commit: c5f30611b1cd0ffb13295d45262628b43e3e8c5a Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Fri Oct 23 05:18:50 2015 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Fri Oct 23 05:19:18 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5f30611
net-analyzer/wireshark: Install pcap icons, explicitly name Qt variant in desktop file by miflab (bug #563246). Package-Manager: portage-2.2.23 ...2.0.0_rc1.ebuild => wireshark-1.12.8-r1.ebuild} | 43 +++++++++++----------- ....0_rc1.ebuild => wireshark-2.0.0_rc1-r1.ebuild} | 10 ++++- 2 files changed, 31 insertions(+), 22 deletions(-) diff --git a/net-analyzer/wireshark/wireshark-2.0.0_rc1.ebuild b/net-analyzer/wireshark/wireshark-1.12.8-r1.ebuild similarity index 86% copy from net-analyzer/wireshark/wireshark-2.0.0_rc1.ebuild copy to net-analyzer/wireshark/wireshark-1.12.8-r1.ebuild index 74ed55f..730e6ee 100644 --- a/net-analyzer/wireshark/wireshark-2.0.0_rc1.ebuild +++ b/net-analyzer/wireshark/wireshark-1.12.8-r1.ebuild @@ -7,22 +7,20 @@ inherit autotools eutils fcaps flag-o-matic multilib qmake-utils qt4-r2 user DESCRIPTION="A network protocol analyzer formerly known as ethereal" HOMEPAGE="http://www.wireshark.org/"; -SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.bz2" +SRC_URI="${HOMEPAGE}download/src/all-versions/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0/${PV}" -KEYWORDS="" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" IUSE=" adns +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap - portaudio +qt4 qt5 selinux sbc smi cpu_flags_x86_sse4_2 ssl zlib + portaudio +qt4 qt5 sbc selinux smi ssl zlib " REQUIRED_USE=" ssl? ( crypt ) ?? ( qt4 qt5 ) " -S=${WORKDIR}/${P/_/} - GTK_COMMON_DEPEND=" x11-libs/gdk-pixbuf x11-libs/pango @@ -95,9 +93,12 @@ src_prepare() { epatch \ "${FILESDIR}"/${PN}-1.6.13-ldflags.patch \ "${FILESDIR}"/${PN}-1.11.0-oldlibs.patch \ - "${FILESDIR}"/${PN}-1.99.0.1975-sse4_2.patch \ - "${FILESDIR}"/${PN}-99999999-pkgconfig.patch \ - "${FILESDIR}"/${PN}-1.99.8-qtchooser.patch + "${FILESDIR}"/${PN}-1.12.8-gtk-deprecated-warnings.patch \ + "${FILESDIR}"/${PN}-1.99.0-qt5.patch \ + "${FILESDIR}"/${PN}-1.99.1-sbc.patch \ + "${FILESDIR}"/${PN}-1.12.5-cross-compile.patch \ + "${FILESDIR}"/${PN}-1.99.7-qt-pie.patch \ + "${FILESDIR}"/${PN}-1.12.6-rcc.patch epatch_user @@ -127,13 +128,7 @@ src_configure() { myconf+=( "--disable-wireshark" ) fi - if ! use qt4 && ! use qt5; then - myconf+=( "--with-qt=no" ) - fi - - if use qt4; then - export QT_MIN_VERSION=4.6.0 - fi + use qt4 && export QT_MIN_VERSION=4.6.0 if use qt5; then export QT_MIN_VERSION=5.3.0 @@ -158,8 +153,8 @@ src_configure() { $(use_with pcap dumpcap-group wireshark) \ $(use_with pcap) \ $(use_with portaudio) \ - $(usex qt4 --with-qt=4 '') \ - $(usex qt5 --with-qt=5 '') \ + $(use_with qt4) \ + $(use_with qt5) \ $(usex qt4 MOC=$(qt4_get_bindir)/moc '') \ $(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \ $(usex qt4 UIC=$(qt4_get_bindir)/uic '') \ @@ -171,7 +166,6 @@ src_configure() { $(use_with ssl gnutls) \ $(use_with zlib) \ $(usex netlink --with-libnl=3 --without-libnl) \ - $(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \ --disable-profile-build \ --disable-usr-local \ --disable-warnings-as-errors \ @@ -190,12 +184,11 @@ src_compile() { src_install() { default - if use doc; then dohtml -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}} if use doc-pdf; then insinto /usr/share/doc/${PF}/pdf/ - doins docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.pdf + doins docbook/{{developer,user}-guide,release-notes}-{a4,us}.pdf fi fi @@ -235,6 +228,10 @@ src_install() { newins image/${c}${d}-app-wireshark.png wireshark.png done done + for d in 16 24 32 48 64 128 256 ; do + insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes + newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png + done fi if use gtk3; then @@ -242,7 +239,11 @@ src_install() { fi if use qt4 || use qt5; then - sed -e '/Exec=/s|wireshark|&-qt|g' wireshark.desktop > wireshark-qt.desktop || die + sed \ + -e '/Exec=/s|wireshark|&-qt|g' \ + -e 's|^Name.*=Wireshark|& (Qt)|g' \ + wireshark.desktop > wireshark-qt.desktop \ + || die domenu wireshark-qt.desktop fi diff --git a/net-analyzer/wireshark/wireshark-2.0.0_rc1.ebuild b/net-analyzer/wireshark/wireshark-2.0.0_rc1-r1.ebuild similarity index 95% rename from net-analyzer/wireshark/wireshark-2.0.0_rc1.ebuild rename to net-analyzer/wireshark/wireshark-2.0.0_rc1-r1.ebuild index 74ed55f..a7fa989 100644 --- a/net-analyzer/wireshark/wireshark-2.0.0_rc1.ebuild +++ b/net-analyzer/wireshark/wireshark-2.0.0_rc1-r1.ebuild @@ -235,6 +235,10 @@ src_install() { newins image/${c}${d}-app-wireshark.png wireshark.png done done + for d in 16 24 32 48 64 128 256 ; do + insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes + newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png + done fi if use gtk3; then @@ -242,7 +246,11 @@ src_install() { fi if use qt4 || use qt5; then - sed -e '/Exec=/s|wireshark|&-qt|g' wireshark.desktop > wireshark-qt.desktop || die + sed \ + -e '/Exec=/s|wireshark|&-qt|g' \ + -e 's|^Name.*=Wireshark|& (Qt)|g' \ + wireshark.desktop > wireshark-qt.desktop \ + || die domenu wireshark-qt.desktop fi
