added patch for glib automagic dep; fixes Bug 161903

Package-Manager: portage-2.1.2

5 files changed, 80 insertions, 15 deletions

diff --git a/dev-libs/g-wrap/ChangeLog b/dev-libs/g-wrap/ChangeLog
index c5f6cb806aae..9a114d016c65 100644
--- a/dev-libs/g-wrap/ChangeLog
+++ b/dev-libs/g-wrap/ChangeLog
@@ -1,6 +1,12 @@
 # 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.29 2007/01/17 08:13:02 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/g-wrap/ChangeLog,v 1.30 2007/01/18 17:58:45 hkbst Exp $
+
+  18 Jan 2007; Marijn Schouten <hkBst@gentoo.org>
+  +files/glib_automagic.patch, +g-wrap-1.9.7-r1.ebuild:
+  added patch for glib automagic dep; fixes Bug 161903
+
+*g-wrap-1.9.7-r1 (18 Jan 2007)
 
   17 Jan 2007; Christian Faulhammer <opfer@gentoo.org> g-wrap-1.9.7.ebuild:
   keyworded ~x86, bug #162010
diff --git a/dev-libs/g-wrap/Manifest b/dev-libs/g-wrap/Manifest
index ff61709c77fa..f52ab00b142d 100644
--- a/dev-libs/g-wrap/Manifest
+++ b/dev-libs/g-wrap/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX g-wrap-1.3.4-direntry.patch 2202 RMD160 2fcc7c0adfd3544045294395912b7692e433b3d3 SHA1 b4cd7b381558672181242fac0031f7163ee11b50 SHA256 132ba88ddf150ddf0102d23e27e2a6efa850055bb509b18004febc1c5615989a
 MD5 05abd740e0c2fe308fd53514de5442e0 files/g-wrap-1.3.4-direntry.patch 2202
 RMD160 2fcc7c0adfd3544045294395912b7692e433b3d3 files/g-wrap-1.3.4-direntry.patch 2202
@@ -13,20 +10,28 @@ AUX g-wrap-glib-problem-fix.patch 409 RMD160 98e5776792132f13b741db0e1fb2fd34c92
 MD5 8f0ce8eb8a8ee6562102446778bb12d8 files/g-wrap-glib-problem-fix.patch 409
 RMD160 98e5776792132f13b741db0e1fb2fd34c92bf9d7 files/g-wrap-glib-problem-fix.patch 409
 SHA256 0b771880436621ab17d5497159da258ee45ac60da4973565ca73ba10191bccf3 files/g-wrap-glib-problem-fix.patch 409
+AUX glib_automagic.patch 559 RMD160 d8c378444b3782c727254db86ee6e0c8b6f9e422 SHA1 4a41e50206521662d0e4b7740ff798c54db1be50 SHA256 ddb7992201efa3d11d663dff41118cc349e137d3e120eef98a746a4a84aabb4c
+MD5 2d5f4144b01810e7f881340a90a57531 files/glib_automagic.patch 559
+RMD160 d8c378444b3782c727254db86ee6e0c8b6f9e422 files/glib_automagic.patch 559
+SHA256 ddb7992201efa3d11d663dff41118cc349e137d3e120eef98a746a4a84aabb4c files/glib_automagic.patch 559
 DIST g-wrap-1.3.4.tar.gz 403570 RMD160 64eddd127e24df11067b498d0986d8823f012d76 SHA1 764f1c878e18341bf437f3e1ddc5f8618019bfc2 SHA256 bb9fa9b7b6b2a11899d98d730cf5970179bbf942fd763eda13b7b541278adee4
 DIST g-wrap-1.9.7.tar.gz 917706 RMD160 ffe665feb1a4f9b527a5e173d697ba2890680dc7 SHA1 403434170d0302f8dbce1c4f85116fa8cd0bba0d SHA256 191f096c0cc5a6c4baac45cb595ebfee3ccba3599babc9fbd03d4c6f1f435355
 EBUILD g-wrap-1.3.4-r1.ebuild 908 RMD160 42d9ba6a1da7a6c5937a70f5da9a9cfc269ca2cd SHA1 e23c1e62eefc601766510dfaab756aedf4151dda SHA256 5785d96923c990c6da1572e00e493a69882d06c28cf18e52e52478be2a8c3b0d
 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.7-r1.ebuild 1010 RMD160 446ab479571e1aaed8f4e6b59ba86fdc1d7bc617 SHA1 7de5a1a1b947af9bc8726683c94c063f4236470b SHA256 fad7db5a90212544c7cf49ee1e23777f1082fb359205cda798a0426ba631e59b
