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

20 files changed, 472 insertions, 434 deletions

diff --git a/gnustep-base/gnustep-make/ChangeLog b/gnustep-base/gnustep-make/ChangeLog
index f013970ea318..06110eb8fa07 100644
--- a/gnustep-base/gnustep-make/ChangeLog
+++ b/gnustep-base/gnustep-make/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for gnustep-base/gnustep-make
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/ChangeLog,v 1.12 2004/11/02 17:26:48 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/ChangeLog,v 1.13 2004/11/12 03:46:55 fafhrd Exp $
+
+*gnustep-make-1.10.0-r1 (11 Nov 2004)
+
+  11 Nov 2004; Armando Di Cianno <fafhrd@gentoo.org>
+  +files/GNUstep-reset.sh.patch, +gnustep-make-1.10.0-r1.ebuild,
+  gnustep-make-1.10.0.ebuild, -gnustep-make-1.10.1_pre20040928.ebuild,
+  +gnustep-make-1.10.1_pre20041030-r1.ebuild,
+  gnustep-make-1.10.1_pre20041030.ebuild, -gnustep-make-1.3.4.ebuild,
+  -gnustep-make-1.5.1.ebuild, -gnustep-make-1.6.0.ebuild,
+  -gnustep-make-1.7.1.ebuild, -gnustep-make-1.7.2.ebuild:
+  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-make-1.10.1_pre20041030 (02 Nov 2004)
 
diff --git a/gnustep-base/gnustep-make/Manifest b/gnustep-base/gnustep-make/Manifest
index a0490947ebb8..c4505bb5c266 100644
--- a/gnustep-base/gnustep-make/Manifest
+++ b/gnustep-base/gnustep-make/Manifest
@@ -1,20 +1,13 @@
-MD5 8d8340275532373e363ffb9a86227689 ChangeLog 4956
-MD5 179efc2317ffec651dea0c8c81bc42bd gnustep-make-1.10.0.ebuild 2608
-MD5 a28ef1c96d8d88659da4ac5f27317612 gnustep-make-1.10.1_pre20040928.ebuild 2871
-MD5 410d092518bb94466994625af24b4abc gnustep-make-1.10.1_pre20041030.ebuild 2865
-MD5 78eb514dc70af3bf2b8119347f4a23a5 gnustep-make-1.3.4.ebuild 4892
-MD5 535178ca88572076fc9a4b6ad6651d98 gnustep-make-1.5.1.ebuild 957
-MD5 422a26483b4dc19239451d201d729d61 gnustep-make-1.6.0.ebuild 1027
-MD5 1d0f0080a652d06bb33b0521cbec7af3 gnustep-make-1.7.1.ebuild 1022
-MD5 95b076f758f375caa475d9f50360001f gnustep-make-1.7.2.ebuild 1291
+MD5 cf7ef7864a88f9b756ac7f1b460aa641 gnustep-make-1.10.0.ebuild 2629
+MD5 1f1f34b34d2243b86fd2a1652adcc61b gnustep-make-1.10.1_pre20041030.ebuild 2884
+MD5 8b20f2cfe412b92b6e1f9da9c1ea4bd2 gnustep-make-1.10.0-r1.ebuild 6506
+MD5 f2210ea2751129974782b44253b629d7 gnustep-make-1.10.1_pre20041030-r1.ebuild 6804
+MD5 581ec9d7a92c26d7e25be308e4784e2b ChangeLog 5754
 MD5 ca04d409726e17e7151b832de9989a48 metadata.xml 530
-MD5 020f6b825d80a9769c36a39877f13f44 files/digest-gnustep-make-1.10.0 71
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-make-1.10.1_pre20040928 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-make-1.10.1_pre20041030 0
-MD5 df4d0245583afe01d23dadcfa5b28224 files/digest-gnustep-make-1.3.4 70
-MD5 7de971aacfff80866d769c9f95822546 files/digest-gnustep-make-1.5.1 70
-MD5 a93883f335b56238e3f70c5bc9672408 files/digest-gnustep-make-1.6.0 70
-MD5 6775eb17a0b900da39e32aa867303d71 files/digest-gnustep-make-1.7.1 70
-MD5 da53863996607e45303ea37b8f665922 files/digest-gnustep-make-1.7.2 70
 MD5 4ba1b8533c9b3b56077617796abc9ab6 files/helloworld.m 1004
 MD5 fdb13360dfc78ccdc3c75a5da84b46ab files/make-user-defaults.patch-1.10.0 1282
