Adding newest gnustep-make from GNUstep overlay, using new gnustep eclasses.

Package-Manager: portage-2.1.2.11

7 files changed, 175 insertions, 5 deletions

diff --git a/gnustep-base/gnustep-make/ChangeLog b/gnustep-base/gnustep-make/ChangeLog
index f944ad25dd55..0da4d9d47d78 100644
--- a/gnustep-base/gnustep-make/ChangeLog
+++ b/gnustep-base/gnustep-make/ChangeLog
@@ -1,6 +1,13 @@
 # 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.43 2007/03/18 01:33:13 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/ChangeLog,v 1.44 2007/08/18 13:26:56 grobian Exp $
+
+*gnustep-make-2.0.1 (18 Aug 2007)
+
+  18 Aug 2007; Fabian Groffen <grobian@gentoo.org>
+  +files/gnustep-make-2.0.1-destdir.patch, +files/gnustep-2.csh,
+  +files/gnustep-2.sh, +gnustep-make-2.0.1.ebuild:
+  Adding newest gnustep-make from GNUstep overlay, using new gnustep eclasses.
 
   18 Mar 2007; Marius Mauch <genone@gentoo.org>
   gnustep-make-1.10.0-r2.ebuild, gnustep-make-1.12.0-r1.ebuild,
diff --git a/gnustep-base/gnustep-make/Manifest b/gnustep-base/gnustep-make/Manifest
index 162672419f44..cb4259648b90 100644
--- a/gnustep-base/gnustep-make/Manifest
+++ b/gnustep-base/gnustep-make/Manifest
@@ -2,6 +2,18 @@ AUX GNUstep-reset.sh.patch 2121 RMD160 28277890445caebf91a33ccc7c2a2c68bc639625
 MD5 ff55be8ebf757b97d823bb3cf08b8bc4 files/GNUstep-reset.sh.patch 2121
 RMD160 28277890445caebf91a33ccc7c2a2c68bc639625 files/GNUstep-reset.sh.patch 2121
 SHA256 367ba567a979bc89feb65da860086c40e6494bb12a508c7071480c4d5d32109b files/GNUstep-reset.sh.patch 2121
+AUX gnustep-2.csh 306 RMD160 fcc8da54bfdd5aa7abcaf07865c663cea9baaa92 SHA1 e0eeb76d746d42be8e94906c2c53f3106afeb699 SHA256 cb42bb270728ec6afe3c1b1d578e627e7f461507d41ce31bf3e3c6b175018d97
+MD5 b265263d888e5bd79ca15a97d6a453ae files/gnustep-2.csh 306
+RMD160 fcc8da54bfdd5aa7abcaf07865c663cea9baaa92 files/gnustep-2.csh 306
+SHA256 cb42bb270728ec6afe3c1b1d578e627e7f461507d41ce31bf3e3c6b175018d97 files/gnustep-2.csh 306
+AUX gnustep-2.sh 317 RMD160 a5b5933c9d35531c4857b6239824ea3a1cc33b7e SHA1 1063766ea47ca7c724c5d9d9dc90fa090dd3762d SHA256 5df828dc453b522748ed624e31673cd43204b8e09dd4e9564703b99c8cfbc87b
+MD5 50bc6d4d39173bf258d3ff99f60b94e5 files/gnustep-2.sh 317
+RMD160 a5b5933c9d35531c4857b6239824ea3a1cc33b7e files/gnustep-2.sh 317
+SHA256 5df828dc453b522748ed624e31673cd43204b8e09dd4e9564703b99c8cfbc87b files/gnustep-2.sh 317
+AUX gnustep-make-2.0.1-destdir.patch 975 RMD160 c2647803d412c954b546e4352310705aac805159 SHA1 94ea603da99cc6b973ecfbd7e3c3980f53c5da0a SHA256 68e386ad5dfeb90138723081ce0d45fd6c426dbcf9660784eb85707dee7be474
+MD5 a04046a35e799188f48a63a7feeb815d files/gnustep-make-2.0.1-destdir.patch 975
+RMD160 c2647803d412c954b546e4352310705aac805159 files/gnustep-make-2.0.1-destdir.patch 975
+SHA256 68e386ad5dfeb90138723081ce0d45fd6c426dbcf9660784eb85707dee7be474 files/gnustep-make-2.0.1-destdir.patch 975
 AUX gnustep.csh 550 RMD160 9c9f95980119f326dc0435e0bd1aab22c6e215ff SHA1 6a6690ed2f6503d7d7d443a32636de08ab67afe9 SHA256 4e35fccbb237b1ab5d9a7e35cc52e1c9455223c36162314e1bbadd7ea5df1f89
 MD5 c2aafc7c2bbd94b6d7d25ddec388af7e files/gnustep.csh 550
 RMD160 9c9f95980119f326dc0435e0bd1aab22c6e215ff files/gnustep.csh 550
