Version bump to 1.12.0. Marked ~ppc-macos. Removed old and CVS based versions. Made repoman happy about copyright header.

(Portage version: 2.1_pre5-r1)

11 files changed, 171 insertions, 334 deletions

diff --git a/gnustep-base/gnustep-base/ChangeLog b/gnustep-base/gnustep-base/ChangeLog
index 56a196d2c999..c246b0b232a5 100644
--- a/gnustep-base/gnustep-base/ChangeLog
+++ b/gnustep-base/gnustep-base/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnustep-base/gnustep-base
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/ChangeLog,v 1.29 2005/12/26 19:35:45 blubb Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/ChangeLog,v 1.30 2006/03/19 14:37:51 grobian Exp $
+
+*gnustep-base-1.12.0 (19 Mar 2006)
+
+  19 Mar 2006; Fabian Groffen <grobian@gentoo.org>
+  -gnustep-base-1.10.2_pre20050312.ebuild, -gnustep-base-1.10.2.ebuild,
+  -gnustep-base-1.10.2-r1.ebuild, +gnustep-base-1.12.0.ebuild:
+  Version bump to 1.12.0.  Marked ~ppc-macos.  Removed old and CVS based versions
 
   26 Dec 2005; Simon Stelling <blubb@gentoo.org> gnustep-base-1.10.3.ebuild:
   stable on amd64
diff --git a/gnustep-base/gnustep-base/Manifest b/gnustep-base/gnustep-base/Manifest
index 6e32fc25b288..04f27c0f2adf 100644
--- a/gnustep-base/gnustep-base/Manifest
+++ b/gnustep-base/gnustep-base/Manifest
@@ -1,18 +1,60 @@
 MD5 20294cb53e066529a7aa287704533205 ChangeLog 9141
-MD5 4e5c7a4cd8ffd9eb042bab27f6b2ee89 gnustep-base-1.10.1-r1.ebuild 2965
-MD5 41a812b167b474526beab856f464c627 gnustep-base-1.10.2-r1.ebuild 3048
-MD5 faf8a7da8c828becee592d4293eb3437 gnustep-base-1.10.2.ebuild 2970
-MD5 4c5cc75a282c76c81e445eaf0a9ff2d3 gnustep-base-1.10.2_pre20050312.ebuild 3350
-MD5 0477b425c5e230195118c12ae11ba59f gnustep-base-1.10.3-r1.ebuild 3171
-MD5 f9d81a7b505a087118f8c62c9fb34ff0 gnustep-base-1.10.3.ebuild 2980
-MD5 6054f8e4a94313852ff8e1294c8abd88 metadata.xml 670
+RMD160 491b520f5e00f01674e13afc3d30f25d61d99637 ChangeLog 9141
+SHA256 442b7e420b0bd9944b1bece83a24682a50f01cdb8d513e0341f2326e6902df44 ChangeLog 9141
 MD5 ec6765fbba5bf4048f63898acc20ce6e files/base-path.patch-gsstartup-0.10.2 487
+RMD160 43bddf7a56b770c7ba12f6e7abaaf3d481fe6789 files/base-path.patch-gsstartup-0.10.2 487
+SHA256 f547ace0eff060463351fe3d09633e4674762a8d291f6020b932681508d5833f files/base-path.patch-gsstartup-0.10.2 487
 MD5 1e1e21f737b0d25c8faabb89bd286988 files/base-user-defaults.patch-1.10.0 1069
+RMD160 efddacffb3fa47839fbf5924749e3083634b4a28 files/base-user-defaults.patch-1.10.0 1069
+SHA256 73bf2d1cea1a67d5a4284659746db49e3c7c3da1911e0f6857662520491888b5 files/base-user-defaults.patch-1.10.0 1069
 MD5 3a635544722f08220cbdfe346c41c125 files/base-user-defaults.patch-1.10.2_pre20050312 1096
+RMD160 7ab2a454b6a3bdd4b4b819eb515e86ae0ca38550 files/base-user-defaults.patch-1.10.2_pre20050312 1096
+SHA256 a756952cc53f76af46b9eb6760744fe8ed8b01bd7b3ba9c0fb89a3cfc8176450 files/base-user-defaults.patch-1.10.2_pre20050312 1096
 MD5 efda24cf74398ac3ddce6cba6071561a files/config-gnustep-base.sh 559
