gentoo auto-resync : 11:01:2023 - 11:44:03

5 files changed, 93 insertions, 45 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index cf51c90261fd..88fa299f257d 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/scapy/Manifest b/net-analyzer/scapy/Manifest
index 777342b2bc41..3b6682337f7b 100644
--- a/net-analyzer/scapy/Manifest
+++ b/net-analyzer/scapy/Manifest
@@ -1,4 +1,6 @@
+AUX scapy-2.5.0-no-install-tests.patch 339 BLAKE2B 0702c8c40d3358dd1e05eeb98ebf990925b61f8d572f053cccf3bab5111265c3d0f5c4908c1efe70c1d33525dba3553b2ed2bf2818b5d8e4fd4cbd87c55fa26f SHA512 cdffcb0b78bcb261d28c8f970e7032a116b37e818affc88009fb82c1208d812edb870d9740004ccb8ff7070407aa12a0949ff535f0ce6b5a2dc78e20d33d97a2
 DIST scapy-2.4.5.tar.gz 3323309 BLAKE2B af94b3ec6324c4544aca25f63bcca8aa60a3b1cbbf132d3ed07b5bc73b95e4298bf250e65157bdb7851226fd0ac039367892a9a14d844e5815832ad4ab556819 SHA512 b5ccd689f7bd4fbbb86921a35360b94ec7a738b494f16e4764828689835296016bc476825add798406e4d32761d8df90b41ce7e38049afdabf98397b1bf5982a
+DIST scapy-2.5.0.tar.gz 6082895 BLAKE2B 2673de913d46532760dce93914916b909a4706d846e1e699c16f35b738cac8a073e23b194f9ed4647ade41170a04849ebd33ab3d0ba5b7f09fea8fa527e14c5d SHA512 4e5cacff0bbf6fd991ea24f4680049d042082fae4b349c8082078e6f01b38c09bb5c8276bfba15d4a88a1eb5af92c505848ec98556b10eecbd803f134a5b244a
 EBUILD scapy-2.4.5.ebuild 1093 BLAKE2B 4b441e9a3781980d4a1205ddfdf66c14ea6ae120ca26aa7da46bb1cb80252dbeee3e664799f18c6da19a948ad3999f90a8a4d0826233f53cb1766685d2719795 SHA512 db1a2d9f9db2fae41b8c30f281f35d0a9f967be57ebeeabd9e77e030fbd30d0ec3f10343a8c6d33123bb337b14d3a76b97aefd883f76d35ed93c29a2e75f89b3
-EBUILD scapy-9999.ebuild 1010 BLAKE2B 1bf3c49d0232cccfae8e516e2fcaae8aff54468e819ea4e0a5143f581c9bfeb40a8eb2b20290f8f4fd2cb0aaaae048cdf8c17b2881c1c9eaa4de9759255f1ded SHA512 e495f34edf64ad3715777dffbf0b8688664542eecbe1abed5d351fdc8f19c0e47bad3e11fa9178a2176deeef0258fffd7b19cac50c32889f121d8f1c6bf5be05
+EBUILD scapy-2.5.0.ebuild 1728 BLAKE2B 0247a4f9541038d69eec0af93194aadca753db6fc78bb8c82b25c26837a6b43dea1a36de87be1c28baebbbfcee512582980dea20250f7930f04450552d2899de SHA512 1f519414240b9c54a92701af710ce5d2ff3648adbc2be33a1a97d6d934e8c125a5d7c92b4b7a45903c91ff24c39411756cdbf4a96bef2c57a385ca67743a8bdc
 MISC metadata.xml 494 BLAKE2B bb5ea4ee5cdbc940e503d4f8eb8e54185bb9bb7f1160810d4448f275a072cef31d7e3c1cfe167ef84b180a7b9a2c6b3babe8c767831fe97954381dbd38bf090b SHA512 74ec713bccc253ec16dd0178e04275a456df12ff485cbde8323b8b05ff96679ca747334441bf621d0762dd1a235f5cdcb07e4207c30d25a909d8ffefd1f29852
