Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

 devel/bluefish/DEPENDS |   30 ++++++++++++++++++++++++------
 devel/bluefish/DETAILS |   27 ++++++++++++---------------
 devel/bluefish/HISTORY |    5 +++++
 3 files changed, 41 insertions(+), 21 deletions(-)

New commits:
commit f8e498585bf21d96bbf61e427e5ad0fb19aaac90
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    bluefish: => 2.2.4

diff --git a/devel/bluefish/DEPENDS b/devel/bluefish/DEPENDS
index 4c6f5c0..c035eaa 100755
--- a/devel/bluefish/DEPENDS
+++ b/devel/bluefish/DEPENDS
@@ -3,15 +3,33 @@ depends pcre &&
 if [[ $BLUEFISH_UNSTABLE == y ]]; then
   depends gtk+2
 else
-  if spell_ok gtk+2 && spell_ok gtk+3; then
-    optional_depends gtk+2 "--with-gtk2" "" "to use gtk2 even if gtk3 is 
available"
-  elif spell_ok gtk+2 && ! spell_ok gtk+3; then
-    depends gtk+2 '--with-gtk2'
+  if spell_ok gtk+2 && ! spell_ok gtk+3 || \
+     ! spell_ok gtk+2 && ! spell_ok gtk+3; then
+    optional_depends gtk+3 \
+                     "--without-gtk2" \
+                     "--with-gtk2" \
+                     "to use gtk3 instead of gtk2" &&
+
+    if ! is_depends_enabled $SPELL gtk+3; then
+      depends gtk+2
+    fi
   else
-    depends gtk+3
+    optional_depends gtk+2 \
+                     "--with-gtk2" \
+                     "--without-gtk2" \
+                     "to use gtk2 even if gtk3 is available" &&
+
+    if ! is_depends_enabled $SPELL gtk+2; then
+      depends gtk+3
+    fi
   fi
 fi &&
 
+optional_depends gettext \
+                 "--enable-nls" \
+                 "--disable-nls" \
+                 "to use Native Language Support" &&
+
 optional_depends gucharmap "" "" "for the character map plugin" &&
 
 optional_depends enchant \
@@ -22,4 +40,4 @@ optional_depends enchant \
 optional_depends python \
                  "--enable-python" \
                  "--disable-python" \
-                 "for python integration (HIGHLY EXPERIMENTAL)"
+                 "for zen-coding plugin"
diff --git a/devel/bluefish/DETAILS b/devel/bluefish/DETAILS
index c071ae3..6fcb1b8 100755
--- a/devel/bluefish/DETAILS
+++ b/devel/bluefish/DETAILS
@@ -1,27 +1,24 @@
            SPELL=bluefish
 if [[ $BLUEFISH_UNSTABLE == y ]]; then
          VERSION=1.3.8
+          BRANCH=devel
           SOURCE=$SPELL-unstable-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-unstable-$VERSION"
-   SOURCE_URL[0]=http://www.bennewitz.com/$SPELL/devel/source/$SOURCE
-   SOURCE_URL[1]=http://bluefish.mrball.net/devel/source/$SOURCE
-   SOURCE_URL[2]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-     
SOURCE_HASH=sha512:fd1e6fdd50f1d0d29944e1d5564861cb5ed6dacb6a1255f48053dad203c905314161d39041a62d4a6847bba4e3afb46a9e53e848d6dcde73ae11afe40223fbc9
 else
-         VERSION=2.2.3
-     
SOURCE_HASH=sha512:92fc251728a4fc0404b27c52f6d8f143158d6e6625001d645ffa18c4c8e18a83826ca399deb966a7cdc0bd145c3c21eac6c0fdba5a84dd90c388985aabfa8538
+         VERSION=2.2.4
+          BRANCH=stable
           SOURCE=$SPELL-$VERSION.tar.bz2
-#         SOURCE2=$SOURCE.sig
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-   SOURCE_URL[0]=http://www.bennewitz.com/$SPELL/stable/source/$SOURCE
-   SOURCE_URL[1]=ftp://ftp.ratisbona.com/pub/$SPELL/stable/source/$SOURCE
-   SOURCE_URL[2]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-#  SOURCE2_URL[0]=$SOURCE_URL.sign
-#  SOURCE2_URL[1]=${SOURCE_URL[1]}.sign
-#  SOURCE2_URL[2]=${SOURCE_URL[2]}.sign
-#  SOURCE2_IGNORE=signature
-#      SOURCE_GPG=bluefish.gpg:$SOURCE2:UPSTREAM_KEY
 fi
+   SOURCE_URL[0]=http://www.bennewitz.com/$SPELL/$BRANCH/source/$SOURCE
+   SOURCE_URL[1]=http://bluefish.mrball.net/$BRANCH/source/$SOURCE
+   SOURCE_URL[2]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+         SOURCE2=$SOURCE.sig
+  SOURCE2_URL[0]=$SOURCE_URL.sig
+  SOURCE2_URL[1]=${SOURCE_URL[1]}.sig
+  SOURCE2_URL[2]=${SOURCE_URL[2]}.sig
+  SOURCE2_IGNORE=signature
+      SOURCE_GPG=bluefish.gpg:$SOURCE2:UPSTREAM_KEY
         WEB_SITE=http://bluefish.openoffice.nl/
          ENTERED=20011106
       LICENSE[0]=GPL
diff --git a/devel/bluefish/HISTORY b/devel/bluefish/HISTORY
index 91d133b..2f811ef 100644
--- a/devel/bluefish/HISTORY
+++ b/devel/bluefish/HISTORY
@@ -1,3 +1,8 @@
+2013-02-09 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 2.2.4; switched back to upstream gpg check
+       * DEPENDS: updated python dependency description; added more choice 
for
+         GTK+ version selection; added gettext optional dependency
+
 2012-06-28 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 2.2.3