Fix building with autoconf-2.64+ #281690.

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

4 files changed, 37 insertions, 4 deletions

diff --git a/net-libs/libpcap/ChangeLog b/net-libs/libpcap/ChangeLog
index ea15f2683116..52f6a79b2922 100644
--- a/net-libs/libpcap/ChangeLog
+++ b/net-libs/libpcap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/libpcap
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.131 2009/10/12 09:03:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.132 2009/11/24 23:09:26 vapier Exp $
+
+  24 Nov 2009; Mike Frysinger <vapier@gentoo.org>
+  libpcap-1.0.1_pre20090812.ebuild, +files/libpcap-1.0.1-autoconf.patch:
+  Fix building with autoconf-2.64+ #281690.
 
   12 Oct 2009; Jeroen Roovers <jer@gentoo.org> libpcap-1.0.0-r2.ebuild:
   Stable for HPPA (bug #284790).
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index 360eee10e493..65e15df2c9bb 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libpcap-0.8.1-fPIC.patch 298 RMD160 4cf97341a5da39c97553871312c9381f30457bdb SHA1 e63657730f2a1d2f04ca50947ea01485f1d5994e SHA256 cd4cbc5aa3ba94095e85cf026b015f20af9ed77c05b529b2cb902e5ba365a7c3
 AUX libpcap-0.9.3-whitespace.diff 679 RMD160 70ccf92874b1665253608ffeffa7de89c2af48d7 SHA1 a50d6467d5805a53809e9fdcc197377b76d21559 SHA256 4ff701485da6f577980048b9b91810ba7aa529c3be021dea30c8205b0a130606
 AUX libpcap-0.9.8-arptype-65534.patch 870 RMD160 be267ff32f5a59d0e8028da030131605beb50c49 SHA1 0fb37d5925b51f3beaae1dc66b5db4553d987cc9 SHA256 854e08c83f8615a4e5d12e3c2d0130ca23e38cd8216105495cf8f2968f2bb0a4
@@ -11,6 +14,7 @@ AUX libpcap-1.0.0-install-bindir.patch 493 RMD160 2e30779a1b45cbbeaeec98e2d9b61c
 AUX libpcap-1.0.0-install-headers.patch 1447 RMD160 c68db41d4417a57c4b51613699b748a4524781c3 SHA1 83c5496eed2e3f4cc262aa6613596d80883eb9d2 SHA256 4e913dd0a4d460fdf5d57c4ebc67cc379178dcd06c8ef33422661c174ffd7e27
 AUX libpcap-1.0.0-optional-bluetooth.patch 5394 RMD160 df5093800385df09e5a0f9a22d359c5e04269a5f SHA1 bdeb0237b720e40585c463fabc3a305f99170024 SHA256 53b01de2108b00c74e2eda513ae8f5253e2b7d960cb8ab22494cbe0631cb3056
 AUX libpcap-1.0.0-whitespace.patch 679 RMD160 6a62d2e5737a8627e43b853a687b31c5b4275b96 SHA1 49fa8750e8fe92c13bbb5f111c8d78b173313c4a SHA256 684b4407b3055336478507f7642bd4f83cf10f3cd1d0fd41971cad1f1a12b6bb
+AUX libpcap-1.0.1-autoconf.patch 560 RMD160 84f326621b6a3de48516a449c5a9a48b95a99874 SHA1 39edc57982ea1a303d212a317f4258e909f0359f SHA256 cdd38a908723e272d834eda1d032f97e2b890949c1a24e24be6a178815258b27
 AUX libpcap-1.0.1_pre20090708-libnl-automagic.patch 1018 RMD160 75c7caeca86951426b0fc140cc8919e0215a8471 SHA1 7fb4a68bfcd1f884907ca2e71c9340eff21b4548 SHA256 8b29e765a244161545f02ea702f555303a9914ccde73548258d79900691778f5
 AUX libpcap-1.0.1_pre20090812-poll-cpu-usage.patch 1060 RMD160 b4821a0b146dda4ff8cce822e5d86f3196ab0894 SHA1 1b017ce2e2edc978b757c886326da6cc7f6898d2 SHA256 44776d07b759061f27be568f1fef7eb3400f1a10ad11fe14557f676a0dbd04b9
 AUX libpcap-cross-linux.patch 1114 RMD160 e76fd1ea94d34e8533416c476d95166ad13579ec SHA1 0853cb1cf102c6d9b41d22b4c62b0e1bac6d73a8 SHA256 4b3fe1e2b7ecefbf82e20120f8c3bf9c5050cb7ccc1e0be77a04af5ef7cbb459
@@ -21,6 +25,13 @@ DIST libpcap-1.0.1-20090812.tar.gz 574616 RMD160 60cab9e2a00ec5124823958c65fc00f
 EBUILD libpcap-0.9.8-r2.ebuild 1893 RMD160 7eb603ca3e2cbe57ce3857536b1ecca7b8769742 SHA1 edcc59e68dc8a21036c1f5b9df87b9cb0516ef93 SHA256 f5c8ed79b684c390791df95dfaad5b2ab0a6f7108ca6048823f5101f18c24a4e
 EBUILD libpcap-1.0.0-r2.ebuild 1742 RMD160 c8cfe56d24f6ec5f36db1e5d7a78db07601067fc SHA1 8b5f1ff186e1c70d5c7fa3156bbadf71a6e5df1d SHA256 54d954551f24a905f5a1c7be53e9da380fe98f0757af51e1a7d1fd37d5e55de6
 EBUILD libpcap-1.0.1_pre20090708.ebuild 1803 RMD160 094bab78977034a4ed4b0d6e7c3fdb240fe64a59 SHA1 03aff6a3ddb8d1e95bcc88052a36eb14fe3ca970 SHA256 cf80f44afc13d3f19dacfbcd32ad45e4598c4b8a8f2f7359e650171c29c88969
-EBUILD libpcap-1.0.1_pre20090812.ebuild 1799 RMD160 a2c1887e7f8b77482aff49e69ae4e26e38045f20 SHA1 ed89849520befe79e5fdd0aa55b1018d6308f660 SHA256 21abcd6edc48a4222dbf107e6344b7cfc1114644facc026b2b36fa96d4ae6520
-MISC ChangeLog 17533 RMD160 961cb98cd4054f433a74d5e71fafab2a40384756 SHA1 9ea028b41023898947bcb090094c117c1df969fd SHA256 63fdbd17ca414413e624638ce0ed20acae890fe4edf9a73df73627efcec5071b
+EBUILD libpcap-1.0.1_pre20090812.ebuild 1855 RMD160 cae7048464ec8c514b53dcf943e5f1550ea81c10 SHA1 e0a11fa54877263c1ffebef13aabd9a4ae8ed0e4 SHA256 ea2dde3c764c7f54b33e40a795a92f008e9b3ce094f4aecce25451ac4be2882c
+MISC ChangeLog 17704 RMD160 b3e74e18b6df5df78505dab03bfa3e552c410bbb SHA1 f0ca9762f2b3d0b7d8124035777fe6840d8eb932 SHA256 3fc235148d810c83e56025ad352f7df598790b96b90e54a59947bb6ffa6e17b0
 MISC metadata.xml 389 RMD160 34c1d8fae5de18e7a265bec7989f85524d314ffa SHA1 7b0158e05458271a71ea956651a095c577b978ac SHA256 229da3200f3a83c37e581ce62f15ffa8c2f8dbcd1dcb091b8a8904e67e3550e8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.13 (GNU/Linux)
+
+iEYEARECAAYFAksMaJkACgkQlPl3HsVfCDox1QCfb2Oo2CLsnvSNoS9utcMi4jv8
+HeAAn1rXJ8gQ4Konwhao5ZH3UXBE9qNG
+=dR3S
+-----END PGP SIGNATURE-----
diff --git a/net-libs/libpcap/files/libpcap-1.0.1-autoconf.patch b/net-libs/libpcap/files/libpcap-1.0.1-autoconf.patch
new file mode 100644
index 000000000000..5d5598fbb33a
--- /dev/null
+++ b/net-libs/libpcap/files/libpcap-1.0.1-autoconf.patch
@@ -0,0 +1,17 @@
+http://bugs.gentoo.org/281690
+https://sourceforge.net/tracker/index.php?func=detail&aid=2881185&group_id=53067&atid=469577
+
+the code before AC_PROG_CC isnt terribly important, so ignore it for now so
+that we work with autoconf-2.64+
+
+--- libpcap/aclocal.m4
++++ libpcap/aclocal.m4
+@@ -44,7 +44,7 @@
+ dnl
+ AC_DEFUN(AC_LBL_C_INIT,
+     [AC_PREREQ(2.12)
+-    AC_BEFORE([$0], [AC_PROG_CC])
++    AC_REQUIRE([AC_PROG_CC])
+     AC_BEFORE([$0], [AC_LBL_FIXINCLUDES])
+     AC_BEFORE([$0], [AC_LBL_DEVEL])
+     AC_ARG_WITH(gcc, [  --without-gcc           don't use gcc])
diff --git a/net-libs/libpcap/libpcap-1.0.1_pre20090812.ebuild b/net-libs/libpcap/libpcap-1.0.1_pre20090812.ebuild
index 462029c15b13..e4f50b829967 100644
--- a/net-libs/libpcap/libpcap-1.0.1_pre20090812.ebuild
+++ b/net-libs/libpcap/libpcap-1.0.1_pre20090812.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.0.1_pre20090812.ebuild,v 1.1 2009/08/29 21:06:50 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.0.1_pre20090812.ebuild,v 1.2 2009/11/24 23:09:26 vapier Exp $
 
 EAPI=2
 inherit autotools eutils multilib toolchain-funcs
@@ -28,6 +28,7 @@ PROVIDE="virtual/libpcap"
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-1.0.0-cross-linux.patch"
 	epatch "${FILESDIR}/${PN}-1.0.1_pre20090812-poll-cpu-usage.patch"
+	epatch "${FILESDIR}"/${PN}-1.0.1-autoconf.patch #281690
 	echo ${PV} > VERSION # Avoid CVS in version
 	eautoreconf
 }