gentoo auto-resync : 17:02:2025 - 00:13:57

4 files changed, 32 insertions, 11 deletions

diff --git a/app-arch/patool/Manifest b/app-arch/patool/Manifest
index 214ea4e900cd..e5bb366857aa 100644
--- a/app-arch/patool/Manifest
+++ b/app-arch/patool/Manifest
@@ -1,8 +1,8 @@
 AUX patool-3.1.0-fix-file-5.46-compat.patch 9022 BLAKE2B 1f383807ed199d3b5208279c00319281ed71257d9101d8a66019d188c7ee78d879666c43399b44d9af8ed74dedf7a4f89b30e98f1f22c4c3ec9876f588b3813e SHA512 3f4e4535925d62474f7d6c2df71d89ba3c036531c70aa49c57ab858378a81efd88fad3138fbfc7a1db2bc602431de8b83bb50594afc84435857051c28e868433
-DIST patool-2.4.0.tar.gz 1996705 BLAKE2B b84fd4c469741de76ceeee90974cec71ba5bc123d31f6a1dd60cf3c336dcfd7da1def7fec2bbec27ce181d97c5dff96f15c1d4714b722718a1439749f7cee077 SHA512 bf6d680613fb996b3c0b12075a85acec1edd468b8cb58cafd233b31847a2b9c490d21c6d906e737218ca68f08d1cdce4a18a3e57e353a970be58da4e2ff0d794
 DIST patool-3.0.3.tar.gz 2003565 BLAKE2B 988b918f52c5f050c78fdd16351d95c2c23351e8e5e92c884e3ab32f9d0cfc33140db96ce309bb3e465c1a51fbade0c530cbfef3f222dcf89f26d4d35d67bf88 SHA512 c81d13f0183432ba4f3b98951b4f5716a95396eec063b09435c0e3cdf88734107e8a8b647ff6ffe84ea808cc12882b823f95b4edf871874913ca127597fe7348
 DIST patool-3.1.0.tar.gz 2006989 BLAKE2B b264c125e7454d677084a17b7e27daab437057750bce7646b451cd3e33b718e8c720ac64a1c05c8b55b4918ca89455698e7829ce5bd1fe0f951c8e2300fe3d73 SHA512 75912a5545f52226e07fe1f34b3c8c9af48e1b2f21da96380e41c0c397cf79a774d041f1d29b643d645f6d5213f0e66b07a26018e1286f7b2760c7bd8a1f6ec9
