5 files changed, 9 insertions, 149 deletions
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index a02c116cc712..511a1401670b 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/patool/Manifest b/app-arch/patool/Manifest
index 6f6442a51291..793352dd30a9 100644
--- a/app-arch/patool/Manifest
+++ b/app-arch/patool/Manifest
@@ -1,7 +1,5 @@
-DIST patool-3.0.3.tar.gz 2003565 BLAKE2B 988b918f52c5f050c78fdd16351d95c2c23351e8e5e92c884e3ab32f9d0cfc33140db96ce309bb3e465c1a51fbade0c530cbfef3f222dcf89f26d4d35d67bf88 SHA512 c81d13f0183432ba4f3b98951b4f5716a95396eec063b09435c0e3cdf88734107e8a8b647ff6ffe84ea808cc12882b823f95b4edf871874913ca127597fe7348
 DIST patool-3.1.3.tar.gz 2007436 BLAKE2B cd90ec04671181f192a416577c30c88ea68293e5c5f86b0d5b82953a4870dff5d0b4b05b1ea8fcd4ffcf13ecb7718d4ee062ca3e57822258a4a0f0505bc92509 SHA512 59565a806c683a9cd0d134f491d92b7a76adee4bf3bfeaf13cc82d3b99daa8aaef8c8699e0dfc491a4e2a9cd87569d0f69408335ae3adaf37d947a8a80d84f50
 DIST patool-4.0.0.tar.gz 2007828 BLAKE2B 230a6b7876db3d995f1b76bb9b3e28d3dc6b50eb933d8290226971800e101ceb462a5dc0f2e5b2782a0c450df09abbfaffad667b94fcb88303845e72cec5ef05 SHA512 4f2dbfe4bdedea18eb6959c19c2e08109380b43f604684a866ebad888c9ced23495f19a97964f18ea4ae011dcdfd0ec7e1a652dd6fd4e8e21c7e482a00fafd20
-EBUILD patool-3.0.3.ebuild 3031 BLAKE2B e6b50e8c0b06619226f7ffbf63379dac39d80426d53bd9572351c52de73963794f742a94b01d712c619c4f6c482da5f03e438df6c2fb3ab243a222d77cd91e2c SHA512 c8fe25ecdcafd831058084e0c9017345f4587293647d51ee98073420cf58ed6cec252a8cd42b803fd56c890a8e28fb0e8b5aef382a4b953308e5fe69d577df0e
-EBUILD patool-3.1.3.ebuild 2656 BLAKE2B 61f2dab2807cfa9fc5d7f33852c4e120afa5b46ffa47deddd4ac04580f7cbaac35e108864037ba97b7dfa15e15713493764d01becebae4c605c88cda1ff4b187 SHA512 c82fe2a2d7a15362cc9754d27499a9ed13768681bcb7579b4155aca09f10366673d8427d3e1e6be87a197cb7759bd7ae2232cb5cda3349fb28bc183296b4e6d0
-EBUILD patool-4.0.0.ebuild 2657 BLAKE2B dca80b493beed23d2c353116a0df4ca27ec84300ffd3a8e468bd1eec4e312af69f47f87e2d45f8a3d24295d31cf73e8724bf6ec76d10707ff73a5f1259b44bd5 SHA512 94d72113cbb51ea6c3bef9e823925daebcf1569a804bcfd169804c54c420933fab3af095d8cb9d1db0cf29fde527a9559c32c83a8bb62320a8f1e184c3492fcf
+EBUILD patool-3.1.3.ebuild 2655 BLAKE2B 19af4469088dbfe2d4442e513b316c70faccff95bbd44b235a67f77c7398bb0f0245683950287a9a11b84a8d4e43cf07fdaf6284c8d2e81e000ed01980a2a4c3 SHA512 ba9fc5536c5f52688410bc9a8f47ff4e1918fe38276f7ff442f8b005e0e93d722aaea991d01865913da4d5e89b44bc5b62de9a3f4850ed78e7ad989a25a59f11
+EBUILD patool-4.0.0.ebuild 2666 BLAKE2B 5d8584a06ce7a9924ad1ba77a9c1520df4c64eb6d1dabd42a4157f58bf00ecc856ae5994f2b7cd4e8642a50cb1a5c1e702d16503cd16b46bce35723f78bf4ee5 SHA512 073d2352c2622606bf1264922f76ad3db56ba9c0b0b4f0ee79b6996f7b20ce29c2d25cdb7bc2eca2b42f39f0a8c4879030a2fb922cf8b22e8caa6bc88249790b
 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
