fix g-wrap-1.9.6 automagic patch to respect use flag

Package-Manager: portage-2.1.2-r1

diff --git a/dev-libs/g-wrap/ChangeLog b/dev-libs/g-wrap/ChangeLog
index 662748fe8d80e77e048f71746f3916799227eba9..e571194d3cc78e76ac1b0c0b856cb2dd65dcf15b 100644 (file)
--- a/dev-libs/g-wrap/ChangeLog
+++ b/dev-libs/g-wrap/ChangeLog
@@ -1,6 +1,10 @@
 # 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.32 2007/01/19 15:42:22 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/g-wrap/ChangeLog,v 1.33 2007/01/20 10:02:22 hkbst Exp $
+
+  20 Jan 2007; Marijn Schouten <hkBst@gentoo.org>
+  files/g-wrap-1.9.6_glib_automagic.patch:
+  fix 1.9.6 patch
 
   19 Jan 2007; Marijn Schouten <hkBst@gentoo.org> -g-wrap-1.9.7.ebuild:
   remove because of automagic dep on glib-1.2

diff --git a/dev-libs/g-wrap/Manifest b/dev-libs/g-wrap/Manifest
index 2b0c2ce3c1faf411dcec6ca493863560586131f5..8d49ebd7f2995f553304ea36556add61fa096647 100644 (file)
--- a/dev-libs/g-wrap/Manifest
+++ b/dev-libs/g-wrap/Manifest
@@ -6,10 +6,10 @@ 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-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.6_glib_automagic.patch 526 RMD160 69368c24380eabb35fb200abebccdad13eefccf2 SHA1 360235117183a39cb86e5901a323c163d545eca6 SHA256 06b30d8800c0b7fc9d731db53f8391f7a0beea43d12cc29ab657d9f4a164d6d7
+MD5 91df84c3af03b751c046b43a0f91e8cd files/g-wrap-1.9.6_glib_automagic.patch 526
+RMD160 69368c24380eabb35fb200abebccdad13eefccf2 files/g-wrap-1.9.6_glib_automagic.patch 526
+SHA256 06b30d8800c0b7fc9d731db53f8391f7a0beea43d12cc29ab657d9f4a164d6d7 files/g-wrap-1.9.6_glib_automagic.patch 526
 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
@@ -33,10 +33,10 @@ EBUILD g-wrap-1.9.7-r1.ebuild 1015 RMD160 57544a6eed753fadbe7f833af7674e7cbeb4c6
 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
-MISC ChangeLog 4628 RMD160 aa4ba0e6286ff88057d09adc5a628827f3f6c680 SHA1 b10236f597c893e0fd7cc744c556eeef06da3e69 SHA256 b9a668ee7c27d89a0ab8aa153aa841077a1c2334c04482b1bb384cbd88253853
-MD5 697a98b6bbc3285b031b5cee20d7721a ChangeLog 4628
-RMD160 aa4ba0e6286ff88057d09adc5a628827f3f6c680 ChangeLog 4628
-SHA256 b9a668ee7c27d89a0ab8aa153aa841077a1c2334c04482b1bb384cbd88253853 ChangeLog 4628
+MISC ChangeLog 4740 RMD160 9f98db991a4a832ef2a0e42537d95f302e5c72ca SHA1 376b19510f217f01c9f55e27fb4046bcbfc3b6ec SHA256 0b738556a6c04a6bf3e00422f396f6ab3e18c97228544bda4a97351276e7d405
+MD5 470e61e9193ad5716197f5ccb9666dd4 ChangeLog 4740
+RMD160 9f98db991a4a832ef2a0e42537d95f302e5c72ca ChangeLog 4740
+SHA256 0b738556a6c04a6bf3e00422f396f6ab3e18c97228544bda4a97351276e7d405 ChangeLog 4740
 MISC metadata.xml 468 RMD160 110e67df4ca1cc3d6204b0066f1f2503671fc742 SHA1 5627c00d4d4884e9d89a39eeac7e3a7cf51e6a44 SHA256 99779e068e75c9c4ceb9bc64b787f1c944ff1f3e45e659bee5eb04835498a936
 MD5 cb23790b246158fbaee5857f8ee9dea4 metadata.xml 468
 RMD160 110e67df4ca1cc3d6204b0066f1f2503671fc742 metadata.xml 468

diff --git a/dev-libs/g-wrap/files/g-wrap-1.9.6_glib_automagic.patch b/dev-libs/g-wrap/files/g-wrap-1.9.6_glib_automagic.patch
index 1b5f8f13940eca9f9ee7007ced601ec36a386aff..cf4f4b36c139731e6611973314e13d629ca5a70d 100644 (file)
--- a/dev-libs/g-wrap/files/g-wrap-1.9.6_glib_automagic.patch
+++ b/dev-libs/g-wrap/files/g-wrap-1.9.6_glib_automagic.patch
@@ -1,11 +1,13 @@
---- 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 @@
+--- configure.ac.old   2007-01-20 10:54:27.000000000 +0100
++++ configure.ac       2007-01-20 10:55:49.000000000 +0100
+@@ -95,7 +95,9 @@
  AM_CONDITIONAL(HAVE_SRFI_35, test "$HAVE_SRFI_35" = yes)
  
  dnl Check for optional libraries
 -PKG_CHECK_MODULES(GLIB, glib, [have_glib=yes], [have_glib=no])
-+PKG_CHECK_MODULES(GLIB, glib-2.0, [have_glib=yes], [have_glib=no])
++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)
  
  dnl Check for compiler flags and warnings. This should be last, since