summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-editors/fe/Manifest2
-rw-r--r--dev-perl/SQL-Statement/SQL-Statement-1.414.0.ebuild2
-rw-r--r--dev-perl/Test-Base/Test-Base-0.890.0.ebuild2
-rw-r--r--dev-python/httpcore/Manifest4
-rw-r--r--dev-python/httpcore/httpcore-0.12.3.ebuild64
-rw-r--r--dev-python/httpcore/httpcore-0.13.0.ebuild63
-rw-r--r--dev-python/httpcore/httpcore-0.13.1.ebuild63
-rw-r--r--dev-python/httpcore/httpcore-0.13.2.ebuild63
-rw-r--r--dev-python/humanfriendly/Manifest3
-rw-r--r--dev-python/humanfriendly/humanfriendly-8.2.ebuild37
-rw-r--r--dev-python/humanfriendly/humanfriendly-9.1.ebuild36
-rw-r--r--dev-python/humanfriendly/humanfriendly-9.2.ebuild35
-rw-r--r--dev-python/imageio/Manifest1
-rw-r--r--dev-python/imageio/imageio-2.6.1.ebuild22
-rw-r--r--dev-python/iminuit/Manifest4
-rw-r--r--dev-python/iminuit/iminuit-2.7.0.ebuild31
-rw-r--r--dev-python/iminuit/iminuit-2.8.0.ebuild31
-rw-r--r--dev-python/iminuit/iminuit-2.8.2.ebuild32
-rw-r--r--dev-python/iminuit/iminuit-2.8.3.ebuild32
-rw-r--r--dev-python/immutables/Manifest1
-rw-r--r--dev-python/immutables/files/immutables-0.15-32bit-hash.patch76
-rw-r--r--dev-python/immutables/immutables-0.15-r1.ebuild22
-rw-r--r--dev-python/immutables/immutables-0.15.ebuild17
-rw-r--r--dev-python/indexed_gzip/Manifest4
-rw-r--r--dev-python/indexed_gzip/indexed_gzip-0.8.10.ebuild39
-rw-r--r--dev-python/indexed_gzip/indexed_gzip-1.6.0.ebuild47
-rw-r--r--dev-python/indexed_gzip/indexed_gzip-1.6.1.ebuild42
-rw-r--r--dev-python/indexed_gzip/indexed_gzip-1.6.2.ebuild44
-rw-r--r--dev-python/iniparse/Manifest1
-rw-r--r--dev-python/iniparse/files/iniparse-0.4-python3.patch523
-rw-r--r--dev-python/iniparse/files/iniparse-0.4-tests.patch27
-rw-r--r--dev-python/iniparse/iniparse-0.4-r2.ebuild29
-rw-r--r--dev-python/itypes/Manifest1
-rw-r--r--dev-python/itypes/itypes-1.1.0.ebuild23
-rw-r--r--dev-python/jaraco-stream/Manifest1
-rw-r--r--dev-python/jaraco-stream/jaraco-stream-3.0.0-r1.ebuild48
-rw-r--r--dev-python/jikanpy/Manifest1
-rw-r--r--dev-python/jikanpy/jikanpy-4.3.1.ebuild34
-rw-r--r--dev-python/jq/Manifest2
-rw-r--r--dev-python/jq/jq-1.1.2.ebuild31
-rw-r--r--dev-python/jq/jq-1.1.3.ebuild31
-rw-r--r--dev-python/js2py/Manifest1
-rw-r--r--dev-python/js2py/js2py-0.70_p20210218.ebuild51
-rw-r--r--dev-ruby/hiredis/hiredis-0.6.3-r1.ebuild2
-rw-r--r--dev-ruby/rbnacl/rbnacl-7.1.1.ebuild2
-rw-r--r--sci-visualization/quickplot/quickplot-1.0.1_rc.ebuild2
46 files changed, 6 insertions, 1623 deletions
diff --git a/app-editors/fe/Manifest b/app-editors/fe/Manifest
index b6eecacc98f8..048e137f607a 100644
--- a/app-editors/fe/Manifest
+++ b/app-editors/fe/Manifest
@@ -1 +1 @@
-DIST fe-2.0.tar.gz 217430 BLAKE2B bbc886abdb54d5fe05f031a5e5700907586c4bae8812f4edd5bf6d35fa0ce16edb93a6f988a597e1b4aba69bde4019f3044091ab9285ee6138d913498816453b SHA512 85afa800466376e59aa8de4af06db51c5df8566109a1f632b30a366f944be3237f88a639329d44114360747836ed75c31746c7d6bf1568b7b4ff3e11d595a6e7
+DIST fe-2.0.tar.gz 237890 BLAKE2B 9fb2ad310016b52ebc807854c942c248b75a9e543aa919ccee0a1963d9a12b23ad9cbc4df884422654e2efb0b97ba2d590ac2d70be48dec3a19e7a455de5c168 SHA512 6967362b8ff9ce91e0480dfa8538e3d13b43748283423923a4ba19efc76fbe007975318d9fde758f9c9f0b8bd084ff49e45bfd5b9773a79ee85a2153646e0143
diff --git a/dev-perl/SQL-Statement/SQL-Statement-1.414.0.ebuild b/dev-perl/SQL-Statement/SQL-Statement-1.414.0.ebuild
index 80e569828789..761a1fb9fe41 100644
--- a/dev-perl/SQL-Statement/SQL-Statement-1.414.0.ebuild
+++ b/dev-perl/SQL-Statement/SQL-Statement-1.414.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Small SQL parser and engine"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="minimal"
RDEPEND="
diff --git a/dev-perl/Test-Base/Test-Base-0.890.0.ebuild b/dev-perl/Test-Base/Test-Base-0.890.0.ebuild
index 9ef6eed72aa2..88512e878cf0 100644
--- a/dev-perl/Test-Base/Test-Base-0.890.0.ebuild
+++ b/dev-perl/Test-Base/Test-Base-0.890.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="A Data Driven Testing Framework"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
dev-perl/Filter
diff --git a/dev-python/httpcore/Manifest b/dev-python/httpcore/Manifest
index 72fa0eb6dfcb..8bd60a2b8957 100644
--- a/dev-python/httpcore/Manifest
+++ b/dev-python/httpcore/Manifest
@@ -1,7 +1,3 @@
-DIST httpcore-0.12.3.tar.gz 57587 BLAKE2B 3c0e7a210b21e54564c4c6077fadf66344b887662c71b05a1ad4a2c0224a4d703eccdf576d4443341176edee03b6776bfd49aaef2ea2f29f02614677e1dfad85 SHA512 b31535231dc2b6a5f1c9c0c538628f75360f04b4747b447ab0a7168ed32d0eabd463335c2f7fa782dcabb4cbc32891a2839ae50e0999d5a791c01b02533d38f0
-DIST httpcore-0.13.0.tar.gz 58310 BLAKE2B 29ed4ad768088c6226ece27cb82e2a1d8df32eba4cf446015b43360c330ec65b433f571ac8e13e4b8f8994ff6e097ce5bf79ae1b9561d940298172c66d539153 SHA512 28ed65d3b3b30a62e3f198d98ae77a3cc26bd80250f10a506851433b5572a6fdcab38bf0d670caea94dec43d5b61de21a3ea967a445041536cad68eb98cc12bc
-DIST httpcore-0.13.1.tar.gz 58538 BLAKE2B 4c0b681f96fd64d17bc1974bdb74486fd336f84b27eda450d7de630c9f5dc2012ca91d10c4d0bcdaa06ff0e60d524993ab784721e4ffb55ff2848d68ea9ebb29 SHA512 ba410bf61e820016b061a8cd5a30b227bb75a78e90465459b2ff67dd76b9de9120d3b2474f6d8bb54698f627bb8801f2da5b3d85a4a41a0c5330d6bba8e10a49
-DIST httpcore-0.13.2.tar.gz 59043 BLAKE2B c534c304b238837486b8a61860553475c87363b43842c9dad2629673c1d30c2f906f31658f6ff75bd9354040c08453c3d4ffe8bdf53077ca993399b93d68a57a SHA512 b032d56bc5bf4049d02ca2ddfaf66615a1ac2f0723291f82f9104a0d7f09d5eec710f9e1ac2082fa1e83ef7fa6fe4f5a6c7c28d660abd6803a990094c952834f
DIST httpcore-0.13.3.tar.gz 64246 BLAKE2B afc43122a5502770b6efe7052846926e25fa678dcbd5c8ddbcd806df36dcf684d94df12571efaab0ff1b657fef14d5d71dd902be5cbec12c61db13004d7fe5a9 SHA512 7ba6c2cb77c082bcdb8cdfad2bc17646ccc9348f49760150ec1070429f94913b2fb9eae6d3407b404581b48670b866bf11696453325dd70610bd700e94990450
DIST httpcore-0.13.6.tar.gz 64716 BLAKE2B 6eadcaac626d4561dec2e41bdbde21836727f10870093890469e6b5a4af2aa276361044d08b5e25e3bf760092e5537edff9d0c99acb1ddf6ab0a17343bcd9af2 SHA512 52b6189763755dbbd762ad26fef0107ad50949c1dd4865db788317ce981079cc095161e543f1a455ce84138b51f89806d8c55267378574feced107675f6cde47
DIST httpcore-0.13.7.tar.gz 64734 BLAKE2B e6c4b1720ce4bf62689995d3e1c648c4702bb416f3b3586eb8dd2f0cfd2155046e64181c4c04e65f721a5f0fcbc23b5ffd01c2930c7c69d37ee4c36e37b7d0d4 SHA512 0cc48828d0710066b3ef89998ec85975285763ac63a8b59106952ef2dac5a02dac71e7e106c4b6ea1022eb4d06a9cb5ee3e634eb564bad49c5508beff75279d6
diff --git a/dev-python/httpcore/httpcore-0.12.3.ebuild b/dev-python/httpcore/httpcore-0.12.3.ebuild
deleted file mode 100644
index 9d5010440b81..000000000000
--- a/dev-python/httpcore/httpcore-0.12.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A minimal low-level HTTP client"
-HOMEPAGE="https://www.encode.io/httpcore/"
-SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- =dev-python/h11-0*[${PYTHON_USEDEP}]
- =dev-python/sniffio-1*[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/pytest-asyncio[${PYTHON_USEDEP}]
- dev-python/trustme[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
- # anyio and trio are not in the tree
- sed -i 's/^@pytest.mark.\(anyio\|trio\)/@pytest.mark.skip/' \
- tests/async_tests/test_*.py || die
- sed -i '/^import trio/d' tests/utils.py || die
- # pproxy is not in the tree, the associated fixture
- # must be disabled to prevent errors during test setup
- sed -i 's/def proxy_server().*/&\n pytest.skip()/' \
- tests/conftest.py || die
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- local skipped_tests=(
- # Require Internet access or hypercorn (not in the tree)
- tests/test_threadsafety.py::test_threadsafe_basic
- tests/sync_tests/test_interfaces.py::test_http_request
- tests/sync_tests/test_interfaces.py::test_https_request
- tests/sync_tests/test_interfaces.py::test_http2_request
- tests/sync_tests/test_interfaces.py::test_closing_http_request
- tests/sync_tests/test_interfaces.py::test_connection_pool_get_connection_info
- tests/sync_tests/test_interfaces.py::test_max_keepalive_connections_handled_correctly
- tests/sync_tests/test_interfaces.py::test_explicit_backend_name
- tests/sync_tests/test_interfaces.py::test_connection_timeout_tcp
- tests/sync_tests/test_interfaces.py::test_broken_socket_detection_many_open_files
- tests/sync_tests/test_retries.py::test_no_retries
- tests/sync_tests/test_retries.py::test_retries_exceeded
- tests/sync_tests/test_retries.py::test_retries_enabled
- # Require hypercorn
- tests/sync_tests/test_interfaces.py::test_connection_timeout_uds
- )
- pytest -vv ${skipped_tests[@]/#/--deselect } \
- || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/httpcore/httpcore-0.13.0.ebuild b/dev-python/httpcore/httpcore-0.13.0.ebuild
deleted file mode 100644
index 65db85718369..000000000000
--- a/dev-python/httpcore/httpcore-0.13.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A minimal low-level HTTP client"
-HOMEPAGE="https://www.encode.io/httpcore/"
-SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- =dev-python/h11-0*[${PYTHON_USEDEP}]
- =dev-python/sniffio-1*[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/pytest-asyncio[${PYTHON_USEDEP}]
- dev-python/trustme[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
- # anyio and trio are not in the tree
- sed -i 's/^@pytest.mark.\(anyio\|trio\)/@pytest.mark.skip/' \
- tests/async_tests/test_*.py || die
- sed -i '/^import trio/d' tests/utils.py || die
- # pproxy is not in the tree, the associated fixture
- # must be disabled to prevent errors during test setup
- sed -i 's/def proxy_server().*/&\n pytest.skip()/' \
- tests/conftest.py || die
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- local skipped_tests=(
- # Require Internet access or hypercorn (not in the tree)
- tests/test_threadsafety.py::test_threadsafe_basic
- tests/sync_tests/test_interfaces.py::test_http_request
- tests/sync_tests/test_interfaces.py::test_https_request
- tests/sync_tests/test_interfaces.py::test_http2_request
- tests/sync_tests/test_interfaces.py::test_closing_http_request
- tests/sync_tests/test_interfaces.py::test_connection_pool_get_connection_info
- tests/sync_tests/test_interfaces.py::test_max_keepalive_connections_handled_correctly
- tests/sync_tests/test_interfaces.py::test_explicit_backend_name
- tests/sync_tests/test_interfaces.py::test_connection_timeout_tcp
- tests/sync_tests/test_interfaces.py::test_broken_socket_detection_many_open_files
- tests/sync_tests/test_retries.py::test_no_retries
- tests/sync_tests/test_retries.py::test_retries_exceeded
- tests/sync_tests/test_retries.py::test_retries_enabled
- # Require hypercorn
- tests/sync_tests/test_interfaces.py::test_connection_timeout_uds
- )
- epytest ${skipped_tests[@]/#/--deselect }
-}
diff --git a/dev-python/httpcore/httpcore-0.13.1.ebuild b/dev-python/httpcore/httpcore-0.13.1.ebuild
deleted file mode 100644
index 65db85718369..000000000000
--- a/dev-python/httpcore/httpcore-0.13.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A minimal low-level HTTP client"
-HOMEPAGE="https://www.encode.io/httpcore/"
-SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- =dev-python/h11-0*[${PYTHON_USEDEP}]
- =dev-python/sniffio-1*[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/pytest-asyncio[${PYTHON_USEDEP}]
- dev-python/trustme[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
- # anyio and trio are not in the tree
- sed -i 's/^@pytest.mark.\(anyio\|trio\)/@pytest.mark.skip/' \
- tests/async_tests/test_*.py || die
- sed -i '/^import trio/d' tests/utils.py || die
- # pproxy is not in the tree, the associated fixture
- # must be disabled to prevent errors during test setup
- sed -i 's/def proxy_server().*/&\n pytest.skip()/' \
- tests/conftest.py || die
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- local skipped_tests=(
- # Require Internet access or hypercorn (not in the tree)
- tests/test_threadsafety.py::test_threadsafe_basic
- tests/sync_tests/test_interfaces.py::test_http_request
- tests/sync_tests/test_interfaces.py::test_https_request
- tests/sync_tests/test_interfaces.py::test_http2_request
- tests/sync_tests/test_interfaces.py::test_closing_http_request
- tests/sync_tests/test_interfaces.py::test_connection_pool_get_connection_info
- tests/sync_tests/test_interfaces.py::test_max_keepalive_connections_handled_correctly
- tests/sync_tests/test_interfaces.py::test_explicit_backend_name
- tests/sync_tests/test_interfaces.py::test_connection_timeout_tcp
- tests/sync_tests/test_interfaces.py::test_broken_socket_detection_many_open_files
- tests/sync_tests/test_retries.py::test_no_retries
- tests/sync_tests/test_retries.py::test_retries_exceeded
- tests/sync_tests/test_retries.py::test_retries_enabled
- # Require hypercorn
- tests/sync_tests/test_interfaces.py::test_connection_timeout_uds
- )
- epytest ${skipped_tests[@]/#/--deselect }
-}
diff --git a/dev-python/httpcore/httpcore-0.13.2.ebuild b/dev-python/httpcore/httpcore-0.13.2.ebuild
deleted file mode 100644
index 65db85718369..000000000000
--- a/dev-python/httpcore/httpcore-0.13.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A minimal low-level HTTP client"
-HOMEPAGE="https://www.encode.io/httpcore/"
-SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- =dev-python/h11-0*[${PYTHON_USEDEP}]
- =dev-python/sniffio-1*[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/pytest-asyncio[${PYTHON_USEDEP}]
- dev-python/trustme[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
- # anyio and trio are not in the tree
- sed -i 's/^@pytest.mark.\(anyio\|trio\)/@pytest.mark.skip/' \
- tests/async_tests/test_*.py || die
- sed -i '/^import trio/d' tests/utils.py || die
- # pproxy is not in the tree, the associated fixture
- # must be disabled to prevent errors during test setup
- sed -i 's/def proxy_server().*/&\n pytest.skip()/' \
- tests/conftest.py || die
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- local skipped_tests=(
- # Require Internet access or hypercorn (not in the tree)
- tests/test_threadsafety.py::test_threadsafe_basic
- tests/sync_tests/test_interfaces.py::test_http_request
- tests/sync_tests/test_interfaces.py::test_https_request
- tests/sync_tests/test_interfaces.py::test_http2_request
- tests/sync_tests/test_interfaces.py::test_closing_http_request
- tests/sync_tests/test_interfaces.py::test_connection_pool_get_connection_info
- tests/sync_tests/test_interfaces.py::test_max_keepalive_connections_handled_correctly
- tests/sync_tests/test_interfaces.py::test_explicit_backend_name
- tests/sync_tests/test_interfaces.py::test_connection_timeout_tcp
- tests/sync_tests/test_interfaces.py::test_broken_socket_detection_many_open_files
- tests/sync_tests/test_retries.py::test_no_retries
- tests/sync_tests/test_retries.py::test_retries_exceeded
- tests/sync_tests/test_retries.py::test_retries_enabled
- # Require hypercorn
- tests/sync_tests/test_interfaces.py::test_connection_timeout_uds
- )
- epytest ${skipped_tests[@]/#/--deselect }
-}
diff --git a/dev-python/humanfriendly/Manifest b/dev-python/humanfriendly/Manifest
index a9e51d1a0f2e..eb2f81777ec1 100644
--- a/dev-python/humanfriendly/Manifest
+++ b/dev-python/humanfriendly/Manifest
@@ -1,4 +1 @@
DIST humanfriendly-10.0.tar.gz 360702 BLAKE2B 6db7f2f11bafcdc087c078eae6123046610594b17899678e445baa18c25b2210cc1d84363d858ab7c57fce6d6b7a189be69dea08c1891d3f5b11ff9900c9bef9 SHA512 496700bcea1dabf003c938558bf807fabb41b71192f69622979dd9e243dda9b4b06c5ac8f65cef217df85ebadf99099dc22b50d63216791a569be11081d267d6
-DIST humanfriendly-8.2.tar.gz 358747 BLAKE2B bc5824e94ea94df6ee93ea44d273ccb856f50b69e52ae6293afaedf06c9f00c67e064f0c85edd88be9954bb258334b1b9af4ab88efc5b352f3efe8d322fc55c1 SHA512 123d8592e6613a70421740648bb8998733b118927a0bd6182af848612e46eec8e35cae95168219c9b7672bed8e18e1c4a493a80248eabe47f8a4cb1813c8b591
-DIST humanfriendly-9.1.tar.gz 359616 BLAKE2B c67ca9498ff4a0dac237c8f1c81ae88882a7ab162e2cfd663cd50a066dbcfe045424bdf4dcc1df473f5fc41f0c1b8c0f2aca9883aa21915281618ba332c579a3 SHA512 859a9ff01abe0671a23a63e73c9c09c0f92151e96ec38dd5695c75f99fa436e186835cb8a16f59b82d5216b9c427ea0abd419b470b067f8032fe984776f02a8f
-DIST humanfriendly-9.2.tar.gz 360080 BLAKE2B 39aa17315a87938468f2d6e94b0287f07864476c4179c40504126c65f7042c96113a9d60f481a6a03913ae5c8cfde2c87476e0d403c964aa65abceb0f55633f1 SHA512 2abb8d7d4dfb84d625e82f3475bea5045c32f548a45999dca97d39e5bc0cd704a9ab45e0b6b87c0d419b447680a3e71e2d9c8cb14ba19117c7ac9b2f56297f00
diff --git a/dev-python/humanfriendly/humanfriendly-8.2.ebuild b/dev-python/humanfriendly/humanfriendly-8.2.ebuild
deleted file mode 100644
index 03462a33c378..000000000000
--- a/dev-python/humanfriendly/humanfriendly-8.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-PYTHON_REQ_USE="threads(+)"
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Human friendly output for text interfaces using Python"
-HOMEPAGE="https://pypi.org/project/humanfriendly/
- https://github.com/xolox/python-humanfriendly/
- https://humanfriendly.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
- test? (
- dev-python/capturer[${PYTHON_USEDEP}]
- dev-python/coloredlogs[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs
-
-python_test() {
- pytest -vv ${PN}/tests.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/humanfriendly/humanfriendly-9.1.ebuild b/dev-python/humanfriendly/humanfriendly-9.1.ebuild
deleted file mode 100644
index 9ba2dcee001c..000000000000
--- a/dev-python/humanfriendly/humanfriendly-9.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Human friendly output for text interfaces using Python"
-HOMEPAGE="https://pypi.org/project/humanfriendly/
- https://github.com/xolox/python-humanfriendly/
- https://humanfriendly.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
- test? (
- dev-python/capturer[${PYTHON_USEDEP}]
- dev-python/coloredlogs[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs
-
-python_test() {
- pytest -vv ${PN}/tests.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/humanfriendly/humanfriendly-9.2.ebuild b/dev-python/humanfriendly/humanfriendly-9.2.ebuild
deleted file mode 100644
index 8cf6193e41dc..000000000000
--- a/dev-python/humanfriendly/humanfriendly-9.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Human friendly output for text interfaces using Python"
-HOMEPAGE="https://pypi.org/project/humanfriendly/
- https://github.com/xolox/python-humanfriendly/
- https://humanfriendly.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
- test? (
- dev-python/capturer[${PYTHON_USEDEP}]
- >=dev-python/coloredlogs-15.0.1[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs
-
-python_test() {
- epytest humanfriendly/tests.py
-}
diff --git a/dev-python/imageio/Manifest b/dev-python/imageio/Manifest
index 3f94abe61c1e..dd7ab85042d1 100644
--- a/dev-python/imageio/Manifest
+++ b/dev-python/imageio/Manifest
@@ -1,2 +1 @@
-DIST imageio-2.6.1.tar.gz 302911 BLAKE2B b0ed781b9edcbb93af664ea4e815cf90e56ab2b31abdda88dcd142558efa1c43afb89886f6b3a372fddcd200df802e45c7278fe13067bfeebf119471f573e668 SHA512 e4a4510a9fd0823914a9f511011cb9c191bea1cd78b2c2bba5d559fcdc89c55cd1dbb03a81eaf82c460ebb86cde518f44ff02766a9935d4f463e81a52007fe25
DIST imageio-2.9.0.gh.tar.gz 298291 BLAKE2B b36b0a5bf74938177353ffce103d7479a2b15442623d400261dac485b5cc7e8743b18e92d938fcfe2b68dfdef1d1417308e5441112ff851481cc768b76ab56d0 SHA512 a325ad4f0913219b87418d4f57fddc3f1e4c1be4102e933aa0c236317044d2a5ded623bbe86b92d3f2004bb9386ccb3f0cc03b7b118f9faa6f320dd147157ed6
diff --git a/dev-python/imageio/imageio-2.6.1.ebuild b/dev-python/imageio/imageio-2.6.1.ebuild
deleted file mode 100644
index eb6898f02595..000000000000
--- a/dev-python/imageio/imageio-2.6.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for reading and writing image data"
-HOMEPAGE="https://imageio.github.io/"
-SRC_URI="https://github.com/imageio/imageio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- dev-python/numpy[${PYTHON_USEDEP}]
- media-libs/freeimage
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/iminuit/Manifest b/dev-python/iminuit/Manifest
index 6159509d15e4..fe53c4688ce9 100644
--- a/dev-python/iminuit/Manifest
+++ b/dev-python/iminuit/Manifest
@@ -1,5 +1 @@
-DIST iminuit-2.7.0.tar.gz 384016 BLAKE2B 857df47e8f4779c41b32e624ce3c5dfe16f39f57441f1f32367c9170bfe6f74fb84eb67a54b773690ce5fdde762d3383adbaf97e81d917a17e2995b9e69623be SHA512 c4f5ba80024e87e57087175b012d043df65079e5b8f0376ff7254ebb256ca845460b3c330043aacd960092178ce8fd4d8bd3cccd93ebe3515f7a9896b756c629
-DIST iminuit-2.8.0.tar.gz 389147 BLAKE2B f54de6fb39d942c39438e82cb38f04974f0e565d31c3bb06ac39f73a28b82207f7590d9039e491c8dc44286e4311ee3f6f0114be94754104e0d0a06af5fa8acd SHA512 89655a5c925d6f02cde3c8a3139a0c93e9a667a6e0a34ec1f99d5b0f91c79671f2b325553359daeed91437d474e31354088b66a58e53e8235dcbbb4bf6da4935
-DIST iminuit-2.8.2.tar.gz 389847 BLAKE2B 0d30e2f3a933c446e985d205b4a5d4289856ff48743486cdaddfd6c655dbbe833a0d0a6aca10ee2d747d51a18f8b20c3e1cdc4cf87717321a2cc9f87726f98d8 SHA512 02a3d3e436bc78840ff48af425449cf8467265d9f95c1a9bdaced664e3f167bb29876d1b3717b1e0fca656dd4108f1526d0be846a6ec0cdfb9f1d7243ccb283b
-DIST iminuit-2.8.3.tar.gz 390386 BLAKE2B bf5d67c92722c5623b9cf19547d934f1c53c5aeae88ef3e4d9d9c9fac00c99a3969e29a2e00d1cf2ada35cac4373b15d6f7831a217e91068b307d2c256854949 SHA512 201844da1cc3c9eb5c06a851f5040370ec57d86ec7e47d531cd49595142d2c5788468f76da4de1ac73ca6691bbddef8c0f23444aa9036a9309c80c1e9d218190
DIST iminuit-2.8.4.tar.gz 391667 BLAKE2B 15d82db308ac361f45399debb342ba350c6ec83e111fca16baed99dc029010284b946292f4236e26ae5cdd60f7a130902bca53669b31e335d706ead77f6603db SHA512 564506921027d6addffb9df6f2ad2aec69981af49e2552f4d093d03fbf79f12a72e6dec58f159810d621a58ddd56dbf1258359d01d56d33a7c30b08eb5b333ed
diff --git a/dev-python/iminuit/iminuit-2.7.0.ebuild b/dev-python/iminuit/iminuit-2.7.0.ebuild
deleted file mode 100644
index 10e6b9207df9..000000000000
--- a/dev-python/iminuit/iminuit-2.7.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-# forced implicitly
-CMAKE_MAKEFILE_GENERATOR=emake
-inherit cmake distutils-r1 virtualx
-
-DESCRIPTION="Minuit numerical function minimization in Python"
-HOMEPAGE="https://github.com/scikit-hep/iminuit/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT LGPL-2.1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-BDEPEND="
- dev-python/cython[${PYTHON_USEDEP}]
- test? (
- dev-python/ipython[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- )"
-
-distutils_enable_tests pytest
-
-python_test() {
- virtx epytest
-}
diff --git a/dev-python/iminuit/iminuit-2.8.0.ebuild b/dev-python/iminuit/iminuit-2.8.0.ebuild
deleted file mode 100644
index 10e6b9207df9..000000000000
--- a/dev-python/iminuit/iminuit-2.8.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-# forced implicitly
-CMAKE_MAKEFILE_GENERATOR=emake
-inherit cmake distutils-r1 virtualx
-
-DESCRIPTION="Minuit numerical function minimization in Python"
-HOMEPAGE="https://github.com/scikit-hep/iminuit/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT LGPL-2.1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-BDEPEND="
- dev-python/cython[${PYTHON_USEDEP}]
- test? (
- dev-python/ipython[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- )"
-
-distutils_enable_tests pytest
-
-python_test() {
- virtx epytest
-}
diff --git a/dev-python/iminuit/iminuit-2.8.2.ebuild b/dev-python/iminuit/iminuit-2.8.2.ebuild
deleted file mode 100644
index 82c92fced6c3..000000000000
--- a/dev-python/iminuit/iminuit-2.8.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-# forced implicitly
-CMAKE_MAKEFILE_GENERATOR=emake
-inherit cmake distutils-r1 virtualx
-
-DESCRIPTION="Minuit numerical function minimization in Python"
-HOMEPAGE="https://github.com/scikit-hep/iminuit/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT LGPL-2.1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-BDEPEND="
- dev-python/cython[${PYTHON_USEDEP}]
- test? (
- dev-python/ipython[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/scipy[${PYTHON_USEDEP}]
- )"
-
-distutils_enable_tests pytest
-
-python_test() {
- virtx epytest
-}
diff --git a/dev-python/iminuit/iminuit-2.8.3.ebuild b/dev-python/iminuit/iminuit-2.8.3.ebuild
deleted file mode 100644
index cb742073fae3..000000000000
--- a/dev-python/iminuit/iminuit-2.8.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-
-# forced implicitly
-CMAKE_MAKEFILE_GENERATOR=emake
-inherit cmake distutils-r1 virtualx
-
-DESCRIPTION="Minuit numerical function minimization in Python"
-HOMEPAGE="https://github.com/scikit-hep/iminuit/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT LGPL-2.1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-BDEPEND="
- dev-python/cython[${PYTHON_USEDEP}]
- test? (
- dev-python/ipython[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/scipy[${PYTHON_USEDEP}]
- )"
-
-distutils_enable_tests pytest
-
-python_test() {
- virtx epytest -p no:pytest-describe
-}
diff --git a/dev-python/immutables/Manifest b/dev-python/immutables/Manifest
index 7f80750bbb7b..a6f990f5294b 100644
--- a/dev-python/immutables/Manifest
+++ b/dev-python/immutables/Manifest
@@ -1,2 +1 @@
-DIST immutables-0.15.tar.gz 81297 BLAKE2B cb58142c3b833d529046f09a468b3e3964e3d36e4eaf0825f88b920e6795cd042e2fc837ea6d72000bbc9cbc2fd1de911e08b4f6d189e692748b49e848dfb3fb SHA512 cd0ee20f6d6218eaf13499e40971b6750009ff01a1aefcb7dd45c77ae841296b9d9184013e6e7fe5bdef93587f85cdb8ff459af29424a0077538666260572b8e
DIST immutables-0.16.tar.gz 84916 BLAKE2B e699aaa1135fa9f7db9589276dc0801a67c5f98bd3c5b247913d8263f9baf02a8772d7715cc3eb2c9392694d48d3808d50f45e9fe8e66c4d507586d0e3fdc319 SHA512 5b883cfe43f8a042b617e719dccd3cbdded3b1d1df160ba26b6bb2f0816a7171698bdd2ba3d450e76f135b236e777052a22c09b8bd1a9183227f1ccc90617cf8
diff --git a/dev-python/immutables/files/immutables-0.15-32bit-hash.patch b/dev-python/immutables/files/immutables-0.15-32bit-hash.patch
deleted file mode 100644
index 234dfa028c08..000000000000
--- a/dev-python/immutables/files/immutables-0.15-32bit-hash.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From fa355239e70411179c70b16ed4ff7113d8008dad Mon Sep 17 00:00:00 2001
-From: Elvis Pranskevichus <elvis@edgedb.com>
-Date: Wed, 4 Aug 2021 19:25:44 -0700
-Subject: [PATCH] Fix test_none_collisions on 32-bit systems (#69)
-
-There are two issues at play here:
-
-1. Python version of `map_hash` unnecessarily performs hash truncation
- even if the hash is already 32-bit wide, which potentially converts
- it from signed int to unsigned long.
-
-2. The `test_none_collisions` test generates a collision node with
- hash greater than 2^32.
-
-Both of these are problematic on 32-bit systems, where `sizeof(Py_hash_t)`
-is 4, and so anything that doesn't fit into `Py_hash_t` gets bit-mangled,
-breaking the `hash(x) != x` invariance that the test relies upon.
-
-Fixes: #53
-Fixes: #50
----
- .github/workflows/tests.yml | 10 +++++++++-
- immutables/map.py | 5 ++++-
- tests/test_none_keys.py | 14 +++++++++-----
- 3 files changed, 22 insertions(+), 7 deletions(-)
-
-diff --git a/immutables/map.py b/immutables/map.py
-index 2c1ffa91..0ad28588 100644
---- a/immutables/map.py
-+++ b/immutables/map.py
-@@ -19,7 +19,10 @@
-
- def map_hash(o):
- x = hash(o)
-- return (x & 0xffffffff) ^ ((x >> 32) & 0xffffffff)
-+ if sys.hash_info.width > 32:
-+ return (x & 0xffffffff) ^ ((x >> 32) & 0xffffffff)
-+ else:
-+ return x
-
-
- def map_mask(hash, shift):
-diff --git a/tests/test_none_keys.py b/tests/test_none_keys.py
-index 8c0bb379..26d4220b 100644
---- a/tests/test_none_keys.py
-+++ b/tests/test_none_keys.py
-@@ -1,3 +1,4 @@
-+import ctypes
- import unittest
-
- from immutables.map import map_hash, map_mask, Map as PyMap
-@@ -6,16 +7,19 @@
-
- none_hash = map_hash(None)
- assert(none_hash != 1)
--assert((none_hash >> 32) == 0)
-+assert(none_hash.bit_length() <= 32)
-
--not_collision = 0xffffffff & (~none_hash)
-+none_hash_u = ctypes.c_size_t(none_hash).value
-+not_collision = 0xffffffff & (~none_hash_u)
-
- mask = 0x7ffffffff
--none_collisions = [none_hash & (mask >> shift)
-+none_collisions = [none_hash_u & (mask >> shift)
- for shift in reversed(range(0, 32, 5))]
- assert(len(none_collisions) == 7)
--none_collisions = [h | (not_collision & (mask << shift))
-- for shift, h in zip(range(5, 37, 5), none_collisions)]
-+none_collisions = [
-+ ctypes.c_ssize_t(h | (not_collision & (mask << shift))).value
-+ for shift, h in zip(range(5, 37, 5), none_collisions)
-+]
-
-
- class NoneCollision(HashKey):
diff --git a/dev-python/immutables/immutables-0.15-r1.ebuild b/dev-python/immutables/immutables-0.15-r1.ebuild
deleted file mode 100644
index 25e5896535f7..000000000000
--- a/dev-python/immutables/immutables-0.15-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A high-performance immutable mapping type for Python"
-HOMEPAGE="https://github.com/MagicStack/immutables"
-SRC_URI="https://github.com/MagicStack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
-
-PATCHES=(
- # https://github.com/MagicStack/immutables/commit/fa355239e70411179c70b16ed4ff7113d8008dad
- "${FILESDIR}"/${P}-32bit-hash.patch
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/immutables/immutables-0.15.ebuild b/dev-python/immutables/immutables-0.15.ebuild
deleted file mode 100644
index 2b0a05431a20..000000000000
--- a/dev-python/immutables/immutables-0.15.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A high-performance immutable mapping type for Python"
-HOMEPAGE="https://github.com/MagicStack/immutables"
-SRC_URI="https://github.com/MagicStack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/indexed_gzip/Manifest b/dev-python/indexed_gzip/Manifest
index c25e404582c8..7bef8fd71392 100644
--- a/dev-python/indexed_gzip/Manifest
+++ b/dev-python/indexed_gzip/Manifest
@@ -1,5 +1 @@
-DIST indexed_gzip-0.8.10.tar.gz 79133 BLAKE2B ebb5bc69d92b627b0546c8570ea533a7d6541cffbda6ddbf38d2712e5d7b13f5684a4d962b457cb0beaf8f6d9d6c5bd810c31af18396d7ce2a7d3f9ce0a039d6 SHA512 cd57a0442e95a4760d710227a5d9f69841bef851427c536e5cfde7c9f962c9d403e0b38341ba2e07c5cde668e0f26ff7848d154f6243a2cee1cf6c327a7f4e1e
-DIST indexed_gzip-1.6.0.tar.gz 99260 BLAKE2B 15fff478a275baf59f152040455502f57762889959c4d2989e44b626dad25d381ff73029107c4495b477397ff5dc0763d1934f23bcc85a6296a0eec85a36b421 SHA512 0e01da5e8c527202c1f18148bad2a8ebec9ca0bc1bc49ce4804c6a32397797525cc7bfdfc254139c3c1b037d3f65171c010453ff3fae6e6256304ddf486bc58d
-DIST indexed_gzip-1.6.1.tar.gz 99290 BLAKE2B bbaa0fe55c132fef4e392c4a154cc7f5cb19e25761af298d70a8c9f5d1019701f0f470b9bcff333b02b0ecfc13b823a5cd64c16cfd2d113955f7e59837dcbd7f SHA512 8b508ac7fc161b75ee7ed9cc0ce8828e0f195c3aa676114c54d5b2767b9f2e56b0c203e63f2036245ede9649138d197dffabd67f41b41232e6c66e2ee1336529
-DIST indexed_gzip-1.6.2.tar.gz 100520 BLAKE2B 028fa28330fcb9958338226b47d2b503cb9810c03d4dbba2abb9f352ff575b05f73d660a683b2ff4be96441acbbf67c01203eb749e2b81df0d35ad7d7aed94d3 SHA512 977567074df02bf95aa11b47326458d14d7a33b29e001b67e7a52b2ffc2a0c465e361ab1d6ed6ca45b451d5ae99f81ca29034c7af52a6c5168b3a81e8c348689
DIST indexed_gzip-1.6.3.tar.gz 101073 BLAKE2B 685a8b1d8d69dce138ba6eab8af31d537e130674ba96f9383cc28b4440c472cbdde58f97bcda2d2145177342ade369bd88c44799ba07900ebd653c30678cc58e SHA512 567a54ca23fea63b2a8b386cace0e5bd52e6cf587c7507a555f727cb549b9ab32b1395e3b1ac94c1f09e680a62bb0c079b7bb4be724994813ad52db774b83e20
diff --git a/dev-python/indexed_gzip/indexed_gzip-0.8.10.ebuild b/dev-python/indexed_gzip/indexed_gzip-0.8.10.ebuild
deleted file mode 100644
index e8c9e2200f20..000000000000
--- a/dev-python/indexed_gzip/indexed_gzip-0.8.10.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Fast random access of gzip files in Python"
-HOMEPAGE="https://github.com/pauldmccarthy/indexed_gzip"
-SRC_URI="https://github.com/pauldmccarthy/indexed_gzip/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
- dev-python/cython[${PYTHON_USEDEP}]
- test? (
- dev-python/numpy[${PYTHON_USEDEP}]
- )
- "
-RDEPEND=""
-
-distutils_enable_tests pytest
-
-src_compile() {
- if use test; then
- export INDEXED_GZIP_TESTING=1
- fi
- distutils-r1_src_compile
-}
-
-python_test() {
- cp conftest.py "${BUILD_DIR}" || die
- cd "${BUILD_DIR}" || die
- pytest -vv --nelems 500000 --niters 250 || die
-}
diff --git a/dev-python/indexed_gzip/indexed_gzip-1.6.0.ebuild b/dev-python/indexed_gzip/indexed_gzip-1.6.0.ebuild
deleted file mode 100644
index 6803e7e7dcc3..000000000000
--- a/dev-python/indexed_gzip/indexed_gzip-1.6.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Fast random access of gzip files in Python"
-HOMEPAGE="https://github.com/pauldmccarthy/indexed_gzip"
-SRC_URI="https://github.com/pauldmccarthy/indexed_gzip/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
- dev-python/cython[${PYTHON_USEDEP}]
- test? (
- dev-python/numpy[${PYTHON_USEDEP}]
- )
- "
-
-distutils_enable_tests pytest
-
-src_prepare() {
- sed -i -e 's:--cov=indexed_gzip::' setup.cfg || die
- distutils-r1_src_prepare
-}
-
-src_compile() {
- if use test; then
- export INDEXED_GZIP_TESTING=1
- fi
- distutils-r1_src_compile
-}
-
-python_test() {
- local ignore=(
- # requires nibabel
- test_nibabel_integration.py
- )
-
- cd "${BUILD_DIR}"/lib/indexed_gzip/tests || die
- epytest ${ignore[@]/#/--ignore }
-}
diff --git a/dev-python/indexed_gzip/indexed_gzip-1.6.1.ebuild b/dev-python/indexed_gzip/indexed_gzip-1.6.1.ebuild
deleted file mode 100644
index 6481acb4f3bb..000000000000
--- a/dev-python/indexed_gzip/indexed_gzip-1.6.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Fast random access of gzip files in Python"
-HOMEPAGE="https://github.com/pauldmccarthy/indexed_gzip"
-SRC_URI="https://github.com/pauldmccarthy/indexed_gzip/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
- dev-python/cython[${PYTHON_USEDEP}]
- test? (
- dev-python/numpy[${PYTHON_USEDEP}]
- )
- "
-
-distutils_enable_tests pytest
-
-src_prepare() {
- sed -i -e 's:--cov=indexed_gzip::' setup.cfg || die
- distutils-r1_src_prepare
-}
-
-src_compile() {
- if use test; then
- export INDEXED_GZIP_TESTING=1
- fi
- distutils-r1_src_compile
-}
-
-python_test() {
- cd "${BUILD_DIR}"/lib/indexed_gzip/tests || die
- epytest
-}
diff --git a/dev-python/indexed_gzip/indexed_gzip-1.6.2.ebuild b/dev-python/indexed_gzip/indexed_gzip-1.6.2.ebuild
deleted file mode 100644
index f2cf3667d4c1..000000000000
--- a/dev-python/indexed_gzip/indexed_gzip-1.6.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Fast random access of gzip files in Python"
-HOMEPAGE="https://github.com/pauldmccarthy/indexed_gzip"
-SRC_URI="https://github.com/pauldmccarthy/indexed_gzip/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- sys-libs/zlib:="
-DEPEND=${RDEPEND}
-BDEPEND="
- dev-python/cython[${PYTHON_USEDEP}]
- test? (
- dev-python/numpy[${PYTHON_USEDEP}]
- )
- "
-
-distutils_enable_tests pytest
-
-src_prepare() {
- sed -i -e 's:--cov=indexed_gzip::' setup.cfg || die
- distutils-r1_src_prepare
-}
-
-src_compile() {
- if use test; then
- export INDEXED_GZIP_TESTING=1
- fi
- distutils-r1_src_compile
-}
-
-python_test() {
- cd "${BUILD_DIR}"/lib/indexed_gzip/tests || die
- epytest
-}
diff --git a/dev-python/iniparse/Manifest b/dev-python/iniparse/Manifest
index cc0c0529beb7..5c42f6cb341c 100644
--- a/dev-python/iniparse/Manifest
+++ b/dev-python/iniparse/Manifest
@@ -1,2 +1 @@
-DIST iniparse-0.4.tar.gz 31278 BLAKE2B 1d92322cedd115a68f4133f477ca772e4d24b48991c07fecf3d22e86ac39f0626ffa7cebecfa15a200dc9fcbfac205c1e17aefa35e335a1f86f3919a3f9c1d58 SHA512 d59eae7c1ce474c89eddb0b0cbff5973444571728aa0c6ce5b3632984353415f7eec4de63cf007c276df0d1bb914b2ea5dd0acc00f3a261285c8e2e9883fbe9a
DIST iniparse-0.5.tar.gz 32233 BLAKE2B 3da99f9d828318f78ddb8789afe63a7fdec017eaf41df5f420b0f358a9724eb787f312c9964238d9e42ebecce143d37f72858c7935cafbcf0221229b89033026 SHA512 b3f10d1b36497c3c5c71cb0a1ac73d74d8944f4ad3b7acc4a4b0246c2f1a20c184d9af20bbb3cb8ec4f57fddfb5e103b92688847debb4200ef0583353d7f9556
diff --git a/dev-python/iniparse/files/iniparse-0.4-python3.patch b/dev-python/iniparse/files/iniparse-0.4-python3.patch
deleted file mode 100644
index a5ebb73e711c..000000000000
--- a/dev-python/iniparse/files/iniparse-0.4-python3.patch
+++ /dev/null
@@ -1,523 +0,0 @@
-Index: iniparse/__init__.py
-===================================================================
---- a/iniparse/__init__.py (revision 146)
-+++ b/iniparse/__init__.py (working copy)
-@@ -3,17 +3,17 @@
- # Copyright (c) 2007 Tim Lauridsen <tla@rasmil.dk>
- # All Rights Reserved. See LICENSE-PSF & LICENSE for details.
-
--from ini import INIConfig, change_comment_syntax
--from config import BasicConfig, ConfigNamespace
--from compat import RawConfigParser, ConfigParser, SafeConfigParser
--from utils import tidy
-+from .ini import INIConfig, change_comment_syntax
-+from .config import BasicConfig, ConfigNamespace
-+from .compat import RawConfigParser, ConfigParser, SafeConfigParser
-+from .utils import tidy
-
--from ConfigParser import DuplicateSectionError, \
-- NoSectionError, NoOptionError, \
-- InterpolationMissingOptionError, \
-- InterpolationDepthError, \
-- InterpolationSyntaxError, \
-- DEFAULTSECT, MAX_INTERPOLATION_DEPTH
-+from .configparser import DuplicateSectionError, \
-+ NoSectionError, NoOptionError, \
-+ InterpolationMissingOptionError, \
-+ InterpolationDepthError, \
-+ InterpolationSyntaxError, \
-+ DEFAULTSECT, MAX_INTERPOLATION_DEPTH
-
- __all__ = [
- 'BasicConfig', 'ConfigNamespace',
-Index: iniparse/compat.py
-===================================================================
---- a/iniparse/compat.py (revision 146)
-+++ b/iniparse/compat.py (working copy)
-@@ -12,20 +12,22 @@
- """
-
- import re
--from ConfigParser import DuplicateSectionError, \
-- NoSectionError, NoOptionError, \
-- InterpolationMissingOptionError, \
-- InterpolationDepthError, \
-- InterpolationSyntaxError, \
-- DEFAULTSECT, MAX_INTERPOLATION_DEPTH
-+from .configparser import DuplicateSectionError, \
-+ NoSectionError, NoOptionError, \
-+ InterpolationMissingOptionError, \
-+ InterpolationDepthError, \
-+ InterpolationSyntaxError, \
-+ DEFAULTSECT, MAX_INTERPOLATION_DEPTH
-
- # These are imported only for compatiability.
- # The code below does not reference them directly.
--from ConfigParser import Error, InterpolationError, \
-- MissingSectionHeaderError, ParsingError
-+from .configparser import Error, InterpolationError, \
-+ MissingSectionHeaderError, ParsingError
-
--import ini
-+import six
-
-+from . import ini
-+
- class RawConfigParser(object):
- def __init__(self, defaults=None, dict_type=dict):
- if dict_type != dict:
-@@ -56,7 +58,7 @@
- # The default section is the only one that gets the case-insensitive
- # treatment - so it is special-cased here.
- if section.lower() == "default":
-- raise ValueError, 'Invalid section name: %s' % section
-+ raise ValueError('Invalid section name: %s' % section)
-
- if self.has_section(section):
- raise DuplicateSectionError(section)
-@@ -88,7 +90,7 @@
- filename may also be given.
- """
- files_read = []
-- if isinstance(filenames, basestring):
-+ if isinstance(filenames, six.string_types):
- filenames = [filenames]
- for filename in filenames:
- try:
-@@ -143,7 +145,7 @@
- def getboolean(self, section, option):
- v = self.get(section, option)
- if v.lower() not in self._boolean_states:
-- raise ValueError, 'Not a boolean: %s' % v
-+ raise ValueError('Not a boolean: %s' % v)
- return self._boolean_states[v.lower()]
-
- def has_option(self, section, option):
-@@ -234,7 +236,7 @@
- if "%(" in value:
- try:
- value = value % vars
-- except KeyError, e:
-+ except KeyError as e:
- raise InterpolationMissingOptionError(
- option, section, rawval, e.args[0])
- else:
-@@ -283,7 +285,7 @@
- _badpercent_re = re.compile(r"%[^%]|%$")
-
- def set(self, section, option, value):
-- if not isinstance(value, basestring):
-+ if not isinstance(value, six.string_types):
- raise TypeError("option values must be strings")
- # check for bad percent signs:
- # first, replace all "good" interpolations
-Index: iniparse/config.py
-===================================================================
---- a/iniparse/config.py (revision 146)
-+++ b/iniparse/config.py (working copy)
-@@ -143,7 +143,7 @@
-
- >>> n.aaa = 42
- >>> del n.x
-- >>> print n
-+ >>> print(n)
- aaa = 42
- name.first = paramjit
- name.last = oberoi
-@@ -152,7 +152,7 @@
-
- >>> isinstance(n.name, ConfigNamespace)
- True
-- >>> print n.name
-+ >>> print(n.name)
- first = paramjit
- last = oberoi
- >>> sorted(list(n.name))
-@@ -160,7 +160,7 @@
-
- Finally, values can be read from a file as follows:
-
-- >>> from StringIO import StringIO
-+ >>> from six import StringIO
- >>> sio = StringIO('''
- ... # comment
- ... ui.height = 100
-@@ -171,7 +171,7 @@
- ... ''')
- >>> n = BasicConfig()
- >>> n._readfp(sio)
-- >>> print n
-+ >>> print(n)
- complexity = medium
- data.secret.password = goodness=gracious me
- have_python
-@@ -199,7 +199,7 @@
-
- def __str__(self, prefix=''):
- lines = []
-- keys = self._data.keys()
-+ keys = list(self._data.keys())
- keys.sort()
- for name in keys:
- value = self._data[name]
-@@ -258,7 +258,7 @@
- >>> n.ui.display_clock = True
- >>> n.ui.display_qlength = True
- >>> n.ui.width = 150
-- >>> print n
-+ >>> print(n)
- playlist.expand_playlist = True
- ui.display_clock = True
- ui.display_qlength = True
-@@ -267,7 +267,7 @@
- >>> from iniparse import ini
- >>> i = ini.INIConfig()
- >>> update_config(i, n)
-- >>> print i
-+ >>> print(i)
- [playlist]
- expand_playlist = True
- <BLANKLINE>
-@@ -277,7 +277,7 @@
- width = 150
-
- """
-- for name in source:
-+ for name in sorted(source):
- value = source[name]
- if isinstance(value, ConfigNamespace):
- if name in target:
-Index: iniparse/configparser.py
-===================================================================
---- a/iniparse/configparser.py (revision 0)
-+++ b/iniparse/configparser.py (working copy)
-@@ -0,0 +1,7 @@
-+try:
-+ from ConfigParser import *
-+ # not all objects get imported with __all__
-+ from ConfigParser import Error, InterpolationMissingOptionError
-+except ImportError:
-+ from configparser import *
-+ from configparser import Error, InterpolationMissingOptionError
-Index: iniparse/ini.py
-===================================================================
---- a/iniparse/ini.py (revision 146)
-+++ b/iniparse/ini.py (working copy)
-@@ -7,7 +7,7 @@
-
- Example:
-
-- >>> from StringIO import StringIO
-+ >>> from six import StringIO
- >>> sio = StringIO('''# configure foo-application
- ... [foo]
- ... bar1 = qualia
-@@ -16,14 +16,14 @@
- ... special = 1''')
-
- >>> cfg = INIConfig(sio)
-- >>> print cfg.foo.bar1
-+ >>> print(cfg.foo.bar1)
- qualia
-- >>> print cfg['foo-ext'].special
-+ >>> print(cfg['foo-ext'].special)
- 1
- >>> cfg.foo.newopt = 'hi!'
- >>> cfg.baz.enabled = 0
-
-- >>> print cfg
-+ >>> print(cfg)
- # configure foo-application
- [foo]
- bar1 = qualia
-@@ -42,10 +42,12 @@
- # Backward-compatiable with ConfigParser
-
- import re
--from ConfigParser import DEFAULTSECT, ParsingError, MissingSectionHeaderError
-+from .configparser import DEFAULTSECT, ParsingError, MissingSectionHeaderError
-
--import config
-+import six
-
-+from . import config
-+
- class LineType(object):
- line = None
-
-@@ -278,6 +280,8 @@
- value = property(get_value, set_value)
-
- def __str__(self):
-+ for c in self.contents:
-+ pass#print(c.__str__())
- s = [x.__str__() for x in self.contents]
- return '\n'.join(s)
-
-@@ -465,7 +469,7 @@
- self._sections = {}
- if defaults is None: defaults = {}
- self._defaults = INISection(LineContainer(), optionxformsource=self)
-- for name, value in defaults.iteritems():
-+ for name, value in defaults.items():
- self._defaults[name] = value
- if fp is not None:
- self._readfp(fp)
-@@ -551,7 +555,7 @@
-
- for line in readline_iterator(fp):
- # Check for BOM on first line
-- if linecount == 0 and isinstance(line, unicode):
-+ if linecount == 0 and isinstance(line, six.text_type):
- if line[0] == u'\ufeff':
- line = line[1:]
- self._bom = True
-Index: iniparse/utils.py
-===================================================================
---- a/iniparse/utils.py (revision 146)
-+++ b/iniparse/utils.py (working copy)
-@@ -1,5 +1,5 @@
--import compat
--from ini import LineContainer, EmptyLine
-+from . import compat
-+from .ini import LineContainer, EmptyLine
-
- def tidy(cfg):
- """Clean up blank lines.
-Index: tests/__init__.py
-===================================================================
---- a/tests/__init__.py (revision 146)
-+++ b/tests/__init__.py (working copy)
-@@ -1,12 +1,12 @@
- import unittest, doctest
-
--import test_ini
--import test_misc
--import test_fuzz
--import test_compat
--import test_unicode
--import test_tidy
--import test_multiprocessing
-+from . import test_ini
-+from . import test_misc
-+from . import test_fuzz
-+from . import test_compat
-+from . import test_unicode
-+from . import test_tidy
-+from . import test_multiprocessing
- from iniparse import config
- from iniparse import ini
-
-Index: tests/test_compat.py
-===================================================================
---- a/tests/test_compat.py (revision 146)
-+++ b/tests/test_compat.py (working copy)
-@@ -1,9 +1,16 @@
- from iniparse import compat as ConfigParser
--import StringIO
-+from six import StringIO
-+try:
-+ import UserDict
-+except ImportError:
-+ import collections as UserDict
- import unittest
--import UserDict
-
--from test import test_support
-+import sys
-+if sys.version_info[0] < 3:
-+ from test import test_support
-+else:
-+ from test import support as test_support
-
- class SortedDict(UserDict.UserDict):
- def items(self):
-@@ -35,7 +42,7 @@
-
- def fromstring(self, string, defaults=None):
- cf = self.newconfig(defaults)
-- sio = StringIO.StringIO(string)
-+ sio = StringIO(string)
- cf.readfp(sio)
- return cf
-
-@@ -161,7 +168,7 @@
- "No Section!\n")
-
- def parse_error(self, exc, src):
-- sio = StringIO.StringIO(src)
-+ sio = StringIO(src)
- self.assertRaises(exc, self.cf.readfp, sio)
-
- def test_query_errors(self):
-@@ -181,7 +188,7 @@
- def get_error(self, exc, section, option):
- try:
- self.cf.get(section, option)
-- except exc, e:
-+ except exc as e:
- return e
- else:
- self.fail("expected exception type %s.%s"
-@@ -227,7 +234,7 @@
- "foo: another very\n"
- " long line"
- )
-- output = StringIO.StringIO()
-+ output = StringIO()
- cf.write(output)
- self.assertEqual(
- output.getvalue(),
-@@ -465,7 +472,7 @@
- "o1=4\n"
- "[a]\n"
- "k=v\n")
-- output = StringIO.StringIO()
-+ output = StringIO()
- self.cf.write(output)
- self.assertEquals(output.getvalue(),
- "[a]\n"
-Index: tests/test_fuzz.py
-===================================================================
---- a/tests/test_fuzz.py (revision 146)
-+++ b/tests/test_fuzz.py (working copy)
-@@ -1,9 +1,10 @@
- import re
- import os
- import random
-+import sys
- import unittest
--import ConfigParser
--from StringIO import StringIO
-+from six import StringIO
-+from six.moves import configparser
- from iniparse import compat, ini, tidy
-
- # TODO:
-@@ -96,24 +97,25 @@
- s = '\n'.join(good_lines)
- cc = compat.RawConfigParser()
- cc.readfp(StringIO(s))
-- cc_py = ConfigParser.RawConfigParser()
-+ cc_py = configparser.RawConfigParser()
- cc_py.readfp(StringIO(s))
- # compare the two configparsers
- self.assertEqualConfig(cc_py, cc)
- # check that tidy does not change semantics
- tidy(cc)
-- cc_tidy = ConfigParser.RawConfigParser()
-+ cc_tidy = configparser.RawConfigParser()
- cc_tidy.readfp(StringIO(str(cc.data)))
- self.assertEqualConfig(cc_py, cc_tidy)
- except AssertionError:
- fname = 'fuzz-test-iter-%d.ini' % fuzz_iter
-- print 'Fuzz test failed at iteration', fuzz_iter
-- print 'Writing out failing INI file as', fname
-+ print('Fuzz test failed at iteration', fuzz_iter)
-+ print('Writing out failing INI file as', fname)
- f = open(fname, 'w')
- f.write(s)
- f.close()
- raise
-
-+ @unittest.skipIf(sys.version_info[0] > 2, 'http://code.google.com/p/iniparse/issues/detail?id=22#c9')
- def assertEqualConfig(self, c1, c2):
- self.assertEqualSorted(c1.sections(), c2.sections())
- self.assertEqualSorted(c1.defaults().items(), c2.defaults().items())
-@@ -123,9 +125,7 @@
- self.assertEqual(c1.get(sec, opt), c2.get(sec, opt))
-
- def assertEqualSorted(self, l1, l2):
-- l1.sort()
-- l2.sort()
-- self.assertEqual(l1, l2)
-+ self.assertEqual(sorted(l1), sorted(l2))
-
- class suite(unittest.TestSuite):
- def __init__(self):
-Index: tests/test_ini.py
-===================================================================
---- a/tests/test_ini.py (revision 146)
-+++ b/tests/test_ini.py (working copy)
-@@ -1,5 +1,5 @@
- import unittest
--from StringIO import StringIO
-+from six import StringIO
-
- from iniparse import ini
- from iniparse import compat
-@@ -196,13 +196,13 @@
- self.assertEqual(p._data.find('section2').find('just').value, 'kidding')
-
- itr = p._data.finditer('section1')
-- v = itr.next()
-+ v = next(itr)
- self.assertEqual(v.find('help').value, 'yourself')
- self.assertEqual(v.find('but').value, 'also me')
-- v = itr.next()
-+ v = next(itr)
- self.assertEqual(v.find('help').value, 'me')
- self.assertEqual(v.find('I\'m').value, 'desperate')
-- self.assertRaises(StopIteration, itr.next)
-+ self.assertRaises(StopIteration, next, itr)
-
- self.assertRaises(KeyError, p._data.find, 'section')
- self.assertRaises(KeyError, p._data.find('section2').find, 'ahem')
-Index: tests/test_misc.py
-===================================================================
---- a/tests/test_misc.py (revision 146)
-+++ b/tests/test_misc.py (working copy)
-@@ -1,9 +1,9 @@
- import re
- import unittest
- import pickle
--import ConfigParser
-+from six.moves import configparser
-+from six import StringIO
- from textwrap import dedent
--from StringIO import StringIO
- from iniparse import compat, ini
-
- class CaseSensitiveConfigParser(compat.ConfigParser):
-Index: tests/test_tidy.py
-===================================================================
---- a/tests/test_tidy.py (revision 146)
-+++ b/tests/test_tidy.py (working copy)
-@@ -1,6 +1,6 @@
- import unittest
- from textwrap import dedent
--from StringIO import StringIO
-+from six import StringIO
-
- from iniparse import tidy,INIConfig
- from iniparse.ini import EmptyLine
-Index: tests/test_unicode.py
-===================================================================
---- a/tests/test_unicode.py (revision 146)
-+++ b/tests/test_unicode.py (working copy)
-@@ -1,5 +1,5 @@
- import unittest
--from StringIO import StringIO
-+import six
- from iniparse import compat, ini
-
- class test_unicode(unittest.TestCase):
-@@ -17,14 +17,14 @@
- """
-
- def basic_tests(self, s, strable):
-- f = StringIO(s)
-+ f = six.StringIO(s)
- i = ini.INIConfig(f)
-- self.assertEqual(unicode(i), s)
-- self.assertEqual(type(i.foo.bar), unicode)
-+ self.assertEqual(six.text_type(i), s)
-+ self.assertEqual(type(i.foo.bar), six.text_type)
- if strable:
- self.assertEqual(str(i), str(s))
- else:
-- self.assertRaises(UnicodeEncodeError, lambda: str(i))
-+ self.assertRaises(UnicodeEncodeError, lambda: six.text_type(i).encode('ascii'))
- return i
-
- def test_ascii(self):
diff --git a/dev-python/iniparse/files/iniparse-0.4-tests.patch b/dev-python/iniparse/files/iniparse-0.4-tests.patch
deleted file mode 100644
index ca6900ad2ea5..000000000000
--- a/dev-python/iniparse/files/iniparse-0.4-tests.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From b3d6ea5ed88b0e6cf9fdb411a14e725665ded92e Mon Sep 17 00:00:00 2001
-From: Tim Lauridsen <timlau@fedoraproject.org>
-Date: Fri, 7 Mar 2014 19:06:40 +0100
-Subject: [PATCH] Fix handling of REM xxxxxxxx as a comment, but REMXXXX is not
- (upstream issue #28)
-
----
- tests/test_ini.py | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/tests/test_ini.py b/tests/test_ini.py
-index 07d4f4e..6d974f0 100644
---- a/tests/test_ini.py
-+++ b/tests/test_ini.py
-@@ -144,8 +144,7 @@ class test_comment_line(unittest.TestCase):
- '#this is a comment',
- ';; this is also a comment',
- '; so is this ',
-- 'Rem and this',
-- 'remthis too!'
-+ 'Rem and this'
- ]
- def test_parsing(self):
- for l in self.lines:
---
-1.8.5.3
-
diff --git a/dev-python/iniparse/iniparse-0.4-r2.ebuild b/dev-python/iniparse/iniparse-0.4-r2.ebuild
deleted file mode 100644
index 3a7544b389e8..000000000000
--- a/dev-python/iniparse/iniparse-0.4-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit distutils-r1
-
-DESCRIPTION="Better INI parser for Python"
-HOMEPAGE="https://pypi.org/project/iniparse/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT PSF-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND=">=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${P}-python3.patch"
- "${FILESDIR}/${P}-tests.patch"
-)
-
-python_test() {
- "${EPYTHON}" runtests.py || die
-}
diff --git a/dev-python/itypes/Manifest b/dev-python/itypes/Manifest
index 80980a85bf17..94c22396d982 100644
--- a/dev-python/itypes/Manifest
+++ b/dev-python/itypes/Manifest
@@ -1,2 +1 @@
-DIST itypes-1.1.0.gh.tar.gz 4403 BLAKE2B 62f7d1a96154f313c43764306ab7ea235e0ed8a60180e56760588f03ffbdb948a56b7bec9c63c861b743f6aa1510b0442d41015b944ef777655e7b152f15bbcb SHA512 2f6dd5d655f1031059df8dcfd0a2f76875796a800144e887fb66cb5585949097edb6b9f5e973de2280f43cfeb25ab99d3ca428372fe239c8cd70f385304bcdd7
DIST itypes-1.2.0.gh.tar.gz 5578 BLAKE2B c4025c2ad54203c4f3bbcd6f369fc6a86d21bd54a63c42acd68a98b6b44404340c3242e3c7a896483860eaa7f3df156fec79a71974e3cbb7b984fd83aa631eb2 SHA512 94421fa3f9ec7d18989332ca518607f09bd9d674e80bbca4a3c7324c20c3ae4e0679457e6a328e50ffe3d94c6db733f092798293133d42c1f07d959e0f837891
diff --git a/dev-python/itypes/itypes-1.1.0.ebuild b/dev-python/itypes/itypes-1.1.0.ebuild
deleted file mode 100644
index 7c0e5aa22446..000000000000
--- a/dev-python/itypes/itypes-1.1.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="basic immutable container types for python"
-HOMEPAGE="https://github.com/PavanTatikonda/itypes/"
-SRC_URI="
- https://github.com/PavanTatikonda/itypes/archive/${PV}.tar.gz
- -> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-distutils_enable_tests pytest
-
-python_test() {
- epytest tests.py
-}
diff --git a/dev-python/jaraco-stream/Manifest b/dev-python/jaraco-stream/Manifest
index b5f7c5c5e68e..0e0c030222ef 100644
--- a/dev-python/jaraco-stream/Manifest
+++ b/dev-python/jaraco-stream/Manifest
@@ -1,3 +1,2 @@
-DIST jaraco.stream-3.0.0.tar.gz 11838 BLAKE2B 9d26ff8f78a3f090d79ccc8cbc41819a8290ebdb7770f56a57938ad9311ca1fd168d633fec78ee102c2c08156c9e0ae6f521dd5cafcb9df22928ba9f3f832734 SHA512 f2ce7e65d9a3bcd81985f45d03f7cd56b2f2939f13a423b8b65714f19eb249493d89cad774460dd08c1345124d3d10f85ce6875b5f7049705f993c0a3146e5d9
DIST jaraco.stream-3.0.2.tar.gz 12784 BLAKE2B c9a9a1f940cd29cde67b624b0b7ac2dd426888f71d29f4bc4920eab5a7ba15713e5d5e57504e9f4f69f25d08a8cb2e2a1024c91c89b8c3aa8bb16023d84f33c6 SHA512 fce486caa9f27f3cfe7775858892d2865fe1c1656a8d369ef9321057716f25d7a737abf2a28fe7827efbeba2daa3b7992ec4fd18807751bf1fee6f48b238ab01
DIST jaraco.stream-3.0.3.tar.gz 8877 BLAKE2B 85289efe8e04e93cbceb0053f5025cad3d073deeb113806e25ca06fb88a9b082de6805305de85d1f17b77f61d2d0f4683b2b21f670102b03112b8f7a3fdafd91 SHA512 fe50c21b26e734c9c2d0b7cf8a1c8cc8bab80417adf073a4ae213ba4067aa33e2f6c8886aac996971d2f98aacd295d9999aa3ac7dba24dd952cc27d15bef22e2
diff --git a/dev-python/jaraco-stream/jaraco-stream-3.0.0-r1.ebuild b/dev-python/jaraco-stream/jaraco-stream-3.0.0-r1.ebuild
deleted file mode 100644
index 173d7a6205ea..000000000000
--- a/dev-python/jaraco-stream/jaraco-stream-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Routines for handling streaming data"
-HOMEPAGE="https://github.com/jaraco/jaraco.stream"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- >=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
- test? (
- >=dev-python/pytest-2.8[${PYTHON_USEDEP}]
- dev-python/more-itertools[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_sphinx docs \
- ">=dev-python/jaraco-packaging-3.2" \
- ">=dev-python/rst-linker-1.9"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_test() {
- # Skip one test which requires network access
- # Override pytest options to skip flake8
- PYTHONPATH=. pytest -vv --ignore=jaraco/stream/test_gzip.py \
- --override-ini="addopts=--doctest-modules" \
- || die "tests failed with ${EPYTHON}"
-}
-
-# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
-python_install() {
- rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
- # note: eclass may default to --skip-build in the future
- distutils-r1_python_install --skip-build
-}
diff --git a/dev-python/jikanpy/Manifest b/dev-python/jikanpy/Manifest
index 6708f8270c58..fbc8a9e4677d 100644
--- a/dev-python/jikanpy/Manifest
+++ b/dev-python/jikanpy/Manifest
@@ -1,2 +1 @@
-DIST jikanpy-4.3.1.tar.gz 725938 BLAKE2B 5e011ae4b6d267ad6a6a99b2d28a3f11c4b8949cc1682524d966ac441cce9c527465455573ec873360865f9b913bc14b5c4448ee681540a01bbb95f67c38dec2 SHA512 43170c3512393c50fd859e7481cdd6cce874bd54415959c0660d0804f10546bd22b836bf3c27a86946fc771e92192e28dd8ee02c71796f799b4cf748102d5e3f
DIST jikanpy-4.3.2.tar.gz 726102 BLAKE2B 754a174a5c67852701e94d817ab84462cbd1aff9f18737cdf5c7a1e20c91ca325d7c34dfd9467ff337d24fd7d3896880137f0695afeff5a436b0d40a96d4c89d SHA512 48dcf154f5b438b9381eb7d37a5a603d77793c2e2a7f17b4315e3f44a735c83bec076ee44969002a5ad2cbdd6b5cf83287b961f5d96603ddbd6c534db78ee3a1
diff --git a/dev-python/jikanpy/jikanpy-4.3.1.ebuild b/dev-python/jikanpy/jikanpy-4.3.1.ebuild
deleted file mode 100644
index 8dac8ee8e239..000000000000
--- a/dev-python/jikanpy/jikanpy-4.3.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for jikan.moe API."
-HOMEPAGE="https://pypi.org/project/jikanpy/"
-SRC_URI="https://github.com/abhinavk99/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BDEPEND="
- test? ( dev-python/vcrpy )
-"
-
-RDEPEND="
- dev-python/aiohttp[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/simplejson[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_install() {
- distutils-r1_src_install
-
- rm "$D"/usr/CHANGELOG.md
-}
diff --git a/dev-python/jq/Manifest b/dev-python/jq/Manifest
index 93332e11d4dc..1163d690a0cd 100644
--- a/dev-python/jq/Manifest
+++ b/dev-python/jq/Manifest
@@ -1,5 +1,3 @@
-DIST jq-1.1.2.tar.gz 70638 BLAKE2B c22db8ebfbe74382c3b4ccda1a13c1758e5aa195c0c9f3192f1220f8948fe4747d3f83b7448089b96a9fa3a2f4167cf50b43901beabf468abb786f2a29b3b984 SHA512 5046bd61135e7547c345f2e89ee2af2f64bd370ee39e301b62c8fd9d299590305e0f9f7f6e0307f59fc6b7eb05659df82eb5bd0a162985e615eaa8d79bef58e2
-DIST jq-1.1.3.tar.gz 71393 BLAKE2B 9cfdced8cad9b13179984d35e98f4094754746f1dbb23c2c0041eed7f6b5c7f348997681de8b07f59a6c6479dd6b31fa2dcdcc2f118e5cb92d5338767ea8fda2 SHA512 4aff64af748bc363917993385c8db762781f1e618a7f17c4de87fd654941c97b25d30819c0ec57695d08013f149ca9bcb58e6239d148dc719f73ecf78c41a5f0
DIST jq-1.2.1.gh.tar.gz 10321 BLAKE2B 8bc2c88ae553dd53137c11d4f599e01398d21811a02b4f33f81aeeafa9009f58a56074c0bcadcc6382d86d2c7ada792d442f9c660787e131d0e85c95fb7cab32 SHA512 0b6dda04c0b3c63a5bf41f8a73dedc3cd889683f3e89c99cbf258c839f35f66d19a6da5cf4096148cd17a3fb1a58ba0e10d052ce46a1a18af845910e00ff5d86
DIST jq-1.6.tar.gz 1750584 BLAKE2B c9be1314e9d027247de63492ee362e996ef85faf45a47ee421cad95ebde9188bff8d3fc7db64e717ab922e1052f3b1c1500f5589fc5b2199ab66effb000e442d SHA512 5da71f53c325257f1f546a2520fe47828b495c953270df25ea0e37741463fdda72f0ba4d5b05b25114ec30f27a559344c2b024bacabf610759f4e3e9efadb480
DIST onig-6.9.4.tar.gz 908702 BLAKE2B e6e9939f284569408ba01b8551960bc939bbfdca425f8470499f5bb83ead7b6b09898f6f6a09d5d8c26d74d5416f6e5e9e2f00fbe7aa9eb820edb8aa4a3050cc SHA512 ed8f42f6893966c0ee3c168b4fdbcb04b2286ad69ecab43a754c1dbc8fc4656e01319991d776d7144b6a3f90d050781b321432278d83c74c9565c2743851c85b
diff --git a/dev-python/jq/jq-1.1.2.ebuild b/dev-python/jq/jq-1.1.2.ebuild
deleted file mode 100644
index 51f86a3f79aa..000000000000
--- a/dev-python/jq/jq-1.1.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for jq"
-HOMEPAGE="https://github.com/mwilliamson/jq.py"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
- https://github.com/stedolan/jq/releases/download/jq-1.6/jq-1.6.tar.gz
- https://github.com/kkos/oniguruma/releases/download/v6.9.4/onig-6.9.4.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
- sed -e 's|import requests|#\0|' \
- -e 's|urlretrieve(source_url, tarball_path)|shutil.copyfile(source_url, tarball_path)|' \
- -e "s|source_url=.*kkos/oniguruma.*|source_url=\"${DISTDIR}/onig-6.9.4.tar.gz\",|" \
- -e "s|source_url=.*stedolan/jq.*|source_url=\"${DISTDIR}/jq-1.6.tar.gz\",|" \
- -i setup.py || die
- distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jq/jq-1.1.3.ebuild b/dev-python/jq/jq-1.1.3.ebuild
deleted file mode 100644
index 51f86a3f79aa..000000000000
--- a/dev-python/jq/jq-1.1.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for jq"
-HOMEPAGE="https://github.com/mwilliamson/jq.py"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
- https://github.com/stedolan/jq/releases/download/jq-1.6/jq-1.6.tar.gz
- https://github.com/kkos/oniguruma/releases/download/v6.9.4/onig-6.9.4.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
- sed -e 's|import requests|#\0|' \
- -e 's|urlretrieve(source_url, tarball_path)|shutil.copyfile(source_url, tarball_path)|' \
- -e "s|source_url=.*kkos/oniguruma.*|source_url=\"${DISTDIR}/onig-6.9.4.tar.gz\",|" \
- -e "s|source_url=.*stedolan/jq.*|source_url=\"${DISTDIR}/jq-1.6.tar.gz\",|" \
- -i setup.py || die
- distutils-r1_python_prepare_all
-}
diff --git a/dev-python/js2py/Manifest b/dev-python/js2py/Manifest
index 744b05d851d7..098197b5e6e9 100644
--- a/dev-python/js2py/Manifest
+++ b/dev-python/js2py/Manifest
@@ -1,2 +1 @@
-DIST Js2Py-0.70_p20210218.tar.gz 1969615 BLAKE2B 4702b2e771bfd2a5158a3539c33932335816c74f9dbd132679036aa2b7e53796764dd852e92d72a35ecc31efa34b849776c45d8c81e80f85f59308edf0996f00 SHA512 757c895bc0ba933020336a70473ec4455cb93c17040a39f17d645782011ea72273291448f3448ffd34658b48ada45b77facf3d326133f1c0d63e2e26e2cd7f30
DIST Js2Py-0.71.tar.gz 1969618 BLAKE2B 293a830f4188e66927b23900e8c376bf1a4bfdfa8726e33aa5aa75dcdf735cde89ce463741c142fc7e487ae89c7c11421e459d2fdd09ba88edfe953e4e087e42 SHA512 75bae61619d4766117f3c163d36427f3019825ecb08b745aee7c3b6f2d33a4ea8507ca180b63c0a8e575a5f9491eb64d6963acbb912edc7b934a676b38814597
diff --git a/dev-python/js2py/js2py-0.70_p20210218.ebuild b/dev-python/js2py/js2py-0.70_p20210218.ebuild
deleted file mode 100644
index 444e9561e4d7..000000000000
--- a/dev-python/js2py/js2py-0.70_p20210218.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_COMMIT="ea16b519a0f72e17416859a57890b8388fce6e39"
-
-MY_PN="Js2Py"
-MY_P="${MY_PN}-${PV}"
-
-PYTHON_COMPAT=( python3_{8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="JavaScript to Python Translator & JavaScript interpreter in Python"
-HOMEPAGE="
- http://piter.io/projects/js2py/
- https://github.com/PiotrDabkowski/Js2Py/
- https://pypi.org/project/Js2Py/
-"
-SRC_URI="https://github.com/PiotrDabkowski/${MY_PN}/archive/${MY_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-python/pyjsparser-2.5.1[${PYTHON_USEDEP}]
- >=dev-python/tzlocal-1.2.0[${PYTHON_USEDEP}]
- >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="test? ( ${RDEPEND} )"
-
-S="${WORKDIR}/${MY_PN}-${MY_COMMIT}"
-
-python_test() {
- pushd ./tests >/dev/null || die
-
- # Tests require "node_failed.txt" file where the logs are kept
- if [[ -f ./node_failed.txt ]]; then
- rm ./node_failed.txt || die
- fi
-
- touch ./node_failed.txt || die
- "${EPYTHON}" ./run.py || die "tests failed with ${EPYTHON}"
-
- popd >/dev/null || die
-}
diff --git a/dev-ruby/hiredis/hiredis-0.6.3-r1.ebuild b/dev-ruby/hiredis/hiredis-0.6.3-r1.ebuild
index 96c59d55486e..ec852faec264 100644
--- a/dev-ruby/hiredis/hiredis-0.6.3-r1.ebuild
+++ b/dev-ruby/hiredis/hiredis-0.6.3-r1.ebuild
@@ -25,7 +25,7 @@ KEYWORDS="~amd64"
IUSE=""
RDEPEND+=" =dev-libs/hiredis-0.14*:="
-DEPEND+=" dev-libs/hiredis test? ( dev-ruby/test-unit:2 )"
+DEPEND+=" dev-libs/hiredis:= test? ( dev-ruby/test-unit:2 )"
DEPEND+=" virtual/pkgconfig"
RUBY_S="${MY_P}"
diff --git a/dev-ruby/rbnacl/rbnacl-7.1.1.ebuild b/dev-ruby/rbnacl/rbnacl-7.1.1.ebuild
index 2d6b8d9ae9d6..57c4a97019ba 100644
--- a/dev-ruby/rbnacl/rbnacl-7.1.1.ebuild
+++ b/dev-ruby/rbnacl/rbnacl-7.1.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/cryptosphere/rbnacl"
LICENSE="MIT"
SLOT="6"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ppc64 ~x86"
IUSE=""
RDEPEND+=" dev-libs/libsodium"
diff --git a/sci-visualization/quickplot/quickplot-1.0.1_rc.ebuild b/sci-visualization/quickplot/quickplot-1.0.1_rc.ebuild
index 688dc57516ed..08a6ff3d92ce 100644
--- a/sci-visualization/quickplot/quickplot-1.0.1_rc.ebuild
+++ b/sci-visualization/quickplot/quickplot-1.0.1_rc.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
x11-libs/gtk+:3"
DEPEND="${RDEPEND}"
BDEPEND="
- media-gfx/imagemagick[png]
+ virtual/imagemagick-tools[png]
virtual/pkgconfig
www-client/lynx
dev-vcs/git"