diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2013-06-13 14:00:05 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2013-06-13 14:00:05 +0000 |
| commit | f27ca03125505f2523c96d626013ca1f79319d57 (patch) | |
| tree | 5c26537beaac3629fedf12ec9bded9faa6332ba5 /net-analyzer | |
| parent | Version bump for a number of stability issues. (diff) | |
| download | gentoo-2-f27ca03125505f2523c96d626013ca1f79319d57.tar.gz gentoo-2-f27ca03125505f2523c96d626013ca1f79319d57.tar.bz2 gentoo-2-f27ca03125505f2523c96d626013ca1f79319d57.zip | |
Fix building with USE="gtk -qt4" by Lars Wendler (bug #473188 by Nikita Kozlov).
(Portage version: 2.2.0_alpha179/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'net-analyzer')
| -rw-r--r-- | net-analyzer/wireshark/ChangeLog | 6 | ||||
| -rw-r--r-- | net-analyzer/wireshark/wireshark-1.10.0-r1.ebuild | 11 |
2 files changed, 13 insertions, 4 deletions
diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog index 6d595a7207c6..d525ee4a6941 100644 --- a/net-analyzer/wireshark/ChangeLog +++ b/net-analyzer/wireshark/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-analyzer/wireshark # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.517 2013/06/12 16:07:13 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.518 2013/06/13 14:00:05 jer Exp $ + + 13 Jun 2013; Jeroen Roovers <jer@gentoo.org> wireshark-1.10.0-r1.ebuild: + Fix building with USE="gtk -qt4" by Lars Wendler (bug #473188 by Nikita + Kozlov). 12 Jun 2013; Jeroen Roovers <jer@gentoo.org> wireshark-1.10.0-r1.ebuild: Have USE=qt4 depend on xdg-utils too. diff --git a/net-analyzer/wireshark/wireshark-1.10.0-r1.ebuild b/net-analyzer/wireshark/wireshark-1.10.0-r1.ebuild index 6a295fa48b57..3622e86630b7 100644 --- a/net-analyzer/wireshark/wireshark-1.10.0-r1.ebuild +++ b/net-analyzer/wireshark/wireshark-1.10.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.0-r1.ebuild,v 1.3 2013/06/12 16:07:13 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.0-r1.ebuild,v 1.4 2013/06/13 14:00:05 jer Exp $ EAPI=5 inherit autotools eutils fcaps flag-o-matic user @@ -120,6 +120,13 @@ src_configure() { esac fi + # Enable wireshark binary with any supported GUI toolkit (bug #473188) + if use gtk || use qt4 ; then + myconf+=( "--enable-wireshark" ) + else + myconf+=( "--disable-wireshark" ) + fi + # Hack around inability to disable doxygen/fop doc generation use doc || export ac_cv_prog_HAVE_DOXYGEN=false use doc-pdf || export ac_cv_prog_HAVE_FOP=false @@ -128,10 +135,8 @@ src_configure() { econf \ $(use pcap && use_enable !caps setuid-install) \ $(use pcap && use_enable caps setcap-install) \ - $(use_enable gtk wireshark) \ $(use_enable ipv6) \ $(use_enable profile profile-build) \ - $(use_enable qt4 wireshark) \ $(use_with caps libcap) \ $(use_with crypt gcrypt) \ $(use_with geoip) \ |