gentoo resync : 20.03.2022

4 files changed, 2 insertions, 56 deletions

diff --git a/dev-python/appdirs/Manifest b/dev-python/appdirs/Manifest
index faad6cfde64f..ea8918e717f1 100644
--- a/dev-python/appdirs/Manifest
+++ b/dev-python/appdirs/Manifest
@@ -1,5 +1,3 @@
-AUX appdirs-1.4.4-distutils.patch 700 BLAKE2B 8986f3b3da992b836b4cb1f0e212b91c2f82a714abf94080de0a48a3e5ea8ee5f23b88fca357d56a409b3a57f0cb08b4612d81931c665354a9225db57bdde07d SHA512 add351286f307ce49c340b92ddab731b5c675b32062107c4076002e7e1ec098f5bb541b1985fe6f1881620714446475419d5c7229ab371ffb683c37e00e91494
 DIST appdirs-1.4.4.tar.gz 9840 BLAKE2B cb9466f4a7f7c1d6f5b6d7ca031820ec4d3450afcaa8ba571e35387c3109ede4e2afbf2c1141a9d01d13798f55524d5efd3fa12546a9378abbda405353938d79 SHA512 4c0e1e8dcd3f91b8b2d215b3f1e2ffaa85137fe054d07d3a2d442b1419e3b44e96fdea1620bd000bd3f4744f71b71f07280094f073df0ff008fac902af614656
-EBUILD appdirs-1.4.4-r1.ebuild 805 BLAKE2B 9b8d782e983f714e038037e00a0159def227cd716d0d9b68644990b166a098e9443826071d56bf678e89ce5b21815c8fa6abf92a480f428a416dce1136059eaf SHA512 24a48524fd0dc5299d9cdc6933195975f649d8fdc35502faa72b74d8c4d50900d570593c1a83875745183724a8c4faf8b2be1b6348e56ede56cbabbb7b3b8892
-EBUILD appdirs-1.4.4-r2.ebuild 1155 BLAKE2B 6b24740c323512e8ca2e7c9ebde3f9eeb533a64b988a593a8846b991bae9ab497a3f7016f176995266a4a20ad787a3582028d55edf6a08254787b783a1e90178 SHA512 a9cb018bafb04174917c2ee2b30def61133c22d23d3865e05447893d9584f82f9ccbb10f17a111f8f7187aa8fd086e743df4432749b25acc44a3c60ebb9aeec3
+EBUILD appdirs-1.4.4-r2.ebuild 1147 BLAKE2B 0aab83e0435d1fcc569061ecb4831bcc39b9d830feb26c984ea17dc4df6cf9b2f9f340e51528721e58a36853a7a72c86cedf16ad79164c735158cfa54bd0ddd5 SHA512 83ced25e0d16919484ac1c6e0ec0bca3744b42e379fac76823ea3098c5c746e74c7a9dcda5054226e582e9fd1ae93bd6ad9dc654fb69817a3998ed3c065fd7ec
 MISC metadata.xml 616 BLAKE2B f7c2e8c06d7af1c1d9566581df4dd3063e8f2f3e3652fe67327fb3567cb9e74567118a02035edc93d7949708da4f4dff65c83c782ef27f591ff011647f7e13e6 SHA512 ad9e7e2937eaf911e68603134ca41f3cc724c3005d6ebcd420892456074364c916b32b914122015031a9c23f6caa1da99859eac01f5d84160509798676fa5fad
diff --git a/dev-python/appdirs/appdirs-1.4.4-r1.ebuild b/dev-python/appdirs/appdirs-1.4.4-r1.ebuild
deleted file mode 100644
index 40b01efb70d6..000000000000
--- a/dev-python/appdirs/appdirs-1.4.4-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# note the patch below
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Module for determining appropriate platform-specific dirs"
-HOMEPAGE="https://github.com/ActiveState/appdirs"
-SRC_URI="https://github.com/ActiveState/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.4.4-distutils.patch )
-
-python_test() {
-	"${PYTHON}" test/test_api.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/appdirs/appdirs-1.4.4-r2.ebuild b/dev-python/appdirs/appdirs-1.4.4-r2.ebuild
index c65226ccfc69..1add4b2268cf 100644
--- a/dev-python/appdirs/appdirs-1.4.4-r2.ebuild
+++ b/dev-python/appdirs/appdirs-1.4.4-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ActiveState/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 src_configure() {
 	[[ -e pyproject.toml ]] &&
diff --git a/dev-python/appdirs/files/appdirs-1.4.4-distutils.patch b/dev-python/appdirs/files/appdirs-1.4.4-distutils.patch
deleted file mode 100644
index 73b871889a0b..000000000000
--- a/dev-python/appdirs/files/appdirs-1.4.4-distutils.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 231643d6865c89f304990bb7f5dc9066f3daeb95 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 13 May 2020 08:50:29 +0200
-Subject: [PATCH] Install via distutils to break cyclic dep with setuptools
-
----
- setup.py | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 7c582f6..fdb8005 100644
---- a/setup.py
-+++ b/setup.py
-@@ -1,10 +1,7 @@
- #!/usr/bin/env python
- import os
- # appdirs is a dependency of setuptools, so allow installing without it.
--try:
--    from setuptools import setup
--except ImportError:
--    from distutils.core import setup
-+from distutils.core import setup
- import ast
- 
- 
--- 
-2.26.2
-