Remove support for gcc's libffi because it's conflicting with dev-libs/libffi in ld.so.conf.

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

4 files changed, 15 insertions, 18 deletions

diff --git a/dev-python/pygobject/ChangeLog b/dev-python/pygobject/ChangeLog
index 233df990c582..7ddb228b7276 100644
--- a/dev-python/pygobject/ChangeLog
+++ b/dev-python/pygobject/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/pygobject
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.82 2009/10/11 15:56:08 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.83 2009/10/14 09:56:39 ssuominen Exp $
+
+  14 Oct 2009; Samuli Suominen <ssuominen@gentoo.org>
+  pygobject-2.14.2.ebuild, pygobject-2.15.4.ebuild:
+  Remove support for gcc's libffi because it's conflicting with
+  dev-libs/libffi in ld.so.conf.
 
   11 Oct 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   pygobject-2.18.0-r2.ebuild:
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index 493cd813cba0..f6c7e0e5a20c 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -10,12 +10,12 @@ DIST pygobject-2.16.0.tar.bz2 515503 RMD160 509cddab25ab084706bc69d3c6c90f490251
 DIST pygobject-2.16.1.tar.bz2 522347 RMD160 37f4075af9c06aba4fca47e2580c5408dbc28845 SHA1 12ce140438e7ff7e1a26fe4bba9a26b49f80ec0d SHA256 ee229c642759470a242c7f6ce3bd969a7484496f95570a8783859b03d6d79cc5
 DIST pygobject-2.18.0.tar.bz2 639205 RMD160 db454107949b0e797c6c151aa426368ef0f59317 SHA1 f800eda7978fe9813600cfdda973da15c3178bb0 SHA256 b11b840ae31e6e644986806ee3400f4528b803d07b6cee26add45e0f2e5e622b
 EBUILD pygobject-2.14.0.ebuild 2433 RMD160 74d4f3ac7c36b394ce35f7f7296378b601acc076 SHA1 96bea289811b38c8e4be289f0dad100406037fcb SHA256 b85959bceec48b5e53f5a54bbdb096067cc86b7c4cddd02acd580cc72e95c382
-EBUILD pygobject-2.14.2.ebuild 2730 RMD160 3f120f703b72796e7df2357736c57ecfb1d241f0 SHA1 281072730a66e5fbae6139f3f0f58df6cdcecd35 SHA256 de145e00a6c38282d4e33e3b781b9c7e1c83d13418b091a374d25c4cec67f7f9
-EBUILD pygobject-2.15.4.ebuild 2186 RMD160 49d3a224ca0a05e605c05f0da58c5f5da5105c16 SHA1 2a746379f3654489be2543d630ff7105292bf857 SHA256 bc1524f543681f56ac244abec54e642eb3dd66b9c72dcb51e9572aec0862b68d
+EBUILD pygobject-2.14.2.ebuild 2594 RMD160 bef6710cdb877ff97272871aaace84d81f9b93ba SHA1 d86de671dd33a78a17b2ddc3942e3d3b0d4e3c90 SHA256 4ca96184de921be9875a9098063109bd00bb1a0f22986babfdd723625fa132b0
+EBUILD pygobject-2.15.4.ebuild 2050 RMD160 7fb956f10d2e924c3813a260eec63d3853806bb8 SHA1 e9dd957746d723824b9b9498e7475061985359b1 SHA256 4fbf686349def20bc8898b225117de4edbfd9101a3e80bdf7a38c9ba8012b5f1
 EBUILD pygobject-2.16.0.ebuild 2295 RMD160 03069f9f486c6e21d32a9ce5c0d7098197df814c SHA1 8c0f2c1fb4f4c8de181e08740fbb6bf4a86509b6 SHA256 989117c44b877704dc96b3e61b9869c8365a472862c123b65601e0f2c93862c6
 EBUILD pygobject-2.16.1-r1.ebuild 2191 RMD160 69e472fb5e6fed2a29e3ef0adcd288791298b415 SHA1 3119f2852aa3ff9220af26560076809ae69f0e3d SHA256 1236fd892a156d5c549ca5171aa8fc57447596319fc168d14c0a1c7a2dcf5d60
 EBUILD pygobject-2.16.1.ebuild 2284 RMD160 035b3fe2fa009485734c8618d701c195f8c5c594 SHA1 bbe684b63e42890a71c3b61d7faba17a61187864 SHA256 c44843fe43db7350c23d4f2d9112be8f91967939b73fca5482be5cc76a78814e
 EBUILD pygobject-2.18.0-r2.ebuild 3542 RMD160 b9550c94def359a0fd352b1c61053f550269fcda SHA1 aa93408ac4eb26c6ed136fd1fc8001b209330aa8 SHA256 f7a726ff632c1b8de6a505bc871feca528d75919c175496246a09beee7f3ecb9
 EBUILD pygobject-2.18.0.ebuild 2467 RMD160 566299b75231dd6e6c51f9a2aa3d0283ec9c99fa SHA1 5d823b29adc50e95585628f558c28c34c62b5708 SHA256 8cff760264dee195549a672b0b0591181d0dbbc7b5f16060fc619d7d1e92d0ed
