add g-wrap-1.9.6 and patch and rename patch for g-wrap-1.9.7 so they can use the...

Package-Manager: portage-2.1.2-r1

diff --git a/dev-libs/g-wrap/ChangeLog b/dev-libs/g-wrap/ChangeLog
index 9a114d016c65fc8a45603f91af265c851c7db9f2..bdbe068574ec5e79a44ca3c38a6cfcb1fcb2f97c 100644 (file)
--- a/dev-libs/g-wrap/ChangeLog
+++ b/dev-libs/g-wrap/ChangeLog
@@ -1,6 +1,15 @@
 # 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.30 2007/01/18 17:58:45 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/g-wrap/ChangeLog,v 1.31 2007/01/19 15:37:25 hkbst Exp $
+
+*g-wrap-1.9.6 (19 Jan 2007)
+
+  19 Jan 2007; Marijn Schouten <hkBst@gentoo.org>
+  +files/g-wrap-1.9.6_glib_automagic.patch,
+  +files/g-wrap-1.9.7_glib_automagic.patch,
+  -files/g-wrap-glib-problem-fix.patch, +g-wrap-1.9.6.ebuild,
+  g-wrap-1.9.7-r1.ebuild:
+  add 1.9.6 and patch and rename patch for 1.9.7
 
   18 Jan 2007; Marijn Schouten <hkBst@gentoo.org>
   +files/glib_automagic.patch, +g-wrap-1.9.7-r1.ebuild:

diff --git a/dev-libs/g-wrap/Manifest b/dev-libs/g-wrap/Manifest
index f52ab00b142d136d727ae45d24adc154629bb7c9..5d063a0acc0284cf9330b58d3e25af6f7f9e1552 100644 (file)
--- a/dev-libs/g-wrap/Manifest
+++ b/dev-libs/g-wrap/Manifest
@@ -6,32 +6,41 @@ AUX g-wrap-1.3.4-m4.patch 501 RMD160 42b980b72ad195c9f89bf3f4903d5cdf91ab930d SH
 MD5 31673db259ce2252708ef8d6353cc096 files/g-wrap-1.3.4-m4.patch 501
 RMD160 42b980b72ad195c9f89bf3f4903d5cdf91ab930d files/g-wrap-1.3.4-m4.patch 501
 SHA256 94a2b046d0b7cc0ff0acca7665abb5af45ac8c5bea8e0da8884b35d5427b26d0 files/g-wrap-1.3.4-m4.patch 501
-AUX g-wrap-glib-problem-fix.patch 409 RMD160 98e5776792132f13b741db0e1fb2fd34c92bf9d7 SHA1 78bef6fd379143fd1564051ab459bc4010ddca58 SHA256 0b771880436621ab17d5497159da258ee45ac60da4973565ca73ba10191bccf3
-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 g-wrap-1.9.6_glib_automagic.patch 479 RMD160 13bb454c91b59a63517abe51363813b2c58348bf SHA1 53daaae89cc44ea0af0240fc6af7cf1205a411c3 SHA256 4147ad33f991ac3582f205ce37d043eda368872f82f8ddcc7864b1faa56a67aa
+MD5 d307a1e3b34c23304fa4ddca576f1df5 files/g-wrap-1.9.6_glib_automagic.patch 479
+RMD160 13bb454c91b59a63517abe51363813b2c58348bf files/g-wrap-1.9.6_glib_automagic.patch 479
+SHA256 4147ad33f991ac3582f205ce37d043eda368872f82f8ddcc7864b1faa56a67aa files/g-wrap-1.9.6_glib_automagic.patch 479
+AUX g-wrap-1.9.7_glib_automagic.patch 559 RMD160 d8c378444b3782c727254db86ee6e0c8b6f9e422 SHA1 4a41e50206521662d0e4b7740ff798c54db1be50 SHA256 ddb7992201efa3d11d663dff41118cc349e137d3e120eef98a746a4a84aabb4c
+MD5 2d5f4144b01810e7f881340a90a57531 files/g-wrap-1.9.7_glib_automagic.patch 559
+RMD160 d8c378444b3782c727254db86ee6e0c8b6f9e422 files/g-wrap-1.9.7_glib_automagic.patch 559
+SHA256 ddb7992201efa3d11d663dff41118cc349e137d3e120eef98a746a4a84aabb4c files/g-wrap-1.9.7_glib_automagic.patch 559
 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.6.tar.gz 826045 RMD160 1e3d86e38061a217b9dde06885301f4a46433d39 SHA1 754116dd5d9af2fe0e1f8386e69721618e0eefdf SHA256 ddb0e31d40581402d6d7045cce7cdc79e0bc0627831a4b12012f45703446d311
 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.6.ebuild 1012 RMD160 521c906eff9dc6176bd10c4d95214f24a5122189 SHA1 c4fdf531dbc4dc43159f799a6fb33ee90a75c8e8 SHA256 8635304ef1e62a4a8dfeaf39a8ae09b66e886474a219214b644eb6bec1b4131c
