Adding a config file and profile.d profiles (thanks to Dmitry S. Kulyabov, bug #117187)

Package-Manager: portage-2.1_pre6-r5

6 files changed, 97 insertions, 35 deletions

diff --git a/gnustep-base/gnustep-make/ChangeLog b/gnustep-base/gnustep-make/ChangeLog
index fa065e112465..f4255c49a819 100644
--- a/gnustep-base/gnustep-make/ChangeLog
+++ b/gnustep-base/gnustep-make/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnustep-base/gnustep-make
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/ChangeLog,v 1.30 2006/03/19 12:37:33 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/ChangeLog,v 1.31 2006/03/26 07:55:25 grobian Exp $
+
+*gnustep-make-1.12.0-r1 (26 Mar 2006)
+
+  26 Mar 2006; Fabian Groffen <grobian@gentoo.org> +files/gnustep.csh,
+  +files/gnustep.sh, -gnustep-make-1.12.0.ebuild,
+  +gnustep-make-1.12.0-r1.ebuild:
+  Adding a config file and profile.d profiles (thanks to Dmitry S. Kulyabov,
+  bug #117187)
 
 *gnustep-make-1.12.0 (19 Mar 2006)
 
diff --git a/gnustep-base/gnustep-make/Manifest b/gnustep-base/gnustep-make/Manifest
index c2adca4e0ed3..e588c285e3cb 100644
--- a/gnustep-base/gnustep-make/Manifest
+++ b/gnustep-base/gnustep-make/Manifest
@@ -1,24 +1,30 @@
-MD5 a391bd2d9b7baf28ad8e21a237d081e3 ChangeLog 8724
-RMD160 7d9787c0c61fc7d2c511aff394d3438421b96e3c ChangeLog 8724
-SHA256 a50a90c8966a009e36dff2c1a61fa107b85a207e68d51565ca8f9c5fa58616ec ChangeLog 8724
+MD5 17c113faebebdf8078a1f833e56c6303 ChangeLog 9011
+RMD160 3e28f12bd1aacd7bb96d0ae9a523342bb3c45a73 ChangeLog 9011
+SHA256 6a3afd719d0b092e2a9201c2452d6ba582fba6572556ec50c34a04f1e016e583 ChangeLog 9011
 MD5 ff55be8ebf757b97d823bb3cf08b8bc4 files/GNUstep-reset.sh.patch 2121
 RMD160 28277890445caebf91a33ccc7c2a2c68bc639625 files/GNUstep-reset.sh.patch 2121
 SHA256 367ba567a979bc89feb65da860086c40e6494bb12a508c7071480c4d5d32109b files/GNUstep-reset.sh.patch 2121
 MD5 c36de529232a90d59d558662fed9d71c files/digest-gnustep-make-1.10.0-r2 259
 RMD160 0163f88e9c853482f29ebaf85687fd857d69b594 files/digest-gnustep-make-1.10.0-r2 259
 SHA256 34258ffa932e24320ffa992da5306aa720b9a0c1b06401a303b7e9a8c9eb1157 files/digest-gnustep-make-1.10.0-r2 259
-MD5 855e57587d5b019bd54362a05d5711e1 files/digest-gnustep-make-1.12.0 259
-RMD160 dc6ec0943ce49690e9de451861b314994a458837 files/digest-gnustep-make-1.12.0 259
-SHA256 bc703b58d8a8aa61d28957c1d2dcb12e7fd3ec189c1d545205e1d86007426ee4 files/digest-gnustep-make-1.12.0 259
+MD5 855e57587d5b019bd54362a05d5711e1 files/digest-gnustep-make-1.12.0-r1 259
+RMD160 dc6ec0943ce49690e9de451861b314994a458837 files/digest-gnustep-make-1.12.0-r1 259
+SHA256 bc703b58d8a8aa61d28957c1d2dcb12e7fd3ec189c1d545205e1d86007426ee4 files/digest-gnustep-make-1.12.0-r1 259
+MD5 c2aafc7c2bbd94b6d7d25ddec388af7e files/gnustep.csh 550
+RMD160 9c9f95980119f326dc0435e0bd1aab22c6e215ff files/gnustep.csh 550
+SHA256 4e35fccbb237b1ab5d9a7e35cc52e1c9455223c36162314e1bbadd7ea5df1f89 files/gnustep.csh 550
+MD5 e79a8c483884e15054c140f9e2cc3aaa files/gnustep.sh 445
+RMD160 c7ebec6201ca3df8447a17c26d3007fc281b1141 files/gnustep.sh 445
+SHA256 de8869e6468c0b19eae087273d05433c1c6edbefb57d4599a4149c2a1f9e660d files/gnustep.sh 445
 MD5 fdb13360dfc78ccdc3c75a5da84b46ab files/make-user-defaults.patch-1.10.0 1282
 RMD160 de8087d46cf0f7e6b0efa0aaff6424cb4101f296 files/make-user-defaults.patch-1.10.0 1282
 SHA256 5e7f5092e233784015394c046e3aa8ab8201f2444c6df761f6f787e585a773c7 files/make-user-defaults.patch-1.10.0 1282
 MD5 853224344b40a604ac9779f275d2efca gnustep-make-1.10.0-r2.ebuild 6449
 RMD160 a9912eeb0a4ca82fba2e14a52c7cc32c1b763ebc gnustep-make-1.10.0-r2.ebuild 6449
 SHA256 730d9a1a7edcd8e22e856a2bcc4fd9fd6ec798f3120392b64b800577e889bc4a gnustep-make-1.10.0-r2.ebuild 6449
-MD5 031bb326c74b9ab1cf3432632cc0e7ee gnustep-make-1.12.0.ebuild 6279
-RMD160 53a1857e30980bd3e456b79305524ca1fc175b6c gnustep-make-1.12.0.ebuild 6279
-SHA256 229c4c642bf32ea5504448340e83964d69c44477d416b429b6fddf8417ed05da gnustep-make-1.12.0.ebuild 6279
+MD5 3b475dd1af26a9522042b5bdcbb3c431 gnustep-make-1.12.0-r1.ebuild 6414
+RMD160 191c728574a1bf416c0765f51e905825d6ca0978 gnustep-make-1.12.0-r1.ebuild 6414
+SHA256 88e50a4064e74c82b2b000c584544ff083c9d696d2fadc2fad9d0b8ff094e2e3 gnustep-make-1.12.0-r1.ebuild 6414
 MD5 ca04d409726e17e7151b832de9989a48 metadata.xml 530
 RMD160 00cac411a415bf03b7834a2245da74bfffc46844 metadata.xml 530
 SHA256 0b45770527e32829be622d108ef32a5022eed02b767778fe23e91a34f6b575c9 metadata.xml 530
diff --git a/gnustep-base/gnustep-make/files/digest-gnustep-make-1.12.0 b/gnustep-base/gnustep-make/files/digest-gnustep-make-1.12.0-r1
index 6cd41c3e7143..6cd41c3e7143 100644
--- a/gnustep-base/gnustep-make/files/digest-gnustep-make-1.12.0
+++ b/gnustep-base/gnustep-make/files/digest-gnustep-make-1.12.0-r1
diff --git a/gnustep-base/gnustep-make/files/gnustep.csh b/gnustep-base/gnustep-make/files/gnustep.csh
new file mode 100644
index 000000000000..fbb176a23734
--- /dev/null
+++ b/gnustep-base/gnustep-make/files/gnustep.csh
@@ -0,0 +1,21 @@
+#!/bin/csh
+
+if ( -e /etc/GNUstep/GNUstep.conf ) then
+    eval `sed -e '/^[^#=][^#=]*=.*$/\\!d' -e 's/^\([^#=][^#=]*\)=\(.*\)$/setenv \1 \2;/' /etc/GNUstep/GNUstep.conf`
+else
+    GNUSTEP_SYSTEM_ROOT="/usr/GNUstep/System"
+endif
+
+source $GNUSTEP_SYSTEM_ROOT/Library/Makefiles/GNUstep.csh
+
+if ( -z "$GNUSTEP_FLATTENED" ) then
+    set TDIR=${GNUSTEP_SYSTEM_ROOT}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/${LIBRARY_COMBO}
+else
+    set TDIR=${GNUSTEP_SYSTEM_ROOT}/Tools
+endif
+
+if ( -x $TDIR/make_services ) then
+    $TDIR/make_services
+endif
+
+unset TDIR
\ No newline at end of file
diff --git a/gnustep-base/gnustep-make/files/gnustep.sh b/gnustep-base/gnustep-make/files/gnustep.sh
new file mode 100644
index 000000000000..7ffe0b692965
--- /dev/null
+++ b/gnustep-base/gnustep-make/files/gnustep.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+if [ -e /etc/GNUstep/GNUstep.conf ]
+    then
+    . /etc/GNUstep/GNUstep.conf
+else
+    GNUSTEP_SYSTEM_ROOT="/usr/GNUstep/System"
+fi
+
+. $GNUSTEP_SYSTEM_ROOT/Library/Makefiles/GNUstep.sh
+
+if [ -z "$GNUSTEP_FLATTENED" ] 
+    then
+    TDIR=${GNUSTEP_SYSTEM_ROOT}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/${LIBRARY_COMBO}
+else
+    TDIR=${GNUSTEP_SYSTEM_ROOT}/Tools
+fi
+
+if [ -x $TDIR/make_services ]
+    then
+    $TDIR/make_services
+fi
+
diff --git a/gnustep-base/gnustep-make/gnustep-make-1.12.0.ebuild b/gnustep-base/gnustep-make/gnustep-make-1.12.0-r1.ebuild
index ef17d6ee2ccc..5f25ee571ab7 100644
--- a/gnustep-base/gnustep-make/gnustep-make-1.12.0.ebuild
+++ b/gnustep-base/gnustep-make/gnustep-make-1.12.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.12.0.ebuild,v 1.1 2006/03/19 12:37:33 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-1.12.0-r1.ebuild,v 1.1 2006/03/26 07:55:25 grobian Exp $
 
 inherit gnustep
 
@@ -115,12 +115,6 @@ pkg_setup() {
 #	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}
 
@@ -129,12 +123,13 @@ src_compile() {
 	#  by econf
 	local myconf
 	myconf="--prefix=`egnustep_prefix`"
-	use non-flattened && myconf="$myconf --disable-flattened"
+	use non-flattened && myconf="$myconf --disable-flattened --enable-multi-platform"
 	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`"
 	myconf="$myconf --enable-strip-makefiles"
+	myconf="$myconf --disable-importing-config-file"
 	econf $myconf || die "configure failed"
 
 	egnustep_make
@@ -143,28 +138,30 @@ src_compile() {
 src_install() {
 	. ${S}/GNUstep.sh
 
-	if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then
-		local make_eval="\
-			special_prefix=\"\${D}\$(egnustep_system_root)\" \
-			makedir=\${D}\$(egnustep_system_root)/Library/Makefiles \
-			GNUSTEP_USER_ROOT=\${TMP} \
-			-j1"
+	local make_eval=" \
+		special_prefix=\"\${D}\$(egnustep_system_root)\" \
+		makedir=\${D}\$(egnustep_system_root)/Library/Makefiles \
+		GNUSTEP_USER_ROOT=\${T} \
+		GNUSTEP_INSTALLATION_DIR=\${D}\$(egnustep_system_root) \
+		-j1"
 
-		if use debug ; then
-			make_eval="${make_eval} debug=yes"
-		fi
-		if use verbose ; then
-			make_eval="${make_eval} verbose=yes"
-		fi
-		eval make ${make_eval} install || die "install has failed"
-	else
-		die "no Makefile found"
+	local docinstall="GNUSTEP_INSTALLATION_DIR=${D}$(egnustep_system_root)"
+
+	if use debug ; then
+		make_eval="${make_eval} debug=yes"
+	fi
+	if use verbose ; then
+		make_eval="${make_eval} verbose=yes"
 	fi
 
+	eval make ${make_eval} special_prefix=${D} install \
+		|| die "install has failed"
+
+# building documentation is broken
 #	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"
+#		emake ${make_eval} all || die "doc make has failed"
+#		make ${make_eval} ${docinstall} install || die "doc install has failed"
 #		cd ..
 #	fi
 
@@ -173,5 +170,12 @@ src_install() {
 	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
+
+	insinto /etc/GNUstep
+	doins ${S}/GNUstep.conf
+
+	exeinto /etc/profile.d
+	doexe ${FILESDIR}/gnustep.sh
+	doexe ${FILESDIR}/gnustep.csh
 }