gentoo resync : 22.01.2021

5 files changed, 2 insertions, 108 deletions

diff --git a/dev-python/setproctitle/Manifest b/dev-python/setproctitle/Manifest
index 735c24b11ce4..227dbd67e116 100644
--- a/dev-python/setproctitle/Manifest
+++ b/dev-python/setproctitle/Manifest
@@ -1,8 +1,3 @@
-AUX setproctitle-1.2-pypy3.patch 1614 BLAKE2B e3aa1709da8c46f4ac6f6b66e587c860e29b3fb0571c7a0d209bf16a1815711e13d48ac6562f6ed7189d3c3f4cd670d4346a8e5ac077cc6f2d0f3ade93d48e97 SHA512 6991a4b224d4f467e70a54bd83fc474e5df00a050627f195720ce2d95d230582cd0b2c49b792a83334f2439de1df757c4a51070c495c275e133698132e7d79c9
-DIST setproctitle-1.1.10.tar.gz 24042 BLAKE2B acd4ef33ab2a200b5d102fe5ceb78df03deeee47eb5a3c7b50f0a44e095953e5a4e2230278b6b4a5010472e4a5a18b81accbff0461e3a642be478b880d98114e SHA512 c976c5b86f59bc6d0f840f495b8256813169d3d7b9edae70207a24d62e1240bfec954fdc4f67b429ae124e3dc74efd7193404785643a52b2d57b55028bb3c533
 DIST setproctitle-1.2.1.tar.gz 23628 BLAKE2B a50f078a08d2828b03b3cde261af419f88e08045fc18230be017c642c2d4e1b4fb6809e1e2230160d46ba24ba893beb1f95f125b93e7d1b9aacd4ed333bfea7e SHA512 c11f756a61501c4126e6bba5d931a3fb26294d2a55255c717f0e3c3b72184841452195ddf04fb6e8b686d26caa36cb5e13fbd66c66c151c54981a9edc620da1e
-DIST setproctitle-1.2.tar.gz 23454 BLAKE2B 4a69566e48a2985ae8add0341feba26f062d8345dd773570e0500795e43b349777d4bf557bd8b88d9cec37850c129009823a1f87ed6261a9709e84c8a6f56868 SHA512 7dc84ac0fc028ca71e786622aa6b649961feb816e0f03a3d52ab7b1a5d7edc0c932695687f1f5487d27104535a3db0c48d12fd69859478a604dbf60c615f4e01
-EBUILD setproctitle-1.1.10-r1.ebuild 968 BLAKE2B 77f24f971b3d3e81616a438a7c70694851c50272aa445c8a64c6ad4e19436d824730fbc40698acbb65c3fb6ad4949ad23e5e129790b25f3ae84253bbd6e28b7c SHA512 49a54e7ec837fc286d3e208a9c2278036ea478d4ab39b96cf8e7d405e23262b02eaa1cd5c2b5ded4d247ee996696d30b6d4646ef21bbb1716b62e568d5236651
-EBUILD setproctitle-1.2.1.ebuild 578 BLAKE2B 4aed6ff8c401f80ce5eef1c362e3c536f3ba55e052d5d0f8d16ae0753a5767a4e5745df4c38c51c87e1ab8a0f5e55c5486ee0d428aaef085fb1c0cce1a6b5be1 SHA512 3f16b416ac3fa167ea2475fb70e01426c3bdf06983fbc57fda67d0498f07b15627405d4dcdaa43fa5285a9853460d71883dd8da32b286a19e912fb9822d33211
-EBUILD setproctitle-1.2.ebuild 623 BLAKE2B 63ef54d2da52913f6fa26edc2b92f552bade1104cb3b76bf077cd283d5ad36fa053e8d8e6249deb02351a9b7608c659fab0dd95ceff7619c1822f3eb6c515d09 SHA512 746730435c9c90d9a4a8a50af8e8f78d62c0a8edd87166de2ecc966f36cf53cc70f3cc0b6d1ef066249db325e7de8703519ea30ec8518a862e000022f5c61c01
+EBUILD setproctitle-1.2.1.ebuild 577 BLAKE2B 48b873cdfd97db025ece44c8b544dc4a854e5b20812cd344fb3a145d3b68f35aa05469ce52a85a8e629766d77398fa51fe2629eabc672abfdde06788f0eca5a0 SHA512 699e8f99bfc03fd8f14d5e040656485ada4cda2758b2d1bc8ea9c0ef74379815f5d2a5a013d473948bd8cefd5af4839f8d5f8ce28f45f49adb0b2dbe295e83a3
 MISC metadata.xml 380 BLAKE2B 136b22ffc942b2b6a6bcbd45ed3cebb105bf91a16014fa1fbc181a3a9055d132e03df3ffa63df79682f1e7369ee264f87ff32e8602a6478d170f4b20a230e9fe SHA512 eaca32091baa4a9fcd8ffbac6d250c135c0237552a7229aafc3cbb8bdf43450c114f26676964f80f73c2146b0b47934d77bdfdaf8411c069958bd898f69e8004
