6 files changed, 54 insertions, 56 deletions
diff --git a/gnustep-base/gnustep-make/ChangeLog b/gnustep-base/gnustep-make/ChangeLog
index 3a22b86980ed..fa065e112465 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/ChangeLog,v 1.29 2006/02/09 22:42:00 tove Exp $
+# 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 $
+
+*gnustep-make-1.12.0 (19 Mar 2006)
+
+  19 Mar 2006; Fabian Groffen <grobian@gentoo.org>
+  -gnustep-make-1.10.1_pre20050312-r1.ebuild, +gnustep-make-1.12.0.ebuild:
+  Version bump to 1.12.0. Removal of masked CVS version as it doesn't work.
+  Marked ~ppc-macos.
 
   07 Dec 2005; Tom Gall <tgall@gentoo.org> 
   gnustep-make-1.10.0-r2.ebuild:
diff --git a/gnustep-base/gnustep-make/Manifest b/gnustep-base/gnustep-make/Manifest
index 1088bb69dd4a..6cf3080e8bc4 100644
--- a/gnustep-base/gnustep-make/Manifest
+++ b/gnustep-base/gnustep-make/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 d1624e2135dd4b7e9e916947341d6b9d ChangeLog 8461
 RMD160 200870c6e2b803111cbd2ae18f65e5a30e82fcb6 ChangeLog 8461
 SHA256 3f882459fd5a501e6be2fa6cfc004935a3f7da07cccb36af4b13a4f861e0337d ChangeLog 8461
@@ -13,6 +10,9 @@ SHA256 879d97ecbaf0d95a2c21c6683e3e5899dfd7807b644de2748aceec84155179f6 files/di
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-make-1.10.1_pre20050312-r1 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-gnustep-make-1.10.1_pre20050312-r1 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-gnustep-make-1.10.1_pre20050312-r1 0
+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 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
@@ -22,13 +22,9 @@ SHA256 c4358be6aa296a3b4934ab16e020f9fabdb7b1e056131ab0b6a5a14864bcd11a gnustep-
 MD5 7b07f883d271d5892ef141ff546b6377 gnustep-make-1.10.1_pre20050312-r1.ebuild 6563
 RMD160 f2ae50b34611cde569db109803081576d3687499 gnustep-make-1.10.1_pre20050312-r1.ebuild 6563
 SHA256 b36f12c3652ae2ab363f21c8a11a71e318202c637425f6fe1f843fbf22243b86 gnustep-make-1.10.1_pre20050312-r1.ebuild 6563
+MD5 0aee1684122571a181aa06eb685e7dd4 gnustep-make-1.12.0.ebuild 6280
+RMD160 fdee6c2d52766bf0d81ea480d94419153194fc93 gnustep-make-1.12.0.ebuild 6280
+SHA256 70f8888877fba30a95ac1fbf09937d8497376df830532cfcdb43d5ad10441a64 gnustep-make-1.12.0.ebuild 6280
 MD5 ca04d409726e17e7151b832de9989a48 metadata.xml 530
 RMD160 00cac411a415bf03b7834a2245da74bfffc46844 metadata.xml 530
 SHA256 0b45770527e32829be622d108ef32a5022eed02b767778fe23e91a34f6b575c9 metadata.xml 530
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD68VEV3J2n04EauwRAv69AJ9jEaUCWUkgyRO4/j3UzRR5zLJ0TgCg1Q7g
-+by52P21MMuwzF7YHc2rzc0=
-=GvYl
------END PGP SIGNATURE-----
diff --git a/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.1_pre20050312-r1 b/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.1_pre20050312-r1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.1_pre20050312-r1
+++ /dev/null
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
new file mode 100644
index 000000000000..6cd41c3e7143
--- /dev/null
+++ b/gnustep-base/gnustep-make/files/digest-gnustep-make-1.12.0
@@ -0,0 +1,3 @@
+MD5 1883a6387405e51ff4c384fb5cc547a7 gnustep-make-1.12.0.tar.gz 395144
+RMD160 fc24625d45dce3c279220b461afcd912f3a0f09a gnustep-make-1.12.0.tar.gz 395144
+SHA256 daeb7f8fd54d312426072b5abe29edd03e86fd5b1597bd95561c48d1e5a023f1 gnustep-make-1.12.0.tar.gz 395144
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
index 66e8fa2208c1..432c100dd381 100644
--- a/gnustep-base/gnustep-make/gnustep-make-1.10.0-r2.ebuild
+++ b/gnustep-base/gnustep-make/gnustep-make-1.10.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.10.0-r2.ebuild,v 1.5 2005/12/08 03:44:30 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-1.10.0-r2.ebuild,v 1.6 2006/03/19 12:37:33 grobian Exp $
 
 inherit gnustep
 
diff --git a/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20050312-r1.ebuild b/gnustep-base/gnustep-make/gnustep-make-1.12.0.ebuild
index 92c7d242c00f..ef17d6ee2ccc 100644
--- a/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20050312-r1.ebuild
+++ b/gnustep-base/gnustep-make/gnustep-make-1.12.0.ebuild
@@ -1,30 +1,21 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.10.1_pre20050312-r1.ebuild,v 1.2 2005/08/25 18:45:04 swegener Exp $
+# $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 $
 
-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
+inherit gnustep
 
-S=${WORKDIR}/${ECVS_MODULE}
+DESCRIPTION="GNUstep Makefile Package"
 
-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"
+SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
 SLOT="0"
 LICENSE="GPL-2"
 
-IUSE="debug doc layout-from-conf-file layout-osx-like non-flattened verbose"
+# removed doc from IUSE, because building documentation is broken
+IUSE="debug verbose layout-from-conf-file layout-osx-like non-flattened"
 DEPEND="${GNUSTEP_CORE_DEPEND}
-	>=sys-devel/make-3.75
-	${DOC_DEPEND}"
+	>=sys-devel/make-3.75"
 RDEPEND="${DEPEND}
 	${DOC_RDEPEND}"
 
@@ -113,18 +104,21 @@ pkg_setup() {
 		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
+#	if use layout-from-conf-file || use layout-osx-like; then
+		einfo "GNUstep installation will be laid out as follows:"
+		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() {
-	cvs_src_unpack
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/make-user-defaults.patch-1.10.0
+	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() {
@@ -140,6 +134,7 @@ src_compile() {
 	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"
 	econf $myconf || die "configure failed"
 
 	egnustep_make
@@ -149,14 +144,11 @@ 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"
+		local make_eval="\
+			special_prefix=\"\${D}\$(egnustep_system_root)\" \
+			makedir=\${D}\$(egnustep_system_root)/Library/Makefiles \
+			GNUSTEP_USER_ROOT=\${TMP} \
+			-j1"
 
 		if use debug ; then
 			make_eval="${make_eval} debug=yes"
@@ -164,17 +156,17 @@ src_install() {
 		if use verbose ; then
 			make_eval="${make_eval} verbose=yes"
 		fi
-		eval emake ${make_eval} install || die "install has failed"
+		eval make ${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
+#	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