+RMD160 4d82665432a662068c75f1748152b01a42410e53 files/config-gnustep-base.sh 559
+SHA256 6fe325c405f1f679490834d12649955194bebbe74dab9f8fc2127738b1dde0e5 files/config-gnustep-base.sh 559
 MD5 deded00aa5a335854582a82255ddc2f3 files/digest-gnustep-base-1.10.1-r1 72
+RMD160 047db98a3597e22b081304e9fb6487790a515bdb files/digest-gnustep-base-1.10.1-r1 72
+SHA256 3c729256ed54f63f2f4992bb7f241f3f16b8320befd280598ceff6528a0e8069 files/digest-gnustep-base-1.10.1-r1 72
 MD5 1d0f2a1118d08b617edef7ae05c4001e files/digest-gnustep-base-1.10.2 72
+RMD160 affabf55225fcac631f8defe5e5c3b61a3a937b3 files/digest-gnustep-base-1.10.2 72
+SHA256 2c69369de411d6801c82a3b435073f733de36780780c400bf201567cb6e4a667 files/digest-gnustep-base-1.10.2 72
 MD5 1d0f2a1118d08b617edef7ae05c4001e files/digest-gnustep-base-1.10.2-r1 72
+RMD160 affabf55225fcac631f8defe5e5c3b61a3a937b3 files/digest-gnustep-base-1.10.2-r1 72
+SHA256 2c69369de411d6801c82a3b435073f733de36780780c400bf201567cb6e4a667 files/digest-gnustep-base-1.10.2-r1 72
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-base-1.10.2_pre20050312 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-gnustep-base-1.10.2_pre20050312 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-gnustep-base-1.10.2_pre20050312 0
 MD5 353cee9163437665f9a7e18d77ba6a65 files/digest-gnustep-base-1.10.3 72
+RMD160 712b1d6c9b58b9cf52e1bbd429ec922dfc9d727b files/digest-gnustep-base-1.10.3 72
+SHA256 8dc44ed80ffa32cdb4d7e0bc60e0a86c59a6184a2a0481499ba70929003d14b1 files/digest-gnustep-base-1.10.3 72
 MD5 353cee9163437665f9a7e18d77ba6a65 files/digest-gnustep-base-1.10.3-r1 72
