Version bump, integrate libobjc2 support (USE-flag still masked for now)

Package-Manager: portage-2.2.0_alpha85/cvs/Linux x86_64

4 files changed, 32 insertions, 26 deletions

diff --git a/gnustep-base/gnustep-make/ChangeLog b/gnustep-base/gnustep-make/ChangeLog
index 3e08d53e5697..23e4ad5aefad 100644
--- a/gnustep-base/gnustep-make/ChangeLog
+++ b/gnustep-base/gnustep-make/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnustep-base/gnustep-make
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/ChangeLog,v 1.102 2011/06/09 09:47:21 voyageur Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/ChangeLog,v 1.103 2012/02/08 14:37:37 voyageur Exp $
+
+*gnustep-make-2.6.2 (08 Feb 2012)
+
+  08 Feb 2012; Bernard Cafarelli <voyageur@gentoo.org>
+  -gnustep-make-2.6.1-r10.ebuild, +gnustep-make-2.6.2.ebuild, metadata.xml:
+  Version bump, integrate libobjc2 support (USE-flag still masked for now)
 
 *gnustep-make-2.6.1-r1 (09 Jun 2011)
 
diff --git a/gnustep-base/gnustep-make/Manifest b/gnustep-base/gnustep-make/Manifest
index 3de195faf5b2..49bf036da854 100644
--- a/gnustep-base/gnustep-make/Manifest
+++ b/gnustep-base/gnustep-make/Manifest
@@ -9,16 +9,17 @@ AUX gnustep-make-2.0.1-destdir.patch 975 RMD160 c2647803d412c954b546e4352310705a
 DIST gnustep-make-2.4.0.tar.gz 521818 RMD160 6f1dd81039c9935e41eb7988923c3b3c6507e383 SHA1 afda14186394c65b0871dba93f92dc965b2fc724 SHA256 8ad6c9d0e532e0bf70fdc25abe60afbd4103b16dc47b324646a147cbac6c6ef9
 DIST gnustep-make-2.6.0.tar.gz 564848 RMD160 05421b3ac78467abe798937905eee81316d2b286 SHA1 e3cd5dd9d1f0314c66e6e45b5e5bf9b2513f9be4 SHA256 db8312a0fc637d5c66c11c33ec51b1ecc0c693091ec06ca39ebac43ca0f27828
 DIST gnustep-make-2.6.1.tar.gz 565262 RMD160 a72970e1bf0fa93622981e991717714795cdb7a5 SHA1 32144e6f9474dff0001372ade68674620f9ed20c SHA256 c48b0a4c85eee4799b12cceeb327c470b168100cbcda4f111b1edad71f8762eb
+DIST gnustep-make-2.6.2.tar.gz 562770 RMD160 683b6a034d4bb7e17b64209c7e7e289e9e94a042 SHA1 3f85cb25f4f7fd35cdcbd8d948a2673c84c605ff SHA256 7a95b3fc5bf14f6b06c4f1f716b48e9de13a11c1fa972aa3cc87736cd98f3e3a
 EBUILD gnustep-make-2.4.0.ebuild 2335 RMD160 fb557f9e3ccbbe3c9d6505b5ea0240c5bf45be4f SHA1 6f8d32ff50ebe43e7697cde8f3f2c9307858430c SHA256 3efca9d4073527e756cfbc562cef3eb4b9c0dd09032be33ff89fe9be141883a1
 EBUILD gnustep-make-2.6.0.ebuild 2488 RMD160 4269a947fe5c159525e1f9773913889d03fe7812 SHA1 4f916eb0f834a930ccede5e3fc0a0f0a29a76b01 SHA256 cb622ead93fe859763c2266979ab02f27e3c578ef639c1e08b59352f895bb208
 EBUILD gnustep-make-2.6.1-r1.ebuild 2486 RMD160 46faa0e60887bea22eb5a4b585c5818be1255e27 SHA1 cdce750b077ccbfee4512f3aa0e6047f82834107 SHA256 f1ed6fbd1c5c1443662e4d330c9db4b16fb2eea7565f87637f925904bd6041a6
-EBUILD gnustep-make-2.6.1-r10.ebuild 3174 RMD160 f5dbd8c771e363fc32e832454ba841298f8b7c16 SHA1 08a539333714fd27d0be6a9d1a3a99fd3141dfd0 SHA256 0ce22ce5696dff21708b57242871371a7c6fffeafa9fd2341c0db0c2a2dce4c1
-MISC ChangeLog 18973 RMD160 d0e0d7c8f85813f52b1482b5b7124d97246eff9a SHA1 da829433d0d304f68990b0e48c4256a9e0a69e71 SHA256 01eed7c5fd2254526b5df38252d9f95368615b5f1ad25d43eccea767d987b52a
-MISC metadata.xml 878 RMD160 040030753aa6de3e343683170957635dc27ac87a SHA1 b599426fe73d3ef8a475a18645837ab752dbe370 SHA256 bdc7f31bed55e3e84eed17e132b69e96bad0b7633186f350d391c358ff0f7595
+EBUILD gnustep-make-2.6.2.ebuild 3104 RMD160 da148aff58cf803fd6c36553619580b1f8077701 SHA1 9f23c8b94e1961867feae9c3781f6cf99c7fbecd SHA256 a1a6a5287d39e53ef80afe791b4c8856438ddbde6719dcd453042521e01c9d5e
+MISC ChangeLog 19215 RMD160 93a454cb462e180aad1e858acf3e89a8d0440528 SHA1 aaac05ebe76e1f023f16fa1fc26b95952c1b52fa SHA256 0f102ca6a91f2de7fbddee0529e842b23e22dde6e4b80964b115e69ae905155f
+MISC metadata.xml 898 RMD160 b9f3536bfebd8b110106c0acd25867ee18ee8913 SHA1 5c8af107c44ff235ab4817c553059aaee486af36 SHA256 00307fc5770d94f69c9c30ce99884a198bb71c5a14e85454b9bf164abc1f8b0f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk3wlr4ACgkQFYEBGcdFJfIcOwD9GGoeBh+cQoMsc/L73QkRmQP3
-JCvSCs5egJ/1UdLrduQBAIvwoz4E1rctLH7+xf64Jz7YieCjSlAvNj9ohDLqLHWC
-=VLx2
+iF4EAREIAAYFAk8yiMMACgkQFYEBGcdFJfJTdwD6Amxcx6HFnAd9z07GMsSIfsGv
+vHg68tVqGZP+aehonRUA/1WtCHMoJkIGnv54Nn10Nb0yE6sD2Dk/cdhl3bFe4uR2
+=VXYF
 -----END PGP SIGNATURE-----
