Fix building with Autoconf >= 2.66 wrt #336598 by S. Holzbach.

Package-Manager: portage-2.2_rc78/cvs/Linux x86_64

4 files changed, 35 insertions, 14 deletions

diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog
index 497fde3157ed..944033482294 100644
--- a/media-libs/libgphoto2/ChangeLog
+++ b/media-libs/libgphoto2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libgphoto2
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.171 2010/08/30 20:06:47 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.172 2010/09/10 18:25:46 ssuominen Exp $
+
+  10 Sep 2010; Samuli Suominen <ssuominen@gentoo.org>
+  libgphoto2-2.4.9.ebuild, +files/libgphoto2-2.4.9-dnl.patch:
+  Fix building with Autoconf >= 2.66 wrt #336598 by S. Holzbach.
 
   30 Aug 2010; Gilles Dartiguelongue <eva@gentoo.org>
   libgphoto2-2.4.9.ebuild:
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 0f0322c9ad2a..da7b9edc27cd 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,10 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX libgphoto2-2.4.7-extra-dist.patch 451 RMD160 c908aafa0946e41cb43c2891ecca42859f219207 SHA1 ed0089c85ca129eb515412d2493475409147f0dc SHA256 d447cdc4fcfde5e28ef50e6d6bf3a0a01440473fbecedca99ecd105ed43d2866
 AUX libgphoto2-2.4.7-no-test-build.patch 910 RMD160 fbc59f08c752874df09f63beca0c89fc5e6a2e96 SHA1 4518c19cc1e21eac86cbbaf8ca3d33193ee6adc8 SHA256 a5d7ab59c51bb9751ade660828447d4767ab6266192345dbb22c820232e9291e
 AUX libgphoto2-2.4.7-respect-bonjour.patch 643 RMD160 09724f2d7ad94938785709548ca7d246aa3bfac4 SHA1 49334840e851f3ab0c632df5031acbbae7335c57 SHA256 00b09825d9b6493a2a65577c6bf0b2a5549c6901b8b5fb839f886d989e29c055
 AUX libgphoto2-2.4.8-increase_max_entries.patch 477 RMD160 4be0b81331eedd0233b577226f70e0c220b869ae SHA1 2b6cd2967b6d16ab13ef7826781a93b852be69a1 SHA256 596ab7c4edc7573044e89ac548505b82de18f791616126273ff4fe13c935b4f8
+AUX libgphoto2-2.4.9-dnl.patch 471 RMD160 062158e62551d43f9515f64054dd37ad0c9b1517 SHA1 9dfbe07ccb18b57e545cdbd35f8654832727a62d SHA256 6f657277d3262d8295b35d5bd49c79a229fef5a9b587191d9e1a91ed73564bf5
 DIST libgphoto2-2.4.6.tar.bz2 5268340 RMD160 cca194a6db6658887b1b997838c7d6a5af9e2609 SHA1 f9fd10495ababce3cf992b36f3a29359e598aea7 SHA256 cbfad37afb6a65f93ce16fbe1e8a1201ef3586c614deca5cc51afc8011245606
 DIST libgphoto2-2.4.7.tar.bz2 5279581 RMD160 f5773f3b194f4dcc4a82ddbbf7ecad12e11dae93 SHA1 f91aef06204f3b1b0f3e07facba452881bedc2e1 SHA256 9e7613f21ac3dd7cf1decbab5c47c1e9a16d39c32062d7f8632adb4fc8d0271f
 DIST libgphoto2-2.4.8.tar.bz2 5371128 RMD160 0edc03231e1c646e45621b9adb09e268582b4437 SHA1 6ad0d9ffcafe2e9eba0cae958a4455ebb4cf2037 SHA256 69d7e0723b40e8a0c4fa897b96f6aecb5ae5548c3cce98c48e37b70623d9ffc3
@@ -13,13 +11,6 @@ EBUILD libgphoto2-2.4.6.ebuild 5861 RMD160 ec31b2783dcea0687b2495f930af02b0482ef
 EBUILD libgphoto2-2.4.7-r2.ebuild 6588 RMD160 02bf29cdf40405f586232cb21fe35f9faf67b4d4 SHA1 921cd1b2625815875b580f034cbf433601bc91f7 SHA256 c3c4e2ec8e41a0e0410d459f37433690a891f9a60ed32575f5be1fde12279805
 EBUILD libgphoto2-2.4.8-r1.ebuild 6630 RMD160 0cb41f2adf942e07e42a906c7fe5d88015d4f4fa SHA1 d24b9d7c61608e27f37e3385629f379ef3efd1d2 SHA256 b321c54fdef2d9ad8371fba20cacbd0b21ca531aacee843623e7441790ebcdf2
 EBUILD libgphoto2-2.4.8.ebuild 6499 RMD160 007f1df30a7f37a163c53c3d48e7fa0c3b517400 SHA1 60b4accd7296be7b49a503498a8637d1cafa8e11 SHA256 fd5d75147802692468c2988683138cedfb77be92219f9e65a7f922235a2873e9
