diff options
| author |   Peter Volkov <pva@gentoo.org> | 2010-03-28 15:33:08 +0000 |
|---|---|---|
| committer | Peter Volkov <pva@gentoo.org> | 2010-03-28 15:33:08 +0000 |
| commit | 9d06f2104aac0156b6ab49f3f030a488c0e0dde3 (patch) | |
| tree | 86c0ee006c2212cd60913c09244fb7ea32f6e994 /net-analyzer/wireshark | |
| parent | Fix sqlite useage, disable sound support as not required for building bug #31... (diff) | |
| download | gentoo-2-9d06f2104aac0156b6ab49f3f030a488c0e0dde3.tar.gz gentoo-2-9d06f2104aac0156b6ab49f3f030a488c0e0dde3.tar.bz2 gentoo-2-9d06f2104aac0156b6ab49f3f030a488c0e0dde3.zip | |
Disable zlib, bug #311241
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'net-analyzer/wireshark')
| -rw-r--r-- | net-analyzer/wireshark/ChangeLog | 5 | ||||
| -rw-r--r-- | net-analyzer/wireshark/wireshark-1.2.6-r1.ebuild | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog index bf6f045c13d0..dc34ebba130e 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.217 2010/03/26 10:54:12 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.218 2010/03/28 15:33:08 pva Exp $ + + 28 Mar 2010; Peter Volkov <pva@gentoo.org> wireshark-1.2.6-r1.ebuild: + Disable zlib, bug #311241 *wireshark-1.2.6-r1 (26 Mar 2010) diff --git a/net-analyzer/wireshark/wireshark-1.2.6-r1.ebuild b/net-analyzer/wireshark/wireshark-1.2.6-r1.ebuild index e1d84acdf9e7..b6605249cb29 100644 --- a/net-analyzer/wireshark/wireshark-1.2.6-r1.ebuild +++ b/net-analyzer/wireshark/wireshark-1.2.6-r1.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.6-r1.ebuild,v 1.1 2010/03/26 10:54:12 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.2.6-r1.ebuild,v 1.2 2010/03/28 15:33:08 pva Exp $ EAPI=2 inherit autotools libtool flag-o-matic eutils toolchain-funcs @@ -17,10 +17,9 @@ 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 zlib kerberos threads profile smi +pcap pcre +caps selinux" +IUSE="adns ares gtk ipv6 lua portaudio gnutls gcrypt geoip kerberos threads profile smi +pcap pcre +caps selinux" RDEPEND=">=dev-libs/glib-2.4.0:2 - zlib? ( >=sys-libs/zlib-1.2.3 ) smi? ( net-libs/libsmi ) gtk? ( >=x11-libs/gtk+-2.4.0:2 x11-libs/pango @@ -112,7 +111,7 @@ src_configure() { $(use_with kerberos krb5) \ $(use_with smi libsmi) \ $(use_with pcap) \ - $(use_with zlib) \ + --without-zlib \ $(use_with pcre) \ $(use_with geoip) \ $(use_with portaudio) \ |