zlib USE flag back as it should be fixed now, bug #311241.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 11 insertions, 7 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 17932627f898..36d3a4673c77 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.219 2010/04/01 07:21:16 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.220 2010/04/22 06:06:27 pva Exp $
+
+  22 Apr 2010; Peter Volkov <pva@gentoo.org> wireshark-1.2.7.ebuild:
+  zlib USE flag back as it should be fixed now, bug #311241.
 
 *wireshark-1.2.7 (01 Apr 2010)
 
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index db2244f1da51..1f255ac114b8 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -8,6 +8,6 @@ DIST wireshark-1.2.6.tar.gz 19381295 RMD160 271a05afbf1701630a6070ecabeabcb84271
 DIST wireshark-1.2.7.tar.gz 19417531 RMD160 44f1eb9ba209a83592ac636f7c1d97003a51ca5c SHA1 068e27540f56f4dec384422fb6258909b0426d6e SHA256 12ed3bce40033da2f4560149b3542fb2b00fb2aa27fc58580ee81bea6bb99242
 EBUILD wireshark-1.2.6-r1.ebuild 4523 RMD160 0449759928f78fcf9a8376b70b3172925ba2acee SHA1 fd208936c59db0bc7608f861f392ad8dddaec925 SHA256 101c62e67a3fb0c1273982d5544b976d34a4af7bd28ea01799b759bb62e72dfd
 EBUILD wireshark-1.2.6.ebuild 4551 RMD160 bc94cd69950fa308f550258e151958a5990ca765 SHA1 2953e180f76351c86c9dcd3f0fd96805a088cce5 SHA256 1ffa24ac2dfec46d4496bd1090b47c31d6e4352b99d896559b3457b7cc24cdcd
-EBUILD wireshark-1.2.7.ebuild 4575 RMD160 ed86bd36828a005ff55440c96c3def3107c4e3ce SHA1 94fad2453114ad741056705a1529ab19dbe79e1d SHA256 2adc0307525ba62ba91d48282a17fc5a53e35053f61fc66095b571c0d7605783
-MISC ChangeLog 32457 RMD160 557e57c048c1ac6fc8abd732b295d3718222d9f8 SHA1 a6bcebb6b1f1bd939b607691fd9e26ec90a13b85 SHA256 caa5255e9bc630061d2b2f0dff74ac1677c5d30910ee4da2b3e34c2845c8a43b
+EBUILD wireshark-1.2.7.ebuild 4577 RMD160 fb35b5b9eef4e04d306ce05baeed48bbf5abde90 SHA1 dc0a874794dbbb3b54738294d0d6331f925f89b1 SHA256 dee512d06928ddc62696a23506fb37fac2309719b57fb93cf63e2b875b303c2f
+MISC ChangeLog 32588 RMD160 262e3ae95a17848fec86941c8d54f8cfab325bd4 SHA1 24aa91ee74a65423c6efd35f01d7b305468f437a SHA256 e32bd822ddc4a5d120d124213aea476df1aa166d2f1ee160186e57cfea10ba02
 MISC metadata.xml 2154 RMD160 01af8905d25e6c387902d30766daedcd37d94e0e SHA1 d68e79d413654ce72c553d508d7aa96f27fe85b5 SHA256 48c540fcec9cf1e5eebe132d7f90e8330b413f4eb6469761a88720eaa6a2233a
diff --git a/net-analyzer/wireshark/wireshark-1.2.7.ebuild b/net-analyzer/wireshark/wireshark-1.2.7.ebuild
index e69efa470289..fb06bd92f4b5 100644
--- a/net-analyzer/wireshark/wireshark-1.2.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.2.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.2.7.ebuild,v 1.1 2010/04/01 07:21:16 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.2.7.ebuild,v 1.2 2010/04/22 06:06:27 pva Exp $
 
 EAPI=2
 inherit autotools libtool flag-o-matic eutils toolchain-funcs
@@ -17,9 +17,11 @@ SRC_URI="http://www.wireshark.org/download/src/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="adns ares gtk ipv6 lua portaudio gnutls gcrypt geoip kerberos threads profile smi +pcap pcre +caps selinux"
+IUSE="adns ares gtk ipv6 lua portaudio gnutls gcrypt geoip zlib kerberos threads profile smi +pcap pcre +caps selinux"
 
 RDEPEND=">=dev-libs/glib-2.4.0:2
+	zlib? ( sys-libs/zlib 
+		!=sys-libs/zlib-1.2.4 )
 	smi? ( net-libs/libsmi )
 	gtk? ( >=x11-libs/gtk+-2.4.0:2
 		x11-libs/pango
@@ -51,7 +53,6 @@ pkg_setup() {
 
 	# Add group for users allowed to sniff.
 	enewgroup wireshark
-	ewarn "zlib support was disabled due to bug #311241."
 }
 
 src_prepare() {
@@ -112,7 +113,7 @@ src_configure() {
 		$(use_with kerberos krb5) \
 		$(use_with smi libsmi) \
 		$(use_with pcap) \
-		--without-zlib \
+		$(use_with zlib) \
 		$(use_with pcre) \
 		$(use_with geoip) \
 		$(use_with portaudio) \