Fix deps, add boehm-gc support

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

4 files changed, 28 insertions, 17 deletions

diff --git a/gnustep-base/libobjc2/ChangeLog b/gnustep-base/libobjc2/ChangeLog
index cd9cb7961bdf..9c871327d2a1 100644
--- a/gnustep-base/libobjc2/ChangeLog
+++ b/gnustep-base/libobjc2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnustep-base/libobjc2
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/libobjc2/ChangeLog,v 1.7 2011/11/24 10:54:08 voyageur Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/libobjc2/ChangeLog,v 1.8 2012/02/14 18:49:56 voyageur Exp $
+
+  14 Feb 2012; Bernard Cafarelli <voyageur@gentoo.org> libobjc2-1.6.ebuild,
+  metadata.xml:
+  Fix deps, add boehm-gc support
 
 *libobjc2-1.6 (24 Nov 2011)
 
diff --git a/gnustep-base/libobjc2/Manifest b/gnustep-base/libobjc2/Manifest
index 6ad9be7e2cdc..5d3f3ded10fb 100644
--- a/gnustep-base/libobjc2/Manifest
+++ b/gnustep-base/libobjc2/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-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
 DIST libobjc2-1.6.tar.bz2 114767 RMD160 17beadf52dea0b78dd9bede01f5c944561fdbd09 SHA1 2b092eb3cfa577207456c70b56e6643899790214 SHA256 cad4556d612e871f60ae19531474045075fab3ffab055f76140e3fed30a0c51d
-EBUILD libobjc2-1.6.ebuild 1220 RMD160 6fc3a353e41dbb577ea48770f3d1face036c1e0b SHA1 0bb2f1d1699c3e50fd02d7735670f302da098315 SHA256 2c1557918e4d57f704a36e745584a1c92c4e4ff9b62feb334af14d2ea83abba3
-MISC ChangeLog 1448 RMD160 af6100bc108c81c916eecaead7eae4038597743f SHA1 5aa262517df20b1105a86a6f5e8d1e9bf035f0d5 SHA256 03eea48b26c8121025329b6386887ffe1d371de0aa9abb23426886234bacf994
-MISC metadata.xml 1000 RMD160 f690d496d08d713b6e13cf667c108a8c34afb69a SHA1 9f0e5c27c268d04c28f0fd053ce8a7f542522726 SHA256 1ebede837fa5494828df361bba9f025ea5fe7cd5cc6720656560e6b2ee4af1df
+EBUILD libobjc2-1.6.ebuild 1300 RMD160 d3de68dc190433b8c4fc14566b9dc992a680673e SHA1 c1bef32b78bfb4193b0c41d4d3feb5affc6d9aa0 SHA256 9663fe96be7f42ed76f88d46174d0066140ba91a3f5844dbd7c405341398262b
+MISC ChangeLog 1574 RMD160 986b514cfb454b488da8c2e102bd7a7fbfdca4c1 SHA1 a27ca47fa331c5341efa0c9f76cd6621520ae71a SHA256 93451eaf3e8346df2dfd4fd4dcb079701d01ac511df49db3b0ad3efb3f5c3e80
+MISC metadata.xml 1114 RMD160 4a8d8eea03ec08881a4534bbb117e9509518a1d1 SHA1 a1412593a8e89c9f557a266e36e471ea265cdc6f SHA256 5bf988d868cac8a9526729cf13365a8dea7ea99f5ef0ada7c85a3855219e6024
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7OIl8ACgkQFYEBGcdFJfJGvwD/cKGPFQhySvsxz+gDkJJRhRl9
-emPk4/1IWpQkD3OsZRIA/0FQSY37i3Qh34lrjdMxK5ptY0HwMiVjOvw/qVRIMnGI
-=z+S2
+iF4EAREIAAYFAk86rN8ACgkQFYEBGcdFJfIZ6wD7BF7ZpjlzExoV5T7gpSp/UEUu
+K1B32NjIfSaWGW/yHm0BAJXAjoc5NprDj1YNcnETrGr2FXAQhII9jodQ1e/2zvOC
+=WDYI
 -----END PGP SIGNATURE-----
diff --git a/gnustep-base/libobjc2/libobjc2-1.6.ebuild b/gnustep-base/libobjc2/libobjc2-1.6.ebuild
index e88e4daa1c58..8d86be5170c4 100644
--- a/gnustep-base/libobjc2/libobjc2-1.6.ebuild
+++ b/gnustep-base/libobjc2/libobjc2-1.6.ebuild
@@ -1,13 +1,13 @@
-# 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/libobjc2/libobjc2-1.6.ebuild,v 1.1 2011/11/24 10:54:08 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/libobjc2/libobjc2-1.6.ebuild,v 1.2 2012/02/14 18:49:56 voyageur Exp $
 
 EAPI=4
 inherit multilib
 
 # We need gnustep-make, but gnustep-make can depend on libobjc
 # Use a temporary setup to install in /usr/
-GSMAKE=gnustep-make-2.6.1
+GSMAKE=gnustep-make-2.6.2
 DESCRIPTION="GNUstep Objective-C runtime"
 HOMEPAGE="http://www.gnustep.org"
 SRC_URI="http://download.gna.org/gnustep/${P}.tar.bz2
@@ -16,11 +16,10 @@ SRC_URI="http://download.gna.org/gnustep/${P}.tar.bz2
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="+boehm-gc"
 
-DEPEND=">=sys-devel/gcc-3.3[objc]
-	>=sys-devel/make-3.75"
-RDEPEND=""
+DEPEND="boehm-gc? ( dev-libs/boehm-gc )"
+RDEPEND="${DEPEND}"
 
 GSMAKE_S=${WORKDIR}/${GSMAKE}
 
@@ -37,7 +36,11 @@ src_configure() {
 }
 
 src_compile() {
-	emake GNUSTEP_MAKEFILES="${GSMAKE_S}" messages=yes
+	local gb
+	use boehm-gc \
+		&& gb="boehm_gc=yes" \
+		|| gb="boehm_gc=no"
+	emake GNUSTEP_MAKEFILES="${GSMAKE_S}" messages=yes ${gb}
 }
 
 src_install() {
diff --git a/gnustep-base/libobjc2/metadata.xml b/gnustep-base/libobjc2/metadata.xml
index 6d5c816014c3..add917dae4e5 100644
--- a/gnustep-base/libobjc2/metadata.xml
+++ b/gnustep-base/libobjc2/metadata.xml
@@ -24,4 +24,8 @@ Both ABIs support the following feature above and beyond the GCC runtime:
 - Type-dependent dispatch, eliminating stack corruption from mismatched
   selectors.
 </longdescription>
+<use>
+	<flag name='boehm-gc'>Enable Hans Boehm's garbage collector
+		(<pkg>dev-libs/boehm-gc</pkg>)</flag>
+</use>
 </pkgmetadata>