diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-12-06 18:23:20 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-12-06 18:23:20 +0000 |
| commit | d37b97a25b8b10f748eead6574b01f893f140b01 (patch) | |
| tree | 13e2a142a31cd193a39c63042a64cab29a1f7ae9 /dev-python/appdirs | |
| parent | a833e3f4a431b8eea751b7420e127787f9c92117 (diff) | |
gentoo resync : 06.12.2017
Diffstat (limited to 'dev-python/appdirs')
| -rw-r--r-- | dev-python/appdirs/Manifest | 8 | ||||
| -rw-r--r-- | dev-python/appdirs/appdirs-1.4.3.ebuild | 13 | ||||
| -rw-r--r-- | dev-python/appdirs/files/appdirs-1.4.3-distutils.patch | 20 |
3 files changed, 33 insertions, 8 deletions
diff --git a/dev-python/appdirs/Manifest b/dev-python/appdirs/Manifest index 430f45b469a8..cd4248f928f4 100644 --- a/dev-python/appdirs/Manifest +++ b/dev-python/appdirs/Manifest @@ -1,6 +1,6 @@ -AUX appdirs-1.4.3-distutils.patch 495 BLAKE2B b16c8b9876bb1b9c65813ff7d614e2167f0c44e14f737041341e54e3ccd59d489bb6717a038f88bc037664e197e40bf66082560a8577519d34fd323a922357ec SHA512 605a59544c6b9ca1ef5ddac524c3b699b667c9001b1e720af5b94740c1c5467dace55432b8d3524710a98a5861f638623fb8b6dfa4db8915ae06b21c8466eaee -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 +AUX appdirs-1.4.3-distutils.patch 782 BLAKE2B fcb1553424c0d22f4b60702ed7f771897cbb6e3f39078169bd1afe24a5c5825d629a286e620f5692414cd3f2aab9c38ae5ee20c2a18baee540ca685cc40a385e SHA512 e23630772b76f1a339ee74354f74f5d25d7c07a16db2b5ce307dbfd33f665c187aef86d7b7ec9e92bd43a3d8363fb40686d2bf49c10baa3b2825c8835e149905 +DIST appdirs-1.4.0.tar.gz 14358 BLAKE2B de0248d7ca8211a287bb76f516d5ae5d3b3ac0a5c3e2060fe0fbdf3fa9131e6ab26d0b0d293cdec4cf86f26e852fad7534eb44c386797d18964232fe85239bde SHA512 a16fbad419e593acf1b58a3f8f893d206b3fc1a269757213a34d129e6fc39aa041efacb7964d326b82376373315357c93e85b272f374a096d9a63e73e3ce1dac +DIST appdirs-1.4.3.tar.gz 9641 BLAKE2B edd7f6372e25279f6ba0f36cda595649cab7e69430e22bfdfd1bb5aa8d566a4a2fbf24c281adf80ab3eafea93f0f4f79b396688134395c3e5565476f24db75df SHA512 787f551ef5af355bbc77ffb3059553fab77614cce466b4145e4b55fecb8553d329f8748865fd69005d13451a9b11229a65721095a122db83a8433a2661503dfc EBUILD appdirs-1.4.0.ebuild 746 BLAKE2B f5d0a2b32c78382df027f26a8a9630e0b91d01a97053c733363f792e94a2e7b269e546aecc754cb45ca0bf8e6a7135cb734f5bdcfd90c89a552ba80b31c7f8ca SHA512 2c665d99c5767e12395d4e8f2efd65c5976c1e865d75d475e830cffb467d9be0d84b31004277d0967af57f1ade0bcd828c89087d6e48814ecbdffc9e81357408 -EBUILD appdirs-1.4.3.ebuild 783 BLAKE2B c4fe19b2437661b6b4e139ebb7c7c707359e856175c02399b76af2b86be1a3a7ef6846522c1df3ea885bc7cbfbb24a88924a97378d048acb2da9a7bf4ed4ffae SHA512 b4411e01521d035cc81fb4c7e8972b9d7ea5ce76e0d84cd89a9a957fdecc97f2f4a21e698ac36d1c868d404aa47a58467c74a8349cf8a82fa417d27ca3914b17 +EBUILD appdirs-1.4.3.ebuild 1178 BLAKE2B 0285e4e635e9252da8c0bd0b3c0718bd4c949213c764f1c33d573eff01476b5b076d47d89a5dc4b7f404027594ad39c4aa9de03afd6f49cdcf0e3778efb1e980 SHA512 7c51409b6a9279b50c298ba38672af0762ad9a16807e64c61b233c971b677ccb8e1279f900f22ecb8c41631b74700d07c984f1e58d5c479c65fd9bafe6191152 MISC metadata.xml 742 BLAKE2B 4731940c3aa6e3e0616487d4600c77f31712455aa70eff1bb900ec121cb062e45e1551206b86a5716b49f6163612096cb5ab9e3cf693af2d1fedaac023de29e6 SHA512 c1e35e090d6e3af99b8879a8a553c89989b149617857696fccecb4ea0435979f547049db2cdb7c505b50c20dc9f081233990f6fc0ee05de8ee27c7629292244e diff --git a/dev-python/appdirs/appdirs-1.4.3.ebuild b/dev-python/appdirs/appdirs-1.4.3.ebuild index b809f43510ff..4162f84ddb15 100644 --- a/dev-python/appdirs/appdirs-1.4.3.ebuild +++ b/dev-python/appdirs/appdirs-1.4.3.ebuild @@ -21,3 +21,16 @@ PATCHES=( "${FILESDIR}"/${PN}-1.4.3-distutils.patch ) python_test() { "${PYTHON}" test/test_api.py || 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/files/appdirs-1.4.3-distutils.patch b/dev-python/appdirs/files/appdirs-1.4.3-distutils.patch index 11ce163d14ca..e5245f255fef 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', |