Mass Update: gnustep.eclass revamped to allow configurable root install; gnustep-base/libs/apps updated to utilize new gnustep.eclass (only versions bumped where files would change); some KEYWORDS were accidentally dropped between version bumps of packages -- this has been resolved; windowmaker correctly supports gnustep now; gnustep-funcs.eclass added -- used where info on an installed gnustep-env is needed rather than making a full GNUstep application

8 files changed, 75 insertions, 5 deletions

diff --git a/gnustep-base/gnustep-make/files/GNUstep-reset.sh.patch b/gnustep-base/gnustep-make/files/GNUstep-reset.sh.patch
new file mode 100644
index 000000000000..6c5dc422af94
--- /dev/null
+++ b/gnustep-base/gnustep-make/files/GNUstep-reset.sh.patch
@@ -0,0 +1,74 @@
+--- GNUstep-reset.sh	2004-11-07 21:42:49.000000000 -0500
++++ GNUstep-reset.sh	2004-11-08 01:19:30.717795904 -0500
+@@ -34,30 +34,43 @@
+ # GNUSTEP_NETWORK_ROOT and GNUSTEP_USER_ROOT are removed from the path
+ # variable (yes, we are rather crude).  All other paths are kept
+ # unchanged.
++
+ function reset_path 
+ {
+   # Declare local variables
+   local original_path tmp_IFS temp_path dir gnustep_dir found
+ 
+-  # NB: We need to use eval because we want to access a variable
+-  # whose name is another variable!
+-  original_path=$(eval echo \$$1)
+-  tmp_IFS="$IFS"
++  if [ -z "$1" ]; then
++    echo "Warning: ${FUNCNAME} called without an argument."
++    echo "This is a bug."
++  fi
++
++  if [ -z "$2" ]; then
++    echo "Warning: ${FUNCNAME} called without an argument."
++    echo "This is a bug (2)."
++  fi
++
++  original_path=${!1}
++  tmp_IFS="${IFS}"
+   IFS=:
+   temp_path=
++
+   # Loop on the paths
+   for dir in $original_path; do
+     # For each of them, keep it only if it's not beginning with
+     # a path in GNUSTEP_PATHLIST as prefix
+     found=no;
+     for gnustep_dir in $GNUSTEP_PATHLIST; do
+-      if [ -n "$gnustep_dir" ]; then
+-        case "$dir" in
+-          $gnustep_dir*)  found=yes; break;;
++      if [ -n "$gnustep_dir$2" ]; then
++        case "$dir/" in
++          $gnustep_dir$2*)
++	    found=yes;
++	    break;;
+           *);;
+         esac;
+       fi;
+     done;
++
+     if [ "$found" = "no" ]; then
+       if [ -z "$temp_path" ]; then
+         temp_path="$dir"
+@@ -80,12 +93,14 @@
+   fi
+ }
+ 
+-reset_path CLASSPATH
+-reset_path GUILE_LOAD_PATH
+-reset_path LD_LIBRARY_PATH
+-reset_path DYLD_LIBRARY_PATH
+-reset_path DYLD_FRAMEWORK_PATH
+-reset_path PATH
++reset_path CLASSPATH /Library/Libraries/Java
++reset_path GUILE_LOAD_PATH /Library/Libraries/Guile
++reset_path LD_LIBRARY_PATH /Library/Libraries
++# ... uhmmm, these aren't in GNUstep.sh ? (11/8/04)
++# (yes, they're on Darwin, I know...;-))
++#reset_path DYLD_LIBRARY_PATH
++#reset_path DYLD_FRAMEWORK_PATH
++reset_path PATH /Tools
+ 
+ # Make sure we destroy the reset_path function after using it - we don't
+ # want to pollute the environment with it.
diff --git a/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.0-r1 b/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.0-r1
new file mode 100644
index 000000000000..a6f51a10dfba
--- /dev/null
+++ b/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.0-r1
@@ -0,0 +1 @@
+MD5 bfd0f6530b938e7ee1d5a300219a0ab3 gnustep-make-1.10.0.tar.gz 372852
diff --git a/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.1_pre20040928 b/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.1_pre20041030-r1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.1_pre20040928
+++ b/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.1_pre20041030-r1
diff --git a/gnustep-base/gnustep-make/files/digest-gnustep-make-1.3.4 b/gnustep-base/gnustep-make/files/digest-gnustep-make-1.3.4
deleted file mode 100644
index 8dd2fc94f56e..000000000000
--- a/gnustep-base/gnustep-make/files/digest-gnustep-make-1.3.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 25318a1e8859cf1d82414031d91867d8 gnustep-make-1.3.4.tar.gz 313638
diff --git a/gnustep-base/gnustep-make/files/digest-gnustep-make-1.5.1 b/gnustep-base/gnustep-make/files/digest-gnustep-make-1.5.1
deleted file mode 100644
index eb38145e3722..000000000000
--- a/gnustep-base/gnustep-make/files/digest-gnustep-make-1.5.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9d5182d0c8f0c11fafdf2034262cbb3c gnustep-make-1.5.1.tar.gz 333780
diff --git a/gnustep-base/gnustep-make/files/digest-gnustep-make-1.6.0 b/gnustep-base/gnustep-make/files/digest-gnustep-make-1.6.0
deleted file mode 100644
index 753507c34a95..000000000000
--- a/gnustep-base/gnustep-make/files/digest-gnustep-make-1.6.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e17e758ee9ab5bbe24dcc01fdafdb13c gnustep-make-1.6.0.tar.gz 342471
diff --git a/gnustep-base/gnustep-make/files/digest-gnustep-make-1.7.1 b/gnustep-base/gnustep-make/files/digest-gnustep-make-1.7.1
deleted file mode 100644
index 7bdbbea72104..000000000000
--- a/gnustep-base/gnustep-make/files/digest-gnustep-make-1.7.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5b349dd804785f335392ef4749e72a6d gnustep-make-1.7.1.tar.gz 350103
diff --git a/gnustep-base/gnustep-make/files/digest-gnustep-make-1.7.2 b/gnustep-base/gnustep-make/files/digest-gnustep-make-1.7.2
deleted file mode 100644
index 39e9ee0023f8..000000000000
--- a/gnustep-base/gnustep-make/files/digest-gnustep-make-1.7.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4f6d66701ad909e57f2dba5db7f2bb54 gnustep-make-1.7.2.tar.gz 353898