@@ -17,6 +29,7 @@ SHA256 5e7f5092e233784015394c046e3aa8ab8201f2444c6df761f6f787e585a773c7 files/ma
 DIST gnustep-make-1.10.0.tar.gz 372852 RMD160 37840590d11f9a3356cf4dcae2fb518f645ea478 SHA1 24a4a948d834f8d12173a394ee3966a05f6a6f5f SHA256 5cfefb8253e0abe8ce6899cb26fe009f48b964ad98be4c8d454ef95c2f8407f7
 DIST gnustep-make-1.12.0.tar.gz 395144 RMD160 fc24625d45dce3c279220b461afcd912f3a0f09a SHA1 acb218ff066186150bc4ea0d377f2b4c5b8d8b95 SHA256 daeb7f8fd54d312426072b5abe29edd03e86fd5b1597bd95561c48d1e5a023f1
 DIST gnustep-make-1.13.0.tar.gz 400157 RMD160 b1d619d7c677463bf1a4adae82a412ad95157dc2 SHA1 91f0494d58233e59254c365b338bca1bd684bea6 SHA256 d79c11bada9ccd32d0ab08a0dfbd776731b02103975a22b6b95284046b740e8f
+DIST gnustep-make-2.0.1.tar.gz 444343 RMD160 b70f2cfbca02898018403787cd5ab879a0beafd8 SHA1 5b9722a364e6b839542fd7ccc6acf7ed4e5cbf6f SHA256 63d5f1bc8f2f12707f0c109ddff3492a297e4ae21ff13eee62ed4e2aa761f653
 EBUILD gnustep-make-1.10.0-r2.ebuild 6439 RMD160 b98200876d963310354e86dc30c6aa82050042d0 SHA1 6107b922a3f3e812b861a02d67260b8f85294f8f SHA256 e64b3d645ca311f3195afd573d9440513a600bf34aa27aa21185b49b67b56726
 MD5 cbf89778814c34244dba61f560f5f980 gnustep-make-1.10.0-r2.ebuild 6439
 RMD160 b98200876d963310354e86dc30c6aa82050042d0 gnustep-make-1.10.0-r2.ebuild 6439
@@ -29,10 +42,14 @@ EBUILD gnustep-make-1.13.0.ebuild 6293 RMD160 8fd7f1777aaffa4934cae872ad3f5f017c
 MD5 31d52c94d662beac75492e752d68c451 gnustep-make-1.13.0.ebuild 6293
 RMD160 8fd7f1777aaffa4934cae872ad3f5f017c9613c8 gnustep-make-1.13.0.ebuild 6293
 SHA256 e77a1379658bf2202efad33674e23702b36309bba777734b0afd0b465ec49e3d gnustep-make-1.13.0.ebuild 6293
-MISC ChangeLog 10451 RMD160 bc4067281f3d3b340f697f8838da20997e69a3e8 SHA1 d3ccfe6f2898c5fe1c4f4a6f8ad08d72af976520 SHA256 2ede0b0049f079d3f452426b1f027a63dbd274ec1b19af3c133b0247505fe4de
-MD5 9032c4cebf22f317d80eae28c9a9ebdd ChangeLog 10451
-RMD160 bc4067281f3d3b340f697f8838da20997e69a3e8 ChangeLog 10451
-SHA256 2ede0b0049f079d3f452426b1f027a63dbd274ec1b19af3c133b0247505fe4de ChangeLog 10451
+EBUILD gnustep-make-2.0.1.ebuild 2197 RMD160 0be691839c351f2ed09b578118cbe9a837508862 SHA1 6b5b80e3e996668abc8ff041a8cfa793aa95ade5 SHA256 1a656ad2a7829c075ceef8a3542dff5ebfbfc0bcf23bda7b4904b3494fe5f189
+MD5 6d1c34f35d38ee501df099d07b135711 gnustep-make-2.0.1.ebuild 2197
+RMD160 0be691839c351f2ed09b578118cbe9a837508862 gnustep-make-2.0.1.ebuild 2197
+SHA256 1a656ad2a7829c075ceef8a3542dff5ebfbfc0bcf23bda7b4904b3494fe5f189 gnustep-make-2.0.1.ebuild 2197
+MISC ChangeLog 10734 RMD160 e52e45f6253f45a75652e574ee867895899067d2 SHA1 a15b4721e4a2a6ee75fa538269f2d3899d9e4d80 SHA256 3be860d089ef13d615f5c7ffacd128b3272679985a75ea714fed18d8769fec8f
+MD5 c2a14cefb76c62c775f732fa13f33811 ChangeLog 10734
+RMD160 e52e45f6253f45a75652e574ee867895899067d2 ChangeLog 10734
+SHA256 3be860d089ef13d615f5c7ffacd128b3272679985a75ea714fed18d8769fec8f ChangeLog 10734
 MISC metadata.xml 530 RMD160 00cac411a415bf03b7834a2245da74bfffc46844 SHA1 79407b9b92ae22d7e51f57c2354da5e34113f94b SHA256 0b45770527e32829be622d108ef32a5022eed02b767778fe23e91a34f6b575c9
 MD5 ca04d409726e17e7151b832de9989a48 metadata.xml 530
 RMD160 00cac411a415bf03b7834a2245da74bfffc46844 metadata.xml 530
