gentoo resync : 12.05.2022

5 files changed, 31 insertions, 67 deletions

diff --git a/dev-python/pluggy/Manifest b/dev-python/pluggy/Manifest
index 4a30fe7ab2f6..0a87d4cfbc23 100644
--- a/dev-python/pluggy/Manifest
+++ b/dev-python/pluggy/Manifest
@@ -1,6 +1,4 @@
-AUX pluggy-0.12.0-strip-setuptools_scm.patch 1186 BLAKE2B 443f5af807826baaca7e956759e7ad7ba3e50c0b0955823ee40d4d95ee85c864bd144104dc2a39cea03aa29ef05f799aa28c14763b85ce3c696baaa9cb249c24 SHA512 031e021a9dfda5b64ef8fcd077cfd6373d2e47bb0d989cc31c59ade70e6d31336b7929dc2e55bd675753487b124f3acd3803f14d112080b67f7e2766c4594364
-DIST pluggy-0.13.1.tar.gz 57962 BLAKE2B aa0a3eec06c988a727bc15511313f12a08bde65da55bcc5e7547a654e3ca8a34c12dfa72166b6a37b524972730f08454b6a0446e071d2710396e868ae3a77151 SHA512 eb747ff341cedacbd90eb20e22ad3d1ddf5588056f14d069f56331f4141a15b7eccaee23ea196d2f4906964ddb77a79b156bbf3ef8c8083e9952c55d13d55f3e
 DIST pluggy-1.0.0.tar.gz 51510 BLAKE2B 8107df9a91a843166a602e7518dd1d4167304464a8cc80180b60b03a2ac803be9b1ba190df9189907addd34a92b93a6b271d3d6b7485aa563203ce733c6a656c SHA512 cf0bcbb4330c24ce473614befa19548f33fb39fa0ad094e1eae786202d7adadc28e16499f80ab96b630091765404ca5c5b6f9a55bc605e03514d8ab50cf9ae00
-EBUILD pluggy-0.13.1-r2.ebuild 622 BLAKE2B 6564f66c814307b59ff5a8a41c3617d112a8d01f7fca0beb4af8536793885567c6e9e34477f4c3ee9343ccf28073cc42f32be3ef686da2b7184c24664868030d SHA512 c4d04fa7b2eb5423a617b9568c8e010bda6f82e5c73b7b833ac7921bca1bb55255a132f90647127215a5516ed8ced271adf736e34244cabd0cc4d4c4b1148474
-EBUILD pluggy-1.0.0-r1.ebuild 704 BLAKE2B 15be5181aa83b842ff5caa1a19750b2c165b359d4def9937b8860f21d6a527fd7484650646df2e3f6c443b89229bc9f1f2beb4e2f8067e7d2240915a072d06a6 SHA512 5058258ee8db12c31ae9e5deee4492ecc80d52bc08c43f6d045c99b3723689fac1efb8cd8520618b127396d71c95dba5460fa5fa6fda4793352422296edfd575
+EBUILD pluggy-1.0.0-r1.ebuild 711 BLAKE2B 59dadba37be355f4f607b933392356569dd07198004100d4e50783259c5d173e1a8ce7cb57e3365643a01319033918d4e3bb01c45cd57c2a3b4f4edbbf08c4de SHA512 cfe3d66bb9e7ae7ca6caa1c6ceb4f1fd5bd4a6eb007aec62c2f197c9dd99460217f3a476b34e433d8c51cc2504903d200002dae6a6d648c572741e5ca8f7ca85
+EBUILD pluggy-1.0.0-r2.ebuild 759 BLAKE2B aa356f2325319afb6241f9265436f4b1f86cb1edba9d88865da34224ce49e18e6a21fb100a7be81ab03d6414c89cfd0241fafac0da6f850a6595b2cf26e3d20e SHA512 b9060c1fd5f77e16c6d1fcacd7c36ac375005f970c8f4d027d441622bfe911483c5ce04eca52c9cfef58f68b0722272d4c8ec09cfc9bd1570580b715e3922652
 MISC metadata.xml 506 BLAKE2B cdc1c868281f0140baf75a407eeea26276d7b8f8f0bcafee6393fa144fc054ecf58a812b055d7b48b7d5ab4aa5bc504d6dc567acf4336bb363c9854292d9926b SHA512 5fc4f019e2a518c815662db23bc44920558193cf639c093ec365ba120c113929bcbd9b611d6b2cb7e6057c0bd9d50dc5d1479840a6d379c4610b3ac8aa3ea1d3
