4 files changed, 8 insertions, 58 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/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*
 }