From: Marijn Schouten <hkbst@gentoo.org>
Date: Sat, 3 Mar 2007 12:12:01 +0000 (+0000)
Subject: only block libffi-4*
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4ea49633790c3123c96baf9906ce125813c3991d;p=gentoo.git

only block libffi-4*
Package-Manager: portage-2.1.2-r13
---

diff --git a/dev-libs/g-wrap/ChangeLog b/dev-libs/g-wrap/ChangeLog
index f3bd2f35873a..2107fce9828d 100644
--- a/dev-libs/g-wrap/ChangeLog
+++ b/dev-libs/g-wrap/ChangeLog
@@ -1,6 +1,10 @@
 # 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.41 2007/03/02 14:41:51 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/g-wrap/ChangeLog,v 1.42 2007/03/03 12:12:01 hkbst Exp $
+
+  03 Mar 2007; Marijn Schouten <hkBst@gentoo.org> g-wrap-1.9.6-r3.ebuild,
+  g-wrap-1.9.7-r3.ebuild:
+  only block libffi-4*
 
   02 Mar 2007; Marijn Schouten <hkBst@gentoo.org>
   +files/libffi_automagic.patch, -g-wrap-1.9.6-r2.ebuild,
diff --git a/dev-libs/g-wrap/Manifest b/dev-libs/g-wrap/Manifest
index 54e91eecce89..7a6ecf3c082b 100644
--- a/dev-libs/g-wrap/Manifest
+++ b/dev-libs/g-wrap/Manifest
@@ -29,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-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
+EBUILD g-wrap-1.9.6-r3.ebuild 1302 RMD160 45f219215a48f06be1bef41958232dd3ba952a99 SHA1 7a0fa274890f8226de39ac92221bbe534e7f82e0 SHA256 6ed6723bad55da98d8b31c5212818d5860c2f27e22fbfb99a75cfdd0c4bad3f8
+MD5 92123b188bfd89a83fcbe084316244e8 g-wrap-1.9.6-r3.ebuild 1302
+RMD160 45f219215a48f06be1bef41958232dd3ba952a99 g-wrap-1.9.6-r3.ebuild 1302
+SHA256 6ed6723bad55da98d8b31c5212818d5860c2f27e22fbfb99a75cfdd0c4bad3f8 g-wrap-1.9.6-r3.ebuild 1302
+EBUILD g-wrap-1.9.7-r3.ebuild 1302 RMD160 0bd386efe721a6a146384aca326536bbfe466241 SHA1 1880b97c0dab8d8324a26b9a865c2b6d2b41d104 SHA256 865eb7cd4d2333020b64322344c6fb01afcbb59ebc62610f217d256a3955122d
+MD5 feceb920ed7c30c7569ebcc854e58616 g-wrap-1.9.7-r3.ebuild 1302
+RMD160 0bd386efe721a6a146384aca326536bbfe466241 g-wrap-1.9.7-r3.ebuild 1302
+SHA256 865eb7cd4d2333020b64322344c6fb01afcbb59ebc62610f217d256a3955122d g-wrap-1.9.7-r3.ebuild 1302
+MISC ChangeLog 6178 RMD160 e9f75a20200f15f59360be79d49769268cac774d SHA1 2323e24a2603fc2e41f282656a16e427b8c8bc34 SHA256 aafa2d75ed47d7da429619bde7f593e72131b2314bf79e2fb784d3100373682a
+MD5 7fdc76b9ce6f9165d944a7c5a5cb2f8b ChangeLog 6178
+RMD160 e9f75a20200f15f59360be79d49769268cac774d ChangeLog 6178
+SHA256 aafa2d75ed47d7da429619bde7f593e72131b2314bf79e2fb784d3100373682a ChangeLog 6178
 MISC metadata.xml 468 RMD160 110e67df4ca1cc3d6204b0066f1f2503671fc742 SHA1 5627c00d4d4884e9d89a39eeac7e3a7cf51e6a44 SHA256 99779e068e75c9c4ceb9bc64b787f1c944ff1f3e45e659bee5eb04835498a936
 MD5 cb23790b246158fbaee5857f8ee9dea4 metadata.xml 468
 RMD160 110e67df4ca1cc3d6204b0066f1f2503671fc742 metadata.xml 468
diff --git a/dev-libs/g-wrap/g-wrap-1.9.6-r3.ebuild b/dev-libs/g-wrap/g-wrap-1.9.6-r3.ebuild
index 03628a2db1d7..d5665ef7585e 100644
--- a/dev-libs/g-wrap/g-wrap-1.9.6-r3.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-r3.ebuild,v 1.1 2007/03/02 14:41:51 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/g-wrap/g-wrap-1.9.6-r3.ebuild,v 1.2 2007/03/03 12:12:01 hkbst Exp $
 
 inherit eutils autotools
 
@@ -13,7 +13,7 @@ SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
 
-DEPEND="dev-scheme/guile =dev-libs/glib-2* !dev-libs/libffi"
+DEPEND="dev-scheme/guile =dev-libs/glib-2* !=dev-libs/libffi-4*"
 
 RDEPEND="${DEPEND}"
 
diff --git a/dev-libs/g-wrap/g-wrap-1.9.7-r3.ebuild b/dev-libs/g-wrap/g-wrap-1.9.7-r3.ebuild
index 9c20697eadf2..84090896c339 100644
--- a/dev-libs/g-wrap/g-wrap-1.9.7-r3.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-r3.ebuild,v 1.1 2007/03/02 14:41:51 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/g-wrap/g-wrap-1.9.7-r3.ebuild,v 1.2 2007/03/03 12:12:01 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-4*"
 
 RDEPEND="${DEPEND}"