summaryrefslogtreecommitdiff
path: root/dev-python
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-01-16 16:18:18 +0000
committerV3n3RiX <venerix@redcorelinux.org>2020-01-16 16:18:18 +0000
commit0704956f7256f1f618cc5e03af2c1dbd0e83dbc5 (patch)
tree881671532c0c3c82ebd4523b6d6cbc8ace982aae /dev-python
parent21435953e16cda318a82334ddbadb3b5c36d9ea7 (diff)
gentoo resync : 16.01.2020
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/Manifest.gzbin289064 -> 289081 bytes
-rw-r--r--dev-python/PySDL2/Manifest2
-rw-r--r--dev-python/PySDL2/PySDL2-0.9.6.ebuild2
-rw-r--r--dev-python/bcolz/Manifest2
-rw-r--r--dev-python/bcolz/bcolz-1.1.2.ebuild2
-rw-r--r--dev-python/cairocffi/Manifest2
-rw-r--r--dev-python/cairocffi/cairocffi-1.1.0.ebuild55
-rw-r--r--dev-python/cli_helpers/Manifest10
-rw-r--r--dev-python/cli_helpers/cli_helpers-0.2.0.ebuild21
-rw-r--r--dev-python/cli_helpers/cli_helpers-1.0.0.ebuild22
-rw-r--r--dev-python/cli_helpers/cli_helpers-1.0.1.ebuild23
-rw-r--r--dev-python/cli_helpers/cli_helpers-1.2.1.ebuild4
-rw-r--r--dev-python/cli_helpers/cli_helpers-9999.ebuild4
-rw-r--r--dev-python/emcee/Manifest2
-rw-r--r--dev-python/emcee/emcee-2.2.1.ebuild2
-rw-r--r--dev-python/fitsio/Manifest2
-rw-r--r--dev-python/fitsio/fitsio-0.9.11.ebuild2
-rw-r--r--dev-python/geoalchemy2/Manifest2
-rw-r--r--dev-python/geoalchemy2/geoalchemy2-0.3.ebuild2
-rw-r--r--dev-python/glymur/Manifest2
-rw-r--r--dev-python/glymur/glymur-0.8.10.ebuild2
-rw-r--r--dev-python/gnuplot-py/Manifest2
-rw-r--r--dev-python/gnuplot-py/gnuplot-py-1.8-r1.ebuild7
-rw-r--r--dev-python/gsd/Manifest2
-rw-r--r--dev-python/gsd/gsd-1.5.3-r1.ebuild2
-rw-r--r--dev-python/jplephem/Manifest2
-rw-r--r--dev-python/jplephem/jplephem-2.6.ebuild2
-rw-r--r--dev-python/milk/Manifest2
-rw-r--r--dev-python/milk/milk-0.6.1.ebuild8
-rw-r--r--dev-python/mpmath/Manifest3
-rw-r--r--dev-python/mpmath/files/mpmath-1.1.0.patch9
-rw-r--r--dev-python/mpmath/mpmath-1.1.0.ebuild2
-rw-r--r--dev-python/netcdf4-python/Manifest2
-rw-r--r--dev-python/netcdf4-python/netcdf4-python-1.2.2-r1.ebuild4
-rw-r--r--dev-python/numpy/Manifest2
-rw-r--r--dev-python/numpy/numpy-1.17.4-r1.ebuild2
-rw-r--r--dev-python/opt-einsum/Manifest2
-rw-r--r--dev-python/opt-einsum/opt-einsum-3.0.1.ebuild2
-rw-r--r--dev-python/owslib/Manifest4
-rw-r--r--dev-python/owslib/owslib-0.16.0-r1.ebuild2
-rw-r--r--dev-python/owslib/owslib-0.17.1.ebuild2
-rw-r--r--dev-python/paho-mqtt/Manifest3
-rw-r--r--dev-python/paho-mqtt/files/paho-mqtt-1.5.0-strip-test-dependency.patch31
-rw-r--r--dev-python/paho-mqtt/paho-mqtt-1.5.0.ebuild37
-rw-r--r--dev-python/pupynere/Manifest2
-rw-r--r--dev-python/pupynere/pupynere-1.0.15-r1.ebuild8
-rw-r--r--dev-python/pyFFTW/Manifest4
-rw-r--r--dev-python/pyFFTW/pyFFTW-0.11.1.ebuild2
-rw-r--r--dev-python/pyFFTW/pyFFTW-9999.ebuild2
-rw-r--r--dev-python/pyamg/Manifest2
-rw-r--r--dev-python/pyamg/pyamg-3.2.1-r1.ebuild2
-rw-r--r--dev-python/pyemf/Manifest2
-rw-r--r--dev-python/pyemf/pyemf-2.0.0.ebuild7
-rw-r--r--dev-python/pygtk/Manifest2
-rw-r--r--dev-python/pygtk/pygtk-2.24.0-r4.ebuild7
-rw-r--r--dev-python/pyilmbase/Manifest2
-rw-r--r--dev-python/pyilmbase/pyilmbase-2.3.0.ebuild9
-rw-r--r--dev-python/pyopencl/Manifest2
-rw-r--r--dev-python/pyopencl/pyopencl-2017.2.ebuild2
-rw-r--r--dev-python/pyproj/Manifest2
-rw-r--r--dev-python/pyproj/pyproj-1.9.5.1-r1.ebuild2
-rw-r--r--dev-python/pyqtgraph/Manifest2
-rw-r--r--dev-python/pyqtgraph/pyqtgraph-0.10.0-r1.ebuild2
-rw-r--r--dev-python/pytest-arraydiff/Manifest2
-rw-r--r--dev-python/pytest-arraydiff/pytest-arraydiff-0.1.ebuild2
-rw-r--r--dev-python/pytools/Manifest4
-rw-r--r--dev-python/pytools/pytools-2017.4-r1.ebuild2
-rw-r--r--dev-python/pytools/pytools-9999.ebuild2
-rw-r--r--dev-python/pyzbar/Manifest4
-rw-r--r--dev-python/pyzbar/pyzbar-0.1.5.ebuild2
-rw-r--r--dev-python/pyzbar/pyzbar-0.1.7.ebuild2
-rw-r--r--dev-python/root_numpy/Manifest4
-rw-r--r--dev-python/root_numpy/root_numpy-4.4.0.ebuild36
-rw-r--r--dev-python/root_numpy/root_numpy-4.7.3.ebuild4
-rw-r--r--dev-python/six/Manifest7
-rw-r--r--dev-python/six/files/1.10.0-no-setuptools.patch22
-rw-r--r--dev-python/six/six-1.10.0.ebuild66
-rw-r--r--dev-python/six/six-1.11.0.ebuild40
-rw-r--r--dev-python/six/six-1.14.0.ebuild20
-rw-r--r--dev-python/symengine/Manifest4
-rw-r--r--dev-python/symengine/symengine-0.3.0.ebuild2
-rw-r--r--dev-python/symengine/symengine-0.5.1.ebuild2
-rw-r--r--dev-python/sympy/Manifest8
-rw-r--r--dev-python/sympy/sympy-1.0-r1.ebuild29
-rw-r--r--dev-python/sympy/sympy-1.3.ebuild26
-rw-r--r--dev-python/sympy/sympy-1.5.1.ebuild26
-rw-r--r--dev-python/sympy/sympy-1.5.ebuild26
-rw-r--r--dev-python/tabulate/Manifest6
-rw-r--r--dev-python/tabulate/tabulate-0.8.1.ebuild2
-rw-r--r--dev-python/tabulate/tabulate-0.8.3.ebuild2
-rw-r--r--dev-python/tabulate/tabulate-0.8.6.ebuild2
-rw-r--r--dev-python/theano/Manifest4
-rw-r--r--dev-python/theano/theano-0.7.0.ebuild47
-rw-r--r--dev-python/theano/theano-1.0.4.ebuild12
-rw-r--r--dev-python/urwid/Manifest2
-rw-r--r--dev-python/urwid/urwid-2.1.0.ebuild35
-rw-r--r--dev-python/websockify/Manifest2
-rw-r--r--dev-python/websockify/websockify-0.8.0.ebuild2
-rw-r--r--dev-python/xcffib/Manifest2
-rw-r--r--dev-python/xcffib/xcffib-0.9.0.ebuild37
-rw-r--r--dev-python/xvfbwrapper/Manifest4
-rw-r--r--dev-python/xvfbwrapper/xvfbwrapper-0.2.8.ebuild28
-rw-r--r--dev-python/xvfbwrapper/xvfbwrapper-0.2.9.ebuild10
103 files changed, 362 insertions, 539 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index eea3ad00bd75..d243faa094c5 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
Binary files differ
diff --git a/dev-python/PySDL2/Manifest b/dev-python/PySDL2/Manifest
index 1d21109980a3..35e373cfba07 100644
--- a/dev-python/PySDL2/Manifest
+++ b/dev-python/PySDL2/Manifest
@@ -1,5 +1,5 @@
AUX PySDL2-0.9.6-0001-test-Always-allow-greater-patch-version-of-SDL2.patch 1812 BLAKE2B 7551d27fe1044d9a7bbe741fd70417f3f180d722915e53ff4374efc5575c70c8171cf4032d26e3b7703eb39e7da4998c6d867447a5338c76897ae84e598192ac SHA512 1a26d4db26b5fbc3c259c110825dbefa272e5c565928d041951438d1ed2012a67b3a06b2158b1c2a7c57685ab6e22363c3841e8bb3bf2e54ea21553b386c89cf
AUX PySDL2-0.9.6-0002-test-Handle-missing-haptic-support-gracefully.patch 950 BLAKE2B e4baf35535ff37a845ba65127d6e580d2c5086e60df0d03a6939b5fee7dac860475503b01644097d9af2a21209e25258524f0feacd45729574034095615ecaf3 SHA512 50b1785d02290ce9544743cea245e216f8cbbadaf9dfc0c865fadd21e1beea88a64d89a304bcfb72e8b2cc19a961fba3c23de028b7caf7e16739f9665dd9aa1a
DIST PySDL2-0.9.6.tar.gz 1048158 BLAKE2B 70a450990dd73169489af2d5b218eea0794c9f75948d774680df4b4423855318ddc6d16a0453f62361d4f0b81e872edc067235c4f946476ea8988e16cd0de44c SHA512 676b1b3381b614122442c70fe4cbd7c210ef3d8695c2babd37938e67b5cfeb2f8acbdcb914c5f68aceb549d89f7a77bdc80c7406b340b0e38c22543df8d46739
-EBUILD PySDL2-0.9.6.ebuild 1883 BLAKE2B b260261475023760a09a4f075bf19ab1ce7a44fbe89ec089b1b20b0488cf6cd94831d6eb608d6cfacac3f182a5fccfb82e99f0aca3ce2f2790982e0f4ff01f04 SHA512 ed051cd2b7c4d3986611ac53e93d1ac7bbf03243d2669664a0965b01bf78e95f3ce2b0312285a7cbf60c36b257f4341e6533cd99a22097d97c620206a52baeda
+EBUILD PySDL2-0.9.6.ebuild 1877 BLAKE2B 2beba0595df8857804aff5a322c2d51f6e7cd0d96f87333f9dbf6305bba800fbdfe84ef42c2e0f7e9c0fbf7b2496484aa56b12fb640e50a18963d3b0c7bd3a55 SHA512 fbed19c6eea9d94c3b7128d3200fab822164cdd7cd8da7cfdf7892174565aec65509868e697a7cebf4a75a18779716ac8660bacf3f9a903b09e9a3b55ea076d1
MISC metadata.xml 451 BLAKE2B 2bc91faee3235d8d971aaba13051362ffe22563c5bc5a33a4dcaa0fa59abb7f238310d271a5311c98d4f69b112f731e11d1c8c49fa1a1d2bed1a5acf36c905f5 SHA512 50ba020088e640ca59a7ab64e30ff760b4708866ebc54b91fa2a12e4408463ebb0b04cfe990113bb7f556cbe8a4fc369fe86e3da4ec5b79a76752868cd08a62c
diff --git a/dev-python/PySDL2/PySDL2-0.9.6.ebuild b/dev-python/PySDL2/PySDL2-0.9.6.ebuild
index 53b5ea93671d..025e430c1d6b 100644
--- a/dev-python/PySDL2/PySDL2-0.9.6.ebuild
+++ b/dev-python/PySDL2/PySDL2-0.9.6.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
inherit distutils-r1
DESCRIPTION="Python (ctypes) bindings for SDL2 libraries"
diff --git a/dev-python/bcolz/Manifest b/dev-python/bcolz/Manifest
index 18de4c022660..532d47a6ef3f 100644
--- a/dev-python/bcolz/Manifest
+++ b/dev-python/bcolz/Manifest
@@ -1,3 +1,3 @@
DIST bcolz-1.1.2.tar.gz 1271418 BLAKE2B 322a755ce3a744d14e185a2a242cd9c2326033404f15a8bef789d0f9cb961a63ad12aa28860c0f62577cc61091983e17e043deafe7c2ca78f0ab2c620da2e395 SHA512 cc0149b5a8a0ded7653c4f1e2232fbf8501027538a3e5d8de4be0eed096e17e7d3845f19cb687a533a4c385b31f5a5262fe140a27ac63b434b57667ec5a55e66
-EBUILD bcolz-1.1.2.ebuild 1156 BLAKE2B 30db7ecb1a2a8bcf64e919e35bec9d8cbff0c72e2891ab0ee7b58bc7df271c4d1184cd3d2eba489c3458b4362b05b0159f7466b79510c0d200ee8b3ad31e50fd SHA512 1b8590283aea9a70c466d931752387e6dd7245abf2a89c1d38450f83d3211b0fb59893962bcd670f3d12a96302a231b914847d83918f88ef894f9384dd534d12
+EBUILD bcolz-1.1.2.ebuild 1150 BLAKE2B 23061489d47523e22cd86391babb7736f55092ed5a225f78b99a8c60303b135fa1f509e2c1d7bca085e926f07335371c24d0afda894f1892efaf0dbaf5f23bf8 SHA512 73367a1d908aff8db16ed2dc487d963e7b71733e62e5e3c0d75f0820f656b08c39f43f8b96560e5ee2d769dc0384007a80108a6f930f6ad4ad97ff8ebff38ba0
MISC metadata.xml 853 BLAKE2B 65ce8db96ca80674e08d006cc5b986cd88868f0b3ae4581cf4cc5e785062de60fb6990c286006e3386443dcee4b1890bf973790ff38a3344e2fa01eef1567440 SHA512 65bee839731be99ae673f86f4d5b791bc115cd5b65f3fbfc79c7e2df35dc08af59bb2fad4ab3b9ee2588582644b10153f2d932d2c292ab0e1fb0db92d88a631a
diff --git a/dev-python/bcolz/bcolz-1.1.2.ebuild b/dev-python/bcolz/bcolz-1.1.2.ebuild
index 747e3936031c..bebcea6b5c50 100644
--- a/dev-python/bcolz/bcolz-1.1.2.ebuild
+++ b/dev-python/bcolz/bcolz-1.1.2.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
inherit distutils-r1
diff --git a/dev-python/cairocffi/Manifest b/dev-python/cairocffi/Manifest
index 0c1aaa964172..7701e4236d4d 100644
--- a/dev-python/cairocffi/Manifest
+++ b/dev-python/cairocffi/Manifest
@@ -3,7 +3,9 @@ AUX cairocffi-1.0.2-test-deps.patch 671 BLAKE2B 489b14e3e9847f28c53211aedc9b3ef4
DIST cairocffi-0.8.0.tar.gz 79217 BLAKE2B fefcee32e486c150d089b7d13b046c864b83fcc184f7880e86cfae0afc22c1e712ad7e835d76506b4ab0cefab6629abcc5bd86cd95c417dcc64c9374a8629110 SHA512 70179e05ca4a4efeaa39ade1ee1a96d280d198ecff5ae8c8fc634c24d8922ea6a3e1eb6cf5f55c5fc9d3f5b2fc3131a53051690eb86712762d8b6400df8a630a
DIST cairocffi-0.9.0.tar.gz 84652 BLAKE2B 9f09c038619b0f44c568d6636861b0e12ffd7e9ab546f3a65bbd8e77eee7ff5f0c6f4d92a841696492b786d0067af86e25949b723ef6ef73ede370fbf2576d6d SHA512 0d3d54e0d54b3696c8336d8b3a6d745628da51d9d9f8c50f36006c007e1432a95dd9bafd8d865923059d040cc4e9f7989b3670a5318383b357ffc979eeb920d5
DIST cairocffi-1.0.2.tar.gz 68537 BLAKE2B ddaf20e0d878126c86b03aa87663391fad37386b8d2dae790e26c20b9050cd3bc36783a32a5c8ee99f64acb232701316bd8308be7327ce406cd49de4df3f92dc SHA512 0ae63be9d6ca4591d806e259ecb385086b053739de2e5098541078d4c142dd100b593a7712d5410a92ed7dbf6e9a7f7a5287f00425cd8d54ada421dae0cfd762
+DIST cairocffi-1.1.0.tar.gz 68744 BLAKE2B 604812572bb1a39ab52e41e03714acc93ddc7532e07ac36b693f53ad71cf0bcfd5d2f3bceb56b8e352fe7f179b174a244238b9cfcee690cbc0cb96e5b2934c75 SHA512 a9bc9ec5be767388aad9d06cc3b386b474dbacf097d3558b4033834cfb2f5418eede2f4b4080bec7e4725c6821f6e54d6c3366e8c4ee73bd3fa1cf444b395197
EBUILD cairocffi-0.8.0-r1.ebuild 1142 BLAKE2B 4d5aeaf534b104e6869e25d24de9ec10df350d5fc27b0cfd624d8e1e7bf9399839bdcd63958404b27592bdf71468a534760b51fdf8273135913378c5985f04c2 SHA512 fcb08dc478ef62f2e0fb748fdb4e950f4465eb4f9ba0f0e3bd789f1d95b03f2b93a7d47cbf8ed7f15d78527959c39bf6ffbdd84271b6bdcae18c4c43d79316d8
EBUILD cairocffi-0.9.0-r1.ebuild 1114 BLAKE2B aa6c295b033d43ccd66033ada4b767998794b32031088d7d386b1195b4da9af3d1979a5b0b4b6141d8147651f5a38948afd08ae7dc200a5d237859578cb16908 SHA512 64a5b85a396b094f3130fb81f963aea74b18ec357071c485c09b853cb35e62f10ce2b8c23b2a9cb6e683a6a02636978746a9cdb046d3f85fc8a670c360f5d972
EBUILD cairocffi-1.0.2-r1.ebuild 1180 BLAKE2B f87b6cbfd6d2d8ed340fffda39910fc9caf648626665f632f3bdb3560908cfa3fc5c366ddaa1768d36e1edb10565aa29eb851315e631d7e18a25368539ec0ac6 SHA512 f2deea39b685b62b64496a17bfc3f9a8a0a2f208cc03737fc2325fb1dfc08d892fcc11cd192d021e86ec7eae1a5b8c950da63c4ff31c2f3cc13dd2c6ccf047df
+EBUILD cairocffi-1.1.0.ebuild 1190 BLAKE2B 0ed567265cd1633193d8c432a41921e36d3c86c68b493f58755ebc7563311e4e743b3ba1c14b9d2d4f5231c2fbb099c38caa931133e9b97112e605fa4d2ae35b SHA512 f8a7fa584515df2a02b30444b1a5f4cdef8569a79aacdb14892a8762fedee5cfc1f784751ffc95d3dcdd172ec1209ec7bac01092f1c12b159f3df9af295a3402
MISC metadata.xml 379 BLAKE2B 75baee69a9fff6d3c571bded0b1e6cfd8abbdfae7262faa2215fb3251ace498c33119ebe3bf74e4e4e0b2d1ba620b9bc60d4daf244917098e17c62af24d4b401 SHA512 b0bdbb3b144675f9e90a0421c694e0f0a782dbf315dd8203574bea69b9389d49d377797a28d9d86588d062e15071c1fe226dd4166a4fbf8e95a852d46cc20215
diff --git a/dev-python/cairocffi/cairocffi-1.1.0.ebuild b/dev-python/cairocffi/cairocffi-1.1.0.ebuild
new file mode 100644
index 000000000000..859430eb4f98
--- /dev/null
+++ b/dev-python/cairocffi/cairocffi-1.1.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1 virtualx
+
+MY_PN="${PN}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="CFFI-based drop-in replacement for Pycairo"
+HOMEPAGE="https://github.com/Kozea/cairocffi"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ $(python_gen_cond_dep '>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]' 'python*')
+ >=dev-python/xcffib-0.3.2[${PYTHON_USEDEP}]
+ x11-libs/cairo:0=[X,xcb(+)]
+ x11-libs/gdk-pixbuf[jpeg]"
+
+BDEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? (
+ ${RDEPEND}
+ dev-python/pytest[${PYTHON_USEDEP}]
+ )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.8.0-tests.patch
+ "${FILESDIR}"/${PN}-1.0.2-test-deps.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+ use doc && esetup.py build_sphinx
+}
+
+python_test() {
+ virtx py.test -v --pyargs cairocffi
+}
+
+python_install_all() {
+ use doc && HTML_DOCS=( docs/_build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/cli_helpers/Manifest b/dev-python/cli_helpers/Manifest
index bc545e651ba9..3450bd86bf1b 100644
--- a/dev-python/cli_helpers/Manifest
+++ b/dev-python/cli_helpers/Manifest
@@ -1,10 +1,4 @@
-DIST cli_helpers-0.2.0.tar.gz 33855 BLAKE2B 8509fd6ea4ce1af77a522d36f98261a019d6b4b7250549af8014c4aba01bc4f4a63106c55b3d5ce40f058f0927db4044af51c7f948879d44a452b35369df8f2b SHA512 7dfa9791f472ccba3d49d0e87daf859257e74349cfbd8920a624f3e8d6905d8c8b7fa7be70eda97091963e548fa16dfbb1171e198cbbaa9d7810bff2321ebe54
-DIST cli_helpers-1.0.0.tar.gz 23269 BLAKE2B 2de1729b32a690d5832cc956c30bdf3ec35b3bfa94d1eed391dc18a1aadfd7229a1cbb4368a08406a3c6bf2bf59c835ac975bee797a58dbb3121c34586632d1f SHA512 8137b081cfe3d226c63cc7c17165f884a42147ea184d11a1e0ee5805f2d22bce37ded580a0c15566bcb057df4c39f2685595d74b2e21d46932e2e635f77eec68
-DIST cli_helpers-1.0.1.tar.gz 23382 BLAKE2B 544bf4165315a6459ba203efc7f55e3a48d4af8a12a4a3dcd4742c9e8f9d72c9163784e4adc42f5910d5ffd42d957aca47f4765e01cc9fc8c17649494b0396c4 SHA512 f4999f20d7f785a143d672ea9e62375dc6cb1abf093796dedcc01003970931a397096cded3515d060b47aa8e38b2a03fbe12f919f84451365d078126a5b35021
DIST cli_helpers-1.2.1.tar.gz 31104 BLAKE2B ded2b9b7825ddaeb33acf64b65362251f773a4a0a74aec1c79bdd8ef77f8f6953dd8761fd926f7a2b210c69534bee220f88e816dd63277b27db15b400510c9f3 SHA512 299fa4984b7c76e6be0527f040582242a746938f8725b6193895f9bbb835c82078658bbb8d1ea0000c26f3c8d2dad93139fd600e7c8d7c2d89777de27a5b26cf
-EBUILD cli_helpers-0.2.0.ebuild 542 BLAKE2B a9a466cd7bfdd03ebecd888beee779e447e8fd2852cedb52ee31125ea4c3435ecea5f3f3e3469c300d1780e017e12644e132c61b203bda84a2d00c6a3de586ae SHA512 380feddc8e658a96edc583f1d3a364fde74753588ef5aa60ace48677c5335923387c4c999804a43d1708a3defe24e6376fb1d7b7b536e5778c10f71127123036
-EBUILD cli_helpers-1.0.0.ebuild 597 BLAKE2B 1ddd10a6041fed0e2b9492a38d68d0a0dc1e0f47106e8b99dc53c36483785d23d490f2a8809e6eb2dafe1a7faec7bfdd725081891e9773da3c622971883d40ec SHA512 d7927852c04fbb126da6419bd6141d5ec24ec81ff7a54e9eddb289f73ce89a0f1d24844e0688a10582321398c74712dd7d0be1bcfd65065a8abafc3139499445
-EBUILD cli_helpers-1.0.1.ebuild 647 BLAKE2B fb010b9e85a9ef2c2fc826a6d2a0312bb1aa8b85299c8342179fdba513fed1568cf03b7205099a78b88e1bab55b8c2c5e5adf6a78896d38c56d145a24b38bd9c SHA512 7e473772892c34f254d8e025ea164e00b7612edd0b9e729975cf7252d9c849eb0bb6a1a5a809eea18b88c930ef2eb748c4396543a349271f789e1369e6d7462b
-EBUILD cli_helpers-1.2.1.ebuild 969 BLAKE2B 8d49945ce303a7c140f9221d47f185eccaa3c09e20cf0b43c949b307b2cfb7a3725451ac6c32626081b4189574fe74b7a0f2dc737a21133c673ee79803d5510e SHA512 e0bacbe86e0c88eab00b12145e062010cd468b8742c806e40b0c3617cd2b77769929b057f8c39b427bb135856b732afe34fe576b972afd4b587655e9223d776e
-EBUILD cli_helpers-9999.ebuild 957 BLAKE2B 7f3e1697e8337701012ef6b3335a3b1e2590c99f7b55ffb5b80fbfcaaeb39de64d8aedad03279948fc9141e3dc4b53a101d75c46fd5a3929194b2d6a66cd54f2 SHA512 961f7d90050be16cb546d89a91f2d18d6bf19a84707091cbf755c9208dc331faad8cc4206372f0adaa67c1aeb5b3678061a7a44c3eeaa78dad03be2b71073759
+EBUILD cli_helpers-1.2.1.ebuild 964 BLAKE2B e8dd698cf0c26f98224233bdcf5ae6902f81c5f91e7aa7d6eb7419db270550a5435a64ce45d4990167de9a8283b803bab5630c031ebf5ade0edc4ab5f325e800 SHA512 74c87c706af1d22d6e1387c9cf0894750456ef56ddbc1d6fb99a543e578d9bff41bc8f6e41eaa6c46c52b0b5e14d2fc155d51a6443e6b23b5da9fa2c3d9121b5
+EBUILD cli_helpers-9999.ebuild 952 BLAKE2B 2a01aec4812baa4d323034caf8f90ada0a08377806feb1f054bab67ac3593dc6894071ba32762ce5965ec34709a3befc809fe56a983daa4c4aba9c88d70353b7 SHA512 679659873c689412d61ac6f4ed1c943240e9c5a0c27a77889ad00e5f6964b615445d1d5c2ca425aee19185c26836905943d88971df9fb51250de5085241163db
MISC metadata.xml 407 BLAKE2B a1128f59da6b44295f47017d6c08b582d58b51b551e4ec866ca0b40778c4353f9c633fbbd3423df0d89b7c85f81caece2fa3a9ce40be2fbf4231961dde1aaf92 SHA512 19d20ea5cc6006d8b35576e7d68167b797eb677cbd62a150f82ac6738ae43d658d9461ae3ed0499b259812ab7b1e4aeb30348436c25fd96e95cc75667fad803c
diff --git a/dev-python/cli_helpers/cli_helpers-0.2.0.ebuild b/dev-python/cli_helpers/cli_helpers-0.2.0.ebuild
deleted file mode 100644
index dc30a060f6a5..000000000000
--- a/dev-python/cli_helpers/cli_helpers-0.2.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-inherit distutils-r1
-
-DESCRIPTION="Python helpers for common CLI tasks"
-
-HOMEPAGE="http://cli-helpers.rtfd.io/"
-SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
- dev-python/terminaltables[${PYTHON_USEDEP}]
- >=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/cli_helpers/cli_helpers-1.0.0.ebuild b/dev-python/cli_helpers/cli_helpers-1.0.0.ebuild
deleted file mode 100644
index b0424fb4e6d2..000000000000
--- a/dev-python/cli_helpers/cli_helpers-1.0.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-inherit distutils-r1
-
-DESCRIPTION="Python helpers for common CLI tasks"
-
-HOMEPAGE="http://cli-helpers.rtfd.io/"
-SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
- >=dev-python/tabulate-0.8.0[${PYTHON_USEDEP}]
- >=dev-python/terminaltables-3.0.0[${PYTHON_USEDEP}]
- >=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/cli_helpers/cli_helpers-1.0.1.ebuild b/dev-python/cli_helpers/cli_helpers-1.0.1.ebuild
deleted file mode 100644
index b9152ddd69f8..000000000000
--- a/dev-python/cli_helpers/cli_helpers-1.0.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-inherit distutils-r1
-
-DESCRIPTION="Python helpers for common CLI tasks"
-
-HOMEPAGE="http://cli-helpers.rtfd.io/"
-SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
- >=dev-python/backports-csv-1.0[${PYTHON_USEDEP}]
- >=dev-python/tabulate-0.8.0[${PYTHON_USEDEP}]
- >=dev-python/terminaltables-3.0.0[${PYTHON_USEDEP}]
- >=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/cli_helpers/cli_helpers-1.2.1.ebuild b/dev-python/cli_helpers/cli_helpers-1.2.1.ebuild
index 797b09c21cdf..f6b73337bb9b 100644
--- a/dev-python/cli_helpers/cli_helpers-1.2.1.ebuild
+++ b/dev-python/cli_helpers/cli_helpers-1.2.1.ebuild
@@ -3,11 +3,11 @@
EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
inherit distutils-r1
DESCRIPTION="Python helpers for common CLI tasks"
-HOMEPAGE="http://cli-helpers.rtfd.io/"
+HOMEPAGE="https://cli-helpers.rtfd.io/"
SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/cli_helpers/cli_helpers-9999.ebuild b/dev-python/cli_helpers/cli_helpers-9999.ebuild
index f90a664aa824..7d5022a9d7df 100644
--- a/dev-python/cli_helpers/cli_helpers-9999.ebuild
+++ b/dev-python/cli_helpers/cli_helpers-9999.ebuild
@@ -3,12 +3,12 @@
EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
EGIT_REPO_URI="https://github.com/dbcli/${PN}.git"
inherit distutils-r1 git-r3
DESCRIPTION="Python helpers for common CLI tasks"
-HOMEPAGE="http://cli-helpers.rtfd.io/"
+HOMEPAGE="https://cli-helpers.rtfd.io/"
SRC_URI=""
LICENSE="BSD"
diff --git a/dev-python/emcee/Manifest b/dev-python/emcee/Manifest
index ebabc9a7aac0..9a349e489c97 100644
--- a/dev-python/emcee/Manifest
+++ b/dev-python/emcee/Manifest
@@ -1,3 +1,3 @@
DIST emcee-2.2.1.tar.gz 24277 BLAKE2B 26572cf242caa2f9f7018e91434d7ff8b235d59349fb7b034e52bbab77098ff952e84eb96d013b66853a763c8fccc0cdd7121a5387b5081dd238df85416cda0a SHA512 8f612a135fe5fc2bc75c2bc231d9210d4a70a91f5d7b94ac2161618c082d18aa1b896604b7ece166b86d93a93902e89ee9961da2a3e65307880c0dbc63bea267
-EBUILD emcee-2.2.1.ebuild 666 BLAKE2B 43fd950dd580677e8426c98a6ef98b07ca9d226a5b979d19913c8b1d006cf5157afc8ce35e5f698388a19ce1831764ec18da5ab3fd3399eee75b21e65da6f839 SHA512 8a9b505ac87730cb98aefbfe686a1ac80736f50ee74353eee9576923187ee85a463977679bc0bc99e84056dfc604698ddfa4d3b616ca8cd1eda27048c1da60a2
+EBUILD emcee-2.2.1.ebuild 660 BLAKE2B eaded7db7c60401e2ace4d3297699b7059843bfaa64c4d4ab3a0404f810b5a1d2d0257e79716e684518150954b66f63554d37017b5b8aa70b734d678c51d1dd5 SHA512 22953efbe028332a0aec43a609a2e08c2d75c55506e32110365ab19ec5b08e38221d1a80212ce229174fcf60239bc6cc1f46fe5ad9b7f699e220e91b4d0b66b3
MISC metadata.xml 865 BLAKE2B 5d1067b3f5aa4969bf5e50ca73aceacdf45795f0e28562b8800d1b0c84d1d0df36d50f788392b3c508aae9c7eb3bc80d8115ea2becdca370f046f543d6f66112 SHA512 e3a8df62f73e85de2462f6f631706f2940cf7903017065e9b1c1e639e409bc7e99d2213ccbeba7da20f8ef15dd04ccb17be6664d2dd10b285f53b204f97e2102
diff --git a/dev-python/emcee/emcee-2.2.1.ebuild b/dev-python/emcee/emcee-2.2.1.ebuild
index 651f3cc2f4ad..335f0980a7b5 100644
--- a/dev-python/emcee/emcee-2.2.1.ebuild
+++ b/dev-python/emcee/emcee-2.2.1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
inherit distutils-r1
diff --git a/dev-python/fitsio/Manifest b/dev-python/fitsio/Manifest
index e32c6c281a35..9641374431a8 100644
--- a/dev-python/fitsio/Manifest
+++ b/dev-python/fitsio/Manifest
@@ -1,4 +1,4 @@
AUX fitsio-0.9.11-test-failures.patch 1560 BLAKE2B 3299a43eda8df89467474c51dec85af9edb8af52c93958e49834317439d440a0993ef6311002a4cddc4cde6aed42ed355dbafcf4f6ecbe98b81d60b9763c1c03 SHA512 224ae91e65d4b5f24cd64f3ab389940bfa58801822ad090966c4c570d5c9fb568588b3efa1dab73c2ebbbd0b5f802c2364fda31097811da78c09903814613c6b
DIST fitsio-0.9.11.tar.gz 6020222 BLAKE2B a71a0a6a026999b06dce54beb48fab2f510951099788b51456a6e07057daa7c911d5a2841d5f15a397705459daf081ff91bff1014782c93cb1dd76faf0ef2e1d SHA512 751b9612fe051f128d8f5dea61e2d119409293051a130ee3e18836181637e8c8daea757a715012fd024678d00e234e8b6c0cc0c9229c2bd9a406db312e4607d7
-EBUILD fitsio-0.9.11.ebuild 937 BLAKE2B 028a5b41dbee76ca4e31df0ad95cbd666ddac0c29f88f4969d1d6ae069ea2140d022c4532e1e5da3f733148f5dde06bcd8ed2ce21ac4dcc969b3b8dd34deffd5 SHA512 9867b33a13e8c8a4b21c924e66f1c3fca72cc1fa07be5d993a7a69bda91c15f267bd3bc9ffa10fe26eb636afe1dde5f81b013376c4f915995ee115cde79fc46c
+EBUILD fitsio-0.9.11.ebuild 927 BLAKE2B 644358a0ab92a2462d67b02bfc8ceabfccefc1335add94481e9387a2dc289f919d2844d6a014431c034b5ea4db1df7825dfa2b2db19c8a87d3260c38fd3cd531 SHA512 8fc103de703a4179f4f4810c3c816f1df25e38638fdb3a24549fbe019730ac24c618d53509bfbbd26b6f194a615000ab9e808767d021e0c09301686c6c29885a
MISC metadata.xml 930 BLAKE2B 495700f368bc6c69ed91745ec7d2847c5cca1690c454bc3b69acbf34eefbacb5b398bf7b56292dc25f2c642a91acc0e2ca054a2a578827aef3c4f95a07a75bf9 SHA512 ef4d3c9838e4e151b16febdacb9fb3b3538763dfb0c08b43ad73a9d9ecbdb275d91152b64b400aec8e3d337f08f3aa46cc166251e34142a68514135d6ae314d4
diff --git a/dev-python/fitsio/fitsio-0.9.11.ebuild b/dev-python/fitsio/fitsio-0.9.11.ebuild
index b413034e1d00..821d33b176f9 100644
--- a/dev-python/fitsio/fitsio-0.9.11.ebuild
+++ b/dev-python/fitsio/fitsio-0.9.11.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
inherit distutils-r1
diff --git a/dev-python/geoalchemy2/Manifest b/dev-python/geoalchemy2/Manifest
index 430713f9c22b..cb3b80183736 100644
--- a/dev-python/geoalchemy2/Manifest
+++ b/dev-python/geoalchemy2/Manifest
@@ -1,3 +1,3 @@
DIST geoalchemy2-0.3.tar.gz 93256 BLAKE2B 4d33ad8b1211f2c23da7ccb8945a051bcb58a1c4963f3c45ba4d20d26658bf0cfa983edd256aebf9ee86a768c7745f21230ba199437bff514d720da7aebc640b SHA512 5f94f6459eba1266c3b31b6d0b1f16478c1641a29b3dbe26cfdc3983d3aa5642b075871fb4722e6bccca7d1960ac1d87103351d846a061891f17d407df4867c8
-EBUILD geoalchemy2-0.3.ebuild 787 BLAKE2B 31c5f11e2fce568e768e6f79b2766760e302b963fec4bbb53996f29e233b337d209cb495928a3085aee0704f2f589efead61ee04c80ff0aeaa4e3a20eda5978e SHA512 5f431ee6cec103a73a8d28ce8d3949ad0db889783217e67ff568419797d53b996e52296c307c15c9edbae503f91d416e1355d2fcf68b2ff555e7e2018a5c4b08
+EBUILD geoalchemy2-0.3.ebuild 777 BLAKE2B 6eac5775fc84ffb87be34cfd52440f184175d2bee617d9867eea75b40d97b798cff962f808982e465e3becf9662454f369a0b1beffad46a746015e31ac49fc12 SHA512 5474a67676d390beedb793e11fff487880f0a43632bc27af07f2522183490dd4069b369117d5873250f1d3225a14e2d9d8c090e86286933b3e7c98b3d3b81580
MISC metadata.xml 388 BLAKE2B aae7ecb5090864e223172cb34f0ddbd114be20417c40f932a5c354804ee049a637eca182b9e33e564f60e7e6eae502c73cff77644dea4ad4498ce89c6938a54b SHA512 fe5d16f1006eea8b0eead7381650b7a06f547dde06224daede90460e2319b8c3f5eb527125f1004d56d866587003aafc35c0c17518699617798d5d05b3fbd254
diff --git a/dev-python/geoalchemy2/geoalchemy2-0.3.ebuild b/dev-python/geoalchemy2/geoalchemy2-0.3.ebuild
index 9108b4f9d322..227d7b803364 100644
--- a/dev-python/geoalchemy2/geoalchemy2-0.3.ebuild
+++ b/dev-python/geoalchemy2/geoalchemy2-0.3.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
inherit distutils-r1
diff --git a/dev-python/glymur/Manifest b/dev-python/glymur/Manifest
index cf22aad589b4..fd25f4bfe71a 100644
--- a/dev-python/glymur/Manifest
+++ b/dev-python/glymur/Manifest
@@ -1,3 +1,3 @@
DIST Glymur-0.8.10.tar.gz 3410241 BLAKE2B 137efe4090a572e900a320b0ac6651f82400fe1c8d0fdfe35f9e6684e771520289e825a02f774cf500fd368608269e646f4574773094bfd940446496f742b771 SHA512 8912e22d76b9de4a0bf8ec098ce1acc9bb0fa70b3b42ddb9fc1de5fc01653478d813429a00ef7502934af34eb78423881a31282e550e4f49c2c9f7d7c08b0016
-EBUILD glymur-0.8.10.ebuild 1021 BLAKE2B df9c4f7ba138019d7224ab265d609d45964e7432715787371ec877cd08a8a6fe519d69f78aa6553671e26a3d10186a08fbf92d581c98e2b607eed4c45660bd22 SHA512 c100a097ac2b3d0de0c7629b5d7b5fc58a408591bf6f03ac8f64cd595eed1562809a7282464c1b945a4b3f7fef2d835b3b08a2e8f6ce302e978f6fef73acc8db
+EBUILD glymur-0.8.10.ebuild 1011 BLAKE2B eb52293d7d7436dfaa4a06f9cb46c65a2635b0f30d25452abb574bf052bac022f164cb0dd883d94e2f23edddaed834f843bd07a9ade8b9ed440abb02046ab329 SHA512 45346a5ad7fc073ba02ac299a9343932f40b5f5e4da087d042f811ff9e121fda64ae5ce6e4b59a78cb3ca294b22fa570a49601148d9bbc521bd81c8bb5d9e713
MISC metadata.xml 381 BLAKE2B c1c488ffa38e039d5b0fbd6c47ac2f1536e48b2d2efcbbdf76303e77113b1eeea3e4062584ce94e7fd8062058d2ea58278565f736cfaabe135b463b214f19acc SHA512 944aedc2a2b05937971ebb61246c3c74dd89dd97bc133386af6a1eae8f6c1c034f49beb31f6531b5192ada3ddc1999963a6b36066e877ffe8fe2584267014edb
diff --git a/dev-python/glymur/glymur-0.8.10.ebuild b/dev-python/glymur/glymur-0.8.10.ebuild
index bc7d23c8301e..214e0efc91e9 100644
--- a/dev-python/glymur/glymur-0.8.10.ebuild
+++ b/dev-python/glymur/glymur-0.8.10.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
inherit distutils-r1
MYPN=Glymur
diff --git a/dev-python/gnuplot-py/Manifest b/dev-python/gnuplot-py/Manifest
index 301186f4f69d..bbd92c4ce540 100644
--- a/dev-python/gnuplot-py/Manifest
+++ b/dev-python/gnuplot-py/Manifest
@@ -1,4 +1,4 @@
AUX gnuplot-py-1.7-mousesupport.patch 2596 BLAKE2B f3fa9063718d6d3ce9ad847c8517f6728f7f32064cc5c13165a993aca556257e600371542f5b2bb34b868cd5a07196ffd7587b852c266229fada49b1288358f7 SHA512 5dee0dcb4b24aef830a9c65678dcb4ca1a831a7dff04723e2248219883e578cdc136b668f05ab95d13c7bbd7da47b20012e0b3d1149342bb64336325c2f1dbbd
DIST gnuplot-py-1.8.tar.gz 118828 BLAKE2B 880062169b2fa047d60318cc7dc556c60794bfd81317681395329a56712506f7e406efecb79f37cd98103e76a6feb8b635e55fe056c3ce5bee0c670c8bcaf7a8 SHA512 748dc95ea53acd362f67c821a3cc7cf23b6329c2dd13c130c91e1c9f89afe1ffd84619ed321923c65455adf86ee58976dd6dd187881ee3ede5e0f5f551fb027d
-EBUILD gnuplot-py-1.8-r1.ebuild 845 BLAKE2B d6bc041f0dff1e47014819356c72be847a2664b738481413ec43b9ea610865ec2d7f325646205c55ac65fd40563284cd58054d015ecb03a4ea7b6efc4f9983ac SHA512 bdb4669b6fc458ba0e99651ce21e442ba3e95c55c61a72a6aa3a1ee087bf49aa640a72258fe78e9249dd5008142c5fb48d1fb1a7c5ec38276e416457f999921c
+EBUILD gnuplot-py-1.8-r1.ebuild 897 BLAKE2B 2b824e39fc85f26f893afd46140a81a79b91d353e3b107df00b741c0d8ffef35b74837dbaee229b940df9553ff002633325e03b1d96bee89aea3d33d50579cb2 SHA512 ad3c7b490aee00282f0292381747c4b712b9c630b2bfdefd2dd7850daa27680c9002b6419ff67bb898447da7a5bf7f703826d076d6cd155b1f94686f2461dbfa
MISC metadata.xml 903 BLAKE2B d642116ef411d7556dffe4486d5360d7dce68927ccead0e3c00261cd89be47fab812ef9fc9455489dd79251f0a16f3c2ce5c1e9b826871f35a2e09b47da61988 SHA512 a007d4c76b4c868757567a8c37d95a825a95b2d21c4a19d050834c3e36753014f2ef8d69e3b99c7eaa52d8e8a5e6ecaca5a9bc4e23079367b055af62447aca69
diff --git a/dev-python/gnuplot-py/gnuplot-py-1.8-r1.ebuild b/dev-python/gnuplot-py/gnuplot-py-1.8-r1.ebuild
index 037b512df594..921b7992021f 100644
--- a/dev-python/gnuplot-py/gnuplot-py-1.8-r1.ebuild
+++ b/dev-python/gnuplot-py/gnuplot-py-1.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -17,7 +17,10 @@ KEYWORDS="amd64 ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-ma
IUSE="doc"
DEPEND="
- dev-python/numpy[${PYTHON_USEDEP}]"
+ || (
+ dev-python/numpy-python2[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ )"
RDEPEND="${DEPEND}
sci-visualization/gnuplot"
diff --git a/dev-python/gsd/Manifest b/dev-python/gsd/Manifest
index caa91da9cee2..d85634cada99 100644
--- a/dev-python/gsd/Manifest
+++ b/dev-python/gsd/Manifest
@@ -1,3 +1,3 @@
DIST gsd-v1.5.3.tar.gz 240114 BLAKE2B 076d888f03350fba2388c907787354e878a1536c7d85c759eb3513102ee2abffe2c9313a6e9e208726d66d6324dac02ae70d8872342f9bcb162ad13d9a23dbc3 SHA512 893db74dc481da47d6c51ea0d0d9faefbe164edfaeb5a2ed73e25acbd9dc42c3cf28cbc0d9257c6bf0cc0e9911ab85cfa72997886350c0e7c125d30636ec432a
-EBUILD gsd-1.5.3-r1.ebuild 546 BLAKE2B 8de097667b0de5ddc51ffc4c01e0da9df32027509ba285d37d582b5fd15eeddc97f04075bb96dc32a4af0378647fd197af0ac282e2c58e8235050db561de08e6 SHA512 d460b57f6c7c578d27b1205ac62e43bcf2a880b0092ad38e555e94e75abd75a66401652c1d5f444b521f08b080f14a8bea9eee52c9b6f8651c73256031458ad0
+EBUILD gsd-1.5.3-r1.ebuild 536 BLAKE2B 2c3f396b53c76d5b73b059504b50e09ebb50fbdf62d123ea3c0f6121047f67f0316396a49716709aaa79ea3ebfd082d4bc02fb1aeb3b016a56066cf6b9e07ca7 SHA512 56fc430554d29334fc29389c9c3b355057a7bc76777ff9f682aff2c9a96238e39adbd79f5d1f76988353a3dc6fc648ff3c03d48f74db7a76adff0ac06c907945
MISC metadata.xml 349 BLAKE2B 92fd987b0f0f73a6f07f9a3002cdca45698f61d9129cebdf2f1756bbe4ac926494bfcae209d18f6283665a95090be82ac6b34c0189da6372368833b62b67b626 SHA512 851f80555da7cbd3b2c2e696eecfe8f2cf19b61359c71d67c917c44a18f55c13aa5047afcf95afe0468ddb84b741cb183244889cd44e80810a0a82756fc033a4
diff --git a/dev-python/gsd/gsd-1.5.3-r1.ebuild b/dev-python/gsd/gsd-1.5.3-r1.ebuild
index eb2e214fb735..f276140a48c2 100644
--- a/dev-python/gsd/gsd-1.5.3-r1.ebuild
+++ b/dev-python/gsd/gsd-1.5.3-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
inherit distutils-r1
DESCRIPTION="GSD - file format specification and a library to read and write it"
diff --git a/dev-python/jplephem/Manifest b/dev-python/jplephem/Manifest
index 21df00591821..0c30365bf107 100644
--- a/dev-python/jplephem/Manifest
+++ b/dev-python/jplephem/Manifest
@@ -1,3 +1,3 @@
DIST jplephem-2.6.tar.gz 27587 BLAKE2B 553fdca55378bbd12e09df572d52b0721fb3a05b358adf403b202aa78411a0d4a60ef9b5d70b65b02605e8bbc65b8d12dc6ef90aef4ea37696f691b4cbb221ed SHA512 037b3b6571936f1a6bc07b156bb8a0c9fb0a51cc8c74e7a2d35f0ac28138223d5479c6fb964f017ca88ff56c7fb757e932d2a922d126d5dd410dc122d0458d7c
-EBUILD jplephem-2.6.ebuild 524 BLAKE2B 197a6605602e0811fee87624c537c87c67eb1dcf329131808df2cdf17548328ba428b6009ad46ac7da6095dfa85b3e4b98d185699c877eac7ecf3b8a9bc0659c SHA512 e0e8f169afc0b3db1f25a569f5b83ca64518671f64341122144e11f07366a5485c1f0ceeef4f42e686a3304a9700c77dbaf724798308e0661408984f2a125f72
+EBUILD jplephem-2.6.ebuild 518 BLAKE2B a5674e799a5d5e54db1737bc270edca267477d596cb5b7d987ec3fb273a56bd7c4970d6376c5d260a462bebf70a672b8f3021cddd9ba56c6d7c54c3f5df72046 SHA512 5e5e36ff45ad5304e48af76735ce314fb1f014089f9bd75f793f50ff19f788f40f711b1fe84b0b2a03f335bedf8f45aac651bb9c292901ac7342893b2bbaf6fb
MISC metadata.xml 636 BLAKE2B 962a5d5dd152fc2e9d220b8d103142d2cbca00069cca126441bd6d94aba0baafe29f76444c53172cd46799f3986b24a424051031b2d8943bf305661d06a6bbcb SHA512 2c406f9486ab5c05c126f371546e4dda63f277bf2e32346b3889b8ffdcce14339ad51740687302a2c41a4c11c700200ca4afc6a0474a329701f28036d5aa5e6c
diff --git a/dev-python/jplephem/jplephem-2.6.ebuild b/dev-python/jplephem/jplephem-2.6.ebuild
index 058ec80ab8be..aae6cd945fb3 100644
--- a/dev-python/jplephem/jplephem-2.6.ebuild
+++ b/dev-python/jplephem/jplephem-2.6.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
inherit distutils-r1
diff --git a/dev-python/milk/Manifest b/dev-python/milk/Manifest
index d0545ff73863..40c5f0e1658d 100644
--- a/dev-python/milk/Manifest
+++ b/dev-python/milk/Manifest
@@ -1,3 +1,3 @@
DIST milk-0.6.1.tar.gz 628357 BLAKE2B ea781b87aed1ed2b20d8eea16efe3cfc1e9777144e8847ea8617f2de3ee523cc3a9dbb54879206e146924487a10d41302e01d6fa78c812c8c5523b360cdd1e5c SHA512 54a94bc1bf760320b53b2f65396e117bdccd0d4d5e6bdb4684b68d96f3cb3beaf3cc9b285d3ba91b1f97ba335750591c1fb2d2115468ec617dbd1cc65fed9f8f
-EBUILD milk-0.6.1.ebuild 597 BLAKE2B 00afd678a0c17e25eaed5349bc3392d4924ae01cf1c6c215c664923cfb066867770a035217b284e527ccb7b2670b658566d5a25e93ac7f5874ed0273ed983a14 SHA512 f9d2f0f081ce6c1d7df3b9b029736bcd63e48d0ba2135c9a74f3ac84e4c6cae06a44b37e66708b12b072a797dfb40d206c43bd6bfcf0ad8fa5c5160fdec4b10e
+EBUILD milk-0.6.1.ebuild 654 BLAKE2B 3490105bc9bb3d8fb2f01ddbce33a5efc82fbc42db5b29f2428a8cd0dfd3da4d4bc0cf4b2dc92aff1290e5fd165deba736d314c1cee0c4c936a334986b155b53 SHA512 5bd3777cfe11bfc5b9dfe5aeb3b602921aedbd2186f60d0f33d086cd2e84ac3b54dfbe98a00d863aa826c41d334b216bf2b6c684c8e54fe5ec2e4edbd2d17fee
MISC metadata.xml 1152 BLAKE2B b772ced54839c36c070780303aee01a876af081e17883e97176e422c447e5da8878fe0a19fbce00267bfbdbc01ccdfd91472763a6a6c87e492bd41b094c62b49 SHA512 c4d9d5d7774abd15d165107798995a5fe4de13ba96342fbc1c8987876df7133846ca94383942812945e6bea62c9bf8f34073bf264842e58a3e70d181273c640f
diff --git a/dev-python/milk/milk-0.6.1.ebuild b/dev-python/milk/milk-0.6.1.ebuild
index 2ce95e5089c1..f0cea5d438f3 100644
--- a/dev-python/milk/milk-0.6.1.ebuild
+++ b/dev-python/milk/milk-0.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -17,7 +17,11 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+RDEPEND="
+ || (
+ dev-python/numpy-python2[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ )"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
dev-cpp/eigen:3
test? ( dev-python/milksets sci-libs/scipy[${PYTHON_USEDEP}] )"
diff --git a/dev-python/mpmath/Manifest b/dev-python/mpmath/Manifest
index fa4ce7028a05..0cd776c9e545 100644
--- a/dev-python/mpmath/Manifest
+++ b/dev-python/mpmath/Manifest
@@ -1,7 +1,6 @@
AUX mpmath-1.0.0.patch 422 BLAKE2B b79a223fb3d6c712a11e225c4f617d68cfda595ad314fb33ba02333eedcf39909f9bf76c98f004619f62cfb4516172615b8e79017362807980b1c61724423543 SHA512 a5c7c8816d7e4ba2dc481480a887d94ca158fee804a01e86f91fcea037372217ed8b029f85f6a0c15558b44aaf56f6fadf36b4f7476713a04a66f18b6f1ab997
-AUX mpmath-1.1.0.patch 422 BLAKE2B b79a223fb3d6c712a11e225c4f617d68cfda595ad314fb33ba02333eedcf39909f9bf76c98f004619f62cfb4516172615b8e79017362807980b1c61724423543 SHA512 a5c7c8816d7e4ba2dc481480a887d94ca158fee804a01e86f91fcea037372217ed8b029f85f6a0c15558b44aaf56f6fadf36b4f7476713a04a66f18b6f1ab997
DIST mpmath-1.0.0.tar.gz 511349 BLAKE2B 62c6275f76c412043cdafef51815e4b5d055a63ca36f3f63b33957351b19e03419ca27f7d59641c580cf8e47c1ca45240b68b3040e2749b3de679eb45b15a28e SHA512 b225f237008e1cfee52b2f0dca0dce1445b932b6eaef92879d7feca30d728e3f88810bfa80882ad8776ba846a636807e59bebe0b9f690cd878c089e9418bd8b7
DIST mpmath-1.1.0.tar.gz 2136921 BLAKE2B 8c3a5f39b48015aab1147aaf77ee7523dbffd7f34911ff2158d7b8bf1612e64f91d157494c5199b22090e986aba02044d610171bb92a2b230cdfbe025652e340 SHA512 628b6c61015825516d983bfcc54fc3a2793f3d9d2b93ba9c5a487a340ddf13eb4e83f17fa35692b22dd8a200a8da3a65ed88091d75abb4c48c9c4e4f2c686bcc
EBUILD mpmath-1.0.0.ebuild 969 BLAKE2B dc8b27a3342f16d9a16fbcd5cab408f7fcf7ec8609f97fabd647f12610ab863913f5dfd1cd244cbe511d327bdb6c399bd3d9a0430b0cb88bfdd6239163222b4f SHA512 e04fa0f91dfa5a791489c4a50a8dca75cee7bb39ee16bfe541c08aeeaa662a167052d12a04ed523f148569a32f7ab527e64c4b21ed0f49dce6994babb2b111e8
-EBUILD mpmath-1.1.0.ebuild 987 BLAKE2B 5e50a86a464c15f23d673f5068758b7f9c2b7dd1c9edb75c5f581ff0ff02e3f538c857edb7796ecd23010a27241031d05572b6e7c151b9eebe8addb3d77cf43a SHA512 65d10db310bd4839cf09fed38a48e9f9d6fb04186b886141f559cf4f1e3a68be342dbc2391a74b94c2de2b0d757f4f0e62c57388ce7467b7f8b78f46a6fde3ff
+EBUILD mpmath-1.1.0.ebuild 994 BLAKE2B ba37df68237eec408e759a6c9d7cb9808c590f34438d0c9ca75e733cb65b76ba093ba7391aa35e3cf83a9273536618c93a7bb6f76edd3fee6ce3d35c5dc977b0 SHA512 c8d48442dabaf5feb250feae30177f545e7bcd136ead91158f0e2dbec128a891493b337c4d42dce645943ec36ba407e887ee434b96a655a4c0076329ddbd628c
MISC metadata.xml 650 BLAKE2B 520b0399fbbae4307a4b3979202b4d5c8d1b06f739e0c0460a9a0be63b78152b50ab3f7fdc9b46623cf7afaeabbc57cd35f3865462f3b16ce2beeb0b8f8659a5 SHA512 0f999aeb354c73658f916cb8d3a80dcd216f50f77839c0c854e9235566cb197a7d047ad51045996fc0b9e1c47f55e934be9dd52597fee16fcce6360bfcbe8f08
diff --git a/dev-python/mpmath/files/mpmath-1.1.0.patch b/dev-python/mpmath/files/mpmath-1.1.0.patch
deleted file mode 100644
index 3a88f38c9927..000000000000
--- a/dev-python/mpmath/files/mpmath-1.1.0.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -r -U1 mpmath-1.0.0.orig/setup.py mpmath-1.0.0/setup.py
---- mpmath-1.0.0.orig/setup.py 2017-09-27 21:42:12.000000000 +0700
-+++ mpmath-1.0.0/setup.py 2017-10-02 20:36:02.919554100 +0700
-@@ -15,4 +15,3 @@
- 'mpmath.functions',
-- 'mpmath.matrices',
-- 'mpmath.tests'],
-+ 'mpmath.matrices'],
- classifiers=['Topic :: Scientific/Engineering :: Mathematics']
diff --git a/dev-python/mpmath/mpmath-1.1.0.ebuild b/dev-python/mpmath/mpmath-1.1.0.ebuild
index 9dd5e4c9ae4c..de811def9199 100644
--- a/dev-python/mpmath/mpmath-1.1.0.ebuild
+++ b/dev-python/mpmath/mpmath-1.1.0.ebuild
@@ -26,7 +26,7 @@ DEPEND="${RDEPEND}
python_prepare_all() {
local PATCHES=(
- "${FILESDIR}/${P}.patch"
+ "${FILESDIR}/${PN}-1.0.0.patch"
)
# this test requires X
diff --git a/dev-python/netcdf4-python/Manifest b/dev-python/netcdf4-python/Manifest
index cf244883c634..413ec9ad0567 100644
--- a/dev-python/netcdf4-python/Manifest
+++ b/dev-python/netcdf4-python/Manifest
@@ -1,3 +1,3 @@
DIST netCDF4-1.2.2.tar.gz 679107 BLAKE2B c15ed9332bd8e4bb18c312cd4418add169716ef29b6f5c4b935c880259a6a16c8388ed7c790919bfbbee631e9e96ce4b9a9afaeabb305e4dd32028353e62207d SHA512 e09465d125077e71b8aad4332be844099c7fa29d0ea8f1dd0887f7a5e849ab778361026323466b1d4897bc3d8f8be1818cfa5f426773c765ee9c5f3728ff3da3
-EBUILD netcdf4-python-1.2.2-r1.ebuild 686 BLAKE2B 8ef633a2120518abc492686cba1899d9746a8a74c3535f7c2999b57ed26980d7dafb9b19877e7666e98f90cd25ca2037b1b95816fcbe02f75f0841bb539c07fc SHA512 c66b97ef77d1da10888a03dc875f26c9ed8697f7ef6eb3aaf77c04f34885e43b36ef27687bc4b7219a2875fb85fb5aca4de4eb0bc57e2d81b7e3c9a7311238c1
+EBUILD netcdf4-python-1.2.2-r1.ebuild 694 BLAKE2B 50dcce00d5f8cbc79672f2abe5c0379965aec03ef099618c894691f88182b6c0c23c440e817bff228ad23a3af75d098eb60a75e50e7b50a54340b5359f5d131a SHA512 8fd9372f785f22e2ba8286172ef6c7ae061b7467ba8fea72fdf6188e6901ed079445f036ce1fb6b56ceb15e4369a33901256c1a4f2cf82e17cbb01b2292f081f
MISC metadata.xml 702 BLAKE2B a7c9b2dd81a36206430022513af169fc3819eab8923bb9fe50d94fa165ad6605bd4bbabe700e1c11612d522ad39d02bee56db03b31888969e4f871606ecb5018 SHA512 ecb1a82976d540d6a8472901456bcc634077214703ca30e52cd9cf6fe47d7ac69abbf754dcaef977ece693e5c7d8f97dd250bbe1e1dccc4c03964eba576e29d5
diff --git a/dev-python/netcdf4-python/netcdf4-python-1.2.2-r1.ebuild b/dev-python/netcdf4-python/netcdf4-python-1.2.2-r1.ebuild
index 6496b8352697..04caabe5fdf3 100644
--- a/dev-python/netcdf4-python/netcdf4-python-1.2.2-r1.ebuild
+++ b/dev-python/netcdf4-python/netcdf4-python-1.2.2-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
inherit distutils-r1
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
RDEPEND="
- dev-python/numpy
+ dev-python/numpy[${PYTHON_USEDEP}]
sci-libs/hdf5
sci-libs/netcdf:=[hdf,hdf5]"
BDEPEND="${RDEPEND}"
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 5809afb3890a..3bb895104381 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -24,6 +24,6 @@ EBUILD numpy-1.14.5.ebuild 4103 BLAKE2B eeaf60f0d6dcf9adb805ebbd4185061dc21c81d2
EBUILD numpy-1.15.4.ebuild 3914 BLAKE2B b1e4541facef34dc973bd1de3d7c9fc556116fa936c7c4ea6f4aa4cac2d727f56743743f5e04f7f0355d8c085457d44c2f2f478bf5bf52310be23d2ec1451b80 SHA512 23ecdb6df8cd632f661aa8518f90e90d1d0fd5fb566e4d97149f92cf19995f067ce5e405b3b0035e740de53383d358eca00f503b63a4227b4d7592909d26b90b
EBUILD numpy-1.16.1.ebuild 3934 BLAKE2B 35063ed7529f4cb757b7dc3aaf8c0009bc4e72aafb6723267ac582ccccffa2e2f079d3cd067a88c32f935de3622abb1875d7bdcf8417d125ad1750f2568b5b2a SHA512 db1c4337360dddbcba2a34eb1f282dabeb652f36a3f216332b2e6d6ea8058e16dea642ea5e6f583871436e7ffa75eae59cb1daec797a41a3097678b8554ca5be
EBUILD numpy-1.16.5.ebuild 4223 BLAKE2B e8de035eab95a811936542fc223d71fce1c3a98c01b6c4f6f064d0fecf231acf4e3d28dfe368c09a06a84f6e95eafc7bd30eedd4fab5d58afc1f97bc792996da SHA512 2d47d1a95f0e2a7677a4ac29ce44ba519fd620c732bce8a2df15cbbfc6d198a56187e837e19ee27bdd8ed6bf7bd4d04d3c67a78e09ec0b2d4da8e0d74df04d41
-EBUILD numpy-1.17.4-r1.ebuild 4085 BLAKE2B 97f33b37330e8ef2672d1967f9b5ad33f6647dde276dc464ccf1d774d3865af02d2d4b571f286b595e03905bcf8707500ce10edadead113cadb467c683ea00d9 SHA512 61c18fa1c261f62b9a964a80edc416f2b1ebb6e7579b054b05e343f0208e8f8a452f07651fc653575014beefb3f86e790bd4f65f69b0e48679f5724b5c186250
+EBUILD numpy-1.17.4-r1.ebuild 4083 BLAKE2B aff98225502e0728fa70907ecb6017e986e3eb6d68bcf0f24afbea2d7f734b4234688478ca22416502f43eb6a27b8b6474f3f4ec9440d10f583cc00c45423ee1 SHA512 79ae2b52dcf5b2098f8d4c8aecec97ad5396f3c4fbcba54f37cc3515fe3b3af1e3d61fbc1f3a9b82295be757c94f89fd25071c97bf50325656f763a52e7cfabf
EBUILD numpy-1.17.4.ebuild 4230 BLAKE2B 8ef305e01f0217df28459560322e08c13fb14f9447b094f65627f129f40cde81dd4ab9932226f2d9f1f1b610d0baa785028ed36487dc7e3e500eb8e666a00ffa SHA512 95dc8135ec99d8427e71f4722d7afdcbff4a6dd85f06b038ba1e6da488121d0c1d738a13b20dee3a0815ba9c749c4f90d641aca83d1f9bbe54190931837ce244
MISC metadata.xml 876 BLAKE2B 5e257d6ea3c59c5819d854db7b7db3ebff53b5c87b5ce9348786085f09db12aa6fc8fa86393b9e6c06760ac0d9f36a52fdfb1865c9d1d9ad5526d74d3d53e8b1 SHA512 d35d0954ff8f21e370edeab3ce3e5ab501bf216c93399e807ede6f1910ba0ea41359425bf894d813a39442fb92a724fe83ec8a5c64e6bd97de9422f67700d549
diff --git a/dev-python/numpy/numpy-1.17.4-r1.ebuild b/dev-python/numpy/numpy-1.17.4-r1.ebuild
index c7836c89affb..9e9450f43f4a 100644
--- a/dev-python/numpy/numpy-1.17.4-r1.ebuild
+++ b/dev-python/numpy/numpy-1.17.4-r1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
)"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc lapack test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/opt-einsum/Manifest b/dev-python/opt-einsum/Manifest
index a53b117a7409..05a49cd74071 100644
--- a/dev-python/opt-einsum/Manifest
+++ b/dev-python/opt-einsum/Manifest
@@ -1,3 +1,3 @@
DIST opt_einsum-3.0.1.tar.gz 66204 BLAKE2B a8d2d1246e890d24ea73d129ed1ee99e8fbbca30771c96a48858acb5af5eac93bc73b9e8f1c5f1ece6e0872277de1f01fd1d0f7d27e044fa5f9de09060792565 SHA512 d6c2b95d17f523680e3f849ad2b0a4c36e7102e0540fddee365446bfddad4a26be2aed19060570ac0d1db42ccde8e15f0e7e4c066b9117024a58f8cc8978508a
-EBUILD opt-einsum-3.0.1.ebuild 477 BLAKE2B b0e2817bc7b21bed51bd5818461146cc35801c5594456284da2796804e73acaf30805a36258f66b5a08f867e107073080aa2e1f4282a5b6cf87d629e0203bb40 SHA512 9db7dfe0d8d1786315f37171b47fc8895fe5a51cac9b2f66a6565b8303794995e64bb142a58cec4e0270652cbb54c69d21ea83af6e4893a6fa7620271c841718
+EBUILD opt-einsum-3.0.1.ebuild 467 BLAKE2B 42ea9767dfd20d527f768fdf72b765cfd41aa3685b71d3a39efc487f3025faa4d267e21c898ff7fe44c6ba415557b9e3e67b5b8cb3976b92ce78f9f8baebe043 SHA512 798baff683292754346966581b9fbc313fcec9b3cc743f4ffd160d235a3eaecfe647c4261fff112c22a41d4aaeb8491bed3cbaf5ed2f83f08baf7ca372903929
MISC metadata.xml 373 BLAKE2B e60b5def188efafe8cbea965732384164a8dd735c37d065cfb9b8c3edc652dcd5b23641e11655fe535206823317e8aa9c0c2f2a624e654d511595e36ef8fc5af SHA512 5471c7592bfb2e9ab1f3c47fdb1ab2211debda6e928f2491f17a171d14c95d5faacf03eb105c94d35ab6f5e889f24cc327f5111e8ac8c11527dcca1e04d61290
diff --git a/dev-python/opt-einsum/opt-einsum-3.0.1.ebuild b/dev-python/opt-einsum/opt-einsum-3.0.1.ebuild
index 777132fc4015..45bd617ea825 100644
--- a/dev-python/opt-einsum/opt-einsum-3.0.1.ebuild
+++ b/dev-python/opt-einsum/opt-einsum-3.0.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python2_7 python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
inherit distutils-r1
DESCRIPTION="Optimized Einsum: A tensor contraction order optimizer"
diff --git a/dev-python/owslib/Manifest b/dev-python/owslib/Manifest
index 867dc19d2ace..7c554d6d01ce 100644
--- a/dev-python/owslib/Manifest
+++ b/dev-python/owslib/Manifest
@@ -1,6 +1,6 @@
DIST owslib-0.16.0.tar.gz 658145 BLAKE2B 8e32de48192579f10515771c1682b1d1319deb8195ff9c0f9168ea82bb30bbc8bcf7c457c794a79b1121d40f3f544624f0a9789b0f6f36632c6457f396fa78c9 SHA512 a468352dfdb62bea1e6189efcc198237cb909051e51782abb15093e328ca7d3d379e88d0466e42c39ce9bc201a3be828a779193666bf9befe8d501355aaddbf4
DIST owslib-0.17.1.tar.gz 898961 BLAKE2B e48b10a0bd9dc1e85588b8007261c47f9f754af9eeb7292d4a3fd9ce017309efbe0fc9951a42470a6938194e5903b12ffe286b140d906e1d281f5a2f739540ce SHA512 0772f7698d1d5c6989419a455e8b6d97b0fc9f04a48275b1179f5bcc0fe782620721e840969281941b0f0a3616d8220916090256bb177eff1b2a4df0e02e2caa
-EBUILD owslib-0.16.0-r1.ebuild 978 BLAKE2B 6188d6b9d0ed618c682e5805de2d34edc7e4af033759bc6e68e988b8624a07d0a2485b5dda72b3887264132787f16c8fcc08ec1b78324f4322eadb225edc644e SHA512 ca6773e37d77ca2caba1815c2c6ecda251279590b73a7d565b0a3be2f352d7bb026184e8d811c49e10967f2a768934cbf788351aa47eaa5f1f9b5db01925bbc1
+EBUILD owslib-0.16.0-r1.ebuild 968 BLAKE2B a4b217fb2c2968acafcdf19c47d047078e00783c3fab44c46ede85ecdbbf7cdb8715796be0532f64038e137f9c18893063cdb7093f59879e467997c9de72fd5c SHA512 93e47b772ad69ca5e70eed49d837f3c60b7bc66b6ed5f3587969bb3075c54fce63993aea2c8e1ff85282c5a2b46c2aafe874db0d95b353ac60727d5fec6d42b5
EBUILD owslib-0.17.1-r1.ebuild 976 BLAKE2B 36e2e2c4cc50165b212fd688ff615750856488ecd7e68598d413964f94839591f8b3ba32847b73f413979b7135560dbdca1712b7fd9be2781c44406352804759 SHA512 256cbce8ae7b43b97d18feb7e8603d9cf782a0c40435a47c968aac28a32b5f376756c84f603f98a5d052a2f643c4b52b8c2efcde3254b39df1489807b2c6820c
-EBUILD owslib-0.17.1.ebuild 980 BLAKE2B 96aabf7c03c839990a3f35adfd1a215e493e0035813a238a566e07b315b82b21e2f80e094b6133817b85a1e8db8bbc323a38aeaef8d253c88f6c83b7ecb50514 SHA512 0f7e71d6aab34bdb90e659d0fa58249031d9b5cd74e537698533bec71a397cd688d1d9a69b4a38fabea3df413ee567cc51bb25215dafc33dfa83c9ecc668d636
+EBUILD owslib-0.17.1.ebuild 970 BLAKE2B da022d9b0d0e3f4a333de740428e21fb35484e631306997f3a96662856cde88c0ecd36439260e0a4ecce96fef389f5ea70da50c958cb7f51b479a8b77222ff8c SHA512 bb72ba75cba402fa326e8c2123cf23655daeaf293bddfca398f61202e03b027575a8cbf5e499784b84e332b6ab80827bb848796cfade07883f6f0ff4c3495da7
MISC metadata.xml 451 BLAKE2B 82a1e52487ebd5bc2a728a26c46f8e26a15d5736da20a50fd8be71fcddc088dacfbe178ca2cdb9841418723175c0631455393e5735b78767e58287c1542991dc SHA512 7c41ce77f3d6126a0fc61c39c953f044f94c39738b4fff7c7c38a9da9c972f16957c44d60df9de59d1c03e3c5384582efa3986e7ac31e546e28fb8ad5b1673f2
diff --git a/dev-python/owslib/owslib-0.16.0-r1.ebuild b/dev-python/owslib/owslib-0.16.0-r1.ebuild
index c409c4e6bb32..0828c3fb1a18 100644
--- a/dev-python/owslib/owslib-0.16.0-r1.ebuild
+++ b/dev-python/owslib/owslib-0.16.0-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
inherit distutils-r1
DESCRIPTION="Library for client programming with Open Geospatial Consortium web service"
diff --git a/dev-python/owslib/owslib-0.17.1.ebuild b/dev-python/owslib/owslib-0.17.1.ebuild
index 118c22f7c3ec..4d741c95859f 100644
--- a/dev-python/owslib/owslib-0.17.1.ebuild
+++ b/dev-python/owslib/owslib-0.17.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
inherit distutils-r1
DESCRIPTION="Library for client programming with Open Geospatial Consortium web service"
diff --git a/dev-python/paho-mqtt/Manifest b/dev-python/paho-mqtt/Manifest
index 6bc75b0ccfda..1cdf235eca04 100644
--- a/dev-python/paho-mqtt/Manifest
+++ b/dev-python/paho-mqtt/Manifest
@@ -1,4 +1,7 @@
AUX paho-mqtt-1.3.1-strip-test-dependency.patch 681 BLAKE2B 0ed9a448e5e72813aa05ad1d37ae957150ad09b6d48a54f668a969e5e98ad25f8d55b223064e01f6773d0e42da3ba26f2e0a7f43a628ff68fee4b619b8de96c9 SHA512 dbadb8c1bd7691a973d8c1cd146ac9bd72407625ddfc5042b25bc81ff74af6d554c06fa3b2972637acc4a466e75a65c9371990e43bbf649fe5a5a22da2bb36fb
+AUX paho-mqtt-1.5.0-strip-test-dependency.patch 801 BLAKE2B ae44e567fea5cb08d116790191a69899c95714db4e76735fc4658174e37595b8a354e8c5fc470c035833fe3b7d27a6e47e7db77db0bab1884306144ca69379ff SHA512 aebc29ede887b5818718a56e933e9ac2342478b528f82b9d72b1132138ddbd2c97b3be2f1e5dadadec38cabf793818c6f55ea16b44336f4a40c8295b9cea0602
DIST paho-mqtt-1.4.0.tar.gz 108278 BLAKE2B 0569f3cb5d262b3b7f6ae68261fe138d839afcc6fe91f880e29de24d5cf8e2491af81a30eb82c27fe63eee90114326eb75b06a32e05ec2fffed27b92d9601902 SHA512 2e49f0f146207ab4fbc8c346b10d3e2b50869b2d9db7c999b6645f7213fb635b64cff01c5405e7833a8b25334d24685ce6ed734a6e4b6b0660b48f65cf4a941c
+DIST paho-mqtt-1.5.0.tar.gz 126869 BLAKE2B 2dce27c1fcfe7ae422dc6da76fb58e7901de00c0c349b9715c56a3603da26e1f46af9bb8c0bd982043ba54a2070655b483d251a0a847e1c3afb36bcd4cfcdba8 SHA512 7e52180bf1783ee1f39aa5248730e82fae47fe3db7c4579b0b7207a29f5337c7c0af58d58aac1c265b1ed91fa9c240187d5e3005f55c6e28623e6cbc36750294
EBUILD paho-mqtt-1.4.0.ebuild 832 BLAKE2B 1ffc21c1e68794f52bc03e2b965f6423490a851e4fdedd2b9c0c394b0f1813e95c9266a538cd1b0025e436136b0617ba26d38bbbd1950f5f6d1164ac47286727 SHA512 ddf18c0813539b838426242af0f2cb93e62a70f3a2496cdbeaad6e54378271c67b883cebc6a53ad15fe1a67548289a2212d1b1801294120870f6fab1a61670ab
+EBUILD paho-mqtt-1.5.0.ebuild 870 BLAKE2B 3c209549ddb661c638c969a08a5effc3d0722f1ad5f85ee47ae7fff77f84879537224bd82ef957e730733ccd025611e3a5d73a4ace951bea6c8d0e8f85cc60c3 SHA512 bfe74d2d95f66179545928b06095b6c4765782f77e71c1fb352b039cd3deea6efabb28bed996b13e7cb6759d1de5892ab6b83fbc91e148072cb997b567502c09
MISC metadata.xml 461 BLAKE2B aafc02224eae792f2800211f291493df079437667e706879cff3d8f7e895f16b8b778fe623280434f36ee878db2da6edefb459ad7b59b3fe5ec6e4dc8e3c7b36 SHA512 a9b6ab584e14070bcc2087a7027b1e36bc91706124039938a7bc2eaef5c14247afbe3c4827a22a3899c8e3c527f0d0ca0e394f1465b42e759e2fd26cf965297c
diff --git a/dev-python/paho-mqtt/files/paho-mqtt-1.5.0-strip-test-dependency.patch b/dev-python/paho-mqtt/files/paho-mqtt-1.5.0-strip-test-dependency.patch
new file mode 100644
index 000000000000..9c8307359337
--- /dev/null
+++ b/dev-python/paho-mqtt/files/paho-mqtt-1.5.0-strip-test-dependency.patch
@@ -0,0 +1,31 @@
+# Remove Pylama from test dependencies.
+
+diff --git a/setup.cfg b/setup.cfg
+index 84551cd..73bd714 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -1,9 +1,6 @@
+ [aliases]
+ test=pytest
+ [tool:pytest]
+-addopts=-r xs --pylama
++addopts=-r xs
+ strict=True
+ testpaths=tests src
+-[pylama]
+-linters=pyflakes
+-skip=tests/*
+diff --git a/setup.py b/setup.py
+index 8441de1..2878352 100644
+--- a/setup.py
++++ b/setup.py
+@@ -11,7 +11,7 @@ with open('README.rst', 'rb') as readme_file:
+ readme = readme_file.read().decode('utf-8')
+
+ requirements = []
+-test_requirements = ['pytest', 'pylama', 'six']
++test_requirements = ['pytest', 'six']
+ needs_pytest = {'pytest', 'test', 'ptr'}.intersection(sys.argv)
+ setup_requirements = ['pytest-runner'] if needs_pytest else []
+ extra_requirements = {'proxy': ['PySocks']}
+--
diff --git a/dev-python/paho-mqtt/paho-mqtt-1.5.0.ebuild b/dev-python/paho-mqtt/paho-mqtt-1.5.0.ebuild
new file mode 100644
index 000000000000..b60266361e63
--- /dev/null
+++ b/dev-python/paho-mqtt/paho-mqtt-1.5.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A client class with support for both MQTT v3.1 and v3.1.1"
+HOMEPAGE="https://www.eclipse.org/paho/clients/python/"
+SRC_URI="https://github.com/eclipse/paho.mqtt.python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/pytest-runner[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ ) "
+
+S="${WORKDIR}/paho.mqtt.python-${PV}"
+
+src_prepare() {
+ eapply "${FILESDIR}/${P}-strip-test-dependency.patch"
+ default
+}
+
+python_test() {
+ esetup.py test
+}
diff --git a/dev-python/pupynere/Manifest b/dev-python/pupynere/Manifest
index 7bae61423c1e..6f1b21259a20 100644
--- a/dev-python/pupynere/Manifest
+++ b/dev-python/pupynere/Manifest
@@ -1,3 +1,3 @@
DIST pupynere-1.0.15.tar.gz 8566 BLAKE2B 1780b7c17868b77c294da0f81052077be22b72660b472a29641c8390d34a608fb0dc067fe942dba764dd5735ce034981c9b5e3b47825eb3be9ab94e46a71d972 SHA512 55b25ca4fb511d80b5eb11b8aa63949c80e9dda336ed1ad406314bbda669ee4ef836a3e01b71065eec0cf0b8556ef36c815a299a5620d50983074a2ff55ca5ba
-EBUILD pupynere-1.0.15-r1.ebuild 646 BLAKE2B 94efb0dcc790656738a64c3d9ea0aeed278eda52757de41efc619c7c6c726fbac0558f98cd059aa220c8deaa6e6a2a0e9bdb5ccd52762213b6a7f251f6dcab7a SHA512 6920cebd6d28479bf0236df2d678c7c796a7c5229e63da2b75a185f405011c50aacf2fc78ab063fb5282bb89e50f78cd8edc502e183c4c7ae3557ed7d8fbb291
+EBUILD pupynere-1.0.15-r1.ebuild 700 BLAKE2B 5ff9a8963e4da4aea5ed204771292878cfc328ac77e17548e13d46bfaa96d8abf9f8fc9c5a38c1778366279124070a5fb79342fdf9ce4957c311874f859a1080 SHA512 a31ec45a48bcdc8c032606ae7c3ac2545c6afd02437ef5aeecdbb8efe5303a21d5f46c3375f5f0c82e84f8a6da3292b0d69a8a008ca9f65af339279d83e32496
MISC metadata.xml 500 BLAKE2B 27412e37a799d7931fb1f7d5dc712db7d6d25f44e166d7a045c63ed3c1f978f1dbbd15facea31d258154f6fe689cf148fee71acc33f6b653f4b9d0388c51ce44 SHA512 7aff7144c2be483bf339a2bc43fec68bde804bc43b1f13a462bd7cd617b53884de2791b6a3335fd90b38d01ce081b1246281d068254af0722731cafa17381e91
diff --git a/dev-python/pupynere/pupynere-1.0.15-r1.ebuild b/dev-python/pupynere/pupynere-1.0.15-r1.ebuild
index 044e5cb45895..7f70dfe14fc9 100644
--- a/dev-python/pupynere/pupynere-1.0.15-r1.ebuild
+++ b/dev-python/pupynere/pupynere-1.0.15-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -16,7 +16,11 @@ SLOT="0"
KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
IUSE=""
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+RDEPEND="
+ || (
+ dev-python/numpy-python2[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ )"
DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyFFTW/Manifest b/dev-python/pyFFTW/Manifest
index dde32fead627..9a4454f30cd9 100644
--- a/dev-python/pyFFTW/Manifest
+++ b/dev-python/pyFFTW/Manifest
@@ -1,4 +1,4 @@
DIST pyFFTW-0.11.1.tar.gz 144045 BLAKE2B dcf37653e8d5259d8d74282699eb8d9820694f21e092528105e07a8c7e05fe213d908590560e83a5a4ad993716fcf343ef0780126bbd689ee4ff584a01ee6453 SHA512 88769fd65b1a9ba3228a920226ac82f9b4e0a9023b6b73fffc0dc52a8983197e4406c376e89d00888526cfe3a9abb3e15a576daa51ba5bea8e8302514176763a
-EBUILD pyFFTW-0.11.1.ebuild 658 BLAKE2B 8ff50d03d15fe4090799294933a18dc16356640124be2d509f927aa3b0dbc2607f1ca616afccfbbc5bcc5a07425e82679d3e40ba2d4cc209d54f5ac66b20c58e SHA512 700ee51acfe92983b6fe978dd066a0d457024a5079ec0bbac8aba47080300d6904642c36495ad19f2eebb5adc8cd1212a0e4d123d603fb16c669bbb53796df8a
-EBUILD pyFFTW-9999.ebuild 658 BLAKE2B 8ff50d03d15fe4090799294933a18dc16356640124be2d509f927aa3b0dbc2607f1ca616afccfbbc5bcc5a07425e82679d3e40ba2d4cc209d54f5ac66b20c58e SHA512 700ee51acfe92983b6fe978dd066a0d457024a5079ec0bbac8aba47080300d6904642c36495ad19f2eebb5adc8cd1212a0e4d123d603fb16c669bbb53796df8a
+EBUILD pyFFTW-0.11.1.ebuild 654 BLAKE2B abe30b778c4b86209b79945f5b5f88aeb34d28136c67b6aec041fef503f63fc206f263eb5ed0275e632f1693b4fc9d199a9ae175264b6f6d137c83e3eb5f83b1 SHA512 ae05816c516f8c05d061bdf08a35b89f9e0dd49b00ea5cdb953ae1f8d2018c5f02fb832606da6e3d113ba8eb68b11e9b9556cf1ed128f444fb575b758b0bf12a
+EBUILD pyFFTW-9999.ebuild 654 BLAKE2B abe30b778c4b86209b79945f5b5f88aeb34d28136c67b6aec041fef503f63fc206f263eb5ed0275e632f1693b4fc9d199a9ae175264b6f6d137c83e3eb5f83b1 SHA512 ae05816c516f8c05d061bdf08a35b89f9e0dd49b00ea5cdb953ae1f8d2018c5f02fb832606da6e3d113ba8eb68b11e9b9556cf1ed128f444fb575b758b0bf12a
MISC metadata.xml 424 BLAKE2B 5d75e20623d795582045a8571aa6c9269619d975bc35598fdac89ff2aad062287f2f44d16ea4fee68923d9dabbdb17a58ee0407fda13af733f0085ea81e219a0 SHA512 1a05bf34de75ceabd0207520d44bfe450958e05bcea410ca7a7cc8b7f43170c2842595b800a178c798bf517a2d060b631633e941da382fb39279fc6c81b044e3
diff --git a/dev-python/pyFFTW/pyFFTW-0.11.1.ebuild b/dev-python/pyFFTW/pyFFTW-0.11.1.ebuild
index c0a80dd82e78..25dfbd2b9be0 100644
--- a/dev-python/pyFFTW/pyFFTW-0.11.1.ebuild
+++ b/dev-python/pyFFTW/pyFFTW-0.11.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
inherit distutils-r1
DESCRIPTION="A pythonic python wrapper around FFTW"
diff --git a/dev-python/pyFFTW/pyFFTW-9999.ebuild b/dev-python/pyFFTW/pyFFTW-9999.ebuild
index c0a80dd82e78..25dfbd2b9be0 100644
--- a/dev-python/pyFFTW/pyFFTW-9999.ebuild
+++ b/dev-python/pyFFTW/pyFFTW-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
inherit distutils-r1
DESCRIPTION="A pythonic python wrapper around FFTW"
diff --git a/dev-python/pyamg/Manifest b/dev-python/pyamg/Manifest
index 37586ef62c21..c26e98f109ca 100644
--- a/dev-python/pyamg/Manifest
+++ b/dev-python/pyamg/Manifest
@@ -1,3 +1,3 @@
DIST pyamg-3.2.1.tar.gz 765723 BLAKE2B 72c59c0fe93363f73d8ba4c6297920dd1ca8406b048cf0357baec5f2390bdb524421a35ef65e790be45b543e9e162067ee8f8f09327b464a4bc5c9cec368b003 SHA512 6be0dd068417389934ce97813321367920abf6f9f5e94ce2df8bd796edc797cedd492c9153b62466f7d68055a05821447dcf21578ccdfe3294766a49a9ac220e
-EBUILD pyamg-3.2.1-r1.ebuild 707 BLAKE2B bf7a6b38376db6eca08c4944da95912b39de2e2bfe056fc41aa3298ffed2fc0c3a7c39da9e7470f3962d2d6f5f6d1e9a382b319afdf8c667e88089dc4a1c6d7f SHA512 dba45b0a287780e3263814ae4b81237d09096aef63c20a69386011c3c30bbc4edafcd7e2eca23e584ebabea936209796ba3b71399d903dbe0bca08881a39526a
+EBUILD pyamg-3.2.1-r1.ebuild 697 BLAKE2B 17d48958e0a9733854cc10f3f6e8af45572ce693522e1e0c7c5ec9286a6c651a6344d4124525565c7bbc7a05013958658f14ac4edeeb483d5abfe480384aeb66 SHA512 6a51b389a4d11ebbb1f05613aeb7481a631903e5d7fb01e7fb2013c898c50e145aea8c35fb9aeb0b6dacee44ba532882bcc8c08d9446e6146c3da06b9053689e
MISC metadata.xml 660 BLAKE2B 09f5ba733b9e679cd6435afe0e71a2382498ed2417563031c24dbb9d8630f1ea9ece9d10c2851afb411dec9694b773e495aac10e9cfe4398980f2d0c26efa370 SHA512 9900180bd0de0c9cb26205d2de5674f02405499778124c3fc21a3d3be6e7bd6602f4f619b0b983e95e30ff3f8f37e15ebfc66535db144f92e8f0c6d579e5e6f1
diff --git a/dev-python/pyamg/pyamg-3.2.1-r1.ebuild b/dev-python/pyamg/pyamg-3.2.1-r1.ebuild
index 349233e869fd..f16d431c5e37 100644
--- a/dev-python/pyamg/pyamg-3.2.1-r1.ebuild
+++ b/dev-python/pyamg/pyamg-3.2.1-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
inherit distutils-r1
diff --git a/dev-python/pyemf/Manifest b/dev-python/pyemf/Manifest
index 296e5ca4c60f..cf2e3747ea6c 100644
--- a/dev-python/pyemf/Manifest
+++ b/dev-python/pyemf/Manifest
@@ -1,3 +1,3 @@
DIST pyemf-2.0.0.tar.gz 194995 BLAKE2B 25416b65151ba2d8afee0f3a744a346df9831356a238ffe4a1b5e436147c9ee0f34ee6641904bebaabed02257203030c22d77c67064aa7ab2e4f034d0cce531d SHA512 013f96356d48db95f9f6f89167d99573e40d8c594b3f6e3183b50d784b653b508662e3b652f8a76dccabeb3933009a06d5786e156284520683d6b3747f2dec66
-EBUILD pyemf-2.0.0.ebuild 488 BLAKE2B 1dad20a68024631055ea1948481046fb867da84c0609c517f6b6665c9c5b8d3cf9a6819e3eea0f6d1df47ae13ed9d71f0398c4494e04e9e94a9f2ed5a3ab8c43 SHA512 20885afa71a6cab3a4f2dea48968fb4d264eb7d2f1ff26f8a55fc9091331db9a35f1653a65131de9c34beeb2168e9bff6fac32a87f956721e60b43363feb400e
+EBUILD pyemf-2.0.0.ebuild 540 BLAKE2B 22695911cf743de9b09cbb26e6a9ca76454362e69b34a5d6e18ce2ebefa792b8bc8601dee51ed9a1a6706ecc62b460217a7e33f5e9ac21164695c800b59b9217 SHA512 a817b75719225685624fe20e671c153bfd2313356cdfac8fa2a6daeca9536023dd1b86bfc3cb5b93b85ffd9de633eaf2fa80159923a0da53638f7b94d4cc143c
MISC metadata.xml 731 BLAKE2B 9ea2a34cd6714b4a6fc11264685d023807f0abbb907e7546937d53f4d53c011ed28d8a052ca798d1471d7db4972d95a2608e8bb7ca003cd813ac2b154510d7c4 SHA512 9e4af665e8fd02302e6d4db6d4c5c2677fac5f5d47ffdc6907190233ec0300ffb99b49af7d2d2cc50f71cfdfdfa10b77206ee424131efd3058529b5b3f206c69
diff --git a/dev-python/pyemf/pyemf-2.0.0.ebuild b/dev-python/pyemf/pyemf-2.0.0.ebuild
index 0268e6564994..3d45f79a144d 100644
--- a/dev-python/pyemf/pyemf-2.0.0.ebuild
+++ b/dev-python/pyemf/pyemf-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -16,6 +16,9 @@ KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="
- dev-python/numpy[${PYTHON_USEDEP}]"
+ || (
+ dev-python/numpy-python2[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ )"
DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pygtk/Manifest b/dev-python/pygtk/Manifest
index 66d2d9ebc6ae..59468f2e6eec 100644
--- a/dev-python/pygtk/Manifest
+++ b/dev-python/pygtk/Manifest
@@ -5,5 +5,5 @@ AUX pygtk-2.24.0-quartz-objc.patch 1023 BLAKE2B 2fca6b1b92f424e853a6724857372f70
AUX pygtk-2.24.0-test-fail.patch 248 BLAKE2B b71575b455e5e5ba740f412d199572d7be2f2290f84d047bab45c7ed464a029bb23ab9696a96b42b69575d2a977ecbd2fa63ced9b325b456a341f756ce00314d SHA512 e306324fa5542c492942c3a3f0be4d6a53f5641fff4362507195afa89bd73722aa2f65563ce7a8000d04b7824f69d840d3a8a53b8ec39bc31b97d2d215ebfde3
AUX pygtk-2.24.0-test_dialog.patch 961 BLAKE2B 035021b5a4a94e487f8e4fdd69b83e54d2baea1891ce1bf8378e7375749de4a45477acdfe2a07e259d907bb182c2951bb512e7ded0ffdeed138ab4fce81f81b7 SHA512 13254063895412641b51cb536892f2c4b9bb76ac1ffa92f8d82fa20b80f5c7748392a968315af3731def20392de917a0ae2b4ac0607cee9e2f38911283d33ca9
DIST pygtk-2.24.0.tar.bz2 2361097 BLAKE2B 35b8ad94f242dcfb5d0593762eaa5480928e63bfbf8d030dd199200daa1dd6fd1769c878517cbb56e3beeaeecedb554b06b04cc35f9b2eefd2d8ec4381daf707 SHA512 64f4344fcf7636e0b2016ffd5310250b5c02a1bf87e44aef39b5d4cf4a5fc50d27cb4f030d4c6802cff61fffb88dee7752821e3d8a4cd1c34dc3745d9ff2f0da
-EBUILD pygtk-2.24.0-r4.ebuild 2706 BLAKE2B bd1998c3b0eabed7e959361cc70e352442289e0fcaa912bb17215ca21739a56efc175ee851930b2eac84333a0eee079168efd9322a5a02cfe0b3c0a05453d210 SHA512 7a7866815304df49b61bcbf2cca951862d3010944619a82c7615b3bcd59cb8178dc1b78569f7baa6a549e69aafe91b1aa64f974353864527d739364891b6a2ee
+EBUILD pygtk-2.24.0-r4.ebuild 2778 BLAKE2B 1d07efae21f28472f545d137c874facde194c1468a716bb71190fd3b720e2319f77bb05ddef9e97f0303e03e71a7c11b078786d661e5b4c498a91a6d31f27b9d SHA512 7967f3528e53178788a93595bf7b66e2e42ec12e3a58f7a7521ff59a4204f0c499c4eb8f976fa9fe04c5da18d1973071fec723f5b824a969f257ffcb164d6724
MISC metadata.xml 1105 BLAKE2B 271b1e6baf35487a0746bdb5eebe9a9f7c8f5dc2b14806e717a3fc3b468c063609c0693b3ee881e4538ca789926b5a9987f9fcac1746709f1ba19c36949af72c SHA512 037cab51c9a9cab4649559886753432a9e204dfd3fb2f145946a805fda17c3b544014d10b8b59a5b4b3d8e97d15a0048cd6f295bbca36515e963d52e9ad6181c
diff --git a/dev-python/pygtk/pygtk-2.24.0-r4.ebuild b/dev-python/pygtk/pygtk-2.24.0-r4.ebuild
index b37ea3474c4f..1e78941ac11a 100644
--- a/dev-python/pygtk/pygtk-2.24.0-r4.ebuild
+++ b/dev-python/pygtk/pygtk-2.24.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -25,7 +25,10 @@ RDEPEND="${PYTHON_DEPS}
>=x11-libs/gtk+-2.24:2
>=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}]
>=dev-python/pygobject-2.26.8-r53:2[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
+ || (
+ >=dev-python/numpy-python2-1.16.5[${PYTHON_USEDEP}]
+ <dev-python/numpy-1.17.4[${PYTHON_USEDEP}]
+ )
>=gnome-base/libglade-2.5:2.0
"
DEPEND="${RDEPEND}
diff --git a/dev-python/pyilmbase/Manifest b/dev-python/pyilmbase/Manifest
index 96746fb84667..027709278498 100644
--- a/dev-python/pyilmbase/Manifest
+++ b/dev-python/pyilmbase/Manifest
@@ -1,5 +1,5 @@
AUX pyilmbase-2.3.0-fix-build-system.patch 1169 BLAKE2B 6afa0faf264ffb4c863a148684d162ef3154fa2802cffb2802315933e5df4781fc24d9fca23a985627a29d123a53cd4d6815beaa3b56487cace67896a22ae57c SHA512 691cdeec3361954fd41c085b38f8ec3a2a6a024ac174aeecb2b32df83844c3e25dbffcb3905b91e0b516eea6ac4597a067bb9ac794a25f5d1ac8502094b4095a
AUX pyilmbase-2.3.0-link-pyimath.patch 454 BLAKE2B 5e2bc6d09bb7012f8d0087aa0d76b8a89280349fa978cbf926cd9cbce1b2b611a6862d73da35642e037ba84161e658915831e63ed9aeafac9db5669e38e5c4f4 SHA512 760a217d5af2e8de48f52351bab18370f3a74453135a401d8f5d964d3c445519ddc41a853c989c4f29d492764e42dfbcf4a8bcf839e43164b4bbe3e125e9d1fc
DIST pyilmbase-2.3.0.tar.gz 524975 BLAKE2B 7c3114921392ad29198025c672c366e6c98d2da968ed213ccfb446533b81fae4b78c687aba2108e476e16c4e97f11924799d0b0474ff3f82f17632f886bb6a39 SHA512 c20c26155315f2ae38efc183e5f33e2c18610365f5f1bca7a50363a005ff91c8782177293290ea037cf5f164f9b404f5710ce3cccba862e5e7f830727753589f
-EBUILD pyilmbase-2.3.0.ebuild 1430 BLAKE2B 45eca74d759c47f1338a8e708a303654cb7d4e0118282995e3f5711351f2eddd2187ffc55bba722e47733aaf6ae64b517090e797537885089330a75af0ec3590 SHA512 ca400f9c5b6fdb845ecb80aaba01f4c0ff7e7e88ce85861daaf379ab70469869bfd33bbd647be841d0a745abdae0558e94b7459d74b387a4eaf06b7a057dbf9a
+EBUILD pyilmbase-2.3.0.ebuild 1509 BLAKE2B 50317fb153056ef663b190fa06be7b782c2b2a8f20907ef9c19d71136129e4f58504c6963298f39673a46d782d955a03e5625aee004d25c676c75a53540804ea SHA512 3d614e898140b5bd9536e34cb19fad89ddcd73916820df2c5acb2548bfd009ea337e078de9bf1d441a5156482487c6362eb0853dc18654ceb3c97028591765b6
MISC metadata.xml 537 BLAKE2B 88a1d7d89fac2094eefd766ad23b01c12cc49bff080e83f6ad63318294c97b18ecd83c6d908979ae8345a6601898b7a01295d9db886f0de500e460129d9c4a6a SHA512 c685de970979ac4ad5c3392a4b41b23bb523da5d003e3f6757a8d61fbdf0be1ea2bddc1a756176a9887101cc5bd6e19f5ac7e038e9dc9e5976c676a8817b9a87
diff --git a/dev-python/pyilmbase/pyilmbase-2.3.0.ebuild b/dev-python/pyilmbase/pyilmbase-2.3.0.ebuild
index 82c39de2cb6c..ea1f2d49fe50 100644
--- a/dev-python/pyilmbase/pyilmbase-2.3.0.ebuild
+++ b/dev-python/pyilmbase/pyilmbase-2.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -20,7 +20,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
>=dev-libs/boost-1.62.0-r1[python(+),${PYTHON_USEDEP}]
~media-libs/ilmbase-${PV}:=
- numpy? ( >=dev-python/numpy-1.10.4 )"
+ numpy? (
+ || (
+ dev-python/numpy-python2[${PYTHON_USEDEP}]
+ >=dev-python/numpy-1.10.4[${PYTHON_USEDEP}]
+ )
+ )"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
>=virtual/pkgconfig-0-r1"
diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index 99cdba53b865..c710423311a3 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -1,3 +1,3 @@
DIST pyopencl-2017.2.tar.gz 350145 BLAKE2B 12c481893158f97dec612256b36e710ab52356c8b5f644f3710b5e34d4d10df3b27137ad76f29543fe16b3da725471e206aa5f69c646a79a65246d6091c686a9 SHA512 49f2ff619d8c214a3962b8444e68ba415dda032abaf9eeab259fcd1b21fbaab10bd057035161baef7f0182995834082218a6667464c01645231a94c88aa5c18b
-EBUILD pyopencl-2017.2.ebuild 1277 BLAKE2B acc3228f34f131fcef952401a6136fbdefaf5884ce2c5eb5ba7acc67b21458a0234ce79a1dcebb0c618066d4b4d69e05eb435687e196368df209fcd7e0f093b5 SHA512 6532433103c9f934941470711715a5d2a1b8a0f23061a85b2a4536690cd9a39ea8be57d7da8b9b1a7cf36e188db850b87a23485990321534eafe94f4dce2ea13
+EBUILD pyopencl-2017.2.ebuild 1271 BLAKE2B 39065f9b777f85306a3885ca00064b964035e220267f8b8e0cf54dcaced4bce7817c3de392dc088e12cc851f681da7424fb319a83871bd3ac1b24a32449b2c96 SHA512 4bde1ea332d0121b68135a27c1a6b7455d5c26b5963b8ac4981860fb6eecd6c044603221f9cc4d194c1ddf210d7fa3b5458aa6d92a48e131803fc7750d4cef8a
MISC metadata.xml 311 BLAKE2B 4a843a4ed6ec77f0be47c898b7fc2a402f486d28dabd347983b1ab528e98173babd5f87270183812cf3d5f6cde6866e1a999e750e3dcdb1411d8b3f029eb10cb SHA512 14da0f2cb9db48698adc78e6827c161a93ac3307c0a595fbf69c45839dac9178966fa855193adf2f175685b7be31eb161c0281b3a35ef2e455db62f0ba65dde5
diff --git a/dev-python/pyopencl/pyopencl-2017.2.ebuild b/dev-python/pyopencl/pyopencl-2017.2.ebuild
index 4465b7bb98ac..16d173abc647 100644
--- a/dev-python/pyopencl/pyopencl-2017.2.ebuild
+++ b/dev-python/pyopencl/pyopencl-2017.2.ebuild
@@ -3,7 +3,7 @@
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
inherit distutils-r1
diff --git a/dev-python/pyproj/Manifest b/dev-python/pyproj/Manifest
index 349eea37dc15..c6ddb2a5ed6a 100644
--- a/dev-python/pyproj/Manifest
+++ b/dev-python/pyproj/Manifest
@@ -1,6 +1,6 @@
AUX pyproj-2.4.2-conftest.patch 803 BLAKE2B 60806213e22edaf3457046e46303c95544085d9a870692677a8ef06506a48c7f7f380f4932a5b33f1465a8a0298e15a02033ce9cd690d631bfef9687a60c06b5 SHA512 2d5222ae3a91f61994b9590b08ed513c73be0dbb39b612c1eef4ca4766bef4981b4db23be0fb1ced2a88c3de7b400f8ba5086d4fb8837ed2a43a6cb6c04899f3
DIST pyproj-1.9.5.1.tar.gz 4424543 BLAKE2B cdf954ec0fe794f354b246fcd5afeac01b796f84cc2456efce3e289fcfb12074d7352c9fa7e9d74356199135dfa9814c07da9379f85771dbb7130b8b9b7ecc34 SHA512 b0e0f85be01a3399cb41c4bf29d1a63ecb519fd45d6092a3558060d93c715afafd12f7532c8665839225ad7243e739a117677f6747bf34a0ccbde5e75c85f324
DIST pyproj-2.4.2.tar.gz 463252 BLAKE2B aa80ee3052f42f0d49d02b1dfa3d1790e02fe6aa4092319ff8e827b0a341cff2cb4779891f74919c2b14781d841b3662154882b5f218a22b55ad79397f3eb4a7 SHA512 20f0a742ea5699a6d7a621e93157512478de69ba740bb7b0df46b6d5668f6db93b07e1fc0bf4d089362275ea8edddf3100a972a533ed8b6a0bc56a04a20d4ef9
-EBUILD pyproj-1.9.5.1-r1.ebuild 701 BLAKE2B f75dab7a97febc7503649bd1fded422a58ab07019447d0b0a3d748af18580a3161771dacfd28dc3b158ee2e405da92389e1299df54028543b58125f710fccf45 SHA512 40f6d371ca16d92811c38a070ff390e7544aab4116432d1523e4bdcaa5283768793d12b7dbebd9fb82730352cf191f2d6d79e02696e41c8493ded3a5fdd04316
+EBUILD pyproj-1.9.5.1-r1.ebuild 691 BLAKE2B 27e60fdbfc86157a9d989d375ac61b2638b4779fc93bacd3aa76924cff59705086eb0eeaf5a8f13652fa224480826a833e0e08cd149172aa7e08cdcc857c5279 SHA512 67ec10aff014d47a4554617a22de2bf1ba575bc344c12d092b6fd03d5aa74e316601e4184a34e51917067b9a444367247a2442591ccc1ebcb324ee515eadea0a
EBUILD pyproj-2.4.2.ebuild 877 BLAKE2B 9ec467fb01b28fcf05e3d04beef3a0638e77598859247f88d242b6b67f7b5b89577842856f495f73b65bd867de482a778de1efd15d854f1a2b8dcde5ed908864 SHA512 a4e5f7098396c5a3730f42a2da391895d5750d62f3006c3fdcbb37dd5d469406d15ab964d2b66e4c48bd478827366c6d483b655a8f70a658962ed9271c6c44ca
MISC metadata.xml 413 BLAKE2B 8b30b06984a66d228b50b463a7149f95bfb671d60c3089e88ec11cab7b88fc7c0f044cd879d9e5fec5bc61840c6f35b17e22b93921e3716ce42b3066fe8dedd7 SHA512 84f84c14bce12374abb5014771c1663bb8877d7808e65fe60f698c60b4c7df17db703c6c1c55cb692b0c8f6a94847758e756d6f9bd7e69f59e915b09c71682ea
diff --git a/dev-python/pyproj/pyproj-1.9.5.1-r1.ebuild b/dev-python/pyproj/pyproj-1.9.5.1-r1.ebuild
index dd5d418d0547..f4d3b9f61aed 100644
--- a/dev-python/pyproj/pyproj-1.9.5.1-r1.ebuild
+++ b/dev-python/pyproj/pyproj-1.9.5.1-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
inherit distutils-r1 flag-o-matic
diff --git a/dev-python/pyqtgraph/Manifest b/dev-python/pyqtgraph/Manifest
index 908bc2a9ae27..ab509ec0fea8 100644
--- a/dev-python/pyqtgraph/Manifest
+++ b/dev-python/pyqtgraph/Manifest
@@ -1,4 +1,4 @@
AUX pyqtgraph-0.10.0-qt5.patch 439 BLAKE2B 8c0b5f766adf64d67800873145223ed8f9dda75ce1d5d62784129d827c4dfb9d44bd5532b44dbe42abc6bd67d5b13082c1691d8796c3a53b4ea873faaa2d7f00 SHA512 792a739e1cdc2c7c1ce059945c4a5280f1187a88dd767669fee83fbbdb5c315c022b99c5312c9c53d88afc6d24767fcb93426f6e05b9a5d08db084ba3110cc93
DIST pyqtgraph-0.10.0.tar.gz 704972 BLAKE2B cb1295608536b06de32ea72503b2df2be7f4ae3065b42431542539feec5eb37412e3a7697e2ee97309594b9aecc19c692ef7b45f843f37bd50148a3c0b6e1d31 SHA512 d995da7b4f13ae0009582aebe3f753dc78566dc50ba9314d3a2d37ad4ed8f2fd8bb497a01bb8b37b6d96bf14c071aad018bcbc7224d9dd9b47589a7b5b640d30
-EBUILD pyqtgraph-0.10.0-r1.ebuild 1221 BLAKE2B 2ad4fe97db1bb7ceb368a6a8600abd396d18dbc975ba154e370dcdedbf58b92c8fba7e62a1afceada878dfb44b3d1b2b0972e4a79357ea251d2874a31be4f339 SHA512 a2a15466184f322fc2750d8c0708fd0212054aad8a478053f1e5e99d9b61187c0a00a162a4df2ad984804926919e15e7333b74437a8c36bbf2610f66e041cb9a
+EBUILD pyqtgraph-0.10.0-r1.ebuild 1215 BLAKE2B 8833116f7ddaf849e3ac2eedd5e9adc10216ad90b9349fbc39a71dccf4509ea7d53de8fc2c4fe072cf2164661c6006f5af0a11c72af00c68d6c721c062726dc6 SHA512 f35873f03b177f8b3cf8e46cdd0dc1a11334909f1fd4699a58d87b6aa59413f431733d809a0884d9a1ef7a2128135f6fbb678333e3544bafa0ae2723ed64957c
MISC metadata.xml 725 BLAKE2B 0126a36d5645e5fa0ddcbc46924f78284cb03de5632f84a790415278a91ab650b2e3c7994467e106a0bc4e900f98b0f40ca70416ea2d515b15d4f74320600e70 SHA512 51fdf4a875bc629230c1040ae34cc6b37225dcd18c04a23d3bb6b5da30c79dd7d4c10ee46fd671941d86ee15d548e7a0303bcb48e7796b20036ebb928ebd9078
diff --git a/dev-python/pyqtgraph/pyqtgraph-0.10.0-r1.ebuild b/dev-python/pyqtgraph/pyqtgraph-0.10.0-r1.ebuild
index 52ba9b9bdb91..5ec286616580 100644
--- a/dev-python/pyqtgraph/pyqtgraph-0.10.0-r1.ebuild
+++ b/dev-python/pyqtgraph/pyqtgraph-0.10.0-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
inherit distutils-r1
DESCRIPTION="A pure-python graphics and GUI library built on PyQt and numpy"
diff --git a/dev-python/pytest-arraydiff/Manifest b/dev-python/pytest-arraydiff/Manifest
index 39e0a72f0c0c..a2d4c7b2b9f1 100644
--- a/dev-python/pytest-arraydiff/Manifest
+++ b/dev-python/pytest-arraydiff/Manifest
@@ -1,3 +1,3 @@
DIST pytest-arraydiff-0.1.tar.gz 8752 BLAKE2B c8d262d38aff61b5559f33786bf7cc396bda8dc30789ea349f9955a12722e10f6b48ae862cf6fa526da85e4c52b6b68339d18d0be088e1f831c05fd57becccdd SHA512 321ea04ea7165753cb4d9aff3870d5297f78a0e5ddaf16aecd5dce622f061a2f664479bf8e3af1c7575e968fa66828ed2d0489473e7d8a236c07d1a31adfce5d
-EBUILD pytest-arraydiff-0.1.ebuild 636 BLAKE2B 8778e582220b772a47d1b7efb2af7ca47132bc65af23f2488c25e31748b5fa3d6d0d5d583ce642887970bdd63b7e8c3dfef27dbd68b77030e76de146f857e94d SHA512 230016528dae4915adbefb15581b3825924efd31825b24dcb821b6b757d9c636a5bd31d20941f0eb4a13d3a71a602968cfc2ba15ef4de4436b879f0869e1ebe7
+EBUILD pytest-arraydiff-0.1.ebuild 630 BLAKE2B 36634180c85041cd9c6dc50e8a337de2a3ab1e245bbd407ef38bc9ee667ec2359957925fd4485da975807e1c9bec76a1283964f3222af35e5b39022f4253a77f SHA512 ed8ca35abf45713c9f42da735f2704cd11027050b3042f0e64aef610624c9d8b16769f9bfc4c5731f66620e48b8ed0c1ce3883691b421c944772609d37ee794f
MISC metadata.xml 527 BLAKE2B 47c322c71573827902b8c93fa33d92162c61a31f4764c68f62754296c52929397db1bd7c70a7baaa96fa203adea26ce954e0ca985c799f2f9300c5bcbc122847 SHA512 9138033364e009d0bef6499aa1f5353a72033955df26a26869038783bf847c91e8ebdc1b62908e393c4471285420ddeb01118aff5905227b67aeb924bdf2738c
diff --git a/dev-python/pytest-arraydiff/pytest-arraydiff-0.1.ebuild b/dev-python/pytest-arraydiff/pytest-arraydiff-0.1.ebuild
index 619eff53f067..7352b23f2b3b 100644
--- a/dev-python/pytest-arraydiff/pytest-arraydiff-0.1.ebuild
+++ b/dev-python/pytest-arraydiff/pytest-arraydiff-0.1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
inherit distutils-r1
diff --git a/dev-python/pytools/Manifest b/dev-python/pytools/Manifest
index d0ce5cc42bfa..16457c031d10 100644
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@@ -1,4 +1,4 @@
DIST pytools-2017.4.tar.gz 51339 BLAKE2B 725518ea3aab7fb158134f9539fe1f42603beebb547260e3556466d89b084bcd0adc367bbad63a461553c88eb5c50e2c2f510a02bfb99b9e3affab29eaddf148 SHA512 4f588b725bc478303d539851110ad627baa2768d5d013434ca20e36fa315a842d0f7c3adebd5ae948f642fc5b9ad4940fbe1ee6afeaf0f16c4bc937210e9fa19
-EBUILD pytools-2017.4-r1.ebuild 912 BLAKE2B 7c253e5d64b9dbb66a9cfbb02a4c1d644bf25da9135cc216f571da3a960be0effacf9bbf4e83af240dd463c74564c690ffd333801c8ad47985a4c1b472dd3736 SHA512 a5c96dfb2393d07c5c3a0dfad4e4c44a0b9c1630a9b13dc0891249301b3f5e4e55c1dacdc6b17faa304a9f7ffd4e2dca96b6ebcce044e14dd135ab44ddccae73
-EBUILD pytools-9999.ebuild 887 BLAKE2B a474a8fdd0bbe4cc3b0a17151eb97597ae6ed1496acd46e560efc63373f873df11c18f47ae9cf04f4d030f42aebef25423493208064da73ba3b06107e0c25a8c SHA512 34862b9e6f042c3d11b9471e5c2e5e5e20233e465c882832ed54d11286fbd99fe9ea1fe7710f75cb884761c79625353fe1d884a0405ec06f3b93618b6b28cd96
+EBUILD pytools-2017.4-r1.ebuild 906 BLAKE2B 9ebc6f7ea0ff748a05438614be0ef80328123d09514c10cbef23502ac9303cd513cd480459e2a43c5da0f8866e6280e3c3cb53d111083e207a1fd53eb52c3ddf SHA512 330693c891dedd9f7816e195f572fc12c2df016d1a93abd2cfdb4bfa2db55dee2ac2013563fe29650d032b64b4e56f399d6403839a668400ee44b33960e27874
+EBUILD pytools-9999.ebuild 881 BLAKE2B 22ad545cb3279ce59c4d0dd5864cd5dfb93c4788c3cb3b379ff101c915637a71cce6ae299fed78f6874f12a229dc212df7b831afeb40247987016f44bcbea189 SHA512 28d494bf949533a48b52e01c4361f9fb74ba9d29be73ae5baa6c85be3f4deaf7cbd5bf439196fe25ec0424479456945620493b18e5fdc2477527678890f8ac1d
MISC metadata.xml 365 BLAKE2B 9c5220f78fa8d68a183b9a60a3d2531359b46761a57288ab4d8db1d0485de923e87718dccd6c91d514b7b436d4c292c29e5d4eaef279d9d46fd3113c6995d078 SHA512 5df10be2b52e92d013020a311d433d36b3d98ad030db8ea9d10becf9f1c46d2fc326c1d77cb9f7ec73778fd9716b74468aa2192f003654bf0ebf3b94bf706a5b
diff --git a/dev-python/pytools/pytools-2017.4-r1.ebuild b/dev-python/pytools/pytools-2017.4-r1.ebuild
index 95a01c98b25d..d410d12751d5 100644
--- a/dev-python/pytools/pytools-2017.4-r1.ebuild
+++ b/dev-python/pytools/pytools-2017.4-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
PYTHON_REQ_USE='sqlite'
inherit distutils-r1
diff --git a/dev-python/pytools/pytools-9999.ebuild b/dev-python/pytools/pytools-9999.ebuild
index b797a82b2193..5b1dd65f9e15 100644
--- a/dev-python/pytools/pytools-9999.ebuild
+++ b/dev-python/pytools/pytools-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
PYTHON_REQ_USE='sqlite'
inherit distutils-r1 git-r3
diff --git a/dev-python/pyzbar/Manifest b/dev-python/pyzbar/Manifest
index 9321e7ff664e..3fd92d0dba21 100644
--- a/dev-python/pyzbar/Manifest
+++ b/dev-python/pyzbar/Manifest
@@ -1,5 +1,5 @@
DIST pyzbar-0.1.5.tar.gz 29654 BLAKE2B 2909ccae347139472398ccbf24ab304084946f649694e820bb62f8298076007ac7cb02acf02087e3ed5d59fb8a32f1f6b61b0af50a85753b0dd182029e98bc5c SHA512 785c3e4cc5b44a1035004e4b4dd2ee538613aa021300b84c6183cc457c751fe4b4a419241608ef0e5e548d312596a0d5f4857a7b1388c6cef77fd021a0e0034a
DIST pyzbar-0.1.7.tar.gz 41551 BLAKE2B 497e920935ec6a50557123e2d78709c935284bfcff32705f8aebad3e13ead4ced7d6822adc8f377a94eb21603f81ddc4f563df9bc92b399e6244a9dee12f2163 SHA512 74b56658db7a8dc2d7a716992c001ec52a2befc9e31c41ecf7e5e1f277d4188963ef79a2433fc4befdd15d2f6e3f47c4f064582b530eef028c55e07e2c88dbbe
-EBUILD pyzbar-0.1.5.ebuild 893 BLAKE2B caf5d3a742d185f7e6c2569b11ff40144dd0e11c74fdb6da61867dfad340c8aaa02fa180cd0dc35ac6e0213fb4a7bf280da5ae88808b384337e2b7336e7135b3 SHA512 eac4bd8afd401c3ae21bb0a0213428821071491079cd45fe82919c74ab0c127e3e9f9f5fc89fe2a41075184145dfd33a2ac19ec4fedcfb26c5e1543ffc241b8b
-EBUILD pyzbar-0.1.7.ebuild 893 BLAKE2B caf5d3a742d185f7e6c2569b11ff40144dd0e11c74fdb6da61867dfad340c8aaa02fa180cd0dc35ac6e0213fb4a7bf280da5ae88808b384337e2b7336e7135b3 SHA512 eac4bd8afd401c3ae21bb0a0213428821071491079cd45fe82919c74ab0c127e3e9f9f5fc89fe2a41075184145dfd33a2ac19ec4fedcfb26c5e1543ffc241b8b
+EBUILD pyzbar-0.1.5.ebuild 883 BLAKE2B 3c841c6fc3eb8f8262d82b3b41cb5efae65ff8e23223ee21dfbcc164bcef27e35ee8da586fe71dd4520765708c049f9d59ee0b536bfb0d058b0871592b5a2ca4 SHA512 f05ae9d443c9af6aa56975198395b70fc25cf4f8d8b88d530536831c4ecfc515b1c269c5c598544e13aed40ba519da988d0d972072a84f40b7fad0c460534f45
+EBUILD pyzbar-0.1.7.ebuild 883 BLAKE2B 3c841c6fc3eb8f8262d82b3b41cb5efae65ff8e23223ee21dfbcc164bcef27e35ee8da586fe71dd4520765708c049f9d59ee0b536bfb0d058b0871592b5a2ca4 SHA512 f05ae9d443c9af6aa56975198395b70fc25cf4f8d8b88d530536831c4ecfc515b1c269c5c598544e13aed40ba519da988d0d972072a84f40b7fad0c460534f45
MISC metadata.xml 381 BLAKE2B 0ce0f75aab60659850e7d04532911feea89a4bccf8ec7826ebfb924416af438d5a2bf7981435a22e825b39881ac20a8b2a0bd93a66b2d7b031c72123033f1d78 SHA512 9b3a37c75a62f1873288ffba45ab105225a90d72e01c7ead253b5a903ec28babe152074cc7595d6398104f8ccc50ebfc71ff72c4e620a7dad1b5e57f767cd118
diff --git a/dev-python/pyzbar/pyzbar-0.1.5.ebuild b/dev-python/pyzbar/pyzbar-0.1.5.ebuild
index b654f76e3a87..addc5815c2fc 100644
--- a/dev-python/pyzbar/pyzbar-0.1.5.ebuild
+++ b/dev-python/pyzbar/pyzbar-0.1.5.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
inherit distutils-r1
DESCRIPTION="Read one-dimensional barcodes and QR codes from Python"
diff --git a/dev-python/pyzbar/pyzbar-0.1.7.ebuild b/dev-python/pyzbar/pyzbar-0.1.7.ebuild
index b654f76e3a87..addc5815c2fc 100644
--- a/dev-python/pyzbar/pyzbar-0.1.7.ebuild
+++ b/dev-python/pyzbar/pyzbar-0.1.7.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
inherit distutils-r1
DESCRIPTION="Read one-dimensional barcodes and QR codes from Python"
diff --git a/dev-python/root_numpy/Manifest b/dev-python/root_numpy/Manifest
index 081d8a9ce465..dc66e717eba8 100644
--- a/dev-python/root_numpy/Manifest
+++ b/dev-python/root_numpy/Manifest
@@ -1,5 +1,3 @@
-DIST root_numpy-4.4.0.tar.gz 441522 BLAKE2B af3b0b08e80e7cba57730cdb32719ad56be914b5329d953693b898f2bb30c19b3bfa7bb4594e7fed819b08a3ba6894580e38d03f9520ecffab7a67daa17898be SHA512 24afa043e4bdaa74412c36ff90ee8c1fc411801d9dc394ab5036035924910a7f4f304c5c90f4c5f389aaee9dda07b0b7e25566e68c4da424f1b4d59e6184f5b2
DIST root_numpy-4.7.3.tar.gz 522432 BLAKE2B 9aab3090c894d8917218a68d83269c0f426ee4e7f81628081e9e710c4239bba5e8f88dcb1d91156cf02c7c36b1ee5d03cdd0c3931ca6e2f3eee6c78201386705 SHA512 7c2684ac0e4e68676304e2a72c7169e0299cfea5b4b63f2525a422974ca83f9c9b4f9f11d992acef7d8565cda7f7a85bd13621513cd7c47f1887aaa0cc46d6e7
-EBUILD root_numpy-4.4.0.ebuild 816 BLAKE2B 90fe0208390b1622aad4a163a8ed77c9ea15aabfe638831c7fffdcb174a39f1333d016370dc5e58597ff0c573f89a4ebfcb9ca9f5648426325f5991f9de34ed8 SHA512 f42312410c8ae5c30601276e50727507d08636fc0a9599f9959d19f9cd25b96a3e85ae034e97f8e81aad679216318c6d000191af6aa75b1abfb5cd4fba6814d5
-EBUILD root_numpy-4.7.3.ebuild 824 BLAKE2B b53c8c51119f55a0aac34e93c925d67d87d9ee7994efdda044124d5b8681d94f3d7ae77643b204e99d0ad04d3fde1ee814220562816a5ba18fd0968828cbf211 SHA512 63431d0cc3ee87a3acc939eddf96c541978be20455697d2006d8ee2efc00b3897692a3bb72afc067edb4bedd47557d3cd5a55770788bee89e9c0822a7b1dc59f
+EBUILD root_numpy-4.7.3.ebuild 818 BLAKE2B 3a40e32386bf2d835cc900394ef89fb94ef9ee7f94412700d8af624a2b8cf424d8bf14f114b895135efcb4c6d693757f579ce2163ee813c6634d50a4a5057387 SHA512 8314d1c7963135d1c7b76d46452f089e9087b9937061644ec13e0717285d43decbd0c3a125e6bcb61ba97a22ef06bb66f569c12b2447f21981e8f2f79e27a613
MISC metadata.xml 898 BLAKE2B f9b4c5ea3d9d901488196239d8076a31acce527480fe3775d1c83545b3436c3c78c21032b7e25d4f8ebe8634dd6c906fa959abe9e68a2b92705aa9864a5afcf3 SHA512 f013cc8dfb3cb8887bb87195d69c765c39262b4d71fbf92bb46a39915b609469a351efc31e130b313bd8379b2a3c41b5927bcd86be5cad8933acf282fad20cb7
diff --git a/dev-python/root_numpy/root_numpy-4.4.0.ebuild b/dev-python/root_numpy/root_numpy-4.4.0.ebuild
deleted file mode 100644
index 9df21e010097..000000000000
--- a/dev-python/root_numpy/root_numpy-4.4.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Interface between ROOT and numpy"
-HOMEPAGE="https://github.com/rootpy/root_numpy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-python/numpy[${PYTHON_USEDEP}]
- sci-physics/root[python,${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
- cd "${BUILD_DIR}" || die
- nosetests -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
- use examples && local EXAMPLES=( tutorial/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/root_numpy/root_numpy-4.7.3.ebuild b/dev-python/root_numpy/root_numpy-4.7.3.ebuild
index 0e4f2ac58248..d76b31455628 100644
--- a/dev-python/root_numpy/root_numpy-4.7.3.ebuild
+++ b/dev-python/root_numpy/root_numpy-4.7.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
inherit distutils-r1
diff --git a/dev-python/six/Manifest b/dev-python/six/Manifest
index ac994b16396c..f2e7ad57cfd6 100644
--- a/dev-python/six/Manifest
+++ b/dev-python/six/Manifest
@@ -1,11 +1,8 @@
-AUX 1.10.0-no-setuptools.patch 545 BLAKE2B e884088c94e36283ce3e9a8df716cf25b040d3c724e0ab7499c2f0c6cff5680ef04461b2a8f56e348e50c88a8f29bda053161f02e1bc5dcff36176179b0722b5 SHA512 f1d5c25815fb9e2ecfccaecef52383d468163feff0391214650f109560282ce2eff51513a60824a15ccc3a5af09fe0411b387314978af9a1f51fccc387521ffe
AUX 1.9.0-mapping.patch 561 BLAKE2B 281a893fa6d0d589eb768c595e8931e4d743be9bc7eb288d87628f6a38c14a220f965430c0a480aecf0652c09155359aff9dff11449e2de3c55d7ef00f2527d3 SHA512 92d5bb1643264a04d5faf36bed16379e8844648a31739921bd97e2dd88e34a9b302c37a12a15a64aceb3d26c53f7cdbcbde2ce8d289a7a43f692af47bf05f58c
-DIST six-1.10.0.tar.gz 29630 BLAKE2B 1f380dbc7a9e746b4a7909de54a58a008a73d7b6c582611b2481475d5d9971c936b1742ea0821c65150694914af72f43155caa54616268735a4bd2447d5b4ba4 SHA512 9a53b7bc8f7e8b358c930eaecf91cc5639176a699830153f586780c3e6d637f1bd31349a69c383574f99da19cb3a36524e7733a318f3572b27aefb69c6409c2e
-DIST six-1.11.0.tar.gz 29860 BLAKE2B de4886ad9af7aa906f9eac213544c99323d74c1988d9abff96ce6fc3eea4464e577511f7c52328cbd9e6989db2128fa8d1ee57f9ce7bfc36b83ff655691b46c9 SHA512 33f246a2e987141e17e5edad9d3537cf3aba0cbdd0bc2a907ea52ce0d674b1474f29c3dd5cc26605fd960396054b189ca5f501708333cad234c223131483fe24
DIST six-1.12.0.tar.gz 32725 BLAKE2B f40621076a7bb2b3b86d9f6ee49056a598e4853c6150952902053b8cfde86e562a7656b6ca3c3108f407d392cf7c1164a61b36142efd565eda909b8733c0bedb SHA512 937728372edf1e0ac13bbd706723d0de35e015c30d0ae41f789c5ed2e3669bb0db70cdc6e036ec2d437a6c4aa0d5d1e727b6d09ac34cca7e4e92e5d3b4775151
DIST six-1.13.0.tar.gz 33726 BLAKE2B 9910a72eea4adc030710b67252d01fd74ce4205bd4e0ccf662bb2bce8837853cf341c765e4f9ba2db3aaeca050dd2b1ccabefacf5c71383dad1d275326313ef6 SHA512 55eb8e23e529cb0d2ab9e7c85868e695f36c8235e914b1548eb4b9fd561e4237266bf1839457f15a9513d57a343cbf8ab809d6187499300791fd9356854fcb00
-EBUILD six-1.10.0.ebuild 1808 BLAKE2B 1e879d66f425baa518b6574ced30f94d16fd6f40cadf478c0d5faedfb7c1de076142f575c6f95a50aaaeb70585f3ae938173935b5ea9e542d7262f16b2ea819e SHA512 e1ffa907c78c1f3f4524c8402c01947f95bce12f144038a37bff1610f68be29b79424187c345435983e930b363a917f806b26841981bc0b2a68b1c78f48be17d
-EBUILD six-1.11.0.ebuild 1076 BLAKE2B 60f82dac0f0dd2d410d96b709a83a599405408812a186e7739ce2935cb64990cb2002632342b081a96e53610eb9afde6eec491c5cf713706fb609a362d226ed6 SHA512 af0509c47479ce9822f7039c335d254b543a161d3b20e139d0f6d2bbf3fd51b51789e5c28fd163b5c24d14e79dccda4907ac7feff388170d35b36bc6b302ba80
+DIST six-1.14.0.tar.gz 33857 BLAKE2B 711ef5b79118c1280c9868688869cc475668c248e6b0c2061145818842d5b4c28809d86b1388709af24f6e92fe5926ea6261f1b85c62db749f79664cbad93e4d SHA512 4dea0f4e7961e8b582d665501c65852dc3b73516a0b6f78b0888c8670f1450df58bd3eea418777f41080b842ab6c3d8633be1034bcf920192e5590d5316e2c9e
EBUILD six-1.12.0.ebuild 1076 BLAKE2B b2bb88413cfab571026d7154338dec8e2f168673ce5648391c094ec4065c86994420f79f43777f4428cf77a5e7d6fa905ea954e9d9113dccdc898fdec3e502c4 SHA512 9d3f4460cc9724bcb25a15c08d842fb7756b9e9469984934da105efb906681dd00da57995f4e3e2364bdbbd86c701cc3803f1bdf0d565d08057748680dbeaf7b
EBUILD six-1.13.0.ebuild 965 BLAKE2B b17cced2a16ca0172e4895df375638e24f22d920c191eb4af89680f522da2e09eb6ffe03cbc007a8f065c86a1133f2afb2212a4d0f618e97019802455a483269 SHA512 79178727a2f1b4dfa42d90f6cbb53693a8ee176550956638339cf723447710ff3017fee46a214832f029151ee45f2a4ac67d90a4fb3cb22a0ddf4411f1e04c93
+EBUILD six-1.14.0.ebuild 689 BLAKE2B 4335b911f57b5c84894f26e97e329919d82d17cccd7547a646f603b2fb56beb304c8019388a62ae700bdc55ebbc78422cd8309dec992b69fccf53835b9aed812 SHA512 76e1a6398ee5dcc1971a6d101860a83d4c14af2ced60b34602fc2e1753ec7429fefab944a36f7cd2dbed74de7943461f94ec30f24bb9a939ed769bc0a102aaa2
MISC metadata.xml 371 BLAKE2B 475b717d4c4bced0454ee0244b5d30f178098ff45b2fc7d168b41f446c4e8f3f2dc022ccadb953d6f4e905f95e38769657d42fb4d80157c816d6e7b5eddb33c2 SHA512 8171125815ab60f7c9a2756367ee6532fd862c5f411ff828b6555e4e21e6d43672f2c764f92134f6625abb161380bdbb739af259ba88c974cf3583f35af76a91
diff --git a/dev-python/six/files/1.10.0-no-setuptools.patch b/dev-python/six/files/1.10.0-no-setuptools.patch
deleted file mode 100644
index d4309181902a..000000000000
--- a/dev-python/six/files/1.10.0-no-setuptools.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Force distutils to avoid depending on setuptools
-
-distutils and setuptools have differing behavior in regard to egg-info
-directories versus files, so we need to ensure that no automagic behavior
-occurs here.
-
-We cannot hard-depend on setuptools due to a circular dependency.
-
-diff --git a/setup.py b/setup.py
---- a/setup.py
-+++ b/setup.py
-@@ -1,9 +1,6 @@
- from __future__ import with_statement
-
--try:
-- from setuptools import setup
--except ImportError:
-- from distutils.core import setup
-+from distutils.core import setup
-
- import six
-
diff --git a/dev-python/six/six-1.10.0.ebuild b/dev-python/six/six-1.10.0.ebuild
deleted file mode 100644
index 97b6b912bdb7..000000000000
--- a/dev-python/six/six-1.10.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python 2 and 3 compatibility library"
-HOMEPAGE="https://github.com/benjaminp/six https://pypi.org/project/six/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- doc? ( dev-python/sphinx )
- test? ( >=dev-python/pytest-2.2.0[${PYTHON_USEDEP}] )"
-
-PATCHES=(
- "${FILESDIR}"/1.10.0-no-setuptools.patch
- "${FILESDIR}"/1.9.0-mapping.patch
-)
-
-python_prepare_all() {
- # https://bitbucket.org/gutworth/six/issues/139/
- sed \
- -e 's:test_assertCountEqual:_&:g' \
- -e 's:test_assertRegex:_&:g' \
- -e 's:test_assertRaisesRegex:_&:g' \
- -i test_six.py || die
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- use doc && emake -C documentation html
-}
-
-python_test() {
- py.test -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( documentation/_build/html/ )
- distutils-r1_python_install_all
-}
-
-# Remove pkg_preinst in the next version bump
-pkg_preinst() {
- # https://bugs.gentoo.org/585146
- cd "${HOME}" || die
-
- _cleanup() {
- local pyver=$("${PYTHON}" -c "from distutils.sysconfig import get_python_version; print(get_python_version())")
- local egginfo="${ROOT%/}$(python_get_sitedir)/${P}-py${pyver}.egg-info"
- if [[ -d ${egginfo} ]]; then
- echo rm -r "${egginfo}"
- rm -r "${egginfo}" || die "Failed to remove egg-info directory"
- fi
- }
- python_foreach_impl _cleanup
-}
diff --git a/dev-python/six/six-1.11.0.ebuild b/dev-python/six/six-1.11.0.ebuild
deleted file mode 100644
index b8c67bbc0b26..000000000000
--- a/dev-python/six/six-1.11.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python 2 and 3 compatibility library"
-HOMEPAGE="https://github.com/benjaminp/six https://pypi.org/project/six/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx )
- test? ( >=dev-python/pytest-2.2.0[${PYTHON_USEDEP}] )"
-
-PATCHES=(
- "${FILESDIR}"/1.9.0-mapping.patch
-)
-
-python_compile_all() {
- use doc && emake -C documentation html
-}
-
-python_test() {
- py.test -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( documentation/_build/html/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/six/six-1.14.0.ebuild b/dev-python/six/six-1.14.0.ebuild
new file mode 100644
index 000000000000..5b72b414e38a
--- /dev/null
+++ b/dev-python/six/six-1.14.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python 2 and 3 compatibility library"
+HOMEPAGE="https://github.com/benjaminp/six https://pypi.org/project/six/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc"
+
+distutils_enable_sphinx documentation
+distutils_enable_tests pytest
diff --git a/dev-python/symengine/Manifest b/dev-python/symengine/Manifest
index 09e415385305..e02ea17d3ff1 100644
--- a/dev-python/symengine/Manifest
+++ b/dev-python/symengine/Manifest
@@ -1,5 +1,5 @@
DIST symengine.py-0.3.0.tar.gz 90877 BLAKE2B 8e1bf5741eb0c6ff6fd954b9f8b1827afcde61e55f0c5d6ada96bdc16d164003b21a51c2b485bc635d1f87e449c422f50e6bc8fca7371996dba7fdc096b0798b SHA512 9f43d572990744a93f4046920b09c80aff3ffa0e5735b2372298a65755140dee6c2c22c9c9fd964622f03379e31a1f1415d0051b213dda943ffc8e839059c7c6
DIST symengine.py-0.5.1.tar.gz 110864 BLAKE2B 30309b87cc612df37fca94df5c3199401a2cff9fd782de2fa00910bf17a1bb2debfb851aefc6178a38eafe49055950b76373c6e9a81a2fe5814497c2894b5f8e SHA512 85df42245daad0387886f003a593e8d45f34e51db4ed207f6bb70f573704a33f24a1cbe30f1c67c2c1541f1e800208c90b3ce3ec35c9d4eab05bbdb5be570ef5
-EBUILD symengine-0.3.0.ebuild 968 BLAKE2B 3e6bd30cf2c16c1e21d012365355366b3e96ce03bb8c7327e623ff5c93b00baaba334d57bc34d6e7f92306870f3a8148c364429315915919530839272774bab7 SHA512 5d8b261d224d83b7e5c8fe7c290f29ec2fde7d59c87472616a6668575ffdf858ddf28577129f1b66b8575cf4a0a33f1a17c432e0b22f620ae9512eb34a886bb7
-EBUILD symengine-0.5.1.ebuild 974 BLAKE2B 657a8e0ee0f3d40ab0ed21568886087b04ac417e5d46282c09cef6d4c425770f64cc771e60f078895ae95e93922106ef905c98425a3a9f71235b92fc6f604af9 SHA512 96fbc23e08aa89b92dc7337f40b3477f4eeaa4e68f861cc02c6b20e7a4ff6c942e3b8eef6187fdaae26d8bf14ffc0d787b74681e6abc70d8b124a7e4dad8c4e5
+EBUILD symengine-0.3.0.ebuild 964 BLAKE2B bfb4c9543bd53fd77ea8a4668201caa078f2f882432995230f890ecb0d7cd34f5e3b4fe57416360c644e4679e50d18203b23ca045223f9dc6e7c1e277e77735d SHA512 106fe025369f2a939b008d73955fd3d311825b1d5dd9f563965d8d68bc49f318bde25d27c6e428c4bd8287b7f77fd584a0fee73a76c352dd6124f85b5c6c8c2d
+EBUILD symengine-0.5.1.ebuild 970 BLAKE2B 25b6c78fc0191f44b3db8f2ac678b5af81abdbd67b832b0e7aed0fb3031226e9297c7c0bfdb415e46f5d7a6a5a519a7b94fb65c1ae514b02ea0abe32da477ee4 SHA512 20eab49f4244cba2a1f7b341ac427ddf3d1795de7df74aebcbcc88a92fc275113eb2fbcc20d0dd9d9a27020f12c29dd3b74d19f6d99edf6837487a7e0f09fbe1
MISC metadata.xml 499 BLAKE2B f8fdd047ee3852b23514589163dc6ff82dfb69c93b8c00e8ee35af3a8a819a3e83051c4acc634a03044caf12cf47a96f892ef5ccb491da55ec4a3f14b4475455 SHA512 e3b01c1a5e3417fff75d843b24a20597c15900defd0efad954831b61a03980c9163fc596bb22ae4fe4cb5162cd492c383247560ced28c395467e1facc49cd573
diff --git a/dev-python/symengine/symengine-0.3.0.ebuild b/dev-python/symengine/symengine-0.3.0.ebuild
index 91da4535de47..02332c4b7034 100644
--- a/dev-python/symengine/symengine-0.3.0.ebuild
+++ b/dev-python/symengine/symengine-0.3.0.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
inherit distutils-r1
diff --git a/dev-python/symengine/symengine-0.5.1.ebuild b/dev-python/symengine/symengine-0.5.1.ebuild
index 531654017bce..010852d47458 100644
--- a/dev-python/symengine/symengine-0.5.1.ebuild
+++ b/dev-python/symengine/symengine-0.5.1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
inherit distutils-r1
diff --git a/dev-python/sympy/Manifest b/dev-python/sympy/Manifest
index 9f44ad6ca25c..db15ba2c3067 100644
--- a/dev-python/sympy/Manifest
+++ b/dev-python/sympy/Manifest
@@ -5,8 +5,8 @@ DIST sympy-1.0.tar.gz 4281528 BLAKE2B b222be6ec486a01ac73e9778a7423aab45e3683860
DIST sympy-1.3.tar.gz 5885611 BLAKE2B 14b0639960432cd6aac087a57f81a80497a0bc40ed61eae92166cf5549deaefc611ce63c2e7a89922374e9bb902fb0a7402f5a4e425278f34c028cdc3582eb35 SHA512 3b47dcf80e9a0ca7d65860907264bbcd6f6022275c717784cd165a7a824dca3471bc5a3be9d1af6ab31e04b29f7d5305713fc47ccb67f798f45281e0ab7e03bf
DIST sympy-1.5.1.tar.gz 6815997 BLAKE2B bc74d01fdf2ccea6b83a06c11f810e3d105e9d35b397c8b87a1bcc4e316d00c456f576baf57d1b4a6175e056dec58f05fbb05893519775ffa252ac018452d2ff SHA512 3c4220243d2cbcff9eedb2a7986431b5b4d7d0007c78208a60b21830c9a3528d2171086874c42205c1227f779e44c19b9562943e2935d329bc352e7ea85396c7
DIST sympy-1.5.tar.gz 6294079 BLAKE2B ee6764264d87454c9713a6e99b70b123e1cc2d36a691287a53e8b69a548df5503168989afa2ca85a08cd5f6792c952e5556352fde07332b1fe47b3746d02b47a SHA512 882ed99cbc7333cbed85d247d04a764a92855e3d26cee96163d18ece566115b9d38999bbe022225521834037dbdfc4c567548112dfddd5ece65af8f672a06091
-EBUILD sympy-1.0-r1.ebuild 2783 BLAKE2B 8e97b96c138dc1ecf12b771c7677c8d183888691f4c52c440a0a18c338118b495524fea9cad5aa93bd99ab6469a3d1d352b59fb2cb95cb56dc0e97facb272355 SHA512 e63b12d6509803108174c1254d9e26ad64d9f7b1f15115bf3da291d9bd03cb665713811d6bd954af3ae9ee188045d47cd1c9a5d5e966b6585c396e6cf4dcb9fb
-EBUILD sympy-1.3.ebuild 2688 BLAKE2B 58e68096e5390f576f8f9fc9d56729001c73252594e27fc3bd710eaa0fd4f5858056a522e2f492878d720b3353efebb463770677da7395ed4729ababc203ac7a SHA512 3d31d6e412f211023e80a82815ec2499737b0ff83cd6f7bb5e52e3324c1d3d45a8374ef46bddec938514bf55a19873d84963547972fed77a912cb5f6f24e40a6
-EBUILD sympy-1.5.1.ebuild 2658 BLAKE2B bf80f17cb99075edccdda39552bf406b13e0a9ece891671c12159c4a9379d9e0b9123d867a6a0b58ce88ce2b5c488b42104387ce3efefa790e61a3edf09b5005 SHA512 93843bfe83f2a155c574840b61fbfaab899a022a1caee2f5d3c2046a2a13336219df20c3e64daac87a8b4f2d6cbd54656343783946e2899ed5c8713a80488f27
-EBUILD sympy-1.5.ebuild 2646 BLAKE2B 01367bb54076e40fe654f317a84a1451410e744f92aeb41e8e8dbd2f02ff7d480a6ae571e0fc03bbad06f818895191ff9bbcb3ea6562c5c50310a6af231dfda1 SHA512 0e3ac939be5306dc402e2c2ae808e600758b2919c20c2efbc0cfeccd5a18bf59ac44e06d9a79202e6e536415ee916340574f4b4969fe872de556ee9ae6b463a6
+EBUILD sympy-1.0-r1.ebuild 1835 BLAKE2B 1368333592aea1b621105ee4a1dcfad793308494e16b928b3aa617aa2c4fd4981bad8e9d496ad5014d5bd75d3a37ea00d3a4614ad9b3c4b4ba005ec67762a6b2 SHA512 7af2c4c82a66f114a6ef1f27825ac15dc81ffa612c3a78a65b4964d8d54cb7e0eaa1633d6082917c4460fab26ba9b0a5d26e6098a83b933db029dec2bb313958
+EBUILD sympy-1.3.ebuild 2001 BLAKE2B 5b093b8dd2b9f3444d5989f9040f5671aff393e19fd18d56d7586b1e99d2846214b62d38060b89f17ba722fe2a3c0d8d03046e647d531a6632741466c84b100f SHA512 0972b1b9437c7b6190b30af365861b19542b03e5284a1d3e895c2b3ede892da1c7d1080bf958a92b1d862e9f43c5a6b231514e809351129a0e3a597349dc31ba
+EBUILD sympy-1.5.1.ebuild 1971 BLAKE2B 4cba72321b539e4e91638814d2ec2d9b18f3efa48848766798e762833ba6c45a1b2e4b637136b2538de08bb5943176c540971dfc4827c9a8f67854e41e0b935f SHA512 de4ec2eea57e752adc60ac279c42589e76eca783b52d973812519c219a0f258fb25e0107f6dd647a49e0bcb86b5a194156e2cfeae911ac1e623ff5b15c6f8df4
+EBUILD sympy-1.5.ebuild 1959 BLAKE2B 23ee8b172fda1e860bceb596e71a4c1d190f18a3ace80a3a04964cb00e66ecefcb204e5f24333dd3704fe3bd46d4ae912eb6ea7dd3a10ab7ae1172a6c77cbd8f SHA512 8c548b1868a3e5bae7b63c279b53eb7082f7c065a34b229362e85ef7e28de393164b653d58e491efd008a767f81da76ce2ba0b00b7855b23c5226a55ace4a22f
MISC metadata.xml 1476 BLAKE2B d6a0d7816ae7c0c2d61d6f584b9c872d0169053d43bb604f66ff242721df6f74788ade3de06b23db53239dc0da1182beda16c86eb7e7b383fb0964b13eca1883 SHA512 99d6eb86839fd09abd4db55783e028c6f97c9d0dfa8d68ceda881e6ca981f86877e55a0a83d34b432833f0824a896eea8af35eb9ea499bffe0c62e1e0a27c3c2
diff --git a/dev-python/sympy/sympy-1.0-r1.ebuild b/dev-python/sympy/sympy-1.0-r1.ebuild
index ee681475875f..a1b4f8b591ef 100644
--- a/dev-python/sympy/sympy-1.0-r1.ebuild
+++ b/dev-python/sympy/sympy-1.0-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
inherit distutils-r1 eutils virtualx
@@ -14,15 +14,13 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples gtk imaging ipython latex mathml opengl pdf png pyglet test texmacs theano"
+IUSE="examples gtk imaging ipython latex mathml opengl pdf png test texmacs"
RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
- doc? ( || ( $(python_gen_useflags 'python2*') ) )
ipython? ( || ( $(python_gen_useflags -3) ) )"
RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '>=dev-python/pexpect-2.0[${PYTHON_USEDEP}]' python2_7)
imaging? ( dev-python/pillow[${PYTHON_USEDEP}] )
ipython? ( $(python_gen_cond_dep 'dev-python/ipython[${PYTHON_USEDEP}]' -3) )
latex? (
@@ -33,23 +31,15 @@ RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}]
)
mathml? (
dev-libs/libxml2:2[${PYTHON_USEDEP}]
- $(python_gen_cond_dep 'dev-libs/libxslt[${PYTHON_USEDEP}]' python2_7)
gtk? ( x11-libs/gtkmathview[gtk] )
)
opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
- pyglet? ( $(python_gen_cond_dep 'dev-python/pyglet[${PYTHON_USEDEP}]' python2_7) )
texmacs? ( app-office/texmacs )
- theano? ( $(python_gen_cond_dep 'dev-python/theano[${PYTHON_USEDEP}]' python2_7) )
"
DEPEND="${RDEPEND}
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] app-text/docbook2X )
test? ( ${RDEPEND} dev-python/pytest[${PYTHON_USEDEP}] )"
-pkg_setup() {
- use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
-}
-
python_prepare_all() {
epatch "${FILESDIR}"/${P}-doc-makefile.patch
epatch "${FILESDIR}"/${P}-zeta.patch
@@ -60,15 +50,6 @@ python_compile() {
PYTHONPATH="." distutils-r1_python_compile
}
-python_compile_all() {
- if use doc; then
- export XDG_CONFIG_HOME="${T}/config-dir"
- mkdir "${XDG_CONFIG_HOME}" || die
- chmod 0700 "${XDG_CONFIG_HOME}" || die
- emake -j1 -C doc html info man cheatsheet
- fi
-}
-
python_test() {
virtx "${PYTHON}" setup.py test
}
@@ -79,12 +60,6 @@ python_install() {
python_install_all() {
local DOCS=( AUTHORS README.rst )
- if use doc; then
- DOCS+=( doc/_build/cheatsheet/cheatsheet.pdf \
- doc/_build/cheatsheet/combinatoric_cheatsheet.pdf )
- local HTML_DOCS=( doc/_build/html/. )
- doinfo doc/_build/texinfo/${PN}.info
- fi
use examples && local EXAMPLES=( examples/. )
distutils-r1_python_install_all
diff --git a/dev-python/sympy/sympy-1.3.ebuild b/dev-python/sympy/sympy-1.3.ebuild
index 966444c34242..078dc48e8f85 100644
--- a/dev-python/sympy/sympy-1.3.ebuild
+++ b/dev-python/sympy/sympy-1.3.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
inherit distutils-r1 eutils virtualx
@@ -14,10 +14,9 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples gtk imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs theano"
+IUSE="examples gtk imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs theano"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
- doc? ( || ( $(python_gen_useflags 'python2*') ) )
ipython? ( || ( $(python_gen_useflags -3) ) )"
RESTRICT="test"
@@ -36,7 +35,6 @@ RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}]
)
mathml? (
dev-libs/libxml2:2[${PYTHON_USEDEP}]
- $(python_gen_cond_dep 'dev-libs/libxslt[${PYTHON_USEDEP}]' python2_7)
gtk? ( x11-libs/gtkmathview[gtk] )
)
opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
@@ -47,36 +45,16 @@ RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] app-text/docbook2X )
test? ( ${RDEPEND} dev-python/pytest[${PYTHON_USEDEP}] )"
PATCHES=( "${FILESDIR}"/${P}-eta.patch )
-pkg_setup() {
- use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
-}
-
-python_compile_all() {
- if use doc; then
- export XDG_CONFIG_HOME="${T}/config-dir"
- mkdir "${XDG_CONFIG_HOME}" || die
- chmod 0700 "${XDG_CONFIG_HOME}" || die
- emake -j1 -C doc html info man cheatsheet
- fi
-}
-
python_test() {
virtx "${PYTHON}" setup.py test
}
python_install_all() {
local DOCS=( AUTHORS README.rst )
- if use doc; then
- DOCS+=( doc/_build/cheatsheet/cheatsheet.pdf \
- doc/_build/cheatsheet/combinatoric_cheatsheet.pdf )
- local HTML_DOCS=( doc/_build/html/. )
- doinfo doc/_build/texinfo/${PN}.info
- fi
if use examples; then
dodoc -r examples
docompress -x /usr/share/doc/${PF}/examples
diff --git a/dev-python/sympy/sympy-1.5.1.ebuild b/dev-python/sympy/sympy-1.5.1.ebuild
index 379c5702f687..5ecc82a06a54 100644
--- a/dev-python/sympy/sympy-1.5.1.ebuild
+++ b/dev-python/sympy/sympy-1.5.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
inherit distutils-r1 eutils virtualx
@@ -14,10 +14,9 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples gtk imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs theano"
+IUSE="examples gtk imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs theano"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
- doc? ( || ( $(python_gen_useflags 'python2*') ) )
ipython? ( || ( $(python_gen_useflags -3) ) )"
RESTRICT="test"
@@ -36,7 +35,6 @@ RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}]
)
mathml? (
dev-libs/libxml2:2[${PYTHON_USEDEP}]
- $(python_gen_cond_dep 'dev-libs/libxslt[${PYTHON_USEDEP}]' python2_7)
gtk? ( x11-libs/gtkmathview[gtk] )
)
opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
@@ -47,36 +45,16 @@ RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] app-text/docbook2X )
test? ( ${RDEPEND} dev-python/pytest[${PYTHON_USEDEP}] )"
S="${WORKDIR}/${PN}-${P}"
-pkg_setup() {
- use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
-}
-
-python_compile_all() {
- if use doc; then
- export XDG_CONFIG_HOME="${T}/config-dir"
- mkdir "${XDG_CONFIG_HOME}" || die
- chmod 0700 "${XDG_CONFIG_HOME}" || die
- emake -j1 -C doc html info man cheatsheet
- fi
-}
-
python_test() {
virtx "${PYTHON}" setup.py test
}
python_install_all() {
local DOCS=( AUTHORS README.rst )
- if use doc; then
- DOCS+=( doc/_build/cheatsheet/cheatsheet.pdf \
- doc/_build/cheatsheet/combinatoric_cheatsheet.pdf )
- local HTML_DOCS=( doc/_build/html/. )
- doinfo doc/_build/texinfo/${PN}.info
- fi
if use examples; then
dodoc -r examples
docompress -x /usr/share/doc/${PF}/examples
diff --git a/dev-python/sympy/sympy-1.5.ebuild b/dev-python/sympy/sympy-1.5.ebuild
index 8fadc5ca34ac..c8dda8967474 100644
--- a/dev-python/sympy/sympy-1.5.ebuild
+++ b/dev-python/sympy/sympy-1.5.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
inherit distutils-r1 eutils virtualx
@@ -14,10 +14,9 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples gtk imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs theano"
+IUSE="examples gtk imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs theano"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
- doc? ( || ( $(python_gen_useflags 'python2*') ) )
ipython? ( || ( $(python_gen_useflags -3) ) )"
RESTRICT="test"
@@ -36,7 +35,6 @@ RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}]
)
mathml? (
dev-libs/libxml2:2[${PYTHON_USEDEP}]
- $(python_gen_cond_dep 'dev-libs/libxslt[${PYTHON_USEDEP}]' python2_7)
gtk? ( x11-libs/gtkmathview[gtk] )
)
opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
@@ -47,34 +45,14 @@ RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] app-text/docbook2X )
test? ( ${RDEPEND} dev-python/pytest[${PYTHON_USEDEP}] )"
-pkg_setup() {
- use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
-}
-
-python_compile_all() {
- if use doc; then
- export XDG_CONFIG_HOME="${T}/config-dir"
- mkdir "${XDG_CONFIG_HOME}" || die
- chmod 0700 "${XDG_CONFIG_HOME}" || die
- emake -j1 -C doc html info man cheatsheet
- fi
-}
-
python_test() {
virtx "${PYTHON}" setup.py test
}
python_install_all() {
local DOCS=( AUTHORS README.rst )
- if use doc; then
- DOCS+=( doc/_build/cheatsheet/cheatsheet.pdf \
- doc/_build/cheatsheet/combinatoric_cheatsheet.pdf )
- local HTML_DOCS=( doc/_build/html/. )
- doinfo doc/_build/texinfo/${PN}.info
- fi
if use examples; then
dodoc -r examples
docompress -x /usr/share/doc/${PF}/examples
diff --git a/dev-python/tabulate/Manifest b/dev-python/tabulate/Manifest
index b96934e73e12..0c9e9bf76983 100644
--- a/dev-python/tabulate/Manifest
+++ b/dev-python/tabulate/Manifest
@@ -2,7 +2,7 @@ AUX tabulate-0.8.6-avoid-pandas-dep.patch 2513 BLAKE2B afbaef53282fa6b775bd3a1a1
DIST tabulate-0.8.1.tar.gz 45666 BLAKE2B f46a0c8bed50e37a2d536d28fe822fb92fbc124c7ac4c29260b6a7ab9828588f49b7e94ec8925505ef9724b1fb4647e5e9207d29b2f3a2f526641ac7ac229ce0 SHA512 f724fbabee53c738c846a5cf645470f5f97074e2b33eb030b4859478931661dac53e5446d77a656553e2dec323230bb116d350997e1407d794382f537e6dfdf5
DIST tabulate-0.8.3.tar.gz 46234 BLAKE2B 1310de381265bf150cdef72b653175b1ab95a8339bf1934cece830ce9e644ed9d3d441eb3c3721509368334d11160054aa4d75a17751e493c47dbeee22c466e2 SHA512 7f0205a4d80ed0b426a45622a3b8ec0a9b77cf6d67c1207db7fbc20a12e83a15748e63d5f8e5e65fa348b6265fd0cac93be4d04f9c1c182476b93507e1131cbf
DIST tabulate-0.8.6.tar.gz 39420 BLAKE2B 28cd8c175b258b56a406a78d7891919a49c867d848843365605ccdcb8ba0b307f1448967a124d57b0f6264169104c9cccc84982fea666a035a265a3c9f10cc43 SHA512 ec4d7a7f20db306be1a460276e0b1b1e63fd1ca14b208a45a297508bddbc07b034e03fcb5ff67fe5e2b9419f308900675994a6dccef755c975ad0b1e9124072f
-EBUILD tabulate-0.8.1.ebuild 665 BLAKE2B c51906e667a59e6039b2a2da3d25938c5a5ef9b11426dc95553979d41c793c41799d189eaddb0c2d1f011a93c921b40265a6bfb41d25dcfe3c37a4541810a933 SHA512 427ad041eec1d8d3c7ed0cdf18fd728e38368c30830593d74889cf1b0849261b8353ad0215aa28aaaa4b74e739ae3d0f264e1f2766e82c88befc77a9e2ac2f60
-EBUILD tabulate-0.8.3.ebuild 818 BLAKE2B ea5d6feb36cc53ce80cdd47ce524f56b3a612f8671764a2f6bbc136620b512edb475be37623bf042312a1991312a3f91ebb470c2d18dd3bc9ee689926af4d467 SHA512 9a59adfab4d971aa9687b4273889b493987100db095a8d00fc637cdcae9582bab3cab8604a82186fcde224f2a03d9178d30e0704ce94ccea95922de49fa4c3be
-EBUILD tabulate-0.8.6.ebuild 992 BLAKE2B ec3f82522c64417e1d01e2a7960cab41c78cb3b37d79a5418bbaae4f9124b51d3151c4d88dce32e4fe0696acba17928c88d7408dabf7fba243380d8d3342400d SHA512 fe691660ab1dad06615f473ac1d19be098c61924cfa045adc821a0a01750d7c216ea4bdd868d5a0f1fc35b1adc110d673809f58ea5c4bdd4e77479ffb70972b7
+EBUILD tabulate-0.8.1.ebuild 655 BLAKE2B 1a8d6992169cfea663f71b6ff28446ac8a57567eea4ad51abdfb525d173b1b4edaf2373e71b8443c87992cd65858ef52f4633fc534de03c700b78577d4dd1f92 SHA512 98dda5355f6f281df76dde05791a72dfa3cc94aba78a476703eab362f91fcee267f5a04753b034b015b74aa56e437fe06369269bbfb9764757768ef5b5cfbcb4
+EBUILD tabulate-0.8.3.ebuild 808 BLAKE2B a749cb8d4bcbcff2b30471e68f1695bb668839aef526ea14f93aad220a772dd87877a725a3b34e288df5a66aa6e58668ca98fcd7dde37982c9f6117f60b85d0d SHA512 e2a16cfab18988adff1a2f36f6d4bca06f1aec398c36c967ae896fbbf088b43b554f0bc5aa056784418a190d2ea9e2fb78353f7c2502315fe33594df164bbdc9
+EBUILD tabulate-0.8.6.ebuild 982 BLAKE2B 698df77d3265d84a110790e37d12089f0be315d1885549c37eead83d1c5e0970f843f5c57e726877c7a223bec4e91abb2fed3746591f9b3f522dadb46cb2af5a SHA512 c8257afbf817599cb53f785563e958b829b222a4024ecb65ebd8088eedae107c7ebd13ff731a932f03b167f12dd7a5066c96a94b9e0992156f3a82071676bb69
MISC metadata.xml 321 BLAKE2B 8b68baf97f22e2360ba30d2a86e181492217d12162d7717d3f69dff5a51926867d5ac8a227fa93c345e3ddb80036ba97839e7ab22aab5df27ec974048b666a41 SHA512 4967ca411c6ee428e897be2be259da008f9dec1991754235f0e8f79d64b5175e69d460c3cfee72f49faa41704ebda3c46bb2f30fc157e95cec4d8d60ae7ba89d
diff --git a/dev-python/tabulate/tabulate-0.8.1.ebuild b/dev-python/tabulate/tabulate-0.8.1.ebuild
index 668fc09feb52..7511178e7f22 100644
--- a/dev-python/tabulate/tabulate-0.8.1.ebuild
+++ b/dev-python/tabulate/tabulate-0.8.1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
inherit distutils-r1
diff --git a/dev-python/tabulate/tabulate-0.8.3.ebuild b/dev-python/tabulate/tabulate-0.8.3.ebuild
index c84ba20f0fe1..ca367d3640d0 100644
--- a/dev-python/tabulate/tabulate-0.8.3.ebuild
+++ b/dev-python/tabulate/tabulate-0.8.3.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
inherit distutils-r1
diff --git a/dev-python/tabulate/tabulate-0.8.6.ebuild b/dev-python/tabulate/tabulate-0.8.6.ebuild
index ee715933d244..de51686e88fe 100644
--- a/dev-python/tabulate/tabulate-0.8.6.ebuild
+++ b/dev-python/tabulate/tabulate-0.8.6.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
inherit distutils-r1
diff --git a/dev-python/theano/Manifest b/dev-python/theano/Manifest
index 06718980c69b..50ff27ccc880 100644
--- a/dev-python/theano/Manifest
+++ b/dev-python/theano/Manifest
@@ -1,5 +1,3 @@
-DIST Theano-0.7.0.tar.gz 1985387 BLAKE2B 00d547d5d1f6bb4049a1db71442381ae3803be683975ccca7536b8971e066ac1d09a4fc93a7f70693ae052bbf681e0c59a8b30a326f862f870e10422b438f979 SHA512 6e6bf9afdebf3c281d71f5ceda73792e0a52b403b18776a639665767ac73ac4920b5042e29d656d517b8f023e5f9cd5a27086e0456dc40c42abf6f3569da3f06
DIST Theano-1.0.4.tar.gz 2840691 BLAKE2B 7f89caee3dd50d75ff09693fde7926f2b7da0f94758ef932f207feea29d74d38ed56591e6ebe0b46cfa043d5fb46d5b97028171acdfd324a01eb7b904169b4ac SHA512 3cc7f9dbb606c3c997c8651c34dd861721d5a8b99d06ed0887306d5a5ad0d7e402fbe29dcb5ad2f513b3bf75966e41a2854ebdf9a4fb212607345f84f367de8c
-EBUILD theano-0.7.0.ebuild 1029 BLAKE2B 1102c18021f02a5b612e5dfa4c31c854353d1903970464a43e169763b6f36ca13c41bd1244dd138e647b0e3d1237338277bd71bb044465ac8ba6a6bb557dc28a SHA512 874a719f06de4ff493aaf8696300414a475362b78ae0640e8e68e0b68d4cbf939470c9f90b7ca75033a365e5807f9a5879b1baff99477e930a90cd3769f95b39
-EBUILD theano-1.0.4.ebuild 1278 BLAKE2B e0add6415b33061b306ca6463f74bac16cf865545c2bd7df032ac31224855f15c7682472de3a2db29d060d67670e6f22dac7e1e8d49096a6979c0ebc36463bdf SHA512 8ca3bbf382b43eaef044985f2db4d9f89d3842c7c30e7169d14051189fb36f025dbd0aff9403f2e1d2d66fbd806adf3ccb207f92406e44dbf0e67a0d4fa55761
+EBUILD theano-1.0.4.ebuild 1259 BLAKE2B db6bdbee3a83a1dae23f4f8b94ff19a90ee4c9a417213884d0c89319ff71c934d194bf5c860af42d7edf0795b5cbb132d2f33da33df9ae73b67eaef80cb7a966 SHA512 6944b8c5e16f08f37f6b07de04865974998d5bf3175f009ca1d5311f4ff9068efb6d8145747c8419eb6e17d7ba5aa4feccfd029c285c3dc55f40cb130a3e275f
MISC metadata.xml 632 BLAKE2B 2bee1d4912596b45d3f5cc0528a927078a072091148dfce38892319b91a0635859fa91dea32565b4a7f5ed02726364a50870bab22197c57ff33c88a48ad9d223 SHA512 653fc6d180455ee24967e70f78682ed2a7e61022d6867390b4c4eb994699b3f293bafe45b4fcf1c4ace3f102acba41c5491e8fb39b9f6102f1022a2c51955ef7
diff --git a/dev-python/theano/theano-0.7.0.ebuild b/dev-python/theano/theano-0.7.0.ebuild
deleted file mode 100644
index 9765e72f92ac..000000000000
--- a/dev-python/theano/theano-0.7.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 versionator
-
-MYPN=Theano
-MYP=${MYPN}-$(replace_version_separator 3 '')
-
-DESCRIPTION="Define and optimize multi-dimensional arrays mathematical expressions"
-HOMEPAGE="https://github.com/Theano/Theano"
-SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-IUSE="test"
-RESTRICT="!test? ( test )"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
- >=dev-python/numpy-1.6.2[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- >=sci-libs/scipy-0.11[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MYP}"
-
-python_prepare_all() {
- find -type f -name "*.py" -exec \
- sed \
- -e 's:theano.compat.six:six:g' \
- -i '{}' + || die
-
- rm ${PN}/compat/six.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- nosetests --verbosity=3 || die
-}
diff --git a/dev-python/theano/theano-1.0.4.ebuild b/dev-python/theano/theano-1.0.4.ebuild
index 68db6a25ddc7..6b6457147cc1 100644
--- a/dev-python/theano/theano-1.0.4.ebuild
+++ b/dev-python/theano/theano-1.0.4.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
inherit distutils-r1 eutils
@@ -25,10 +25,10 @@ RDEPEND="
DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]
test? (
- dev-python/flake8[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/parameterized[${PYTHON_USEDEP}]
- dev-python/pyflakes[${PYTHON_USEDEP}]
+ dev-python/flake8[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/parameterized[${PYTHON_USEDEP}]
+ dev-python/pyflakes[${PYTHON_USEDEP}]
)"
S="${WORKDIR}/${PN^}-${PV}"
@@ -36,7 +36,7 @@ S="${WORKDIR}/${PN^}-${PV}"
python_prepare_all() {
# remove bundled six
find -type f -name "*.py" -exec \
- sed -e 's:theano.compat.six:six:g' -i '{}' + || die
+ sed -e 's:theano.compat.six:six:g' -i '{}' + || die
distutils-r1_python_prepare_all
}
diff --git a/dev-python/urwid/Manifest b/dev-python/urwid/Manifest
index a2da904dca69..5a8a9ca81291 100644
--- a/dev-python/urwid/Manifest
+++ b/dev-python/urwid/Manifest
@@ -2,6 +2,8 @@ AUX urwid-1.1.0-sphinx.patch 453 BLAKE2B 3ef9cbc0486cca3f7e8833d029a95e021cf7955
AUX urwid-1.3.1-test-vterm-EINTR.patch 1384 BLAKE2B 91385ddb7b343a4bbe89718cdf095d6ff79f2ecf64140d993ae664972c66e672b18de353e4fa81f38f86863eb95cae1b15a7ade787048e7d3093d3cec0b7b41c SHA512 0746938ff78d98cda847adbe49f8848e603eca4d6460921e57ef8c211dd19a21aaa9027f83cb24c53e5396f4a3fdd194396ea82a457729b8b252306c00bfff97
DIST urwid-1.3.1.tar.gz 588549 BLAKE2B b2e135fa1ba60ef75f6d748c7a51e5eecef2c7fd51e19782c4901ab2715c6afc01ac709cd79c74e3da9b8671dfd021c968aaf7c3fa393e607e0ed9ac54bcbbb4 SHA512 8b505d38f3a0c04bbf527b324dc36212f2580213dd55eca61c66705d3beaac4f074c39aaa0f4f71add1fe5f3fce4c4c6dc88dd1e981b04bac6d52195d7a3f0ed
DIST urwid-2.0.1.tar.gz 604167 BLAKE2B 0c7c289175d023bb14fca2c48eeec9e149af301827874c17d3087532f19d120ca2208306db44c5fbfd28b68f4b192f176cd46b83e915a5cbb8200e442e69fedb SHA512 99c86a26b08c624c23207ce8e587e8442bece1f522e0c788600ad5f01a4c679efff95dd947edade8b6f4adc376edca949a40c305f9d5ddaf6a0ff97f13c6da30
+DIST urwid-2.1.0.tar.gz 630226 BLAKE2B 62e36080419cd4acf8c3415ce6393483244f44ffa881730ceebea71ae5535da04a7f45bd5e23fa0808a88a192c8d9d21fa2b1cf7dc3fb20485ee3280c2eeda99 SHA512 c121c0e49ab9531f67bff8740d29fc716fb8c9203e1b2ddb7257f01095e0bf976f3f2131a3b1f95a3b5368ddeea6a09b9c867ab459b91e3e9be6cba4f18ec654
EBUILD urwid-1.3.1.ebuild 1219 BLAKE2B 7eb13d92e9494b513c4450ace81bb5adaa4e4ccd26594e51a9496440f402b4cab7575d01297eb72c957903266740cdb62df49f6337f05d29dac429b95616c88e SHA512 4a1d1abaff1a6ecae8f32b76a12700f0725013d871f4d3d2f9b780f819dc266bf911899fa6ceeb9c390082dca2aeefd80fecd2a84e01a2ecd636c0c998d26edc
EBUILD urwid-2.0.1.ebuild 1028 BLAKE2B c379b8b7ab8a9738cda6a1127a43f3177f5434705080c4d16b14dc416fb4b2c490c29bb422c4124276307b8ce1dce6fc78a9cca1496be30a6fe9cf1541e3dfe1 SHA512 8993a739ed021dbe28a348877a26f66029ffcb22f6ea4fad182f92996b0eed21db392e55c081d794ecc0b7705a332c099f04a2dbc329f6130f41256f8873488b
+EBUILD urwid-2.1.0.ebuild 824 BLAKE2B 9d37d887d1b9010afa68765b70f47f0621b2bd92af3a65dd6c4581b4f7b961e1bf5ee8693c52df7aec7497ebf874820a069e37cce9b6c5efb8523518a8bdf35b SHA512 264edb97618a3d0a8856d06c6a80a53a3537b801985a4bbeae8935bf5594f9b9a68d14afc0c6008bf79c5508aee7eeb0cb0e5a826d3119b0a099f06b007c2418
MISC metadata.xml 1152 BLAKE2B 4b992c5bc6907498186b29eba5804d17341a20715dfd9ea568e0b066d5f6b8775a79a703be450a436badf46d052a790a62cb8ce7100cdb54f24faa68eae6ecda SHA512 4bb4df4cc9398e2b77815b908cfc3821a96370e083a7b4452d601009186bc2c29418987f6e9a25d64332a15b860addb66ee4594e30ea51f34a1eae2d8be0a680
diff --git a/dev-python/urwid/urwid-2.1.0.ebuild b/dev-python/urwid/urwid-2.1.0.ebuild
new file mode 100644
index 000000000000..5685bca7c7f7
--- /dev/null
+++ b/dev-python/urwid/urwid-2.1.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_REQ_USE="ncurses"
+
+inherit distutils-r1
+
+DESCRIPTION="Curses-based user interface library for Python"
+HOMEPAGE="http://urwid.org/ https://pypi.org/project/urwid/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples"
+
+distutils_enable_sphinx docs
+distutils_enable_tests setup.py
+
+python_compile() {
+ if ! python_is_python3; then
+ local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+ export CFLAGS
+ fi
+
+ distutils-r1_python_compile
+}
+
+python_install_all() {
+ use examples && dodoc -r examples
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/websockify/Manifest b/dev-python/websockify/Manifest
index 206b98d96141..b5307993df7b 100644
--- a/dev-python/websockify/Manifest
+++ b/dev-python/websockify/Manifest
@@ -1,3 +1,3 @@
DIST websockify-0.8.0.zip 319105 BLAKE2B 5c9a0e5f32239b35b5f41d5dd2b46b215cad6800e5752e8d9fa0c20fe77df2ae756cc74a527b50f545497abdc621ee402e02a9d2a788630a2cbfdeecb7b494df SHA512 625cecbf37149c82edd2ebb9cd1f1a20a35415f7c7696ebe88b2e86563a170573959f9ede2c7a1db82ace9edddfb9d2da6e2e20d29fd916ae238235880d9a943
-EBUILD websockify-0.8.0.ebuild 508 BLAKE2B 99f6279669cbb8d14c7434588a639f7400020c82113709a60b3eb66569928420d2fff54aa094d9363a911db0f9e524f71d8b6465384eee59a7137693d4823ff3 SHA512 2975680f07ac4f3fc3a4cb59e9e3b3a43c893b4e1559a7467594d33adba67fbc8ecf5363b47cd9ac5f546f2445cef0403859c69a0336d5adb537fbd6d6052342
+EBUILD websockify-0.8.0.ebuild 498 BLAKE2B 3edcb9b04ad192b204f1860e0785f6e9f6b439cf97e5bccfe263aee0bc725c13908ae5f556dff1c5f3c0c35b5df861c3c326d0e0ff8242551fc2901d4eb50847 SHA512 d4515cfb309b1a6d4a482b6d389230e60e87b133a89e3573dd6b50ccd9c8b488ef676d4445afaba1b21871a1e7f1ea2edc3ede3641c82e1cd50d371c2ed8a8fa
MISC metadata.xml 554 BLAKE2B 4d53f25662d08966f53551fe7f47d0d43d8facd10841dc5c15fc7735703a8fd932b4c9d17a7dfd054a7a147f387e376e0a90e6aa6185a453ecc4132a636f7d1a SHA512 9140154c124bad88c19f2b8cad2e453508b0b41714b6d8e27e951edc38467124b28179713636d22491f0f41c79a0c52e2908abfec78c4304293389463cc5d9b6
diff --git a/dev-python/websockify/websockify-0.8.0.ebuild b/dev-python/websockify/websockify-0.8.0.ebuild
index 7723b535a7bb..8a046bcae7b1 100644
--- a/dev-python/websockify/websockify-0.8.0.ebuild
+++ b/dev-python/websockify/websockify-0.8.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
inherit distutils-r1
diff --git a/dev-python/xcffib/Manifest b/dev-python/xcffib/Manifest
index 3ee7b1fdd77e..4bcb22d4824e 100644
--- a/dev-python/xcffib/Manifest
+++ b/dev-python/xcffib/Manifest
@@ -3,8 +3,10 @@ DIST xcffib-0.5.1.tar.gz 81274 BLAKE2B 17e19d16a5d1b5699a10bc93c80327ba2d4c38d18
DIST xcffib-0.6.0.tar.gz 84360 BLAKE2B 0947e1a20e9ad73f77e6cb000ed9fc8d70e45080edb74c5d25642c2d5ae388cc97461633e8cee1d7676557735b57b9cc1a3de459e54f96888cf7d19451d24c21 SHA512 de78b738f2a75e6569a0529d1fe2844b2cafe48623f25c20a9572ce881cb97325c3823dfe883a2e14bc93d01342f20c4ab561928312f65d0a67364fecb5c8ba5
DIST xcffib-0.7.0.tar.gz 83895 BLAKE2B b2f8f2a4fcba20bfedc4e174d61900ea20bb8968bbdff73700ceeacd6c9fa36288bfcfd67a7d4206376b3b45e6e51481604e3ea3d6aa6d9ff68eaa49df25a414 SHA512 ad655e897eb08b898e396290c0b4b64a1e228b21fc5ed1fbcb3cc73bae466fa5255d539d864f1a9fdcb1396e73f60a981e00aab82efc343c7f83c8f62a6d31c5
DIST xcffib-0.8.1.tar.gz 82979 BLAKE2B 7f253a1a6faf77830f2835cc51ae3e2138bdc826b30afded951e276056e2f6b4a1168d3440874e11d539cef84de47e02e16ec435dc7ec55b5bbb933e43f0eb8b SHA512 c7eed1f2c31d87c9ec9b7fa01e11ae3c65d2d9493fe3f4c7286901c65cb4c81382b1c41906ee537372c98b58f680530d708b81826d41eb66be45d62ab22624bf
+DIST xcffib-0.9.0.tar.gz 83063 BLAKE2B 898fbce1ff503a9ad64a4c34778e0b5ffef531cf2ad04327f1890c87adb5f91287465e39a981a3c5a628c048b8acbb38bac3b0b76a58c3bbe45ab34c9a5eacf5 SHA512 e5891f080fcf1df596c37bb64a70e0de4a41d83b4675dac3b1c128656ab1b09d865e3ab0bfe0e5cc523e89a75dc6127dfc455ab66ca543ba6eeae9ee5bdae168
EBUILD xcffib-0.5.1.ebuild 856 BLAKE2B 1ddd81491d7755b91c6c8c1fe3521efde7a90277e25ce9dcf3534ef3402b9a2ce895b9ee60ea962fad62979e9791a326abb44f71ace3e9556068e66b5a6db1aa SHA512 b9fc38a364dcafce2cfdb4856313949037ce9a315b68b36cdca769aa397d9768e571dbbf43c814938c3131362f39760743c7b3f9389d1609ac3151ff350a76ee
EBUILD xcffib-0.6.0.ebuild 860 BLAKE2B cc2dbf62cdc8b574b1107e555e57b23c11aa919997f2724ad7c8381b33d9f2ac87ee1f63a450a8a7cb3f7453a60cb69c20859c9dc72226adfa6d667f6b5c4224 SHA512 9768af62e3e52fd52f45bd4735fc99663a7a90bc135fda62684f9a7e74dda69ae034fe8561ac60d4ef33861ea7884514b4cf1177f9095b19f56cc67640c2fb91
EBUILD xcffib-0.7.0.ebuild 896 BLAKE2B 8c579be7c0102ec3177ba2d1979ee8b84ce00798853667a68631c87aa685e2e9a1d266da8e21abdc34f5ce87b181b3d5abc2cd31c1ba42bfe84cf11ff4de6127 SHA512 a9f9868ca6d6aba04a1a425230daee4d2473d31e9864b26ed5651fe25e7551f47d029e02faf49eb1454e709cec897b005d31d209885a319006ad9bdc97f3821b
EBUILD xcffib-0.8.1.ebuild 904 BLAKE2B 82ed9f07dcf955aff8c217d089fa58c469228ea6eeaa45d2aa84f4ed538c40f9adf9a27b8d5cd0135beb7500939be96b7666b06c80cfc0afd17a92bf4a02ae22 SHA512 4ba0bca738368815fa42469589ffe529929bdde417881022d5e88dc251fb787157c55a3dfc99e37794acbf959f8c4f4672f219d84e680cabf7f3437ae3f3ce78
+EBUILD xcffib-0.9.0.ebuild 875 BLAKE2B 339067a9098933701578b26bb4e0fd6319f9a6a706dbc2aeb5eff883d6cbc1b1d49a5101b7ee480bd93282abe2184eaca6ebbb9e7024d580cd9ecf2f2dcad6ca SHA512 bc2a5cafb82ae728af411fb2951d4b2d4a56eb9db122c01471245843240ea4e01d7576891aa77f10f4a5d4d65d52ca3a541037537deacbdb6588c82e385a17db
MISC metadata.xml 373 BLAKE2B e21d3d9113705facf550e641e786485f657d976a1cbc19f5f1513d534e9a6bde20f68b104a95914dbe95347e0144c0cb0bdc8f87df31906f5f70be71324495dd SHA512 2c7291bce1de8d82151379bcdcc039344659570feec49b82ce9e7274b5e0abecf8499fe7c595b06f71c37ab7bfcb3f2ce8771f216282a50b6c1aba5dffc1008c
diff --git a/dev-python/xcffib/xcffib-0.9.0.ebuild b/dev-python/xcffib/xcffib-0.9.0.ebuild
new file mode 100644
index 000000000000..e568cadb7fac
--- /dev/null
+++ b/dev-python/xcffib/xcffib-0.9.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="A drop in replacement for xpyb, an XCB python binding"
+HOMEPAGE="https://github.com/tych0/xcffib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="x11-libs/libxcb"
+RDEPEND="
+ $(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
+ dev-python/six[${PYTHON_USEDEP}]
+ ${DEPEND}"
+BDEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ dev-python/nose[${PYTHON_USEDEP}]
+ x11-base/xorg-server[xvfb]
+ x11-apps/xeyes
+ )"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.4.2-test-imports.patch )
+
+python_test() {
+ virtx nosetests -d -v
+}
diff --git a/dev-python/xvfbwrapper/Manifest b/dev-python/xvfbwrapper/Manifest
index d1e257bc0258..234f2e8e6724 100644
--- a/dev-python/xvfbwrapper/Manifest
+++ b/dev-python/xvfbwrapper/Manifest
@@ -1,5 +1,3 @@
-DIST xvfbwrapper-0.2.8.tar.gz 4660 BLAKE2B 464a9f3d41d3c96a72c0cfc56994c32ccb94ac19267f5a701bd0ee18a17010216fd7ee163d8a532e62fd2256dc296201d4150f4f0d03fd4f20eae703b6bcaac1 SHA512 1b29b7e6bb336a9972e51249bbc96805733e305476cc559f5501cd09a343671c10333b5592e4c4868016d4510b37d6c592165a4683b1543e62c2205b1eeb0980
DIST xvfbwrapper-0.2.9.tar.gz 5575 BLAKE2B a973e6ca6dd85713e7b350397113d63c15fd284c07d3a0d5c0b8b8dceed65c3a17a3e8222b79ec88fb124175259d51fcd31d09a95183f1cbd091ba11d9bbec3b SHA512 800f3489b2e1bbc884d7651e344ed73783d6c00856f3ab7ccfa6b9058dd6d3bb98d38f11172ba89dff5773d6c5b773bc000786c1f6c6aae5a27179b37017851e
-EBUILD xvfbwrapper-0.2.8.ebuild 736 BLAKE2B 72ba03fabcf6f899c286bb794419e8266c29e1739e8f0c52413faf28725539368841ece77570e2aa987f255cf42fcb8ff188cb80ddce9a98f0eed059213c88b8 SHA512 0e9c13162d30e3028745cd75cd8397af0c152ce25b8c9072eb2511b7d880c1bb04b390d6d7ef87defe1ed78c5ae8f21d21fbf2f5e0b645a1226e41696f01a6f4
-EBUILD xvfbwrapper-0.2.9.ebuild 711 BLAKE2B b1f2cd44ef258a2441b991a3573de235d941831b768912c3a1603595939a5328d318642c703735648d80a05534574c78ab2f6c4735e38ab35dc1c86356ca4362 SHA512 48433e07a4381a8763d2125788f3c82e931b858049cba64e3a74f078c8af2f731b875b6d6575465672c7c1b2f66524df7b2b686d1e5c88b8a7650cdb35af0a45
+EBUILD xvfbwrapper-0.2.9.ebuild 701 BLAKE2B f6fd8777f4e7870e0d8f7decd3ed5dd220d5ccb7c6df338bd27d8b173179485192664de8131ce36ee9ec301cde666d7ff3c5817244f094190a06e5b4a361b378 SHA512 309ef6ae753d66c3c7e8e54979869fb7e7b7178be49c28cbd4ec5c99e71b2a867ac8681790ad65d30c294ba45ed5965f1268fb580cc3b9878dea2ea8523b6d05
MISC metadata.xml 387 BLAKE2B 1371ad91acdddb84e00b9d88497327d9f969686caeb599467b702da40bc0bb59f324d143cbc285e2739c2afb49bf7984eca78ad9e02a89b8c5697ed21d33b3fb SHA512 d9e8ace17387367e585434a5b178a7a1715973828d6cf762ad82f2c4020413239e87b26dbcb9a8db1122ac57e2b09fe01f0f7fec1b48723cde989c0205b84885
diff --git a/dev-python/xvfbwrapper/xvfbwrapper-0.2.8.ebuild b/dev-python/xvfbwrapper/xvfbwrapper-0.2.8.ebuild
deleted file mode 100644
index 226d1d3dee61..000000000000
--- a/dev-python/xvfbwrapper/xvfbwrapper-0.2.8.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for running a display inside X virtual framebuffer"
-HOMEPAGE="https://github.com/cgoldberg/xvfbwrapper
- https://pypi.org/project/xvfbwrapper/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="x11-base/xorg-server[xvfb]"
-DEPEND="${RDEPEND}
- test? ( dev-python/pep8[${PYTHON_USEDEP}] )
-"
-
-python_test() {
-# "${PYTHON}" test_xvfb.py || die "Tests failed with ${EPYTHON}"
- "${PYTHON}" -m unittest discover || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/xvfbwrapper/xvfbwrapper-0.2.9.ebuild b/dev-python/xvfbwrapper/xvfbwrapper-0.2.9.ebuild
index 9c4b8f613007..49aebade00d5 100644
--- a/dev-python/xvfbwrapper/xvfbwrapper-0.2.9.ebuild
+++ b/dev-python/xvfbwrapper/xvfbwrapper-0.2.9.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
inherit distutils-r1
@@ -12,14 +12,12 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
RDEPEND="x11-base/xorg-server[xvfb]"
-DEPEND="${RDEPEND}
- test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )
-"
+BDEPEND="test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )"
python_test() {
"${PYTHON}" -m unittest discover || die "Tests failed with ${EPYTHON}"