-MISC ChangeLog 11432 RMD160 b95ee61ee9d95b2eca06f890b29772eea8ea69be SHA1 9c4812aed4688897017999d6a8652b648ad73c9d SHA256 d3109114cc2703d4b17cce60c1f0567729a228269ea45751e6493498b14d68b2
+MISC ChangeLog 11637 RMD160 f2922d3eb98ce37d6f2f480e9e1c9c6ec6a201a6 SHA1 11658ce9f4d0e4d067100004579f0d54edb080b3 SHA256 022114a24913b2a4c88a977b502bbe97c6472a8df7eb06c750683e94e41758f7
 MISC metadata.xml 282 RMD160 32fd779b50e24af15b5d30862d362cef786e2930 SHA1 6603342ce4d848c26dd1a585eeebc1b84198f2fa SHA256 116a6827697ff69c8f1971077502e9fa2b0d2fd23e57c97d4b54b3d1495597ca
diff --git a/dev-python/pygobject/pygobject-2.14.2.ebuild b/dev-python/pygobject/pygobject-2.14.2.ebuild
index de53ff13914a..2da5a39e919c 100644
--- a/dev-python/pygobject/pygobject-2.14.2.ebuild
+++ b/dev-python/pygobject/pygobject-2.14.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.14.2.ebuild,v 1.13 2009/08/16 22:49:57 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.14.2.ebuild,v 1.14 2009/10/14 09:56:39 ssuominen Exp $
 
 inherit alternatives gnome2 python autotools virtualx
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.pygtk.org/"
 LICENSE="LGPL-2"
 SLOT="2"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
-IUSE="doc examples libffi"
+IUSE="doc examples"
 RESTRICT="test"
 
 # glib higher dep than in configure.in comes from a runtime version check and ensures that
@@ -26,11 +26,7 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS ChangeLog NEWS README"
 
 pkg_setup() {
-	if use libffi && ! built_with_use sys-devel/gcc libffi; then
-		eerror "libffi support not found in sys-devel/gcc." && die
-	fi
-
-	G2CONF="${G2CONF} $(use_enable doc docs) $(use_with libffi)"
+	G2CONF="${G2CONF} $(use_enable doc docs) --without-libffi"
 }
 
 src_unpack() {
diff --git a/dev-python/pygobject/pygobject-2.15.4.ebuild b/dev-python/pygobject/pygobject-2.15.4.ebuild
index e5ad940aa435..c21773027bbf 100644
--- a/dev-python/pygobject/pygobject-2.15.4.ebuild
+++ b/dev-python/pygobject/pygobject-2.15.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.15.4.ebuild,v 1.3 2009/08/16 22:49:57 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.15.4.ebuild,v 1.4 2009/10/14 09:56:39 ssuominen Exp $
 
 inherit alternatives autotools gnome2 python virtualx
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.pygtk.org/"
 LICENSE="LGPL-2"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc examples libffi"
+IUSE="doc examples"
 
 RDEPEND=">=dev-lang/python-2.4.4-r5
 	>=dev-libs/glib-2.16
@@ -22,11 +22,7 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS ChangeLog NEWS README"
 
 pkg_setup() {
-	if use libffi && ! built_with_use sys-devel/gcc libffi; then
-		eerror "libffi support not found in sys-devel/gcc." && die
-	fi
-
-	G2CONF="${G2CONF} $(use_enable doc docs) $(use_with libffi)"
+	G2CONF="${G2CONF} $(use_enable doc docs) --without-libffi"
 }
 
 src_unpack() {