always build internal libffi, fixes bug 163647

Package-Manager: portage-2.1.2-r12

7 files changed, 47 insertions, 30 deletions

diff --git a/dev-libs/g-wrap/ChangeLog b/dev-libs/g-wrap/ChangeLog
index c1972f680ca1..f3bd2f35873a 100644
--- a/dev-libs/g-wrap/ChangeLog
+++ b/dev-libs/g-wrap/ChangeLog
@@ -1,8 +1,11 @@
 # ChangeLog for dev-libs/g-wrap
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/g-wrap/ChangeLog,v 1.40 2007/02/28 15:10:58 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/g-wrap/ChangeLog,v 1.41 2007/03/02 14:41:51 hkbst Exp $
 
-*g-wrap-1.9.6-r2 (28 Feb 2007)
+  02 Mar 2007; Marijn Schouten <hkBst@gentoo.org>
+  +files/libffi_automagic.patch, -g-wrap-1.9.6-r2.ebuild,
+  +g-wrap-1.9.6-r3.ebuild, -g-wrap-1.9.7-r2.ebuild, +g-wrap-1.9.7-r3.ebuild:
+  always build internal libffi, fixes bug 163647
 
   28 Feb 2007; Marijn Schouten <hkBst@gentoo.org> g-wrap-1.9.6-r2.ebuild files/digest-g-wrap-1.9.6-r2
   fix srfi issues of bug 165763
diff --git a/dev-libs/g-wrap/Manifest b/dev-libs/g-wrap/Manifest
index adca620c569b..54e91eecce89 100644
--- a/dev-libs/g-wrap/Manifest
+++ b/dev-libs/g-wrap/Manifest
@@ -18,6 +18,10 @@ AUX glib_automagic.patch 559 RMD160 d8c378444b3782c727254db86ee6e0c8b6f9e422 SHA
 MD5 2d5f4144b01810e7f881340a90a57531 files/glib_automagic.patch 559
 RMD160 d8c378444b3782c727254db86ee6e0c8b6f9e422 files/glib_automagic.patch 559
 SHA256 ddb7992201efa3d11d663dff41118cc349e137d3e120eef98a746a4a84aabb4c files/glib_automagic.patch 559
+AUX libffi_automagic.patch 375 RMD160 2bf4928628eb39590875678db048b5ac8a220e8d SHA1 a14242b8499369e86483aa3069c879847488040d SHA256 5ae3e082904ebdf6f67092a805cfac6725b295edfd02f0b8b0cd1c595fa2c51f
+MD5 c79401f564476029f27dfb2a3dcede94 files/libffi_automagic.patch 375
+RMD160 2bf4928628eb39590875678db048b5ac8a220e8d files/libffi_automagic.patch 375
+SHA256 5ae3e082904ebdf6f67092a805cfac6725b295edfd02f0b8b0cd1c595fa2c51f files/libffi_automagic.patch 375
 DIST g-wrap-1.3.4.tar.gz 403570 RMD160 64eddd127e24df11067b498d0986d8823f012d76 SHA1 764f1c878e18341bf437f3e1ddc5f8618019bfc2 SHA256 bb9fa9b7b6b2a11899d98d730cf5970179bbf942fd763eda13b7b541278adee4
 DIST g-wrap-1.9.6.tar.gz 826045 RMD160 1e3d86e38061a217b9dde06885301f4a46433d39 SHA1 754116dd5d9af2fe0e1f8386e69721618e0eefdf SHA256 ddb0e31d40581402d6d7045cce7cdc79e0bc0627831a4b12012f45703446d311
 DIST g-wrap-1.9.7.tar.gz 917706 RMD160 ffe665feb1a4f9b527a5e173d697ba2890680dc7 SHA1 403434170d0302f8dbce1c4f85116fa8cd0bba0d SHA256 191f096c0cc5a6c4baac45cb595ebfee3ccba3599babc9fbd03d4c6f1f435355
@@ -25,18 +29,18 @@ EBUILD g-wrap-1.3.4-r1.ebuild 908 RMD160 42d9ba6a1da7a6c5937a70f5da9a9cfc269ca2c
 MD5 449f820c337d499d5838557ec14a7df2 g-wrap-1.3.4-r1.ebuild 908
 RMD160 42d9ba6a1da7a6c5937a70f5da9a9cfc269ca2cd g-wrap-1.3.4-r1.ebuild 908
 SHA256 5785d96923c990c6da1572e00e493a69882d06c28cf18e52e52478be2a8c3b0d g-wrap-1.3.4-r1.ebuild 908
