srfi-3[45] are provided by guile-lib, so don't install them anymore, bug 278233

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

5 files changed, 11 insertions, 62 deletions

diff --git a/dev-libs/g-wrap/ChangeLog b/dev-libs/g-wrap/ChangeLog
index 5163750a110c..a9753f8921a2 100644
--- a/dev-libs/g-wrap/ChangeLog
+++ b/dev-libs/g-wrap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/g-wrap
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/g-wrap/ChangeLog,v 1.68 2009/07/19 11:10:31 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/g-wrap/ChangeLog,v 1.69 2009/07/19 11:45:58 hkbst Exp $
+
+  19 Jul 2009; Marijn Schouten <hkBst@gentoo.org> g-wrap-1.9.11.ebuild,
+  -g-wrap-1.9.11-r1.ebuild, g-wrap-1.9.12.ebuild:
+  srfi-3[45] are provided by guile-lib, so don't install them anymore, bug
+  278233
 
 *g-wrap-1.9.12 (19 Jul 2009)
 
diff --git a/dev-libs/g-wrap/Manifest b/dev-libs/g-wrap/Manifest
index 6737bcd6e8b0..21aa8c67ff58 100644
--- a/dev-libs/g-wrap/Manifest
+++ b/dev-libs/g-wrap/Manifest
@@ -12,11 +12,10 @@ DIST g-wrap-1.9.6.tar.gz 826045 RMD160 1e3d86e38061a217b9dde06885301f4a46433d39
 DIST g-wrap-1.9.8-gcc-4.2.0.patch.bz2 56607 RMD160 e3b45b1c90fb88fbbbad599ace507caf315513e8 SHA1 61b2c6e18b6c2bec78c8cfe70f6dd050f6f048e7 SHA256 ca7022319847bdc8e4b1453fe7d62f4886627d7f7064be2f9e15ba4c8d9846e1
 DIST g-wrap-1.9.8.tar.gz 964660 RMD160 609f73e608d3676b03660cee78ef2eab3aa24a37 SHA1 5f774c2379e362434d82c5aef4e416a4e8f9cac2 SHA256 ec2258b9b5dfa8f312d853df22d03e9d40384c152644cab3c77fc57db1ceba54
 DIST g-wrap-1.9.9.tar.gz 1057858 RMD160 b38e3333655f544442ce6269668f7a7688ae8731 SHA1 75227eae833df996702e5b475b06693decf187d7 SHA256 175dc9d513f336a041e2a57bc4a7aef91d86b1c48caeb84b7a5f7ed53afdd246
-EBUILD g-wrap-1.9.11-r1.ebuild 1430 RMD160 d30b1bc69386a6b28580022899ddf75b13412575 SHA1 e360268ea5db1f0b81d175b5c8ad998ada279dc6 SHA256 3b81a56b5e5dd073d07ebcd8ab092cc2333a3d9c7cb517ea53d28732bf01f17d
-EBUILD g-wrap-1.9.11.ebuild 1430 RMD160 bd128d2eb1f22b3d3088fc84dbf4fb65d6cba4a0 SHA1 b53262f0720acfb617b333f3cbd5a2c9e36b4662 SHA256 103bcc67ad4857024e5804c8b0de6bebb87658a8e27c3a627865d7ee72920ab1
-EBUILD g-wrap-1.9.12.ebuild 1459 RMD160 692d48d92ad9dbe9d712d35e12b95d81d4524332 SHA1 d13a77fdf63d5d4afbbd4e3f12b3cb2943738ec6 SHA256 44ed14296902a3f8851ed6290ec5848c3fda2a94a2b095d3a6fd4020762fe958
+EBUILD g-wrap-1.9.11.ebuild 1373 RMD160 e61c148befec8dafde85c175004b1d1102aaa3b9 SHA1 0cf2f6cb94f8799a7605f68554f040971bb62728 SHA256 fae49200f68800d2229345c7951611dd201d76996e69d02fd369aaca184da6df
+EBUILD g-wrap-1.9.12.ebuild 1405 RMD160 37c696d5fb13ff9d76d9e524ea403650d1e6e27e SHA1 972cfc3fd33344fd1cd8797e0d4c4f3d166fce12 SHA256 2078e1a9ee7f5f05b8f4a49266484b8cf2b9d6f897eaf6417a7300c8273cc162
 EBUILD g-wrap-1.9.6-r3.ebuild 1354 RMD160 0ccb38664f8c4d2dc040f4c20e1d7e9f02ef40ca SHA1 7aaa5b3369bff35204901936b2f1914a77805384 SHA256 a0e3bca4ddcd0441262234072385f06266dc55af98875a0d04c9974a9ff94f85
 EBUILD g-wrap-1.9.8.ebuild 1610 RMD160 bc6c3de31c78a416f1b565f7d82d9802f05ca439 SHA1 9c3b86316b7072a58b395a9481f0d80c6a125127 SHA256 a5ecfe05748cbeacc17c253e818a0b92e212c1113273fee28fb11b13c3746cbf
 EBUILD g-wrap-1.9.9.ebuild 1643 RMD160 5ed129b6a41e10f2fb4c18f7b24e90dd0edb54a0 SHA1 dcc956c4776c0a39e08b343ae53ca133855a838f SHA256 29df69e9105970ec3d5164600af4d6798e46f43ad39eefc15fc1533d735efceb
