commit: 1bd5bcd19f91a6268d4dbbb3d6c3c0c2d3421ff0 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Sun Jan 22 12:13:52 2017 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Sun Jan 22 12:14:09 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bd5bcd1
net-analyzer/wireshark: EAPI=6, Drop IUSE=qt4. Package-Manager: Portage-2.3.3, Repoman-2.3.1 ...k-99999999.ebuild => wireshark-2.2.3-r1.ebuild} | 26 ++++++++++------------ net-analyzer/wireshark/wireshark-99999999.ebuild | 14 ++++++------ 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-2.2.3-r1.ebuild similarity index 93% copy from net-analyzer/wireshark/wireshark-99999999.ebuild copy to net-analyzer/wireshark/wireshark-2.2.3-r1.ebuild index 671d50c..05996ad 100644 --- a/net-analyzer/wireshark/wireshark-99999999.ebuild +++ b/net-analyzer/wireshark/wireshark-2.2.3-r1.ebuild @@ -2,16 +2,16 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 -inherit autotools eutils fcaps flag-o-matic git-r3 multilib qmake-utils user +EAPI=6 +inherit autotools eutils fcaps flag-o-matic multilib qmake-utils 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 +qt5 sbc selinux smi @@ -23,6 +23,8 @@ REQUIRED_USE=" ssl? ( crypt ) " +S=${WORKDIR}/${P/_/} + CDEPEND=" >=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl:3 ) @@ -83,22 +85,18 @@ RDEPEND=" qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark ) " +PATCHES=( + "${FILESDIR}"/${PN}-1.99.8-qtchooser.patch + "${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch + "${FILESDIR}"/${PN}-99999999-androiddump.patch +) 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}-99999999-androiddump.patch - - epatch_user + default eautoreconf } diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild index 671d50c..bab62ea 100644 --- a/net-analyzer/wireshark/wireshark-99999999.ebuild +++ b/net-analyzer/wireshark/wireshark-99999999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 inherit autotools eutils fcaps flag-o-matic git-r3 multilib qmake-utils user DESCRIPTION="A network protocol analyzer formerly known as ethereal" @@ -83,6 +83,11 @@ RDEPEND=" qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark ) " +PATCHES=( + "${FILESDIR}"/${PN}-1.99.8-qtchooser.patch + "${FILESDIR}"/${PN}-99999999-androiddump.patch + "${FILESDIR}"/${PN}-99999999-sse4_2.patch +) pkg_setup() { enewgroup wireshark @@ -93,12 +98,7 @@ src_unpack() { } src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-1.99.8-qtchooser.patch \ - "${FILESDIR}"/${PN}-99999999-sse4_2.patch \ - "${FILESDIR}"/${PN}-99999999-androiddump.patch - - epatch_user + default eautoreconf }
