commit: aa62f57ad703f6c28bdfa82b71045220d048736c Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Thu Nov 10 18:19:33 2016 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Thu Nov 10 18:19:52 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa62f57a
net-analyzer/wireshark: Install ws_diag_control.h by Anton Bolshakov (bug #599216). Package-Manager: portage-2.3.2 ...ireshark-99999999.ebuild => wireshark-2.2.1-r1.ebuild} | 15 +++++++-------- net-analyzer/wireshark/wireshark-99999999.ebuild | 1 + 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-2.2.1-r1.ebuild similarity index 95% copy from net-analyzer/wireshark/wireshark-99999999.ebuild copy to net-analyzer/wireshark/wireshark-2.2.1-r1.ebuild index 231c33f..86dcffc 100644 --- a/net-analyzer/wireshark/wireshark-99999999.ebuild +++ b/net-analyzer/wireshark/wireshark-2.2.1-r1.ebuild @@ -3,15 +3,15 @@ # $Id$ EAPI=5 -inherit autotools eutils fcaps flag-o-matic git-r3 multilib qmake-utils qt4-r2 user +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/"; -EGIT_REPO_URI="https://code.wireshark.org/review/wireshark"; +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 androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf geoip +gtk kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi @@ -24,6 +24,8 @@ REQUIRED_USE=" ssl? ( crypt ) " +S=${WORKDIR}/${P/_/} + CDEPEND=" >=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl:3 ) @@ -94,14 +96,10 @@ pkg_setup() { enewgroup wireshark } -src_unpack() { - git-r3_src_unpack -} - src_prepare() { epatch \ "${FILESDIR}"/${PN}-1.99.8-qtchooser.patch \ - "${FILESDIR}"/${PN}-99999999-sse4_2.patch \ + "${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch \ "${FILESDIR}"/${PN}-99999999-androiddump.patch epatch_user @@ -231,6 +229,7 @@ src_install() { epan/wmem/*.h \ register.h \ wiretap/*.h \ + ws_diag_control.h \ ws_symbol_export.h \ wsutil/*.h do diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild index 231c33f..e62bacc 100644 --- a/net-analyzer/wireshark/wireshark-99999999.ebuild +++ b/net-analyzer/wireshark/wireshark-99999999.ebuild @@ -231,6 +231,7 @@ src_install() { epan/wmem/*.h \ register.h \ wiretap/*.h \ + ws_diag_control.h \ ws_symbol_export.h \ wsutil/*.h do