-EBUILD libgphoto2-2.4.9.ebuild 6638 RMD160 e64706529b92d05ba5b61324ce60c31265a237a1 SHA1 69c4687c380b0bf1e61416ac9daf4b9ffa999629 SHA256 6351f76da0228e8e02c34088c04028350575c0fd59b9545fc333e1a599a8af1a
-MISC ChangeLog 28698 RMD160 aca56eea5b331e12c02be8780bf402120fb43d8d SHA1 41f3d6757391c51db5af8102f8d992edafe0ca34 SHA256 02585560a3c6c22f4a273d67b2d37093074b01c5761d9573c60968e147fe1ec7
+EBUILD libgphoto2-2.4.9.ebuild 6690 RMD160 a3e195f8a27ffe9129b25662eb97bbf6a2274cef SHA1 0052899037f4a0dfec4338214c99617cddb1a113 SHA256 b854c06cc0622594d2002aa3b01b4bd1e6511aee47b5d49bac82cbc617c5ff6e
+MISC ChangeLog 28886 RMD160 7c82fb1d542efa90c459bbfcc0a4e6e0d3ac12d1 SHA1 b194b4d3b4e3ae214c84ee2201046d4b70762fa9 SHA256 e5e2829bd9e57cffaf80cc3e45bcb4c3d9ac2d90b4299c0448da7e48a9d9408e
 MISC metadata.xml 255 RMD160 182d44452574b19b29c12dc7e757a2a4aa9cbc20 SHA1 7e912f6a5b9a294509849512ba044bd88b59065f SHA256 d2cc84bd8e8d171980c022b0af42cf2f2d829e37c05183988a211fccafcf363b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkx8D14ACgkQ1fmVwcYIWAZjeACgkXICBk+QNwxCTJkavo4Aletx
-2zcAn0ll7sD57yfsKJ1Ho4qDOkmyIPHe
-=bO6o
------END PGP SIGNATURE-----
diff --git a/media-libs/libgphoto2/files/libgphoto2-2.4.9-dnl.patch b/media-libs/libgphoto2/files/libgphoto2-2.4.9-dnl.patch
new file mode 100644
index 000000000000..8ee30baf8f74
--- /dev/null
+++ b/media-libs/libgphoto2/files/libgphoto2-2.4.9-dnl.patch
@@ -0,0 +1,24 @@
+http://bugs.gentoo.org/336598
+
+--- libgphoto2_port/m4/gp-libltdl.m4
++++ libgphoto2_port/m4/gp-libltdl.m4
+@@ -23,7 +23,7 @@
+ 
+ Please make sure that the proper development package is installed
+ (libltdl-dev, libtool-ltdl-devel, etc.)
+-])dnl
++])[]dnl
+ ])dnl
+ ])
+ else
+--- m4m/gp-libltdl.m4
++++ m4m/gp-libltdl.m4
+@@ -23,7 +23,7 @@
+ 
+ Please make sure that the proper development package is installed
+ (libltdl-dev, libtool-ltdl-devel, etc.)
+-])dnl
++])[]dnl
+ ])dnl
+ ])
+ else
diff --git a/media-libs/libgphoto2/libgphoto2-2.4.9.ebuild b/media-libs/libgphoto2/libgphoto2-2.4.9.ebuild
index c3c578c9e22d..8aaf28ea29c6 100644
--- a/media-libs/libgphoto2/libgphoto2-2.4.9.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.4.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.9.ebuild,v 1.2 2010/08/30 20:06:47 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.9.ebuild,v 1.3 2010/09/10 18:25:46 ssuominen Exp $
 
 # TODO
 # 1. Track upstream bug --disable-docs does not work.
@@ -96,6 +96,8 @@ src_prepare() {
 	# Increase max entries from 1024 to 8192 to fix bug #291049
 	epatch "${FILESDIR}/${PN}-2.4.8-increase_max_entries.patch"
 
+	epatch "${FILESDIR}"/${P}-dnl.patch #336598
+
 	eautoreconf
 
 	# Fix bug #216206, libusb detection