* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/, net-analyzer/wireshark/files/, profiles/
@ 2020-12-20 22:44 Marek Szuba
0 siblings, 0 replies; only message in thread
From: Marek Szuba @ 2020-12-20 22:44 UTC (permalink / raw
To: gentoo-commits
commit: 6636718bb751bf82e39dd6127a596a4cef54a087
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 20 22:36:37 2020 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sun Dec 20 22:44:01 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6636718b
net-analyzer/wireshark: migrate to lua-single.eclass
Both the latest release and the live ebuild. Nothing special, just
the usual version-selection treatment. Compatibility as specified
in the upstream build scripts.
Closes: https://bugs.gentoo.org/752789
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
.../files/wireshark-3.4.2-cmake-lua-version.patch | 11 ++++++++++
...99999999.ebuild => wireshark-3.4.2-r100.ebuild} | 25 ++++++++++++++++------
net-analyzer/wireshark/wireshark-99999999.ebuild | 21 +++++++++++++-----
profiles/package.mask | 1 +
4 files changed, 46 insertions(+), 12 deletions(-)
diff --git a/net-analyzer/wireshark/files/wireshark-3.4.2-cmake-lua-version.patch b/net-analyzer/wireshark/files/wireshark-3.4.2-cmake-lua-version.patch
new file mode 100644
index 00000000000..18f663b7d81
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-3.4.2-cmake-lua-version.patch
@@ -0,0 +1,11 @@
+--- a/cmake/modules/FindLUA.cmake
++++ b/cmake/modules/FindLUA.cmake
+@@ -19,7 +19,7 @@
+
+ if(NOT WIN32)
+ find_package(PkgConfig)
+- pkg_search_module(LUA lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51)
++ pkg_search_module(LUA lua)
+ if(NOT LUA_FOUND)
+ pkg_search_module(LUA "lua<=5.2.99")
+ endif()
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild
similarity index 91%
copy from net-analyzer/wireshark/wireshark-99999999.ebuild
copy to net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild
index 25d08cbda03..8a5f5b3e6df 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild
@@ -2,24 +2,26 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit fcaps flag-o-matic git-r3 multilib python-any-r1 qmake-utils xdg-utils cmake
+
+LUA_COMPAT=( lua5-{1..2} )
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg-utils cmake
DESCRIPTION="A network protocol analyzer formerly known as ethereal"
HOMEPAGE="https://www.wireshark.org/"
-EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark"
+SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
LICENSE="GPL-2"
SLOT="0/${PV}"
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon
+dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb
- +mergecap +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt
+ +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt
+randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl
sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd
"
-RESTRICT="!test? ( test )"
S=${WORKDIR}/${P/_/}
CDEPEND="
@@ -35,11 +37,12 @@ CDEPEND="
ilbc? ( media-libs/libilbc )
kerberos? ( virtual/krb5 )
libxml2? ( dev-libs/libxml2 )
- lua? ( >=dev-lang/lua-5.1:0= )
+ lua? ( ${LUA_DEPS} )
lz4? ( app-arch/lz4 )
maxminddb? ( dev-libs/libmaxminddb )
minizip? ( sys-libs/zlib[minizip] )
netlink? ( dev-libs/libnl:3 )
+ opus? ( media-libs/opus )
pcap? ( net-libs/libpcap )
qt5? (
dev-qt/qtcore:5
@@ -88,13 +91,20 @@ RDEPEND="
selinux? ( sec-policy/selinux-wireshark )
"
REQUIRED_USE="
+ lua? ( ${LUA_REQUIRED_USE} )
plugin-ifdemo? ( plugins )
"
+RESTRICT="test"
PATCHES=(
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
+ "${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
"${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch
)
+pkg_setup() {
+ use lua && lua-single_pkg_setup
+}
+
src_configure() {
local mycmakeargs
@@ -159,6 +169,7 @@ src_configure() {
-DENABLE_MINIZIP=$(usex minizip)
-DENABLE_NETLINK=$(usex netlink)
-DENABLE_NGHTTP2=$(usex http2)
+ -DENABLE_OPUS=$(usex opus)
-DENABLE_PCAP=$(usex pcap)
-DENABLE_PLUGINS=$(usex plugins)
-DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 25d08cbda03..61860be16a1 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -2,8 +2,11 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit fcaps flag-o-matic git-r3 multilib python-any-r1 qmake-utils xdg-utils cmake
+
+LUA_COMPAT=( lua5-{1..2} )
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit fcaps flag-o-matic git-r3 lua-single python-any-r1 qmake-utils xdg-utils cmake
DESCRIPTION="A network protocol analyzer formerly known as ethereal"
HOMEPAGE="https://www.wireshark.org/"
@@ -15,11 +18,10 @@ KEYWORDS=""
IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon
+dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb
- +mergecap +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt
+ +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt
+randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl
sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd
"
-RESTRICT="!test? ( test )"
S=${WORKDIR}/${P/_/}
CDEPEND="
@@ -35,11 +37,12 @@ CDEPEND="
ilbc? ( media-libs/libilbc )
kerberos? ( virtual/krb5 )
libxml2? ( dev-libs/libxml2 )
- lua? ( >=dev-lang/lua-5.1:0= )
+ lua? ( ${LUA_DEPS} )
lz4? ( app-arch/lz4 )
maxminddb? ( dev-libs/libmaxminddb )
minizip? ( sys-libs/zlib[minizip] )
netlink? ( dev-libs/libnl:3 )
+ opus? ( media-libs/opus )
pcap? ( net-libs/libpcap )
qt5? (
dev-qt/qtcore:5
@@ -88,13 +91,20 @@ RDEPEND="
selinux? ( sec-policy/selinux-wireshark )
"
REQUIRED_USE="
+ lua? ( ${LUA_REQUIRED_USE} )
plugin-ifdemo? ( plugins )
"
+RESTRICT="!test? ( test )"
PATCHES=(
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
+ "${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
"${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch
)
+pkg_setup() {
+ use lua && lua-single_pkg_setup
+}
+
src_configure() {
local mycmakeargs
@@ -159,6 +169,7 @@ src_configure() {
-DENABLE_MINIZIP=$(usex minizip)
-DENABLE_NETLINK=$(usex netlink)
-DENABLE_NGHTTP2=$(usex http2)
+ -DENABLE_OPUS=$(usex opus)
-DENABLE_PCAP=$(usex pcap)
-DENABLE_PLUGINS=$(usex plugins)
-DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)
diff --git a/profiles/package.mask b/profiles/package.mask
index c73d7120655..ca7266954de 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -535,6 +535,7 @@ kde-apps/kdebase-meta:5
>=net-analyzer/rrdtool-1.7.2-r100
>=net-analyzer/snort-2.9.16-r100
>=net-analyzer/suricata-6.0.1-r100
+>=net-analyzer/wireshark-3.4.2-r100
>=net-im/prosody-0.11.7-r100
>=net-im/swift-4.0.2-r100
>=net-irc/hexchat-2.14.3-r100
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2020-12-20 22:44 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-20 22:44 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/, net-analyzer/wireshark/files/, profiles/ Marek Szuba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox