Adding metadata

28 files changed, 47 insertions, 307 deletions

diff --git a/dev-python/jaraco-path/jaraco-path-3.3.1.ebuild b/dev-python/jaraco-path/jaraco-path-3.3.1.ebuild
index ca0ba51a7e88..5313d87a5f12 100644
--- a/dev-python/jaraco-path/jaraco-path-3.3.1.ebuild
+++ b/dev-python/jaraco-path/jaraco-path-3.3.1.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/klein/klein-20.6.0.ebuild b/dev-python/klein/klein-20.6.0.ebuild
index ec0b30598180..675d6a937d5f 100644
--- a/dev-python/klein/klein-20.6.0.ebuild
+++ b/dev-python/klein/klein-20.6.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
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index e94b7dfb5c21..abe0de646274 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,2 +1 @@
-DIST pillow-8.1.1.tar.gz 44976395 BLAKE2B 208534f3e24d9416360efaab8f802b4d482208fe81d1b39bf8339ddd1fe992b281a59faaadeb5ad5364ff062b1b7b19c3dadc11f9a453d5bd14bbf5170521396 SHA512 d04300442ac33e946bea186d6293516b615059b0f4b1b6ac7a48ce3a2e4e22bce5bc403331be697c022a4c81cb30f943cc33bfda649873c734af7db23afd6b69
 DIST pillow-8.1.2.tar.gz 45217041 BLAKE2B dbc7fb5c426c6a8f0efd218db5cd404c6b6a603054b36125ea687c69cca78ddd2e58712e8fe94460978bffe6bc059e5819d7ac6371bad11ee8fc1df445495c70 SHA512 32ffedf8cc8f2c21c241f41938d0521626ea05206d1a762305ac38abedecdf9bc8a6e5e2ded7565340e54797a4395acefb3b4d939ebdde8fc9583a1998bae34d
