Fix building with asneeded for bug 184668.

Package-Manager: portage-2.1.3_rc8

4 files changed, 39 insertions, 12 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 735337a65cd3..6c6dd154c20a 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.57 2007/07/09 17:37:35 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.58 2007/07/15 20:23:28 drac Exp $
+
+  15 Jul 2007; Samuli Suominen <drac@gentoo.org>
+  +files/wireshark-0.99.6-asneeded.patch, wireshark-0.99.6.ebuild:
+  Fix building with asneeded for bug 184668.
 
   09 Jul 2007; Raúl Porcel <armin76@gentoo.org> wireshark-0.99.6.ebuild:
   Fix bug #184529, blame Jokey
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index bd41fb985da8..34b18dfa91a5 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -2,6 +2,10 @@ AUX wireshark-0.99.5-sizet.patch 290 RMD160 f162ca06aab5b3f62269c3690bef965c1ece
 MD5 9cf68b2290e19ac343fdc91bbff3620f files/wireshark-0.99.5-sizet.patch 290
 RMD160 f162ca06aab5b3f62269c3690bef965c1eceef95 files/wireshark-0.99.5-sizet.patch 290
 SHA256 9081276cb7e8ba74e4f9289e89f3e0bced9e1163b4e7e5cefb3cf7b131605375 files/wireshark-0.99.5-sizet.patch 290
+AUX wireshark-0.99.6-asneeded.patch 1913 RMD160 c461f0d5768de3387976790b7c9d749cc2780b95 SHA1 9a8e3538e421633534000c956351204fc7ce0d84 SHA256 b9819090848f02265d286fdc7b076b39b137cdb29024786fa9cf1b7098db89fd
+MD5 07eefc558b4a3e7bf40806a89e913a30 files/wireshark-0.99.6-asneeded.patch 1913
+RMD160 c461f0d5768de3387976790b7c9d749cc2780b95 files/wireshark-0.99.6-asneeded.patch 1913
+SHA256 b9819090848f02265d286fdc7b076b39b137cdb29024786fa9cf1b7098db89fd files/wireshark-0.99.6-asneeded.patch 1913
 AUX wireshark-epan_dissectors_packet-diameter.diff 1106 RMD160 600471845a90d24f6bb65b46c9d2f8e9c851a78d SHA1 c37922ea7e2d12115aaa55ffe361f4724cbfd9f0 SHA256 cf8a00c20abf51456d90b4ff0b6cd19bd64e2796a7268c355a1c482e434c3505
 MD5 6cfe46e4398d7657b708cf8014f93e72 files/wireshark-epan_dissectors_packet-diameter.diff 1106
 RMD160 600471845a90d24f6bb65b46c9d2f8e9c851a78d files/wireshark-epan_dissectors_packet-diameter.diff 1106
@@ -16,14 +20,14 @@ EBUILD wireshark-0.99.5.ebuild 4454 RMD160 ced1aed25d5ee385f27e750195078b5b643fe
 MD5 85cf7bd6d7d47ca660e41d71703eb2f3 wireshark-0.99.5.ebuild 4454
 RMD160 ced1aed25d5ee385f27e750195078b5b643fefd8 wireshark-0.99.5.ebuild 4454
 SHA256 a2a678dcc39cb3f0cc0556ec18c90e71151dcdde7a47082ebcd0c8209fd56994 wireshark-0.99.5.ebuild 4454