@@ -46,3 +63,6 @@ SHA256 bc703b58d8a8aa61d28957c1d2dcb12e7fd3ec189c1d545205e1d86007426ee4 files/di
 MD5 e1e091b9f82d4517acf205f613b2ab1f files/digest-gnustep-make-1.13.0 259
 RMD160 8c62c40b22471e78bb66e9dad623c8a49debc9a0 files/digest-gnustep-make-1.13.0 259
 SHA256 fa473a45e9518a63233a0fbbf19b77a64db556177f1f8e84104e571ecdeb5ae2 files/digest-gnustep-make-1.13.0 259
+MD5 2c7838cb92d225eab8018ad010145d3a files/digest-gnustep-make-2.0.1 256
+RMD160 c306bcc8130abf315be247e34b3858863a7f6b73 files/digest-gnustep-make-2.0.1 256
+SHA256 745c1c57187d70e9f661f72152f79e33f9bcc3aee0e4aee1140ed026018f5374 files/digest-gnustep-make-2.0.1 256
diff --git a/gnustep-base/gnustep-make/files/digest-gnustep-make-2.0.1 b/gnustep-base/gnustep-make/files/digest-gnustep-make-2.0.1
new file mode 100644
index 000000000000..d8b6ea04bfdd
--- /dev/null
+++ b/gnustep-base/gnustep-make/files/digest-gnustep-make-2.0.1
@@ -0,0 +1,3 @@
+MD5 f268733ea23f53e211e3977e27b46098 gnustep-make-2.0.1.tar.gz 444343
+RMD160 b70f2cfbca02898018403787cd5ab879a0beafd8 gnustep-make-2.0.1.tar.gz 444343
+SHA256 63d5f1bc8f2f12707f0c109ddff3492a297e4ae21ff13eee62ed4e2aa761f653 gnustep-make-2.0.1.tar.gz 444343
diff --git a/gnustep-base/gnustep-make/files/gnustep-2.csh b/gnustep-base/gnustep-make/files/gnustep-2.csh
new file mode 100644
index 000000000000..00dfd6159aa9
--- /dev/null
+++ b/gnustep-base/gnustep-make/files/gnustep-2.csh
@@ -0,0 +1,16 @@
+#!/bin/csh
+
+# Test for an interactive shell
+if ( $?prompt ) then
+
+	setenv GNUSTEP_SYSTEM_TOOLS /usr/GNUstep/System/Tools
+
+	if ( -x $GNUSTEP_SYSTEM_TOOLS/make_services ) then
+		$GNUSTEP_SYSTEM_TOOLS/make_services
+	endif
+
+	if ( -x $GNUSTEP_SYSTEM_TOOLS/gdnc ) then
+		$GNUSTEP_SYSTEM_TOOLS/gdnc
+	endif
+
+endif
diff --git a/gnustep-base/gnustep-make/files/gnustep-2.sh b/gnustep-base/gnustep-make/files/gnustep-2.sh
new file mode 100644
index 000000000000..652a8e8bad73
--- /dev/null
+++ b/gnustep-base/gnustep-make/files/gnustep-2.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# Test for an interactive shell
+case $- in
+	*i*)
+	;;
+	*)
+		return
+	;;
+esac
+	
+GNUSTEP_SYSTEM_TOOLS=/usr/GNUstep/System/Tools
+
+if [ -x ${GNUSTEP_SYSTEM_TOOLS}/make_services ]; then
+    ${GNUSTEP_SYSTEM_TOOLS}/make_services
+fi
+
+if [ -x ${GNUSTEP_SYSTEM_TOOLS}/gdnc ]; then
+    ${GNUSTEP_SYSTEM_TOOLS}/gdnc
+fi
diff --git a/gnustep-base/gnustep-make/files/gnustep-make-2.0.1-destdir.patch b/gnustep-base/gnustep-make/files/gnustep-make-2.0.1-destdir.patch
new file mode 100644
index 000000000000..407a5145724e
--- /dev/null
+++ b/gnustep-base/gnustep-make/files/gnustep-make-2.0.1-destdir.patch
@@ -0,0 +1,21 @@
+* grobian@gentoo.org: because we use sandbox this check fails (cannot
+  write outside the DESTDIR.  Allowing to write in the
+  GNUSTEP_INSTALLATION_DIR means our sandbox is useless, since then
+  everything can be written, so prefer to just check the DESTDIR
+  location instead.
+
+--- Master/rules.make
++++ Master/rules.make
+@@ -107,9 +107,9 @@
+ 
+ ifneq ($(GNUSTEP_INSTALLATION_DIR),)
+ internal-check-install-permissions:
+-	@if [ -d "$(GNUSTEP_INSTALLATION_DIR)" \
+-	      -a ! -w "$(GNUSTEP_INSTALLATION_DIR)" ]; then \
+-	  echo "*ERROR*: the software is configured to install itself into $(GNUSTEP_INSTALLATION_DIR)"; \
++	@if [ -d "$(DESTDIR)$(GNUSTEP_INSTALLATION_DIR)" \
++	      -a ! -w "$(DESTDIR)$(GNUSTEP_INSTALLATION_DIR)" ]; then \
++	  echo "*ERROR*: the software is configured to install itself into $(DESTDIR)$(GNUSTEP_INSTALLATION_DIR)"; \
+ 	  echo "but you do not have permissions to write in that directory:";\
+ 	  echo "Aborting installation."; \
+ 	  echo ""; \
diff --git a/gnustep-base/gnustep-make/gnustep-make-2.0.1.ebuild b/gnustep-base/gnustep-make/gnustep-make-2.0.1.ebuild
new file mode 100644
index 000000000000..9ecae4cee124
--- /dev/null
+++ b/gnustep-base/gnustep-make/gnustep-make-2.0.1.ebuild
@@ -0,0 +1,83 @@
+# 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-2.0.1.ebuild,v 1.1 2007/08/18 13:26:56 grobian Exp $
+
+inherit gnustep-base eutils
+
+DESCRIPTION="GNUstep Makefile Package"
+
+HOMEPAGE="http://www.gnustep.org"
+SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND="${GNUSTEP_CORE_DEPEND}
+	>=sys-devel/make-3.75"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	gnustep-base_pkg_setup
+
+	if ! built_with_use sys-devel/gcc objc; then
+		ewarn "gcc must be compiled with Objective-C support! See the objc USE flag."
+		die "ObjC support not available"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-destdir.patch
+}
+
+src_compile() {
+	cd ${S}
+
+	local myconf
+	myconf="--prefix=${GNUSTEP_PREFIX} --with-layout=gnustep"
+	myconf="$myconf --with-config-file=/etc/GNUstep/GNUstep.conf"
+	myconf="$myconf --enable-native-objc-exceptions"
+	econf $myconf || die "configure failed"
+
+	emake
+	# Prepare doc here (needed when no gnustep-make is already installed)
+	if use doc ; then
+		# If a gnustep-1 environment is set
+		unset GNUSTEP_MAKEFILES
+		cd Documentation
+		emake -j1 all install || die "doc make has failed"
+		cd ..
+	fi
+}
+
+src_install() {
+	# Get GNUSTEP_* variables
+	. ./GNUstep.conf
+
+	local make_eval="-j1"
+	use debug || make_eval="${make_eval} debug=no"
+	make_eval="${make_eval} verbose=yes"
+
+	emake ${make_eval} DESTDIR=${D} install || die "install has failed"
+
+	# Copy the documentation
+	if use doc ; then
+		dodir ${GNUSTEP_SYSTEM_LIBRARY}
+		cp -r Documentation/tmp-installation/System/Library/Documentation \
+			${D}${GNUSTEP_SYSTEM_LIBRARY}
+	fi
+
+	exeinto /etc/profile.d
+	doexe ${FILESDIR}/gnustep-2.sh
+	doexe ${FILESDIR}/gnustep-2.csh
+
+	dodir /etc/env.d
+	cat <<- EOF > "${D}"/etc/env.d/99gnustep
+PATH=${GNUSTEP_SYSTEM_TOOLS}:${GNUSTEP_LOCAL_TOOLS}
+LDPATH=${GNUSTEP_SYSTEM_LIBRARIES}:${GNUSTEP_LOCAL_LIBRARIES}
+MANPATH=${GNUSTEP_SYSTEM_DOC_MAN}:${GNUSTEP_LOCAL_DOC_MAN}
+INFOPATH=${GNUSTEP_SYSTEM_DOC_INFO}:${GNUSTEP_LOCAL_DOC_INFO}
+INFODIR=${GNUSTEP_SYSTEM_DOC_INFO}:${GNUSTEP_LOCAL_DOC_INFO}
+EOF
+}