diff --git a/gnustep-base/gnustep-make/gnustep-make-2.6.1-r10.ebuild b/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild
index 09f701b30d32..689194fdaf7f 100644
--- a/gnustep-base/gnustep-make/gnustep-make-2.6.1-r10.ebuild
+++ b/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.6.1-r10.ebuild,v 1.2 2011/06/09 09:47:21 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild,v 1.1 2012/02/08 14:37:37 voyageur Exp $
 
-EAPI="3"
+EAPI=4
 
 inherit gnustep-base eutils prefix
 
@@ -16,21 +16,21 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="${GNUSTEP_CORE_DEPEND}
-	>=sys-devel/gcc-3.3[objc]
 	>=sys-devel/make-3.75
 	libobjc2? ( gnustep-base/libobjc2
 		>=sys-devel/clang-2.9 )
-	!libobjc2? ( !gnustep-base/libobjc2 )"
+	!libobjc2? ( !gnustep-base/libobjc2
+		>=sys-devel/gcc-3.3[objc] )"
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
 	if ( use libobjc2 && ! has_version gnustep-base/gnustep-make[libobjc2] ) || \
 		( ! use libobjc2 && has_version gnustep-base/gnustep-make[libobjc2] ) || \
-		( use libobjc2 && has_version <=gnustep-base-2.6.1-r1 ) ; then
-		ewarn "TOGGLED liobjc2 USE-FLAG WARNING:"
+		( use libobjc2 && has_version <gnustep-base-2.6.2 ) ; then
+		ewarn "TOGGLED libobjc2 USE-FLAG WARNING:"
 		ewarn "You changed the libojbc2 use-flag"
 		ewarn "You must rebuild all gnustep packages installed."
-		# Suggest gnustep-updater once updated to do the trick
+		# Suggest gnustep-updater once it can do the trick
 	fi
 }
 
@@ -47,22 +47,23 @@ src_configure() {
 		export CC=clang
 	fi
 
-	#--enable-objc-nonfragile-abi: problem with glibc unistd.h (__blocks)
+	#--enable-objc-nonfragile-abi: only working in clang for now
+	#--with-objc-lib-flag: TODO use to force libobjc2 or not
 	econf \
 		--with-layout=fhs-system \
 		--with-config-file="${EPREFIX}"/etc/GNUstep/GNUstep.conf \
-		$(use_enable native-exceptions native-objc-exceptions) \
-		|| die "configure failed"
+		$(use_enable libobjc2 objc-nonfragile-abi) \
+		$(use_enable native-exceptions native-objc-exceptions)
 }
 
 src_compile() {
-	emake || die "compilation 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
 		pushd Documentation &> /dev/null
-		emake all install || die "doc make has failed"
+		emake all install
 		popd &> /dev/null
 	fi
 }
@@ -75,7 +76,7 @@ src_install() {
 	use debug || make_eval="${make_eval} debug=no"
 	make_eval="${make_eval} verbose=yes"
 
-	emake ${make_eval} DESTDIR="${D}" install || die "install has failed"
+	emake ${make_eval} DESTDIR="${D}" install
 
 	# Copy the documentation
 	if use doc ; then
@@ -100,6 +101,4 @@ pkg_postinst() {
 		ewarn "then remerge all packages still installed with the old layout"
 		ewarn "You can use gnustep-base/gnustep-updater for this task"
 	fi
-
-	# TODO warn if libobjc2 flag changed
 }
diff --git a/gnustep-base/gnustep-make/metadata.xml b/gnustep-base/gnustep-make/metadata.xml
index 816a08388d56..10f57cdec6a4 100644
--- a/gnustep-base/gnustep-make/metadata.xml
+++ b/gnustep-base/gnustep-make/metadata.xml
@@ -10,7 +10,7 @@ configuration, building, installation, and packaging.  It also allows
 the user to easily create cross-compiled binaries.
 </longdescription>
 <use>
-	<flag name='libobjc2'>Enables use of the GNUstep Objective-C runtime (<pkg>gnustep-base/libobjc2</pkg>) with <pkg>sys-devel/clang</pkg> compiler</flag>
+	<flag name='libobjc2'>Enables use of the GNUstep Objective-C runtime (<pkg>gnustep-base/libobjc2</pkg>) with non-fragile ABI and <pkg>sys-devel/clang</pkg> compiler</flag>
 	<flag name='native-exceptions'>Enables use of the native Objective-C exception support (@try/@catch/@finally) built-in objective-c exceptions with compilers that support it </flag>
 </use>
 </pkgmetadata>