gentoo auto-resync : 30:01:2024 - 17:49:05

4 files changed, 16 insertions, 139 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 7aee00c0bacb..5638b08e143d 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/patool/Manifest b/app-arch/patool/Manifest
index 1ccfbab8072c..f6cc265cf32f 100644
--- a/app-arch/patool/Manifest
+++ b/app-arch/patool/Manifest
@@ -1,11 +1,9 @@
 AUX patool-1.12_p20230424-disable-file-sandbox.patch 1032 BLAKE2B 6c5f0447b1c9d037f78dcfb17d4638a549a170b941aa4724ce7a2d80251e8225c970e7962802cb21a9b23af4338543838dfcceb18c44023a96b41b62c7f9b6cb SHA512 a9919888af4cc71cfd73f0dddfe9958fe33c9f3c3a586fe0fea64ebcb6f9a7267e7d7de07383219daacc5e5a5208c214a26306425cbc77ce8db83d842592224e
 AUX patool-1.12_p20230424-map-vnd.android.package-archive.patch 1451 BLAKE2B 0d3cb6076fc8229c9500b635e8a1c5c105fc254ae190ceabff91f157a9c8cab6c25b25d06e1857ec61fbc5317f7393a18075037a8e003bae3a9e90222558da44 SHA512 cbfafbb76449c1a8f9e2250ba2b0de4397dc327c0173ea4d4b90f34f0a5ed68cadda8e060e8f4da01e7da8e445f569d18f637760fb61e8047f72862e6515f5d3
-DIST patool-1.12_p20230424.gh.tar.gz 1990425 BLAKE2B dd0ae58fd26ef1849c26cb681839536b0499d666faf48cb7028adc12840055d72e70a85db99c615c79b076671f16e1371ee5ddbb24228248cd3c1b0daf2dc496 SHA512 c2974bad22ab57aca3aab32e51aeac0c2a2aa3ffee41241d3220151206b8a5d709ec72ea1b4a73a218c03b9fad64297ecd2ab44cc20da5f4d0e4a3ecd5589d43
-DIST patool-1.14.1.tar.gz 1992559 BLAKE2B 3468c6b7779806ecb906830043964f2fa88384569af4cad857d8519568a7670a403ce17ca5b495fae6ad129f109bfac38693bfe651bad54dc5e6a46b5b58ea4f SHA512 df5ce0f5275fcc0b653775b9fbc36e11dfff1fcf30e5caf78bbebbf2c169125c7d27e71481c7ba108d39fb12cebdf3d84ab8c40f1a5f061dea5e5304e2306481
 DIST patool-1.15.0.tar.gz 1993753 BLAKE2B 18dbbb6d73862778af9774b64f192e20d48f1454c078a2ab0bf9ccf12f3de988b7799c5e6116b1f49fe48b2512968789d363e37aa504d622a72c22a620398f5f SHA512 c7cbcd829a803025a99df67c8d4aca1d803d3bd8e06f2897c65bc0e2475fbd42e273654f978090fe4c2bbcac02e5d1f8e322cb90220e746ac9ef9d0755e0c717
 DIST patool-2.0.0.tar.gz 1987911 BLAKE2B a9c12f8083e82835792445f50e1e72f55e98c505f0019656cd00c1f882a860ae61c7484ea16c7744101b6a983c1934fad12dbb58af2a03e82d0ec4ceb417aa92 SHA512 c81a65fa89ff77ee80ae85fbc6868e5414d5141e47433028546273b3a231ce3240d6b30baae114247bc0ab0b3e4e91c6e127b8734eff9af8721abdae7f464ef5
