4 files changed, 135 insertions, 28 deletions
diff --git a/app-arch/patool/Manifest b/app-arch/patool/Manifest
index cdc0a89ce575..260e321d8468 100644
--- a/app-arch/patool/Manifest
+++ b/app-arch/patool/Manifest
@@ -1 +1 @@
-DIST patool-1.12.tar.gz 69146 BLAKE2B e97f64b4ba41860c1f7e506f63f249adeb02974b71bf83eb1673ae1fd93b8f9b698818cb57f961b3d3a5d4e445c5e7a3a349db54e1eb11a8fc165ad07722ace9 SHA512 b8c67526ce79448de703b03ca9b363c0e04cfe56bfc6168bcb96202f95022b6bbcaa92be86a85ee9608070206acd09382b0dfd08a2f805c5e8e5683c7c3f18cc
+DIST patool-2.2.0.tar.gz 1995287 BLAKE2B ec7a188abfbfc2198e0171568324cb0e372a5629363aaeabfa404767f08062669028d6a9771e80370eb096677f3668da75923f7def7fbb4525f5ce7418cdf68a SHA512 eae774e7da2be13c7644038dc47457105caff7a51a9d3b99e38962dd26c0ace0129f1c0151c27766708ee9754049aec283873fd4a2e8647015a1a07acd48de60
diff --git a/app-arch/patool/metadata.xml b/app-arch/patool/metadata.xml
index 1a9341f87f15..198fc346c99a 100644
--- a/app-arch/patool/metadata.xml
+++ b/app-arch/patool/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>gentoo@chymera.eu</email>
-    <name>Horea Christian</name>
+  <maintainer type="person" proxied="yes">
+    <email>parona@protonmail.com</email>
+    <name>Alfred Wingate</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
   <upstream>
     <remote-id type="pypi">patool</remote-id>
+    <remote-id type="github">wummel/patool</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/app-arch/patool/patool-1.12.ebuild b/app-arch/patool/patool-1.12.ebuild
deleted file mode 100644
index d30ce9ad1591..000000000000
--- a/app-arch/patool/patool-1.12.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Portable archive file manager"
-HOMEPAGE="http://wummel.github.io/patool/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
diff --git a/app-arch/patool/patool-2.2.0.ebuild b/app-arch/patool/patool-2.2.0.ebuild
new file mode 100644
index 000000000000..278760c4129c
--- /dev/null
+++ b/app-arch/patool/patool-2.2.0.ebuild
@@ -0,0 +1,128 @@
+# 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..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
+
+	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"
+	)
+
+	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::TestLrzip::test_lrzip"
+		)
+	fi
+
+	epytest
+}