Add patch to build with --as-needed and adns useflag. Bug #129906 reported by Patrizio Bassi.

Package-Manager: portage-2.1_pre7-r5

4 files changed, 38 insertions, 13 deletions

diff --git a/net-analyzer/ethereal/ChangeLog b/net-analyzer/ethereal/ChangeLog
index 9394f0445f53..0eaed7993361 100644
--- a/net-analyzer/ethereal/ChangeLog
+++ b/net-analyzer/ethereal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/ethereal
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.170 2006/03/10 00:22:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.171 2006/04/15 16:36:44 flameeyes Exp $
+
+  15 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/ethereal-0.10.14-asneeded.patch, ethereal-0.10.14-r1.ebuild:
+  Add patch to build with --as-needed and adns useflag. Bug #129906 reported
+  by Patrizio Bassi.
 
   10 Mar 2006; Aron Griffis <agriffis@gentoo.org> ethereal-0.10.14.ebuild:
   Mark 0.10.14 stable on ia64
diff --git a/net-analyzer/ethereal/Manifest b/net-analyzer/ethereal/Manifest
index 660205a4f7fe..ce03bdba037f 100644
--- a/net-analyzer/ethereal/Manifest
+++ b/net-analyzer/ethereal/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f7a5fdd501009d34ccafc3ad4a7c61f6 ChangeLog 15560
-RMD160 e8d0a29a3a36493f98a10546d3832a78eac204ab ChangeLog 15560
-SHA256 562b8d10cfca301c39dfd4020bc6a789dcad052ce78ddb79a7add83953eb6683 ChangeLog 15560
+MD5 2b2f0732aaf8ea8220bb7f8991c4b158 ChangeLog 15783
+RMD160 3af2f95a53967765c246915aefc0f5a9436cf821 ChangeLog 15783
+SHA256 f663a887046e891c717a35a40cb46a75eddeaffa946c24a42cb2c68baf62ccbf ChangeLog 15783
 MD5 b351bb6638fe4279a26c3f570c9dd30b ethereal-0.10.13-r2.ebuild 3787
 RMD160 a83d6df6f49b7ecbb9e97323ae31f33b0ef93460 ethereal-0.10.13-r2.ebuild 3787
 SHA256 c8f845c881b092d96980e5e70a4c524926788cbdaa312d2414cac2e071134bfe ethereal-0.10.13-r2.ebuild 3787
-MD5 da983c6e4fc5e08dd177d500ce775461 ethereal-0.10.14-r1.ebuild 3692
-RMD160 ad1353b148bd886d4d368a8cf46246ed791516fb ethereal-0.10.14-r1.ebuild 3692
-SHA256 57f6968ce0500fde2c4b7c02903c1839e24a7e695084ee8f64e712832b2521e8 ethereal-0.10.14-r1.ebuild 3692
+MD5 37e925f02777b6168f6aad1db53116ec ethereal-0.10.14-r1.ebuild 3814
+RMD160 d98d22045ff4b6bfe509923cf292df1a952d8eeb ethereal-0.10.14-r1.ebuild 3814
+SHA256 61feaf092e58a06c8699711a9662b3def73295e2e36c3225b86d9eda6769552a ethereal-0.10.14-r1.ebuild 3814
 MD5 eeb4a9b83362b84c0348c0d07a199818 ethereal-0.10.14.ebuild 3576
 RMD160 ecf41482a4ff4829e952e1c4ae60c2552e677254 ethereal-0.10.14.ebuild 3576
 SHA256 209920ddc054e769197ab637b4b2b163e1bed9dc1b206cfd12f786a07801e275 ethereal-0.10.14.ebuild 3576
@@ -28,6 +28,9 @@ SHA256 a6a75b5b90650af3f06e5f8234959410f02c8c725cc3a86d869ece1fab399d29 files/et
 MD5 c334d7d6daae506c1e3a9a61d892a00c files/ethereal-0.10.13-packet-ospf.diff 18115
 RMD160 9607e8a4ad3676b6873acdd26aa994ad77558c08 files/ethereal-0.10.13-packet-ospf.diff 18115
 SHA256 8b654d145d9bea0f3e9e79accfc6efa031086b4816950073a2c6cbd4e249d28a files/ethereal-0.10.13-packet-ospf.diff 18115
