commit: 5cf82d83f6fd99d6a5883d128c4dd3ccba9993b8 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Tue Dec 5 22:17:22 2017 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Tue Dec 5 22:17:57 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cf82d83
dev-python/appdirs: fix distutils patch Bug: https://bugs.gentoo.org/627724 Package-Manager: Portage-2.3.15, Repoman-2.3.6_p7 dev-python/appdirs/Manifest | 4 ++-- .../appdirs/files/appdirs-1.4.3-distutils.patch | 20 ++++++++++++++++---- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dev-python/appdirs/Manifest b/dev-python/appdirs/Manifest index 1675f4e5b51..876464b4267 100644 --- a/dev-python/appdirs/Manifest +++ b/dev-python/appdirs/Manifest @@ -1,2 +1,2 @@ -DIST appdirs-1.4.0.tar.gz 14358 SHA256 8fc245efb4387a4e3e0ac8ebcc704582df7d72ff6a42a53f5600bbb18fdaadc5 SHA512 a16fbad419e593acf1b58a3f8f893d206b3fc1a269757213a34d129e6fc39aa041efacb7964d326b82376373315357c93e85b272f374a096d9a63e73e3ce1dac WHIRLPOOL 0e12bf1875e489fbfb2ed48b125917bb6e176b90051a0afe2b64f431bbd1f5be499b7c0631302513387c440a05b2eb067fefaf54141424c260834cba854b7e6f -DIST appdirs-1.4.3.tar.gz 9641 SHA256 5ce44e43c3fd537ce1aaf72141c525aa67032a5af0a14dcf755621e69d72414b SHA512 787f551ef5af355bbc77ffb3059553fab77614cce466b4145e4b55fecb8553d329f8748865fd69005d13451a9b11229a65721095a122db83a8433a2661503dfc WHIRLPOOL 4e88de235789556a220134c9b6cc1741d6fb65070c62e278c94585e3adc464562e3dc259340a8147b33de417e9533b7bc40cc66eb558d04ec3b197f5a092980e +DIST appdirs-1.4.0.tar.gz 14358 BLAKE2B de0248d7ca8211a287bb76f516d5ae5d3b3ac0a5c3e2060fe0fbdf3fa9131e6ab26d0b0d293cdec4cf86f26e852fad7534eb44c386797d18964232fe85239bde SHA512 a16fbad419e593acf1b58a3f8f893d206b3fc1a269757213a34d129e6fc39aa041efacb7964d326b82376373315357c93e85b272f374a096d9a63e73e3ce1dac +DIST appdirs-1.4.3.tar.gz 9641 BLAKE2B edd7f6372e25279f6ba0f36cda595649cab7e69430e22bfdfd1bb5aa8d566a4a2fbf24c281adf80ab3eafea93f0f4f79b396688134395c3e5565476f24db75df SHA512 787f551ef5af355bbc77ffb3059553fab77614cce466b4145e4b55fecb8553d329f8748865fd69005d13451a9b11229a65721095a122db83a8433a2661503dfc diff --git a/dev-python/appdirs/files/appdirs-1.4.3-distutils.patch b/dev-python/appdirs/files/appdirs-1.4.3-distutils.patch index 11ce163d14c..e5245f255fe 100644 --- a/dev-python/appdirs/files/appdirs-1.4.3-distutils.patch +++ b/dev-python/appdirs/files/appdirs-1.4.3-distutils.patch @@ -1,9 +1,21 @@ Force setup.py to use distutils in order to break setuptools cyclic dependency. ---- appdirs-1.4.0/setup.py -+++ appdirs-1.4.0/setup.py -@@ -38,8 +38,6 @@ - Programming Language :: Python :: 3.2 +--- 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',