+MD5 fc4d790723cd81327881f4325f9c4569 g-wrap-1.9.7-r1.ebuild 1010
+RMD160 446ab479571e1aaed8f4e6b59ba86fdc1d7bc617 g-wrap-1.9.7-r1.ebuild 1010
+SHA256 fad7db5a90212544c7cf49ee1e23777f1082fb359205cda798a0426ba631e59b g-wrap-1.9.7-r1.ebuild 1010
 EBUILD g-wrap-1.9.7.ebuild 638 RMD160 5c317af7d30e700093d4b462ac4430870e32546f SHA1 8798b1b39da7d30382085372a94f105156af46b0 SHA256 059e4b65a0f487bb41294f7e54479548454c92c3782b063f25ac9bcafb3615df
 MD5 cb7d0360a44b5b12c218ebe02e71b3a9 g-wrap-1.9.7.ebuild 638
 RMD160 5c317af7d30e700093d4b462ac4430870e32546f g-wrap-1.9.7.ebuild 638
 SHA256 059e4b65a0f487bb41294f7e54479548454c92c3782b063f25ac9bcafb3615df g-wrap-1.9.7.ebuild 638
-MISC ChangeLog 4010 RMD160 6c65906e59b9f39bb036bfde7c9ed89e381bc96b SHA1 100b3b60136d6677931f5f272a43802c4b0d5877 SHA256 af07abc1c0079514a7dc737d7a697a3002a4a319f15408d5ff94287a4383145b
-MD5 85ed2f4156d72a7b778a01f03e36a71e ChangeLog 4010
-RMD160 6c65906e59b9f39bb036bfde7c9ed89e381bc96b ChangeLog 4010
-SHA256 af07abc1c0079514a7dc737d7a697a3002a4a319f15408d5ff94287a4383145b ChangeLog 4010
+MISC ChangeLog 4204 RMD160 14b5374dfb7bf9efccc7a3faf85fe5fe172b947f SHA1 559063ac7e87d7be2f91d33c8c40dd71a303594a SHA256 76524068a3370316952d6850dea41e4b28a16c5d8b18c1b5594efe44829be6f3
+MD5 2418ea8434a502e74ce9384c0b33b014 ChangeLog 4204
+RMD160 14b5374dfb7bf9efccc7a3faf85fe5fe172b947f ChangeLog 4204
+SHA256 76524068a3370316952d6850dea41e4b28a16c5d8b18c1b5594efe44829be6f3 ChangeLog 4204
 MISC metadata.xml 468 RMD160 110e67df4ca1cc3d6204b0066f1f2503671fc742 SHA1 5627c00d4d4884e9d89a39eeac7e3a7cf51e6a44 SHA256 99779e068e75c9c4ceb9bc64b787f1c944ff1f3e45e659bee5eb04835498a936
 MD5 cb23790b246158fbaee5857f8ee9dea4 metadata.xml 468
 RMD160 110e67df4ca1cc3d6204b0066f1f2503671fc742 metadata.xml 468