diff --git a/net-analyzer/scapy/files/scapy-2.5.0-no-install-tests.patch b/net-analyzer/scapy/files/scapy-2.5.0-no-install-tests.patch
new file mode 100644
index 000000000000..be6d8fbd638a
--- /dev/null
+++ b/net-analyzer/scapy/files/scapy-2.5.0-no-install-tests.patch
@@ -0,0 +1,11 @@
+--- a/setup.py
++++ b/setup.py
+@@ -33,7 +33,7 @@ def get_long_description():
+ setup(
+     name='scapy',
+     version=__import__('scapy').VERSION,
+-    packages=find_packages(),
++    packages=find_packages(exclude=["test", "test.*"]),
+     data_files=[('share/man/man1', ["doc/scapy.1"])],
+     package_data={
+         'scapy': ['VERSION'],
diff --git a/net-analyzer/scapy/scapy-2.5.0.ebuild b/net-analyzer/scapy/scapy-2.5.0.ebuild
new file mode 100644
index 000000000000..f1784cc3ed4b
--- /dev/null
+++ b/net-analyzer/scapy/scapy-2.5.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="A Python interactive packet manipulation program for mastering the network"
+HOMEPAGE="https://scapy.net/ https://github.com/secdev/scapy"
+SRC_URI="https://github.com/secdev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/python-zstandard[${PYTHON_USEDEP}]
+	)
+"
+
+DOC_CONTENTS="
+Scapy has optional support for the following packages:
+
+	dev-python/cryptography
+	dev-python/ipython
+	dev-python/matplotlib
+	dev-python/pyx
+	media-gfx/graphviz
+	net-analyzer/tcpdump
+	net-analyzer/tcpreplay
+	net-libs/libpcap
+	virtual/imagemagick-tools
+
+	See also ""${EPREFIX}/usr/share/doc/${PF}/installation.rst""
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.0-no-install-tests.patch
+)
+
+src_prepare() {
+	if ! [[ -f ${PN}/VERSION ]]; then
+		echo ${PV} > ${PN}/VERSION || die
+	else
+		die
+	fi
+
+	# Drop tests which need network
+	rm \
+		test/nmap.uts \
+		test/p0f.uts \
+		test/p0fv2.uts \
+		test/regression.uts \
+		test/scapy/layers/inet6.uts || die
+	# Timed out
+	rm test/tftp.uts || die
+	# Needs ipython
+	rm test/scapy/layers/dhcp.uts || die
+	# Import failure?
+	rm test/contrib/isotp_native_socket.uts test/contrib/isotpscan.uts || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# https://github.com/secdev/scapy/blob/master/tox.ini
+	"${EPYTHON}" -m scapy.tools.UTscapy -c ./test/configs/linux.utsc -N || die
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	dodoc -r doc/${PN}/*
+	DISABLE_AUTOFORMATTING=1 readme.gentoo_create_doc
+}
diff --git a/net-analyzer/scapy/scapy-9999.ebuild b/net-analyzer/scapy/scapy-9999.ebuild
deleted file mode 100644
index ffcb7962a604..000000000000
--- a/net-analyzer/scapy/scapy-9999.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 git-r3 readme.gentoo-r1
-
-DESCRIPTION="A Python interactive packet manipulation program for mastering the network"
-HOMEPAGE="https://scapy.net/ https://github.com/secdev/scapy"
-EGIT_REPO_URI="https://github.com/secdev/${PN}"
-S="${WORKDIR}"/${P/_/}
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DOC_CONTENTS="
-Scapy has optional support for the following packages:
-
-	dev-python/cryptography
-	dev-python/ipython
-	dev-python/matplotlib
-	dev-python/pyx
-	media-gfx/graphviz
-	net-analyzer/tcpdump
-	net-analyzer/tcpreplay
-	net-libs/libpcap
-	virtual/imagemagick-tools
-
-	See also ""${EPREFIX}/usr/share/doc/${PF}/installation.rst""
-"
-
-src_prepare() {
-	echo ${PV/_/} > ${PN}/VERSION || die
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-	dodoc -r doc/${PN}/*
-	DISABLE_AUTOFORMATTING=plz readme.gentoo_create_doc
-}