| 1 |
commit: 57fd3e443c10d76d00a060e627c38bc6be93b2c8 |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Dec 23 20:58:52 2016 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 23 20:59:33 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57fd3e44 |
| 7 |
|
| 8 |
net-analyzer/wireshark: Drop Qt4. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
net-analyzer/wireshark/wireshark-99999999.ebuild | 26 +++++------------------- |
| 13 |
1 file changed, 5 insertions(+), 21 deletions(-) |
| 14 |
|
| 15 |
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild |
| 16 |
index e62bacc..87ee793 100644 |
| 17 |
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild |
| 18 |
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild |
| 19 |
@@ -3,7 +3,7 @@ |
| 20 |
# $Id$ |
| 21 |
|
| 22 |
EAPI=5 |
| 23 |
-inherit autotools eutils fcaps flag-o-matic git-r3 multilib qmake-utils qt4-r2 user |
| 24 |
+inherit autotools eutils fcaps flag-o-matic git-r3 multilib qmake-utils user |
| 25 |
|
| 26 |
DESCRIPTION="A network protocol analyzer formerly known as ethereal" |
| 27 |
HOMEPAGE="http://www.wireshark.org/" |
| 28 |
@@ -14,11 +14,10 @@ SLOT="0/${PV}" |
| 29 |
KEYWORDS="" |
| 30 |
IUSE=" |
| 31 |
adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf |
| 32 |
- geoip +gtk kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi |
| 33 |
+ geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi |
| 34 |
libssh randpkt randpktdump sshdump ssl tfshark zlib |
| 35 |
" |
| 36 |
REQUIRED_USE=" |
| 37 |
- ?? ( qt4 qt5 ) |
| 38 |
ciscodump? ( libssh ) |
| 39 |
sshdump? ( libssh ) |
| 40 |
ssl? ( crypt ) |
| 41 |
@@ -42,11 +41,6 @@ CDEPEND=" |
| 42 |
lua? ( >=dev-lang/lua-5.1:* ) |
| 43 |
pcap? ( net-libs/libpcap ) |
| 44 |
portaudio? ( media-libs/portaudio ) |
| 45 |
- qt4? ( |
| 46 |
- dev-qt/qtcore:4 |
| 47 |
- dev-qt/qtgui:4[accessibility] |
| 48 |
- x11-misc/xdg-utils |
| 49 |
- ) |
| 50 |
qt5? ( |
| 51 |
dev-qt/qtcore:5 |
| 52 |
dev-qt/qtgui:5 |
| 53 |
@@ -85,7 +79,6 @@ DEPEND=" |
| 54 |
RDEPEND=" |
| 55 |
${CDEPEND} |
| 56 |
gtk? ( virtual/freedesktop-icon-theme ) |
| 57 |
- qt4? ( virtual/freedesktop-icon-theme ) |
| 58 |
qt5? ( virtual/freedesktop-icon-theme ) |
| 59 |
selinux? ( sec-policy/selinux-wireshark ) |
| 60 |
" |
| 61 |
@@ -126,20 +119,16 @@ src_configure() { |
| 62 |
fi |
| 63 |
|
| 64 |
# Enable wireshark binary with any supported GUI toolkit (bug #473188) |
| 65 |
- if use gtk || use qt4 || use qt5; then |
| 66 |
+ if use gtk || use qt5; then |
| 67 |
myconf+=( "--enable-wireshark" ) |
| 68 |
else |
| 69 |
myconf+=( "--disable-wireshark" ) |
| 70 |
fi |
| 71 |
|
| 72 |
- if ! use qt4 && ! use qt5; then |
| 73 |
+ if ! use qt5; then |
| 74 |
myconf+=( "--with-qt=no" ) |
| 75 |
fi |
| 76 |
|
| 77 |
- if use qt4; then |
| 78 |
- export QT_MIN_VERSION=4.6.0 |
| 79 |
- fi |
| 80 |
- |
| 81 |
if use qt5; then |
| 82 |
export QT_MIN_VERSION=5.3.0 |
| 83 |
append-cxxflags -fPIC -DPIC |
| 84 |
@@ -176,11 +165,6 @@ src_configure() { |
| 85 |
$(use_with zlib) \ |
| 86 |
$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \ |
| 87 |
$(usex netlink --with-libnl=3 --without-libnl) \ |
| 88 |
- $(usex qt4 --with-qt=4 '') \ |
| 89 |
- $(usex qt4 LRELEASE=$(qt4_get_bindir)/lrelease '') \ |
| 90 |
- $(usex qt4 MOC=$(qt4_get_bindir)/moc '') \ |
| 91 |
- $(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \ |
| 92 |
- $(usex qt4 UIC=$(qt4_get_bindir)/uic '') \ |
| 93 |
$(usex qt5 --with-qt=5 '') \ |
| 94 |
$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') \ |
| 95 |
$(usex qt5 MOC=$(qt5_get_bindir)/moc '') \ |
| 96 |
@@ -243,7 +227,7 @@ src_install() { |
| 97 |
insinto /usr/include/wiretap |
| 98 |
doins wiretap/wtap.h |
| 99 |
|
| 100 |
- if use gtk || use qt4 || use qt5; then |
| 101 |
+ if use gtk || use qt5; then |
| 102 |
local c d |
| 103 |
for c in hi lo; do |
| 104 |
for d in 16 32 48; do |
Archives