+RMD160 712b1d6c9b58b9cf52e1bbd429ec922dfc9d727b files/digest-gnustep-base-1.10.3-r1 72
+SHA256 8dc44ed80ffa32cdb4d7e0bc60e0a86c59a6184a2a0481499ba70929003d14b1 files/digest-gnustep-base-1.10.3-r1 72
+MD5 128a99eb69ce0540edf630e0bb700e5d files/digest-gnustep-base-1.12.0 262
+RMD160 a783007d51e04ee23859322c3d09d3353a0464f3 files/digest-gnustep-base-1.12.0 262
+SHA256 aa0c7d491c3d1e4436ba914b6126c25ad8791c8cdf1cd07efb2cdd86bdf55cdd files/digest-gnustep-base-1.12.0 262
+MD5 4e5c7a4cd8ffd9eb042bab27f6b2ee89 gnustep-base-1.10.1-r1.ebuild 2965
+RMD160 b9397253242ebfb6b16e57297c611a21cc5da045 gnustep-base-1.10.1-r1.ebuild 2965
+SHA256 1cc274bdc771f1794a6cb0e51c67ed21861dddb0882fd224e2dfebeefa24b3ae gnustep-base-1.10.1-r1.ebuild 2965
+MD5 41a812b167b474526beab856f464c627 gnustep-base-1.10.2-r1.ebuild 3048
+RMD160 c166381943cdbf7b6fc9ed5a1915c3ead6e2848f gnustep-base-1.10.2-r1.ebuild 3048
+SHA256 0e4d02befb771f5d4e0eaa491c86b4a5b539846ad4027979e28f060663ababc6 gnustep-base-1.10.2-r1.ebuild 3048
+MD5 faf8a7da8c828becee592d4293eb3437 gnustep-base-1.10.2.ebuild 2970
+RMD160 2316691862d47acfdf7bfbbe7ee50397fdfaaac1 gnustep-base-1.10.2.ebuild 2970
+SHA256 42ad38629f4013464106737ebbc3b7ecc0b0dd94b7f888a6e88f8ab59ac86abb gnustep-base-1.10.2.ebuild 2970
+MD5 4c5cc75a282c76c81e445eaf0a9ff2d3 gnustep-base-1.10.2_pre20050312.ebuild 3350
+RMD160 cc5bf34eef25fe7751dab78969d71cccb6d4e4f5 gnustep-base-1.10.2_pre20050312.ebuild 3350
+SHA256 28e9d9aab8d4a92b367a39f1c6058c197255139928d9d71724f2567437840450 gnustep-base-1.10.2_pre20050312.ebuild 3350
+MD5 0477b425c5e230195118c12ae11ba59f gnustep-base-1.10.3-r1.ebuild 3171
+RMD160 866c5b55a6c1eae4567dd81e157f8e1f63ca0558 gnustep-base-1.10.3-r1.ebuild 3171
+SHA256 9e0d7d5abf9c4d789eb95ca67994ab680d176bc74301fae156b955100ba8916e gnustep-base-1.10.3-r1.ebuild 3171
+MD5 f9d81a7b505a087118f8c62c9fb34ff0 gnustep-base-1.10.3.ebuild 2980
+RMD160 f7169cd708f075eaa0ee69ab414ff328c203f14d gnustep-base-1.10.3.ebuild 2980
+SHA256 f22c3faa125ee27bac26bdaae639e400c1d86f36c741081b66eca8245ef1c881 gnustep-base-1.10.3.ebuild 2980
+MD5 08ed8ce0fb189f3dec739f2edb0085fe gnustep-base-1.12.0.ebuild 2887
+RMD160 debf8b40fa57bb4a2763cb1370b1a96a98ca39bf gnustep-base-1.12.0.ebuild 2887
+SHA256 fa52872bed608d632bab938af71f071148a27dead5347a902b8a9c5189c711b5 gnustep-base-1.12.0.ebuild 2887
+MD5 6054f8e4a94313852ff8e1294c8abd88 metadata.xml 670
+RMD160 5d5b88faf28b66aa5d5d3efd6fe5844e980604c9 metadata.xml 670
+SHA256 e08343661cc7ecb6d963be62092a270a45f8af0201c9523d1feeddfa09a417fa metadata.xml 670
diff --git a/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.2 b/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.2
deleted file mode 100644
index 3976c5be438d..000000000000
--- a/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1b3fe2b48917ba1c63828d58295b1044 gnustep-base-1.10.2.tar.gz 1925577
diff --git a/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.2-r1 b/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.2-r1
deleted file mode 100644
index 3976c5be438d..000000000000
--- a/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1b3fe2b48917ba1c63828d58295b1044 gnustep-base-1.10.2.tar.gz 1925577
diff --git a/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.2_pre20050312 b/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.2_pre20050312
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.2_pre20050312
+++ /dev/null
diff --git a/gnustep-base/gnustep-base/files/digest-gnustep-base-1.12.0 b/gnustep-base/gnustep-base/files/digest-gnustep-base-1.12.0
new file mode 100644
index 000000000000..2aaf0c2ac403
--- /dev/null
+++ b/gnustep-base/gnustep-base/files/digest-gnustep-base-1.12.0
@@ -0,0 +1,3 @@
+MD5 e2ab022f8312fbbc1a9cab938edf70c4 gnustep-base-1.12.0.tar.gz 2084468
+RMD160 2722b38fcc7df9e810e427b95e9471d747770eb3 gnustep-base-1.12.0.tar.gz 2084468
+SHA256 888b0283c7be8b137a1d6e13790784c8bdc0de5ba9969b6ff103c5488a6903b1 gnustep-base-1.12.0.tar.gz 2084468
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.10.2-r1.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.10.2-r1.ebuild
deleted file mode 100644
index 471086a55088..000000000000
--- a/gnustep-base/gnustep-base/gnustep-base-1.10.2-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/gnustep-base-1.10.2-r1.ebuild,v 1.3 2005/07/16 19:25:38 swegener Exp $
-
-inherit gnustep
-
-DESCRIPTION="The GNUstep Base Library is a library of general-purpose, non-graphical Objective C objects."
-
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-KEYWORDS="~ppc ~x86 ~amd64 ~sparc ~alpha"
-SLOT="0"
-LICENSE="GPL-2 LGPL-2.1"
-
-IUSE="doc gcc-libffi"
-DEPEND="${GNUSTEP_CORE_DEPEND}
-	~gnustep-base/gnustep-make-1.10.0
-	|| (
-		gcc-libffi? ( >=sys-devel/gcc-3.3.5 )
-		>=dev-libs/libffi-3.3.5
-	)
-	>=dev-libs/libxml2-2.6
-	>=dev-libs/libxslt-1.1
-	>=dev-libs/gmp-4.1
-	>=dev-libs/openssl-0.9.7
-	>=sys-libs/zlib-1.2
-	sys-apps/sed
-	${DOC_DEPEND}"
-RDEPEND="${DEPEND}
-	${DOC_RDEPEND}"
-
-egnustep_install_domain "System"
-
-pkg_setup() {
-	if use gcc-libffi; then
-		if [ "$(ffi_available)" == "no" ]; then
-			ffi_not_available_info
-			die "libffi is not available"
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/base-user-defaults.patch-1.10.0
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/base-path.patch-gsstartup-0.10.2
-}
-
-src_compile() {
-	egnustep_env
-	# why libffi over ffcall?
-	# - libffi is known to work with 32 and 64 bit platforms
-	# - libffi does not use trampolines
-	local myconf
-	myconf="--enable-libffi --disable-ffcall"
-	if use gcc-libffi; then
-		myconf="${myconf} --with-ffi-library=$(gcc-config -L) --with-ffi-include=$(gcc-config -L | sed 's/:.*//')/include"
-	else
-		myconf="${myconf} --with-ffi-library=/usr/lib/libffi --with-ffi-include=/usr/include/libffi"
-	fi
-
-	myconf="$myconf --with-xml-prefix=/usr"
-	myconf="$myconf --with-gmp-include=/usr/include --with-gmp-library=/usr/lib"
-	econf $myconf || die "configure failed"
-
-	egnustep_make || die
-}
-
-src_install() {
-	egnustep_env
-	egnustep_install || die
-
-	local base_temp_lib_path
-	if [ ! -z $GNUSTEP_FLATTENED ]; then
-		base_temp_lib_path="$(egnustep_install_domain)/Library/Libraries"
-	else
-		base_temp_lib_path="$(egnustep_install_domain)/Library/Libraries/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO"
-	fi
-
-	if use doc ; then
-		local make_eval="INSTALL_ROOT=\${D} \
-			GNUSTEP_SYSTEM_ROOT=\${D}\$(egnustep_system_root) \
-			GNUSTEP_NETWORK_ROOT=\$(egnustep_network_root) \
-			GNUSTEP_LOCAL_ROOT=\$(egnustep_local_root) \
-			GNUSTEP_MAKEFILES=\$(egnustep_system_root)/Library/Makefiles \
-			GNUSTEP_USER_ROOT=\${TMP} \
-			GNUSTEP_DEFAULTS_ROOT=\${TMP}/\${__GS_USER_ROOT_POSTFIX} \
-			LD_LIBRARY_PATH=\"\${D}\${base_temp_lib_path}:\${LD_LIBRARY_PATH}\" \
-			GNUSTEP_INSTALLATION_DIR=\${D}\$(egnustep_install_domain) \
-			-j1"
-		if use debug ; then
-			make_eval="${make_eval} debug=yes"
-		fi
-		if use verbose ; then
-			make_eval="${make_eval} verbose=yes"
-		fi
-
-		cd ${S}/Documentation
-		eval emake ${make_eval} all || die "doc make has failed"
-		eval emake ${make_eval} install || die "doc install has failed"
-		cd ..
-	fi
-	egnustep_package_config
-}
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.10.2.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.10.2.ebuild
deleted file mode 100644
index fefc1030a828..000000000000
--- a/gnustep-base/gnustep-base/gnustep-base-1.10.2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/gnustep-base-1.10.2.ebuild,v 1.3 2005/07/16 19:25:38 swegener Exp $
-
-inherit gnustep
-
-DESCRIPTION="The GNUstep Base Library is a library of general-purpose, non-graphical Objective C objects."
-
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-KEYWORDS="~ppc ~x86 ~amd64 ~sparc ~alpha"
-SLOT="0"
-LICENSE="GPL-2 LGPL-2.1"
-
-IUSE="doc gcc-libffi"
-DEPEND="${GNUSTEP_CORE_DEPEND}
-	~gnustep-base/gnustep-make-1.10.0
-	|| (
-		gcc-libffi? ( >=sys-devel/gcc-3.3.5 )
-		>=dev-libs/libffi-3.3.5
-	)
-	>=dev-libs/libxml2-2.6
-	>=dev-libs/libxslt-1.1
-	>=dev-libs/gmp-4.1
-	>=dev-libs/openssl-0.9.7
-	>=sys-libs/zlib-1.2
-	sys-apps/sed
-	${DOC_DEPEND}"
-RDEPEND="${DEPEND}
-	${DOC_RDEPEND}"
-
-egnustep_install_domain "System"
-
-pkg_setup() {
-	if use gcc-libffi; then
-		if [ "$(ffi_available)" == "no" ]; then
-			ffi_not_available_info
-			die "libffi is not available"
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/base-user-defaults.patch-1.10.0
-}
-
-src_compile() {
-	egnustep_env
-	# why libffi over ffcall?
-	# - libffi is known to work with 32 and 64 bit platforms
-	# - libffi does not use trampolines
-	local myconf
-	myconf="--enable-libffi --disable-ffcall"
-	if use gcc-libffi; then
-		myconf="${myconf} --with-ffi-library=$(gcc-config -L) --with-ffi-include=$(gcc-config -L | sed 's/:.*//')/include"
-	else
-		myconf="${myconf} --with-ffi-library=/usr/lib/libffi --with-ffi-include=/usr/include/libffi"
-	fi
-
-	myconf="$myconf --with-xml-prefix=/usr"
-	myconf="$myconf --with-gmp-include=/usr/include --with-gmp-library=/usr/lib"
-	econf $myconf || die "configure failed"
-
-	egnustep_make || die
-}
-
-src_install() {
-	egnustep_env
-	egnustep_install || die
-
-	local base_temp_lib_path
-	if [ ! -z $GNUSTEP_FLATTENED ]; then
-		base_temp_lib_path="$(egnustep_install_domain)/Library/Libraries"
-	else
-		base_temp_lib_path="$(egnustep_install_domain)/Library/Libraries/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO"
-	fi
-
-	if use doc ; then
-		local make_eval="INSTALL_ROOT=\${D} \
-			GNUSTEP_SYSTEM_ROOT=\${D}\$(egnustep_system_root) \
-			GNUSTEP_NETWORK_ROOT=\$(egnustep_network_root) \
-			GNUSTEP_LOCAL_ROOT=\$(egnustep_local_root) \
-			GNUSTEP_MAKEFILES=\$(egnustep_system_root)/Library/Makefiles \
-			GNUSTEP_USER_ROOT=\${TMP} \
-			GNUSTEP_DEFAULTS_ROOT=\${TMP}/\${__GS_USER_ROOT_POSTFIX} \
-			LD_LIBRARY_PATH=\"\${D}\${base_temp_lib_path}:\${LD_LIBRARY_PATH}\" \
-			GNUSTEP_INSTALLATION_DIR=\${D}\$(egnustep_install_domain) \
-			-j1"
-		if use debug ; then
-			make_eval="${make_eval} debug=yes"
-		fi
-		if use verbose ; then
-			make_eval="${make_eval} verbose=yes"
-		fi
-
-		cd ${S}/Documentation
-		eval emake ${make_eval} all || die "doc make has failed"
-		eval emake ${make_eval} install || die "doc install has failed"
-		cd ..
-	fi
-	egnustep_package_config
-}
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.10.2_pre20050312.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.10.2_pre20050312.ebuild
deleted file mode 100644
index fce5fd08fdf6..000000000000
--- a/gnustep-base/gnustep-base/gnustep-base-1.10.2_pre20050312.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/gnustep-base-1.10.2_pre20050312.ebuild,v 1.3 2005/07/16 19:25:38 swegener Exp $
-
-ECVS_CVS_COMMAND="cvs -q"
-ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
-ECVS_USER="anoncvs"
-ECVS_AUTH="ext"
-ECVS_MODULE="gnustep/core/base"
-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 toolchain-funcs cvs
-
-S=${WORKDIR}/${ECVS_MODULE}
-
-DESCRIPTION="The GNUstep Base Library is a library of general-purpose, non-graphical Objective C objects."
-
-HOMEPAGE="http://www.gnustep.org"
-#SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-KEYWORDS="~ppc ~x86 ~amd64 ~sparc ~alpha"
-SLOT="0"
-LICENSE="GPL-2 LGPL-2.1"
-
-IUSE="doc gcc-libffi"
-DEPEND="${GNUSTEP_CORE_DEPEND}
-	>=gnustep-base/gnustep-make-1.10.1_pre20050312
-	|| (
-		gcc-libffi? ( >=sys-devel/gcc-3.3.2 )
-		>=dev-libs/libffi-3 )
-	>=dev-libs/libxml2-2.6
-	>=dev-libs/libxslt-1.1
-	>=dev-libs/gmp-4.1
-	>=dev-libs/openssl-0.9.7
-	>=sys-libs/zlib-1.2
-	sys-apps/sed
-	${DOC_DEPEND}"
-RDEPEND="${DEPEND}
-	${DOC_RDEPEND}"
-
-egnustep_install_domain "System"
-
-pkg_setup() {
-	gnustep_pkg_setup
-
-	if use gcc-libffi; then
-		if [ "$(ffi_available)" == "no" ]; then
-			ffi_not_available_info
-			die "libffi is not available"
-		fi
-	fi
-}
-
-src_unpack() {
-	cvs_src_unpack ${A}
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/base-user-defaults.patch-${PV}
-	cd ${S}/Source
-}
-
-src_compile() {
-	egnustep_env
-	# why libffi over ffcall?
-	# - libffi is known to work with 32 and 64 bit platforms
-	# - libffi does not use trampolines
-	local myconf
-	myconf="--disable-ffcall --enable-libffi"
-	if use gcc-libffi; then
-		myconf="${myconf} --with-ffi-library=$(gcc-config -L) --with-ffi-include=$(gcc-config -L | sed 's/:.*//')/include"
-	else
-		myconf="${myconf} --with-ffi-library=/usr/lib/libffi --with-ffi-include=/usr/include/libffi"
-	fi
-	myconf="$myconf --with-xml-prefix=/usr"
-	myconf="$myconf --with-gmp-include=/usr/include --with-gmp-library=/usr/lib"
-	econf $myconf || die "configure failed"
-
-	egnustep_make || die
-}
-
-src_install() {
-	egnustep_env
-	egnustep_install || die
-
-	local base_temp_lib_path
-	if [ ! -z $GNUSTEP_FLATTENED ]; then
-		base_temp_lib_path="$(egnustep_install_domain)/Library/Libraries"
-	else
-		base_temp_lib_path="$(egnustep_install_domain)/Library/Libraries/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO"
-	fi
-
-	if use doc ; then
-		local make_eval="INSTALL_ROOT=\${D} \
-			GNUSTEP_SYSTEM_ROOT=\${D}\$(egnustep_system_root) \
-			GNUSTEP_NETWORK_ROOT=\$(egnustep_network_root) \
-			GNUSTEP_LOCAL_ROOT=\$(egnustep_local_root) \
-			GNUSTEP_MAKEFILES=\$(egnustep_system_root)/Library/Makefiles \
-			GNUSTEP_USER_ROOT=\${TMP} \
-			GNUSTEP_DEFAULTS_ROOT=\${TMP}/\${__GS_USER_ROOT_POSTFIX} \
-			LD_LIBRARY_PATH=\"\${D}\${base_temp_lib_path}:\${LD_LIBRARY_PATH}\" \
-			GNUSTEP_INSTALLATION_DIR=\${D}\$(egnustep_install_domain) \
-			-j1"
-		if use debug ; then
-			make_eval="${make_eval} debug=yes"
-		fi
-		if use verbose ; then
-			make_eval="${make_eval} verbose=yes"
-		fi
-
-		cd ${S}/Documentation
-		eval emake ${make_eval} all || die "doc make has failed"
-		eval emake ${make_eval} install || die "doc install has failed"
-		cd ..
-	fi
-	egnustep_package_config
-}
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.10.3.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.10.3.ebuild
index 7457c761f265..675aee18a15c 100644
--- a/gnustep-base/gnustep-base/gnustep-base-1.10.3.ebuild
+++ b/gnustep-base/gnustep-base/gnustep-base-1.10.3.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-base/gnustep-base-1.10.3.ebuild,v 1.7 2005/12/26 19:35:45 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/gnustep-base-1.10.3.ebuild,v 1.8 2006/03/19 14:37:51 grobian Exp $
 
 inherit gnustep
 
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.12.0.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.12.0.ebuild
new file mode 100644
index 000000000000..540ff7c67a72
--- /dev/null
+++ b/gnustep-base/gnustep-base/gnustep-base-1.12.0.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/gnustep-base-1.12.0.ebuild,v 1.1 2006/03/19 14:37:51 grobian Exp $
+
+inherit gnustep
+
+DESCRIPTION="The GNUstep Base Library: general-purpose, non-gui Obj-C objects"
+
+HOMEPAGE="http://www.gnustep.org"
+SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc-macos ~sparc ~x86"
+SLOT="0"
+LICENSE="GPL-2 LGPL-2.1"
+
+# disable doc as it appears to be broken
+IUSE="ffcall gcc-libffi"
+DEPEND="${GNUSTEP_CORE_DEPEND}
+	~gnustep-base/gnustep-make-1.12.0
+	|| (
+		ffcall? ( dev-libs/ffcall )
+		gcc-libffi? ( >=sys-devel/gcc-3.3.5 )
+		>=dev-libs/libffi-3.3.5
+	)
+	>=dev-libs/libxml2-2.6
+	>=dev-libs/libxslt-1.1
+	>=dev-libs/gmp-4.1
+	>=dev-libs/openssl-0.9.7
+	>=sys-libs/zlib-1.2
+	sys-apps/sed
+	${DOC_DEPEND}"
+RDEPEND="${DEPEND}
+	${DEBUG_DEPEND}
+	${DOC_RDEPEND}"
+
+egnustep_install_domain "System"
+
+pkg_setup() {
+	# Order of preferences: ffcall, libffi from gcc, dev-libs/libffi
+	if ! use ffcall; then
+		if use gcc-libffi; then
+			if [ "$(ffi_available)" == "no" ]; then
+				ffi_not_available_info
+				die "libffi is not available"
+			fi
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+#	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/base-user-defaults.patch-1.10.0
+}
+
+src_compile() {
+	egnustep_env
+	local myconf
+	if use ffcall; then
+		einfo "Using ffcall for FFI, not libffi"
+		myconf="--disable-libffi --enable-ffcall"
+	else
+		einfo "Using libffi for FFI, not ffcall"
+		myconf="--enable-libffi --disable-ffcall"
+		if use gcc-libffi; then
+			myconf="${myconf} --with-ffi-library=$(gcc-config -L) --with-ffi-include=$(gcc-config -L | sed 's/:.*//')/include"
+		else
+			myconf="${myconf} --with-ffi-library=/usr/lib/libffi --with-ffi-include=/usr/include/libffi"
+		fi
+	fi
+
+	myconf="$myconf --with-xml-prefix=/usr"
+	myconf="$myconf --with-gmp-include=/usr/include --with-gmp-library=/usr/lib"
+	econf $myconf || die "configure failed"
+
+	egnustep_make || die
+}
+
+src_install() {
+	egnustep_env
+	egnustep_install || die
+
+	local base_temp_lib_path
+	if [ ! -z $GNUSTEP_FLATTENED ]; then
+		base_temp_lib_path="$(egnustep_install_domain)/Library/Libraries"
+	else
+		base_temp_lib_path="$(egnustep_install_domain)/Library/Libraries/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO"
+	fi
+
+#	if use doc ; then
+#		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"
+#		fi
+#		if use verbose ; then
+#			make_eval="${make_eval} verbose=yes"
+#		fi
+#
+#		cd ${S}/Documentation
+#		eval make ${make_eval} all || die "doc make has failed"
+#		eval make ${make_eval} install || die "doc install has failed"
+#		cd ..
+#	fi
+	egnustep_package_config
+}