Got rid of the patch in favor of flag-o-matic

5 files changed, 21 insertions, 38 deletions

diff --git a/net-analyzer/ethereal/ChangeLog b/net-analyzer/ethereal/ChangeLog
index 6b11746152e4..a19641c41bb2 100644
--- a/net-analyzer/ethereal/ChangeLog
+++ b/net-analyzer/ethereal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/ethereal
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.81 2004/08/15 21:36:40 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.82 2004/08/16 07:35:32 eldad Exp $
+
+  16 Aug 2004; Eldad Zack <eldad@gentoo.org> -files/0.10.3-gcc34.patch,
+  -files/0.10.6-gcc34.patch, ethereal-0.10.6.ebuild:
+  Got rid of the patch in favor of flag-o-matic.
 
   15 Aug 2004; Tony Vroon <chainsaw@gentoo.org> +files/0.10.6-gcc34.patch,
   ethereal-0.10.6.ebuild:
diff --git a/net-analyzer/ethereal/Manifest b/net-analyzer/ethereal/Manifest
index 47a630f72906..0f3d76c28b14 100644
--- a/net-analyzer/ethereal/Manifest
+++ b/net-analyzer/ethereal/Manifest
@@ -1,11 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 0a42a2c2146a38e8b79a7ac03600f8a0 ethereal-0.10.5.ebuild 2580
-MD5 bc9b5cb351d27339a0aa0814965cb278 ethereal-0.10.6.ebuild 2590
-MD5 a5cae9d759aa69bcb3dd6c466c5e63a4 ChangeLog 11470
+MD5 67fe3215c33eaf71089ce034d4716645 ethereal-0.10.6.ebuild 2402
+MD5 1d2cadf6df4142cc721162250688724b ChangeLog 11642
 MD5 bb9946fe6df0695a2376909c6e3cbd2d ethereal-0.10.5-r1.ebuild 2595
 MD5 17a9be2cf8cb9f24e7e5b398392483b4 metadata.xml 224
-MD5 1875318b9daa28a1a0007c8244809037 files/0.10.6-gcc34.patch 303
-MD5 5a73274ec255373b4e618388cd057275 files/0.10.3-gcc34.patch 458
 MD5 5a73274ec255373b4e618388cd057275 files/0.10.4-gcc34.patch 458
 MD5 56d5feedd5047dd2b7bcd4c9295addef files/digest-ethereal-0.10.5-r1 69
 MD5 56d5feedd5047dd2b7bcd4c9295addef files/digest-ethereal-0.10.5 69
 MD5 5bc98004e6492e3349a16bf0591c743e files/digest-ethereal-0.10.6 69
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.4 (GNU/Linux)
+
+iD8DBQFBIGR1T+MN7JbqCpMRAj8vAJ9nweo7R6T1rcBAFAgQrYOieoR4yACfc1Lw
+bbw47Is0u0yL1h3byD1nvT0=
+=jEhD
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/ethereal/ethereal-0.10.6.ebuild b/net-analyzer/ethereal/ethereal-0.10.6.ebuild
index ee36638ca0c5..e94a8434cb20 100644
--- a/net-analyzer/ethereal/ethereal-0.10.6.ebuild
+++ b/net-analyzer/ethereal/ethereal-0.10.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.6.ebuild,v 1.2 2004/08/15 21:36:40 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.6.ebuild,v 1.3 2004/08/16 07:35:32 eldad Exp $
 
 inherit libtool flag-o-matic gcc eutils
 
@@ -33,21 +33,14 @@ DEPEND="${RDEPEND}
 	sys-devel/bison
 	sys-devel/flex"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
+src_compile() {
 
 	replace-flags -O3 -O
 	replace-flags -O2 -O
-	# Fix gcc-3.4 segfault #49238
-	[ "`gcc-version`" == "3.4" ] && epatch ${FILESDIR}/0.10.6-gcc34.patch
 
-	# running a full elibtoolize seems to break things in this
-	# package... see bug 41831 (17 Feb 2004 agriffis)
-	# elibtoolize --patch-only
-}
+	# Fix gcc-3.4 segfault #49238
+	[ "`gcc-version`" == "3.4" ] && append-flags -fno-unroll-loops
 
-src_compile() {
 	local myconf="
 		$(use_with ssl)
 		$(use_enable ipv6)
diff --git a/net-analyzer/ethereal/files/0.10.3-gcc34.patch b/net-analyzer/ethereal/files/0.10.3-gcc34.patch
deleted file mode 100644
index 7f7a5d2451c2..000000000000
--- a/net-analyzer/ethereal/files/0.10.3-gcc34.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- epan/Makefile.in.old	2004-03-26 04:05:56.000000000 +0000
-+++ epan/Makefile.in	2004-04-23 08:59:22.353604120 +0100
-@@ -1453,7 +1453,7 @@
- CCLD = $(CC)
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -fno-unroll-loops
- DIST_SOURCES = $(libethereal_la_SOURCES) $(EXTRA_libethereal_la_SOURCES)
- 
- RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
diff --git a/net-analyzer/ethereal/files/0.10.6-gcc34.patch b/net-analyzer/ethereal/files/0.10.6-gcc34.patch
deleted file mode 100644
index c198202cd25f..000000000000
--- a/net-analyzer/ethereal/files/0.10.6-gcc34.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- epan/Makefile.in.orig	2004-08-15 22:41:56.667034016 +0100
-+++ epan/Makefile.in	2004-08-15 22:42:42.952997480 +0100
-@@ -96,7 +96,7 @@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -fno-unroll-loops
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CYGPATH_W = @CYGPATH_W@