gentoo resync : 29.12.2022

3 files changed, 37 insertions, 6 deletions

diff --git a/dev-python/lockfile/Manifest b/dev-python/lockfile/Manifest
index d3ed00d96eea..829992484ddd 100644
--- a/dev-python/lockfile/Manifest
+++ b/dev-python/lockfile/Manifest
@@ -1,3 +1,4 @@
+AUX lockfile-0.12.2-pytest.patch 741 BLAKE2B c27fcf7080c09556ab94831243a3301b10fd5ae26bc5b03351120642c610b12a8ab76f34bd9ed66a06139db21ec58e421a7e6c70bad219aa402f38eb7ac855eb SHA512 3ff3074c40935a6cb5e813cb29ef48656086d1396f21e55be1100f98da293d86256f4e9ce1b31c27000c82421f3d1dbf2699b7a830205de5b95683a2667a64b3
 DIST lockfile-0.12.2.tar.gz 20874 BLAKE2B 8a1e49e8799516b44b219fb28101f3985d75fea842456e69c4357b71eb6a7be21cc56c0f9e885df8da3fb6c584ff4a47c7daad87ba34fc47a8cd40644ece063b SHA512 67b7d651d7e963a497c2604912c61eed90181cdd09c744a0ceaa26e6bbe09d1a871ce48be3949b7da7ea6b366b15492c8c8de589edeca2641ca5e6cb3804df07
-EBUILD lockfile-0.12.2-r2.ebuild 604 BLAKE2B 62be6c81752a789814ef9484d5366cfe6eb5aa2785b07b68262b63ffdadd96d0ac65309f8c5bdb6759dea8cf76d539a87b8f0c9370f529981e6baa721adb5cee SHA512 e82a2397cb8c51db5f52ed768f41299076a43bce83471278bc8e83a55b24411227f98efc3847010dfd0295dcf020bad2d42feb092fe1bbae8b1b10f842713f8a
+EBUILD lockfile-0.12.2-r3.ebuild 692 BLAKE2B 1384f4ab368d9a74e2ca505b43ef7b3811c72e9a3c60bccfcf0ff492744ab5e1386c7b91cd76b7e58b5b613d51277409224dbbc60742b44f1ebe2ffab53128ca SHA512 2bf0b1cc0e39bff93764847ee9741f086a79008264b0decaaf8b5eb6ea68212d2e78ae0735a4f4d0489a970e444a2cc9a67661d123df01b091dc8f338ef6198c
 MISC metadata.xml 389 BLAKE2B 00c71a4c10b51971e512ff1c19e18566370966282421bf8cf108c1950fb76c9e01a56b6ead6b5fe6102ca6375365a18466b4c887458914fecd7fa67b438d4d84 SHA512 2d558396239b2e3b9c4e79bbc89a6bd510554d76e875ba91b3a0192085b62974d278fcc6d16724d05e007e28931bef38b95246f80b74166ef151f50e62b6211f
diff --git a/dev-python/lockfile/files/lockfile-0.12.2-pytest.patch b/dev-python/lockfile/files/lockfile-0.12.2-pytest.patch
new file mode 100644
index 000000000000..47362a4de6a0
--- /dev/null
+++ b/dev-python/lockfile/files/lockfile-0.12.2-pytest.patch
@@ -0,0 +1,20 @@
+diff -dup -r lockfile-0.12.2/test/compliancetest.py lockfile-0.12.2.new/test/compliancetest.py
+--- lockfile-0.12.2/test/compliancetest.py	2015-11-25 19:29:13.000000000 +0100
++++ lockfile-0.12.2.new/test/compliancetest.py	2022-05-27 07:55:43.720523461 +0200
+@@ -6,15 +6,13 @@ import lockfile
+ 
+ 
+ class ComplianceTest(object):
+-    def __init__(self):
+-        self.saved_class = lockfile.LockFile
+-
+     def _testfile(self):
+         """Return platform-appropriate file.  Helper for tests."""
+         import tempfile
+         return os.path.join(tempfile.gettempdir(), 'trash-%s' % os.getpid())
+ 
+     def setup(self):
++        self.saved_class = lockfile.LockFile
+         lockfile.LockFile = self.class_to_test
+ 
+     def teardown(self):
diff --git a/dev-python/lockfile/lockfile-0.12.2-r2.ebuild b/dev-python/lockfile/lockfile-0.12.2-r3.ebuild
index 1d9b54e15ac9..23f6213dad63 100644
--- a/dev-python/lockfile/lockfile-0.12.2-r2.ebuild
+++ b/dev-python/lockfile/lockfile-0.12.2-r3.ebuild
@@ -1,21 +1,31 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
 DESCRIPTION="Platform-independent file locking module"
-HOMEPAGE="https://launchpad.net/pylockfile https://pypi.org/project/lockfile/"
+HOMEPAGE="
+	https://launchpad.net/pylockfile/
+	https://pypi.org/project/lockfile/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
-BDEPEND=">dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+BDEPEND="
+	>dev-python/pbr-1.8[${PYTHON_USEDEP}]
+"
 
-distutils_enable_tests nose
+PATCHES=(
+	"${FILESDIR}"/${P}-pytest.patch
+)
+
+distutils_enable_tests pytest
 distutils_enable_sphinx doc/source --no-autodoc