-EBUILD patool-1.12_p20230424.ebuild 2791 BLAKE2B 2f914f86579c5429a65f0b345f6599a388613f33ad4f48fa558bd5d0419bd52797e0bcd134ba6942eb3ccfd1dd9c2b95fe111ae337bff51941dc1257b4b05e6b SHA512 973c9f02b491cb485f1fe658c75a13e66e1f4682c0bc8eb55dad1aa0587dce709aae3d9934cf31a6f96b95cdc15884e309e4ea4fd2d9b08243bc66c0db6343cb
-EBUILD patool-1.14.1.ebuild 2494 BLAKE2B 35061075526e1904e02f7ecb58f13b27fac2d4743591e61592aa739556a99fdc6993c33458917ec49f5360d591176da693ec8d9b759dbcd1d7e13b0de6e63d88 SHA512 0ced7cd0570127bf31dfb2cbc0336f32034a3673fabf216dc53932e39d3ef9b2c425c467627a669ac76987d542d3fc724c1b74a7a247e89d7840f327321a8701
+DIST patool-2.1.1.tar.gz 1991183 BLAKE2B f33c92c628ffcca349ad897c29cec935730aba7f2e9a5581acedb9b3ecb0bab22046cd16af9f2d2e605bc483c2dc624db01b52dea8459388a8b140b7f357b193 SHA512 3b51fe917da9672dbeae015852680b67e81ec35d609af3e465f0d53afb12c35bee885f4f3db4a135c01521cc70db182b27fc25320d141f96eaf098ba99524f63
 EBUILD patool-1.15.0.ebuild 2662 BLAKE2B 41ca69119d552b641f401af16dda3ff2510615114c8d613cf5e564af85a2d26fd47ccd8dadbe7a2477dca0e05ca98c00ab5c386a205cf930f482ebbdfc6671cd SHA512 ff74da9491d6fadfc2732414ade668ec8dffccfe45a1e7cd9c1db1b512fe217ff96c5fb0d9157f928f6756e92c7e6ba0f26bcdf66af09b194bcc7e4feabee233
 EBUILD patool-2.0.0.ebuild 2664 BLAKE2B 6099a4e45ed8f0142ad3a82c5331c6ba1e890e14b331c2758db3716622e292ef82ff5e00d0a2f521ffb2880b4a0dab6b40189ef454286ebd070e02017d959b91 SHA512 cb7c13ebae341085922797ba4eb68056b695b50034685a10ff91dbff6e47da76abbb159e83c546471234c16efd20404737598b12cbacdab9628238e485347c51
+EBUILD patool-2.1.1.ebuild 2573 BLAKE2B 0f07be52b30a8cf0e644dd39d2383f5ceaab45858d40e3f8c752c773ed23b65775fd1641ff1731c0b790ac9f85dbb52b10e47d198caa4e6d0cdca142c7fcbf41 SHA512 260bf4d922487b6b5761d814567de5751f459dc4a325a4fd28c1c9ff43331038f12dec56ee96cefea7b5ac779c1329c62ad61ffd28fbfc61ca26aed4bed718d9
 MISC metadata.xml 539 BLAKE2B b19f1ad36967b42e152a23108851ad6eabcd7f44fd1faeeb4c345ff812b97d4b4079afc83653c1fd0dd005943a152cba44210132389e1ec956a434d24e97486d SHA512 b557ec32ca1211faa72e108a7f769f4ffb3a08075a4010aee2f9ced79a9f7f8c26f60bf26e2587d4a0cbb3cf6d52ea52d9102407ed548cdd41f53c67dd10d7bb
