commit: 6b485c6d9180892d5ae4912f35a490999d8a5246
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 26 04:27:21 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 26 04:27:21 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b485c6d
net-analyzer/wireshark: add 4.1.0 (unkeyworded)
4.1.0 is a preview for 4.2.x.
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-analyzer/wireshark/Manifest | 1 +
.../{wireshark-9999.ebuild => wireshark-4.1.0.ebuild} | 11 ++++++-----
net-analyzer/wireshark/wireshark-9999.ebuild | 11 ++++++-----
3 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index f6a6b5738dc5..84b53db047b2 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,4 @@
DIST wireshark-4.0.6.tar.xz 41583088 BLAKE2B
5c4f3b6e16541afbeb9241d2c66c75da97df3164cbc841f1d5d5ba57fa102d85c8d22275180ce2e4fb72ed73c9fb8e64be1c9b4f337803d85146564bee43ce52
SHA512
651b760d05518a914ffbb2fe1ced84e877ebc40d7b03500586e009609064761bef7810654b1321e08aeea403867450be289227a9e43937e9f777693a8f4c901b
DIST wireshark-4.0.7.tar.xz 43113752 BLAKE2B
06d4863fe796da8d3b97144a8b24430741ea8f58a8401a56327e0db37e5a7e81e63ab43325c87195a535565af7cb1265e25f8c62600ae69d549da479951bb9a1
SHA512
98f609405f20a3714e7c5e4f806cae5cc842daaf0219bd92d3130d2930758cce244edca4529db59300b5ca1e1e98d1aa632bc5c85c92f26aa2e0c124e691a5ab
DIST wireshark-4.0.8.tar.xz 43123664 BLAKE2B
bda31be809724a39e475489eb5653589310ae679933fac193cbc8bb3924b3ec48a93b5da6d39655fdb9f4a8d717b9cc84fcb357bea275cb457b45783a75ca778
SHA512
f6de0f86bb1eac82f7ed2d98d7f4fe3189107b1f0da441abd9077593f8e624989c33aaf8b4ef4b3c460fe787c64c4b8fdb3168de9f5661802fed6b06d71c5c65
+DIST wireshark-4.1.0.tar.xz 44601140 BLAKE2B
c20a0a917c94554d593986e9058cee7f10c68a0e73a3b8a69e87c40f5932d4f33da1d3ba8ed5177094058bd43ba9942b21a2f3fe6e04a751ffb75e9e9b524627
SHA512
d3253d26d53dbeaa14f7d7dd0956124de3f7fe1d683f2041c6d1420271ba9601248c904a0927160194ca54aa8752526bd5de643d553e55ded8478caa54cd9bb0
diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild
b/net-analyzer/wireshark/wireshark-4.1.0.ebuild
similarity index 97%
copy from net-analyzer/wireshark/wireshark-9999.ebuild
copy to net-analyzer/wireshark/wireshark-4.1.0.ebuild
index f2e8832d6897..084bda174c0f 100644
--- a/net-analyzer/wireshark/wireshark-9999.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.1.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
LUA_COMPAT=( lua5-{1..2} )
# TODO: check cmake/modules/UseAsn2Wrs.cmake for 3.12
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
@@ -19,9 +19,10 @@ else
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz";
S="${WORKDIR}/${P/_/}"
- if [[ ${PV} != *_rc* ]] ; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
- fi
+ # 4.1.x is an experimental release until 4.2
+ #if [[ ${PV} != *_rc* ]] ; then
+ # KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+ #fi
fi
LICENSE="GPL-2"
@@ -131,7 +132,6 @@ RDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
- "${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
)
python_check_deps() {
@@ -215,6 +215,7 @@ src_configure() {
-DENABLE_LIBXML2=$(usex libxml2)
-DENABLE_LTO=$(usex lto)
-DENABLE_LUA=$(usex lua)
+ -DLUA_FIND_VERSIONS="${ELUA#lua}"
-DENABLE_LZ4=$(usex lz4)
-DENABLE_MINIZIP=$(usex minizip)
-DENABLE_NETLINK=$(usex netlink)
diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild
b/net-analyzer/wireshark/wireshark-9999.ebuild
index f2e8832d6897..084bda174c0f 100644
--- a/net-analyzer/wireshark/wireshark-9999.ebuild
+++ b/net-analyzer/wireshark/wireshark-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
LUA_COMPAT=( lua5-{1..2} )
# TODO: check cmake/modules/UseAsn2Wrs.cmake for 3.12
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
@@ -19,9 +19,10 @@ else
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz";
S="${WORKDIR}/${P/_/}"
- if [[ ${PV} != *_rc* ]] ; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
- fi
+ # 4.1.x is an experimental release until 4.2
+ #if [[ ${PV} != *_rc* ]] ; then
+ # KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+ #fi
fi
LICENSE="GPL-2"
@@ -131,7 +132,6 @@ RDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
- "${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
)
python_check_deps() {
@@ -215,6 +215,7 @@ src_configure() {
-DENABLE_LIBXML2=$(usex libxml2)
-DENABLE_LTO=$(usex lto)
-DENABLE_LUA=$(usex lua)
+ -DLUA_FIND_VERSIONS="${ELUA#lua}"
-DENABLE_LZ4=$(usex lz4)
-DENABLE_MINIZIP=$(usex minizip)
-DENABLE_NETLINK=$(usex netlink)