-EBUILD patool-2.4.0.ebuild 2552 BLAKE2B 626b08c1d3b89d54af16df64814103d12b92d8dd596f30647b82f58ef7d62e9d835e555a1794440462b93afea4bbe03a3cab247fd1723034df1b6cb40f794d28 SHA512 582aa05d32792f789565cb03ea57ab8bf10330e495ff0a4e70ee0a2cf8ac0489ea4e0e53094719d1efbe2bf70a49f625563cd51ccdfe89c58cfe977f74e5fceb
-EBUILD patool-3.0.3.ebuild 2702 BLAKE2B 14819ccdbf5bbe28d540fda467da2ac97f2fb84d688adc50a19fb1e18e868d6ddee6dc626408276d2e5a9a3918755280beffa05974b138b5259cd0222d079b48 SHA512 973970abb3f3806a752c904ba78fbffa8bc3644ad04b381ea302d888a35b27189dac5d415d8ca8a39b0442374f82386ac1c04e9de8b3244e27ae306aa74f9b53
-EBUILD patool-3.1.0.ebuild 2622 BLAKE2B 8966830e57650387caa19839cca506f5871be43147a4f3cdf490e23d9398c9b92afefcbc7691dc07069452fd2b66f357045398aee4c9eb5648202e74575111d6 SHA512 92888f1df32a0e024ff200c1fbfde9e295f90edd0a95b15610bad2226d0db0b5a8ae4be62b5fd96efd26601274b88ac89134d11592d444e91e4ec7711a24e3fc
+DIST patool-3.1.3.tar.gz 2007436 BLAKE2B cd90ec04671181f192a416577c30c88ea68293e5c5f86b0d5b82953a4870dff5d0b4b05b1ea8fcd4ffcf13ecb7718d4ee062ca3e57822258a4a0f0505bc92509 SHA512 59565a806c683a9cd0d134f491d92b7a76adee4bf3bfeaf13cc82d3b99daa8aaef8c8699e0dfc491a4e2a9cd87569d0f69408335ae3adaf37d947a8a80d84f50
+EBUILD patool-3.0.3.ebuild 3031 BLAKE2B e6b50e8c0b06619226f7ffbf63379dac39d80426d53bd9572351c52de73963794f742a94b01d712c619c4f6c482da5f03e438df6c2fb3ab243a222d77cd91e2c SHA512 c8fe25ecdcafd831058084e0c9017345f4587293647d51ee98073420cf58ed6cec252a8cd42b803fd56c890a8e28fb0e8b5aef382a4b953308e5fe69d577df0e
+EBUILD patool-3.1.0.ebuild 2949 BLAKE2B b5b76701b6cef216ecf2b66a2cf157a67e1594b47869142dc7eaa50abe7c09cc8eebf0eaaf8f054904d2b36206f44eca50ae628d14f24ee6678740f55796bf73 SHA512 0be6a9846d1b660f803ed41ab85977a64f293efa94da9f45c03363840198d1439d200991fe2ab04ada4c5673eb0dc160123c89e0eb52a40149c2b1a7fff23adc
+EBUILD patool-3.1.3.ebuild 2657 BLAKE2B 05767c093fcee9e0ae2dab301abc08a4637535741c8caa0a9f3ef6afd611fe36acc70d47dd402cf1e865ca420693eae845aaf7ad57db003445c7d8d54bc4f1fe SHA512 2f884eef708d1c33af6c0bd701ba4a3c66ad00af5364efdac56d2d35e181dac0de18dcc08737544f39bad0ba9521b54249aae3296dde453c3d9a7f96e924cde7
 MISC metadata.xml 539 BLAKE2B b19f1ad36967b42e152a23108851ad6eabcd7f44fd1faeeb4c345ff812b97d4b4079afc83653c1fd0dd005943a152cba44210132389e1ec956a434d24e97486d SHA512 b557ec32ca1211faa72e108a7f769f4ffb3a08075a4010aee2f9ced79a9f7f8c26f60bf26e2587d4a0cbb3cf6d52ea52d9102407ed548cdd41f53c67dd10d7bb
diff --git a/app-arch/patool/patool-3.0.3.ebuild b/app-arch/patool/patool-3.0.3.ebuild
index 8e8053efb9bf..b7bb5875db45 100644
--- a/app-arch/patool/patool-3.0.3.ebuild
+++ b/app-arch/patool/patool-3.0.3.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+EPYTEST_XDIST=1
 PYTHON_COMPAT=( python3_{10..13} )
 
 inherit distutils-r1 pypi