-EBUILD g-wrap-1.9.6-r2.ebuild 1315 RMD160 97e413ef4fa2fa981674bb83d3636763321d2f0d SHA1 9123929d9c78ca2751042f3bdf53ee51ed121009 SHA256 9b096caa0d3d1ffeeae864a365600ae6470a7c8a0bf1b354880ad5035d074e7e
-MD5 cc9da56d78d55e4d345f23f8fe85aa51 g-wrap-1.9.6-r2.ebuild 1315
-RMD160 97e413ef4fa2fa981674bb83d3636763321d2f0d g-wrap-1.9.6-r2.ebuild 1315
-SHA256 9b096caa0d3d1ffeeae864a365600ae6470a7c8a0bf1b354880ad5035d074e7e g-wrap-1.9.6-r2.ebuild 1315
-EBUILD g-wrap-1.9.7-r2.ebuild 1315 RMD160 98b8630fb54f9290734a4e1d84181911fa213050 SHA1 367a9b09cb9b83db297a95c02e3b2bd633bcd51b SHA256 b348520213807d0895bc3d7637fcecf869ee337696062168bdc06d8912aa2226
-MD5 fcba3f8774b3c99947f315a6b13e2f81 g-wrap-1.9.7-r2.ebuild 1315
-RMD160 98b8630fb54f9290734a4e1d84181911fa213050 g-wrap-1.9.7-r2.ebuild 1315
-SHA256 b348520213807d0895bc3d7637fcecf869ee337696062168bdc06d8912aa2226 g-wrap-1.9.7-r2.ebuild 1315
-MISC ChangeLog 5851 RMD160 2edbe613df38956bbfe581301fb68f60255ae377 SHA1 23b7dc6de3d0f0507098469672c113ff09616a0d SHA256 d56cfe9a5e8207169e60da4c00d6105837ec6f32e7ff70831f20d719978a157f
-MD5 2523698089c8f5921109364ba4fb697f ChangeLog 5851
-RMD160 2edbe613df38956bbfe581301fb68f60255ae377 ChangeLog 5851
-SHA256 d56cfe9a5e8207169e60da4c00d6105837ec6f32e7ff70831f20d719978a157f ChangeLog 5851
+EBUILD g-wrap-1.9.6-r3.ebuild 1298 RMD160 41786c85af543dd963b1dd03402b5fbf4afc0461 SHA1 d49a8969395960cdb1fb45b6a6296703735601f6 SHA256 a5a704c928d9859069fbedb188711e660bb15afe2c8253e7a65a6e320e5d83dd
+MD5 4ffdf9a4d037b8d766b8a61d79817963 g-wrap-1.9.6-r3.ebuild 1298
+RMD160 41786c85af543dd963b1dd03402b5fbf4afc0461 g-wrap-1.9.6-r3.ebuild 1298
+SHA256 a5a704c928d9859069fbedb188711e660bb15afe2c8253e7a65a6e320e5d83dd g-wrap-1.9.6-r3.ebuild 1298
+EBUILD g-wrap-1.9.7-r3.ebuild 1356 RMD160 97b03838e966e2ce535f2ff27e43a92e25795b49 SHA1 02dbf7ce6183469d11712d9ac7b2220c6e787987 SHA256 2e804f028fa51b65616122ffd67a0e786f549845ceadd1e54255308565480087
+MD5 444bb8d67850cb4cb48b512ae1bdff2c g-wrap-1.9.7-r3.ebuild 1356
+RMD160 97b03838e966e2ce535f2ff27e43a92e25795b49 g-wrap-1.9.7-r3.ebuild 1356
+SHA256 2e804f028fa51b65616122ffd67a0e786f549845ceadd1e54255308565480087 g-wrap-1.9.7-r3.ebuild 1356
+MISC ChangeLog 6054 RMD160 b7ea183664d750ea14f6d4c25d8d6f39ae7433a4 SHA1 ed487eb9215e1a723c01a9c543fde4e50f0385ff SHA256 4bdbca4a79aa22b10759412e961990eb48ccb692906f27b00825e6461ece7b43
+MD5 5d051148556c2f911a2bf4a6323b1e33 ChangeLog 6054
+RMD160 b7ea183664d750ea14f6d4c25d8d6f39ae7433a4 ChangeLog 6054
+SHA256 4bdbca4a79aa22b10759412e961990eb48ccb692906f27b00825e6461ece7b43 ChangeLog 6054
 MISC metadata.xml 468 RMD160 110e67df4ca1cc3d6204b0066f1f2503671fc742 SHA1 5627c00d4d4884e9d89a39eeac7e3a7cf51e6a44 SHA256 99779e068e75c9c4ceb9bc64b787f1c944ff1f3e45e659bee5eb04835498a936
 MD5 cb23790b246158fbaee5857f8ee9dea4 metadata.xml 468
 RMD160 110e67df4ca1cc3d6204b0066f1f2503671fc742 metadata.xml 468
