Sync with latest changes in master

7 files changed, 15 insertions, 16 deletions

diff --git a/gnustep-libs/gnustep-gui/BUILD b/gnustep-libs/gnustep-gui/BUILD
deleted file mode 100755
index 60a5da7782..0000000000
--- a/gnustep-libs/gnustep-gui/BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-if test "$(get_spell_provider $SPELL LIBGIF)" = giflib; then
-  OPTS="--disable-ungif --enable-libgif $OPTS"
-fi &&
-if test "$(get_spell_provider $SPELL LIBGIF)" = libungif; then
-  OPTS="--enable-ungif --disable-libgif $OPTS"
-fi &&
-default_build
diff --git a/gnustep-libs/gnustep-gui/DEPENDS b/gnustep-libs/gnustep-gui/DEPENDS
index 5479910ee1..9387f2e513 100755
--- a/gnustep-libs/gnustep-gui/DEPENDS
+++ b/gnustep-libs/gnustep-gui/DEPENDS
@@ -6,8 +6,8 @@ optional_depends libpng                      \
                  "--enable-png"              \
                  "--disable-png"             \
                  "Enable PNG support"        &&
-optional_depends LIBGIF                      \
-                 ""                          \
+optional_depends giflib                      \
+                 "--disable-ungif --enable-libgif" \
                  ""                          \
                  "Add gif support."          &&
 optional_depends jpeg                        \
diff --git a/gnustep-libs/gnustep-gui/HISTORY b/gnustep-libs/gnustep-gui/HISTORY
index c45623ada2..55a3fc2059 100644
--- a/gnustep-libs/gnustep-gui/HISTORY
+++ b/gnustep-libs/gnustep-gui/HISTORY
@@ -1,3 +1,7 @@
+2008-07-12 Vlad Glagolev <stealth@sourcemage.org>
+	* DEPENDS: depends on giflib, provider deprecated
+	* BUILD: removed, useless
+
 2008-03-18 Eric Sandall <sandalle@sourcemage.org>
 	* DEPENDS: Switch X11-LIBS to the one and only xorg-libs
 
diff --git a/gnustep-libs/gnustep-make/DETAILS b/gnustep-libs/gnustep-make/DETAILS
index cfd8a79d15..852b8fa201 100755
--- a/gnustep-libs/gnustep-make/DETAILS
+++ b/gnustep-libs/gnustep-make/DETAILS
@@ -1,16 +1,13 @@
            SPELL=gnustep-make
-         VERSION=2.0.0
+         VERSION=2.0.5
           SOURCE=$SPELL-$VERSION.tar.gz
-         SOURCE2=$SOURCE.sig
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=ftp://ftp.gnustep.org/pub/gnustep/core/$SOURCE
-  SOURCE2_URL[0]=ftp://ftp.gnustep.org/pub/gnustep/core/$SOURCE2
-        WEB_SITE=http://www.gnustep.org
-      SOURCE_GPG=gnustep.gpg:$SOURCE2:UPSTREAM_KEY
-  SOURCE2_IGNORE=signature
+      SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
       LICENSE[0]=LGPL
-         ENTERED=20050908
+        WEB_SITE=http://www.gnustep.org
         KEYWORDS="gnustep libs"
+         ENTERED=20050908
            SHORT="Powerful and extensible way to write GNUstep-based makefiles"
 cat << EOF
 The makefile package is a simple, powerful and extensible way to write
diff --git a/gnustep-libs/gnustep-make/HISTORY b/gnustep-libs/gnustep-make/HISTORY
index 30e664a938..032f81a229 100644
--- a/gnustep-libs/gnustep-make/HISTORY
+++ b/gnustep-libs/gnustep-make/HISTORY
@@ -1,3 +1,7 @@
+2008-04-29 Eric Sandall <sandalle@sourcemage.org>
+	* DETAILS: Updated to 2.0.5
+	  Upstream key cannot be found anywhere
+
 2006-10-26 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
 	* INSTALL: use TRACK_ROOT when linking #9163
 
@@ -43,3 +47,4 @@
 
 2005-09-08 Maurizio Boriani <baux@sourcemage.org>
 	* BUILD, DEPENDS, DETAILS, CONFIGURE, FINAL: created the spell.
+
diff --git a/gnustep-libs/gnustep-make/gnustep-make-2.0.5.tar.gz.sig b/gnustep-libs/gnustep-make/gnustep-make-2.0.5.tar.gz.sig
new file mode 100644
index 0000000000..a6dc7298a7
--- /dev/null
+++ b/gnustep-libs/gnustep-make/gnustep-make-2.0.5.tar.gz.sig
diff --git a/gnustep-libs/gnustep.gpg b/gnustep-libs/gnustep.gpg
index 748c4244c4..1921632a38 100644
--- a/gnustep-libs/gnustep.gpg
+++ b/gnustep-libs/gnustep.gpg