@@ -108,6 +109,12 @@ python_test() {
 		"tests/archives/test_arc.py"
 		# Error: 1002 (invalid input file)
 		"tests/archives/test_mac.py"
+		# Needs upstream changes to handle app-arch/7zip[-rar]
+		# https://github.com/wummel/patool/commit/0cd8855a27ee78d3cf283bd62750ed3e846a5e0b
+		# https://github.com/wummel/patool/commit/b2573ed8eaaadf0965ef83fee48b8ecdba0ca124
+		"tests/archives/test_7zz.py"
+	)
+	local EPYTEST_DESELECT=(
 		# Broken due mime type change for rar in file-5.46
 		# https://github.com/wummel/patool/pull/173
 		"tests/test_mime.py::TestMime::test_nested_gzip"
@@ -122,6 +129,8 @@ python_test() {
 	if use x86; then
 		EPYTEST_IGNORE+=(
 			"tests/archives/test_clzip.py"
+		)
+		EPYTEST_DESELECT+=(
 			# bug #916317
 			"tests/archives/test_lrzip.py::TestLrzip::test_lrzip"
 		)
diff --git a/app-arch/patool/patool-3.1.0.ebuild b/app-arch/patool/patool-3.1.0.ebuild
index 19470cd52d22..70b90fb397cc 100644
--- a/app-arch/patool/patool-3.1.0.ebuild
+++ b/app-arch/patool/patool-3.1.0.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+EPYTEST_XDIST=1
 PYTHON_COMPAT=( python3_{10..13} )
 
 inherit distutils-r1 pypi
@@ -112,7 +113,12 @@ python_test() {
 		"tests/archives/test_arc.py"
 		# Error: 1002 (invalid input file)
 		"tests/archives/test_mac.py"
+		# Needs upstream changes to handle app-arch/7zip[-rar]
+		# https://github.com/wummel/patool/commit/0cd8855a27ee78d3cf283bd62750ed3e846a5e0b
+		# https://github.com/wummel/patool/commit/b2573ed8eaaadf0965ef83fee48b8ecdba0ca124
+		"tests/archives/test_7zz.py"
 	)
+	local EPYTEST_DESELECT=()
 
 	if use elibc_musl; then
 		EPYTEST_IGNORE+=(
@@ -123,6 +129,8 @@ python_test() {
 	if use x86; then
 		EPYTEST_IGNORE+=(
 			"tests/archives/test_clzip.py"
+		)
+		EPYTEST_DESELECT+=(
 			# bug #916317
 			"tests/archives/test_lrzip.py::TestLrzip::test_lrzip"
 		)
diff --git a/app-arch/patool/patool-2.4.0.ebuild b/app-arch/patool/patool-3.1.3.ebuild
index 4b7faf77c031..339f8d9c0ad1 100644
--- a/app-arch/patool/patool-2.4.0.ebuild
+++ b/app-arch/patool/patool-3.1.3.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+EPYTEST_XDIST=1
 PYTHON_COMPAT=( python3_{10..13} )
 
 inherit distutils-r1 pypi
@@ -13,7 +14,7 @@ HOMEPAGE="https://wummel.github.io/patool/"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 BDEPEND="
 	test? (
@@ -32,7 +33,7 @@ BDEPEND="
 		app-arch/lzip
 		app-arch/lzop
 		app-arch/ncompress
-		app-arch/p7zip[rar]
+		app-arch/p7zip
 		app-arch/pbzip2
 		app-arch/pdlzip
 		app-arch/pigz
@@ -59,6 +60,7 @@ BDEPEND="
 		sys-apps/grep
 		!elibc_musl? ( app-arch/rar )
 		!x86? (
+			app-arch/7zip
 			app-arch/clzip
 			app-arch/lrzip
 			app-arch/unar
@@ -74,6 +76,7 @@ BDEPEND="
 # app-arch/clzip is unkeyworded on x86
 # app-arch/lrzip bug #916317 on x86
 # app-arch/unar is unkeyworded on x86
+# app-arch/7zip is unkeyworded on x86
 
 # Unpackaged testable dependencies
 # archmage
@@ -87,15 +90,13 @@ BDEPEND="
 # star
 # unalz
 # uncompress.real
-# 7zz ( app-arch/7zip:guru )
 
 distutils_enable_tests pytest
 
-src_install() {
-	distutils-r1_src_install
-
+python_install_all() {
 	einstalldocs
 	doman doc/patool.1
+	distutils-r1_python_install_all
 }
 
 python_test() {
@@ -109,6 +110,7 @@ python_test() {
 		# Error: 1002 (invalid input file)
 		"tests/archives/test_mac.py"
 	)
+	local EPYTEST_DESELECT=()
 
 	if use elibc_musl; then
 		EPYTEST_IGNORE+=(
@@ -119,6 +121,8 @@ python_test() {
 	if use x86; then
 		EPYTEST_IGNORE+=(
 			"tests/archives/test_clzip.py"
+		)
+		EPYTEST_DESELECT+=(
 			# bug #916317
 			"tests/archives/test_lrzip.py::TestLrzip::test_lrzip"
 		)