Updated to use GENTOO_GNUSTEP_ROOT variable from gnustep.eclass

7 files changed, 31 insertions, 19 deletions

diff --git a/gnustep-base/gnustep-env/ChangeLog b/gnustep-base/gnustep-env/ChangeLog
index ef8da06f6e20..1d245ed4d67a 100644
--- a/gnustep-base/gnustep-env/ChangeLog
+++ b/gnustep-base/gnustep-env/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnustep-base/gnustep-env
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-env/ChangeLog,v 1.4 2004/09/24 01:05:12 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-env/ChangeLog,v 1.5 2004/10/04 01:17:44 fafhrd Exp $
+
+*gnustep-env-0.1.4 (03 Oct 2004)
+
+  03 Oct 2004; Armando Di Cianno <fafhrd@gentoo.org> files/gnustep.env-0.1.4,
+  files/gnustep.runscript-0.1.4, gnustep-env-0.1.4.ebuild:
+  Updated to use GENTOO_GNUSTEP_ROOT variable from gnustep.eclass
 
   25 Jul 2004; Lina Pezzella <burgundy@gentoo.org> :
   Fixed Manifest.
diff --git a/gnustep-base/gnustep-env/files/gnustep.env-0.1.4 b/gnustep-base/gnustep-env/files/gnustep.env-0.1.4
index c98548a749de..4c66c0c916cb 100644
--- a/gnustep-base/gnustep-env/files/gnustep.env-0.1.4
+++ b/gnustep-base/gnustep-env/files/gnustep.env-0.1.4
@@ -1,3 +1,3 @@
-MANPATH="/usr/GNUstep/System/Library/Documentation/man:/usr/GNUstep/Local/Library/Documentation/man:/usr/GNUstep/Network/Library/Documentation/man"
-INFODIR="/usr/GNUstep/System/Library/Documentation/info:/usr/GNUstep/Local/Library/Documentation/info:/usr/GNUstep/Network/Library/Documentation/info"
-INFOPATH="/usr/GNUstep/System/Library/Documentation/info:/usr/GNUstep/Local/Library/Documentation/info:/usr/GNUstep/Network/Library/Documentation/info"
+MANPATH="XXX_GENTOO_GNUSTEP_ROOT_XXX/System/Library/Documentation/man:XXX_GENTOO_GNUSTEP_ROOT_XXX/Local/Library/Documentation/man:XXX_GENTOO_GNUSTEP_ROOT_XXX/Network/Library/Documentation/man"
+INFODIR="XXX_GENTOO_GNUSTEP_ROOT_XXX/System/Library/Documentation/info:XXX_GENTOO_GNUSTEP_ROOT_XXX/Local/Library/Documentation/info:XXX_GENTOO_GNUSTEP_ROOT_XXX/Network/Library/Documentation/info"
+INFOPATH="XXX_GENTOO_GNUSTEP_ROOT_XXX/System/Library/Documentation/info:XXX_GENTOO_GNUSTEP_ROOT_XXX/Local/Library/Documentation/info:XXX_GENTOO_GNUSTEP_ROOT_XXX/Network/Library/Documentation/info"
diff --git a/gnustep-base/gnustep-env/files/gnustep.runscript-0.1.4 b/gnustep-base/gnustep-env/files/gnustep.runscript-0.1.4
index eac8f01a12d9..57d3092deabd 100644
--- a/gnustep-base/gnustep-env/files/gnustep.runscript-0.1.4
+++ b/gnustep-base/gnustep-env/files/gnustep.runscript-0.1.4
@@ -6,7 +6,7 @@
 # Modifications, truncation, and gentoo-ification:
 # Copyright 2004 Gentoo Technologies, Inc.
 
-GNUSTEP_SYSTEM_ROOT="/usr/GNUstep/System"
+GNUSTEP_SYSTEM_ROOT="XXX_GENTOO_GNUSTEP_ROOT_XXX/System"
 . ${GNUSTEP_SYSTEM_ROOT}/Library/Makefiles/GNUstep.sh
 TOOLS="${GNUSTEP_SYSTEM_ROOT}/Tools"
 