deleted file mode 100644
index b7bb5875db45..000000000000
--- a/app-arch/patool/patool-3.0.3.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# 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
-
-DESCRIPTION="Portable archive file manager"
-HOMEPAGE="https://wummel.github.io/patool/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
-	test? (
-		app-arch/arj
-		app-arch/bzip2
-		app-arch/bzip3
-		app-arch/cabextract
-		app-alternatives/cpio
-		app-arch/dpkg
-		app-arch/gzip
-		app-arch/lbzip2
-		app-arch/lcab
-		app-arch/lha
-		app-arch/libarchive
-		app-arch/lz4
-		app-arch/lzip
-		app-arch/lzop
-		app-arch/ncompress
-		app-arch/p7zip[rar]
-		app-arch/pbzip2
-		app-arch/pdlzip
-		app-arch/pigz
-		app-arch/plzip
-		app-arch/rpm
-		app-arch/rzip
-		app-arch/sharutils
-		app-arch/tar
-		app-arch/unace
-		app-arch/unadf
-		app-arch/unzip
-		app-arch/xdms
-		app-arch/xz-utils
-		app-arch/zip
-		app-arch/zopfli
-		app-arch/zpaq
-		app-arch/zstd
-		app-cdr/cdrtools
-		dev-libs/chmlib
-		media-libs/flac
-		media-sound/shorten
-		sys-apps/diffutils
-		sys-apps/file
-		sys-apps/grep
-		!elibc_musl? ( app-arch/rar )
-		!x86? (
-			app-arch/clzip
-			app-arch/lrzip
-			app-arch/unar
-		)
-	)
-"
-# Test dependencies which are packaged but can't be tested for various reasons.
-# app-arch/arc
-# app-arch/zoo
-# media-sound/mac
-
-# app-arch/rar is masked on musl
-# app-arch/clzip is unkeyworded on x86
-# app-arch/lrzip bug #916317 on x86
-# app-arch/unar is unkeyworded on x86
-
-# Unpackaged testable dependencies
-# archmage
-# genisoimage
-# lhasa
-# nomarch
-# pdzip2
-# py_{bz2,echo,gzip,tarfile,zipfile}
-# rpm2cpio
-# rzip
-# star
-# unalz
-# uncompress.real
-# 7zz ( app-arch/7zip:guru )
-
-distutils_enable_tests pytest
-
-src_install() {
-	distutils-r1_src_install
-
-	einstalldocs
-	doman doc/patool.1
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# zoo emits a non-zero exit status on a possibly false consistency check
-		# Zoo:  WARNING:  Archive header failed consistency check.
-		"tests/archives/test_zoo.py"
-		# Doesn't accept long arguments, such as those that files in ${S} would have.
-		# Too long argument: /var/tmp/portage/app-arch/patool-1.12_p20230424/work/patool-ab64562c8cdac34dfd69fcb6e30c8c0014282d11/tests/data/p.arc.foo
-		"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"
-	)
-
-	if use elibc_musl; then
-		EPYTEST_IGNORE+=(
-			"tests/archives/test_rar.py"
-		)
-	fi
-
-	if use x86; then
-		EPYTEST_IGNORE+=(
-			"tests/archives/test_clzip.py"
-		)
-		EPYTEST_DESELECT+=(
-			# bug #916317
-			"tests/archives/test_lrzip.py::TestLrzip::test_lrzip"
-		)
-	fi
-
-	epytest
-}
diff --git a/app-arch/patool/patool-3.1.3.ebuild b/app-arch/patool/patool-3.1.3.ebuild
index 330f0402e287..4875a21291b8 100644
--- a/app-arch/patool/patool-3.1.3.ebuild
+++ b/app-arch/patool/patool-3.1.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wummel.github.io/patool/"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	test? (
diff --git a/app-arch/patool/patool-4.0.0.ebuild b/app-arch/patool/patool-4.0.0.ebuild
index a11332d4ab07..e8ade06b7b11 100644
--- a/app-arch/patool/patool-4.0.0.ebuild
+++ b/app-arch/patool/patool-4.0.0.ebuild
@@ -14,10 +14,11 @@ HOMEPAGE="https://wummel.github.io/patool/"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 BDEPEND="
 	test? (
+		app-arch/7zip
 		app-arch/arj
 		app-arch/bzip2
 		app-arch/bzip3
@@ -33,7 +34,6 @@ BDEPEND="
 		app-arch/lzip
 		app-arch/lzop
 		app-arch/ncompress
-		app-arch/p7zip
 		app-arch/pbzip2
 		app-arch/pdlzip
 		app-arch/pigz
@@ -58,9 +58,12 @@ BDEPEND="
 		sys-apps/diffutils
 		sys-apps/file
 		sys-apps/grep
+		|| (
+			>=app-arch/7zip-24.09[symlink(+)]
+			app-arch/p7zip
+		)
 		!elibc_musl? ( app-arch/rar )
 		!x86? (
-			app-arch/7zip
 			app-arch/clzip
 			app-arch/lrzip
 			app-arch/unar
@@ -76,7 +79,6 @@ 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