diff --git a/dev-python/setproctitle/files/setproctitle-1.2-pypy3.patch b/dev-python/setproctitle/files/setproctitle-1.2-pypy3.patch
deleted file mode 100644
index 01d4b0e4dd53..000000000000
--- a/dev-python/setproctitle/files/setproctitle-1.2-pypy3.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From b13b7254fa10b4ba461c03b0f1f03858a2368bdc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 25 Nov 2020 09:29:18 +0100
-Subject: [PATCH] Fix skipping embedded tests with pypy
-
-Fix skipping embedded tests by using the 'skipif' decorator.  The tests
-need to be skipped early, as otherwise they error out trying to
-initialize pyconfig fixture.
----
- tests/setproctitle_test.py | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/tests/setproctitle_test.py b/tests/setproctitle_test.py
-index 5d73733..7b679df 100644
---- a/tests/setproctitle_test.py
-+++ b/tests/setproctitle_test.py
-@@ -340,12 +340,10 @@ print(os.popen("ps -x -o pid,command 2> /dev/null").read())
- 
- 
- @pytest.mark.embedded
-+@pytest.mark.skipif(IS_PYPY, reason="skip test, pypy")
- def test_embedded(pyrun, spt_directory):
-     """Check the module works with embedded Python.
-     """
--    if IS_PYPY:
--        pytest.skip("skip test, pypy")
--
-     if not os.path.exists("/proc/%s/cmdline" % os.getpid()):
-         pytest.skip("known failure: '/proc/PID/cmdline' not available")
- 
-@@ -371,11 +369,9 @@ print(os.popen("ps -x -o pid,command 2> /dev/null").read())
- 
- 
- @pytest.mark.embedded
-+@pytest.mark.skipif(IS_PYPY, reason="skip test, pypy")
- def test_embedded_many_args(pyrun, spt_directory):
-     """Check more complex cmdlines are handled in embedded env too."""
--    if IS_PYPY:
--        pytest.skip("skip test, pypy")
--
-     if not os.path.exists("/proc/%s/cmdline" % os.getpid()):
-         pytest.skip("known failure: '/proc/PID/cmdline' not available")
- 
--- 
-2.29.2
-
diff --git a/dev-python/setproctitle/setproctitle-1.1.10-r1.ebuild b/dev-python/setproctitle/setproctitle-1.1.10-r1.ebuild
deleted file mode 100644
index 94e5e41b8029..000000000000
--- a/dev-python/setproctitle/setproctitle-1.1.10-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6..9} pypy3 )
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Allow customization of the process title"
-HOMEPAGE="https://github.com/dvarrazzo/py-setproctitle"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-python_configure_all() {
-	2to3 -w --no-diffs tests || die
-}
-
-python_test() {
-	if [[ ${EPYTHON} != pypy* ]]; then
-		# prepare executable for embedded interpreter test
-		# (skipped with pypy)
-		rm -f tests/pyrun3 || die
-		emake \
-			CC="$(tc-getCC)" \
-			PYINC="$(python_get_CFLAGS)" \
-			PYLIB="$(python_get_LIBS)" \
-			tests/pyrun3
-	fi
-
-	"${EPYTHON}" tests/setproctitle_test.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/setproctitle/setproctitle-1.2.1.ebuild b/dev-python/setproctitle/setproctitle-1.2.1.ebuild
index d7250117ebf7..1679b2619f35 100644
--- a/dev-python/setproctitle/setproctitle-1.2.1.ebuild
+++ b/dev-python/setproctitle/setproctitle-1.2.1.ebuild
@@ -12,6 +12,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~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 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 distutils_enable_tests pytest
diff --git a/dev-python/setproctitle/setproctitle-1.2.ebuild b/dev-python/setproctitle/setproctitle-1.2.ebuild
deleted file mode 100644
index 052603c65556..000000000000
--- a/dev-python/setproctitle/setproctitle-1.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6..9} pypy3 )
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Allow customization of the process title"
-HOMEPAGE="https://github.com/dvarrazzo/py-setproctitle"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-pypy3.patch
-)