+MD5 04b01b96fe9ecba73b567a1e64dc7dac g-wrap-1.9.6.ebuild 1012
+RMD160 521c906eff9dc6176bd10c4d95214f24a5122189 g-wrap-1.9.6.ebuild 1012
+SHA256 8635304ef1e62a4a8dfeaf39a8ae09b66e886474a219214b644eb6bec1b4131c g-wrap-1.9.6.ebuild 1012
+EBUILD g-wrap-1.9.7-r1.ebuild 1015 RMD160 57544a6eed753fadbe7f833af7674e7cbeb4c6b8 SHA1 495a34e356976f30e9123bf87eb251ba2f505ba4 SHA256 e26f1b042a72fb5d3785e6f2d4592c1800fde1835320f46f94baac84c716ff92
+MD5 bd2068647dc2924bc617ba4be1802fd5 g-wrap-1.9.7-r1.ebuild 1015
+RMD160 57544a6eed753fadbe7f833af7674e7cbeb4c6b8 g-wrap-1.9.7-r1.ebuild 1015
+SHA256 e26f1b042a72fb5d3785e6f2d4592c1800fde1835320f46f94baac84c716ff92 g-wrap-1.9.7-r1.ebuild 1015
 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 4204 RMD160 14b5374dfb7bf9efccc7a3faf85fe5fe172b947f SHA1 559063ac7e87d7be2f91d33c8c40dd71a303594a SHA256 76524068a3370316952d6850dea41e4b28a16c5d8b18c1b5594efe44829be6f3
-MD5 2418ea8434a502e74ce9384c0b33b014 ChangeLog 4204
-RMD160 14b5374dfb7bf9efccc7a3faf85fe5fe172b947f ChangeLog 4204
-SHA256 76524068a3370316952d6850dea41e4b28a16c5d8b18c1b5594efe44829be6f3 ChangeLog 4204
+MISC ChangeLog 4509 RMD160 5cc4f44ab3175515b55052a2bcb83f5c4984e7a7 SHA1 57db76fb01037ff2d596ce4c28e4797bd1ae9f46 SHA256 a3ed87760b095d67b929cad567d9c386418a91a8a44d843126d6b62304f02c01
+MD5 b03c5d60d72b4aa79dd90d0a696ee5ca ChangeLog 4509
+RMD160 5cc4f44ab3175515b55052a2bcb83f5c4984e7a7 ChangeLog 4509
+SHA256 a3ed87760b095d67b929cad567d9c386418a91a8a44d843126d6b62304f02c01 ChangeLog 4509
 MISC metadata.xml 468 RMD160 110e67df4ca1cc3d6204b0066f1f2503671fc742 SHA1 5627c00d4d4884e9d89a39eeac7e3a7cf51e6a44 SHA256 99779e068e75c9c4ceb9bc64b787f1c944ff1f3e45e659bee5eb04835498a936
 MD5 cb23790b246158fbaee5857f8ee9dea4 metadata.xml 468
 RMD160 110e67df4ca1cc3d6204b0066f1f2503671fc742 metadata.xml 468
@@ -39,6 +48,9 @@ SHA256 99779e068e75c9c4ceb9bc64b787f1c944ff1f3e45e659bee5eb04835498a936 metadata
 MD5 49072b71a0893483af97a027ec66c35c files/digest-g-wrap-1.3.4-r1 238
 RMD160 421b33f9403adfcf66dd0cdde7b488595b6758e9 files/digest-g-wrap-1.3.4-r1 238
 SHA256 be550d35c33e688f49c5da74b5439c7d89058af43b5b4a6421837e271b7cd522 files/digest-g-wrap-1.3.4-r1 238
