Remove old version

(Portage version: 2.1.3.7)

5 files changed, 6 insertions, 306 deletions

diff --git a/gnustep-base/gnustep-make/ChangeLog b/gnustep-base/gnustep-make/ChangeLog
index b7e754b9d476..05f5521b9cee 100644
--- a/gnustep-base/gnustep-make/ChangeLog
+++ b/gnustep-base/gnustep-make/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnustep-base/gnustep-make
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/ChangeLog,v 1.47 2007/09/06 15:28:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/ChangeLog,v 1.48 2007/09/06 23:03:48 voyageur Exp $
+
+  06 Sep 2007; Bernard Cafarelli <voyageur@gentoo.org>
+  -files/make-user-defaults.patch-1.10.0, -files/GNUstep-reset.sh.patch,
+  -gnustep-make-1.10.0-r2.ebuild:
+  Remove old version, bug #139385
 
   06 Sep 2007; Raúl Porcel <armin76@gentoo.org> gnustep-make-2.0.1.ebuild:
   Add ~alpha wrt #189372
diff --git a/gnustep-base/gnustep-make/files/GNUstep-reset.sh.patch b/gnustep-base/gnustep-make/files/GNUstep-reset.sh.patch
deleted file mode 100644
index 6c5dc422af94..000000000000
--- a/gnustep-base/gnustep-make/files/GNUstep-reset.sh.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- 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-r2 b/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.0-r2
deleted file mode 100644
index 40f09026a1ea..000000000000
--- a/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.0-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bfd0f6530b938e7ee1d5a300219a0ab3 gnustep-make-1.10.0.tar.gz 372852
-RMD160 37840590d11f9a3356cf4dcae2fb518f645ea478 gnustep-make-1.10.0.tar.gz 372852
-SHA256 5cfefb8253e0abe8ce6899cb26fe009f48b964ad98be4c8d454ef95c2f8407f7 gnustep-make-1.10.0.tar.gz 372852
diff --git a/gnustep-base/gnustep-make/files/make-user-defaults.patch-1.10.0 b/gnustep-base/gnustep-make/files/make-user-defaults.patch-1.10.0
deleted file mode 100644
index 025226dd367a..000000000000
--- a/gnustep-base/gnustep-make/files/make-user-defaults.patch-1.10.0
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -ur core/make/user_home.c core-adc/make/user_home.c
---- user_home.c	2004-02-23 23:02:41.000000000 -0500
-+++ user_home.c	2004-08-18 09:34:23.755365944 -0400
-@@ -316,6 +316,8 @@
- 
-       if (*user == '\0' || forceU == 0 || *defs == '\0' || forceD == 0)
- 	{
-+          char *env_var;
-+
- 	  strcpy(path, home);
- 	  strcat(path, SEP);
- 	  strcat(path, ".GNUsteprc");
-@@ -381,6 +383,21 @@
- 		}
- 	      fclose(fptr);
- 	    }
-+#if !defined(__MINGW__)
-+            /* if specified in the environment, as long as system does not override,
-+             * observe user environment variables for USER and DEFAULTS here
-+             */
-+	    if((0 == forceU) && (NULL != (env_var = getenv("GNUSTEP_USER_ROOT"))))
-+            {
-+		user = malloc(strlen(env_var) + 1);
-+            	strcpy(user, env_var);
-+	    }
-+	    if((0 == forceD) && (NULL != (env_var = getenv("GNUSTEP_DEFAULTS_ROOT"))))
-+            {
-+		defs = malloc(strlen(env_var) + 1);
-+            	strcpy(defs, env_var);
-+	    }
-+#endif
- 	}
- 
-       if (type == DEFS)
-@@ -402,6 +419,15 @@
- 	  strcat(path, SEP);
- 	  strcat(path, "GNUstep");
- 	}
-+
-+      if (*defs != '\0')
-+        {
-+          free(defs);
-+        }
-+      if (*user != '\0')
-+        {
-+          free(user);
-+        }
-     }
- #if defined(__MINGW__)
-   /*
diff --git a/gnustep-base/gnustep-make/gnustep-make-1.10.0-r2.ebuild b/gnustep-base/gnustep-make/gnustep-make-1.10.0-r2.ebuild
deleted file mode 100644
index b061fa6d5fc3..000000000000
--- a/gnustep-base/gnustep-make/gnustep-make-1.10.0-r2.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2007 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-r2.ebuild,v 1.11 2007/07/12 16:11:17 mr_bones_ 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="~alpha amd64 ppc sparc x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-# doc is broken
-IUSE="debug layout-from-conf-file layout-osx-like non-flattened verbose"
-DEPEND="${GNUSTEP_CORE_DEPEND}
-	>=sys-devel/make-3.75"
-RDEPEND="${DEPEND}
-	${DOC_RDEPEND}"
-
-egnustep_install_domain "System"
-
-pkg_setup() {
-	gnustep_pkg_setup
-
-	if [ "$(objc_available)" == "no" ]; then
-		objc_not_available_info
-		die "ObjC support not available"
-	fi
-
-	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
-		elog "GNUstep installation will be laid out thusly:"
-		elog "\tGNUSTEP_SYSTEM_ROOT=`egnustep_system_root`"
-		elog "\tGNUSTEP_LOCAL_ROOT=`egnustep_local_root`"
-		elog "\tGNUSTEP_NETWORK_ROOT=`egnustep_network_root`"
-		elog "\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
-}