as-needed.patch to include other libs. bug #131252 thanks to Mike and Hanno

Package-Manager: portage-2.1_pre9-r4

4 files changed, 42 insertions, 13 deletions

diff --git a/net-analyzer/ethereal/ChangeLog b/net-analyzer/ethereal/ChangeLog
index 1dc7d73eb2dc..9e091fb96b17 100644
--- a/net-analyzer/ethereal/ChangeLog
+++ b/net-analyzer/ethereal/ChangeLog
@@ -1,6 +1,10 @@
 # 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.174 2006/04/26 02:16:26 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.175 2006/04/26 02:53:14 dragonheart Exp $
+
+  26 Apr 2006; Daniel Black <dragonheart@gentoo.org>
+  +files/ethereal-0.99.0-as-needed.patch, ethereal-0.99.0.ebuild:
+  as-needed.patch to include other libs. bug #131252 thanks to Mike and Hanno
 
   26 Apr 2006; Jason Wever <weeve@gentoo.org> ethereal-0.99.0.ebuild:
   Stable on SPARC wrt security bug #130505.
diff --git a/net-analyzer/ethereal/Manifest b/net-analyzer/ethereal/Manifest
index 2ed492cc662e..455dcdd32f5e 100644
--- a/net-analyzer/ethereal/Manifest
+++ b/net-analyzer/ethereal/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ethereal-0.10.14-asneeded.patch 847 RMD160 83896f31fb4b84940f17cb48a70073e849968543 SHA1 c0f3107923cfb66df5c5191ba5308ec07f72dc4d SHA256 2815e1f321400e74c01953a72b330e6080a5b65a5360d594ceeb8b1a7d2e7c03 size 847
 MD5 9423b7a0f04e4e124835eacfe33c8d48 files/ethereal-0.10.14-asneeded.patch 847
 RMD160 83896f31fb4b84940f17cb48a70073e849968543 files/ethereal-0.10.14-asneeded.patch 847
@@ -6,6 +9,10 @@ AUX ethereal-0.10.14-capture_loop.patch 1985 RMD160 5d435678e4bf265899b9e95654c0
 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
+AUX ethereal-0.99.0-as-needed.patch 921 RMD160 6967cbb5ce3da80ac35f657140942235d453a5e9 SHA1 fe50576ef5ec409f5b419a4d378f002e03d4f526 SHA256 ad30c8dc12fa4c2b425a7d4b883c4414aad6eefc0dceacbb020046b8944b7d21 size 921
+MD5 73f8c14539d2443f77ef38a60454afa1 files/ethereal-0.99.0-as-needed.patch 921
+RMD160 6967cbb5ce3da80ac35f657140942235d453a5e9 files/ethereal-0.99.0-as-needed.patch 921
+SHA256 ad30c8dc12fa4c2b425a7d4b883c4414aad6eefc0dceacbb020046b8944b7d21 files/ethereal-0.99.0-as-needed.patch 921
 DIST ethereal-0.10.14.tar.bz2 8583324 RMD160 1c11c43a1ceebb5a82dc920ca30b370ec73a1d23 SHA256 c8d0b59d599c5f7917666a0109a593be4ce031344de78228f92c481defc91258 size 8583324
 DIST ethereal-0.99.0.tar.bz2 8884587 RMD160 f86e21ae60d53e1ed60b61e58c2941ecfd4d8696 SHA256 b4bc14b6d385aa7d332d7e11e881d640676104d1f296dde7f50abac6ef794267 size 8884587
 EBUILD ethereal-0.10.14-r1.ebuild 3814 RMD160 d98d22045ff4b6bfe509923cf292df1a952d8eeb SHA1 4aba87aad7ebbddcdccb1807786b915ff1edaf2c SHA256 61feaf092e58a06c8699711a9662b3def73295e2e36c3225b86d9eda6769552a size 3814
@@ -16,14 +23,14 @@ EBUILD ethereal-0.10.14.ebuild 3576 RMD160 ecf41482a4ff4829e952e1c4ae60c2552e677
 MD5 eeb4a9b83362b84c0348c0d07a199818 ethereal-0.10.14.ebuild 3576
 RMD160 ecf41482a4ff4829e952e1c4ae60c2552e677254 ethereal-0.10.14.ebuild 3576
 SHA256 209920ddc054e769197ab637b4b2b163e1bed9dc1b206cfd12f786a07801e275 ethereal-0.10.14.ebuild 3576
