4 files changed, 2 insertions, 67 deletions
diff --git a/dev-python/appdirs/Manifest b/dev-python/appdirs/Manifest
index fc903583be65..3fa825a8cae1 100644
--- a/dev-python/appdirs/Manifest
+++ b/dev-python/appdirs/Manifest
@@ -1,7 +1,4 @@
-AUX appdirs-1.4.3-distutils.patch 782 BLAKE2B fcb1553424c0d22f4b60702ed7f771897cbb6e3f39078169bd1afe24a5c5825d629a286e620f5692414cd3f2aab9c38ae5ee20c2a18baee540ca685cc40a385e SHA512 e23630772b76f1a339ee74354f74f5d25d7c07a16db2b5ce307dbfd33f665c187aef86d7b7ec9e92bd43a3d8363fb40686d2bf49c10baa3b2825c8835e149905
 AUX appdirs-1.4.4-distutils.patch 700 BLAKE2B 8986f3b3da992b836b4cb1f0e212b91c2f82a714abf94080de0a48a3e5ea8ee5f23b88fca357d56a409b3a57f0cb08b4612d81931c665354a9225db57bdde07d SHA512 add351286f307ce49c340b92ddab731b5c675b32062107c4076002e7e1ec098f5bb541b1985fe6f1881620714446475419d5c7229ab371ffb683c37e00e91494
-DIST appdirs-1.4.3.tar.gz 9641 BLAKE2B edd7f6372e25279f6ba0f36cda595649cab7e69430e22bfdfd1bb5aa8d566a4a2fbf24c281adf80ab3eafea93f0f4f79b396688134395c3e5565476f24db75df SHA512 787f551ef5af355bbc77ffb3059553fab77614cce466b4145e4b55fecb8553d329f8748865fd69005d13451a9b11229a65721095a122db83a8433a2661503dfc
 DIST appdirs-1.4.4.tar.gz 9840 BLAKE2B cb9466f4a7f7c1d6f5b6d7ca031820ec4d3450afcaa8ba571e35387c3109ede4e2afbf2c1141a9d01d13798f55524d5efd3fa12546a9378abbda405353938d79 SHA512 4c0e1e8dcd3f91b8b2d215b3f1e2ffaa85137fe054d07d3a2d442b1419e3b44e96fdea1620bd000bd3f4744f71b71f07280094f073df0ff008fac902af614656
-EBUILD appdirs-1.4.3-r1.ebuild 1211 BLAKE2B 83c2bd72ecc3934923ac57911e3c05c7e706404602cda9afbbf3a685c27acda4e8871cc5b8c6937af6061d58b277a113e7a9a857edae0d26b8ccd10410be7e34 SHA512 7db1a40c67c797ff2a1910b786fda7eb02a3eede9eba8235bbd7f24c76b83b64a77b39ed8387bdcbffe831a61403b9fd556c92d858565513b9f9338ff1931aeb
-EBUILD appdirs-1.4.4.ebuild 829 BLAKE2B d0c0ffc9cbdd775fec3112930fe3879ef2d8cc8738fd7ade4ff0b51d8f6a9eb82c04dfdd47755b5bb974cdd2542ad7d525d657eee0b8db9a52f5db10c9fd0bb3 SHA512 9d528b92666bbc7d6a0ca9127f00f8d0148cb5f3c566878533b8bc7b69d5f3dd4b0f894b4ad1f988bcca4dbd7e060686174d98f4392900ad97606bb8e3467480
+EBUILD appdirs-1.4.4.ebuild 820 BLAKE2B 2a4d4a6f25af1e60db65424e8b34098a52b12e6e5754b163e96da178b759d1fc877791d5a70e0c9f5db0700232f0b04fc802639680bf361f6d3a11a115252d42 SHA512 7abc1a1e007ea54d80b89abda2ab7bbd2de24569f1200da2176b65fb6d72bbcce886a94886f3e99e73d29f792fc8a365660aa4fc7764c5c9bb394a0708f9755d
 MISC metadata.xml 615 BLAKE2B 25ecff1fc659fefee97a373a6c228a4d4609df375113f812f17935bb3d2fa32b79db79930e0458c5c9a3c738ed2c1bf1e999d1dc9d26243749b6401c5245849b SHA512 536fb34e9f8d5657941d883975c17ce95e177376b9434dd72a12b7e59ef126865cd696a0bef5d0d5f016514a216c3cca07b39377e66f87c9e3e706d9afb4cc33
diff --git a/dev-python/appdirs/appdirs-1.4.3-r1.ebuild b/dev-python/appdirs/appdirs-1.4.3-r1.ebuild
deleted file mode 100644
index fd8ec908ad0d..000000000000
--- a/dev-python/appdirs/appdirs-1.4.3-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 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=( python2_7 python3_{6,7,8} 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 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.4.3-distutils.patch )
-
-python_test() {
-	"${PYTHON}" test/test_api.py -v || die "Tests fail with ${EPYTHON}"
-}
-
-[[ ${PV} == 1.4.3 ]] || die "Please remove pkg_preinst from the ebuild"
-pkg_preinst() {
-	_remove_egg_info() {
-		local pyver="$("${PYTHON}" -c 'import sys; print(sys.version[:3])')"
-		local egginfo="${ROOT}$(python_get_sitedir)/${P}-py${pyver}.egg-info"
-		if [[ -d ${egginfo} ]]; then
-			einfo "Removing ${egginfo}"
-			rm -r "${egginfo}" || die
-		fi
-	}
-	python_foreach_impl _remove_egg_info
-}
diff --git a/dev-python/appdirs/appdirs-1.4.4.ebuild b/dev-python/appdirs/appdirs-1.4.4.ebuild
index 76734e15ac07..fff25cbf188f 100644
--- a/dev-python/appdirs/appdirs-1.4.4.ebuild
+++ b/dev-python/appdirs/appdirs-1.4.4.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 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 PATCHES=( "${FILESDIR}"/${PN}-1.4.4-distutils.patch )
 
diff --git a/dev-python/appdirs/files/appdirs-1.4.3-distutils.patch b/dev-python/appdirs/files/appdirs-1.4.3-distutils.patch
deleted file mode 100644
index e5245f255fef..000000000000
--- a/dev-python/appdirs/files/appdirs-1.4.3-distutils.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Force setup.py to use distutils in order to break setuptools cyclic dependency.
-
---- a/setup.py
-+++ b/setup.py
-@@ -3,10 +3,7 @@
- import os
- import os.path
- # 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 appdirs
- 
- tests_require = []
-@@ -45,8 +42,6 @@
-         Programming Language :: Python :: Implementation :: CPython
-         Topic :: Software Development :: Libraries :: Python Modules
-         """.split('\n') if c.strip()],
--    test_suite='test.test_api',
--    tests_require=tests_require,
-     keywords='application directory log cache user',
-     author='Trent Mick',
-     author_email='trentm@gmail.com',