summaryrefslogtreecommitdiff
path: root/dev-python
diff options
context:
space:
mode:
authorLiguros - Gitlab CI/CD [develop] <gitlab@liguros.net>2020-12-21 00:49:22 +0000
committerLiguros - Gitlab CI/CD [develop] <gitlab@liguros.net>2020-12-21 00:49:22 +0000
commit7038755cbf5b2168076aa28fef18abdd8652368b (patch)
treed734997b4569a38f5de3e43553306c9756c7719e /dev-python
parent2a04911022e274daa6d001a3f908b097ca1b15eb (diff)
downloadbaldeagleos-repo-7038755cbf5b2168076aa28fef18abdd8652368b.tar.gz
baldeagleos-repo-7038755cbf5b2168076aa28fef18abdd8652368b.tar.xz
baldeagleos-repo-7038755cbf5b2168076aa28fef18abdd8652368b.zip
Updating liguros repo
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/diff-match-patch/diff-match-patch-20200713.ebuild2
-rw-r--r--dev-python/dogpile-cache/files/dogpile-cache-1.0.2-pytest6.patch20
-rw-r--r--dev-python/funcy/funcy-1.14-r1.ebuild31
-rw-r--r--dev-python/funcy/funcy-1.14.ebuild14
-rw-r--r--dev-python/hiredis/Manifest1
-rw-r--r--dev-python/hiredis/hiredis-1.0.1-r1.ebuild32
-rw-r--r--dev-python/hiredis/hiredis-1.0.1.ebuild29
-rw-r--r--dev-python/hiredis/hiredis-1.1.0.ebuild6
-rw-r--r--dev-python/hiredis/metadata.xml2
-rw-r--r--dev-python/joblib/joblib-1.0.0.ebuild2
-rw-r--r--dev-python/loky/loky-2.9.0.ebuild2
-rw-r--r--dev-python/miniupnpc/Manifest2
-rw-r--r--dev-python/miniupnpc/miniupnpc-2.1.20201016.ebuild34
-rw-r--r--dev-python/miniupnpc/miniupnpc-2.2.0.ebuild2
-rw-r--r--dev-python/pyfakefs/Manifest4
-rw-r--r--dev-python/pyfakefs/pyfakefs-4.2.1.ebuild23
-rw-r--r--dev-python/pyfakefs/pyfakefs-4.3.0.ebuild23
-rw-r--r--dev-python/pyfakefs/pyfakefs-4.3.2.ebuild2
-rw-r--r--dev-python/pyfakefs/pyfakefs-4.3.3.ebuild (renamed from dev-python/pyfakefs/pyfakefs-4.3.1.ebuild)2
-rw-r--r--dev-python/pygit2/Manifest1
-rw-r--r--dev-python/pygit2/pygit2-1.3.0.ebuild42
-rw-r--r--dev-python/pygit2/pygit2-1.4.0.ebuild2
-rw-r--r--dev-python/pyglet/pyglet-1.5.10.ebuild2
-rw-r--r--dev-python/pyls-black/pyls-black-0.4.6.ebuild2
-rw-r--r--dev-python/pyls-spyder/pyls-spyder-0.1.1.ebuild2
-rw-r--r--dev-python/pyparted/pyparted-3.11.7.ebuild2
-rw-r--r--dev-python/pysaml2/files/cve-2020-5390.patch189
-rw-r--r--dev-python/pytest-faulthandler/pytest-faulthandler-1.6.0.ebuild2
-rw-r--r--dev-python/pytest-faulthandler/pytest-faulthandler-2.0.1.ebuild2
-rw-r--r--dev-python/python-language-server/Manifest1
-rw-r--r--dev-python/python-language-server/python-language-server-0.35.1-r1.ebuild70
-rw-r--r--dev-python/python-language-server/python-language-server-0.36.1.ebuild2
-rw-r--r--dev-python/sphinx-gallery/sphinx-gallery-0.8.2.ebuild2
-rw-r--r--dev-python/sphinx/Manifest1
-rw-r--r--dev-python/sphinx/sphinx-3.4.0.ebuild128
-rw-r--r--dev-python/sudsds/metadata.xml2
-rw-r--r--dev-python/sudsds/sudsds-1.0.1-r1.ebuild6
-rw-r--r--dev-python/threadpoolctl/threadpoolctl-2.1.0.ebuild2
-rw-r--r--dev-python/three-merge/three-merge-0.1.1.ebuild2
-rw-r--r--dev-python/unidecode/Manifest2
-rw-r--r--dev-python/unidecode/unidecode-1.1.2.ebuild (renamed from dev-python/unidecode/unidecode-0.04.21.ebuild)23
-rw-r--r--dev-python/websockets/websockets-8.1.ebuild2
-rw-r--r--dev-python/whatever/metadata.xml3
43 files changed, 198 insertions, 527 deletions
diff --git a/dev-python/diff-match-patch/diff-match-patch-20200713.ebuild b/dev-python/diff-match-patch/diff-match-patch-20200713.ebuild
index b0bd88d1c4d3..32161590eb4d 100644
--- a/dev-python/diff-match-patch/diff-match-patch-20200713.ebuild
+++ b/dev-python/diff-match-patch/diff-match-patch-20200713.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
distutils_enable_tests pytest
diff --git a/dev-python/dogpile-cache/files/dogpile-cache-1.0.2-pytest6.patch b/dev-python/dogpile-cache/files/dogpile-cache-1.0.2-pytest6.patch
deleted file mode 100644
index cc8154822544..000000000000
--- a/dev-python/dogpile-cache/files/dogpile-cache-1.0.2-pytest6.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit 625f73ce189b43541636dc40d8d0e4cd4f9a1386
-Author: Louis Sautier <sautier.louis@gmail.com>
-Date: Sat Oct 31 02:23:06 2020 +0100
-
- Support pytest 6
-
- See https://docs.pytest.org/en/stable/deprecations.html#node-construction-changed-to-node-from-parent
-
-diff --git a/tests/conftest.py b/tests/conftest.py
-index 10afafb..0b2a1e4 100644
---- a/tests/conftest.py
-+++ b/tests/conftest.py
-@@ -26,6 +26,6 @@ def is_unittest(obj):
-
- def pytest_pycollect_makeitem(collector, name, obj):
- if is_unittest(obj) and not obj.__name__.startswith("_"):
-- return UnitTestCase(name, parent=collector)
-+ return UnitTestCase.from_parent(collector, name=name)
- else:
- return []
diff --git a/dev-python/funcy/funcy-1.14-r1.ebuild b/dev-python/funcy/funcy-1.14-r1.ebuild
new file mode 100644
index 000000000000..9d04567a0959
--- /dev/null
+++ b/dev-python/funcy/funcy-1.14-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="A collection of fancy functional tools focused on practicality"
+HOMEPAGE="https://github.com/Suor/funcy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND="
+ ${RDEPEND}
+ test? (
+ dev-python/whatever[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ )"
+
+python_test() {
+ distutils_install_for_testing --via-root
+ pytest || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/funcy/funcy-1.14.ebuild b/dev-python/funcy/funcy-1.14.ebuild
index 741ebafc6b72..ef4fd7c71310 100644
--- a/dev-python/funcy/funcy-1.14.ebuild
+++ b/dev-python/funcy/funcy-1.14.ebuild
@@ -13,19 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
+IUSE=""
DEPEND=""
RDEPEND="${DEPEND}"
-BDEPEND="
- ${RDEPEND}
- test? (
- dev-python/whatever[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- )"
-
-python_test() {
- distutils_install_for_testing --via-root
- pytest || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/hiredis/Manifest b/dev-python/hiredis/Manifest
index d60dee5ddaf6..3504fdc829af 100644
--- a/dev-python/hiredis/Manifest
+++ b/dev-python/hiredis/Manifest
@@ -1,2 +1 @@
-DIST hiredis-1.0.1.tar.gz 54460 BLAKE2B 90bdbd99f47b0765636dbeee9fc3cbb9c71fd7ba752a0d58ab9c2c9d2ee93bfc1a343465618d1127703ae09a4870d6691d7d5b52f59150849a448eae73c6a1d3 SHA512 8aa5e29b09f42826d746857d55b8042b40ffa3977386b0f8b2ea1b2ede0c28337f3df4bbd177192d8873570810bc9d0987f1f2b29f094f27adaa4aaf409c3a6b
DIST hiredis-1.1.0.tar.gz 54620 BLAKE2B 9991745d277e87efe836c1c8eabb2016ce401e2be52c7e1b3a154350776fae6fd3c49e3096da57231e42c57bf36ba692ce26bc993d0923b5246376d8694ad058 SHA512 ad37868376de91303c15ffe6109dc7fadb4f458efdd44b7ddc0a410937a389b8e062ab7d36b1aec3fe324ecafe6b1e5e6b92f547cbf619251dad22a28e02ee9c
diff --git a/dev-python/hiredis/hiredis-1.0.1-r1.ebuild b/dev-python/hiredis/hiredis-1.0.1-r1.ebuild
deleted file mode 100644
index b3d2f71538e3..000000000000
--- a/dev-python/hiredis/hiredis-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python extension that wraps hiredis"
-HOMEPAGE="https://github.com/pietern/hiredis-py"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="system-libs"
-
-DEPEND="system-libs? ( dev-libs/hiredis:0/0.14 )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- use system-libs && PATCHES+=(
- "${FILESDIR}"/${P}-system-libs.patch
- "${FILESDIR}"/${P}-api-0.14.patch
- )
- default
-}
-
-python_test() {
- cd test
- "${EPYTHON}" -m unittest reader.ReaderTest || die "tests failed"
-}
diff --git a/dev-python/hiredis/hiredis-1.0.1.ebuild b/dev-python/hiredis/hiredis-1.0.1.ebuild
deleted file mode 100644
index badb8c56a91b..000000000000
--- a/dev-python/hiredis/hiredis-1.0.1.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_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python extension that wraps hiredis"
-HOMEPAGE="https://github.com/pietern/hiredis-py"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="dev-libs/hiredis:0/0.14"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-system-libs.patch
- "${FILESDIR}"/${P}-api-0.14.patch
-)
-
-python_test() {
- cd test
- "${EPYTHON}" -m unittest reader.ReaderTest || die "tests failed"
-}
diff --git a/dev-python/hiredis/hiredis-1.1.0.ebuild b/dev-python/hiredis/hiredis-1.1.0.ebuild
index ecd689bef87f..b4c77ac06754 100644
--- a/dev-python/hiredis/hiredis-1.1.0.ebuild
+++ b/dev-python/hiredis/hiredis-1.1.0.ebuild
@@ -7,12 +7,12 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} )
inherit distutils-r1
DESCRIPTION="Python extension that wraps hiredis"
-HOMEPAGE="https://github.com/pietern/hiredis-py"
+HOMEPAGE="https://github.com/redis/hiredis-py/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="system-libs"
DEPEND="system-libs? ( dev-libs/hiredis:0/0.14 )"
@@ -27,6 +27,6 @@ src_prepare() {
}
python_test() {
- cd test
+ cd test || die
"${EPYTHON}" -m unittest reader.ReaderTest || die "tests failed"
}
diff --git a/dev-python/hiredis/metadata.xml b/dev-python/hiredis/metadata.xml
index 285da38ba1b3..6d50eacf774f 100644
--- a/dev-python/hiredis/metadata.xml
+++ b/dev-python/hiredis/metadata.xml
@@ -11,7 +11,7 @@
</maintainer>
<upstream>
<remote-id type="pypi">hiredis</remote-id>
- <remote-id type="github">pietern/hiredis-py</remote-id>
+ <remote-id type="github">redis/hiredis-py</remote-id>
</upstream>
<use>
<flag name="system-libs">Use dev-libs/hiredis from system</flag>
diff --git a/dev-python/joblib/joblib-1.0.0.ebuild b/dev-python/joblib/joblib-1.0.0.ebuild
index 31a9ed6b3883..726f1c0016d6 100644
--- a/dev-python/joblib/joblib-1.0.0.ebuild
+++ b/dev-python/joblib/joblib-1.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
RDEPEND="
dev-python/cloudpickle[${PYTHON_USEDEP}]
diff --git a/dev-python/loky/loky-2.9.0.ebuild b/dev-python/loky/loky-2.9.0.ebuild
index 041648d264f9..c632ce4ab8b1 100644
--- a/dev-python/loky/loky-2.9.0.ebuild
+++ b/dev-python/loky/loky-2.9.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
RDEPEND="
dev-python/cloudpickle[${PYTHON_USEDEP}]
diff --git a/dev-python/miniupnpc/Manifest b/dev-python/miniupnpc/Manifest
index eace9f0adc8e..f8092a1cc73e 100644
--- a/dev-python/miniupnpc/Manifest
+++ b/dev-python/miniupnpc/Manifest
@@ -1,4 +1,2 @@
-DIST miniupnpc-2.1.20201016.tar.gz 97682 BLAKE2B 2c98f71ff7262a24a69a9a4af411dbeb58c20ec4181bca8bbdd61c628bf5bd49f7e9b763b73ffb5d3508b5b545a0c918828ead2a376b57b8ea5051cd7b8e9c13 SHA512 d619f7e205cac68137020fab31e8bdaeebd09eeaca5e42e1e03a9e0085a64d635ec896862a488b0d57798d1e6ce96e2ba5652f60c0b8df9fc866eea90baea152
-DIST miniupnpc-2.1.20201016.tar.gz.sig 543 BLAKE2B b8ddcadb58e7b8dc4646ea1ac4e10331fe70a5b9a27902dd5ad09ac306605160b63f2e21d96eda4aa0f77485800cb9c5aa110f215dbe3536a9f6ec1c4a5e9ed9 SHA512 fb7886d4198bd2ae1eeff293152ff509e7ebe6ff0f9b3c20d5824f7ca9f65091a61db2bc0a8ac9fb0449994aba594cff3bf6c556876dbb47d593ecf8b7b26d10
DIST miniupnpc-2.2.0.tar.gz 98348 BLAKE2B 3464dc7f0b5416b558d0dd49121f3b851d9808a516c19d4f99fdb205e20149f27ef495d9f8da09ad3a28656580bfc16d1cf99ef993e41e9600cfe427b4a776d2 SHA512 b5bb674f162cae3d9e0205a9cdf6acc1fb334ab8ac5330be924411a8fd46833fb916d09f947d1e40d05224df7df1ecf6d812037185690e5022287c2024eb183f
DIST miniupnpc-2.2.0.tar.gz.sig 543 BLAKE2B c75dbc54debc77e63ea3534f8f424a3904131893fc31d6485163ee6ecdafdab02fc0db8e290d28c834ac0efc5a37c34cbca7f14e1c78f859d22abc4e0b2ae48f SHA512 54f8cccea5886e06fbdaa04d270c12bd95d219be0b275491d9168f1089b1efe96e8a6f30ebf428091a3bae4bc349c0b8c94a22e94d56845a0a8b9724b1f9f74d
diff --git a/dev-python/miniupnpc/miniupnpc-2.1.20201016.ebuild b/dev-python/miniupnpc/miniupnpc-2.1.20201016.ebuild
deleted file mode 100644
index b22d1ffff32d..000000000000
--- a/dev-python/miniupnpc/miniupnpc-2.1.20201016.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_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1 verify-sig
-
-DESCRIPTION="Python bindings for UPnP client library"
-HOMEPAGE="https://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
- verify-sig? ( http://miniupnp.free.fr/files/${P}.tar.gz.sig )"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND=">=net-libs/miniupnpc-${PV}:0="
-DEPEND="${RDEPEND}"
-BDEPEND="verify-sig? ( app-crypt/openpgp-keys-miniupnp )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc
-
-PATCHES=(
- "${FILESDIR}"/miniupnpc-2.0.20171102-shared-lib.patch
-)
-
-# DOCS are installed by net-libs/miniupnpc.
-DOCS=()
-
-# Example test command:
-# python -c 'import miniupnpc; u = miniupnpc.UPnP(); u.discover(); u.selectigd(); print(u.externalipaddress())'
diff --git a/dev-python/miniupnpc/miniupnpc-2.2.0.ebuild b/dev-python/miniupnpc/miniupnpc-2.2.0.ebuild
index cb6732d40366..b22d1ffff32d 100644
--- a/dev-python/miniupnpc/miniupnpc-2.2.0.ebuild
+++ b/dev-python/miniupnpc/miniupnpc-2.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
IUSE=""
RDEPEND=">=net-libs/miniupnpc-${PV}:0="
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index e0889292269a..e08a898ac782 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -1,4 +1,2 @@
-DIST pyfakefs-4.2.1.tar.gz 192910 BLAKE2B dd1826b8fbddb9c9f272cd6fe0a286a41dbcf1bba625cfaef22ea1f17089f6acf346c3a84e56e6ad41f501329c06539bcda72cad670481a3ad770d014ad1e93d SHA512 99ee0ece46ed457dcf98c4c59ee905e58bbfe66e4fadcc3d3d9d725c2ce7b4fae25bc3cf847c85045a828beab52f315ec2ee78e6fea4b23cfe9aaddfd49f1829
-DIST pyfakefs-4.3.0.tar.gz 194821 BLAKE2B f7deca18ad019dba12ac35bac44be339fc1eef0ef609f33b2fa8974f3bd65a25fba043f0afef0e332f9a71f5014444eb7c6e890acbfcfc9c8acb780dc88140a6 SHA512 42c6e9da0f098eeb948fbe3f1f26e8fddfb35d3156543ccc2297cc0fb971a87911a94ca925d2fd12531999fd9314b615f49688a3e9a4aef19522cd08bdabe72a
-DIST pyfakefs-4.3.1.tar.gz 194638 BLAKE2B 752fb2ec88d7468ca439e7124e26b9f111f3b3971a47062b598a0d66c9fc5d8d317716ad73648de727ad6072546fd7b02f7f3a65da45998a20d5f5f3e5999bf1 SHA512 9e1521b7c051ef984329ebe9e2003f72a6f54497dcde46b3fe1b14f282ba436dc17ebd6b8e570714eb1ed8de9f484e6bc94ece0a39985a47f7668f350b5a797f
DIST pyfakefs-4.3.2.tar.gz 194897 BLAKE2B c3b36e280cb73c4bcd2349382eb67726c19627b0c6dc392a0f38ec7f9f001e5ddbe93734de6d177c68ea1e2213c5c7d06827e3aa12af0c7cd744ba35b8d5df5c SHA512 50479d2ac7b8622ee30c4c2f09cb3d2bdfb315b4eb61eecb37f8946f038ec9048d653250a0f58dcef55b1b8347b040ecd416f61f26ecfdf7b083801114770803
+DIST pyfakefs-4.3.3.tar.gz 194498 BLAKE2B 4ad300889e8c8462f4a237c2a12a9d93cbaaff6e9e6347e667bc366abf9705023eb1838c4291488c10a51d5209810c773edcb08c58e3759ccd9f851b17ea82e1 SHA512 e4cc3603496705216c1ea1448f835a19efa5a1429f3ecd67911ab2dc76d6754af7bb25312a6b15046355af26b8b72528acf68db50960d2eaba8bb3ef80fccaa0
diff --git a/dev-python/pyfakefs/pyfakefs-4.2.1.ebuild b/dev-python/pyfakefs/pyfakefs-4.2.1.ebuild
deleted file mode 100644
index 5c82c39679e5..000000000000
--- a/dev-python/pyfakefs/pyfakefs-4.2.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=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-DISTUTILS_IN_SOURCE_BUILD=1
-
-inherit distutils-r1
-
-DESCRIPTION="a fake file system that mocks the Python file system modules"
-HOMEPAGE="https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs/"
-SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests pytest
-
-python_test() {
- "${EPYTHON}" -m pyfakefs.tests.all_tests -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pyfakefs/pyfakefs-4.3.0.ebuild b/dev-python/pyfakefs/pyfakefs-4.3.0.ebuild
deleted file mode 100644
index 7044381e625f..000000000000
--- a/dev-python/pyfakefs/pyfakefs-4.3.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-DISTUTILS_IN_SOURCE_BUILD=1
-
-inherit distutils-r1
-
-DESCRIPTION="a fake file system that mocks the Python file system modules"
-HOMEPAGE="https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs/"
-SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-distutils_enable_tests pytest
-
-python_test() {
- "${EPYTHON}" -m pyfakefs.tests.all_tests -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pyfakefs/pyfakefs-4.3.2.ebuild b/dev-python/pyfakefs/pyfakefs-4.3.2.ebuild
index db5f0a20e3da..ce31d9d838e0 100644
--- a/dev-python/pyfakefs/pyfakefs-4.3.2.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-4.3.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
distutils_enable_tests pytest
diff --git a/dev-python/pyfakefs/pyfakefs-4.3.1.ebuild b/dev-python/pyfakefs/pyfakefs-4.3.3.ebuild
index 7044381e625f..db5f0a20e3da 100644
--- a/dev-python/pyfakefs/pyfakefs-4.3.1.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-4.3.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
distutils_enable_tests pytest
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index 9267f85a40e5..a2e04b6c2302 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,2 +1 @@
-DIST pygit2-1.3.0.tar.gz 243399 BLAKE2B 273d678b1681bbe969282ed10af640a59d99c421d32f6d25cf7374a6b018fb52f92337929a24bd9348085fb4f359561d21b51728ce66d73a5ee7089eef9b7b4c SHA512 297c6aef27019ca540d7ec9c26da7a5e870a7e5c2e06daa1a038023c4ab32c800b2494970e41a3d576e17e1d2c33402c3116389d9e2ebe1c2def0ba529dbde71
DIST pygit2-1.4.0.tar.gz 244586 BLAKE2B aa4c04ff22df31270a03107498abe095e99e196711a1939fe6f15d4cae18e94d72f1964850437c5e82d897ca74e951a5b877fb41154f3790c9fb6c926c6cfe0b SHA512 b6b9d5028fd63593e6ecd869735132edeeb55c1fd97664be5d0d5dac0c25f844ce0d981782fad7f47e54555ab1f7fa5e87d1ad8a76340d81e1f908ad4ea1e35a
diff --git a/dev-python/pygit2/pygit2-1.3.0.ebuild b/dev-python/pygit2/pygit2-1.3.0.ebuild
deleted file mode 100644
index f2793e864c7a..000000000000
--- a/dev-python/pygit2/pygit2-1.3.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for libgit2"
-HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- =dev-libs/libgit2-1.0*
- dev-python/cached-property[${PYTHON_USEDEP}]
- >=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-src_prepare() {
- distutils-r1_src_prepare
-
- # unconditionally prevent it from using network
- sed -i -e '/has_network/s:True:False:' test/utils.py || die
-
- # we need to move them away to prevent pytest from forcing '..'
- # for imports
- mkdir hack || die
- mv test hack/ || die
- ln -s hack/test test || die
-}
-
-python_test() {
- pytest -vv hack/test || die
-}
diff --git a/dev-python/pygit2/pygit2-1.4.0.ebuild b/dev-python/pygit2/pygit2-1.4.0.ebuild
index 93a10bf83eb7..07b790346712 100644
--- a/dev-python/pygit2/pygit2-1.4.0.ebuild
+++ b/dev-python/pygit2/pygit2-1.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2-with-linking-exception"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="
=dev-libs/libgit2-1.1*
diff --git a/dev-python/pyglet/pyglet-1.5.10.ebuild b/dev-python/pyglet/pyglet-1.5.10.ebuild
index ed04cc5b8864..9902c4e92372 100644
--- a/dev-python/pyglet/pyglet-1.5.10.ebuild
+++ b/dev-python/pyglet/pyglet-1.5.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
IUSE="examples image +sound"
BDEPEND="
diff --git a/dev-python/pyls-black/pyls-black-0.4.6.ebuild b/dev-python/pyls-black/pyls-black-0.4.6.ebuild
index 6691d6f75204..e5fd0aa0872e 100644
--- a/dev-python/pyls-black/pyls-black-0.4.6.ebuild
+++ b/dev-python/pyls-black/pyls-black-0.4.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rupert/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="
dev-python/python-language-server[${PYTHON_USEDEP}]
diff --git a/dev-python/pyls-spyder/pyls-spyder-0.1.1.ebuild b/dev-python/pyls-spyder/pyls-spyder-0.1.1.ebuild
index 2627abc89543..0731b22fd5fb 100644
--- a/dev-python/pyls-spyder/pyls-spyder-0.1.1.ebuild
+++ b/dev-python/pyls-spyder/pyls-spyder-0.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.ta
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="dev-python/python-language-server[${PYTHON_USEDEP}]"
BDEPEND="test? ( dev-python/mock )"
diff --git a/dev-python/pyparted/pyparted-3.11.7.ebuild b/dev-python/pyparted/pyparted-3.11.7.ebuild
index 43fd32695c35..7eb32254297e 100644
--- a/dev-python/pyparted/pyparted-3.11.7.ebuild
+++ b/dev-python/pyparted/pyparted-3.11.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/dcantrell/pyparted/archive/v${PV}.tar.gz -> ${P}.tar
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
DEPEND="
>=sys-block/parted-3.2
diff --git a/dev-python/pysaml2/files/cve-2020-5390.patch b/dev-python/pysaml2/files/cve-2020-5390.patch
deleted file mode 100644
index bef46808d920..000000000000
--- a/dev-python/pysaml2/files/cve-2020-5390.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-From 5e9d5acbcd8ae45c4e736ac521fd2df5b1c62e25 Mon Sep 17 00:00:00 2001
-From: Ivan Kanakarakis <ivan.kanak@gmail.com>
-Date: Sat, 4 Jan 2020 00:39:47 +0200
-Subject: [PATCH] Fix XML Signature Wrapping (XSW) vulnerabilities
-
-PySAML2 did not check that the signature in a SAML document is enveloped and thus
-XML signature wrapping (XSW) was effective.
-
-The signature information and the node/object that is signed can be in different places
-and thus the signature verification will succeed, but the wrong data will be used. This
-specifically affects the verification of assertions that have been signed.
-
-This was assigned CVE-2020-5390
-
-Thanks to Alexey Sintsov and Yuri Goltsev from HERE Technologies to report this.
-
-+ + + + + + + +
-
-In more detail:
-
-libxml2 follows the xmldsig-core specification. The xmldsig specification is way too
-general. saml-core reuses the xmldsig specification, but constrains it to use of
-specific facilities. The implementation of the SAML specification is responsible to
-enforce those constraints. libxml2/xmlsec1 are not aware of those constraints and thus
-process the document based on the full/general xmldsig rules.
-
-What is happening is the following:
-
-- xmldsig-core allows the signature-information and the data that was signed to be in
- different places. This works by setting the URI attribute of the Reference element.
- The URI attribute contains an optional identifier of the object being signed. (see
- "4.4.3 The Reference Element" -- https://www.w3.org/TR/xmldsig-core1/#sec-Reference)
- This identifier is actually a pointer that can be defined in many different ways; from
- XPath expressions that need to be executed(!), to a full URL that should be fetched(!)
- in order to recalculate the signature.
-
-- saml-core section "5.4 XML Signature Profile" defines constrains on the xmldsig-core
- facilities. It explicitly dictates that enveloped signatures are the only signatures
- allowed. This mean that:
- * Assertion/RequestType/ResponseType elements must have an ID attribute
- * signatures must have a single Reference element
- * the Reference element must have a URI attribute
- * the URI attribute contains an anchor
- * the anchor points to the enclosing element's ID attribute
-
-xmlsec1 does the right thing - it follows the reference URI pointer and validates the
-assertion. But, the pointer points to an assertion in another part of the document; not
-the assertion in which the signature is embedded/enveloped. SAML processing thinks that
-the signature is fine (that's what xmlsec1 said), and gets the assertion data from the
-assertion that contains the signature - but that assertion was never validated. The
-issue is that pysaml2 does not enforce the constrains on the signature validation
-facilities of xmldsig-core, that the saml-core spec defines.
-
-The solution is simple; all we need is to make sure that assertions with signatures (1)
-contain one reference element that (2) has a URI attribute (3) that is an anchor that
-(4) points to the assertion in which the signature is embedded. If those conditions are
-met then we're good, otherwise we should fail the verification.
-
-Signed-off-by: Ivan Kanakarakis <ivan.kanak@gmail.com>
----
- src/saml2/sigver.py | 49 ++++++++++++++++++++++++++++++++++++
- tests/saml2_response_xsw.xml | 6 +++++
- tests/test_xsw.py | 44 ++++++++++++++++++++++++++++++++
- 3 files changed, 99 insertions(+)
- create mode 100644 tests/saml2_response_xsw.xml
- create mode 100644 tests/test_xsw.py
-
-diff --git a/src/saml2/sigver.py b/src/saml2/sigver.py
-index cbeca41f..c3d298a9 100644
---- a/src/saml2/sigver.py
-+++ b/src/saml2/sigver.py
-@@ -1476,6 +1476,55 @@ def _check_signature(self, decoded_xml, item, node_name=NODE_NAME, origdoc=None,
- if not certs:
- raise MissingKey(_issuer)
-
-+ # saml-core section "5.4 XML Signature Profile" defines constrains on the
-+ # xmldsig-core facilities. It explicitly dictates that enveloped signatures
-+ # are the only signatures allowed. This mean that:
-+ # * Assertion/RequestType/ResponseType elements must have an ID attribute
-+ # * signatures must have a single Reference element
-+ # * the Reference element must have a URI attribute
-+ # * the URI attribute contains an anchor
-+ # * the anchor points to the enclosing element's ID attribute
-+ references = item.signature.signed_info.reference
-+ signatures_must_have_a_single_reference_element = len(references) == 1
-+ the_Reference_element_must_have_a_URI_attribute = (
-+ signatures_must_have_a_single_reference_element
-+ and hasattr(references[0], "uri")
-+ )
-+ the_URI_attribute_contains_an_anchor = (
-+ the_Reference_element_must_have_a_URI_attribute
-+ and references[0].uri.startswith("#")
-+ and len(references[0].uri) > 1
-+ )
-+ the_anchor_points_to_the_enclosing_element_ID_attribute = (
-+ the_URI_attribute_contains_an_anchor
-+ and references[0].uri == "#{id}".format(id=item.id)
-+ )
-+ validators = {
-+ "signatures must have a single reference element": (
-+ signatures_must_have_a_single_reference_element
-+ ),
-+ "the Reference element must have a URI attribute": (
-+ the_Reference_element_must_have_a_URI_attribute
-+ ),
-+ "the URI attribute contains an anchor": (
-+ the_URI_attribute_contains_an_anchor
-+ ),
-+ "the anchor points to the enclosing element ID attribute": (
-+ the_anchor_points_to_the_enclosing_element_ID_attribute
-+ ),
-+ }
-+ if not all(validators.values()):
-+ error_context = {
-+ "message": "Signature failed to meet constraints on xmldsig",
-+ "validators": validators,
-+ "item ID": item.id,
-+ "reference URI": item.signature.signed_info.reference[0].uri,
-+ "issuer": _issuer,
-+ "node name": node_name,
-+ "xml document": decoded_xml,
-+ }
-+ raise SignatureError(error_context)
-+
- verified = False
- last_pem_file = None
-
-diff --git a/tests/saml2_response_xsw.xml b/tests/saml2_response_xsw.xml
-new file mode 100644
-index 00000000..3671eb48
---- /dev/null
-+++ b/tests/saml2_response_xsw.xml
-@@ -0,0 +1,6 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<ns0:Response xmlns:ns0="urn:oasis:names:tc:SAML:2.0:protocol" xmlns:ns1="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ns2="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Destination="http://lingon.catalogix.se:8087/" ID="id-vqOQ72JCppXaBWnBE" InResponseTo="id12" IssueInstant="2019-12-20T12:15:16Z" Version="2.0"><ns1:Issuer Format="urn:oasis:names:tc:SAML:2.0:nameid-format:entity">urn:mace:example.com:saml:roland:idp</ns1:Issuer><ns0:Status><ns0:StatusCode Value="urn:oasis:names:tc:SAML:2.0:status:Success"/></ns0:Status><ns1:Assertion ID="id-SPOOFED_ASSERTION" IssueInstant="2019-12-20T12:15:16Z" Version="2.0"><ns1:Issuer Format="urn:oasis:names:tc:SAML:2.0:nameid-format:entity">urn:mace:example.com:saml:roland:idp</ns1:Issuer><ns2:Signature Id="Signature2"><ns2:SignedInfo><ns2:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/><ns2:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><ns2:Reference URI="#id-Aa9IWfDxJVIX6GQye"><ns2:Transforms><ns2:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><ns2:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></ns2:Transforms><ns2:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><ns2:DigestValue>EWBvQUlrwQbtrAjuUXkSBAVsZ50=</ns2:DigestValue></ns2:Reference></ns2:SignedInfo><ns2:SignatureValue>m4zRgTWleMcx1dFboeiYlbiDigHWAVhHVa+GLN++ELNMFDutuzBxc3tu6okyaNQGW3leu32wzbfdpb5+3RlpGoKj2wPX570/EMJj4uw91XfXsZfpNP+5GlgNT8w/elDmBXhG/KwmSO477Imk0szKovTBMVHmo3QOd+ba//dVsJE=</ns2:SignatureValue><ns2:KeyInfo><ns2:X509Data><ns2:X509Certificate>MIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwHhcNMDkxMDA2MTk0OTQxWhcNMDkxMTA1MTk0OTQxWjBFMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDJg2cms7MqjniT8Fi/XkNHZNPbNVQyMUMXE9tXOdqwYCA1cc8vQdzkihscQMXy3iPw2cMggBu6gjMTOSOxECkuvX5ZCclKr8pXAJM5cY6gVOaVO2PdTZcvDBKGbiaNefiEw5hnoZomqZGp8wHNLAUkwtH9vjqqvxyS/vclc6k2ewIDAQABo4GnMIGkMB0GA1UdDgQWBBRePsKHKYJsiojE78ZWXccK9K4aJTB1BgNVHSMEbjBsgBRePsKHKYJsiojE78ZWXccK9K4aJaFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNVBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAJrzqSSwmDY9MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAJSrKOEzHO7TL5cy6h3qh+3+JAk8HbGBW+cbX6KBCAw/mzU8flK25vnWwXS3dv2FF3Aod0/S7AWNfKib5U/SA9nJaz/mWeF9S0farz9AQFc8/NSzAzaVq7YbM4F6f6N2FRl7GikdXRCed45j6mrPzGzk3ECbupFnqyREH3+ZPSdk=</ns2:X509Certificate></ns2:X509Data></ns2:KeyInfo></ns2:Signature><ns1:Subject><ns1:NameID Format="urn:oasis:names:tc:SAML:2.0:nameid-format:transient" NameQualifier="" SPNameQualifier="id12">ANOTHER_ID</ns1:NameID><ns1:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer"><ns1:SubjectConfirmationData InResponseTo="id12" NotOnOrAfter="2019-12-20T12:20:16Z" Recipient="http://lingon.catalogix.se:8087/"/></ns1:SubjectConfirmation></ns1:Subject><ns1:Conditions NotBefore="2019-12-20T12:15:16Z" NotOnOrAfter="2019-12-20T12:20:16Z"><ns1:AudienceRestriction><ns1:Audience>urn:mace:example.com:saml:roland:sp</ns1:Audience></ns1:AudienceRestriction></ns1:Conditions><ns1:AuthnStatement AuthnInstant="2019-12-20T12:15:16Z" SessionIndex="id-eEhNCc5BSiesVOl8B"><ns1:AuthnContext><ns1:AuthnContextClassRef>urn:oasis:names:tc:SAML:2.0:ac:classes:InternetProtocolPassword</ns1:AuthnContextClassRef><ns1:AuthenticatingAuthority>http://www.example.com/login</ns1:AuthenticatingAuthority></ns1:AuthnContext></ns1:AuthnStatement><ns1:AttributeStatement><ns1:Attribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">staff</ns1:AttributeValue><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">ADMIN</ns1:AttributeValue></ns1:Attribute><ns1:Attribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">HACKER@gmail.com</ns1:AttributeValue></ns1:Attribute><ns1:Attribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">Derek</ns1:AttributeValue></ns1:Attribute><ns1:Attribute FriendlyName="surName" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">Jeter</ns1:AttributeValue></ns1:Attribute><ns1:Attribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">shortstop</ns1:AttributeValue></ns1:Attribute></ns1:AttributeStatement></ns1:Assertion>
-+<XSW_ATTACK>
-+<ns1:Assertion ID="id-Aa9IWfDxJVIX6GQye" IssueInstant="2019-12-20T12:15:16Z" Version="2.0"><ns1:Issuer Format="urn:oasis:names:tc:SAML:2.0:nameid-format:entity">urn:mace:example.com:saml:roland:idp</ns1:Issuer><ns1:Subject><ns1:NameID Format="urn:oasis:names:tc:SAML:2.0:nameid-format:transient" NameQualifier="" SPNameQualifier="id12">ac5b22bb8eac4a26ed07a55432a0fe0da243f6e911aa614cff402c44d7cdec36</ns1:NameID><ns1:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer"><ns1:SubjectConfirmationData InResponseTo="id12" NotOnOrAfter="2019-12-20T12:20:16Z" Recipient="http://lingon.catalogix.se:8087/"/></ns1:SubjectConfirmation></ns1:Subject><ns1:Conditions NotBefore="2019-12-20T12:15:16Z" NotOnOrAfter="2019-12-20T12:20:16Z"><ns1:AudienceRestriction><ns1:Audience>urn:mace:example.com:saml:roland:sp</ns1:Audience></ns1:AudienceRestriction></ns1:Conditions><ns1:AuthnStatement AuthnInstant="2019-12-20T12:15:16Z" SessionIndex="id-eEhNCc5BSiesVOl8B"><ns1:AuthnContext><ns1:AuthnContextClassRef>urn:oasis:names:tc:SAML:2.0:ac:classes:InternetProtocolPassword</ns1:AuthnContextClassRef><ns1:AuthenticatingAuthority>http://www.example.com/login</ns1:AuthenticatingAuthority></ns1:AuthnContext></ns1:AuthnStatement><ns1:AttributeStatement><ns1:Attribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">staff</ns1:AttributeValue><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">member</ns1:AttributeValue></ns1:Attribute><ns1:Attribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">foo@gmail.com</ns1:AttributeValue></ns1:Attribute><ns1:Attribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">Derek</ns1:AttributeValue></ns1:Attribute><ns1:Attribute FriendlyName="surName" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">Jeter</ns1:AttributeValue></ns1:Attribute><ns1:Attribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">shortstop</ns1:AttributeValue></ns1:Attribute></ns1:AttributeStatement></ns1:Assertion>
-+</XSW_ATTACK>
-+</ns0:Response>
-diff --git a/tests/test_xsw.py b/tests/test_xsw.py
-new file mode 100644
-index 00000000..9978c4d3
---- /dev/null
-+++ b/tests/test_xsw.py
-@@ -0,0 +1,44 @@
-+from datetime import datetime
-+from unittest.mock import Mock
-+from unittest.mock import patch
-+
-+from saml2.config import config_factory
-+from saml2.response import authn_response
-+from saml2.sigver import SignatureError
-+
-+from dateutil import parser
-+
-+from pytest import raises
-+
-+from pathutils import dotname
-+from pathutils import full_path
-+
-+
-+XML_RESPONSE_XSW = full_path("saml2_response_xsw.xml")
-+
-+
-+class TestAuthnResponse:
-+ def setup_class(self):
-+ self.conf = config_factory("sp", dotname("server_conf"))
-+ self.ar = authn_response(self.conf, "http://lingon.catalogix.se:8087/")
-+
-+ @patch('saml2.response.validate_on_or_after', return_value=True)
-+ def test_verify_signed_xsw(self, mock_validate_on_or_after):
-+ self.ar.issue_instant_ok = Mock(return_value=True)
-+
-+ with open(XML_RESPONSE_XSW) as fp:
-+ xml_response = fp.read()
-+
-+ self.ar.outstanding_queries = {"id12": "http://localhost:8088/sso"}
-+ self.ar.timeslack = 10000
-+ self.ar.loads(xml_response, decode=False)
-+
-+ assert self.ar.came_from == 'http://localhost:8088/sso'
-+ assert self.ar.session_id() == "id12"
-+ assert self.ar.issuer() == 'urn:mace:example.com:saml:roland:idp'
-+
-+ with raises(SignatureError):
-+ self.ar.verify()
-+
-+ assert self.ar.ava is None
-+ assert self.ar.name_id is None
diff --git a/dev-python/pytest-faulthandler/pytest-faulthandler-1.6.0.ebuild b/dev-python/pytest-faulthandler/pytest-faulthandler-1.6.0.ebuild
index 6baff98a1a94..8b377bc5f540 100644
--- a/dev-python/pytest-faulthandler/pytest-faulthandler-1.6.0.ebuild
+++ b/dev-python/pytest-faulthandler/pytest-faulthandler-1.6.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
BDEPEND="
dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-faulthandler/pytest-faulthandler-2.0.1.ebuild b/dev-python/pytest-faulthandler/pytest-faulthandler-2.0.1.ebuild
index 766f053251d8..af65ff38f613 100644
--- a/dev-python/pytest-faulthandler/pytest-faulthandler-2.0.1.ebuild
+++ b/dev-python/pytest-faulthandler/pytest-faulthandler-2.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pytest-dev/pytest-faulthandler/archive/${PV}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
RDEPEND="
>=dev-python/pytest-5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-language-server/Manifest b/dev-python/python-language-server/Manifest
index 799c9b5b22a5..925cd99e9a40 100644
--- a/dev-python/python-language-server/Manifest
+++ b/dev-python/python-language-server/Manifest
@@ -1,3 +1,2 @@
-DIST python-language-server-0.35.1.tar.gz 72944 BLAKE2B fe469e5365dec4a2192a2ca2f75fc9f05476434c0f6db26d851521149053455b256678ed98c5f1209d30b262808b615a3f7ac77fb604adf1455203e40f93c96f SHA512 278f281c8c82729ad60db2785b3f4b64568de529edb7a6f1b5683d09838ea43ed79182c50e42210e766b9a3f3c10b0c0256121b9925803c45f9e948f144ca994
DIST python-language-server-0.36.1.tar.gz 74524 BLAKE2B 3337bf4c91204302b26b2496bc79ae6e0c18143f89ef97861dd91760b27406eba8fc9895a2f00c5c2de3a990eeb8ba29ba10319262466a42b1fb362af809060f SHA512 4a8150cf1334e9b2085e9b4ca7165404f30127339bd0fe8db229924c67933bfcd7827a875136b1694a82d4f447255862df116bc6d74a51df8e1ed82a6875914b
DIST python-language-server-0.36.2.tar.gz 74499 BLAKE2B 0bf950e236f8f898c3158afc2b3355948340639b607f474654b0334d484170a210b6e81c7508f12368223ae9915ccf19f76a1bcde41503230d8c008ba0818b47 SHA512 ee909d9332ef76c616d727ebfa36e80fd03ab57df8fc57265de21f0105cc0b64a518b2a8a582f88364d03a7d2a66e1030bcf5b3452ad3a891a3141da9b338373
diff --git a/dev-python/python-language-server/python-language-server-0.35.1-r1.ebuild b/dev-python/python-language-server/python-language-server-0.35.1-r1.ebuild
deleted file mode 100644
index 5e5b991658e8..000000000000
--- a/dev-python/python-language-server/python-language-server-0.35.1-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="An implementation of the Language Server Protocol for Python"
-HOMEPAGE="https://github.com/palantir/python-language-server"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]
- test? (
- dev-python/autopep8[${PYTHON_USEDEP}]
- dev-python/flaky[${PYTHON_USEDEP}]
- >=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- >=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
- <dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/pandas[${PYTHON_USEDEP}]
- >=dev-python/pycodestyle-2.6.0[${PYTHON_USEDEP}]
- <dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
- >=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/pyflakes-2.2.0[${PYTHON_USEDEP}]
- <dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
- >=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
- dev-python/QtPy[gui,testlib,${PYTHON_USEDEP}]
- >=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
- dev-python/yapf[${PYTHON_USEDEP}]
-)"
-
-RDEPEND="
- >=dev-python/jedi-0.17.0[${PYTHON_USEDEP}]
- <dev-python/jedi-0.18.0[${PYTHON_USEDEP}]
- dev-python/pluggy[${PYTHON_USEDEP}]
- >=dev-python/python-jsonrpc-server-0.4.0[${PYTHON_USEDEP}]
- >=dev-python/ujson-3[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
- # remove pytest-cov dep
- sed -i -e '0,/addopts/I!d' setup.cfg || die
-
- distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
- elog "To get additional features, optional runtime dependencies may be installed:"
- optfeature "Automatically formats Python code to conform to the PEP 8 style guide" dev-python/autopep8
- optfeature "A wrapper around PyFlakes, pep8 & mccabe" dev-python/flake8
- optfeature "flake8 plugin: McCabe complexity checker" dev-python/mccabe
- optfeature "Python style guide checker (fka pep8)" dev-python/pycodestyle
- optfeature "Python docstring style checker" dev-python/pydocstyle
- optfeature "Passive checker for Python programs" dev-python/pyflakes
- optfeature "Python code static checker" dev-python/pylint
- optfeature "Python refactoring library" dev-python/rope
- optfeature "A formatter for Python files" dev-python/yapf
-}
diff --git a/dev-python/python-language-server/python-language-server-0.36.1.ebuild b/dev-python/python-language-server/python-language-server-0.36.1.ebuild
index 95979f007de4..7b5fb183bba3 100644
--- a/dev-python/python-language-server/python-language-server-0.36.1.ebuild
+++ b/dev-python/python-language-server/python-language-server-0.36.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]
test? (
diff --git a/dev-python/sphinx-gallery/sphinx-gallery-0.8.2.ebuild b/dev-python/sphinx-gallery/sphinx-gallery-0.8.2.ebuild
index 8a47a14c5e68..5568c00f58cc 100644
--- a/dev-python/sphinx-gallery/sphinx-gallery-0.8.2.ebuild
+++ b/dev-python/sphinx-gallery/sphinx-gallery-0.8.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 0fd3af4507bd..6375b289f80d 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,3 +1,4 @@
DIST Sphinx-2.4.4.tar.gz 5966973 BLAKE2B 727a75eb4ec33beadf80b22cdd8dda02a53f4da4aea10ee18ecae658a69a9bb797f83b0d11b41b8405bf18b2472ea7fd501bea85382c20c5f2a9d5b14a032428 SHA512 cd35b7ebdf4eb41fb3a58706333ca4328fbf9b37999ad1bcc751f9769f0a294464e4def019a403fcd2204ca963ef641c35c957a4145eb50af07573d21df8c74d
DIST Sphinx-3.2.1.tar.gz 5970067 BLAKE2B 6158d31390c9b07aa3abcdc4eb7ed827cf2160192a2c53ad845f07d5027cc4bd65264ea1114e78e06f9652a8788a8d0e992a8988382787a05bf507a73618cd96 SHA512 3f0f49036a44938abd470c2f825a0eeeeb818daf3dfbb3bc5c746b64305b5fe66c1c34d9703eb9420b2b347247c122825ddae1b6c28c88c249206151f39e3bdb
DIST Sphinx-3.3.1.tar.gz 5979919 BLAKE2B 4eb9d8c9dccfd83690252ad6be05a3e69006e1e801bb0b37b77fb6ccf998f3a2fd99a90eba890cfb2baa5545ac0c2734fcd72d602fc2d1091e6754337f241b34 SHA512 bb1fb0780b741c0162ca014cb996dcdaac06985d14b6cc645a835679d7cf2680912784a815a027caf3fe902f721f9707bc9e9daaaf2c2d43051d31fe00584f78
+DIST Sphinx-3.4.0.tar.gz 5996932 BLAKE2B 9765d076b7b4738c3d4676618c69d401c49c5f5994f0daf0d04d02ce8c74a8084242910a821333b9233636a195df801f978bf43fbd4d323ad7e9f3651ef33b6e SHA512 49fe0aea70c244416bd26141271074d0f04dd69a8fa37be6d3f6cc3e5e98d4b64fa83ac3bbb80b0b37e8ea05d06bcc5f9891ddc00682e1c3c14130f48a831971
diff --git a/dev-python/sphinx/sphinx-3.4.0.ebuild b/dev-python/sphinx/sphinx-3.4.0.ebuild
new file mode 100644
index 000000000000..7ae59b1e3113
--- /dev/null
+++ b/dev-python/sphinx/sphinx-3.4.0.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="https://www.sphinx-doc.org/
+ https://github.com/sphinx-doc/sphinx"
+SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
+
+LICENSE="BSD"
+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 ~x86-macos ~x64-solaris"
+IUSE="doc latex test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ <dev-python/alabaster-0.8[${PYTHON_USEDEP}]
+ dev-python/Babel[${PYTHON_USEDEP}]
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/imagesize[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/snowballstemmer[${PYTHON_USEDEP}]
+ dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
+ dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
+ dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
+ dev-python/sphinxcontrib-htmlhelp[${PYTHON_USEDEP}]
+ dev-python/sphinxcontrib-serializinghtml[${PYTHON_USEDEP}]
+ dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
+ dev-python/packaging[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/typed-ast[${PYTHON_USEDEP}]
+ ' python3_{6,7})
+ latex? (
+ dev-texlive/texlive-latexextra
+ dev-texlive/texlive-luatex
+ app-text/dvipng
+ )"
+BDEPEND="
+ doc? (
+ dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+ media-gfx/graphviz
+ )
+ test? (
+ ${RDEPEND}
+ dev-python/html5lib[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ virtual/imagemagick-tools[jpeg,png,svg]
+ dev-texlive/texlive-fontsextra
+ dev-texlive/texlive-latexextra
+ dev-texlive/texlive-luatex
+ app-text/dvipng
+ )"
+
+S="${WORKDIR}/${P^}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.2.1-doc-link.patch"
+)
+
+python_prepare_all() {
+ # disable internet access
+ sed -i -e 's:^intersphinx_mapping:disabled_&:' \
+ doc/conf.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile() {
+ distutils-r1_python_compile
+
+ # Generate the grammar. It will be caught by install somehow.
+ # Note that the tests usually do it for us. However, I don't want
+ # to trust USE=test really running all the tests, especially
+ # with FEATURES=test-fail-continue.
+ pushd "${BUILD_DIR}"/lib >/dev/null || die
+ "${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
+ popd >/dev/null || die
+}
+
+python_compile_all() {
+ if use doc; then
+ esetup.py build_sphinx
+ HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+ fi
+}
+
+python_test() {
+ mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+ local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+
+ local deselect=(
+ # these tests require Internet access
+ tests/test_build_latex.py::test_latex_images
+ tests/test_build_linkcheck.py::test_defaults
+ tests/test_build_linkcheck.py::test_defaults_json
+ tests/test_build_linkcheck.py::test_anchors_ignored
+ )
+ [[ ${EPYTHON} == pypy3 ]] && deselect+=(
+ tests/test_build_latex.py::test_latex_images
+ tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
+ tests/test_ext_autodoc.py::test_automethod_for_builtin
+ tests/test_ext_autodoc.py::test_partialfunction
+ tests/test_ext_autodoc.py::test_autodoc_typed_instance_variables
+ tests/test_ext_autodoc.py::test_autodoc_typed_inherited_instance_variables
+ tests/test_ext_autodoc.py::test_cython
+ tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
+ tests/test_ext_autodoc_autodata.py::test_autodata_type_comment
+ tests/test_ext_autodoc_autofunction.py::test_builtin_function
+ tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
+ tests/test_ext_autodoc_configs.py::test_autodoc_typehints_signature
+ tests/test_ext_autodoc_configs.py::test_autodoc_type_aliases
+ tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
+ tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
+ tests/test_pycode_parser.py::test_annotated_assignment_py36
+ )
+
+ pytest -vv ${deselect[@]/#/--deselect } ||
+ die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/sudsds/metadata.xml b/dev-python/sudsds/metadata.xml
index c4e7a7e3d49d..a56745df0223 100644
--- a/dev-python/sudsds/metadata.xml
+++ b/dev-python/sudsds/metadata.xml
@@ -8,5 +8,5 @@
<longdescription lang="en">
A lightweight SOAP python client for consuming Web Services. Czech NIC labs fork.
</longdescription>
- <origin>calculatelinux-overlay</origin>
+ <origin>kit-fixups</origin>
</pkgmetadata>
diff --git a/dev-python/sudsds/sudsds-1.0.1-r1.ebuild b/dev-python/sudsds/sudsds-1.0.1-r1.ebuild
index ac0d6b9c7860..054a9f5306c4 100644
--- a/dev-python/sudsds/sudsds-1.0.1-r1.ebuild
+++ b/dev-python/sudsds/sudsds-1.0.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=5
PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} )
@@ -17,4 +17,4 @@ KEYWORDS="amd64 x86"
IUSE="doc"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND=""
diff --git a/dev-python/threadpoolctl/threadpoolctl-2.1.0.ebuild b/dev-python/threadpoolctl/threadpoolctl-2.1.0.ebuild
index 30a66818a38b..fe4dda8e9cc6 100644
--- a/dev-python/threadpoolctl/threadpoolctl-2.1.0.ebuild
+++ b/dev-python/threadpoolctl/threadpoolctl-2.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/joblib/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
diff --git a/dev-python/three-merge/three-merge-0.1.1.ebuild b/dev-python/three-merge/three-merge-0.1.1.ebuild
index a9549b33b814..c7c91b2ab352 100644
--- a/dev-python/three-merge/three-merge-0.1.1.ebuild
+++ b/dev-python/three-merge/three-merge-0.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.ta
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="dev-python/diff-match-patch[${PYTHON_USEDEP}]"
diff --git a/dev-python/unidecode/Manifest b/dev-python/unidecode/Manifest
index 1dfb9910dfe4..f1080e6dfa7e 100644
--- a/dev-python/unidecode/Manifest
+++ b/dev-python/unidecode/Manifest
@@ -1,2 +1,2 @@
-DIST Unidecode-0.04.21.tar.gz 205931 BLAKE2B 701afb86b89fc17a8eb9c769b4be1d08a30f0b44881597735478108d8121f57e2539a8209b9aef9c90f5aa8cc9f9dc76bea837d9b2ebad502a840c37628ed5ff SHA512 33fc546b3eefc4ba5feee90d584e49ccd81dd0ae00671f7e44f43cc3dc8a458b86ed6dbfacba6dac7539112408137fc1db6329cc42f31ee250755d841c7c29c2
DIST Unidecode-1.1.1.tar.gz 212151 BLAKE2B 9884f89bb45c7c99569d42e0b287731638b8b1b697afab2c812b56340c6bd12dc3214b42177554f1b0aa214ce1b73fe1f05208ac6fc33d1949ed1200e42914ab SHA512 5474f04be843ed94ddceb1a7e5f1ca986ee5f2e88ee35bd9347784c7a11b51e1d94d61e1a2a10dd2e71b3587c5b7b76717756f6cf4e2446d83222178c2360696
+DIST Unidecode-1.1.2.tar.gz 213644 BLAKE2B c4a9ecb441eb05800d931ccd43843d19ae07f74829d43bc3c24462955e8872f4edf4bb9b3909fc5155b13676b8d255848cdd90772a88cd453152ca13af0d3fab SHA512 8ee45ae05064612638ecbaa4eb74759580e5ea5cba9f3116b8e63db4af13affc266c7a07aaefbbd70b50ead7e483a72d7676c64e20b5bee2a6ba831aaccd6748
diff --git a/dev-python/unidecode/unidecode-0.04.21.ebuild b/dev-python/unidecode/unidecode-1.1.2.ebuild
index 4a7685bc367a..1f2571b14e40 100644
--- a/dev-python/unidecode/unidecode-0.04.21.ebuild
+++ b/dev-python/unidecode/unidecode-1.1.2.ebuild
@@ -1,27 +1,22 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-MY_PN=Unidecode
-MY_P=${MY_PN}-${PV}
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_REQ_USE="wide-unicode(+)"
+DISTUTILS_USE_SETUPTOOLS="rdepend"
inherit distutils-r1
+MY_P=Unidecode-${PV}
DESCRIPTION="Module providing ASCII transliterations of Unicode text"
HOMEPAGE="https://pypi.org/project/Unidecode/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-S=${WORKDIR}/${MY_P}
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
- esetup.py test
-}
+distutils_enable_tests setup.py
diff --git a/dev-python/websockets/websockets-8.1.ebuild b/dev-python/websockets/websockets-8.1.ebuild
index a3daa5f6cefa..2d2677b94538 100644
--- a/dev-python/websockets/websockets-8.1.ebuild
+++ b/dev-python/websockets/websockets-8.1.ebuild
@@ -14,4 +14,4 @@ SRC_URI="https://github.com/aaugustin/${PN}/archive/${PV}.tar.gz -> ${P}-src.tar
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
diff --git a/dev-python/whatever/metadata.xml b/dev-python/whatever/metadata.xml
index 43f0b3e0369b..7965efae3fd7 100644
--- a/dev-python/whatever/metadata.xml
+++ b/dev-python/whatever/metadata.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>python@gentoo.org</email>
- </maintainer>
<maintainer type="person">
<email>tupone@gentoo.org</email>
<name>Tupone Alfredo</name>