@@ -44,9 +48,9 @@ SHA256 99779e068e75c9c4ceb9bc64b787f1c944ff1f3e45e659bee5eb04835498a936 metadata
 MD5 49072b71a0893483af97a027ec66c35c files/digest-g-wrap-1.3.4-r1 238
 RMD160 421b33f9403adfcf66dd0cdde7b488595b6758e9 files/digest-g-wrap-1.3.4-r1 238
 SHA256 be550d35c33e688f49c5da74b5439c7d89058af43b5b4a6421837e271b7cd522 files/digest-g-wrap-1.3.4-r1 238
-MD5 417daeca72cd92c7ed56c95b01dda85a files/digest-g-wrap-1.9.6-r2 238
-RMD160 15950b5c477c0c423a4e794f92a384ec98652b3f files/digest-g-wrap-1.9.6-r2 238
-SHA256 c300467065e5bfcbf694a59d0a1b0b6bd416760dc6705dd536cfbc1332247b85 files/digest-g-wrap-1.9.6-r2 238
-MD5 37000183ad6896bcc388dbf244e12ad8 files/digest-g-wrap-1.9.7-r2 238
-RMD160 3c46d0df2f2ecd0dbd55902b941a38065aa85fc0 files/digest-g-wrap-1.9.7-r2 238
-SHA256 e31944bc17cdcbb6bc46e819672d07805eb30c18890050e3fc294eec62534cd6 files/digest-g-wrap-1.9.7-r2 238
+MD5 417daeca72cd92c7ed56c95b01dda85a files/digest-g-wrap-1.9.6-r3 238
+RMD160 15950b5c477c0c423a4e794f92a384ec98652b3f files/digest-g-wrap-1.9.6-r3 238
+SHA256 c300467065e5bfcbf694a59d0a1b0b6bd416760dc6705dd536cfbc1332247b85 files/digest-g-wrap-1.9.6-r3 238
+MD5 37000183ad6896bcc388dbf244e12ad8 files/digest-g-wrap-1.9.7-r3 238
+RMD160 3c46d0df2f2ecd0dbd55902b941a38065aa85fc0 files/digest-g-wrap-1.9.7-r3 238
+SHA256 e31944bc17cdcbb6bc46e819672d07805eb30c18890050e3fc294eec62534cd6 files/digest-g-wrap-1.9.7-r3 238
diff --git a/dev-libs/g-wrap/files/digest-g-wrap-1.9.6-r2 b/dev-libs/g-wrap/files/digest-g-wrap-1.9.6-r3
index 79764f2c6023..79764f2c6023 100644
--- a/dev-libs/g-wrap/files/digest-g-wrap-1.9.6-r2
+++ b/dev-libs/g-wrap/files/digest-g-wrap-1.9.6-r3
diff --git a/dev-libs/g-wrap/files/digest-g-wrap-1.9.7-r2 b/dev-libs/g-wrap/files/digest-g-wrap-1.9.7-r3
index 1829f97f18cf..1829f97f18cf 100644
--- a/dev-libs/g-wrap/files/digest-g-wrap-1.9.7-r2
+++ b/dev-libs/g-wrap/files/digest-g-wrap-1.9.7-r3
diff --git a/dev-libs/g-wrap/files/libffi_automagic.patch b/dev-libs/g-wrap/files/libffi_automagic.patch
new file mode 100644
index 000000000000..1cb6b1535225
--- /dev/null
+++ b/dev-libs/g-wrap/files/libffi_automagic.patch
@@ -0,0 +1,11 @@
+--- configure.ac.old	2007-03-02 15:20:54.000000000 +0100
++++ configure.ac	2007-03-02 15:21:08.000000000 +0100
+@@ -55,7 +55,7 @@
+ dnl
+ 
+ dnl libffi
+-ar_WITH_LIB_LIBFFI([have_libffi=yes], [have_libffi=no])
++ar_WITH_LIB_LIBFFI([have_libffi=no], [have_libffi=no])
+ LIBFFI_CFLAGS_INSTALLED="$LIBFFI_CFLAGS"
+ LIBFFI_LIBS_INSTALLED="$LIBFFI_LIBS"
+ if test "$have_libffi" = no; then
diff --git a/dev-libs/g-wrap/g-wrap-1.9.6-r2.ebuild b/dev-libs/g-wrap/g-wrap-1.9.6-r3.ebuild
index dea4be9b2fb5..03628a2db1d7 100644
--- a/dev-libs/g-wrap/g-wrap-1.9.6-r2.ebuild
+++ b/dev-libs/g-wrap/g-wrap-1.9.6-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/g-wrap/g-wrap-1.9.6-r2.ebuild,v 1.1 2007/02/28 15:10:58 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/g-wrap/g-wrap-1.9.6-r3.ebuild,v 1.1 2007/03/02 14:41:51 hkbst Exp $
 
 inherit eutils autotools
 