@@ -37,10 +42,6 @@ SHA256 be550d35c33e688f49c5da74b5439c7d89058af43b5b4a6421837e271b7cd522 files/di
 MD5 37000183ad6896bcc388dbf244e12ad8 files/digest-g-wrap-1.9.7 238
 RMD160 3c46d0df2f2ecd0dbd55902b941a38065aa85fc0 files/digest-g-wrap-1.9.7 238
 SHA256 e31944bc17cdcbb6bc46e819672d07805eb30c18890050e3fc294eec62534cd6 files/digest-g-wrap-1.9.7 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFFrdpzNQqtfCuFneMRAk5FAJsFlGrBTcHIx1ZE0MW0RLcaw8vVFQCgjbeA
-5HiDACzv/rkRSNYhA859KgA=
-=7BDr
------END PGP SIGNATURE-----
+MD5 37000183ad6896bcc388dbf244e12ad8 files/digest-g-wrap-1.9.7-r1 238
+RMD160 3c46d0df2f2ecd0dbd55902b941a38065aa85fc0 files/digest-g-wrap-1.9.7-r1 238
+SHA256 e31944bc17cdcbb6bc46e819672d07805eb30c18890050e3fc294eec62534cd6 files/digest-g-wrap-1.9.7-r1 238
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-r1
new file mode 100644
index 000000000000..1829f97f18cf
--- /dev/null
+++ b/dev-libs/g-wrap/files/digest-g-wrap-1.9.7-r1
@@ -0,0 +1,3 @@
+MD5 4e980fd3f464d53ecee12184569c32bf g-wrap-1.9.7.tar.gz 917706
+RMD160 ffe665feb1a4f9b527a5e173d697ba2890680dc7 g-wrap-1.9.7.tar.gz 917706
+SHA256 191f096c0cc5a6c4baac45cb595ebfee3ccba3599babc9fbd03d4c6f1f435355 g-wrap-1.9.7.tar.gz 917706
diff --git a/dev-libs/g-wrap/files/glib_automagic.patch b/dev-libs/g-wrap/files/glib_automagic.patch
new file mode 100644
index 000000000000..676fb4a589b4
--- /dev/null
+++ b/dev-libs/g-wrap/files/glib_automagic.patch
@@ -0,0 +1,16 @@
+--- configure.ac.old	2007-01-18 17:54:08.000000000 +0100
++++ configure.ac	2007-01-18 17:57:38.000000000 +0100
+@@ -119,11 +119,8 @@
+ AC_SUBST(GW_LANGUAGES)
+ 
+ dnl Check for optional libraries
+-AC_CHECK_PROG(have_glib, glib-config, yes, no)
+-if test "$have_glib" = yes; then
+-  PKG_CHECK_MODULES(GLIB, glib, [echo building GLib 1.2 support])
+-else
+-  echo Not building Glib 1.2 support
++if test "x$with_glib" != "xno"; then
++       PKG_CHECK_MODULES([GLIB], [glib-2.0], [have_glib=yes], [have_glib=no])
+ fi
+ AM_CONDITIONAL(HAVE_GLIB, test "$have_glib" = yes)
+ 
diff --git a/dev-libs/g-wrap/g-wrap-1.9.7-r1.ebuild b/dev-libs/g-wrap/g-wrap-1.9.7-r1.ebuild
new file mode 100644
index 000000000000..2ae4665d426e
--- /dev/null
+++ b/dev-libs/g-wrap/g-wrap-1.9.7-r1.ebuild
@@ -0,0 +1,39 @@
+# 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.1 2007/01/18 17:58:45 hkbst Exp $
+
+inherit eutils autotools
+
+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="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="glib"
+
+DEPEND="=dev-scheme/guile-1.6*
+	glib? ( =dev-libs/glib-2* )"
+# seems not to work. g-wrap builds its own libffi-4.0.1
+# dev-libs/libffi
+
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch ${FILESDIR}/glib_automagic.patch
+	AT_M4DIR="${S}/m4" eautoreconf
+}
+
+#looks like parallel build and install fails occasionally
+src_compile() {
+	econf $(use_with glib)
+	emake -j1 || die 'make failed'
+}
+
+src_install () {
+	emake -j1 DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog NEWS README THANKS
+}