Update gcc4 patch with the proper AC_TRY_LINK fix. Thanks to halcy0n for the help.

(Portage version: 2.0.51.21-r1)

4 files changed, 49 insertions, 16 deletions

diff --git a/net-analyzer/tcpdump/ChangeLog b/net-analyzer/tcpdump/ChangeLog
index e17797b57ec5..e12c1e9c7ebe 100644
--- a/net-analyzer/tcpdump/ChangeLog
+++ b/net-analyzer/tcpdump/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/tcpdump
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.42 2005/05/14 12:24:56 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.43 2005/05/14 16:21:40 ka0ttic Exp $
+
+  14 May 2005; Aaron Walker <ka0ttic@gentoo.org>
+  files/tcpdump-3.8.3-gcc4.patch, tcpdump-3.8.3-r2.ebuild:
+  Update gcc4 patch with the proper AC_TRY_LINK fix. Thanks to halcy0n for the
+  help.
 
   14 May 2005; Aaron Walker <ka0ttic@gentoo.org>
   +files/tcpdump-3.8.3-gcc4.patch, tcpdump-3.8.3-r2.ebuild:
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index 4037ea7c51c2..28d8be62cf95 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 8c5b3bdacca3d85a1d84a55f3db230c5 tcpdump-3.8.3-r1.ebuild 1092
-MD5 30b574d0dec57c3447074dc5b2907a08 ChangeLog 5705
+MD5 9b5ffd6f81dd5a35daa87b514f4b412d ChangeLog 5901
 MD5 1465cdeb961745379a8ae1402b3e51ab metadata.xml 268
-MD5 a991e276117febb6746fec831f40e7bf tcpdump-3.8.3-r2.ebuild 1277
-MD5 7c5de451e6fc2e5d0b34410069973e5b files/tcpdump-3.8.3-gcc4.patch 2571
+MD5 1d277eb8740cf65078cd8d4bed9ea5cd tcpdump-3.8.3-r2.ebuild 1244
+MD5 373e9bba235a67d1de8eb1356151f32c files/tcpdump-3.8.3-gcc4.patch 3162
 MD5 d285bb203f9e48fc23492e4c72d61a94 files/digest-tcpdump-3.8.3-r1 65
 MD5 d285bb203f9e48fc23492e4c72d61a94 files/digest-tcpdump-3.8.3-r2 65
 MD5 4d0df7aa1535098ccef25ba7e86e5e95 files/tcpdump-3.8.3-gentoo.patch 4002
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFChe5pEZCkKN40op4RAh64AKCd7LMUkEkDpCg6L8TXDLTBj0OeUwCgosdW
-JJin25OecBH7KAYmVjBC2m0=
-=f+gm
------END PGP SIGNATURE-----
diff --git a/net-analyzer/tcpdump/files/tcpdump-3.8.3-gcc4.patch b/net-analyzer/tcpdump/files/tcpdump-3.8.3-gcc4.patch
index 0414171222ee..5f20a5a45595 100644
--- a/net-analyzer/tcpdump/files/tcpdump-3.8.3-gcc4.patch
+++ b/net-analyzer/tcpdump/files/tcpdump-3.8.3-gcc4.patch
@@ -1,3 +1,42 @@
+--- tcpdump-3.8.3/configure.gcc34	2004-03-23 19:59:23.000000000 +0100
++++ tcpdump-3.8.3/configure	2004-03-30 14:56:21.469869618 +0200
+@@ -8917,18 +8917,10 @@
+ int
+ main ()
+ {
+-
+-int
+-return_pcap_debug(void)
+-{
+ 	extern int pcap_debug;
+ 
+ 	return pcap_debug;
+ }
+-
+-  ;
+-  return 0;
+-}
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+@@ -8976,17 +8968,9 @@
+ int
+ main ()
+ {
+-
+-	int
+-	return_yydebug(void)
+-	{
+ 		extern int yydebug;
+ 
+ 		return yydebug;
+-	}
+-
+-  ;
+-  return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
 diff --exclude='*~' --exclude='.*' -I '$Id:' -urN tcpdump-3.8.3.orig/print-fr.c tcpdump-3.8.3/print-fr.c
 --- tcpdump-3.8.3.orig/print-fr.c	2005-05-14 05:53:15.000000000 -0400
 +++ tcpdump-3.8.3/print-fr.c	2005-05-14 05:58:21.000000000 -0400
diff --git a/net-analyzer/tcpdump/tcpdump-3.8.3-r2.ebuild b/net-analyzer/tcpdump/tcpdump-3.8.3-r2.ebuild
index c6f101927d4f..39a661fe5750 100644
--- a/net-analyzer/tcpdump/tcpdump-3.8.3-r2.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-3.8.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-3.8.3-r2.ebuild,v 1.8 2005/05/14 12:24:56 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-3.8.3-r2.ebuild,v 1.9 2005/05/14 16:21:40 ka0ttic Exp $
 
 inherit flag-o-matic toolchain-funcs
 
@@ -33,7 +33,6 @@ src_compile() {
 	then
 		filter-flags -funit-at-a-time
 		append-flags -fno-unit-at-a-time #48747
-		append-flags -UHAVE_PCAP_DEBUG
 	fi
 
 	econf $(use_with ssl crypto) $(use_enable ipv6) || die