force glib on

(Portage version: 2.1.2-r2)

5 files changed, 16 insertions, 9 deletions

diff --git a/dev-libs/g-wrap/ChangeLog b/dev-libs/g-wrap/ChangeLog
index e571194d3cc7..f67994117fce 100644
--- a/dev-libs/g-wrap/ChangeLog
+++ b/dev-libs/g-wrap/ChangeLog
@@ -1,6 +1,13 @@
 # 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.33 2007/01/20 10:02:22 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/g-wrap/ChangeLog,v 1.34 2007/01/24 17:15:21 hkbst Exp $
+
+*g-wrap-1.9.7-r2 (24 Jan 2007)
+*g-wrap-1.9.6-r1 (24 Jan 2007)
+
+  24 Jan 2007; Marijn Schouten <hkBst@gentoo.org> -g-wrap-1.9.6.ebuild,
+  +g-wrap-1.9.6-r1.ebuild, -g-wrap-1.9.7-r1.ebuild, +g-wrap-1.9.7-r2.ebuild:
+  force glib on
 
   20 Jan 2007; Marijn Schouten <hkBst@gentoo.org>
   files/g-wrap-1.9.6_glib_automagic.patch:
diff --git a/dev-libs/g-wrap/files/digest-g-wrap-1.9.6 b/dev-libs/g-wrap/files/digest-g-wrap-1.9.6-r1
index 79764f2c6023..79764f2c6023 100644
--- a/dev-libs/g-wrap/files/digest-g-wrap-1.9.6
+++ b/dev-libs/g-wrap/files/digest-g-wrap-1.9.6-r1
diff --git a/dev-libs/g-wrap/files/digest-g-wrap-1.9.7-r1 b/dev-libs/g-wrap/files/digest-g-wrap-1.9.7-r2
index 1829f97f18cf..1829f97f18cf 100644
--- a/dev-libs/g-wrap/files/digest-g-wrap-1.9.7-r1
+++ b/dev-libs/g-wrap/files/digest-g-wrap-1.9.7-r2
diff --git a/dev-libs/g-wrap/g-wrap-1.9.6.ebuild b/dev-libs/g-wrap/g-wrap-1.9.6-r1.ebuild
index f9084ffd99b0..3a155b3c154e 100644
--- a/dev-libs/g-wrap/g-wrap-1.9.6.ebuild
+++ b/dev-libs/g-wrap/g-wrap-1.9.6-r1.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.ebuild,v 1.1 2007/01/19 15:37:25 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/g-wrap/g-wrap-1.9.6-r1.ebuild,v 1.1 2007/01/24 17:15:21 hkbst Exp $
 
 inherit eutils autotools
 
@@ -11,10 +11,10 @@ SRC_URI="http://download.savannah.gnu.org/releases/g-wrap/${P}.tar.gz"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
 LICENSE="GPL-2"
-IUSE="glib"
+IUSE=""
 
 DEPEND="=dev-scheme/guile-1.6*
-	glib? ( =dev-libs/glib-2* )"
+	=dev-libs/glib-2*"
 # seems not to work. g-wrap builds its own libffi-4.0.1
 # dev-libs/libffi
 
@@ -29,7 +29,7 @@ src_unpack() {
 
 #looks like parallel build and install fails occasionally
 src_compile() {
-	econf $(use_with glib)
+	econf --with-glib
 	emake -j1 || die 'make failed'
 }
 
diff --git a/dev-libs/g-wrap/g-wrap-1.9.7-r1.ebuild b/dev-libs/g-wrap/g-wrap-1.9.7-r2.ebuild
index fc2c9f05c4d0..82f4968186eb 100644
--- a/dev-libs/g-wrap/g-wrap-1.9.7-r1.ebuild
+++ b/dev-libs/g-wrap/g-wrap-1.9.7-r2.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-r1.ebuild,v 1.2 2007/01/19 15:37:25 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/g-wrap/g-wrap-1.9.7-r2.ebuild,v 1.1 2007/01/24 17:15:21 hkbst Exp $
 
 inherit eutils autotools
 
@@ -11,10 +11,10 @@ SRC_URI="http://download.savannah.gnu.org/releases/g-wrap/${P}.tar.gz"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
 LICENSE="GPL-2"
-IUSE="glib"
+IUSE=""
 
 DEPEND="=dev-scheme/guile-1.6*
-	glib? ( =dev-libs/glib-2* )"
+	=dev-libs/glib-2*"
 # seems not to work. g-wrap builds its own libffi-4.0.1
 # dev-libs/libffi
 
@@ -29,7 +29,7 @@ src_unpack() {
 
 #looks like parallel build and install fails occasionally
 src_compile() {
-	econf $(use_with glib)
+	econf --with-glib
 	emake -j1 || die 'make failed'
 }