@@ -13,10 +13,7 @@ SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
 
-DEPEND="dev-scheme/guile
-	=dev-libs/glib-2*"
-# seems not to work. g-wrap builds its own libffi-4.0.1
-# dev-libs/libffi
+DEPEND="dev-scheme/guile =dev-libs/glib-2* !dev-libs/libffi"
 
 RDEPEND="${DEPEND}"
 
@@ -27,6 +24,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch ${FILESDIR}/${P}_glib_automagic.patch
+	epatch ${FILESDIR}/libffi_automagic.patch
 	AT_M4DIR="${S}/m4" eautoreconf
 }
 
@@ -34,12 +32,12 @@ src_unpack() {
 src_compile() {
 	econf --with-glib
 	emake -j1 || die 'make failed'
-#	emake -j1 -C libffi || die 'make libffi failed'
+	emake -j1 -C libffi || die 'make libffi failed'
 }
 
 src_install () {
 	emake -j1 DESTDIR="${D}" install || die "make install failed"
-#	emake -C libffi -j1 DESTDIR="${D}" install || die 'make libffi failed'
+	emake -C libffi -j1 DESTDIR="${D}" install || die 'make libffi failed'
 	dodoc AUTHORS ChangeLog NEWS README THANKS
 	insinto /usr/share/guile/site/srfi
 	doins lib/srfi/srfi*
diff --git a/dev-libs/g-wrap/g-wrap-1.9.7-r2.ebuild b/dev-libs/g-wrap/g-wrap-1.9.7-r3.ebuild
index 92af0481f52d..9c20697eadf2 100644
--- a/dev-libs/g-wrap/g-wrap-1.9.7-r2.ebuild
+++ b/dev-libs/g-wrap/g-wrap-1.9.7-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/g-wrap/g-wrap-1.9.7-r2.ebuild,v 1.4 2007/02/28 15:10:58 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/g-wrap/g-wrap-1.9.7-r3.ebuild,v 1.1 2007/03/02 14:41:51 hkbst Exp $
 
 inherit eutils autotools
 
@@ -27,6 +27,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch ${FILESDIR}/${P}_glib_automagic.patch
+	epatch ${FILESDIR}/libffi_automagic.patch
 	AT_M4DIR="${S}/m4" eautoreconf
 }
 
@@ -34,12 +35,12 @@ src_unpack() {
 src_compile() {
 	econf --with-glib
 	emake -j1 || die 'make failed'
-#	emake -j1 -C libffi || die 'make libffi failed'
+	emake -j1 -C libffi || die 'make libffi failed'
 }
 
 src_install () {
 	emake -j1 DESTDIR="${D}" install || die "make install failed"
-#	emake -C libffi -j1 DESTDIR="${D}" install || die 'make libffi failed'
+	emake -C libffi -j1 DESTDIR="${D}" install || die 'make libffi failed'
 	dodoc AUTHORS ChangeLog NEWS README THANKS
 	insinto /usr/share/guile/site/srfi
 	doins lib/srfi/srfi*