Fixed regression: compilation failure with --as-needed, bug 210998, reported by Mike Auty and Hanno Böck.

Package-Manager: portage-2.1.4.4

4 files changed, 22 insertions, 4 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 0e624451c181..8c8eebb38057 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.78 2008/02/20 07:56:38 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.79 2008/02/21 20:44:13 pva Exp $
+
+  21 Feb 2008; <pva@gentoo.org> +files/wireshark-0.99.8-as-needed.patch,
+  wireshark-0.99.8_rc1.ebuild:
+  Fixed regression: compilation failure with --as-needed, bug 210998, reported
+  by Mike Auty and Hanno Böck.
 
 *wireshark-0.99.8_rc1 (20 Feb 2008)
 
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 9dcd170ea49e..f8b52a9ed4b1 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -3,12 +3,13 @@ AUX wireshark-0.99.7-crash-emem.c.patch 1123 RMD160 e5dd57a30a6ca177dedb7263a51c
 AUX wireshark-0.99.7-exit.patch 2553 RMD160 078fe05e5901c1e94e84bf0de5dba4974bf0d273 SHA1 aca76a59220825da884d98e12abce108945442fc SHA256 b7b4d4832fc7053620bd81e4ea3466a9aacf6341b3de093fe9fdf36c909fc07e
 AUX wireshark-0.99.7-glib-1.2-compile-fix.patch 308 RMD160 91e1779b76b152242527caff6c2e8d2d74f7b9c1 SHA1 966880965cddd7645ac1d65ba2f6d1309a062978 SHA256 4e598666cc3622aa7da11161306e2b1b52958aada5393c10fb78114d0f0882f7
 AUX wireshark-0.99.7-libgcrypt.patch 1460 RMD160 50746197a57eb99b86d192c8a3d5068cee527f07 SHA1 c0aec79a244b1d9e133de903c6953493958d2ef0 SHA256 01fd754829b3bc4714389dac9eaaf8d4f4457277794d60d69a55450042610814
+AUX wireshark-0.99.8-as-needed.patch 395 RMD160 2e06f641e9789db717544bfd1568e4bf6e85855c SHA1 a18b6fcc85b40c00fc1d30bcdfc81d13dc33e904 SHA256 d2f996a79fa3117296b25c10a1d4a3f0f8027a678de4e37e6c60bfb47a4754b9
 AUX wireshark-except-double-free.diff 664 RMD160 2b61f03f5148975f6438351c11de18a500deabc5 SHA1 0239e19ba0ebd2cfb4ab4987a8a4c56646cd9250 SHA256 dc02a5f3e4bdbd128a2ba08f38880358f747661a93ca0b3fe1918c67b255c369
 DIST wireshark-0.99.7.tar.bz2 13179467 RMD160 558611675aa23313acbdb46650cf471959204bd0 SHA1 3cb6e11410d5151734db19d4fc03b42ecb226277 SHA256 2cbb3360507d8da13fa108e2fe9a4407a89b61fc0ddb6505d60f906b6c15eb82
 DIST wireshark-0.99.8pre1.tar.gz 16815173 RMD160 86655c294ccb3f550f5f904e00c9d978ec1f3546 SHA1 4c46569f3d3112792f14b6e5a99997d6a25eb9f0 SHA256 9a5d1fe01fb9001fa673abb8eb9d5100285ac66ea44070f3421ce0ecc5e06bf5
 EBUILD wireshark-0.99.7-r1.ebuild 5107 RMD160 3709b61da94f61f119de71fa2ef53e7f2f36b710 SHA1 bcf5bfd55466cfebbc867942c40933c6f9a4f2e5 SHA256 c4789c7eb84837aea4464230fe84502d3dbe62f85a3d5e4873e6137aa0c8feb1
 EBUILD wireshark-0.99.7-r2.ebuild 5253 RMD160 7d1d34d60fdb27851d75b90e8b84d547f52ebf0d SHA1 c66eddcce5771d0aeeb7abcfa4414d65042e8a79 SHA256 b00034793dae6f7f693227271abdc80c453531e77fe0729928d755e6ba9102fc
 EBUILD wireshark-0.99.7.ebuild 4895 RMD160 359ce3eefe727942641b4cef82b2fba462e8ae24 SHA1 b15e2155e3903fc902bda4cb43ecec6b30771279 SHA256 d2f1bc2fbe273c8a6e1c83e0e276856243297a3b12259fd3c16e14afc747aa9f
