commit:     696920f53ea54e61124437781c0f32c4870e2933
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed May  2 19:10:10 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed May  2 19:10:22 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=696920f5

net-analyzer/wireshark: Drop -DDUMPCAP_INSTALL_OPTION=.

Package-Manager: Portage-2.3.32, Repoman-2.3.9

 net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild | 17 ++++++++---------
 net-analyzer/wireshark/wireshark-99999999.ebuild | 17 ++++++++---------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild 
b/net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild
index 1efad019372..40b8f06bf92 100644
--- a/net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild
@@ -118,6 +118,11 @@ src_configure() {
        fi
 
        mycmakeargs+=(
+               $(use androiddump && use pcap && echo 
-DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
+               $(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
+               $(usex qt5 MOC=$(qt5_get_bindir)/moc '')
+               $(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
+               $(usex qt5 UIC=$(qt5_get_bindir)/uic '')
                -DBUILD_androiddump=$(usex androiddump)
                -DBUILD_capinfos=$(usex capinfos)
                -DBUILD_captype=$(usex captype)
@@ -138,13 +143,16 @@ src_configure() {
                -DBUILD_udpdump=$(usex udpdump)
                -DBUILD_wireshark=$(usex qt5)
                -DBUILD_wireshark_gtk=$(usex gtk)
+               -DDISABLE_WERROR=yes
                -DENABLE_BCG729=$(usex bcg729)
+               -DENABLE_CAP=$(usex caps)
                -DENABLE_CARES=$(usex adns)
                -DENABLE_GNUTLS=$(usex ssl)
                -DENABLE_KERBEROS=$(usex kerberos)
                -DENABLE_LIBXML2=$(usex libxml2)
                -DENABLE_LUA=$(usex lua)
                -DENABLE_LZ4=$(usex lz4)
+               -DENABLE_NETLINK=$(usex netlink)
                -DENABLE_NGHTTP2=$(usex nghttp2)
                -DENABLE_PCAP=$(usex pcap)
                -DENABLE_PORTAUDIO=$(usex portaudio)
@@ -153,15 +161,6 @@ src_configure() {
                -DENABLE_SNAPPY=$(usex snappy)
                -DENABLE_SPANDSP=$(usex spandsp)
                -DENABLE_ZLIB=$(usex zlib)
-               -DENABLE_NETLINK=$(usex netlink)
-               $(use androiddump && use pcap && echo 
-DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
-               -DENABLE_CAP=$(usex caps)
-               -DDUMPCAP_INSTALL_OPTION=$(usex caps capabilities suid)
-               -DDISABLE_WERROR=yes
-               $(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
-               $(usex qt5 MOC=$(qt5_get_bindir)/moc '')
-               $(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
-               $(usex qt5 UIC=$(qt5_get_bindir)/uic '')
        )
 
        cmake-utils_src_configure

diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild 
b/net-analyzer/wireshark/wireshark-99999999.ebuild
index c658f9ec1c6..c216e52d33d 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -116,6 +116,11 @@ src_configure() {
        fi
 
        mycmakeargs+=(
+               $(use androiddump && use pcap && echo 
-DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
+               $(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
+               $(usex qt5 MOC=$(qt5_get_bindir)/moc '')
+               $(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
+               $(usex qt5 UIC=$(qt5_get_bindir)/uic '')
                -DBUILD_androiddump=$(usex androiddump)
                -DBUILD_capinfos=$(usex capinfos)
                -DBUILD_captype=$(usex captype)
@@ -136,13 +141,16 @@ src_configure() {
                -DBUILD_udpdump=$(usex udpdump)
                -DBUILD_wireshark=$(usex qt5)
                -DBUILD_wireshark_gtk=$(usex gtk)
+               -DDISABLE_WERROR=yes
                -DENABLE_BCG729=$(usex bcg729)
+               -DENABLE_CAP=$(usex caps)
                -DENABLE_CARES=$(usex adns)
                -DENABLE_GNUTLS=$(usex ssl)
                -DENABLE_KERBEROS=$(usex kerberos)
                -DENABLE_LIBXML2=$(usex libxml2)
                -DENABLE_LUA=$(usex lua)
                -DENABLE_LZ4=$(usex lz4)
+               -DENABLE_NETLINK=$(usex netlink)
                -DENABLE_NGHTTP2=$(usex nghttp2)
                -DENABLE_PCAP=$(usex pcap)
                -DENABLE_PORTAUDIO=$(usex portaudio)
@@ -151,15 +159,6 @@ src_configure() {
                -DENABLE_SNAPPY=$(usex snappy)
                -DENABLE_SPANDSP=$(usex spandsp)
                -DENABLE_ZLIB=$(usex zlib)
-               -DENABLE_NETLINK=$(usex netlink)
-               $(use androiddump && use pcap && echo 
-DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
-               -DENABLE_CAP=$(usex caps)
-               -DDUMPCAP_INSTALL_OPTION=$(usex caps capabilities suid)
-               -DDISABLE_WERROR=yes
-               $(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
-               $(usex qt5 MOC=$(qt5_get_bindir)/moc '')
-               $(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
-               $(usex qt5 UIC=$(qt5_get_bindir)/uic '')
        )
 
        cmake-utils_src_configure

Reply via email to