+MD5 9423b7a0f04e4e124835eacfe33c8d48 files/ethereal-0.10.14-asneeded.patch 847
+RMD160 83896f31fb4b84940f17cb48a70073e849968543 files/ethereal-0.10.14-asneeded.patch 847
+SHA256 2815e1f321400e74c01953a72b330e6080a5b65a5360d594ceeb8b1a7d2e7c03 files/ethereal-0.10.14-asneeded.patch 847
 MD5 99292dc5864a5d38a12bf357dab75e6f files/ethereal-0.10.14-capture_loop.patch 1985
 RMD160 5d435678e4bf265899b9e95654c049ecc3d33435 files/ethereal-0.10.14-capture_loop.patch 1985
 SHA256 68b2a0997e2224fc0a26f7dcbc440e4b0b1574c845716072d554cdc422f55126 files/ethereal-0.10.14-capture_loop.patch 1985
@@ -35,9 +38,9 @@ MD5 94e03a4ff2917efc81b0e0f07040afde metadata.xml 241
 RMD160 e54fec44f06e7d8c93e399d9bd98e56f231920be metadata.xml 241
 SHA256 684412188c16efe278e263e010f4bf09d33f17f2762d4829516e3e3a47ab3c02 metadata.xml 241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEEMbbJrHF4yAQTrARArIWAKCOakD872ZDdF2lHDJDeV4RfRF3kQCgmu1k
-PKC0gl8tmDZILRfkHhyZxfs=
-=USRC
+iD8DBQFEQSByAiZjviIA2XgRAuhkAJ48kmno/QiOZz1gjWf4AxQolcORcwCfcTSc
+OyFGTUN4P/2gtBXHh1hrXlw=
+=XP3h
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/ethereal/ethereal-0.10.14-r1.ebuild b/net-analyzer/ethereal/ethereal-0.10.14-r1.ebuild
index 3156a2f50830..8bfebbc76193 100644
--- a/net-analyzer/ethereal/ethereal-0.10.14-r1.ebuild
+++ b/net-analyzer/ethereal/ethereal-0.10.14-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.14-r1.ebuild,v 1.2 2006/02/15 22:13:06 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.14-r1.ebuild,v 1.3 2006/04/15 16:36:44 flameeyes Exp $
 
-inherit libtool flag-o-matic eutils
+inherit libtool flag-o-matic eutils autotools libtool
 
 DESCRIPTION="A commercial-quality network protocol analyzer"
 HOMEPAGE="http://www.ethereal.com/"
@@ -48,6 +48,10 @@ src_unpack() {
 	cd "${S}"
 	# bug 117716
 	epatch "${FILESDIR}"/${PN}-0.10.14-capture_loop.patch
+	epatch "${FILESDIR}/${P}-asneeded.patch"
+
+	AT_M4DIR="${S}/aclocal-fallback" eautomake
+	elibtoolize
 }
 
 src_compile() {
diff --git a/net-analyzer/ethereal/files/ethereal-0.10.14-asneeded.patch b/net-analyzer/ethereal/files/ethereal-0.10.14-asneeded.patch
new file mode 100644
index 000000000000..2bf83fe7ece3
--- /dev/null
+++ b/net-analyzer/ethereal/files/ethereal-0.10.14-asneeded.patch
@@ -0,0 +1,13 @@
+Index: ethereal-0.10.14/epan/Makefile.am
+===================================================================
+--- ethereal-0.10.14.orig/epan/Makefile.am
++++ ethereal-0.10.14/epan/Makefile.am
+@@ -84,7 +84,7 @@ MAINTAINERCLEANFILES = \
+ #
+ # Add the object files for missing routines, if any.
+ #
+-libethereal_la_LIBADD = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ dfilter/libdfilter.la ftypes/libftypes.la dissectors/libdissectors.la
++libethereal_la_LIBADD = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ dfilter/libdfilter.la ftypes/libftypes.la dissectors/libdissectors.la @ADNS_LIBS@
+ libethereal_la_DEPENDENCIES = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ dfilter/libdfilter.la ftypes/libftypes.la dissectors/libdissectors.la
+ 
+ tvbtest: tvbtest.o tvbuff.o except.o strutil.o