diff --git a/gnustep-base/gnustep-env/gnustep-env-0.1.4.ebuild b/gnustep-base/gnustep-env/gnustep-env-0.1.4.ebuild
index 83170f7bfd9a..c4fb1878f225 100644
--- a/gnustep-base/gnustep-env/gnustep-env-0.1.4.ebuild
+++ b/gnustep-base/gnustep-env/gnustep-env-0.1.4.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-env/gnustep-env-0.1.4.ebuild,v 1.1 2004/09/24 01:05:12 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-env/gnustep-env-0.1.4.ebuild,v 1.2 2004/10/04 01:17:44 fafhrd Exp $
 
 inherit gnustep
 
@@ -27,8 +27,10 @@ src_compile() {
 src_install() {
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/gnustep.runscript-${PV} gnustep
+	dosed "s:XXX_GENTOO_GNUSTEP_ROOT_XXX:${GENTOO_GNUSTEP_ROOT}:g" /etc/init.d/gnustep
 	insinto /etc/env.d
 	newins ${FILESDIR}/gnustep.env-${PV} 99gnustep
+	dosed "s:XXX_GENTOO_GNUSTEP_ROOT_XXX:${GENTOO_GNUSTEP_ROOT}:g" /etc/env.d/99gnustep
 	dodir /var/run/GNUstep
 	einfo "Check http://dev.gentoo.org/~fafhrd/ for very handy info in setting up your GNUstep env."
 }
diff --git a/gnustep-base/gnustep-make/ChangeLog b/gnustep-base/gnustep-make/ChangeLog
index fbf5f407fe41..d2297f1c3cab 100644
--- a/gnustep-base/gnustep-make/ChangeLog
+++ b/gnustep-base/gnustep-make/ChangeLog
@@ -1,6 +1,10 @@
 # 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.6 2004/09/28 17:50:02 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/ChangeLog,v 1.7 2004/10/04 01:17:28 fafhrd Exp $
+
+  03 Oct 2004; Armando Di Cianno <fafhrd@gentoo.org>
+  gnustep-make-1.10.0.ebuild, gnustep-make-1.10.1_pre20040928.ebuild:
+  Updated to use GENTOO_GNUSTEP_ROOT variable from gnustep.eclass
 
 *gnustep-make-1.10.1_pre20040927 (28 Sep 2004)
 
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 faa2ac828318..27413d033bbc 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.1 2004/09/24 01:03:52 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-1.10.0.ebuild,v 1.2 2004/10/04 01:17:28 fafhrd Exp $
 
 inherit gnustep
 
@@ -37,8 +37,8 @@ src_unpack() {
 src_compile() {
 	cd ${S}
 
-	myconf="--prefix=/usr/GNUstep"
-	myconf="$myconf --with-network-root=/usr/GNUstep/Network"
+	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"
 
@@ -66,19 +66,19 @@ src_install() {
 		die "no Makefile found"
 	fi
 
-	. ${D}usr/GNUstep/System/Library/Makefiles/GNUstep.sh
+	. ${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}usr/GNUstep/System/Library/Makefiles \
+			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}usr/GNUstep/System/Library/Makefiles \
+			GNUSTEP_MAKEFILES=${D}${GENTOO_GNUSTEP_ROOT}/System/Library/Makefiles \
 			GNUSTEP_USER_ROOT=${TMP}/GNUstep \
 			GNUSTEP_DEFAULTS_ROOT=${TMP}/GNUstep \
 			install || die "doc install failed"
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
index 00e6a65d9609..542370e0aa37 100644
--- a/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20040928.ebuild
+++ b/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20040928.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_pre20040928.ebuild,v 1.1 2004/09/28 17:50:02 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20040928.ebuild,v 1.2 2004/10/04 01:17:28 fafhrd Exp $
 
 ECVS_CVS_COMMAND="cvs -q"
 ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
@@ -46,8 +46,8 @@ src_unpack() {
 src_compile() {
 	cd ${S}
 
-	myconf="--prefix=/usr/GNUstep"
-	myconf="$myconf --with-network-root=/usr/GNUstep/Network"
+	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"
 
@@ -75,19 +75,19 @@ src_install() {
 		die "no Makefile found"
 	fi
 
-	. ${D}usr/GNUstep/System/Library/Makefiles/GNUstep.sh
+	. ${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}usr/GNUstep/System/Library/Makefiles \
+			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}usr/GNUstep/System/Library/Makefiles \
+			GNUSTEP_MAKEFILES=${D}${GENTOO_GNUSTEP_ROOT}/System/Library/Makefiles \
 			GNUSTEP_USER_ROOT=${TMP}/GNUstep \
 			GNUSTEP_DEFAULTS_ROOT=${TMP}/GNUstep \
 			install || die "doc install failed"