-EBUILD wireshark-0.99.8_rc1.ebuild 4723 RMD160 49be3ffdca1a899c0a359f0d0f3bd9cc6bf3f3a3 SHA1 025b865cf596e71c2ac3b0c306a4ce4b1da111eb SHA256 1ba99ad8e879fa953d5d76347f0839620eb100b3078d50ece7bb74c0a59006d7
-MISC ChangeLog 12222 RMD160 cff0e263a8c13c347d132f97a54788d4187a9ebf SHA1 e1a7208b916c659cf2d73f305a6c85e9f8e02723 SHA256 5118114ea4ab8952ad71b7699073bffd96b28ed4f76ab3c172a4c9dbfe7dfffb
+EBUILD wireshark-0.99.8_rc1.ebuild 4774 RMD160 2c53d6008d2805248814c8ad9b7722563122da8c SHA1 7e6249cd1a3ceb5c08b22c7ae59fc783364efa34 SHA256 2aa4a51a68b408dcc65514539be26502833cb562997adaaf0f523651cef1b7d3
+MISC ChangeLog 12438 RMD160 ccda85f4ed40278e059e29fe963789c7c53fcc85 SHA1 21ea04f73a23bd181c20d34320409902297e9c22 SHA256 c5b1f91fdbb148ffdd71566d71674e82d22080cea858830aed38a30bed439457
 MISC metadata.xml 1730 RMD160 0c29f85b78106162ac35419f8bc01d1539c3eb6d SHA1 93881ba93a2f1fb8b153887ce7e6a022ce95085f SHA256 d722982a52a578876257954779aa8e14dbf4c0eff0dba0e4b82db551f4a964bd
diff --git a/net-analyzer/wireshark/files/wireshark-0.99.8-as-needed.patch b/net-analyzer/wireshark/files/wireshark-0.99.8-as-needed.patch
new file mode 100644
index 000000000000..df495f8cf71b
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-0.99.8-as-needed.patch
@@ -0,0 +1,11 @@
+--- wiretap/Makefile.am.orig	2008-02-21 23:11:41.000000000 +0300
++++ wiretap/Makefile.am	2008-02-21 23:12:08.000000000 +0300
+@@ -67,7 +67,7 @@
+ 	$(GENERATOR_FILES) 	\
+ 	$(GENERATED_FILES)
+ 
+-libwiretap_la_LIBADD = libwiretap_generated.la
++libwiretap_la_LIBADD = libwiretap_generated.la $(GLIB_LIBS)
+ libwiretap_la_DEPENDENCIES = libwiretap_generated.la
+ 
+ RUNLEX = $(top_srcdir)/tools/runlex.sh
diff --git a/net-analyzer/wireshark/wireshark-0.99.8_rc1.ebuild b/net-analyzer/wireshark/wireshark-0.99.8_rc1.ebuild
index a9f0722043e2..7cc61756a32b 100644
--- a/net-analyzer/wireshark/wireshark-0.99.8_rc1.ebuild
+++ b/net-analyzer/wireshark/wireshark-0.99.8_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-0.99.8_rc1.ebuild,v 1.1 2008/02/20 07:56:38 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-0.99.8_rc1.ebuild,v 1.2 2008/02/21 20:44:13 pva Exp $
 
 WANT_AUTOMAKE="1.9"
 inherit autotools libtool flag-o-matic eutils toolchain-funcs
@@ -67,6 +67,7 @@ src_unpack() {
 
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-0.99.7-asneeded.patch
+	epatch "${FILESDIR}"/${PN}-0.99.8-as-needed.patch
 
 	cd "${S}"/epan
 	epatch "${FILESDIR}"/wireshark-except-double-free.diff