7 files changed, 129 insertions, 0 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 1698590ce89d..64f9d876a98a 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/nox/Manifest b/dev-python/nox/Manifest
new file mode 100644
index 000000000000..a56c0caa4f17
--- /dev/null
+++ b/dev-python/nox/Manifest
@@ -0,0 +1,3 @@
+DIST nox-2022.11.21.gh.tar.gz 3983862 BLAKE2B 9c365dae5415de4c43c262a1ec9c9007b686838f8aff92a049b1602efe320b7644677646ee72c0e5754efc79d6e38cd46b59ff2851b39b4bf05d3166625000d4 SHA512 7f725425acd7d1ef55e04c5330c1f4fd2f2f5107c24b4bb7f7e2711cf6a5c1b8f2777a4902ee31d4a56898a953f3da6a9ed340d652fbc63cba33f5f763702b78
+EBUILD nox-2022.11.21.ebuild 1017 BLAKE2B ebec5dd9569319df2b1cb4d7122f92e796abd11dfff093c7c1ad8e3689c12bbe05f1feec9b20fa4c75f90e74fa3bc2d4d934ebc818e6eb72c3a2a7e82f2f205d SHA512 ce0fe5f05f3e8b766e12ae119921327ed7848018221bea6a7970dd5b2cda8c1fe0c1af3858b4117e4cb13ce80f36f65a20c313008c0993ae2d59d56171f82f0b
+MISC metadata.xml 382 BLAKE2B 52bcdba99198ee70c06bcb2d118ae3d92f3072ad7df91433670b6ba14ca76489dac5b275780d11b1052e19a1c03d5021f42ba75c3d5e236f1e028c54f19129c2 SHA512 9fb9741a9920cc7537180b07f2715e40b058c5fd18b74e030c0cc598a46dc5a72b227982a11e39fc09dfe200b3cff0a4c150436709c86cb6e44508e412d364b7
diff --git a/dev-python/nox/metadata.xml b/dev-python/nox/metadata.xml
new file mode 100644
index 000000000000..ab6d02e2c276
--- /dev/null
+++ b/dev-python/nox/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">wntrblm/nox</remote-id>
+		<remote-id type="pypi">nox</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/nox/nox-2022.11.21.ebuild b/dev-python/nox/nox-2022.11.21.ebuild
new file mode 100644
index 000000000000..1047e05af66b
--- /dev/null
+++ b/dev-python/nox/nox-2022.11.21.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Flexible test automation for Python"
+HOMEPAGE="
+	https://github.com/wntrblm/nox/
+	https://pypi.org/project/nox/
+"
+SRC_URI="
+	https://github.com/wntrblm/nox/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	<dev-python/argcomplete-3.0[${PYTHON_USEDEP}]
+	>=dev-python/argcomplete-1.9.4[${PYTHON_USEDEP}]
+	<dev-python/colorlog-7.0.0[${PYTHON_USEDEP}]
+	>=dev-python/colorlog-2.6.1[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.9[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-14[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# broken with >=dev-python/tox-4
+	# https://github.com/wntrblm/nox/issues/673
+	rm nox/tox_to_nox.* tests/test_tox_to_nox.py || die
+	sed -i -e '/tox-to-nox/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/stapler/Manifest b/dev-python/stapler/Manifest
index 68747d923237..81f36336bf5d 100644
--- a/dev-python/stapler/Manifest
+++ b/dev-python/stapler/Manifest
@@ -1,7 +1,9 @@
+AUX stapler-1.0.0_p20220330-PyPDF2-to-pypdf.patch 987 BLAKE2B 2bd426a54ef89c0ee92c86b076d5d711bcb83abe5c2cc01124a02f9259bd4a2300421ae5d6844a7510d2c81bc7d7fabc9442bcc3ae20855ab957ef64c49358e9 SHA512 f6764625b1eede538be66963d39fba1846a5b128226ef8814eafe9d4320acd462de1d9d40a6a58635e7f931723e6796a77b3cdab2a58c5014c71741f5dfb220b
 AUX stapler-1.0.0_p20220330-fix-tests-for-PyPDF2-2.x.patch 317 BLAKE2B 7000903663d5843388203d4cb4984a93c93cd1524a877df0c1d8a474805b4b85701f903ab813b0afa9ef8b8bef3faae771822b6e28522e17cda014299b933d16 SHA512 c7f35ae69db4eb5d61d63a2a56e15315444696168a080dc81d2839f815d975c2da92cdf36f39e7bd8a38958889b1f588dce38c435fcec7fc5e7cd62e3b25befe
 AUX stapler-1.0.0_p20220330-port-to-PyPDF2-3.0.0.patch 11876 BLAKE2B bcb22eece9e360e32bc6ef40ccdaac176fa6c2b265d962c52b399497f8347291f597a6a3b806fdf315937509d32b68bed79ccc580b2b4eb4789a5b7d4fbba2a6 SHA512 698cdbf12d36549c7e35c636b76e98bffe0f5b826bda8872f6a06a0cdb815bd855a63dc250a4f30aeb459d572db4fd54af81371664fd48cbf35aaf9b3f759061
 AUX stapler-1.0.0_p20220330-use-poetry-core-backend-for-PEP517.patch 1080 BLAKE2B 6342f8cc0931736aa6868749552da18d1c41656815f954826c6e9b2b1be0a18b45f8a8baac95d3e0f364c7c53ec7c6efb888a67b162134a9165f387e6d0c7824 SHA512 26b8d141dd765be117e9df42b78d79f68f1593e09420badb10793df007d031189627d2b3bab36635228a4337bb5b9c199472be41953be3973dd20bdddbffed11
 DIST stapler-1.0.0_p20220330.tar.gz 43659 BLAKE2B 10c24868d51086b37dd2d517aa84e3c3fc0b6becc7a29ebf496646bdd65494eb0c43488f725241d7bd7b3083ce5703538db3e05de9976a2e5029731fc2e645d2 SHA512 acd2dfec0dfab46b2cf6b440cba6c0db5399be2ba2194ca12530c311c6c5a8028614164af45b850061e7d22cbec33458ceff7757f1b104c722228dc2d02cae0a
 EBUILD stapler-1.0.0_p20220330-r1.ebuild 778 BLAKE2B 85f68550da515ac0c356dabb10758fab37efea3eff6b9c00689d560b60079b38f37a2ea32666a40696039dbbd51d5caf8d4b5266920a2b63c61ec0cdb55735fe SHA512 aad862b317e8179a6700af6eb3e838b2d9b5fcc06b6eaa11373d42329355524106ce262f14ebaf5ebfb1becc1d520acaefe53e8487ebaad2eb40fe4a248eb764
 EBUILD stapler-1.0.0_p20220330-r2.ebuild 861 BLAKE2B 9efdd79049bb7758f55202bf183fa967c680135d5879aabd25d50e535a883945018f788e11aeddd61cbd89501397b7ffa53944ada83321e97baacd29b97e52ce SHA512 fae04dac057c79b38cecdb1004a9495b3a3665f2ffc4a6aee0f5622fa02ed2a7bb4b8b34216c289fdb5458c1bf488ace17a935110f09356d45c6a09122919869
+EBUILD stapler-1.0.0_p20220330-r3.ebuild 885 BLAKE2B f21e9924d4fafdf7f443b3e2ba3a2f57f0048ba4c3f4f4391414f826b308fd18212c17c0d4c967bfa235c3b0604f7cce6b1a896a8f43614be65d771151a0273a SHA512 9beb12b71bf08f5693c917a78250333bffd4da3eacb1cf43723990c6b651bf92a951ead011fcd057b5dda116071acfaeef0be0c996a6a5d938e5b0f9051ee5e2
 MISC metadata.xml 398 BLAKE2B 3c566702150e77dd0ba58f667336f57c0347422496edeb4fdd53e0f131cb966d15781a5d5b5e13211b2385e410a1d12c064c3ffe66056395b6eeeccdcca1cc72 SHA512 802c118d28a07f7fba6558aaa8f60aef0ebf137395af566e273ba1d218712d1835c74f82c5160f12d120d8776cbaf4fe7d09827a84c1a5e234fef307e0835a18
diff --git a/dev-python/stapler/files/stapler-1.0.0_p20220330-PyPDF2-to-pypdf.patch b/dev-python/stapler/files/stapler-1.0.0_p20220330-PyPDF2-to-pypdf.patch
new file mode 100644
index 000000000000..e82005743c90
--- /dev/null
+++ b/dev-python/stapler/files/stapler-1.0.0_p20220330-PyPDF2-to-pypdf.patch
@@ -0,0 +1,39 @@
+diff --git a/staplelib/commands.py b/staplelib/commands.py
+index caf75f9..e67f419 100644
+--- a/staplelib/commands.py
++++ b/staplelib/commands.py
+@@ -4,7 +4,7 @@ import math
+ import os
+ 
+ try:
+-    from PyPDF2 import PdfWriter, PdfReader
++    from pypdf import PdfWriter, PdfReader
+ except:
+     from pyPdf import PdfWriter, PdfReader
+ 
+diff --git a/staplelib/iohelper.py b/staplelib/iohelper.py
+index 8df365c..5474898 100644
+--- a/staplelib/iohelper.py
++++ b/staplelib/iohelper.py
+@@ -7,7 +7,7 @@ import re
+ import sys
+ 
+ try:
+-    from PyPDF2 import PdfWriter, PdfReader
++    from pypdf import PdfWriter, PdfReader
+ except ImportError:
+     from pyPdf import PdfWriter, PdfReader
+ 
+diff --git a/staplelib/tests.py b/staplelib/tests.py
+index 86db178..423406d 100755
+--- a/staplelib/tests.py
++++ b/staplelib/tests.py
+@@ -5,7 +5,7 @@ import shutil
+ import tempfile
+ import unittest
+ 
+-from PyPDF2 import PdfReader
++from pypdf import PdfReader
+ 
+ from staplelib import main, CommandError
+ 
diff --git a/dev-python/stapler/stapler-1.0.0_p20220330-r3.ebuild b/dev-python/stapler/stapler-1.0.0_p20220330-r3.ebuild
new file mode 100644
index 000000000000..23e77887dad0
--- /dev/null
+++ b/dev-python/stapler/stapler-1.0.0_p20220330-r3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=poetry
+
+inherit distutils-r1
+
+COMMIT="382f1edc62296e071093a5419811a2fca9d78d93"
+
+DESCRIPTION="Suite of tools for PDF files manipulation written in Python"
+HOMEPAGE="https://github.com/hellerbarde/stapler"
+SRC_URI="https://github.com/hellerbarde/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="test? ( dev-python/pypdf[${PYTHON_USEDEP}] )"
+RDEPEND="dev-python/pypdf[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
+
+PATCHES=( "${FILESDIR}"/${P}-fix-tests-for-PyPDF2-2.x.patch
+	"${FILESDIR}"/${P}-port-to-PyPDF2-3.0.0.patch 
+	"${FILESDIR}"/${P}-use-poetry-core-backend-for-PEP517.patch
+	"${FILESDIR}"/${P}-PyPDF2-to-pypdf.patch )