| 1 |
commit: 696920f53ea54e61124437781c0f32c4870e2933 |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 2 19:10:10 2018 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 2 19:10:22 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=696920f5 |
| 7 |
|
| 8 |
net-analyzer/wireshark: Drop -DDUMPCAP_INSTALL_OPTION=. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.32, Repoman-2.3.9 |
| 11 |
|
| 12 |
net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild | 17 ++++++++--------- |
| 13 |
net-analyzer/wireshark/wireshark-99999999.ebuild | 17 ++++++++--------- |
| 14 |
2 files changed, 16 insertions(+), 18 deletions(-) |
| 15 |
|
| 16 |
diff --git a/net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild b/net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild |
| 17 |
index 1efad019372..40b8f06bf92 100644 |
| 18 |
--- a/net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild |
| 19 |
+++ b/net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild |
| 20 |
@@ -118,6 +118,11 @@ src_configure() { |
| 21 |
fi |
| 22 |
|
| 23 |
mycmakeargs+=( |
| 24 |
+ $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes) |
| 25 |
+ $(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') |
| 26 |
+ $(usex qt5 MOC=$(qt5_get_bindir)/moc '') |
| 27 |
+ $(usex qt5 RCC=$(qt5_get_bindir)/rcc '') |
| 28 |
+ $(usex qt5 UIC=$(qt5_get_bindir)/uic '') |
| 29 |
-DBUILD_androiddump=$(usex androiddump) |
| 30 |
-DBUILD_capinfos=$(usex capinfos) |
| 31 |
-DBUILD_captype=$(usex captype) |
| 32 |
@@ -138,13 +143,16 @@ src_configure() { |
| 33 |
-DBUILD_udpdump=$(usex udpdump) |
| 34 |
-DBUILD_wireshark=$(usex qt5) |
| 35 |
-DBUILD_wireshark_gtk=$(usex gtk) |
| 36 |
+ -DDISABLE_WERROR=yes |
| 37 |
-DENABLE_BCG729=$(usex bcg729) |
| 38 |
+ -DENABLE_CAP=$(usex caps) |
| 39 |
-DENABLE_CARES=$(usex adns) |
| 40 |
-DENABLE_GNUTLS=$(usex ssl) |
| 41 |
-DENABLE_KERBEROS=$(usex kerberos) |
| 42 |
-DENABLE_LIBXML2=$(usex libxml2) |
| 43 |
-DENABLE_LUA=$(usex lua) |
| 44 |
-DENABLE_LZ4=$(usex lz4) |
| 45 |
+ -DENABLE_NETLINK=$(usex netlink) |
| 46 |
-DENABLE_NGHTTP2=$(usex nghttp2) |
| 47 |
-DENABLE_PCAP=$(usex pcap) |
| 48 |
-DENABLE_PORTAUDIO=$(usex portaudio) |
| 49 |
@@ -153,15 +161,6 @@ src_configure() { |
| 50 |
-DENABLE_SNAPPY=$(usex snappy) |
| 51 |
-DENABLE_SPANDSP=$(usex spandsp) |
| 52 |
-DENABLE_ZLIB=$(usex zlib) |
| 53 |
- -DENABLE_NETLINK=$(usex netlink) |
| 54 |
- $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes) |
| 55 |
- -DENABLE_CAP=$(usex caps) |
| 56 |
- -DDUMPCAP_INSTALL_OPTION=$(usex caps capabilities suid) |
| 57 |
- -DDISABLE_WERROR=yes |
| 58 |
- $(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') |
| 59 |
- $(usex qt5 MOC=$(qt5_get_bindir)/moc '') |
| 60 |
- $(usex qt5 RCC=$(qt5_get_bindir)/rcc '') |
| 61 |
- $(usex qt5 UIC=$(qt5_get_bindir)/uic '') |
| 62 |
) |
| 63 |
|
| 64 |
cmake-utils_src_configure |
| 65 |
|
| 66 |
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild |
| 67 |
index c658f9ec1c6..c216e52d33d 100644 |
| 68 |
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild |
| 69 |
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild |
| 70 |
@@ -116,6 +116,11 @@ src_configure() { |
| 71 |
fi |
| 72 |
|
| 73 |
mycmakeargs+=( |
| 74 |
+ $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes) |
| 75 |
+ $(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') |
| 76 |
+ $(usex qt5 MOC=$(qt5_get_bindir)/moc '') |
| 77 |
+ $(usex qt5 RCC=$(qt5_get_bindir)/rcc '') |
| 78 |
+ $(usex qt5 UIC=$(qt5_get_bindir)/uic '') |
| 79 |
-DBUILD_androiddump=$(usex androiddump) |
| 80 |
-DBUILD_capinfos=$(usex capinfos) |
| 81 |
-DBUILD_captype=$(usex captype) |
| 82 |
@@ -136,13 +141,16 @@ src_configure() { |
| 83 |
-DBUILD_udpdump=$(usex udpdump) |
| 84 |
-DBUILD_wireshark=$(usex qt5) |
| 85 |
-DBUILD_wireshark_gtk=$(usex gtk) |
| 86 |
+ -DDISABLE_WERROR=yes |
| 87 |
-DENABLE_BCG729=$(usex bcg729) |
| 88 |
+ -DENABLE_CAP=$(usex caps) |
| 89 |
-DENABLE_CARES=$(usex adns) |
| 90 |
-DENABLE_GNUTLS=$(usex ssl) |
| 91 |
-DENABLE_KERBEROS=$(usex kerberos) |
| 92 |
-DENABLE_LIBXML2=$(usex libxml2) |
| 93 |
-DENABLE_LUA=$(usex lua) |
| 94 |
-DENABLE_LZ4=$(usex lz4) |
| 95 |
+ -DENABLE_NETLINK=$(usex netlink) |
| 96 |
-DENABLE_NGHTTP2=$(usex nghttp2) |
| 97 |
-DENABLE_PCAP=$(usex pcap) |
| 98 |
-DENABLE_PORTAUDIO=$(usex portaudio) |
| 99 |
@@ -151,15 +159,6 @@ src_configure() { |
| 100 |
-DENABLE_SNAPPY=$(usex snappy) |
| 101 |
-DENABLE_SPANDSP=$(usex spandsp) |
| 102 |
-DENABLE_ZLIB=$(usex zlib) |
| 103 |
- -DENABLE_NETLINK=$(usex netlink) |
| 104 |
- $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes) |
| 105 |
- -DENABLE_CAP=$(usex caps) |
| 106 |
- -DDUMPCAP_INSTALL_OPTION=$(usex caps capabilities suid) |
| 107 |
- -DDISABLE_WERROR=yes |
| 108 |
- $(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') |
| 109 |
- $(usex qt5 MOC=$(qt5_get_bindir)/moc '') |
| 110 |
- $(usex qt5 RCC=$(qt5_get_bindir)/rcc '') |
| 111 |
- $(usex qt5 UIC=$(qt5_get_bindir)/uic '') |
| 112 |
) |
| 113 |
|
| 114 |
cmake-utils_src_configure |
Archives