diff options
| author | Remko van der Vossen | 2009-02-01 23:24:55 +0100 |
|---|---|---|
| committer | Remko van der Vossen | 2009-02-01 23:24:55 +0100 |
| commit | ce0b8cc1fd99fad4133980160686544fba859219 (patch) | |
| tree | e75d6cbc530954f249821494ec3b110ef418a3a3 | |
| parent | 0caa402b442e019d7fe1cc4823e5ae5298481cba (diff) | |
| parent | cc9ca64c2b1e62e58d3704e8a7babb8b860ce08a (diff) | |
Merge branch 'master' of ssh://remkov@scm.sourcemage.org/smgl/grimoire
31 files changed, 87 insertions, 40 deletions
diff --git a/database/mysql/HISTORY b/database/mysql/HISTORY index dea62a19bb..bf99e838ff 100644 --- a/database/mysql/HISTORY +++ b/database/mysql/HISTORY @@ -1,3 +1,8 @@ +2009-02-01 Julien "_kaze_" ROZO <julien@rozo.org + * PRE_SUB_DEPENDS, SUB_DEPENDS: switched subdepends to uppercase + (fixed bug #15054) + * REPAIR^9682de3a9bbe7bf0d2281d5c80939d51^PRE_SUB_DEPENDS: added + 2009-01-30 Julien "_kaze_" ROZO <julien@rozo.org * PRE_SUB_DEPENDS, SUB_DEPENDS: added forced InnoDB storage engine support diff --git a/database/mysql/PRE_SUB_DEPENDS b/database/mysql/PRE_SUB_DEPENDS index d9899846bd..b79f83d974 100755 --- a/database/mysql/PRE_SUB_DEPENDS +++ b/database/mysql/PRE_SUB_DEPENDS @@ -1,5 +1,5 @@ case $THIS_SUB_DEPENDS in - embedded) if [ $MSQL_EMBED == "--with-embedded-server" ]; then return 0; fi;; - innodb) if [[ $MSQL_ENGINES == *InnoDB* || "$MSQL_ENGINES" == "all" ]]; then return 0; fi;; + embedded|EMBEDDED) if [ $MSQL_EMBED == "--with-embedded-server" ]; then return 0; fi;; + innodb|INNODB) if [[ $MSQL_ENGINES == *InnoDB* || "$MSQL_ENGINES" == "all" ]]; then return 0; fi;; esac return 1 diff --git a/database/mysql/REPAIR^9682de3a9bbe7bf0d2281d5c80939d51^PRE_SUB_DEPENDS b/database/mysql/REPAIR^9682de3a9bbe7bf0d2281d5c80939d51^PRE_SUB_DEPENDS new file mode 100755 index 0000000000..c8aeb071b9 --- /dev/null +++ b/database/mysql/REPAIR^9682de3a9bbe7bf0d2281d5c80939d51^PRE_SUB_DEPENDS @@ -0,0 +1,5 @@ +case $THIS_SUB_DEPENDS in + EMBEDDED) if [ $MSQL_EMBED == "--with-embedded-server" ]; then return 0; fi;; + INNODB) if [[ $MSQL_ENGINES == *InnoDB* || "$MSQL_ENGINES" == "all" ]]; then return 0; fi;; +esac +return 1 diff --git a/database/mysql/SUB_DEPENDS b/database/mysql/SUB_DEPENDS index 857f695a30..b31384a1b6 100755 --- a/database/mysql/SUB_DEPENDS +++ b/database/mysql/SUB_DEPENDS @@ -1,11 +1,11 @@ case $THIS_SUB_DEPENDS in - embedded) echo "Embbeded mysql requested, forcing it." && - MSQL_EMBED="--with-embedded-server" ;; - innodb) echo "InnoDB storage engine support requested, forcing it." && - if [ "$MSQL_ENGINES" == "none" ]; then - MSQL_ENGINES="InnoDB" - else - MSQL_ENGINES="$MSQL_ENGINES InnoDB" - fi ;; - *) echo "unknown sub-depends!"; return 1 ;; + embedded|EMBEDDED) echo "Embbeded mysql requested, forcing it." && + MSQL_EMBED="--with-embedded-server" ;; + innodb|INNODB) echo "InnoDB storage engine support requested, forcing it." && + if [ "$MSQL_ENGINES" == "none" ]; then + MSQL_ENGINES="InnoDB" + else + MSQL_ENGINES="$MSQL_ENGINES InnoDB" + fi ;; + *) echo "unknown sub-depends!"; return 1 ;; esac diff --git a/database/tokyocabinet/DETAILS b/database/tokyocabinet/DETAILS index 0b1094fc19..6658f559c7 100755 --- a/database/tokyocabinet/DETAILS +++ b/database/tokyocabinet/DETAILS @@ -1,6 +1,6 @@ SPELL=tokyocabinet - VERSION=1.4.2 - SOURCE_HASH=sha512:a06386e089d6c52d8d14af35c9a3ef3817fa7c07b79e8ba499e1f60f3d28d2f1fd225471cf29a47b0a66c2f450a6eb503601c7dcbdf0a0507e7fe056de781751 + VERSION=1.4.3 + SOURCE_HASH=sha512:4916697d825380ff9353d3ef1451a2f118edf005e1573660322cd3cf6145b5aabc70224e2449a3ae86ee4bd9ace12b7454b26c65283078bac219dbe76950cda9 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=http://$SPELL.sf.net/$SOURCE diff --git a/database/tokyocabinet/HISTORY b/database/tokyocabinet/HISTORY index d9b9c51f86..40b70122ac 100644 --- a/database/tokyocabinet/HISTORY +++ b/database/tokyocabinet/HISTORY @@ -1,3 +1,6 @@ +2009-02-01 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 1.4.3 + 2009-01-26 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 1.4.2 diff --git a/display/directfb/DETAILS b/display/directfb/DETAILS index 545d2b9811..bcf9955144 100755 --- a/display/directfb/DETAILS +++ b/display/directfb/DETAILS @@ -1,9 +1,9 @@ SPELL=directfb - VERSION=1.1.1 + VERSION=1.3.0 SOURCE=DirectFB-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/DirectFB-$VERSION SOURCE_URL[0]=http://www.directfb.org/downloads/Core/$SOURCE - SOURCE_HASH=sha512:a82793c5164f0379fad7662071c45bc350a44cc814462cf284cb65cf701ce6c4912570e4e7f34c1db62547a625bc57a907537032d0ea7b1bea946839c0ad9bc2 + SOURCE_HASH=sha512:690a12550ef22e95c87d018228c10552a2f4aec4091ccb2db6f42249f4fdc3607d5ce6a2d9f61342ca49ca7841249c0b3d645f1dff7f592e6a67cf2b38898ed7 LICENSE[0]=LGPL KEYWORDS="display" WEB_SITE=http://www.directfb.org/ diff --git a/display/directfb/HISTORY b/display/directfb/HISTORY index 3064b24790..96968c541f 100644 --- a/display/directfb/HISTORY +++ b/display/directfb/HISTORY @@ -1,3 +1,6 @@ +2009-02-01 Ethan Grammatikidis <eekee57@fastmail.fm> + * DETAILS: 1.3.0, needed to build against recent linux-fusion + 2008-07-13 Eric Sandall <sandalle@sourcemage.org> * DEPENDS: Removed libvncserver, fails to build here * BUILD: Disable VNC, fails to build here diff --git a/editors/biew/DETAILS b/editors/biew/DETAILS index a731513f11..2d08307f53 100755 --- a/editors/biew/DETAILS +++ b/editors/biew/DETAILS @@ -1,6 +1,6 @@ SPELL=biew - VERSION=570 - SOURCE_HASH=sha512:c2d5f952666d052c083ca3ff8640247a20ae661025da508e82c54dfb233d38812d413e88067eeb4745a046b9a9d4b7a012dc53c369cd778efb05f8977341dc05 + VERSION=573 + SOURCE_HASH=sha512:e98a98da2223be58eaafa75c1a4d40167461b1dbe88afc0d62f8c2540a6dae2e1d8a44af6c9d243aafa17630ec009ff266ddf52eb33bf73b7f012d10949400ca SOURCE=${SPELL}-${VERSION}.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=$SOURCEFORGE_URL/biew/$SOURCE diff --git a/editors/biew/HISTORY b/editors/biew/HISTORY index 7251bf335a..949f84b284 100644 --- a/editors/biew/HISTORY +++ b/editors/biew/HISTORY @@ -1,3 +1,6 @@ +2009-02-01 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 573 + 2008-12-21 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 570 * INSTALL: removed diff --git a/i18n/scim-tables/DETAILS b/i18n/scim-tables/DETAILS index 2e7a03d896..43bb05db29 100755 --- a/i18n/scim-tables/DETAILS +++ b/i18n/scim-tables/DETAILS @@ -1,10 +1,10 @@ SPELL=scim-tables - VERSION=0.5.7 + VERSION=0.5.9 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION WEB_SITE=http://www.scim-im.org/ SOURCE_URL[0]=$SOURCEFORGE_URL/scim/$SOURCE - SOURCE_HASH=sha512:24b60826c2faa35a7957b2272e3cf1ce05cbd0a9b1ad151b30865fc3348167fbee5331f4d513fb265bad678219a936f76700a4a808315ad2bb78002663a15553 + SOURCE_HASH=sha512:52027ffc3e06a633c06aa6cf33939a0534e195d32ae389a392a6c71b58fb5df1b12a8477d60908804f2b058ac1db75c3866156773feedd20ac63553469484b35 LICENSE[0]=GPL ENTERED=20030912 KEYWORDS="i18n" diff --git a/i18n/scim-tables/HISTORY b/i18n/scim-tables/HISTORY index 6ace477b07..5e4025c9eb 100644 --- a/i18n/scim-tables/HISTORY +++ b/i18n/scim-tables/HISTORY @@ -1,3 +1,6 @@ +2009-02-01 George Sherwood <gsherwood@sourcemage.org> + * DETAILS: Updated to version 0.5.9 + 2006-10-22 George Sherwood <george@beernabeer.com> * DETAILS: Updated to version 0.5.7 diff --git a/i18n/scim/DETAILS b/i18n/scim/DETAILS index ae291676ce..4304752141 100755 --- a/i18n/scim/DETAILS +++ b/i18n/scim/DETAILS @@ -1,10 +1,10 @@ SPELL=scim - VERSION=1.4.7 + VERSION=1.4.8 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION WEB_SITE=http://www.scim-im.org/ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE - SOURCE_HASH=sha512:69ca549afb1049747bb769bfa2d0d0bbad438fa73f4ba353d549efc9486fe82b6ae3d90ded7ac115543e02aba4b3ba9225ac72f9d36fbd6836ccada69a0f95c1 + SOURCE_HASH=sha512:4583c019695412824947f10aaea1e1338858db7cfe3c7b2580fa15ca491ed00147abcf0dccf5f12e33be464b15090a86e7f74ca3a2ed3cda40d09a2e29d6f9c7 LICENSE[0]=GPL ENTERED=20030912 KEYWORDS="i18n" diff --git a/i18n/scim/HISTORY b/i18n/scim/HISTORY index e92f25821c..d5fa255699 100644 --- a/i18n/scim/HISTORY +++ b/i18n/scim/HISTORY @@ -1,3 +1,6 @@ +2009-02-01 George Sherwood <gsherwood@sourcemage.org> + * DETAILS: Updated to version 1.4.8 + 2008-03-18 Eric Sandall <sandalle@sourcemage.org> * DEPENDS: No need to check if using modular X as that's all that's available now diff --git a/kde4-apps/amarok2/DEPENDS b/kde4-apps/amarok2/DEPENDS index db2724248b..ac7c733658 100755 --- a/kde4-apps/amarok2/DEPENDS +++ b/kde4-apps/amarok2/DEPENDS @@ -2,7 +2,7 @@ source $SECTION_DIRECTORY/KDE_DEPENDS && if [[ $AMR_SVN == y ]];then depends subversion fi && -depends -sub embedded mysql && +depends -sub EMBEDDED mysql && optional_depends faac '' '' 'for M4A/AAC/MP4 tag support' && optional_depends libvisual '' '' 'to use libvisual plugins' && optional_depends gstreamer '' '' 'GStreamer support' && diff --git a/kde4-apps/amarok2/HISTORY b/kde4-apps/amarok2/HISTORY index a970a548d3..6c0445e338 100644 --- a/kde4-apps/amarok2/HISTORY +++ b/kde4-apps/amarok2/HISTORY @@ -1,3 +1,7 @@ +2009-02-01 Julien "_kaze_" ROZO <julien@rozo.org> + * DEPENDS: subdepends on embedded mysql must be uppercase + (fixed bug #15054) + 2009-01-11 Julien "_kaze_" ROZO <julien@rozo.org> * DETAILS: updated version to 2.0.1.1 diff --git a/kde4-apps/kdenlive4/DEPENDS b/kde4-apps/kdenlive4/DEPENDS index 448aa7ff6f..54a97cd2fb 100755 --- a/kde4-apps/kdenlive4/DEPENDS +++ b/kde4-apps/kdenlive4/DEPENDS @@ -1,4 +1,6 @@ source $SECTION_DIRECTORY/KDE_DEPENDS +depends soprano && +sub_depends kdelibs4 SOPRANO && if [[ $KDN_SVN == y ]]; then depends subversion fi && diff --git a/kde4-apps/kdenlive4/DETAILS b/kde4-apps/kdenlive4/DETAILS index 4c4f09d168..b4accacc4f 100755 --- a/kde4-apps/kdenlive4/DETAILS +++ b/kde4-apps/kdenlive4/DETAILS @@ -12,11 +12,11 @@ if [[ $KDN_SVN == y ]]; then SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-svn FORCE_DOWNLOAD=on else - VERSION=0.7.1 - SOURCE_HASH=sha512:00dac05c00808ab61e26a4061ee430d208d8df7ae12794c5b4ab5638e94f97ad494b8d2895352b5ccf75dfefef2587cd1af3bc0ca7613053f1f5c6f59643da17 - SOURCE=$SPELLX-$VERSION.tar.bz2 + VERSION=0.7.2 + SOURCE_HASH=sha512:df9596b6d26b789f0282a382a2b6ad184b9fcb050c8abef3c53e32798e43d466d26743d1544b5b75c60b98b021767abfb711e9bd3b8e0cd19252f138527198a3 + SOURCE=$SPELLX-$VERSION.tar.gz SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELLX/$SOURCE -SOURCE_DIRECTORY=$BUILD_DIRECTORY/home/one/downloads/svn/clean/$SPELLX-${VERSION/.0//} +SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-${VERSION} fi WEB_SITE=http://www.kdenlive.org LICENSE[0]=GPL diff --git a/kde4-apps/kdenlive4/HISTORY b/kde4-apps/kdenlive4/HISTORY index c056cf76d4..a9807d9656 100755 --- a/kde4-apps/kdenlive4/HISTORY +++ b/kde4-apps/kdenlive4/HISTORY @@ -1,3 +1,7 @@ +2009-02-01 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 0.7.2 + * DEPENDS: add soprano + 2008-12-29 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 0.7.1 diff --git a/kde4/akonadi/DEPENDS b/kde4/akonadi/DEPENDS index 728e3ec11a..570c3d3aaf 100755 --- a/kde4/akonadi/DEPENDS +++ b/kde4/akonadi/DEPENDS @@ -9,5 +9,5 @@ depends subversion fi && optional_depends mysql '' '' 'for akonadi server' && if is_depends_enabled $SPELL mysql; then - depends -sub innodb mysql + depends -sub INNODB mysql fi diff --git a/kde4/akonadi/HISTORY b/kde4/akonadi/HISTORY index 34f033b50e..d7c143a932 100644 --- a/kde4/akonadi/HISTORY +++ b/kde4/akonadi/HISTORY @@ -1,3 +1,7 @@ +2009-02-01 Julien "_kaze_" ROZO <julien@rozo.org> + * DEPENDS: subdepends on InnoDB in mysql must be uppercase + (fixed bug #15054) + 2009-01-30 Julien "_kaze_" ROZO <julien@rozo.org> * DEPENDS: akonadi server needs InnoDB storage engine enabled in mysql diff --git a/python-pypi/reportlab/BUILD b/python-pypi/reportlab/BUILD deleted file mode 100755 index dbd0112228..0000000000 --- a/python-pypi/reportlab/BUILD +++ /dev/null @@ -1,3 +0,0 @@ -cd reportlab && -default_install - diff --git a/python-pypi/reportlab/DEPENDS b/python-pypi/reportlab/DEPENDS index 822676130a..16a57baeb9 100755 --- a/python-pypi/reportlab/DEPENDS +++ b/python-pypi/reportlab/DEPENDS @@ -1,5 +1,5 @@ depends python && - +depends freetype2 && optional_depends pil \ "" \ "" \ diff --git a/python-pypi/reportlab/DETAILS b/python-pypi/reportlab/DETAILS index fb9021791e..bbefc7cef8 100755 --- a/python-pypi/reportlab/DETAILS +++ b/python-pypi/reportlab/DETAILS @@ -1,8 +1,9 @@ SPELL=reportlab - VERSION=2\_1 - SOURCE_HASH=sha512:06c0cc9674db36e805d8756ad179cbf379550c615d67f7ba15acbe9bd5ba5eb054d1db519fbb44c3799d136b6e8531360286efdffb23aeac8d2e37cba30ea83b - SOURCE=ReportLab\_${VERSION}.tgz -SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL\_$VERSION + SPELLX=ReportLab + VERSION=2\_2 + SOURCE_HASH=sha512:608d6dae1ab6e38896b7d4e5b47b0261927b4afa10391a55f9f2d2b850ef19791107597feaaf693f48c096e548bd8c0beb2543b76f41e595f68f43703fb580d7 + SOURCE=$SPELLX\_${VERSION}.tgz +SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX\_$VERSION WEB_SITE=http://www.reportlab.org SOURCE_URL[0]=$WEB_SITE/ftp/$SOURCE ENTERED=20040122 diff --git a/python-pypi/reportlab/HISTORY b/python-pypi/reportlab/HISTORY index 71b12a372f..82a926c85d 100644 --- a/python-pypi/reportlab/HISTORY +++ b/python-pypi/reportlab/HISTORY @@ -1,3 +1,8 @@ +2009-02-01 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 2_2 + * BUILD: deleted + * DEPENDS: add freetype2 + 2008-01-19 Treeve Jelbert <treeve@sourcemage.org> * INSTALL: use default_install * BUILD: use default_build diff --git a/utils/strigi/DETAILS b/utils/strigi/DETAILS index 57f4500de5..380a9f8f45 100755 --- a/utils/strigi/DETAILS +++ b/utils/strigi/DETAILS @@ -12,8 +12,8 @@ fi SOURCE_URL[0]=svn://anonsvn.kde.org/home/kde/trunk//kdesupport/$SPELL:$SPELL SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL else - VERSION=0.6.3 - SOURCE_HASH=sha512:518e0b77d55c021abc4b26f006ebf5b547e5332976e1a069b3bd553d7f3dbe059ed86b31963a240e6be46077379a58823e6bee5ef9facbcacf583bdc0dee58af + VERSION=0.6.4 + SOURCE_HASH=sha512:809e09a216ab59f3d19589a628581fcb98820f5f5106c571ab5fdf908886dbbffba756b20675b2fcc580f6967d93d843c6e94fb30cf3504a9e99371c701ff265 SOURCE=$SPELL-$VERSION.tar.bz2 # SOURCE_URL[0]=$KDE_URL/unstable/${KDEVER//.0}/src/$SOURCE SOURCE_URL[1]=$SOURCEFORGE_URL/$SPELL/$SOURCE diff --git a/utils/strigi/HISTORY b/utils/strigi/HISTORY index 1fa61a6267..974b49c4b9 100644 --- a/utils/strigi/HISTORY +++ b/utils/strigi/HISTORY @@ -1,3 +1,6 @@ +2009-02-01 Julien "_kaze_" ROZO <julien@rozo.org> + * DETAILS: updated version to 0.6.4 + 2009-01-13 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 0.6.3 diff --git a/x11-toolkits/pygtk2/DETAILS b/x11-toolkits/pygtk2/DETAILS index be0196a98e..c324f1caec 100755 --- a/x11-toolkits/pygtk2/DETAILS +++ b/x11-toolkits/pygtk2/DETAILS @@ -1,8 +1,8 @@ SPELL=pygtk2 - VERSION=2.13.0 + VERSION=2.14.0 BRANCH=`echo $VERSION|cut -d . -f 1,2` SOURCE=pygtk-$VERSION.tar.bz2 -SOURCE_DIRECTORY=$BUILD_DIRECTORY/pygtk-$VERSION +SOURCE_DIRECTORY="$BUILD_DIRECTORY/pygtk-$VERSION" SOURCE_URL[0]=$GNOME_URL/sources/pygtk/$BRANCH/$SOURCE SOURCE_GPG=gurus.gpg:$SOURCE.sig LICENSE[0]=LGPL diff --git a/x11-toolkits/pygtk2/HISTORY b/x11-toolkits/pygtk2/HISTORY index 0835ead068..d46cdb878d 100644 --- a/x11-toolkits/pygtk2/HISTORY +++ b/x11-toolkits/pygtk2/HISTORY @@ -1,3 +1,6 @@ +2009-02-01 Vlad Glagolev <stealth@sourcemage.org> + * DETAILS: updated spell to 2.14.0; quoting paths + 2008-10-08 Jaka Kranjc <lynxlynxlynx@sourcemage.org> * DEPENDS: added python, so it will be triggered on "bad" updates @@ -185,4 +188,3 @@ 2002-05-24 Julian v. Bock <julian@wongr.net> * Added spell. - diff --git a/x11-toolkits/pygtk2/pygtk-2.13.0.tar.bz2.sig b/x11-toolkits/pygtk2/pygtk-2.13.0.tar.bz2.sig Binary files differdeleted file mode 100644 index f3849ca0dd..0000000000 --- a/x11-toolkits/pygtk2/pygtk-2.13.0.tar.bz2.sig +++ /dev/null diff --git a/x11-toolkits/pygtk2/pygtk-2.14.0.tar.bz2.sig b/x11-toolkits/pygtk2/pygtk-2.14.0.tar.bz2.sig Binary files differnew file mode 100644 index 0000000000..e3102584ba --- /dev/null +++ b/x11-toolkits/pygtk2/pygtk-2.14.0.tar.bz2.sig |