From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E75FF139086 for ; Sun, 22 Jan 2017 12:14:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4459623412F; Sun, 22 Jan 2017 12:14:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1157D23412F for ; Sun, 22 Jan 2017 12:14:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F033A3416A8 for ; Sun, 22 Jan 2017 12:14:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EEE6E2C73 for ; Sun, 22 Jan 2017 12:14:10 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1485087249.1bd5bcd19f91a6268d4dbbb3d6c3c0c2d3421ff0.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/wireshark/wireshark-2.2.3-r1.ebuild net-analyzer/wireshark/wireshark-99999999.ebuild X-VCS-Directories: net-analyzer/wireshark/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 1bd5bcd19f91a6268d4dbbb3d6c3c0c2d3421ff0 X-VCS-Branch: master Date: Sun, 22 Jan 2017 12:14:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 29c8a117-b1cf-4ab7-9961-07ac4950d997 X-Archives-Hash: 9f4f5c4d8a1bfba0ddc21371ff680e26 commit: 1bd5bcd19f91a6268d4dbbb3d6c3c0c2d3421ff0 Author: Jeroen Roovers gentoo org> AuthorDate: Sun Jan 22 12:13:52 2017 +0000 Commit: Jeroen Roovers gentoo 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 }