gentoo resync : 21.08.2021

5 files changed, 7 insertions, 93 deletions

diff --git a/dev-python/flufl-lock/Manifest b/dev-python/flufl-lock/Manifest
index 59fac2ddd33e..fcb016b3e05f 100644
--- a/dev-python/flufl-lock/Manifest
+++ b/dev-python/flufl-lock/Manifest
@@ -1,10 +1,5 @@
-AUX flufl-lock-dontinstalltests.diff 554 BLAKE2B 4440739b038f1a73e035555028152c14ceca39ad42ddbd5457c839c154d12160fbd6d3da1c4f0e24977b9f2d0f117fd031e2f65599198172a61ea0f19a39b84e SHA512 e0a918f69563e5573fb245736ebf7557ad98e917cf9cac51d331fa7265a6a46f3b9b1fee0f14f66d0d8ffb8d4e5b57cbc4271f3b95362ce0029e36046138b578
-DIST flufl-lock-5.0.1.tar.gz 27788 BLAKE2B 2651898e881719f24bc61e14f697877ca39f2747fadf52de1a5fc917b26e23001df5f0a4ea2e48271da69198e1a1336e69cc0167a4f46fddd21f464b355fa4ca SHA512 f937fb6c7f7bef2b85674225f83f3162f34db3fe2df3d9a896f772c4489c3e0611361e3d1d9efda7727112d780f31022d3045d3a3b8e78e9412aca2f2418ca24
-DIST flufl.lock-5.0.4.tar.gz 29486 BLAKE2B 3fc6c3bfdac3c877c82f9f56e739342604be9f855a42a99bd06e5fb89fe8b3bc4cabd2e357e8e0992f7aa3f5ec7ea4a18e1f59a05beeeed7074a72440d3f6b9b SHA512 c08d8115c836f7523887d86539e9f11a2007913936fd8a4a116a610b648adf289fb086e8904b2163a6af7449e92a6edf9fad09fb770a34473768ffc4d8eb146e
-DIST flufl.lock-5.0.5.tar.gz 29537 BLAKE2B 978581adb55ce468ed2dd0f84978234a54293ee7cda4517dcdda2a2fc3507c965c419424f6a6bdc8cccbc15b14ebb739ff02e0c00d427f4f92afc31f913d0201 SHA512 11d0dde6addd34fd3812b346d851692addee49e7a65620acae87da791051f89638036a652645cb7fe34edd786afe3112bf5efb3fe4aa36760e2054622b0c1c8e
 DIST flufl.lock-5.1.tar.gz 29652 BLAKE2B c5b5bbfb284945d2232e8183084e4f9b24518962e2b8bf229bfd10d2e0629f0d248daf8cae544cbf50ec24c57ff2744c3cae4a4de756bdbd11fe51e810ac2eb6 SHA512 fbfc28e4e34e47b92a5b4e6d1771bf2b53ee052947d2f05d3392c3db156c5d14632ad63e0ac5b2934b8dc00176f6ff5b5fe1ff87358056ab9d71c2bb7f2c0498
-EBUILD flufl-lock-5.0.1.ebuild 818 BLAKE2B a44aed8dda606290e57056dde43ff5d00c944b9a4e7bc4319e7c42339e435a8d63ad2d5d617cb4c04370b67147ca0f6bcc8fa6129eeaea500c6df450859726b7 SHA512 6a82f7608a57ebdc7d3cf4e2c8fe3d744beae03a8e58785837b3ff790dc217c16588adfb47a6f1d9837bc99db9ebc771b4062e2d794c64a2b353bfb3645759b5
-EBUILD flufl-lock-5.0.4.ebuild 887 BLAKE2B 1a9d383d6234f7d16dde89e9232288c5a1d9b2989f33d23a1f77bfbc3362ac6ee565cf8c6a272b3aadc2a88fa3d46fca0b1affe6fcf09c1d7ec1aacda9012647 SHA512 cc93d16c153b5b45041dc786f5e407e478662e60e59068b25bc4713dd51e154a47cb58ce7175adf5dd8a2ad591f78147e764d5d779aed27f02988a2518efd626
-EBUILD flufl-lock-5.0.5.ebuild 887 BLAKE2B 1a9d383d6234f7d16dde89e9232288c5a1d9b2989f33d23a1f77bfbc3362ac6ee565cf8c6a272b3aadc2a88fa3d46fca0b1affe6fcf09c1d7ec1aacda9012647 SHA512 cc93d16c153b5b45041dc786f5e407e478662e60e59068b25bc4713dd51e154a47cb58ce7175adf5dd8a2ad591f78147e764d5d779aed27f02988a2518efd626
+DIST flufl.lock-6.0.tar.gz 30762 BLAKE2B 98e259f04aac565271e7918223c1bc8abd528f91fd04490a519b482c0d12bbf954f0c678f89d990bc036df5000fb5587e1689d6fc0cd499ed7fe806a1e3125f5 SHA512 cbd41f1dedb91fc120c3f3e20c15f25a39b0ce5b27a2c4fcedad301e91156d5291b35ff961c38a5a7d43c40fdfa2a879a2ba427f1b17994678fbba797e7a234b
 EBUILD flufl-lock-5.1.ebuild 887 BLAKE2B 1a9d383d6234f7d16dde89e9232288c5a1d9b2989f33d23a1f77bfbc3362ac6ee565cf8c6a272b3aadc2a88fa3d46fca0b1affe6fcf09c1d7ec1aacda9012647 SHA512 cc93d16c153b5b45041dc786f5e407e478662e60e59068b25bc4713dd51e154a47cb58ce7175adf5dd8a2ad591f78147e764d5d779aed27f02988a2518efd626
