Source Mage code commit list

[Eric Sandall <scm AT sourcemage.org>]

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

 devel/meld/DETAILS                  |    9 +++++----
 devel/meld/HISTORY                  |    3 +++
 devel/meld/meld-1.1.5.1.tar.bz2.sig |binary
 x11/conky/DEPENDS                   |    7 ++++++-
 x11/conky/HISTORY                   |    1 +
 5 files changed, 15 insertions(+), 5 deletions(-)

New commits:
commit 40baf4ded50ef49b4440d1772b6ad4643d2fc949
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    conky: Optionally depends on wireless_tools for WLAN support

commit 0b2ba6d336403b4351ed014b8b0c2f4293355285
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    meld: Updated to 1.1.5.1

diff --git a/devel/meld/DETAILS b/devel/meld/DETAILS
index 20590fd..799c03f 100755
--- a/devel/meld/DETAILS
+++ b/devel/meld/DETAILS
@@ -1,15 +1,16 @@
            SPELL=meld
-         VERSION=1.1.4
+         VERSION=1.1.5.1
           BRANCH=$(echo $VERSION|cut -d. -f1,2)
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
-     
SOURCE_HASH=sha512:f663945a8161508e77fb09efcabf2356d27b47371b4df065dcf8bdebe07f112c7123665f03c13eb3e2531994366823a888947a6a89ea15db2522bd938d4824b2
+      SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+#     
SOURCE_HASH=sha512:f663945a8161508e77fb09efcabf2356d27b47371b4df065dcf8bdebe07f112c7123665f03c13eb3e2531994366823a888947a6a89ea15db2522bd938d4824b2
+      LICENSE[0]=GPL
+        KEYWORDS="gnome devel"
         WEB_SITE=http://meld.sourceforge.net/
          ENTERED=20030805
             DOCS="changelog AUTHORS COPYING TODO.txt"
-      LICENSE[0]=GPL
-        KEYWORDS="gnome devel"
            SHORT='Meld is a GNOME 2 visual diff and merge tool'
 cat << EOF
 Meld is a GNOME 2 visual diff and merge tool. It integrates especially
diff --git a/devel/meld/HISTORY b/devel/meld/HISTORY
index 34a6361..75c4260 100644
--- a/devel/meld/HISTORY
+++ b/devel/meld/HISTORY
@@ -1,3 +1,6 @@
+2007-10-02 Eric Sandall <sandalle AT sourcemage.org>
+       * DETAILS: Updated to 1.1.5.1
+
 2006-10-09 Anton Brondz <dinolinux AT sourcemage.org>
        * DETAILS: updated to 1.1.4
 
diff --git a/devel/meld/meld-1.1.5.1.tar.bz2.sig 
b/devel/meld/meld-1.1.5.1.tar.bz2.sig
new file mode 100644
index 0000000..240d66f
Binary files /dev/null and b/devel/meld/meld-1.1.5.1.tar.bz2.sig differ
diff --git a/x11/conky/DEPENDS b/x11/conky/DEPENDS
index 8979a03..0f5cfba 100755
--- a/x11/conky/DEPENDS
+++ b/x11/conky/DEPENDS
@@ -1 +1,6 @@
-depends  X11-LIBS
+depends  X11-LIBS  &&
+
+optional_depends  wireless_tools          \
+                  '--enable-wlan'         \
+                  '--disable-wlan'        \
+                  'for Wireless support'
diff --git a/x11/conky/HISTORY b/x11/conky/HISTORY
index 85e0563..e974ecd 100644
--- a/x11/conky/HISTORY
+++ b/x11/conky/HISTORY
@@ -1,5 +1,6 @@
 2007-10-01 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 1.4.7
+       * DEPENDS: Optionally depends on wireless_tools for WLAN support
 
 2006-08-31 Pol Vinogradov <vin.public AT gmail.com>
        * DETAILS: updated to 1.4.2, removed UPDATED