Rename patch to indicate version. Add patch to fix building with autoconf-2.65 (bug #297943).

Package-Manager: portage-2.2_rc67/cvs/Linux i686

5 files changed, 48 insertions, 16 deletions

diff --git a/net-analyzer/argus/ChangeLog b/net-analyzer/argus/ChangeLog
index 29d1a66ee1a2..ec1004d65427 100644
--- a/net-analyzer/argus/ChangeLog
+++ b/net-analyzer/argus/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/argus
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus/ChangeLog,v 1.20 2010/01/01 17:33:17 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus/ChangeLog,v 1.21 2010/04/09 01:52:31 jer Exp $
+
+  09 Apr 2010; Jeroen Roovers <jer@gentoo.org> argus-3.0.2.ebuild,
+  +files/argus-3.0.2-ac_require_and_cflags.patch,
+  +files/argus-3.0.2-disable-tcp-wrappers-automagic.patch,
+  -files/argus-disable-tcp-wrappers-automagic.patch:
+  Rename patch to indicate version. Add patch to fix building with
+  autoconf-2.65 (bug #297943).
 
   01 Jan 2010; Christian Faulhammer <fauli@gentoo.org> argus-3.0.2.ebuild:
   Transfer Prefix keywords
diff --git a/net-analyzer/argus/Manifest b/net-analyzer/argus/Manifest
index 8fea67049d9a..57c1439c8255 100644
--- a/net-analyzer/argus/Manifest
+++ b/net-analyzer/argus/Manifest
@@ -1,23 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX argus-2.0.5-gentoo.diff 317 RMD160 ad92b1d58f429a92053322a7ee1a716cb36dc89a SHA1 74402084425a1527e9bb10930d9e0dfa90d8a861 SHA256 dbce18208d928df5069c6991ac2ebbd8c23a4e7959d0112ef49749eeec5f2ccb
 AUX argus-2.0.5-libpcap-include.patch 669 RMD160 77667addf0331c1f5e15b4e2304c466eb96f770f SHA1 ae9aa5bb6b71ab0357670ea34c637589c930c95f SHA256 d2f0e0de3ad41c9505c23e391d91b9a369b4e00c7929145c0a787efe31aeaff2
 AUX argus-2.0.6-libpcap-include.patch 388 RMD160 7b4b0569527352fa6c9c0a25b6dee23db9aabb5b SHA1 4a902ce6a4057d8ee771312d190bd3b1ecf32136 SHA256 71c2356fcfc76543bc1e3b93561cbc5186751369284dccc9c00b3ba946f7eef9
-AUX argus-disable-tcp-wrappers-automagic.patch 587 RMD160 1584b25fbe796b63d1771a0befb66cf1575d44a2 SHA1 208b94ff33f7daafac4d96c6d65f33856f08a755 SHA256 7ad5c6c443f9153d7e540b453b0fc34098681c6ac69f9498926f8b5309d9658c
+AUX argus-3.0.2-ac_require_and_cflags.patch 877 RMD160 92ef9d7065cd18070f44016fff5d510fe5b42760 SHA1 3f00a2b888220ff59e695e13104f4c04800315b1 SHA256 76919f8012931ca8b546e241d26a67ca1ff46f317838a474c34f9ddd3505db87
+AUX argus-3.0.2-disable-tcp-wrappers-automagic.patch 587 RMD160 1584b25fbe796b63d1771a0befb66cf1575d44a2 SHA1 208b94ff33f7daafac4d96c6d65f33856f08a755 SHA256 7ad5c6c443f9153d7e540b453b0fc34098681c6ac69f9498926f8b5309d9658c
 AUX argus.initd 479 RMD160 7a52b754edf5219dec6049c216c89d24d3058eb2 SHA1 7ec0457ba22e94adf04b4b75283deac73c5a984c SHA256 df066d772f87e4df2ee1250de6ce4e370a5191fead8d22a2dc84593f4368ce88
 DIST argus-2.0.5.tar.gz 495234 RMD160 4bfb17c791adbc38255a3211c05477a5127c5b8d SHA1 e41abd49da2f5b0783621f35f94cb16f9c3fc4fc SHA256 6db37b526a206ea0b627bd4a5b09cfdf080d75bf367d899472093bdfbb4faa9e
 DIST argus-2.0.6.tar.gz 349299 RMD160 b58888da55153c02c90bfa6e473534c4b081738d SHA1 5316fe07c1bfdee455f4f6bcf53eff7e514403ba SHA256 3e626613ba3348fc60af234777b53fc0a0beb88fe43896aac2b1eda9b22a2c88
 DIST argus-3.0.2.tar.gz 392804 RMD160 85a922a9e30d09a0316bdcab2f815533b6fd6984 SHA1 32aa9b8da2a533114ca329843e6a111a20019f8d SHA256 5007d59cbd1fee0b4fd057550a767374749d97bd7b9d817541afdaf366805f50
 EBUILD argus-2.0.5.ebuild 1096 RMD160 a95f83efe9bb2c86af2838ada8a40935295567b0 SHA1 2c85ffadfcdb8c90703627688c893dc8e77bc71a SHA256 f3bd3215d4b0622d44ef9b18d9102f49441d14527541d951cb21ec3fb7033deb
 EBUILD argus-2.0.6.ebuild 1505 RMD160 bba7e461e537b6e95e9d5a76549606435e20c43e SHA1 a1f0fc54e64a7e5090d6dedc69af0e928f97fedd SHA256 96b506b487650510dd4005c6d16043f9dd4bb4902accf6c9c215f0e0a7240888
-EBUILD argus-3.0.2.ebuild 1765 RMD160 50d5c4d86a687167f31478bceae5a476ae24dc33 SHA1 5e91cea2505815a35f9358db1a342366ecfc922e SHA256 54c2e345542bc3f50538e1c764e47a37aef8cb26db263e78e43a070743acd590
-MISC ChangeLog 2617 RMD160 52b1c5cf90dc2bbff89a0938565cd88fc3007f21 SHA1 68ccc369442fdf8ac6a44ea2613704a7e8abbb13 SHA256 8dfe7c1e013fe015243371eabb430d4c5b4b027e8f8ee8464ebd9d84048f209c
+EBUILD argus-3.0.2.ebuild 1817 RMD160 350d4f92101d9ea89084d68e31c9509d186db716 SHA1 999d5d31b8af1364b5009425628a5466e4f21cdc SHA256 57e5e38b0c019ad8cb638e5c4a8aaee52258dc1254d1c68da5b50659992b2656
+MISC ChangeLog 2943 RMD160 0ebbac5dfcb05fec3aeb2907ced04a68d2b108e4 SHA1 2b94274a0df3875b28e0f3589b82a0bacf6d632f SHA256 3e4f8e31f06da8abf0c30a0f1f6af185bf88ff90d69c38245075e3401dcfbd19
 MISC metadata.xml 249 RMD160 2d5bfee9070b799f81a90c8976fd4890bed297b2 SHA1 642f6a9d8398574e2ff8a4b564a94167624eac32 SHA256 0ee6ce106355df17fe546546ea6658fc7dd7e6d0fab58aef1b745dac3b4c20da
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAks+MeMACgkQNQqtfCuFnePpGwCePGUimAW8tPGhVeY9ryaNsSo1
-oJ0AoJws8jbv2N8hLQU7Dt8Lwo18qymf
-=VOXQ
------END PGP SIGNATURE-----
diff --git a/net-analyzer/argus/argus-3.0.2.ebuild b/net-analyzer/argus/argus-3.0.2.ebuild
index 7833e14fa920..8b2de4c604ab 100644
--- a/net-analyzer/argus/argus-3.0.2.ebuild
+++ b/net-analyzer/argus/argus-3.0.2.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/net-analyzer/argus/argus-3.0.2.ebuild,v 1.2 2010/01/01 17:33:17 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus/argus-3.0.2.ebuild,v 1.3 2010/04/09 01:52:31 jer Exp $
 
 EAPI="2"
 
@@ -35,7 +35,8 @@ src_prepare() {
 		-e 's:\(#ARGUS_CHROOT_DIR=\).*:\1/var/lib/argus:' \
 			-i support/Config/argus.conf || die
 
-	epatch "${FILESDIR}/${PN}-disable-tcp-wrappers-automagic.patch"
+	epatch "${FILESDIR}/${P}-disable-tcp-wrappers-automagic.patch"
+	epatch "${FILESDIR}/${P}-ac_require_and_cflags.patch"
 	eautoreconf
 }
 
diff --git a/net-analyzer/argus/files/argus-3.0.2-ac_require_and_cflags.patch b/net-analyzer/argus/files/argus-3.0.2-ac_require_and_cflags.patch
new file mode 100644
index 000000000000..35787cde5889
--- /dev/null
+++ b/net-analyzer/argus/files/argus-3.0.2-ac_require_and_cflags.patch
@@ -0,0 +1,33 @@
+* Use AC_REQUIRE instead of AC_BEFORE (bug #297943).
+* Do not introduce compiler optimisation flags.
+
+
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -93,7 +93,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_BEFORE([$0], [AC_QOSIENT_DEBUG])
+@@ -126,7 +126,7 @@
+     if test "$GCC" = yes ; then
+        if test "$SHLICC2" = yes ; then
+           ac_cv_lbl_gcc_vers=2
+-          $1="-O3"
++          $1=""
+        else
+           AC_MSG_CHECKING(gcc version)
+           AC_CACHE_VAL(ac_cv_lbl_gcc_vers,
+@@ -137,7 +137,7 @@
+             -e 's/\..*//'`)
+           AC_MSG_RESULT($ac_cv_lbl_gcc_vers)
+           if test $ac_cv_lbl_gcc_vers -gt 1 ; then
+-             $1="-O3"
++             $1=""
+           fi
+        fi
+     else
diff --git a/net-analyzer/argus/files/argus-disable-tcp-wrappers-automagic.patch b/net-analyzer/argus/files/argus-3.0.2-disable-tcp-wrappers-automagic.patch
index 2117756a2636..2117756a2636 100644
--- a/net-analyzer/argus/files/argus-disable-tcp-wrappers-automagic.patch
+++ b/net-analyzer/argus/files/argus-3.0.2-disable-tcp-wrappers-automagic.patch