+MD5 ff55be8ebf757b97d823bb3cf08b8bc4 files/GNUstep-reset.sh.patch 2121
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-make-1.10.1_pre20041030-r1 0
+MD5 020f6b825d80a9769c36a39877f13f44 files/digest-gnustep-make-1.10.0 71
+MD5 020f6b825d80a9769c36a39877f13f44 files/digest-gnustep-make-1.10.0-r1 71
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-make-1.10.1_pre20041030 0
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
diff --git a/gnustep-base/gnustep-make/gnustep-make-1.10.0-r1.ebuild b/gnustep-base/gnustep-make/gnustep-make-1.10.0-r1.ebuild
new file mode 100644
index 000000000000..6525868368b3
--- /dev/null
+++ b/gnustep-base/gnustep-make/gnustep-make-1.10.0-r1.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-1.10.0-r1.ebuild,v 1.1 2004/11/12 03:46:56 fafhrd Exp $
+
+inherit gnustep
+
+DESCRIPTION="The makefile package is a simple, powerful and extensible way to write makefiles for a GNUstep-based project."
+
+HOMEPAGE="http://www.gnustep.org"
+SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
+KEYWORDS="~ppc ~x86 ~amd64 ~sparc ~alpha"
+SLOT="0"
+LICENSE="GPL-2"
+
+IUSE="${IUSE} doc non-flattened layout-osx-like layout-from-conf-file"
+DEPEND="${GNUSTEP_CORE_DEPEND}
+	>=sys-devel/make-3.75
+	${DOC_DEPEND}"
+RDEPEND="${DEPEND}
+	${DOC_RDEPEND}"
+
+egnustep_install_domain "System"
+
+pkg_setup() {
+	gnustep_pkg_setup
+
+	# okay, I couldn't figure out how to check if a dependency was
+	#  compiled with a specific use flag, so we do it ./configure
+	#  check-for-lib style ...
+	gcc ${FILESDIR}/helloworld.m -o $TMP/helloworld -lobjc || die \
+		"gcc must be compiled with Objective-C support! See the objc USE flag."
+
+	if use layout-from-conf-file && use layout-osx-like ; then
+		eerror "layout-from-conf-file and layout-osx-like are mutually exclusive use flags."
+		die "USE flag misconfiguration -- please correct"
+	fi
+
+	if use layout-from-conf-file || use layout-osx-like ; then
+		ewarn "USE layout-from-conf-file || layout-osx-like"
+		ewarn "Utilizing these USE flags allows one to install files in non standard"
+		ewarn "  locations vis a vis the Linux FHS -- please fully comprehend what you"
+		ewarn "  are doing when setting this USE flag."
+	fi
+
+	if use layout-from-conf-file; then
+		if [ ! -f /etc/conf.d/gnustep.env ]; then
+			eerror "There is no /etc/conf.d/gnustep.env file!"
+			eerror "Did you read the USE flag description?"
+			die "USE flag misconfiguration -- please correct"
+		else
+			unset GNUSTEP_SYSTEM_ROOT
+			unset GNUSTEP_LOCAL_ROOT
+			unset GNUSTEP_NETWORK_ROOT
+			unset GNUSTEP_USER_ROOT
+			. /etc/conf.d/gnustep.env
+			if [ -z "${GNUSTEP_SYSTEM_ROOT}" ] || [ "/" != "${GNUSTEP_SYSTEM_ROOT:0:1}" ]; then
+				eerror "GNUSTEP_SYSTEM_ROOT is missing or misconfigured in /etc/conf.d/gnustep.env"
+				eerror "GNUSTEP_SYSTEM_ROOT=${GNUSTEP_SYSTEM_ROOT}"
+				die "USE flag misconfiguration -- please correct"
+			fi
+			if [ "/System" != ${GNUSTEP_SYSTEM_ROOT:$((${#GNUSTEP_SYSTEM_ROOT}-7)):7} ]; then
+				eerror "GNUSTEP_SYSTEM_ROOT must end with \"System\" -- read the USE flag directions!!!"
+				die "USE flag misconfiguration -- please correct"
+			fi
+			if [ "${GNUSTEP_LOCAL_ROOT}" ] && [ "/" != "${GNUSTEP_LOCAL_ROOT:0:1}" ]; then
+				eerror "GNUSTEP_LOCAL_ROOT is misconfigured in /etc/conf.d/gnustep.env"
+				eerror "GNUSTEP_LOCAL_ROOT=${GNUSTEP_LOCAL_ROOT}"
+				die "USE flag misconfiguration -- please correct"
+			elif [ -z "${GNUSTEP_LOCAL_ROOT}" ]; then
+				GNUSTEP_LOCAL_ROOT="$(dirname ${GNUSTEP_SYSTEM_ROOT})/Local"
+			fi
+			if [ "${GNUSTEP_NETWORK_ROOT}" ] && [ "/" != "${GNUSTEP_NETWORK_ROOT:0:1}" ]; then
+				eerror "GNUSTEP_NETWORK_ROOT is misconfigured in /etc/conf.d/gnustep.env"
+				eerror "GNUSTEP_NETWORK_ROOT=${GNUSTEP_NETWORK_ROOT}"
+				die "USE flag misconfiguration -- please correct"
+			elif [ -z "${GNUSTEP_NETWORK_ROOT}" ]; then
+				GNUSTEP_NETWORK_ROOT="$(dirname ${GNUSTEP_SYSTEM_ROOT})/Network"
+			fi
+			if [ "${GNUSTEP_USER_ROOT}" ] && [ '~' != "${GNUSTEP_USER_ROOT:0:1}" ]; then
+				eerror "GNUSTEP_USER_ROOT is misconfigured in /etc/conf.d/gnustep.env"
+				eerror "GNUSTEP_USER_ROOT=${GNUSTEP_USER_ROOT}"
+				die "USE flag misconfiguration -- please correct"
+			elif [ -z "${GNUSTEP_USER_ROOT}" ]; then
+				GNUSTEP_USER_ROOT='~/GNUstep'
+			fi
+
+			egnustep_prefix "$(dirname ${GNUSTEP_SYSTEM_ROOT})"
+			egnustep_system_root "${GNUSTEP_SYSTEM_ROOT}"
+			egnustep_local_root "${GNUSTEP_LOCAL_ROOT}"
+			egnustep_network_root "${GNUSTEP_NETWORK_ROOT}"
+			egnustep_user_root "${GNUSTEP_USER_ROOT}"
+		fi
+	elif use layout-osx-like; then
+		egnustep_prefix "/"
+		egnustep_system_root "/System"
+		egnustep_local_root "/"
+		egnustep_network_root "/Network"
+		egnustep_user_root '~'
+	else
+		# setup defaults here
+		egnustep_prefix "/usr/GNUstep"
+		egnustep_system_root "/usr/GNUstep/System"
+		egnustep_local_root "/usr/GNUstep/Local"
+		egnustep_network_root "/usr/GNUstep/Network"
+		egnustep_user_root '~/GNUstep'
+	fi
+
+#	if use layout-from-conf-file || use layout-osx-like; then
+		einfo "GNUstep installation will be laid out thusly:"
+		einfo "\tGNUSTEP_SYSTEM_ROOT=`egnustep_system_root`"
+		einfo "\tGNUSTEP_LOCAL_ROOT=`egnustep_local_root`"
+		einfo "\tGNUSTEP_NETWORK_ROOT=`egnustep_network_root`"
+		einfo "\tGNUSTEP_USER_ROOT=`egnustep_user_root`"
+		ebeep
+		epause 10
+#	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/make-user-defaults.patch-${PV}
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/GNUstep-reset.sh.patch
+}
+
+src_compile() {
+	cd ${S}
+
+	# gnustep-make ./configure : "prefix" here is going to be where
+	#  "System" is installed -- other correct paths should be set
+	#  by econf
+	local myconf
+	myconf="--prefix=`egnustep_prefix`"
+	use non-flattened && myconf="$myconf --disable-flattened"
+	myconf="$myconf --with-tar=/bin/tar"
+	myconf="$myconf --with-local-root=`egnustep_local_root`"
+	myconf="$myconf --with-network-root=`egnustep_network_root`"
+	myconf="$myconf --with-user-root=`egnustep_user_root`"
+	econf $myconf || die "configure failed"
+
+	egnustep_make
+}
+
+src_install() {
+	. ${S}/GNUstep.sh
+
+	if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then
+		local make_eval="INSTALL_ROOT=\${D} \
+		GNUSTEP_SYSTEM_ROOT=\${D}\$(egnustep_system_root) \
+		GNUSTEP_NETWORK_ROOT=\${D}\$(egnustep_network_root) \
+		GNUSTEP_LOCAL_ROOT=\${D}\$(egnustep_local_root) \
+		GNUSTEP_MAKEFILES=\${D}\$(egnustep_system_root)/Library/Makefiles \
+		GNUSTEP_USER_ROOT=\${TMP} \
+		GNUSTEP_DEFAULTS_ROOT=\${TMP}/\${__GS_USER_ROOT_POSTFIX} \
+		-j1"
+
+		if use debug ; then
+			make_eval="${make_eval} debug=yes"
+		fi
+		if use verbose ; then
+			make_eval="${make_eval} verbose=yes"
+		fi
+		eval emake ${make_eval} install || die "install has failed"
+	else
+		die "no Makefile found"
+	fi
+
+	if use doc ; then
+		cd Documentation
+		eval emake ${make_eval} all || die "doc make has failed"
+		eval emake ${make_eval} install || die "doc install has failed"
+		cd ..
+	fi
+
+	dodir /etc/conf.d
+	echo "GNUSTEP_SYSTEM_ROOT=$(egnustep_system_root)" > ${D}/etc/conf.d/gnustep.env
+	echo "GNUSTEP_LOCAL_ROOT=$(egnustep_local_root)" >> ${D}/etc/conf.d/gnustep.env
+	echo "GNUSTEP_NETWORK_ROOT=$(egnustep_network_root)" >> ${D}/etc/conf.d/gnustep.env
+	echo "GNUSTEP_USER_ROOT='$(egnustep_user_root)'" >> ${D}/etc/conf.d/gnustep.env
+}
+
diff --git a/gnustep-base/gnustep-make/gnustep-make-1.10.0.ebuild b/gnustep-base/gnustep-make/gnustep-make-1.10.0.ebuild
index 160dae9a6691..45351c5eb0e0 100644
--- a/gnustep-base/gnustep-make/gnustep-make-1.10.0.ebuild
+++ b/gnustep-base/gnustep-make/gnustep-make-1.10.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-1.10.0.ebuild,v 1.4 2004/10/21 19:09:32 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-1.10.0.ebuild,v 1.5 2004/11/12 03:46:56 fafhrd Exp $
 
 inherit gnustep
 
@@ -8,7 +8,7 @@ DESCRIPTION="The makefile package is a simple, powerful and extensible way to wr
 
 HOMEPAGE="http://www.gnustep.org"
 SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ~ppc ~amd64 ~sparc ~alpha"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20040928.ebuild b/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20040928.ebuild
deleted file mode 100644
index 6b27340d97dc..000000000000
--- a/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20040928.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20040928.ebuild,v 1.6 2004/10/31 11:31:15 kloeri Exp $
-
-ECVS_CVS_COMMAND="cvs -q"
-ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
-ECVS_USER="anoncvs"
-ECVS_AUTH="ext"
-ECVS_MODULE="gnustep/core/make"
-ECVS_CO_OPTS="-D ${PV/*_pre}"
-ECVS_UP_OPTS="-D ${PV/*_pre}"
-ECVS_TOP_DIR="${DISTDIR}/cvs-src/savannah.gnu.org-gnustep"
-inherit gnustep cvs
-
-S=${WORKDIR}/${ECVS_MODULE}
-
-DESCRIPTION="The makefile package is a simple, powerful and extensible way to write makefiles for a GNUstep-based project."
-HOMEPAGE="http://www.gnustep.org"
-
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-SLOT="0"
-LICENSE="GPL-2"
-
-IUSE="${IUSE} doc"
-DEPEND="${GNUSTEP_CORE_DEPEND}
-	>=sys-devel/make-3.75
-	${DOC_DEPEND}"
-RDEPEND="${DEPEND}
-	${DOC_RDEPEND}"
-
-pkg_setup() {
-	gnustep_pkg_setup
-
-	# okay, I couldn't figure out how to check if a dependency was
-	#  compiled with a specific use flag, so we do it ./configure
-	#  check-for-lib style ...
-	gcc ${FILESDIR}/helloworld.m -o $TMP/helloworld -lobjc || die \
-		"gcc must be compiled with Objective-C support! See the objc USE flag."
-}
-
-src_unpack() {
-	cvs_src_unpack
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/make-user-defaults.patch-1.10.0
-}
-
-src_compile() {
-	cd ${S}
-
-	myconf="--prefix=${GENTOO_GNUSTEP_ROOT}"
-	myconf="$myconf --with-network-root=${GENTOO_GNUSTEP_ROOT}/Network"
-	myconf="$myconf --with-tar=/bin/tar"
-	econf $myconf || die "configure failed"
-
-	egnustep_make
-}
-
-src_install() {
-	. ${S}/GNUstep.sh
-
-	if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then
-		if use debug ; then
-			emake -j1 INSTALL_ROOT=${D} \
-				GNUSTEP_SYSTEM_ROOT=${D}${GNUSTEP_SYSTEM_ROOT} \
-				GNUSTEP_NETWORK_ROOT=${D}${GNUSTEP_NETWORK_ROOT} \
-				GNUSTEP_LOCAL_ROOT=${D}${GNUSTEP_LOCAL_ROOT} \
-				debug=yes install || die "install has failed"
-		else
-			emake -j1 INSTALL_ROOT=${D} \
-				GNUSTEP_SYSTEM_ROOT=${D}${GNUSTEP_SYSTEM_ROOT} \
-				GNUSTEP_NETWORK_ROOT=${D}${GNUSTEP_NETWORK_ROOT} \
-				GNUSTEP_LOCAL_ROOT=${D}${GNUSTEP_LOCAL_ROOT} \
-				install || die "install has failed"
-		fi
-	else
-		die "no Makefile found"
-	fi
-
-	. ${D}${GENTOO_GNUSTEP_ROOT}/System/Library/Makefiles/GNUstep.sh
-
-	if use doc ; then
-		cd Documentation
-		make INSTALL_ROOT=${D} \
-			GNUSTEP_SYSTEM_ROOT=${D}${GNUSTEP_SYSTEM_ROOT} \
-			GNUSTEP_MAKEFILES=${D}${GENTOO_GNUSTEP_ROOT}/System/Library/Makefiles \
-			GNUSTEP_USER_ROOT=${TMP}/GNUstep \
-			GNUSTEP_DEFAULTS_ROOT=${TMP}/GNUstep \
-			all || die "doc build failed"
-		make INSTALL_ROOT=${D} \
-			GNUSTEP_SYSTEM_ROOT=${D}${GNUSTEP_SYSTEM_ROOT} \
-			GNUSTEP_MAKEFILES=${D}${GENTOO_GNUSTEP_ROOT}/System/Library/Makefiles \
-			GNUSTEP_USER_ROOT=${TMP}/GNUstep \
-			GNUSTEP_DEFAULTS_ROOT=${TMP}/GNUstep \
-			install || die "doc install failed"
-		cd ..
-	fi
-}
-
diff --git a/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041030-r1.ebuild b/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041030-r1.ebuild
new file mode 100644
index 000000000000..0e0791c9d2d5
--- /dev/null
+++ b/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041030-r1.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041030-r1.ebuild,v 1.1 2004/11/12 03:46:56 fafhrd Exp $
+
+ECVS_CVS_COMMAND="cvs -q"
+ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
+ECVS_USER="anoncvs"
+ECVS_AUTH="ext"
+ECVS_MODULE="gnustep/core/make"
+ECVS_CO_OPTS="-P -D ${PV/*_pre}"
+ECVS_UP_OPTS="-dP -D ${PV/*_pre}"
+ECVS_TOP_DIR="${DISTDIR}/cvs-src/savannah.gnu.org-gnustep"
+inherit gnustep cvs
+
+S=${WORKDIR}/${ECVS_MODULE}
+
+DESCRIPTION="The makefile package is a simple, powerful and extensible way to write makefiles for a GNUstep-based project."
+HOMEPAGE="http://www.gnustep.org"
+
+KEYWORDS="~x86 ~ppc ~amd64 ~sparc ~alpha"
+SLOT="0"
+LICENSE="GPL-2"
+
+IUSE="${IUSE} doc layout-from-conf-file layout-osx-like non-flattened"
+DEPEND="${GNUSTEP_CORE_DEPEND}
+	>=sys-devel/make-3.75
+	${DOC_DEPEND}"
+RDEPEND="${DEPEND}
+	${DOC_RDEPEND}"
+
+egnustep_install_domain "System"
+
+pkg_setup() {
+	gnustep_pkg_setup
+
+	# okay, I couldn't figure out how to check if a dependency was
+	#  compiled with a specific use flag, so we do it ./configure
+	#  check-for-lib style ...
+	gcc ${FILESDIR}/helloworld.m -o $TMP/helloworld -lobjc || die \
+		"gcc must be compiled with Objective-C support! See the objc USE flag."
+
+	if use layout-from-conf-file && use layout-osx-like ; then
+		eerror "layout-from-conf-file and layout-osx-like are mutually exclusive use flags."
+		die "USE flag misconfiguration -- please correct"
+	fi
+
+	if use layout-from-conf-file || use layout-osx-like ; then
+		ewarn "USE layout-from-conf-file || layout-osx-like"
+		ewarn "Utilizing these USE flags allows one to install files in non standard"
+		ewarn "  locations vis a vis the Linux FHS -- please fully comprehend what you"
+		ewarn "  are doing when setting this USE flag."
+	fi
+
+	if use layout-from-conf-file; then
+		if [ ! -f /etc/conf.d/gnustep.env ]; then
+			eerror "There is no /etc/conf.d/gnustep.env file!"
+			eerror "Did you read the USE flag description?"
+			die "USE flag misconfiguration -- please correct"
+		else
+			unset GNUSTEP_SYSTEM_ROOT
+			unset GNUSTEP_LOCAL_ROOT
+			unset GNUSTEP_NETWORK_ROOT
+			unset GNUSTEP_USER_ROOT
+			. /etc/conf.d/gnustep.env
+			if [ -z "${GNUSTEP_SYSTEM_ROOT}" ] || [ "/" != "${GNUSTEP_SYSTEM_ROOT:0:1}" ]; then
+				eerror "GNUSTEP_SYSTEM_ROOT is missing or misconfigured in /etc/conf.d/gnustep.env"
+				eerror "GNUSTEP_SYSTEM_ROOT=${GNUSTEP_SYSTEM_ROOT}"
+				die "USE flag misconfiguration -- please correct"
+			fi
+			if [ "/System" != ${GNUSTEP_SYSTEM_ROOT:$((${#GNUSTEP_SYSTEM_ROOT}-7)):7} ]; then
+				eerror "GNUSTEP_SYSTEM_ROOT must end with \"System\" -- read the USE flag directions!!!"
+				die "USE flag misconfiguration -- please correct"
+			fi
+			if [ "${GNUSTEP_LOCAL_ROOT}" ] && [ "/" != "${GNUSTEP_LOCAL_ROOT:0:1}" ]; then
+				eerror "GNUSTEP_LOCAL_ROOT is misconfigured in /etc/conf.d/gnustep.env"
+				eerror "GNUSTEP_LOCAL_ROOT=${GNUSTEP_LOCAL_ROOT}"
+				die "USE flag misconfiguration -- please correct"
+			elif [ -z "${GNUSTEP_LOCAL_ROOT}" ]; then
+				GNUSTEP_LOCAL_ROOT="$(dirname ${GNUSTEP_SYSTEM_ROOT})/Local"
+			fi
+			if [ "${GNUSTEP_NETWORK_ROOT}" ] && [ "/" != "${GNUSTEP_NETWORK_ROOT:0:1}" ]; then
+				eerror "GNUSTEP_NETWORK_ROOT is misconfigured in /etc/conf.d/gnustep.env"
+				eerror "GNUSTEP_NETWORK_ROOT=${GNUSTEP_NETWORK_ROOT}"
+				die "USE flag misconfiguration -- please correct"
+			elif [ -z "${GNUSTEP_NETWORK_ROOT}" ]; then
+				GNUSTEP_NETWORK_ROOT="$(dirname ${GNUSTEP_SYSTEM_ROOT})/Network"
+			fi
+			if [ "${GNUSTEP_USER_ROOT}" ] && [ '~' != "${GNUSTEP_USER_ROOT:0:1}" ]; then
+				eerror "GNUSTEP_USER_ROOT is misconfigured in /etc/conf.d/gnustep.env"
+				eerror "GNUSTEP_USER_ROOT=${GNUSTEP_USER_ROOT}"
+				die "USE flag misconfiguration -- please correct"
+			elif [ -z "${GNUSTEP_USER_ROOT}" ]; then
+				GNUSTEP_USER_ROOT='~/GNUstep'
+			fi
+
+			egnustep_prefix "$(dirname ${GNUSTEP_SYSTEM_ROOT})"
+			egnustep_system_root "${GNUSTEP_SYSTEM_ROOT}"
+			egnustep_local_root "${GNUSTEP_LOCAL_ROOT}"
+			egnustep_network_root "${GNUSTEP_NETWORK_ROOT}"
+			egnustep_user_root "${GNUSTEP_USER_ROOT}"
+		fi
+	elif use layout-osx-like; then
+		egnustep_prefix "/"
+		egnustep_system_root "/System"
+		egnustep_local_root "/"
+		egnustep_network_root "/Network"
+		egnustep_user_root '~'
+	else
+		# setup defaults here
+		egnustep_prefix "/usr/GNUstep"
+		egnustep_system_root "/usr/GNUstep/System"
+		egnustep_local_root "/usr/GNUstep/Local"
+		egnustep_network_root "/usr/GNUstep/Network"
+		egnustep_user_root '~/GNUstep'
+	fi
+
+	einfo "GNUstep installation will be laid out thusly:"
+	einfo "\tGNUSTEP_SYSTEM_ROOT=`egnustep_system_root`"
+	einfo "\tGNUSTEP_LOCAL_ROOT=`egnustep_local_root`"
+	einfo "\tGNUSTEP_NETWORK_ROOT=`egnustep_network_root`"
+	einfo "\tGNUSTEP_USER_ROOT=`egnustep_user_root`"
+	ebeep
+	epause 10
+}
+
+src_unpack() {
+	cvs_src_unpack
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/make-user-defaults.patch-1.10.0
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/GNUstep-reset.sh.patch
+}
+
+src_compile() {
+	cd ${S}
+
+	# gnustep-make ./configure : "prefix" here is going to be where
+	#  "System" is installed -- other correct paths should be set
+	#  by econf
+	local myconf
+	myconf="--prefix=`egnustep_prefix`"
+	use non-flattened && myconf="$myconf --disable-flattened"
+	myconf="$myconf --with-tar=/bin/tar"
+	myconf="$myconf --with-local-root=`egnustep_local_root`"
+	myconf="$myconf --with-network-root=`egnustep_network_root`"
+	myconf="$myconf --with-user-root=`egnustep_user_root`"
+	econf $myconf || die "configure failed"
+
+	egnustep_make
+}
+
+src_install() {
+	. ${S}/GNUstep.sh
+
+	if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then
+		local make_eval="INSTALL_ROOT=\${D} \
+		GNUSTEP_SYSTEM_ROOT=\${D}\$(egnustep_system_root) \
+		GNUSTEP_NETWORK_ROOT=\${D}\$(egnustep_network_root) \
+		GNUSTEP_LOCAL_ROOT=\${D}\$(egnustep_local_root) \
+		GNUSTEP_MAKEFILES=\${D}\$(egnustep_system_root)/Library/Makefiles \
+		GNUSTEP_USER_ROOT=\${TMP} \
+		GNUSTEP_DEFAULTS_ROOT=\${TMP}/\${__GS_USER_ROOT_POSTFIX} \
+		-j1"
+
+		if use debug ; then
+			make_eval="${make_eval} debug=yes"
+		fi
+		if use verbose ; then
+			make_eval="${make_eval} verbose=yes"
+		fi
+		eval emake ${make_eval} install || die "install has failed"
+	else
+		die "no Makefile found"
+	fi
+
+	if use doc ; then
+		cd Documentation
+		eval emake ${make_eval} all || die "doc make has failed"
+		eval emake ${make_eval} install || die "doc install has failed"
+		cd ..
+	fi
+
+	dodir /etc/conf.d
+	echo "GNUSTEP_SYSTEM_ROOT=$(egnustep_system_root)" > ${D}/etc/conf.d/gnustep.env
+	echo "GNUSTEP_LOCAL_ROOT=$(egnustep_local_root)" >> ${D}/etc/conf.d/gnustep.env
+	echo "GNUSTEP_NETWORK_ROOT=$(egnustep_network_root)" >> ${D}/etc/conf.d/gnustep.env
+	echo "GNUSTEP_USER_ROOT='$(egnustep_user_root)'" >> ${D}/etc/conf.d/gnustep.env
+}
+
diff --git a/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041030.ebuild b/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041030.ebuild
index 77ae3afad55b..99f53028413b 100644
--- a/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041030.ebuild
+++ b/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041030.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041030.ebuild,v 1.2 2004/11/02 17:26:48 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041030.ebuild,v 1.3 2004/11/12 03:46:56 fafhrd Exp $
 
 ECVS_CVS_COMMAND="cvs -q"
 ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
@@ -17,7 +17,7 @@ S=${WORKDIR}/${ECVS_MODULE}
 DESCRIPTION="The makefile package is a simple, powerful and extensible way to write makefiles for a GNUstep-based project."
 HOMEPAGE="http://www.gnustep.org"
 
-KEYWORDS="~ppc ~amd64"
+KEYWORDS="~x86 ~ppc ~amd64 ~sparc ~alpha"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/gnustep-base/gnustep-make/gnustep-make-1.3.4.ebuild b/gnustep-base/gnustep-make/gnustep-make-1.3.4.ebuild
deleted file mode 100644
index 45cc56a0108b..000000000000
--- a/gnustep-base/gnustep-make/gnustep-make-1.3.4.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-1.3.4.ebuild,v 1.1 2004/07/23 13:51:21 fafhrd Exp $
-
-IUSE=""
-
-DESCRIPTION="GNUstep makefile package (unstable)"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="x86 sparc "
-SLOT="0"
-
-DEPEND="virtual/libc
-	>=sys-devel/gcc-3.1
-	>=dev-libs/ffcall-1.8d
-	>=dev-libs/gmp-3.1.1
-	>=dev-util/guile-1.4
-	>=dev-libs/openssl-0.9.6d
-	>=media-libs/tiff-3.5.7-r1
-	>=dev-libs/libxml2-2.4.22"
-
-src_compile() {
-	./configure \
-		--host=${CHOST} || die "./configure failed"
-	emake || die
-}
-
-src_install () {
-	dodir   /usr/GNUstep/System \
-		/usr/GNUstep/System/Makefiles \
-		/usr/GNUstep/System/Makefiles/ix86 \
-		/usr/GNUstep/System/Makefiles/ix86/linux-gnu \
-		/usr/GNUstep/System/Makefiles/Additional \
-		/usr/GNUstep/System/Makefiles/Master \
-		/usr/GNUstep/System/Makefiles/Instance \
-		/usr/GNUstep/System/Makefiles/Instance/Shared \
-		/usr/GNUstep/System/Tools \
-		/usr/GNUstep/System/share \
-		/usr/GNUstep/System/Applications \
-		/usr/GNUstep/System/Libraries/ix86/linux-gnu/gnu-gnu-gnu \
-		/usr/GNUstep/System/Libraries/Resources \
-		/usr/GNUstep/System/Libraries/Java \
-		/usr/GNUstep/System/Headers/ix86/linux-gnu \
-		/usr/GNUstep/System/Tools/ix86/linux-gnu/gnu-gnu-gnu \
-		/usr/GNUstep/System/Tools/Java \
-		/usr/GNUstep/System/Library/Bundles \
-		/usr/GNUstep/System/Library/Colors \
-		/usr/GNUstep/System/Library/Frameworks \
-		/usr/GNUstep/System/Library/PostScript \
-		/usr/GNUstep/System/Library/Services \
-		/usr/GNUstep/System/Documentation/Developer \
-		/usr/GNUstep/System/Documentation/User \
-		/usr/GNUstep/System/Documentation/info \
-		/usr/GNUstep/System/Documentation/man \
-		/usr/GNUstep/System/Developer/Palettes \
-		/usr/GNUstep/Local/Applications \
-		/usr/GNUstep/Local/Libraries/ix86/linux-gnu/gnu-gnu-gnu \
-		/usr/GNUstep/Local/Libraries/Resources \
-		/usr/GNUstep/Local/Libraries/Java \
-		/usr/GNUstep/Local/Headers/ix86/linux-gnu \
-		/usr/GNUstep/Local/Tools/ix86/linux-gnu/gnu-gnu-gnu \
-		/usr/GNUstep/Local/Tools/Java \
-		/usr/GNUstep/Local/Library/Bundles \
-		/usr/GNUstep/Local/Library/Colors \
-		/usr/GNUstep/Local/Library/Frameworks \
-		/usr/GNUstep/Local/Library/PostScript \
-		/usr/GNUstep/Local/Library/Services \
-		/usr/GNUstep/Local/Documentation/Developer \
-		/usr/GNUstep/Local/Documentation/User \
-		/usr/GNUstep/Local/Developer/Palettes \
-		/usr/GNUstep/Local/Users \
-		/usr/GNUstep/Local/Users/Administrator \
-		/usr/GNUstep/Network
-
-	insinto /usr/GNUstep/System/Makefiles/ix86/linux-gnu
-	insopts -m 755
-	doins which_lib user_home
-
-	insinto /usr/GNUstep/System/Makefiles
-	insopts -m 755
-	doins config.guess config.sub install-sh mkinstalldirs \
-		clean_cpu.sh clean_os.sh clean_vendor.sh cpu.sh \
-		ld_lib_path.sh os.sh transform_paths.sh vendor.sh \
-		ld_lib_path.csh fixpath.sh relative_path.sh \
-		GNUstep.sh GNUstep-reset.sh GNUstep.csh
-
-	insinto /usr/GNUstep/System/Tools
-	insopts -m 755
-	doins openapp debugapp opentool
-
-	insinto /usr/GNUstep/System/Makefiles
-	insopts -m 644
-	doins aggregate.make application.make bundle.make service.make \
-		common.make library-combo.make java.make jni.make \
-		library.make rules.make target.make names.make \
-		resource-set.make tool.make ctool.make test-library.make \
-		objc.make test-application.make test-tool.make \
-		subproject.make palette.make gswapp.make gswbundle.make \
-		clibrary.make documentation.make java-executable.template \
-		java-tool.make framework.make spec-rules.template \
-		spec-debug-rules.template spec-debug-alone-rules.template \
-		executable.template messages.make
-
-	cd ./Master
-	insinto /usr/GNUstep/System/Makefiles/Master
-	insopts -m 644
-	doins aggregate.make source-distribution.make rpm.make rules.make \
-		application.make bundle.make clibrary.make ctool.make \
-		documentation.make framework.make gswapp.make \
-		gswbundle.make 	library.make objc.make java.make \
-		java-tool.make palette.make resource-set.make service.make \
-		subproject.make test-application.make test-library.make \
-		test-tool.make tool.make
-
-	cd ../Instance
-	insinto /usr/GNUstep/System/Makefiles/Instance
-	insopts -m 644
-	doins rules.make application.make bundle.make clibrary.make \
-		ctool.make documentation.make framework.make gswapp.make \
-		gswbundle.make library.make objc.make java.make \
-		java-tool.make palette.make resource-set.make service.make \
-		subproject.make test-application.make test-library.make \
-		test-tool.make tool.make
-
-	cd ./Shared
-	insinto /usr/GNUstep/System/Makefiles/Instance/Shared
-	insopts -m 644
-	doins bundle.make headers.make java.make
-
-	cd ../../
-	insinto /usr/GNUstep/System/share
-	insopts -m 644
-	doins config.site
-
-	insinto /usr/GNUstep/System/Makefiles/ix86/linux-gnu
-	insopts -m 644
-	doins config.make
-}
diff --git a/gnustep-base/gnustep-make/gnustep-make-1.5.1.ebuild b/gnustep-base/gnustep-make/gnustep-make-1.5.1.ebuild
deleted file mode 100644
index 48ef2579a812..000000000000
--- a/gnustep-base/gnustep-make/gnustep-make-1.5.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-1.5.1.ebuild,v 1.1 2004/07/23 13:51:21 fafhrd Exp $
-
-IUSE=""
-
-DESCRIPTION="GNUstep makefile package (unstable)"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="x86 ~sparc"
-SLOT="0"
-
-DEPEND="virtual/libc
-	>=sys-devel/gcc-3.1
-	>=dev-libs/ffcall-1.8d
-	>=dev-libs/gmp-4.1
-	>=dev-util/guile-1.4
-	>=dev-libs/openssl-0.9.6g
-	>=media-libs/tiff-3.5.7-r1
-	>=dev-libs/libxml2-2.4.22
-	>=media-libs/audiofile-0.2.3"
-
-src_compile() {
-	./configure \
-		--host=${CHOST} || die "./configure failed"
-	emake || die
-}
-
-src_install () {
-	make \
-	GNUSTEP_SYSTEM_ROOT=${D}/usr/GNUstep/System \
-	GNUSTEP_LOCAL_ROOT=${D}/usr/GNUstep/Local \
-	GNUSTEP_NETWORK_ROOT=${D}/usr/GNUstep/Network \
-	install || die "install failed"
-}
diff --git a/gnustep-base/gnustep-make/gnustep-make-1.6.0.ebuild b/gnustep-base/gnustep-make/gnustep-make-1.6.0.ebuild
deleted file mode 100644
index 9761fe61caef..000000000000
--- a/gnustep-base/gnustep-make/gnustep-make-1.6.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-1.6.0.ebuild,v 1.1 2004/07/23 13:51:21 fafhrd Exp $
-
-IUSE=""
-
-DESCRIPTION="GNUstep makefile package"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 sparc"
-
-DEPEND="virtual/libc
-	>=sys-devel/gcc-3.2
-	>=dev-libs/ffcall-1.8d
-	>=dev-libs/gmp-4.1
-	>=dev-util/guile-1.6
-	>=dev-libs/openssl-0.9.6j
-	>=media-libs/tiff-3.5.7-r1
-	>=dev-libs/libxml2-2.4.24
-	>=media-libs/audiofile-0.2.3"
-
-src_compile() {
-	./configure \
-		--prefix=/usr/GNUstep \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--host=${CHOST} || die "./configure failed"
-	make || die
-}
-
-src_install() {
-	make \
-	GNUSTEP_SYSTEM_ROOT=${D}/usr/GNUstep/System \
-	GNUSTEP_LOCAL_ROOT=${D}/usr/GNUstep/Local \
-	GNUSTEP_NETWORK_ROOT=${D}/usr/GNUstep/Network \
-	install || die "install failed"
-}
diff --git a/gnustep-base/gnustep-make/gnustep-make-1.7.1.ebuild b/gnustep-base/gnustep-make/gnustep-make-1.7.1.ebuild
deleted file mode 100644
index 5ac9bf450d83..000000000000
--- a/gnustep-base/gnustep-make/gnustep-make-1.7.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-1.7.1.ebuild,v 1.1 2004/07/23 13:51:21 fafhrd Exp $
-
-IUSE=""
-
-DESCRIPTION="GNUstep makefile package"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="-x86"
-
-DEPEND="virtual/libc
-	>=sys-devel/gcc-3.2
-	>=dev-libs/ffcall-1.8d
-	>=dev-libs/gmp-4.1
-	>=dev-util/guile-1.6
-	>=dev-libs/openssl-0.9.6j
-	>=media-libs/tiff-3.5.7-r1
-	>=dev-libs/libxml2-2.4.24
-	>=media-libs/audiofile-0.2.3"
-
-src_compile() {
-	./configure \
-		--prefix=/usr/GNUstep \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--host=${CHOST} || die "./configure failed"
-	make || die
-}
-
-src_install() {
-	make \
-	GNUSTEP_SYSTEM_ROOT=${D}/usr/GNUstep/System \
-	GNUSTEP_LOCAL_ROOT=${D}/usr/GNUstep/Local \
-	GNUSTEP_NETWORK_ROOT=${D}/usr/GNUstep/Network \
-	install || die "install failed"
-}
diff --git a/gnustep-base/gnustep-make/gnustep-make-1.7.2.ebuild b/gnustep-base/gnustep-make/gnustep-make-1.7.2.ebuild
deleted file mode 100644
index 3b27908175e8..000000000000
--- a/gnustep-base/gnustep-make/gnustep-make-1.7.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-1.7.2.ebuild,v 1.2 2004/09/06 00:13:49 ciaranm Exp $
-
-inherit eutils
-
-IUSE=""
-
-DESCRIPTION="GNUstep makefile package"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc alpha"
-
-DEPEND="virtual/libc
-	>=sys-devel/gcc-3.2
-	>=dev-libs/ffcall-1.8d
-	>=dev-libs/gmp-4.1
-	>=dev-util/guile-1.6
-	>=dev-libs/openssl-0.9.6j
-	>=media-libs/tiff-3.5.7-r1
-	>=dev-libs/libxml2-2.4.24
-	>=media-libs/audiofile-0.2.3"
-
-src_unpack() {
-	ewarn ""
-	ewarn "Unmerge previous versions of gnustep-make before upgrading"
-	ewarn "or you will have problems!"  See:
-	ewarn "http://bugs.gentoo.org/show_bug.cgi?id=24530"
-	ewarn ""
-	epause 5
-	unpack ${A}
-	cd ${S}
-}
-
-src_compile() {
-	./configure \
-		--prefix=/usr/GNUstep \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--host=${CHOST} || die "./configure failed"
-	make || die
-}
-
-src_install() {
-	make \
-	GNUSTEP_SYSTEM_ROOT=${D}/usr/GNUstep/System \
-	GNUSTEP_LOCAL_ROOT=${D}/usr/GNUstep/Local \
-	GNUSTEP_NETWORK_ROOT=${D}/usr/GNUstep/Network \
-	install || die "install failed"
-}