diff --git a/dev-python/pillow/pillow-8.1.1.ebuild b/dev-python/pillow/pillow-8.1.1.ebuild
deleted file mode 100644
index 0541afc0b12e..000000000000
--- a/dev-python/pillow/pillow-8.1.1.ebuild
+++ /dev/null
@@ -1,98 +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} pypy3 )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 toolchain-funcs virtualx
-
-MY_PN=Pillow
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python Imaging Library (fork)"
-HOMEPAGE="https://python-pillow.org/"
-SRC_URI="https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
-REQUIRED_USE="test? ( jpeg tiff )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	imagequant? ( media-gfx/libimagequant:0 )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lcms? ( media-libs/lcms:2= )
-	tiff? ( media-libs/tiff:0=[jpeg,zlib] )
-	truetype? ( media-libs/freetype:2= )
-	webp? ( media-libs/libwebp:0= )
-	xcb? ( x11-libs/libxcb )
-	zlib? ( sys-libs/zlib:0= )"
-RDEPEND="${DEPEND}
-	dev-python/olefile[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		media-gfx/imagemagick[png]
-	)
-"
-
-python_configure_all() {
-	# It's important that these flags are also passed during the install phase
-	# as well. Make sure of that if you change the lines below. See bug 661308.
-	mydistutilsargs=(
-		build_ext
-		--disable-platform-guessing
-		$(use_enable truetype freetype)
-		$(use_enable jpeg)
-		$(use_enable jpeg2k jpeg2000)
-		$(use_enable lcms)
-		$(use_enable tiff)
-		$(use_enable imagequant)
-		$(use_enable webp)
-		$(use_enable webp webpmux)
-		$(use_enable xcb)
-		$(use_enable zlib)
-	)
-
-	# setup.py sucks at adding the right toolchain paths but it does
-	# accept additional ones from INCLUDE and LIB so set these. You
-	# wouldn't normally need these at all as the toolchain should look
-	# here anyway but this setup.py does stupid things.
-	export \
-		INCLUDE=${ESYSROOT}/usr/include \
-		LIB=${ESYSROOT}/usr/$(get_libdir)
-
-	# We have patched in this env var.
-	tc-export PKG_CONFIG
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	"${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
-	# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
-	pytest -vv -p no:relaxed || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	python_doheader src/libImaging/*.h
-	distutils-r1_python_install
-}
-
-python_install_all() {
-	if use examples ; then
-		docinto example
-		dodoc docs/example/*
-		docompress -x /usr/share/doc/${PF}/example
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pillow/pillow-8.1.2.ebuild b/dev-python/pillow/pillow-8.1.2.ebuild
index 383cf0775313..36fb62d379b2 100644
--- a/dev-python/pillow/pillow-8.1.2.ebuild
+++ b/dev-python/pillow/pillow-8.1.2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
 REQUIRED_USE="test? ( jpeg jpeg2k tiff )"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index 4ac5d9710079..024ebb61ebb3 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -1,2 +1 @@
 DIST pycryptodome-3.10.1.tar.gz 15545471 BLAKE2B ef1922efd0b6bef6beaee76fe03a4201a6f1cf2a203abcb12b96a5ea7c8de59a34ac704fe7508a3728a214efc0755f289d66dc14a0adb3f2eac882bc8db691bf SHA512 4c7e7e989d5363064e7e184f6b00a174045e03916cdf1199626afd7fe75eb5efcd13888ecdee607b974e96faad465694b384eb6d91edb8de1d0277ad71888c52
-DIST pycryptodome-3.9.9.tar.gz 15551299 BLAKE2B ac89bcc2bbe707cb2a9cf2496a2eb74ff5685f11017d60d67558de7ac6cad5c24c43b4074bff01e99378d7c88462e88e88f363c5329fb800e1a7872ad8a34dab SHA512 a1aad4d52256220fe3d5d7f399c2c5e7338d6eb88058da0571fe1c686d74d33ff4bc1c275d4b9373e0ff22f4ddcded75a25387e76fc65047f8612f8856c1bd4d
diff --git a/dev-python/pycryptodome/files/pycryptodome-3.9.4-parallel-make.patch b/dev-python/pycryptodome/files/pycryptodome-3.9.4-parallel-make.patch
deleted file mode 100644
index 331333533f10..000000000000
--- a/dev-python/pycryptodome/files/pycryptodome-3.9.4-parallel-make.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 1d70caad..c72f64ff 100644
---- a/setup.py
-+++ b/setup.py
-@@ -364,7 +364,7 @@ ext_modules = [
-     Extension("Crypto.Cipher._raw_eksblowfish",
-         include_dirs=['src/'],
-         define_macros=[('EKS',None),],
--        sources=["src/blowfish.c"]),
-+        sources=["src/blowfish_eks.c"]),
-     Extension("Crypto.Cipher._raw_cast",
-         include_dirs=['src/'],
-         sources=["src/CAST.c"]),
-@@ -427,7 +427,7 @@ ext_modules = [
-     # Math
-     Extension("Crypto.Math._modexp",
-         include_dirs=['src/'],
--        sources=['src/modexp.c', 'src/siphash.c', 'src/modexp_utils.c', 'src/mont.c'],
-+        sources=['src/modexp.c', 'src/siphash.c', 'src/modexp_utils.c', 'src/mont_math.c'],
-         ),
- ]
- 
diff --git a/dev-python/pycryptodome/files/pycryptodome-3.9.9-system-libtomcrypt.patch b/dev-python/pycryptodome/files/pycryptodome-3.9.9-system-libtomcrypt.patch
deleted file mode 100644
index 927ad65e7c47..000000000000
--- a/dev-python/pycryptodome/files/pycryptodome-3.9.9-system-libtomcrypt.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/setup.py	2019-01-19 22:52:55.000000000 +0100
-+++ b/setup.py	2019-02-15 15:29:46.960976879 +0100
-@@ -367,11 +367,13 @@ ext_modules = [
-         include_dirs=['src/'],
-         sources=["src/CAST.c"]),
-     Extension("Crypto.Cipher._raw_des",
--        include_dirs=['src/', 'src/libtom/'],
--        sources=["src/DES.c"]),
-+        include_dirs=['src/'],
-+        sources=["src/DES.c"],
-+        extra_link_args=["-ltomcrypt"]),
-     Extension("Crypto.Cipher._raw_des3",
--        include_dirs=['src/', 'src/libtom/'],
--        sources=["src/DES3.c"]),
-+        include_dirs=['src/'],
-+        sources=["src/DES3.c"],
-+        extra_link_args=["-ltomcrypt"]),
-     Extension("Crypto.Util._cpuid_c",
-         include_dirs=['src/'],
-         sources=['src/cpuid.c']),
-@@ -400,8 +402,9 @@ ext_modules = [
-         include_dirs=['src/'],
-         sources=["src/ARC4.c"]),
-     Extension("Crypto.Cipher._Salsa20",
--        include_dirs=['src/', 'src/libtom/'],
--        sources=["src/Salsa20.c"]),
-+        include_dirs=['src/'],
-+        sources=["src/Salsa20.c"],
-+        extra_link_args=["-ltomcrypt"]),
-     Extension("Crypto.Cipher._chacha20",
-         include_dirs=['src/'],
-         sources=["src/chacha20.c"]),
---- a/src/DES.c	2019-01-19 22:52:55.000000000 +0100
-+++ b/src/DES.c	2019-02-15 15:30:27.014967034 +0100
-@@ -39,7 +39,7 @@ FAKE_INIT(raw_des3)
- 
- /* Include the actial DES implementation */
- #define LTC_NO_PROTOTYPES
--#include "libtom/tomcrypt_des.c"
-+#include <tomcrypt.h>
- 
- struct block_state {
-     symmetric_key sk;
diff --git a/dev-python/pycryptodome/pycryptodome-3.10.1.ebuild b/dev-python/pycryptodome/pycryptodome-3.10.1.ebuild
index 5297ef1bfe07..bd86168beec2 100644
--- a/dev-python/pycryptodome/pycryptodome-3.10.1.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.10.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="BSD-2 Unlicense"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/pycryptodome/pycryptodome-3.9.9-r1.ebuild b/dev-python/pycryptodome/pycryptodome-3.9.9-r1.ebuild
deleted file mode 100644
index f4ac4dba8c8d..000000000000
--- a/dev-python/pycryptodome/pycryptodome-3.9.9-r1.ebuild
+++ /dev/null
@@ -1,54 +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} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A self-contained cryptographic library for Python"
-HOMEPAGE="https://www.pycryptodome.org/
-	https://github.com/Legrandin/pycryptodome/
-	https://pypi.org/project/pycryptodome/"
-SRC_URI="
-	https://github.com/Legrandin/pycryptodome/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="BSD-2 Unlicense"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
-IUSE=""
-
-DEPEND="
-	dev-libs/gmp:0=
-	>=dev-libs/libtomcrypt-1.18.2-r1:="
-BDEPEND="
-	virtual/python-cffi[${PYTHON_USEDEP}]"
-RDEPEND="
-	${DEPEND}
-	${BDEPEND}
-	!dev-python/pycrypto"
-
-PATCHES=(
-	"${FILESDIR}/pycryptodome-3.9.4-parallel-make.patch"
-	"${FILESDIR}/pycryptodome-3.9.9-system-libtomcrypt.patch"
-)
-
-distutils_enable_tests setup.py
-
-python_prepare_all() {
-	# parallel make fixes
-	#  Multiple targets were compiling the same file, setuptools doesn't
-	#  understand this and you get race conditions where a file gets
-	#  overwritten while it's linking. This makes the files look like separate
-	#  files so this race won't happen
-	ln src/blowfish.c src/blowfish_eks.c || die
-	ln src/mont.c src/mont_math.c || die
-
-	# make sure we're unbundling it correctly
-	rm -r src/libtom || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index df72bd136a5f..ed5859b21c8b 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -1,2 +1 @@
-DIST pyglet-1.5.14.tar.gz 6414252 BLAKE2B 3e30f4dc80fffbf93a3cc7fa744ba224868dea1d9f1998446a2341fd3ed1c058493c486979aedb8415abe5c8a3f53dc634494f849bf6f3ab6f9ceb0e35cfecd9 SHA512 9b34e80e1b28a2ef0504339b67bdc31e568bf3a3352a9a1d78d3cf87ba84e86e23aec6e524abbca26865082ec2f9da8d7633ba83206f9996d87002faa1269044
 DIST pyglet-1.5.15.tar.gz 6429039 BLAKE2B 5835d2c8c0c6e309664bea4a4001d0b68622379ae27555b640ed4441cb4319bf4ffd2b491cf789cba5639b9ca43e047f1e2cf820e540123939dd386a4c88fbf3 SHA512 0ea6f936895b0f17d7272866ecec7721ae1fb353af3654c49bb09eb81729f939df07ba3cdaf8b8bece345a8f144d56a45dc23d82e1887db306fd08c7989c688e
diff --git a/dev-python/pyglet/pyglet-1.5.14.ebuild b/dev-python/pyglet/pyglet-1.5.14.ebuild
deleted file mode 100644
index 67b3ca69398a..000000000000
--- a/dev-python/pyglet/pyglet-1.5.14.ebuild
+++ /dev/null
@@ -1,62 +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 virtualx xdg-utils
-
-DESCRIPTION="Cross-platform windowing and multimedia library for Python"
-HOMEPAGE="http://pyglet.org/"
-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"
-IUSE="examples image +sound"
-
-BDEPEND="
-	test? (
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/gst-python[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	virtual/glu
-	virtual/opengl
-	image? ( || (
-		dev-python/pillow[${PYTHON_USEDEP}]
-		x11-libs/gtk+:2
-	) )
-	sound? ( || (
-		media-libs/openal
-		media-sound/pulseaudio
-	) )
-"
-#	ffmpeg? ( media-libs/avbin-bin )
-
-DOCS=( DESIGN NOTICE README.md RELEASE_NOTES )
-
-distutils_enable_tests pytest
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	xdg_environment_reset
-
-	# Specify path to avoid running interactive tests
-	# We could add in integration tests, but they're slow
-	pytest -vv tests/unit || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyglet/pyglet-1.5.15.ebuild b/dev-python/pyglet/pyglet-1.5.15.ebuild
index b249e2618881..67b3ca69398a 100644
--- a/dev-python/pyglet/pyglet-1.5.15.ebuild
+++ b/dev-python/pyglet/pyglet-1.5.15.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/pypugjs/Manifest b/dev-python/pypugjs/Manifest
index 3ebdcced9e02..4814e99db913 100644
--- a/dev-python/pypugjs/Manifest
+++ b/dev-python/pypugjs/Manifest
@@ -1,2 +1,3 @@
 DIST pypugjs-5.9.5.tar.gz 48925 BLAKE2B 4487799759e5090a9ef20da5af2d94d6f2d0139409cb5b963153ca949160bdf3f8f5ec8a3dd2949913b80f77b454ce4aeca00d9df10716c7202e105823db8f8b SHA512 f38ced5a908a4353aa1e48df605ebd80da418ecd2f5f554bf8e7788275a13ed82bc5b420656e5ba88862e033e339c5118d097d0ca7c1237aadd5049a15976aa8
 DIST pypugjs-5.9.8.tar.gz 49012 BLAKE2B c072f834127011edd81eab3d141a107592ee305739bee3bf116c9e0782009ecfbbfbb0cf5c10a04b6abdd303c18f79a0fb167f4dbfa2a4ca39664faef66d9f31 SHA512 5f02b2fd4355a489badb0ff09053438d5cd4a2a1d21da84fc276efe496492e384e55aea33d7ba715cc68437a1292ea30e39700e5f7bbff9dfe174d1cedca9fef
+DIST pypugjs-5.9.9.tar.gz 49022 BLAKE2B 26bdad4bd951eb8e515a0c181a56f68a8fdf8131dbd9e61c32c266bd91575143006f3cb6c2f477a2406110b22ed279a1167821a1b1f403a73bb333013173db2a SHA512 f34fab60e4f9d0680a36e5d2a28c5f99668c13b296a1bb70778dced235d223c592d49adbadc2f70b1a7e350f28a2f29dbce8febe2b8e99d60a0e050254180c71
diff --git a/dev-python/pypugjs/pypugjs-5.9.9.ebuild b/dev-python/pypugjs/pypugjs-5.9.9.ebuild
new file mode 100644
index 000000000000..fa966be38011
--- /dev/null
+++ b/dev-python/pypugjs/pypugjs-5.9.9.ebuild
@@ -0,0 +1,23 @@
+# 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
+
+DESCRIPTION="Pug (Jade) syntax adapter for Django, Jinja2 and Mako templates"
+HOMEPAGE="https://github.com/kakulukia/pypugjs"
+SRC_URI="https://github.com/kakulukia/pypugjs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE=""
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/chardet
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r1.ebuild b/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r1.ebuild
index 8a2de310cd53..9a322bc5cb3e 100644
--- a/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r1.ebuild
+++ b/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-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
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild
index d20b885db7db..7f68b0d5eb8e 100644
--- a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild
+++ b/dev-python/pytest-shutil/pytest-shutil-1.7.0-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
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest-virtualenv/metadata.xml b/dev-python/pytest-virtualenv/metadata.xml
index ef36fa3ec6b5..b6d9dfaced2b 100644
--- a/dev-python/pytest-virtualenv/metadata.xml
+++ b/dev-python/pytest-virtualenv/metadata.xml
@@ -15,4 +15,5 @@
   <remote-id type="github">man-group/pytest-plugins</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild b/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild
index fbbd23532f64..1adb830defe5 100644
--- a/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild
+++ b/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-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
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
diff --git a/dev-python/setuptools-git/setuptools-git-1.2-r2.ebuild b/dev-python/setuptools-git/setuptools-git-1.2-r2.ebuild
index 54780aed0e13..b39534bc9fc3 100644
--- a/dev-python/setuptools-git/setuptools-git-1.2-r2.ebuild
+++ b/dev-python/setuptools-git/setuptools-git-1.2-r2.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
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-vcs/git"
diff --git a/dev-python/setuptools/setuptools-54.1.1.ebuild b/dev-python/setuptools/setuptools-54.1.1.ebuild
index 8b32bdec8982..e008fc27122c 100644
--- a/dev-python/setuptools/setuptools-54.1.1.ebuild
+++ b/dev-python/setuptools/setuptools-54.1.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/setuptools/setuptools-54.1.2.ebuild b/dev-python/setuptools/setuptools-54.1.2.ebuild
index 8b32bdec8982..e008fc27122c 100644
--- a/dev-python/setuptools/setuptools-54.1.2.ebuild
+++ b/dev-python/setuptools/setuptools-54.1.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/setuptools/setuptools-54.2.0.ebuild b/dev-python/setuptools/setuptools-54.2.0.ebuild
index 8b32bdec8982..6b8d76137bdf 100644
--- a/dev-python/setuptools/setuptools-54.2.0.ebuild
+++ b/dev-python/setuptools/setuptools-54.2.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/snakeoil/snakeoil-0.9.4.ebuild b/dev-python/snakeoil/snakeoil-0.9.4.ebuild
index bfbd0e54cd94..9a91e38e7382 100644
--- a/dev-python/snakeoil/snakeoil-0.9.4.ebuild
+++ b/dev-python/snakeoil/snakeoil-0.9.4.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~s390 sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild b/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild
index 7f7d1334403c..333a71a1d836 100644
--- a/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild
+++ b/dev-python/sphinx-testing/sphinx-testing-1.0.1-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/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
index b6d7a612b770..5a3d0718bd3a 100644
--- a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
+++ b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.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
@@ -33,9 +33,6 @@ RDEPEND+="
 
 python_prepare_all() {
 	sed -i -e /build-base/d setup.cfg || die
-	# Those tests are known-broken upstream
-	# https://github.com/blockdiag/sphinxcontrib-blockdiag/pull/11
-	rm tests/test_latex.py || die
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.13.0.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.13.0.ebuild
index 432b7e8b5e7e..c4708c683c31 100644
--- a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.13.0.ebuild
+++ b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.13.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
diff --git a/dev-python/termcolor/termcolor-1.1.0-r2.ebuild b/dev-python/termcolor/termcolor-1.1.0-r2.ebuild
index ee4a6e30e2f1..9c180969da51 100644
--- a/dev-python/termcolor/termcolor-1.1.0-r2.ebuild
+++ b/dev-python/termcolor/termcolor-1.1.0-r2.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
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 # no tests...
 RESTRICT="test"