diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2012-08-06 09:41:38 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2012-08-06 09:41:38 +0000 |
| commit | 08ffc8d3ebd871a19d98a985cb1e107d24e1fdec (patch) | |
| tree | 229cbd3a0815104a7c7f400cab42534fad57a6a4 /net-analyzer | |
| parent | old (diff) | |
| download | gentoo-2-08ffc8d3ebd871a19d98a985cb1e107d24e1fdec.tar.gz gentoo-2-08ffc8d3ebd871a19d98a985cb1e107d24e1fdec.tar.bz2 gentoo-2-08ffc8d3ebd871a19d98a985cb1e107d24e1fdec.zip | |
Add --disable-usr-local to econf.
(Portage version: 2.2.0_alpha120/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.1-r1.ebuild | 30 |
2 files changed, 20 insertions, 15 deletions
diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog index 093b0c3f2016..6cf694b1828f 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.370 2012/08/03 21:33:05 steev Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.371 2012/08/06 09:41:38 jer Exp $ + + 06 Aug 2012; Jeroen Roovers <jer@gentoo.org> wireshark-1.8.1-r1.ebuild: + Add --disable-usr-local to econf. 03 Aug 2012; Steev Klimaszewski <steev@gentoo.org> wireshark-1.8.1-r1.ebuild: Keyword 1.8.1-r1 ~arm. Tested on Efika MX (i.MX51 armv7) and Sabre SD (i.MX6 diff --git a/net-analyzer/wireshark/wireshark-1.8.1-r1.ebuild b/net-analyzer/wireshark/wireshark-1.8.1-r1.ebuild index 84000db6fedb..c56984f9402b 100644 --- a/net-analyzer/wireshark/wireshark-1.8.1-r1.ebuild +++ b/net-analyzer/wireshark/wireshark-1.8.1-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.1-r1.ebuild,v 1.2 2012/08/03 21:33:05 steev Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.1-r1.ebuild,v 1.3 2012/08/06 09:41:38 jer Exp $ EAPI="4" PYTHON_DEPEND="python? 2" @@ -144,25 +144,27 @@ src_configure() { use doc-pdf || export ac_cv_prog_HAVE_FOP=false # dumpcap requires libcap, setuid-install requires dumpcap - econf $(use_enable gtk wireshark) \ + 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_with ssl gnutls) \ + $(use_with caps libcap) \ $(use_with gcrypt) \ - $(use_enable ipv6) \ - $(use_with lua) \ - $(use_with kerberos krb5) \ - $(use_with smi libsmi) \ - $(use_with zlib) \ $(use_with geoip) \ + $(use_with kerberos krb5) \ + $(use_with lua) \ + $(use_with pcap dumpcap-group wireshark) \ + $(use_with pcap) \ $(use_with portaudio) \ $(use_with python) \ - $(use_with caps libcap) \ - $(use_with pcap) \ - $(use_with pcap dumpcap-group wireshark) \ - $(use pcap && use_enable caps setcap-install) \ - $(use pcap && use_enable !caps setuid-install) \ - --sysconfdir="${EPREFIX}"/etc/wireshark \ + $(use_with smi libsmi) \ + $(use_with ssl gnutls) \ + $(use_with zlib) \ --disable-extra-gcc-checks \ + --disable-usr-local \ + --sysconfdir="${EPREFIX}"/etc/wireshark \ ${myconf} } |