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

(Portage version: 2.2_rc67/cvs/Linux i686)

4 files changed, 44 insertions, 3 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/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