diff --git a/app-arch/patool/patool-1.12_p20230424.ebuild b/app-arch/patool/patool-1.12_p20230424.ebuild
deleted file mode 100644
index 2aa28fce4eff..000000000000
--- a/app-arch/patool/patool-1.12_p20230424.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Portable archive file manager"
-HOMEPAGE="https://wummel.github.io/patool/"
-COMMIT="ab64562c8cdac34dfd69fcb6e30c8c0014282d11"
-SRC_URI="https://github.com/wummel/patool/archive/${COMMIT}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
-	test? (
-		app-arch/arj
-		app-arch/bzip2
-		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/lrzip
-		app-arch/lzip
-		app-arch/lzop
-		app-arch/ncompress
-		app-arch/p7zip[rar]
-		app-arch/pbzip2
-		app-arch/pdlzip
-		app-arch/pigz
-		app-arch/rpm
-		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/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 )
-	)
-"
-# Test dependencies which are packaged but can't be tested for various reasons.
-# app-arch/arc
-# app-arch/zoo
-# app-arch/zopfli
-# media-sound/mac
-
-# app-arch/rar is masked on musl
-# app-arch/clzip is unkeyworded on x86
-
-# Unpackaged testable dependencies
-# archmage
-# genisoimage
-# lhasa
-# nomarch
-# pdzip2
-# py_{bz2,echo,gzip,tarfile,zipfile}
-# rpm2cpio
-# rzip
-# star
-# unalz
-# uncompress.real
-
-PATCHES=(
-	"${FILESDIR}/patool-1.12_p20230424-disable-file-sandbox.patch"
-	"${FILESDIR}/patool-1.12_p20230424-map-vnd.android.package-archive.patch"
-)
-
-distutils_enable_tests pytest
-
-src_install() {
-	distutils-r1_src_install
-
-	newdoc doc/README.txt README.md
-	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"
-		# AttributeError: module 'patoolib.programs.zopfli' has no attribute 'extract_gzip'
-		"tests/archives/test_zopfli.py"
-	)
-
-	if use elibc_musl; then
-		EPYTEST_IGNORE+=(
-			"tests/archives/test_rar.py"
-		)
-	fi
-
-	if use x86; then
-		EPYTEST_IGNORE+=(
-			"tests/archives/test_clzip.py"
-			# bug #916317
-			"tests/archives/test_lrzip.py"
-		)
-	fi
-
-	epytest
-}
diff --git a/app-arch/patool/patool-1.14.1.ebuild b/app-arch/patool/patool-2.1.1.ebuild
index a09ac7e79ce1..b6b287767626 100644
--- a/app-arch/patool/patool-1.14.1.ebuild
+++ b/app-arch/patool/patool-2.1.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wummel.github.io/patool/"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 BDEPEND="
 	test? (
@@ -28,7 +28,7 @@ BDEPEND="
 		app-arch/lcab
 		app-arch/lha
 		app-arch/libarchive
-		app-arch/lrzip
+		app-arch/lz4
 		app-arch/lzip
 		app-arch/lzop
 		app-arch/ncompress
@@ -36,7 +36,9 @@ BDEPEND="
 		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
@@ -45,6 +47,7 @@ BDEPEND="
 		app-arch/xdms
 		app-arch/xz-utils
 		app-arch/zip
+		app-arch/zopfli
 		app-arch/zpaq
 		app-arch/zstd
 		app-cdr/cdrtools
@@ -55,17 +58,22 @@ BDEPEND="
 		sys-apps/file
 		sys-apps/grep
 		!elibc_musl? ( app-arch/rar )
-		!x86? ( app-arch/clzip )
+		!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
-# app-arch/zopfli
 # 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
@@ -79,6 +87,7 @@ BDEPEND="
 # star
 # unalz
 # uncompress.real
+# 7zz ( app-arch/7zip:guru )
 
 distutils_enable_tests pytest
 
@@ -99,8 +108,6 @@ python_test() {
 		"tests/archives/test_arc.py"
 		# Error: 1002 (invalid input file)
 		"tests/archives/test_mac.py"
-		# AttributeError: module 'patoolib.programs.zopfli' has no attribute 'extract_gzip'
-		"tests/archives/test_zopfli.py"
 	)
 
 	if use elibc_musl; then
@@ -113,7 +120,7 @@ python_test() {
 		EPYTEST_IGNORE+=(
 			"tests/archives/test_clzip.py"
 			# bug #916317
-			"tests/archives/test_lrzip.py"
+			"tests/archives/test_lrzip.py::TestLrzip::test_lrzip"
 		)
 	fi