python: massive setuptools fix for real now

2026-04-18 21:00:56 +02:00 · 2017-11-30 10:26:27 +08:00 · 2017-11-30 10:26:27 +08:00 · 1be6bff79e
commit 1be6bff79e
parent 60d5029e88
28 changed files with 68 additions and 63 deletions
--- a/dev-python/PTP/PTP-0.3.0.ebuild
+++ b/dev-python/PTP/PTP-0.3.0.ebuild
@ -16,8 +16,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""

-DEPEND=""
-RDEPEND="${DEPEND}"
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"

 src_prepare(){
 	rm -r tests/
--- a/dev-python/PyVirtualDisplay/Manifest
+++ b/dev-python/PyVirtualDisplay/Manifest
@ -1,2 +1 @@
 DIST PyVirtualDisplay-0.2.1.tar.gz 30785 SHA256 012883851a992f9c53f0dc6a512765a95cf241bdb734af79e6bdfef95c6e9982 SHA512 2ffb290a975e5520b44f9710ed5767a36b5e793c4e6c642e053c11fa8942b44bac1c2c9ef27ccb1a67bc50b73bb27a9ac77f001c699c3ce48ebe0dbdd6d44e52 WHIRLPOOL f962aef55fa2fcf245b2b581adc12ac0905f699de7abee78583e9304d5b873379200d2cce7951e5338f160dbddbb6f24c911ad4690f72d1605d81c48acd1996d
-DIST PyVirtualDisplay-0.2.tar.gz 29649 SHA256 8bf0827b04487b6b9ad8490b03254c03948ca7f23bb1de420637b2c09e59ed84 SHA512 f41f0acbb80b2901b1466ca1cf1098d6cfd6751d3f383a2484874c7a0a987736cb6b6d601be343df9f3f31594b491ba47bd2092677af10d15a3a4052c3094272 WHIRLPOOL 7a735f103f07bb6b341c065d2bb21e7415d2383addbf00559a850a0cf2001c9ecda1a9f95d950458309701f1f9d0fce188098eee65ec35e189efc677134a72ef
--- a/dev-python/PyVirtualDisplay/PyVirtualDisplay-0.2.1.ebuild
+++ b/dev-python/PyVirtualDisplay/PyVirtualDisplay-0.2.1.ebuild
@ -17,4 +17,5 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""

 DEPEND=""
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
--- a/dev-python/capstone-python/Manifest
+++ b/dev-python/capstone-python/Manifest
@ -1,3 +1,2 @@
 DIST capstone-4.0-alpha5.tar.gz 3263242 SHA256 003b21b00bcae8842002cc83da1f3277cf386202a3559849d7e9d52c6babc706 SHA512 c218f976ad0d26dc38553267695b9b196156d76f046330446b2ea66161215bb6bd79e086f29c023d01664e8f6371cc4d3a3413c246913381bf3de01a7a3b76c0 WHIRLPOOL 1b8cc5d8fa234d35daf522326cc3ea8177a3a3e35950a8666158f264970ea866a19a5b8245099846cebe6342afbb97ca80a5c708a7dea47fdb0a40f419a13ea9
 DIST capstone-python-3.0.4.tar.gz 2800818 SHA256 5d6dadf5864c56f8de66c66088fa68e849d0bff6577865a4f81b6f23112b14f2 SHA512 a5c29e7c559b5391d6a4ec9a7f766699ea6d321aa2f1fc57fdcec893107fa3ef2f5f6323629971c1129f1ca087df4f3ad03d0a8234d2eae368c8ccfec04dbf4d WHIRLPOOL 24aa002e215ee2a74c06a9be40218c78258a853028c74e1cdf95a5e2ea484471cf084cc8f5cc9db1aaefc16cf80a0b37480d4af60ca9119730334cbe2a02b906
-DIST capstone-python-4.0_alpha4.tar.gz 3239543 SHA256 d75d0a2b8e74a5fab0732d338ee743adef640e05fea75599a0073f7deec0b759 SHA512 72dba105ee602e1df0261a2408762eb97ddda63a967acf862a3bc33893b49b13b89b3ed23ca28ecfdb68528ed6ca5ca270a3a6f892a76b9bb8051843d8de254b WHIRLPOOL 7c3009deb0ac00e475e1c5fc2b43055f768b5bc67a92a4bb765d950226553378ebf94a619fdd5e42ccfa35f8ae78b42ec658cd532623cfb45e956f709eff4718
--- a/dev-python/capstone-python/capstone-python-3.0.4.ebuild
+++ b/dev-python/capstone-python/capstone-python-3.0.4.ebuild
@ -17,7 +17,8 @@ IUSE="cython"

 RDEPEND="cython? ( dev-python/cython
 	dev-libs/capstone[python] )"
-DEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"

 S=${WORKDIR}/${MY_P}/bindings/python

--- a/dev-python/capstone-python/capstone-python-4.0_alpha5-r1.ebuild
+++ b/dev-python/capstone-python/capstone-python-4.0_alpha5-r1.ebuild
@ -19,7 +19,8 @@ IUSE="cython"

 RDEPEND="cython? ( dev-python/cython
 	dev-libs/capstone[python] )"
-DEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"

 S=${WORKDIR}/${MY_P}/bindings/python

--- a/dev-python/construct/construct-2.8.10.ebuild
+++ b/dev-python/construct/construct-2.8.10.ebuild
@ -17,5 +17,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""

-DEPEND=""
-RDEPEND="${DEPEND}"
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
--- a/dev-python/esmre/esmre-0.3.1.ebuild
+++ b/dev-python/esmre/esmre-0.3.1.ebuild
@ -17,8 +17,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""

-DEPEND=""
-RDEPEND="${DEPEND}"
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"

 python_test() {
 	distutils_install_for_testing
--- a/dev-python/frida-python/frida-python-10.6.15.ebuild
+++ b/dev-python/frida-python/frida-python-10.6.15.ebuild
@ -18,8 +18,8 @@ KEYWORDS="~amd64 ~x86"

 S="${WORKDIR}/${MY_PN}-${PV}"

-DEPEND=""
 RDEPEND="dev-python/prompt_toolkit[${PYTHON_USEDEP}]
 	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-"
+	dev-python/pygments[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
--- a/dev-python/jsbeautifier/Manifest
+++ b/dev-python/jsbeautifier/Manifest
@ -1,3 +1,2 @@
 DIST jsbeautifier-1.6.14.tar.gz 55566 SHA256 50b2af556aa1da7283a6a92eaa699668312cb91f2ba6b78a4422b1d42af964a2 SHA512 a0f7c536f8756a9083c7a8fea8f4d5c566efe7df70112a47494384a6d2b46aa1b987ffe8edbe1848c4b3591d66275891debbf53fbaf71045c7e415fe524416b5 WHIRLPOOL b7160c14a16a95ab7779c4fdbca8d01f9bdbc560d94db70a559f3bd961061e4e38fad90db894c6a4513f11ac4abd2d67a09c8831dcc94707e4a9bb8727c424e1
-DIST jsbeautifier-1.7.3.tar.gz 56316 SHA256 0092fe4f5ee631faaaadb2990de611de5915d623d52059d26efd70066134e15e SHA512 eb385811028d32ee9d7594dcb31e56c06d0a72b8008b7a714193160e456a0a67b5fdebd83017d892e3422ac492d09ffbf982d36abb7059e337c499f160c10563 WHIRLPOOL 14c01c8bcb5c830798d905450e4dc8834e9669b1bf35e2fa7c851a482b1d3572fb03ba3764caf7aa1d96a5a326b603b20efea81335b395cd9907b8be372285cd
 DIST jsbeautifier-1.7.4.tar.gz 56428 SHA256 7fc14f279117a55a5e854602f6e8c1cb178c6d83f7cf75e2e9f50678fe11079e SHA512 2a0afae5fb7f0ef2d1baa9e6c6d84db1e182df50abdd585abfd7728573cba1dc4e875d23dc9a05ab79b846fe403e32a762d3a27f55ef56c3e0421b2a196c2cb6 WHIRLPOOL 473f5a9927a9c20c91b65866a90a650c98f1a47835b9b0b3bee8f0e7cae415b284faade2bc88b0441749d90844a1907ff1a20d87e35ca26ddbfa32a3719fd44e
--- a/dev-python/jsbeautifier/jsbeautifier-1.6.14.ebuild
+++ b/dev-python/jsbeautifier/jsbeautifier-1.6.14.ebuild
@ -16,8 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""

-DEPEND=""
-RDEPEND="${DEPEND}
-	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
-	>=dev-python/editorconfig-0.12.0[${PYTHON_USEDEP}]
-"
+RDEPEND="	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+	>=dev-python/editorconfig-0.12.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
--- a/dev-python/jsbeautifier/jsbeautifier-1.7.4.ebuild
+++ b/dev-python/jsbeautifier/jsbeautifier-1.7.4.ebuild
@ -16,8 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""

-DEPEND=""
-RDEPEND="${DEPEND}
-	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
-	>=dev-python/editorconfig-0.12.0[${PYTHON_USEDEP}]
-"
+RDEPEND=">=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+	>=dev-python/editorconfig-0.12.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
--- a/dev-python/nassl/Manifest
+++ b/dev-python/nassl/Manifest
@ -1,3 +1,2 @@
-DIST nassl-0.16.2.tar.gz 3665244 SHA256 93349d1037ab1c497efe7b684f221967211207b5ceaceaf331ef199e31618744 SHA512 6debfa753a0f904344eb10482378c39df8f1f1182bebeebc924963d1a5a5958a58f2d2f8892a5dc91f6920419e201b76860d7c417a27857ab53a837aeb4f764a WHIRLPOOL 81e5ff1459c5db262922e95f1a6697fdea4bef7e30fdd01f62a5d1ad401e47a545391ee0b915bbf93cc245160cd94a770d67dc268f3594b27bf0734be7cc4f01
 DIST nassl-0.16.3.tar.gz 3665258 SHA256 d70eca48f9bf1f04515eac1e1e9a2d95404d2676a1c2e2858165685cd93f3850 SHA512 85938edf4e8ecbf7edb0ef5d98cdee8a7f8b9aa465df3c135c33e7f4b2ad840fc922eb2b914ef6e16a6b1cabf741ce9f40b8d2dc7b2aa56776d777721292d4d2 WHIRLPOOL 20e400511af51ae0a60f2fb872b6ecc75074b673f68671a31086af8ca5b93b7ff090fc38b3aa5749d68f7bf8c030bb747f3db5b68c64834c35e6189ad807c4da
 DIST nassl-0.17.0.tar.gz 3665705 SHA256 a0db0046068239ae39a754d90251074c54a5c0bd4562b1dd798c75196a3ce3cd SHA512 bbcaacf9bbb1c7e6a4e41339736c510dd7f025771bf2024a593a0277e191f3b8b4092d8033ecb40de81296e49e5c51cefe4c845ed5cdbf416bfcaffe6b13e42d WHIRLPOOL 337cb3e1a582c9ab97cfd6120933a81b878cc1b68e84b1d4538da4d8fd102e4136d7545c484cdee5002e65d19f3f5fdf4b55987835c74be949ebd3087c0ea078
--- a/dev-python/nassl/nassl-0.16.3.ebuild
+++ b/dev-python/nassl/nassl-0.16.3.ebuild
@ -16,8 +16,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""

-DEPEND=""
 RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"

 src_compile() {
 	append-cflags -fno-strict-aliasing
--- a/dev-python/nassl/nassl-0.17.0.ebuild
+++ b/dev-python/nassl/nassl-0.17.0.ebuild
@ -16,8 +16,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""

-DEPEND=""
 RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"

 src_compile() {
 	append-cflags -fno-strict-aliasing
--- a/dev-python/pygtail/pygtail-0.7.0.ebuild
+++ b/dev-python/pygtail/pygtail-0.7.0.ebuild
@ -1,6 +1,5 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$

 EAPI=5

@ -8,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1

 DESCRIPTION="Reads log file lines that have not been read"
-HOMEPAGE="http://github.com/bgreenlee/pygtail"
+HOMEPAGE="https://github.com/bgreenlee/pygtail"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="GPL-2"
@ -16,5 +15,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""

-DEPEND=""
-RDEPEND="${DEPEND}"
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
--- a/dev-python/python-ntlm/python-ntlm-1.1.0.ebuild
+++ b/dev-python/python-ntlm/python-ntlm-1.1.0.ebuild
@ -18,7 +18,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE="example"

 DEPEND=""
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"

 src_install() {
 	python_foreach_impl distutils-r1_python_install || die
--- a/dev-python/python-owasp-zap-v2/python-owasp-zap-v2-0.0.9.ebuild
+++ b/dev-python/python-owasp-zap-v2/python-owasp-zap-v2-0.0.9.ebuild
@ -16,8 +16,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""

-DEPEND=""
-RDEPEND="${DEPEND}
-	net-proxy/zaproxy"
-
-#S=${WORKDIR}/${PN}-v2.4-${PV}
+RDEPEND="net-proxy/zaproxy"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
--- a/dev-python/python-registry/Manifest
+++ b/dev-python/python-registry/Manifest
@ -1,2 +1 @@
-DIST python-registry-1.0.4.tar.gz 13602 SHA256 1bb541204e0f6ae5ba0db1da925835925fb522f1ec43ed178c83a2cf0d8c9aec SHA512 995807920c7a5e676309169feefd39d5787e78f19a6c00ab9ddc58b1496accfb891accf399b107060b9f77c1d2b3f6e04ddeafa61609fe1df144773b43e3998f WHIRLPOOL 69317217efee312022e03c68144776cc9b10ee52520dc053c6d172a1876af68fec018645e24ffab8510362b57022733779f39afda30d699c9cecb156f8ac4434
 DIST python-registry-1.2.0.tar.gz 135451 SHA256 785f313e09cb84c45cabcb858a7ab337848c24148858eda24bfb3c82595cf147 SHA512 169a5cbcacae8d1ace26aadfebe97c0d5c34a1b1b5428ce93c67a0560be3560fc3728592f0f41b39f0e66cbe828da7a5b9121bc1a9f95f4ba4c3fdd210f52a10 WHIRLPOOL ffbc3c6dd2b15937dc407de56ca543a024b1e9daa80873d52a6e3beca88e5b0ab08a60656529b4f6b34be01d263c67f0e70949b5a33e0a57bf79ed23e9bf9784
--- a/dev-python/python-registry/python-registry-1.2.0.ebuild
+++ b/dev-python/python-registry/python-registry-1.2.0.ebuild
@ -17,6 +17,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""

-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-python/enum34"
+RDEPEND="dev-python/enum34"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
--- a/dev-python/ruamel-base/ruamel-base-1.0.0.ebuild
+++ b/dev-python/ruamel-base/ruamel-base-1.0.0.ebuild
@ -21,8 +21,9 @@ KEYWORDS="~amd64"
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

-DEPEND=""
 RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"

 S="${WORKDIR}/${MY_P}"

--- a/dev-python/ruamel-ordereddict/ruamel-ordereddict-0.4.9.ebuild
+++ b/dev-python/ruamel-ordereddict/ruamel-ordereddict-0.4.9.ebuild
@ -1,6 +1,5 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$

 EAPI=5

@ -21,5 +20,6 @@ IUSE=""

 S="${WORKDIR}/${MY_P}"

-DEPEND=""
-RDEPEND="${DEPEND}"
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
--- a/dev-python/simplesoapy/simplesoapy-1.5.1-r1.ebuild
+++ b/dev-python/simplesoapy/simplesoapy-1.5.1-r1.ebuild
@ -21,8 +21,8 @@ else
 	SRC_URI="https://github.com/xmikos/simplesoapy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi

-
-DEPEND=""
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-		net-wireless/soapysdr[python]
-		net-wireless/soapysdr[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	dev-python/numpy[${PYTHON_USEDEP}]
+	net-wireless/soapysdr[python]
+	net-wireless/soapysdr[${PYTHON_USEDEP}]"
--- a/dev-python/simplesoapy/simplesoapy-9999.ebuild
+++ b/dev-python/simplesoapy/simplesoapy-9999.ebuild
@ -21,8 +21,8 @@ else
 	SRC_URI="https://github.com/xmikos/simplesoapy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi

-
-DEPEND=""
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-		net-wireless/soapysdr[python]
-		net-wireless/soapysdr[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	dev-python/numpy[${PYTHON_USEDEP}]
+	net-wireless/soapysdr[python]
+	net-wireless/soapysdr[${PYTHON_USEDEP}]"
--- a/dev-python/simplespectral/simplespectral-1.0.0.ebuild
+++ b/dev-python/simplespectral/simplespectral-1.0.0.ebuild
@ -23,7 +23,8 @@ fi

 IUSE="faster +fastest"

-DEPEND=""
 RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
 		faster? ( sci-libs/scipy[${PYTHON_USEDEP}] )
 		fastest? ( dev-python/pyFFTW[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
--- a/dev-python/simplespectral/simplespectral-9999.ebuild
+++ b/dev-python/simplespectral/simplespectral-9999.ebuild
@ -23,7 +23,8 @@ fi

 IUSE="faster +fastest"

-DEPEND=""
 RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
 		faster? ( sci-libs/scipy[${PYTHON_USEDEP}] )
 		fastest? ( dev-python/pyFFTW[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
--- a/dev-python/stopit/stopit-1.1.1.ebuild
+++ b/dev-python/stopit/stopit-1.1.1.ebuild
@ -16,5 +16,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""

-DEPEND=""
-RDEPEND="${DEPEND}"
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
--- a/dev-python/tblib/tblib-1.2.0.ebuild
+++ b/dev-python/tblib/tblib-1.2.0.ebuild
@ -27,4 +27,5 @@ IUSE=""
 S="${WORKDIR}/python-${P}"

 DEPEND=""
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"