-MISC ChangeLog 9734 RMD160 f5f9519a6314b90b0ac44efffe1c93f35a436b25 SHA1 11aab83c23f5e12f5a243a121935bc3dee08e91d SHA256 cbb100f103cb70ef6c8c338b0877cb5fb3f121860dd9071a049b10cdb4c33112
+MISC ChangeLog 9941 RMD160 f16aab83e5277afbdb22dd70d898382578fddb3c SHA1 50267da264313a3b49ef853366452d8e7e6a861c SHA256 6b3b20a90dc97169a14c2f28abafbeecd8bbbf9f8644f6c68ec2c9e8d6bf454e
 MISC metadata.xml 468 RMD160 110e67df4ca1cc3d6204b0066f1f2503671fc742 SHA1 5627c00d4d4884e9d89a39eeac7e3a7cf51e6a44 SHA256 99779e068e75c9c4ceb9bc64b787f1c944ff1f3e45e659bee5eb04835498a936
diff --git a/dev-libs/g-wrap/g-wrap-1.9.11-r1.ebuild b/dev-libs/g-wrap/g-wrap-1.9.11-r1.ebuild
deleted file mode 100644
index 4473fe330483..000000000000
--- a/dev-libs/g-wrap/g-wrap-1.9.11-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2009 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.11-r1.ebuild,v 1.2 2009/07/19 11:10:31 hkbst Exp $
-
-inherit eutils
-
-DESCRIPTION="A tool for exporting C libraries into Scheme"
-HOMEPAGE="http://www.nongnu.org/g-wrap/"
-SRC_URI="http://download.savannah.gnu.org/releases/g-wrap/${P}.tar.gz"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-# guile-lib for srfi-34, srfi-35
-RDEPEND="dev-scheme/guile
-	=dev-libs/glib-2*
-	virtual/libffi
-	dev-scheme/guile-lib"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-pkg_setup() {
-	if has_version =dev-scheme/guile-1.8*; then
-		built_with_use dev-scheme/guile deprecated || die "guile must be built with deprecated use flag"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-#	cp guile/g-wrap-2.0-guile.pc.in guile/g-wrap-2.0-guile.pc.in.old
-
-	sed "s:@LIBFFI_CFLAGS_INSTALLED@:@LIBFFI_CFLAGS@:g" -i guile/g-wrap-2.0-guile.pc.in
-	sed "s:@LIBFFI_LIBS_INSTALLED@:@LIBFFI_LIBS@:g" -i guile/g-wrap-2.0-guile.pc.in
-
-#	diff -u guile/g-wrap-2.0-guile.pc.in.old guile/g-wrap-2.0-guile.pc.in
-}
-
-src_compile() {
-	econf --with-glib --disable-Werror
-	emake -j1 || die "make failed"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README THANKS
-	insinto /usr/share/guile/site/srfi
-	doins srfi/srfi*
-}
diff --git a/dev-libs/g-wrap/g-wrap-1.9.11.ebuild b/dev-libs/g-wrap/g-wrap-1.9.11.ebuild
index 6f481f0f2ea1..2bb5727ae207 100644
--- a/dev-libs/g-wrap/g-wrap-1.9.11.ebuild
+++ b/dev-libs/g-wrap/g-wrap-1.9.11.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-libs/g-wrap/g-wrap-1.9.11.ebuild,v 1.9 2009/07/19 11:10:31 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/g-wrap/g-wrap-1.9.11.ebuild,v 1.10 2009/07/19 11:45:58 hkbst Exp $
 
 inherit eutils
 
@@ -46,6 +46,4 @@ src_compile() {
 src_install () {
 	emake DESTDIR="${D}" install || die "make install 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.12.ebuild b/dev-libs/g-wrap/g-wrap-1.9.12.ebuild
index 036f8613f155..ebd778c66033 100644
--- a/dev-libs/g-wrap/g-wrap-1.9.12.ebuild
+++ b/dev-libs/g-wrap/g-wrap-1.9.12.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-libs/g-wrap/g-wrap-1.9.12.ebuild,v 1.1 2009/07/19 11:10:31 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/g-wrap/g-wrap-1.9.12.ebuild,v 1.2 2009/07/19 11:45:58 hkbst Exp $
 
 inherit eutils
 
@@ -48,6 +48,4 @@ src_compile() {
 src_install () {
 	emake DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS ChangeLog NEWS README THANKS
-	insinto /usr/share/guile/site/srfi
-	doins srfi/srfi*
 }