-EBUILD ethereal-0.99.0.ebuild 3960 RMD160 c8089cfee123bfecbc26f3fb6d7f46f6ae91c153 SHA1 5d438dbc6e5c132d9b0f0c7bdd7334ce289d6a1a SHA256 fca5c95a1f43492000611c44e2ea074cbdfafb487bbf83c6f4902d41dbbb199c size 3960
-MD5 5801ea0b938e3ddfe75e376360f61d0f ethereal-0.99.0.ebuild 3960
-RMD160 c8089cfee123bfecbc26f3fb6d7f46f6ae91c153 ethereal-0.99.0.ebuild 3960
-SHA256 fca5c95a1f43492000611c44e2ea074cbdfafb487bbf83c6f4902d41dbbb199c ethereal-0.99.0.ebuild 3960
-MISC ChangeLog 16355 RMD160 9a9e571d1f143c643ad7ec0de8867e8614157a6c SHA1 6666548197e38317e6b410cc3002cf11bcb4d96c SHA256 a0a2db45e67d0db070ff8a2e0f843df977e963b628167e4485b0d2d9e51faed7 size 16355
-MD5 6c2fdf08158318a274a0d54e06aa06c2 ChangeLog 16355
-RMD160 9a9e571d1f143c643ad7ec0de8867e8614157a6c ChangeLog 16355
-SHA256 a0a2db45e67d0db070ff8a2e0f843df977e963b628167e4485b0d2d9e51faed7 ChangeLog 16355
+EBUILD ethereal-0.99.0.ebuild 3957 RMD160 3bbf502cca0f8fe33d97c05c0ad192733d9da8e8 SHA1 e70c26fafb46ce7a6059f4ea35480e62f8a8908c SHA256 cecee5391e5724b4994d984d380d6dbfaaeabc02a08c193e4295a856523bcc6f size 3957
+MD5 f05b0174c71875f640a61b96de2f3b53 ethereal-0.99.0.ebuild 3957
+RMD160 3bbf502cca0f8fe33d97c05c0ad192733d9da8e8 ethereal-0.99.0.ebuild 3957
+SHA256 cecee5391e5724b4994d984d380d6dbfaaeabc02a08c193e4295a856523bcc6f ethereal-0.99.0.ebuild 3957
+MISC ChangeLog 16559 RMD160 70bd2c43d2d3a6af8fde8d974921a9f699dd0110 SHA1 0bff9b9ed8aa8e195fca1a7de40b905a68e0f0e7 SHA256 5545d3e6a5424f0385b6485f83cfa3fdee44785ad903b84fecf515e4a00f8a41 size 16559
+MD5 9356e39c136a4a739ba88f810bb41646 ChangeLog 16559
+RMD160 70bd2c43d2d3a6af8fde8d974921a9f699dd0110 ChangeLog 16559
+SHA256 5545d3e6a5424f0385b6485f83cfa3fdee44785ad903b84fecf515e4a00f8a41 ChangeLog 16559
 MISC metadata.xml 241 RMD160 e54fec44f06e7d8c93e399d9bd98e56f231920be SHA1 3f1b8ff204522d99acbe339fe83cbc916d460554 SHA256 684412188c16efe278e263e010f4bf09d33f17f2762d4829516e3e3a47ab3c02 size 241
 MD5 94e03a4ff2917efc81b0e0f07040afde metadata.xml 241
 RMD160 e54fec44f06e7d8c93e399d9bd98e56f231920be metadata.xml 241
@@ -37,3 +44,10 @@ SHA256 b87f7f32aa677e6b5a5a45cf6f61b9b4728b74d0f7908495fd55974e38d01b96 files/di
 MD5 c6839261e43bcc0927402c529a6e23cf files/digest-ethereal-0.99.0 253
 RMD160 24f9dbe348849fa1cd1b1c7cd98a04b846a214cf files/digest-ethereal-0.99.0 253
 SHA256 9a280483030d81621ca6b38e6d82686f8b926dc5861de6e143f8c034433ad81a files/digest-ethereal-0.99.0 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFETuJymdTrptrqvGERAu/CAJ0Tx4D6TerN8U30cqB+BXsf5uQJaQCglSrO
+k2PBRj/hWeo3XeoglRtnjpo=
+=6n1u
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/ethereal/ethereal-0.99.0.ebuild b/net-analyzer/ethereal/ethereal-0.99.0.ebuild
index 0d395c437155..373e909d8069 100644
--- a/net-analyzer/ethereal/ethereal-0.99.0.ebuild
+++ b/net-analyzer/ethereal/ethereal-0.99.0.ebuild
@@ -1,6 +1,6 @@
 # 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.99.0.ebuild,v 1.3 2006/04/26 02:16:26 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.99.0.ebuild,v 1.4 2006/04/26 02:53:14 dragonheart Exp $
 
 inherit libtool flag-o-matic eutils autotools libtool
 
@@ -49,10 +49,9 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd "${S}"
 	# bug 117716
-	epatch "${FILESDIR}/${PN}-0.10.14-asneeded.patch"
-
+	epatch "${FILESDIR}/${P}-as-needed.patch"
+	cd "${S}"
 	AT_M4DIR="${S}/aclocal-fallback" eautomake
 	elibtoolize
 }
diff --git a/net-analyzer/ethereal/files/ethereal-0.99.0-as-needed.patch b/net-analyzer/ethereal/files/ethereal-0.99.0-as-needed.patch
new file mode 100644
index 000000000000..4adc90485f50
--- /dev/null
+++ b/net-analyzer/ethereal/files/ethereal-0.99.0-as-needed.patch
@@ -0,0 +1,12 @@
+diff -uNr ethereal-0.99.0.orig/epan/Makefile.am ethereal-0.99.0/epan/Makefile.am
+--- ethereal-0.99.0.orig/epan/Makefile.am	2006-04-17 14:46:53.000000000 +0000
++++ ethereal-0.99.0/epan/Makefile.am		2006-04-25 21:21:15.000000000 +0000
+@@ -84,7 +84,7 @@
+ #
+ # 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@ @LIBGNUTLS_LIBS@ @KRB5_LIBS@ @SNMP_LIBS@ @SSL_LIBS@ -lm
+ 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