+MD5 417daeca72cd92c7ed56c95b01dda85a files/digest-g-wrap-1.9.6 238
+RMD160 15950b5c477c0c423a4e794f92a384ec98652b3f files/digest-g-wrap-1.9.6 238
+SHA256 c300467065e5bfcbf694a59d0a1b0b6bd416760dc6705dd536cfbc1332247b85 files/digest-g-wrap-1.9.6 238
 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

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
new file mode 100644 (file)
index 0000000..79764f2
--- /dev/null
+++ b/dev-libs/g-wrap/files/digest-g-wrap-1.9.6
@@ -0,0 +1,3 @@
+MD5 4d83964f51376500eedced538c1620cb g-wrap-1.9.6.tar.gz 826045
+RMD160 1e3d86e38061a217b9dde06885301f4a46433d39 g-wrap-1.9.6.tar.gz 826045
+SHA256 ddb0e31d40581402d6d7045cce7cdc79e0bc0627831a4b12012f45703446d311 g-wrap-1.9.6.tar.gz 826045

diff --git a/dev-libs/g-wrap/files/g-wrap-glib-problem-fix.patch b/dev-libs/g-wrap/files/g-wrap-1.9.6_glib_automagic.patch
similarity index 62%
rename from dev-libs/g-wrap/files/g-wrap-glib-problem-fix.patch
rename to dev-libs/g-wrap/files/g-wrap-1.9.6_glib_automagic.patch
index 23dd9c8310391487884dc148211f45c4f4bbcf90..1b5f8f13940eca9f9ee7007ced601ec36a386aff 100644 (file)
--- a/dev-libs/g-wrap/files/g-wrap-glib-problem-fix.patch
+++ b/dev-libs/g-wrap/files/g-wrap-1.9.6_glib_automagic.patch
@@ -1,5 +1,5 @@
---- configure.ac.orig  2006-03-08 15:42:30.000000000 +0200
-+++ configure.ac       2006-03-08 15:42:47.000000000 +0200
+--- configure.ac.old   2007-01-19 16:07:41.000000000 +0100
++++ configure.ac       2007-01-19 16:07:59.000000000 +0100
 @@ -95,7 +95,7 @@
  AM_CONDITIONAL(HAVE_SRFI_35, test "$HAVE_SRFI_35" = yes)
  
@@ -8,3 +8,4 @@
 +PKG_CHECK_MODULES(GLIB, glib-2.0, [have_glib=yes], [have_glib=no])
  AM_CONDITIONAL(HAVE_GLIB, test "$have_glib" = yes)
  
+ dnl Check for compiler flags and warnings. This should be last, since

diff --git a/dev-libs/g-wrap/files/g-wrap-1.9.7_glib_automagic.patch b/dev-libs/g-wrap/files/g-wrap-1.9.7_glib_automagic.patch
new file mode 100644 (file)
index 0000000..676fb4a
--- /dev/null
+++ b/dev-libs/g-wrap/files/g-wrap-1.9.7_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.6.ebuild b/dev-libs/g-wrap/g-wrap-1.9.6.ebuild
new file mode 100644 (file)
index 0000000..f9084ff
--- /dev/null
+++ b/dev-libs/g-wrap/g-wrap-1.9.6.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.6.ebuild,v 1.1 2007/01/19 15:37:25 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}/${P}_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
+}

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
index 2ae4665d426e57fc2695fddcbfc5f2129e747107..fc2c9f05c4d015d0a2ad4c7742337b346a603f4b 100644 (file)
--- a/dev-libs/g-wrap/g-wrap-1.9.7-r1.ebuild
+++ b/dev-libs/g-wrap/g-wrap-1.9.7-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.7-r1.ebuild,v 1.1 2007/01/18 17:58:45 hkbst Exp $
+# $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 $
 
 inherit eutils autotools
 
@@ -23,7 +23,7 @@ RDEPEND="${DEPEND}"
 src_unpack() {
        unpack ${A}
        cd "${S}"
-       epatch ${FILESDIR}/glib_automagic.patch
+       epatch ${FILESDIR}/${P}_glib_automagic.patch
        AT_M4DIR="${S}/m4" eautoreconf
 }