+EBUILD flufl-lock-6.0.ebuild 839 BLAKE2B ca8214c65942f8a86f48d95d6f80616183a538b3549702b9a09374c4a64ca23457f68d831ff3d792bc47dbc6a4c43b3c36a916fe213f36ee7b41b8ddbe64f268 SHA512 9a9e625c086c5ee9bec28a1a68a4a4fe86b74069ef4146feb910988f739d9e1950ff984a5fe77e6c962b3dd60acac2281c40dac53bc71e2cba45fe8fbcaef443
 MISC metadata.xml 406 BLAKE2B 292a253230d4c718cf487d4ef1d760ba4e4910af7742462e99263a28f74b8a83bd12832502c918f2630a3e8afe2a9eed348f0532535253610cebea49979c83f7 SHA512 5e3d8954a932195a7cde168d5d86eec59babe5214af33da08805f1c2cb463d4369d14d7ca59bc8e3247281a556863236eccc4e317833fb560c5ae7dee84596dd
diff --git a/dev-python/flufl-lock/files/flufl-lock-dontinstalltests.diff b/dev-python/flufl-lock/files/flufl-lock-dontinstalltests.diff
deleted file mode 100644
index 3cd5bfba99ed..000000000000
--- a/dev-python/flufl-lock/files/flufl-lock-dontinstalltests.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naurp a/setup.py b/setup.py
---- a/setup.py	2020-08-20 06:35:06.000000000 +0200
-+++ b/setup.py	2020-09-27 17:50:43.776476265 +0200
-@@ -24,7 +24,7 @@ setup(
-     keywords='locking locks lock',
-     url='https://flufllock.readthedocs.io',
-     download_url='https://pypi.python.org/pypi/flufl.lock',
--    packages=find_namespace_packages(where='.'),
-+    packages=find_namespace_packages(where='.', exclude=['tests', 'docs']),
-     namespace_packages=['flufl'],
-     include_package_data=True,
-     # readthedocs builds fail unless zip_safe is False.
diff --git a/dev-python/flufl-lock/flufl-lock-5.0.1.ebuild b/dev-python/flufl-lock/flufl-lock-5.0.1.ebuild
deleted file mode 100644
index 1342094e36fc..000000000000
--- a/dev-python/flufl-lock/flufl-lock-5.0.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="NFS-safe file locking with timeouts for POSIX systems."
-HOMEPAGE="https://gitlab.com/warsaw/flufl.lock"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/atpublic[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' python3_{6,7})"
-
-# See https://gitlab.com/warsaw/flufl.lock/-/issues/22
-PATCHES=( "${FILESDIR}/flufl-lock-dontinstalltests.diff" )
diff --git a/dev-python/flufl-lock/flufl-lock-5.0.5.ebuild b/dev-python/flufl-lock/flufl-lock-5.0.5.ebuild
deleted file mode 100644
index 57e4a8b7e444..000000000000
--- a/dev-python/flufl-lock/flufl-lock-5.0.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-MY_P=${P/-/.}
-DESCRIPTION="NFS-safe file locking with timeouts for POSIX systems"
-HOMEPAGE="https://gitlab.com/warsaw/flufl.lock"
-SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/atpublic[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' python3_7)"
-BDEPEND="
-	test? ( dev-python/sybil[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:--cov=flufl::' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/flufl-lock/flufl-lock-5.0.4.ebuild b/dev-python/flufl-lock/flufl-lock-6.0.ebuild
index 57e4a8b7e444..365c8d1b0d42 100644
--- a/dev-python/flufl-lock/flufl-lock-5.0.4.ebuild
+++ b/dev-python/flufl-lock/flufl-lock-6.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 MY_P=${P/-/.}
@@ -18,17 +18,15 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	dev-python/atpublic[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' python3_7)"
+	dev-python/psutil[${PYTHON_USEDEP}]"
 BDEPEND="
 	test? ( dev-python/sybil[${PYTHON_USEDEP}] )"
 
 distutils_enable_tests pytest
 
 src_prepare() {
-	sed -i -e 's:--cov=flufl::' setup.cfg || die
+	sed -i -e 's:--cov=flufl --cov-report=term --cov-report=xml::' \
+		setup.cfg || die
 	distutils-r1_src_prepare
 }