-EBUILD wireshark-0.99.6.ebuild 4457 RMD160 0ed74d5be9220d8b495db629002022c806b89499 SHA1 e5b00ad900e6c201f930d0091c82f61fd727ace9 SHA256 9082b3d8c519c7c4cf879073a5d681dc63c2ed16a1b0d118a36d99976a616188
-MD5 a54446f02e38f14d65d7428f1e8a40dc wireshark-0.99.6.ebuild 4457
-RMD160 0ed74d5be9220d8b495db629002022c806b89499 wireshark-0.99.6.ebuild 4457
-SHA256 9082b3d8c519c7c4cf879073a5d681dc63c2ed16a1b0d118a36d99976a616188 wireshark-0.99.6.ebuild 4457
-MISC ChangeLog 8138 RMD160 a8f2fb22c11c229a566cf639d77f94f91384d88e SHA1 8f5595f71853fc58da28ed770e7a39a37ea64a94 SHA256 bc7216364385773c122a71a3de72fe0ef3ccb96f5545e25eaf42609534f3bd9b
-MD5 121e83980a70ea729ed5ec5b44acd592 ChangeLog 8138
-RMD160 a8f2fb22c11c229a566cf639d77f94f91384d88e ChangeLog 8138
-SHA256 bc7216364385773c122a71a3de72fe0ef3ccb96f5545e25eaf42609534f3bd9b ChangeLog 8138
+EBUILD wireshark-0.99.6.ebuild 4542 RMD160 44e741fbb75cad596be2f05693664635052c7d5a SHA1 733f9601b8160710470b82a9bbb86c9095d833a4 SHA256 deac38e9fd381c722129e61f41d25fcf388e2a44631aa1e2cf188d5b0cdc761f
+MD5 108e3793352d0a202c9bce5904d49400 wireshark-0.99.6.ebuild 4542
+RMD160 44e741fbb75cad596be2f05693664635052c7d5a wireshark-0.99.6.ebuild 4542
+SHA256 deac38e9fd381c722129e61f41d25fcf388e2a44631aa1e2cf188d5b0cdc761f wireshark-0.99.6.ebuild 4542
+MISC ChangeLog 8297 RMD160 b44b580ed6e0dcdec899d948ad7b75d88f1b0161 SHA1 4c05f7047e58b1e849104565b5ab0ab5299a70cd SHA256 779e962f9450379b27a88c5551039aecdaf5df7584431ebb33c928d74f47c1fc
+MD5 1de7168c583f99094fcea8911738b958 ChangeLog 8297
+RMD160 b44b580ed6e0dcdec899d948ad7b75d88f1b0161 ChangeLog 8297
+SHA256 779e962f9450379b27a88c5551039aecdaf5df7584431ebb33c928d74f47c1fc ChangeLog 8297
 MISC metadata.xml 241 RMD160 e54fec44f06e7d8c93e399d9bd98e56f231920be SHA1 3f1b8ff204522d99acbe339fe83cbc916d460554 SHA256 684412188c16efe278e263e010f4bf09d33f17f2762d4829516e3e3a47ab3c02
 MD5 94e03a4ff2917efc81b0e0f07040afde metadata.xml 241
 RMD160 e54fec44f06e7d8c93e399d9bd98e56f231920be metadata.xml 241
diff --git a/net-analyzer/wireshark/files/wireshark-0.99.6-asneeded.patch b/net-analyzer/wireshark/files/wireshark-0.99.6-asneeded.patch
new file mode 100644
index 000000000000..ed591dbaa266
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-0.99.6-asneeded.patch
@@ -0,0 +1,14 @@
+diff -ur wireshark-0.99.6.orig/epan/Makefile.am wireshark-0.99.6/epan/Makefile.am
+--- wireshark-0.99.6.orig/epan/Makefile.am	2007-07-05 22:25:05.000000000 +0300
++++ wireshark-0.99.6/epan/Makefile.am	2007-07-10 16:11:02.000000000 +0300
+@@ -108,8 +108,8 @@
+ #
+ # Add the object files for missing routines, if any.
+ #
+-libwireshark_la_LIBADD = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la $(wslua_lib) @ADNS_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @KRB5_LIBS@ @SNMP_LIBS@ @SSL_LIBS@ -lm
+-libwireshark_la_DEPENDENCIES = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la $(wslua_lib)
++libwireshark_la_LIBADD = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la ${top_builddir}/wiretap/libwiretap.la $(wslua_lib) @ADNS_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @KRB5_LIBS@ @SNMP_LIBS@ @SSL_LIBS@ -lm
++libwireshark_la_DEPENDENCIES = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la ${top_builddir}/wiretap/libwiretap.la $(wslua_lib)
+ 
+ #EXTRA_PROGRAMS = reassemble_test
+ #reassemble_test_LDADD = $(GLIB_LIBS)
diff --git a/net-analyzer/wireshark/wireshark-0.99.6.ebuild b/net-analyzer/wireshark/wireshark-0.99.6.ebuild
index 903a9ad8f17e..5d20e8f25d87 100644
--- a/net-analyzer/wireshark/wireshark-0.99.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-0.99.6.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-0.99.6.ebuild,v 1.2 2007/07/09 17:37:35 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-0.99.6.ebuild,v 1.3 2007/07/15 20:23:28 drac Exp $
 
-inherit libtool flag-o-matic eutils toolchain-funcs
+WANT_AUTOMAKE="1.9"
+
+inherit autotools libtool flag-o-matic eutils toolchain-funcs
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
 HOMEPAGE="http://www.wireshark.org/"
@@ -53,7 +55,10 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd "${S}"/epan
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+	eautomake
+	cd epan
 	epatch "${FILESDIR}"/wireshark-except-double-free.diff
 	epatch "${FILESDIR}"/wireshark-epan_dissectors_packet-diameter.diff
 }