diff --git a/dev-python/pluggy/files/pluggy-0.12.0-strip-setuptools_scm.patch b/dev-python/pluggy/files/pluggy-0.12.0-strip-setuptools_scm.patch
deleted file mode 100644
index 6de5905f1103..000000000000
--- a/dev-python/pluggy/files/pluggy-0.12.0-strip-setuptools_scm.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From dc8f1f4371f20ce0f635b46ab0976d6d76ca0c26 Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Thu, 25 Jul 2019 18:18:59 -0700
-Subject: [PATCH] strip setuptools_scm
-
----
- setup.py | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 0f26fa0..9194143 100644
---- a/setup.py
-+++ b/setup.py
-@@ -1,4 +1,5 @@
- from setuptools import setup
-+import os
- 
- classifiers = [
-     "Development Status :: 4 - Beta",
-@@ -23,14 +24,16 @@ with open("README.rst", "rb") as fd:
- with open("CHANGELOG.rst", "rb") as fd:
-     long_description += "\n\n" + fd.read().decode("utf-8")
- 
-+with open("src/pluggy/_version.py", 'wt') as fp:
-+    fp.write('version = "{}"'.format(os.environ['PV']))
-+
- 
- def main():
-     setup(
-         name="pluggy",
-         description="plugin and hook calling mechanisms for python",
-         long_description=long_description,
--        use_scm_version={"write_to": "src/pluggy/_version.py"},
--        setup_requires=["setuptools-scm"],
-+        version=os.environ['PV'],
-         license="MIT license",
-         platforms=["unix", "linux", "osx", "win32"],
-         author="Holger Krekel",
--- 
-2.22.0
-
diff --git a/dev-python/pluggy/pluggy-0.13.1-r2.ebuild b/dev-python/pluggy/pluggy-0.13.1-r2.ebuild
deleted file mode 100644
index 0c15916eaec1..000000000000
--- a/dev-python/pluggy/pluggy-0.13.1-r2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="plugin and hook calling mechanisms for python"
-HOMEPAGE="https://pluggy.readthedocs.io/ https://github.com/pytest-dev/pluggy https://pypi.org/project/pluggy/"
-SRC_URI="mirror://pypi/${P: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 ~x64-macos"
-
-PATCHES=( "${FILESDIR}/${PN}"-0.12.0-strip-setuptools_scm.patch )
-
-distutils_enable_tests pytest
diff --git a/dev-python/pluggy/pluggy-1.0.0-r1.ebuild b/dev-python/pluggy/pluggy-1.0.0-r1.ebuild
index 4b8d6bf69500..1777831a28b2 100644
--- a/dev-python/pluggy/pluggy-1.0.0-r1.ebuild
+++ b/dev-python/pluggy/pluggy-1.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P: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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
diff --git a/dev-python/pluggy/pluggy-1.0.0-r2.ebuild b/dev-python/pluggy/pluggy-1.0.0-r2.ebuild
new file mode 100644
index 000000000000..4ae4ade2545a
--- /dev/null
+++ b/dev-python/pluggy/pluggy-1.0.0-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Plugin and hook calling mechanisms for Python"
+HOMEPAGE="
+	https://pluggy.readthedocs.io/
+	https://github.com/pytest-dev/pluggy/
+	https://pypi.org/project/pluggy/
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest