Adding metadata

42 files changed, 515 insertions, 70 deletions

diff --git a/dev-python/aiohttp-jinja2/Manifest b/dev-python/aiohttp-jinja2/Manifest
index 28e0da6d8007..c40dead9fd2c 100644
--- a/dev-python/aiohttp-jinja2/Manifest
+++ b/dev-python/aiohttp-jinja2/Manifest
@@ -1 +1,2 @@
 DIST aiohttp-jinja2-0.15.0.tar.gz 51183 BLAKE2B e19ca813f36ac746a84812ec278a3de43e6e24eaafcf949fd18a32c99f460ded03f4dc97171fe1493174a8e2c51543b8c1afcdec51c4688f4fb0b7781287cc03 SHA512 084714cd2376b93f32cdcebc1971d4aaa704a177524b00f322e0347c15ab8085960a68a3760be056e391410f01b6b637eb59db54fccf54d09ba53a9ea03a01db
+DIST aiohttp-jinja2-1.4.2.tar.gz 54328 BLAKE2B 3d6aaeb03bbb89516a92fa877ee95a2fd27ab83666a03ca12e78f1744b82797faf2547bf55118618cbd979d80779a9571dfcfe9036bc84142563ede55cfbc1a1 SHA512 7bdaee97efe90a0009cd78a4e46dc80cfeb661c2d5561fdb1b1a1ff098abba8667260bb908e3227edd6601c2412812d0311461942568a8aabf07a164ea2f290e
diff --git a/dev-python/aiohttp-jinja2/aiohttp-jinja2-1.4.2.ebuild b/dev-python/aiohttp-jinja2/aiohttp-jinja2-1.4.2.ebuild
new file mode 100644
index 000000000000..0d69760c39e3
--- /dev/null
+++ b/dev-python/aiohttp-jinja2/aiohttp-jinja2-1.4.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 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="jinja2 template renderer for aiohttp.web"
+HOMEPAGE="https://github.com/aio-libs/aiohttp-jinja2"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/aiohttp-2.3.9[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	doc? (
+		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? ( >=dev-python/pytest-aiohttp-0.3.0[${PYTHON_USEDEP}] )
+"
+
+DOCS=( README.rst )
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's:--cov=aiohttp_jinja2 --cov-report xml --cov-report html --cov-report term::' \
+		setup.cfg || die
+
+	distutils-r1_src_prepare
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index 921d41a642a2..0403ba701a9a 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1 +1,2 @@
 DIST aws-sam-translator-1.35.0.tar.gz 867345 BLAKE2B b2775f9ce0d3e20fa5b3b5a9b68100f1338576229a9380cf7afb08e9c75fedfb926a06c1c71b96df9883e5306de355f720e624d0d1150c12b58c4dc4098309f2 SHA512 14e22095d497df9e0fcfdaea83c93edd881837ed57e508cfcb484abd5241dce60059b349b3bba92c307515b4c4018e8e065342e9133e401004a04baf3182ec46
+DIST aws-sam-translator-1.36.0.tar.gz 878204 BLAKE2B 027837687709d2bbe166d4c40599156c8075b1902fe9f75aa5f29bc1f725e2cb97a1f7020cba2f75d5a7180e658e1d47cf4ff03ff3336b0ac21458426f6241fa SHA512 8af9e54d9a02ac3a315b1274d71a5e7413b5a39c6913036f0cc57cf1cd94d6d079f78e4810d5b501003bf5b06a4f25c2481c8abce0836c01da6f962dc0163651
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.36.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.36.0.ebuild
new file mode 100644
index 000000000000..ad6656565090
--- /dev/null
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.36.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 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=bdepend
+inherit distutils-r1
+
+DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
+HOMEPAGE="https://github.com/aws/serverless-application-model
+	https://pypi.org/project/aws-sam-translator/"
+SRC_URI="https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/serverless-application-model-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/boto3-1.5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# remove pytest-cov dependency
+	sed -r -e 's:--cov(-[[:graph:]]+|)[[:space:]]+[[:graph:]]+::g' \
+		-i pytest.ini || die
+
+	# don't install tests
+	sed -e 's:"tests",:"tests", "tests.*",:' -i setup.py || die
+
+	# deps are installed by ebuild, don't try to reinstall them via pip
+	truncate --size=0 requirements/*.txt || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/bandit/bandit-1.7.0.ebuild b/dev-python/bandit/bandit-1.7.0.ebuild
index 2d663320efa7..b1ee8ac97798 100644
--- a/dev-python/bandit/bandit-1.7.0.ebuild
+++ b/dev-python/bandit/bandit-1.7.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~s390 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~s390 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cangjie/cangjie-1.3-r1.ebuild b/dev-python/cangjie/cangjie-1.3-r1.ebuild
index 77f917baa6ca..3ea649fc1e13 100644
--- a/dev-python/cangjie/cangjie-1.3-r1.ebuild
+++ b/dev-python/cangjie/cangjie-1.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit autotools python-r1
 
 DESCRIPTION="Python wrapper for libcangjie"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Cangjians/py${PN}/releases/download/v${PV}/${P#py}.t
 LICENSE="LGPL-3+"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
+
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/cgroup-utils/cgroup-utils-0.8.ebuild b/dev-python/cgroup-utils/cgroup-utils-0.8.ebuild
index aa3ad81d7b9a..a167839f6bbe 100644
--- a/dev-python/cgroup-utils/cgroup-utils-0.8.ebuild
+++ b/dev-python/cgroup-utils/cgroup-utils-0.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="Tools and libraries for control groups of Linux"
@@ -14,9 +14,6 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND=""
-RDEPEND=""
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.8-tests-builddir.patch
 
diff --git a/dev-python/chart-studio/metadata.xml b/dev-python/chart-studio/metadata.xml
index 8b0b26b3a9f7..9edeac137a35 100644
--- a/dev-python/chart-studio/metadata.xml
+++ b/dev-python/chart-studio/metadata.xml
@@ -14,7 +14,7 @@
     graphs. Plotly is an online collaborative data analysis and graphing tool. 
   </longdescription>
  <upstream>
-  <remote-id type="pypi">plotly</remote-id>
+  <remote-id type="pypi">chart-studio</remote-id>
   <remote-id type="github">plotly/plotly.py</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
diff --git a/dev-python/discogs-client/Manifest b/dev-python/discogs-client/Manifest
index df1ae110a0d7..5c531fa574a4 100644
--- a/dev-python/discogs-client/Manifest
+++ b/dev-python/discogs-client/Manifest
@@ -1 +1 @@
-DIST discogs-client-2.2.2.tar.gz 25005 BLAKE2B 1e87ce7a1cfd2d72a3dbbc0544a4e6a91d451c9d65c0712f261297e6bf4a46663bfe73d59781c9159902666cb10c0d1594a37ee6493623f794e0f4ec6ec6cfb0 SHA512 cf08526f739216efa9ef628f28650c8074cd6ddb21e0ab5431a8c8864c1f2707f612b065baf6b2f907b7fa7cdf2cfe5905cbefddb02c6f8f1c7796b0631a2ba7
+DIST discogs-client-2.3.12.tar.gz 32604 BLAKE2B 6c7960263d0158fc796edd76f6ccc549d582cbd96666cbf3ae10a3215eee6464c857e1b46c8e76ad2a48308ae9353c347a421189b3c754bd23a0f2ec455d9cfa SHA512 c14ea953e92f2d77909a7af8f840ee5a1df2416e16f6de0b7f0e988f6ef56a07fc04c75b247508dc0d1b5f7033faf6cce80196b610d1169a23350d3e816e2925
diff --git a/dev-python/discogs-client/discogs-client-2.2.2.ebuild b/dev-python/discogs-client/discogs-client-2.2.2.ebuild
deleted file mode 100644
index cf5b0e7937e8..000000000000
--- a/dev-python/discogs-client/discogs-client-2.2.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 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="Official Python API client for Discogs"
-HOMEPAGE="https://github.com/discogs/discogs_client https://pypi.org/project/discogs-client/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/oauth2[${PYTHON_USEDEP}]
-	dev-python/oauthlib[${PYTHON_USEDEP}]
-	"
-
-distutils_enable_tests unittest
diff --git a/dev-python/discogs-client/discogs-client-2.3.12.ebuild b/dev-python/discogs-client/discogs-client-2.3.12.ebuild
new file mode 100644
index 000000000000..b2c8723c9ae2
--- /dev/null
+++ b/dev-python/discogs-client/discogs-client-2.3.12.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 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
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/joalla/discogs_client.git"
+	inherit git-r3
+else
+	MY_PN='python3-discogs-client'
+	MY_P=${MY_PN}-${PV}
+	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Continuation of the official Python API client for Discogs"
+HOMEPAGE="https://github.com/joalla/discogs_client https://pypi.org/project/python3-discogs-client/"
+
+LICENSE="BSD-2"
+SLOT="0"
+
+RDEPEND="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/oauth2[${PYTHON_USEDEP}]
+	dev-python/oauthlib[${PYTHON_USEDEP}]
+	"
+BDEPEND="
+	dev-python/oauthlib[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/sh[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+distutils_enable_tests nose
diff --git a/dev-python/discogs-client/discogs-client-9999.ebuild b/dev-python/discogs-client/discogs-client-9999.ebuild
new file mode 100644
index 000000000000..3e4e43b623e1
--- /dev/null
+++ b/dev-python/discogs-client/discogs-client-9999.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 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
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/joalla/discogs_client.git"
+	inherit git-r3
+else
+	MY_PN='python3-discogs-client'
+	MY_P=${MY_PN}-${PV}
+	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Continuation of the official Python API client for Discogs"
+HOMEPAGE="https://github.com/joalla/discogs_client https://pypi.org/project/python3-discogs-client/"
+
+LICENSE="BSD-2"
+SLOT="0"
+
+RDEPEND="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/oauth2[${PYTHON_USEDEP}]
+	dev-python/oauthlib[${PYTHON_USEDEP}]
+	"
+BDEPEND="
+	dev-python/oauthlib[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/sh[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	"
+
+distutils_enable_tests nose
diff --git a/dev-python/discogs-client/metadata.xml b/dev-python/discogs-client/metadata.xml
index 1878041a3c0b..0a5932a68197 100644
--- a/dev-python/discogs-client/metadata.xml
+++ b/dev-python/discogs-client/metadata.xml
@@ -5,9 +5,17 @@
   <email>python@gentoo.org</email>
   <name>Python</name>
  </maintainer>
+ <maintainer type="person">
+  <email>guillaumeseren@gmail.com</email>
+  <name>Guillaume Seren</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
  <upstream>
-  <remote-id type="pypi">discogs-client</remote-id>
-  <remote-id type="github">discogs/discogs_client</remote-id>
+  <remote-id type="pypi">python3-discogs-client</remote-id>
+  <remote-id type="github">joalla/discogs_client</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/emoji/Manifest b/dev-python/emoji/Manifest
index 16184f63db3a..1508447896a5 100644
--- a/dev-python/emoji/Manifest
+++ b/dev-python/emoji/Manifest
@@ -1 +1,2 @@
 DIST emoji-0.5.4.tar.gz 43402 BLAKE2B a7d94af22d09159e23b160300f70372c08c095fae3be45e204e5be73a907cd4ffcbad00aeed4c85ec0048ae1a5fdedce52105bcfc1557217d3b53002e1770267 SHA512 20e592247f8bc9bc0a030181904d806b50768b444b728d074afa58896e258ca664b4983de5c51b7624b585edcd93e05a34b8df722f4d0eefb625ce11fbb63d0d
+DIST emoji-1.2.1.tar.gz 158090 BLAKE2B c16ff949611f9453c3c073d466ddde75f31029fb4ec2160ba003dc94d1857c3d6f1de060220869f76fd94ab11539e7ea4bcff81211b7354c1f0e6bedc131e178 SHA512 b654494aab90c3ca4ec17331ba6504e2f16b46226170e170971f5f86553e025027e23d2e02020c899d5251e50bd8b78d4db3ea1a017b4eb371562595e4a9a5a7
diff --git a/dev-python/emoji/emoji-1.2.1.ebuild b/dev-python/emoji/emoji-1.2.1.ebuild
new file mode 100644
index 000000000000..0fd5b89bbed0
--- /dev/null
+++ b/dev-python/emoji/emoji-1.2.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 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="Emoji for Python"
+HOMEPAGE="https://github.com/carpedm20/emoji/"
+SRC_URI="https://github.com/carpedm20/emoji/archive/refs/tags/v.${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-v.${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+distutils_enable_tests pytest
diff --git a/dev-python/emoji/metadata.xml b/dev-python/emoji/metadata.xml
index 3b1fa6093c84..f3a792e25a28 100644
--- a/dev-python/emoji/metadata.xml
+++ b/dev-python/emoji/metadata.xml
@@ -10,4 +10,5 @@
   <remote-id type="github">carpedm20/emoji</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/git-review/git-review-2.1.0.ebuild b/dev-python/git-review/git-review-2.1.0.ebuild
index bcc3bad3a480..9140df53d0a6 100644
--- a/dev-python/git-review/git-review-2.1.0.ebuild
+++ b/dev-python/git-review/git-review-2.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND=">=dev-python/pbr-4.1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/lxml/lxml-4.6.3-r1.ebuild b/dev-python/lxml/lxml-4.6.3-r1.ebuild
index 9216c3048f10..319264881f67 100644
--- a/dev-python/lxml/lxml-4.6.3-r1.ebuild
+++ b/dev-python/lxml/lxml-4.6.3-r1.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/lxml-${P}
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples +threads test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/neovim-remote/neovim-remote-2.4.0.ebuild b/dev-python/neovim-remote/neovim-remote-2.4.0.ebuild
index 40c009adca78..1f22c188d78c 100644
--- a/dev-python/neovim-remote/neovim-remote-2.4.0.ebuild
+++ b/dev-python/neovim-remote/neovim-remote-2.4.0.ebuild
@@ -1,22 +1,23 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/mhinz/${PN}.git"
 else
-	KEYWORDS="~amd64 ~arm"
 	SRC_URI="https://github.com/mhinz/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm"
 fi
 
 DESCRIPTION="A tool that helps control neovim processes"
 HOMEPAGE="https://github.com/mhinz/neovim-remote"
+
 LICENSE="MIT"
 SLOT="0"
 
diff --git a/dev-python/neovim-remote/neovim-remote-9999.ebuild b/dev-python/neovim-remote/neovim-remote-9999.ebuild
index 2bfe63ab8993..39fd4d98ded3 100644
--- a/dev-python/neovim-remote/neovim-remote-9999.ebuild
+++ b/dev-python/neovim-remote/neovim-remote-9999.ebuild
@@ -1,26 +1,32 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+EAPI=7
 
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/mhinz/${PN}.git"
 else
-	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/mhinz/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm"
 fi
 
 DESCRIPTION="A tool that helps control neovim processes"
 HOMEPAGE="https://github.com/mhinz/neovim-remote"
+
 LICENSE="MIT"
 SLOT="0"
 
 RDEPEND="
 	dev-python/pynvim[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+	dev-python/psutil[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+BDEPEND+="
+	test? ( app-editors/neovim )
+"
diff --git a/dev-python/ntlm-auth/metadata.xml b/dev-python/ntlm-auth/metadata.xml
index 31b563b3b5fb..597302ca9409 100644
--- a/dev-python/ntlm-auth/metadata.xml
+++ b/dev-python/ntlm-auth/metadata.xml
@@ -14,4 +14,5 @@
   <remote-id type="github">jborean93/ntlm-auth</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/ntlm-auth/ntlm-auth-1.5.0.ebuild b/dev-python/ntlm-auth/ntlm-auth-1.5.0.ebuild
index be989d7ba7aa..f34bf6c65e28 100644
--- a/dev-python/ntlm-auth/ntlm-auth-1.5.0.ebuild
+++ b/dev-python/ntlm-auth/ntlm-auth-1.5.0.ebuild
@@ -11,11 +11,12 @@ DESCRIPTION="Calculates NTLM Authentication codes"
 HOMEPAGE="https://github.com/jborean93/ntlm-auth"
 SRC_URI="https://github.com/jborean93/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-SLOT="0"
 LICENSE="MIT"
+SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index f9c16b0765f3..367d1680221e 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,2 +1,2 @@
 DIST pipenv-2020.11.15.tar.gz 11603983 BLAKE2B 552c35c942f9ece0f52419b6090b87c7dce0c49dd9dc12f8c5b3eb311058fc770ec9e2b141e960d357064c66c6de7cd0892d2dd19868e5cdaee0f302f98fb0ff SHA512 d312059b3fefc97d4cd79bf2b75d6bde1d117d92c0a299c30181a60ebea662a6c3dff0ca7b92c610dd8eb0c873509dd23c9a891761d0d47d0bba2cab738c830d
-DIST pipenv-2020.11.4.tar.gz 11574683 BLAKE2B cb2ac4ba6b07377a3a5540b23756afac38a02691e495ba93031815417d001701b919221fd83d0f9e6b94d4f28c1fa754c2c31e289830305a8c8ac75d847209c4 SHA512 c9015eb9a449fa517f31619d1fec5d99882da915a50e189ba6ab9c7c147862f9734f0df200330d666380afe5d2cf52d18015c539635ca6459042ab50d3ccd059
+DIST pipenv-2021.5.29.tar.gz 11607230 BLAKE2B 8eef8e79fbdfaf85a949437d06d9f8b48f7eaa6e4769f6d4ed90b01c0ebf70c282fc90581cce5ffcab0aeb6bc9ad770a8b4425f355a06e0fc4cd56fb221386e2 SHA512 4fa018c13d4babe856bf5671cf5d18a95f4af4b6d4fc64c4919825fe04004ed3d8979ca335b851c6e24dad081475f6fb5b925eeff58c6fb5cffc450b967ed1cd
diff --git a/dev-python/pipenv/pipenv-2020.11.4.ebuild b/dev-python/pipenv/pipenv-2021.5.29.ebuild
index 4b8cb657274a..2d46e7a8aecf 100644
--- a/dev-python/pipenv/pipenv-2020.11.4.ebuild
+++ b/dev-python/pipenv/pipenv-2021.5.29.ebuild
@@ -27,13 +27,12 @@ RDEPEND="
 	>=dev-python/virtualenv-20.0.35[${PYTHON_USEDEP}]
 	dev-python/virtualenv-clone[${PYTHON_USEDEP}]
 "
-
 BDEPEND="
 	${RDEPEND}
 	test? (
 		dev-python/flaky[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
-		<dev-python/pytest-5[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/plotly-geo/metadata.xml b/dev-python/plotly-geo/metadata.xml
index 8b0b26b3a9f7..eeee98c0f506 100644
--- a/dev-python/plotly-geo/metadata.xml
+++ b/dev-python/plotly-geo/metadata.xml
@@ -14,7 +14,7 @@
     graphs. Plotly is an online collaborative data analysis and graphing tool. 
   </longdescription>
  <upstream>
-  <remote-id type="pypi">plotly</remote-id>
+  <remote-id type="pypi">plotly-geo</remote-id>
   <remote-id type="github">plotly/plotly.py</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
diff --git a/dev-python/pluginbase/files/pluginbase-1.0.0-python3.9.patch b/dev-python/pluginbase/files/pluginbase-1.0.0-python3.9.patch
new file mode 100644
index 000000000000..8c83198dae3c
--- /dev/null
+++ b/dev-python/pluginbase/files/pluginbase-1.0.0-python3.9.patch
@@ -0,0 +1,120 @@
+From ad876a1282423c5e677392814eec09d826fd311e Mon Sep 17 00:00:00 2001
+From: Matthew Bakhtiari <dev@mtbk.me>
+Date: Mon, 10 May 2021 05:47:33 +0200
+Subject: [PATCH 1/5] Add python 3.8 and 3.9 support
+
+---
+ setup.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/setup.py b/setup.py
+index 012827f..ef63b70 100644
+--- a/setup.py
++++ b/setup.py
+@@ -37,6 +37,8 @@
+         'Programming Language :: Python :: 3.5',
+         'Programming Language :: Python :: 3.6',
+         'Programming Language :: Python :: 3.7',
++        'Programming Language :: Python :: 3.8',
++        'Programming Language :: Python :: 3.9',
+         'Programming Language :: Python :: Implementation :: PyPy',
+         'Environment :: Plugins',
+         'Intended Audience :: Developers',
+
+From 28d1baa81ac17c2281c8ca439ca0444910740ae5 Mon Sep 17 00:00:00 2001
+From: Matthew Bakhtiari <dev@mtbk.me>
+Date: Mon, 10 May 2021 05:49:53 +0200
+Subject: [PATCH 2/5] Remove deprecated yield_fixture
+
+---
+ tests/conftest.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/conftest.py b/tests/conftest.py
+index a43b8cf..e20513b 100644
+--- a/tests/conftest.py
++++ b/tests/conftest.py
+@@ -20,7 +20,7 @@ def source(base):
+                                    identifier='demo')
+ 
+ 
+-@pytest.yield_fixture(scope='function', autouse=True)
++@pytest.fixture(scope='function', autouse=True)
+ def run_garbage_collection():
+     gc.collect()
+     try:
+
+From 95edc820811dac75a5f8d11697cbe197b4024efb Mon Sep 17 00:00:00 2001
+From: Matthew Bakhtiari <dev@mtbk.me>
+Date: Mon, 10 May 2021 06:26:32 +0200
+Subject: [PATCH 3/5] Remove deprecated tests
+
+---
+ tox.ini | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tox.ini b/tox.ini
+index dbea2bd..678eff6 100644
+--- a/tox.ini
++++ b/tox.ini
+@@ -1,5 +1,5 @@
+ [tox]
+-envlist = py26,py27,py33,py34,py35,py36,pypy
++envlist = py27,py34,py35,py36,py37,py38,py39,pypy
+ 
+ [testenv]
+ commands = make test
+
+From 06ab2ca2ee843e62a1a6bf26ef2d118995a4f210 Mon Sep 17 00:00:00 2001
+From: Matthew Bakhtiari <dev@mtbk.me>
+Date: Mon, 10 May 2021 06:32:07 +0200
+Subject: [PATCH 4/5] Remove old versions from travis.yml
+
+---
+ .travis.yml | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/.travis.yml b/.travis.yml
+index 743a38a..739db3e 100644
+--- a/.travis.yml
++++ b/.travis.yml
+@@ -1,11 +1,12 @@
+ language: python
+ python:
+-  - "2.6"
+   - "2.7"
+-  - "3.3"
+   - "3.4"
+   - "3.5"
+   - "3.6"
++  - "3.7"
++  - "3.8"
++  - "3.9"
+   - "pypy"
+ 
+ install:
+
+From 382037ce6cd81e2767143db744d1049081051ce3 Mon Sep 17 00:00:00 2001
+From: Matthew Bakhtiari <dev@mtbk.me>
+Date: Mon, 10 May 2021 06:37:02 +0200
+Subject: [PATCH 5/5] Remove old versions from setup.py
+
+---
+ setup.py | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index ef63b70..8f9f4e6 100644
+--- a/setup.py
++++ b/setup.py
+@@ -29,10 +29,8 @@
+     classifiers=[
+         'License :: OSI Approved :: BSD License',
+         'Programming Language :: Python',
+-        'Programming Language :: Python :: 2.6',
+         'Programming Language :: Python :: 2.7',
+         'Programming Language :: Python :: 3',
+-        'Programming Language :: Python :: 3.3',
+         'Programming Language :: Python :: 3.4',
+         'Programming Language :: Python :: 3.5',
+         'Programming Language :: Python :: 3.6',
diff --git a/dev-python/pluginbase/pluginbase-1.0.0.ebuild b/dev-python/pluginbase/pluginbase-1.0.0.ebuild
index 3e838ce6269f..118a4c94050f 100644
--- a/dev-python/pluginbase/pluginbase-1.0.0.ebuild
+++ b/dev-python/pluginbase/pluginbase-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,6 +24,8 @@ DEPEND="${RDEPEND}
 	test? (	dev-python/pytest[${PYTHON_USEDEP}] )
 "
 
+PATCHES="${FILESDIR}/${P}-python3.9.patch"
+
 python_prepare_all() {
 	sed -e "s/, 'sphinx.ext.intersphinx'//" \
 		-i docs/conf.py || die
diff --git a/dev-python/pyaudio/pyaudio-0.2.11-r1.ebuild b/dev-python/pyaudio/pyaudio-0.2.11-r1.ebuild
index 9f2fcba340f2..5dc561955611 100644
--- a/dev-python/pyaudio/pyaudio-0.2.11-r1.ebuild
+++ b/dev-python/pyaudio/pyaudio-0.2.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/pybluez/pybluez-0.23.ebuild b/dev-python/pybluez/pybluez-0.23.ebuild
index fc93ecdf9f81..1d35ace4d250 100644
--- a/dev-python/pybluez/pybluez-0.23.ebuild
+++ b/dev-python/pybluez/pybluez-0.23.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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
 
 MY_P="PyBluez-${PV}"
diff --git a/dev-python/pycxx/Manifest b/dev-python/pycxx/Manifest
index f483a5224d93..3dd4e917655c 100644
--- a/dev-python/pycxx/Manifest
+++ b/dev-python/pycxx/Manifest
@@ -1 +1,2 @@
 DIST pycxx-7.1.2.tar.gz 150865 BLAKE2B bbf78d88ca13fafee1239c354167b56cef2f1d56d20b0fc81d9a5d7d82096ab5d6a88802f411719cc490179314f87ef89b1e53c2b8a3a784566f9ff9d16d7cc8 SHA512 67f8d8d1ec6ce63c39695cd56c3276767d5cb4b6cc2fcf7daf5aea4bac11114f5a1fa4784ecdb35be708859cf07fc88c8e9f00b7fc808169708fd0eef1056a63
+DIST pycxx-7.1.5.tar.gz 156343 BLAKE2B 099de7f88c19ec86aea67b503e6fbdc0df66bbdd3bdc0ff7f8ce77425be9486e6abebed8548f9ac764688a85e62cda77d3832f460e5678b4c07b1c6d2123b257 SHA512 0f980298739886d0c05ddd5ee23ebb234014b8276d811e62dc5b0a738666c6a011ad3f4aeeb7b1b404d8bff87dddfc30f68eec9c6bd13d5f262a2f7c53e273be
diff --git a/dev-python/pycxx/pycxx-7.1.5.ebuild b/dev-python/pycxx/pycxx-7.1.5.ebuild
new file mode 100644
index 000000000000..6e99a01a4961
--- /dev/null
+++ b/dev-python/pycxx/pycxx-7.1.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 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=no
+inherit distutils-r1
+
+DESCRIPTION="Set of facilities to extend Python with C++"
+HOMEPAGE="https://sourceforge.net/projects/cxx/"
+SRC_URI="mirror://sourceforge/cxx/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="doc examples"
+
+python_prepare_all() {
+	# Without this, pysvn fails.
+	# Src/Python3/cxxextensions.c: No such file or directory
+	sed -e "/^#include/s:Src/::" -i Src/*.{c,cxx} || die "sed failed"
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( Doc/. )
+	if use examples ; then
+		docinto examples
+		dodoc -r Demo/Python{2,3}/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyilmbase/Manifest b/dev-python/pyilmbase/Manifest
index 7e8d99f7190d..9ddce5102735 100644
--- a/dev-python/pyilmbase/Manifest
+++ b/dev-python/pyilmbase/Manifest
@@ -1 +1,2 @@
 DIST pyilmbase-2.5.5.tar.gz 27536865 BLAKE2B d0c0b2fd39b2cfafb60b6d0de3960063ff62341cf22be519f874c0c83f05cb604c5d503bb8b88514c71c5a54a79afa80a7fd00c2df15ec2193f6b3cffdc117c6 SHA512 e511af26a8fe2175a641fd25d2dcc6ef807e00bee2aff06a4784125f916ffd47fe376fe0621d385b604180a239bbfee063f8ceee3f7b731fde3c38558e9fdcdf
+DIST pyilmbase-2.5.6.tar.gz 27540385 BLAKE2B eea64c6ae4500de31673f3127da6ac98272e85a2c93e2aed96494cc24c397edbce508f0721387be5bbabc4dde596dccf61212709173b7cebd4212dbfbd1e4b65 SHA512 8d4582a5f2adcd5eb1486cabe033f9ecaa0292000bf7fa484a94e1d9ec908678a5a903fc6a1beba22bcd9c7f06ac51236834f448ea8aaf4462a338de886f0412
diff --git a/dev-python/pyilmbase/pyilmbase-2.5.6.ebuild b/dev-python/pyilmbase/pyilmbase-2.5.6.ebuild
new file mode 100644
index 000000000000..2b972acb54a7
--- /dev/null
+++ b/dev-python/pyilmbase/pyilmbase-2.5.6.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit cmake python-single-r1
+
+DESCRIPTION="IlmBase Python bindings"
+HOMEPAGE="https://www.openexr.com"
+SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/openexr-${PV}/PyIlmBase"
+
+LICENSE="BSD"
+SLOT="0/25"
+KEYWORDS="~amd64 ~x86"
+IUSE="exceptions +numpy test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	~media-libs/ilmbase-${PV}:=
+	sys-libs/zlib
+	$(python_gen_cond_dep '
+		>=dev-libs/boost-1.62.0-r1:=[python,${PYTHON_MULTI_USEDEP}]
+		numpy? ( >=dev-python/numpy-1.10.4[${PYTHON_MULTI_USEDEP}] )
+	')
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-admin/chrpath
+	virtual/pkgconfig
+"
+
+#PATCHES=(
+#	"${FILESDIR}"/${PN}-2.5.2-0001-Fix-pkgconfig-file-for-PyIlmBase-to-include-prefixes.patch
+#)
+
+DOCS=( README.md )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Python2=ON
+		-DPYILMBASE_INSTALL_PKG_CONFIG=ON
+		-DPYIMATH_ENABLE_EXCEPTIONS=$(usex exceptions)
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DPython3_INCLUDE_DIR=$(python_get_includedir)
+		-DPython3_LIBRARY=$(python_get_library_path)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	if use numpy; then
+		python_domodule "${BUILD_DIR}/${EPYTHON/./_}/imathnumpy.so"
+		chmod +x "${D}/$(python_get_sitedir)/imathnumpy.so" || die
+		chrpath -d "${D}/$(python_get_sitedir)/imathnumpy.so" || die
+	fi
+}
diff --git a/dev-python/pypax/pypax-0.9.5.ebuild b/dev-python/pypax/pypax-0.9.5.ebuild
index 460b97d4c458..4a5364d44435 100644
--- a/dev-python/pypax/pypax-0.9.5.ebuild
+++ b/dev-python/pypax/pypax-0.9.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-python/pypax/pypax-9999.ebuild b/dev-python/pypax/pypax-9999.ebuild
index f6f73a88c21b..5e97acc71fc3 100644
--- a/dev-python/pypax/pypax-9999.ebuild
+++ b/dev-python/pypax/pypax-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-python/pytest-html/pytest-html-1.22.1.ebuild b/dev-python/pytest-html/pytest-html-1.22.1.ebuild
index 05fbf27923a2..7bdd1b4827f3 100644
--- a/dev-python/pytest-html/pytest-html-1.22.1.ebuild
+++ b/dev-python/pytest-html/pytest-html-1.22.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
 
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Plugin for generating HTML reports for py.test results"
@@ -13,9 +13,10 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MPL-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+
 # Lots of test failures...
 RESTRICT="test"
+
 RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
 	dev-python/pytest-metadata[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/dev-python/requests-credssp/Manifest b/dev-python/requests-credssp/Manifest
index 38af56c1593a..ca9270fbf0a4 100644
--- a/dev-python/requests-credssp/Manifest
+++ b/dev-python/requests-credssp/Manifest
@@ -1 +1 @@
-DIST requests-credssp-1.2.0.tar.gz 18384 BLAKE2B 5d92326066f8e6abf675b3ab56522aceefb2ecf99bb58d44de4f0c40b46582b567888c6b888d21da29ef1746d070526c6d35601b88b5ca207f3c7f2b6c596260 SHA512 425e18b673cdf1006d6ab3d4108acdb2a8cdf6132646663741339c771aecada2cc237d919351cd0d2ca6022a0bcddba92b3b44b15386d683c6c18db461b8c7fd
+DIST requests-credssp-1.2.0.gh.tar.gz 23310 BLAKE2B 647dff76fbb47b9b972f403a9fb2a10ffab5e1915e32977e65b5f5c1cb206ec1b9fa884e12d687761087b2f7f4cb9e8bde631b68140cc50dbd9561a4999bdf55 SHA512 55458773cbf14a468d22d0b04186611385ff24fceda85052e69981bd6d4fd32a46f96b95fa36724b72fd9719485b2ed8906d1927284157e7bc685c0c42c2312c
diff --git a/dev-python/requests-credssp/metadata.xml b/dev-python/requests-credssp/metadata.xml
index 0defe0d08557..cb614311fc2e 100644
--- a/dev-python/requests-credssp/metadata.xml
+++ b/dev-python/requests-credssp/metadata.xml
@@ -9,4 +9,5 @@
   <remote-id type="pypi">requests-credssp</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/requests-credssp/requests-credssp-1.2.0.ebuild b/dev-python/requests-credssp/requests-credssp-1.2.0.ebuild
index 6832834a0fb2..f947392fcdee 100644
--- a/dev-python/requests-credssp/requests-credssp-1.2.0.ebuild
+++ b/dev-python/requests-credssp/requests-credssp-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,12 +8,14 @@ inherit distutils-r1
 
 DESCRIPTION="HTTPS CredSSP authentication with the requests library"
 HOMEPAGE="https://pypi.org/project/requests-credssp/"
-SRC_URI="mirror://pypi/r/requests-credssp/${P}.tar.gz"
+# .gh for tests in github tarball, drop ".gh" on next bump
+SRC_URI="https://github.com/jborean93/requests-credssp/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
+# Needs unpackaged pyspnego (https://github.com/jborean93/pyspnego)
+RESTRICT="test"
 
 RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/ntlm-auth[${PYTHON_USEDEP}]
@@ -21,5 +23,6 @@ RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/pyopenssl[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+#distutils_enable_tests pytest
diff --git a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.2.ebuild b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.2.ebuild
index 475b5a9a017f..e441f357c60c 100644
--- a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.2.ebuild
+++ b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~s390 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~s390 x86"
 
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}"
diff --git a/dev-python/thrift/Manifest b/dev-python/thrift/Manifest
index 37af6138fd50..744b93011d8d 100644
--- a/dev-python/thrift/Manifest
+++ b/dev-python/thrift/Manifest
@@ -1 +1,2 @@
 DIST thrift-0.13.0.tar.gz 59911 BLAKE2B b45363c2e8bbc5c7fae25533c7df9be49e6ea88b5ce077e9a580c28decf06de608d50100ba77cdb1ce8c7e56b87608d193b8579a4f89cc4fb74d672da0ba7e93 SHA512 063440db324efdae1fc4466133deaedeb1edd2f953f6924191ad819476f7b62a434d52960837e94516a673063ceab8b446b4f7dc8c94bb2d1fb84e95d2fa3d78
+DIST thrift-0.14.1.tar.gz 4311458 BLAKE2B 00c0b77c3d722b0db833f03848df0b74ee64712ed1ff06e0b63b926eb493f43ffd9c316422b6044f74685471cdbd2ccea7c6305fd8dbbc10614f2151a3e16237 SHA512 e09e53b2ea3cad01ef81ab4b5a87bfed443cfda849a13c4f00ba0ed1cd1a1f9742faf95adb07f279506cc5f866c13fdce57149de1bc9e71ab5c40238037e8b22
diff --git a/dev-python/thrift/thrift-0.14.1.ebuild b/dev-python/thrift/thrift-0.14.1.ebuild
new file mode 100644
index 000000000000..1997f2b95cfb
--- /dev/null
+++ b/dev-python/thrift/thrift-0.14.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of Thrift"
+HOMEPAGE="https://pypi.org/project/thrift/ https://thrift.apache.org/"
+SRC_URI="https://downloads.apache.org/${PN}/${PV}//${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${P}/lib/py"
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize
+}