diff options
| author |   Rick Farina <zerochaos@gentoo.org> | 2012-08-31 16:45:21 +0000 |
|---|---|---|
| committer | Rick Farina <zerochaos@gentoo.org> | 2012-08-31 16:45:21 +0000 |
| commit | a709746ec453830de4749240a0acd08fae3f4d29 (patch) | |
| tree | 46c49e5ee472cbf229a080b6a9628a6092a321fd /net-analyzer | |
| parent | Set REQUIRED_USE for USE=libadns to require USE=adns. (diff) | |
| download | gentoo-2-a709746ec453830de4749240a0acd08fae3f4d29.tar.gz gentoo-2-a709746ec453830de4749240a0acd08fae3f4d29.tar.bz2 gentoo-2-a709746ec453830de4749240a0acd08fae3f4d29.zip | |
remove requirement for required use
(Portage version: 2.1.11.12/cvs/Linux x86_64)
Diffstat (limited to 'net-analyzer')
| -rw-r--r-- | net-analyzer/wireshark/ChangeLog | 5 | ||||
| -rw-r--r-- | net-analyzer/wireshark/wireshark-1.8.2-r1.ebuild | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog index a6f5884b176c..7841801d072f 100644 --- a/net-analyzer/wireshark/ChangeLog +++ b/net-analyzer/wireshark/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-analyzer/wireshark # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.387 2012/08/31 16:34:43 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.388 2012/08/31 16:45:21 zerochaos Exp $ + + 31 Aug 2012; Rick Farina <zerochaos@gentoo.org> wireshark-1.8.2-r1.ebuild: + remove requirement for required use 31 Aug 2012; Jeroen Roovers <jer@gentoo.org> wireshark-1.6.10-r1.ebuild, wireshark-1.8.2-r1.ebuild: diff --git a/net-analyzer/wireshark/wireshark-1.8.2-r1.ebuild b/net-analyzer/wireshark/wireshark-1.8.2-r1.ebuild index 717bf528bd13..b13ef1a16ea2 100644 --- a/net-analyzer/wireshark/wireshark-1.8.2-r1.ebuild +++ b/net-analyzer/wireshark/wireshark-1.8.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.2-r1.ebuild,v 1.4 2012/08/31 16:34:43 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.2-r1.ebuild,v 1.5 2012/08/31 16:45:21 zerochaos Exp $ EAPI="4" PYTHON_DEPEND="python? 2" @@ -18,8 +18,6 @@ IUSE=" adns doc doc-pdf gtk ipv6 libadns lua gcrypt geoip kerberos profile +pcap portaudio python +caps selinux smi ssl zlib " -REQUIRED_USE="libadns? ( adns )" - RDEPEND=">=dev-libs/glib-2.14:2 zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) @@ -36,8 +34,8 @@ RDEPEND=">=dev-libs/glib-2.14:2 portaudio? ( media-libs/portaudio ) adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) - libadns? ( net-libs/adns ) ) + libadns? ( net-libs/adns ) geoip? ( dev-libs/geoip ) lua? ( >=dev-lang/lua-5.1 ) selinux? ( sec-policy/selinux-wireshark )" @@ -135,6 +133,10 @@ src_configure() { else myconf+=" --without-adns --with-c-ares" fi + else + if use libadns; then + myconf+=" --with-adns --without-c-ares" + fi fi # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass # --with-ssl to ./configure. (Mimics code from acinclude.m4). |