Sync with portage [Thu Jun 24 10:09:31 MSK 2021].

3 years ago · d25eb2c918
parent 60ed1cc870
commit d25eb2c918
20873 changed files with 34181 additions and 30062 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/lib_users/lib_users-0.14-r2.ebuild
+++ b/app-admin/lib_users/lib_users-0.14-r2.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/klausman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
--- a/app-doc/pms/pms-9999.ebuild
+++ b/app-doc/pms/pms-9999.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
 inherit git-r3
@ -28,7 +28,7 @@ RDEPEND="!app-doc/pms-bin"
 src_compile() {
 	# just in case; we shouldn't be generating any fonts
 	export VARTEXFONTS="${T}/fonts"
-	emake $(usex twoside TWOSIDE=yes "")
+	emake $(usev twoside TWOSIDE=yes)
 	use html && emake html
 }
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
--- a/app-forensics/sleuthkit/sleuthkit-4.10.1-r3.ebuild
+++ b/app-forensics/sleuthkit/sleuthkit-4.10.1-r3.ebuild
@ -0,0 +1,306 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 JAVA_PKG_BSFIX_NAME="build.xml build-unix.xml"
 inherit autotools java-pkg-opt-2 java-ant-2
 DESCRIPTION="A collection of file system and media management forensic analysis tools"
 HOMEPAGE="https://www.sleuthkit.org/sleuthkit/"
 # TODO: sqlite-jdbc does not exist in the tree, we bundle it for now
 #		See: https://bugs.gentoo.org/690010
 # TODO: Upstream uses a very specific version of libewf which is not in
 #       the tree anymore. So we statically compile and link to sleuthkit.
 #       Hopefully upstream will figure something out in the future.
 #		See: https://bugs.gentoo.org/689752
 # TODO: gson-2.8.5 does not exist in the tree. Building it seems to
 # 		require Java 9. We have Java 11 in the tree but I don't see a
 # 		way to use it as a gentoo-vm in order to build gson. Sleuthkit
 # 		upstream still uses Java 8.
 # 		See: https://bugs.gentoo.org/706274
 # TODO: commons-validator-1.6 does not exist in the tree. The latest version
 #		as of writing this ebuild is 1.4.1, for which the build fails. As
 #		per #711930, this is a security sensitive bump. We're gonna fetch
 #		the jar file here and file a bug request for a bump as well:
 #		    https://bugs.gentoo.org/721020
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz
 	java? (
 		https://repo1.maven.org/maven2/com/google/code/gson/gson/2.8.5/gson-2.8.5.jar
 		http://repo1.maven.org/maven2/org/xerial/sqlite-jdbc/3.25.2/sqlite-jdbc-3.25.2.jar
 		https://repo1.maven.org/maven2/commons-validator/commons-validator/1.6/commons-validator-1.6.jar
 	)
 	ewf? ( https://github.com/sleuthkit/libewf_64bit/archive/VisualStudio_2010.tar.gz -> sleuthkit-libewf_64bit-20130416.tar.gz )"
 LICENSE="BSD CPL-1.0 GPL-2+ IBM java? ( Apache-2.0 )"
 SLOT="0/19" # subslot = major soname version
 KEYWORDS="~amd64 ~hppa ~ppc ~x86"
 IUSE="aff doc ewf java static-libs test +threads zlib"
 RESTRICT="!test? ( test )"
 DEPEND="
 	dev-db/sqlite:3
 	dev-lang/perl:*
 	aff? ( app-forensics/afflib )
 	ewf? ( sys-libs/zlib )
 	java? (
 		>=dev-java/c3p0-0.9.5:0
 		dev-java/commons-lang:3.6
 		dev-java/guava:20
 		>=dev-java/jdbc-postgresql-9.4:0
 		>=dev-java/joda-time-2.4:0
 		dev-java/sparsebitset
 	)
 	zlib? ( sys-libs/zlib )
 "
 # TODO: add support for not-in-tree libraries libvhdi and libvmdk
 # libvhdi: https://github.com/libyal/libvhdi
 # libvmdk: https://github.com/libyal/libvmdk
 # DEPEND="${DEPEND}
 # 	vhdi? ( dev-libs/libvhdi )
 # 	vmdk? ( dev-libs/libvmdk )
 # "
 RDEPEND="${DEPEND}
 	java? (
 		|| (
 			virtual/jre:1.8
 			virtual/jdk:1.8
 		)
 	)
 "
 DEPEND="${DEPEND}
 	java? ( virtual/jdk:1.8 )
 	doc? ( app-doc/doxygen )
 	test? ( >=dev-util/cppunit-1.2.1 )
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.1.0-tools-shared-libs.patch
 	"${FILESDIR}"/${PN}-4.6.4-default-jar-location-fix.patch
 	"${FILESDIR}"/${PN}-4.10.1-exclude-usr-local.patch
 )
 src_unpack() {
 	local f
 	unpack ${P}.tar.gz
 	if use ewf; then
 		pushd "${T}" &>/dev/null || die
 		unpack sleuthkit-libewf_64bit-20130416.tar.gz
 		export TSK_LIBEWF_SRCDIR="${T}"/libewf_64bit-VisualStudio_2010
 		popd &>/dev/null || die
 	fi
 	# Copy the jar files that don't exist in the tree yet
 	if use java; then
 		TSK_JAR_DIR="${T}/lib"
 		mkdir "${TSK_JAR_DIR}" || die
 		for f in ${A}; do
 			if [[ ${f} =~ .jar$ ]]; then
 				cp "${DISTDIR}"/"${f}" "${TSK_JAR_DIR}" || die
 			fi
 		done
 		export TSK_JAR_DIR
 	fi
 }
 tsk_prepare_libewf() {
 	# Inlining breaks the compilation, disable it
 	sed -e 's/LIBUNA_INLINE inline/LIBUNA_INLINE/' \
 		-i "${TSK_LIBEWF_SRCDIR}"/libuna/libuna_inline.h || die
 }
 src_prepare() {
 	use ewf && tsk_prepare_libewf
 	# Do not pass '-Werror'. This is overkill for user builds.
 	sed -e '/AM_CXXFLAGS/ s/-Werror//g' \
 		-i tsk/util/Makefile.am \
 		-i tsk/pool/Makefile.am || die
 	# Remove -static from LDFLAGS because it doesn't actually create
 	# a static binary. It confuses libtool, who then inserts rpath
 	sed -e '/LDFLAGS/ s/-static//' \
 		-i tools/pooltools/Makefile.am || die
 	if use java; then
 		pushd "${S}"/bindings/java &>/dev/null || die
 		# Prevent "make install" from installing
 		# jar files under /usr/share/java
 		# We'll use the java eclasses for this
 		# See: https://github.com/sleuthkit/sleuthkit/pull/1379
 		sed -e '/^jar_DATA/ d;' -i Makefile.am || die
 		java-pkg-opt-2_src_prepare
 		popd &>/dev/null || die
 	fi
 	# Override the doxygen output directories
 	if use doc; then
 		sed -e "/^OUTPUT_DIRECTORY/ s|=.*$|= ${T}/doc|" \
 			-i tsk/docs/Doxyfile \
 			-i bindings/java/doxygen/Doxyfile || die
 	fi
 	# It's safe to call this even after java-pkg-opt-2_src_prepare
 	# because future calls to eapply_user do nothing and return 0
 	default
 	eautoreconf
 }
 tsk_compile_libewf() {
 	local myeconfargs=(
 		--prefix=/
 		--libdir=/lib
 		--enable-static
 		--disable-shared
 		--disable-winapi
 		--without-libbfio
 		--with-zlib
 		--without-bzip2
 		--without-libhmac
 		--without-openssl
 		--without-libuuid
 		--without-libfuse
 		--with-libcstring=no
 		--with-libcerror=no
 		--with-libcdata=no
 		--with-libclocale=no
 		--with-libcnotify=no
 		--with-libcsplit=no
 		--with-libuna=no
 		--with-libcfile=no
 		--with-libcpath=no
 		--with-libbfio=no
 		--with-libfcache=no
 		--with-libfvalue=no
 	)
 	# We want to contain our build flags
 	local CFLAGS="${CFLAGS}"
 	local LDFLAGS="${LDFLAGS}"
 	pushd "${TSK_LIBEWF_SRCDIR}" &>/dev/null || die
 	# Produce relocatable code
 	CFLAGS+=" -fPIC"
 	LDFLAGS+=" -fPIC"
 	econf "${myeconfargs[@]}"
 	# Do not waste CPU cycles on building ewftools
 	sed -e '/ewftools/ d' -i Makefile || die
 	emake
 	# Only install the headers and the library
 	emake -C libewf DESTDIR="${T}"/image install
 	emake -C include DESTDIR="${T}"/image install
 	find "${T}"/image -name '*.la' -delete || die
 	popd &>/dev/null || die
 }
 src_configure() {
 	local myeconfargs=(
 		--enable-offline="${TSK_JAR_DIR}"
 		$(use_enable java)
 		$(use_enable static-libs static)
 		$(use_enable threads multithreading)
 		$(use_with aff afflib)
 		$(use_with zlib)
 	)
 	# TODO: add support for non-existing libraries libvhdi and libvmdk
 	# myeconfargs+=(
 	# 	$(use_with vhdi libvhdi)
 	# 	$(use_with vmdk libvmdk)
 	# )
 	myeconfargs+=(
 		--without-libvhdi
 		--without-libvmdk
 	)
 	use ewf && tsk_compile_libewf
 	myeconfargs+=( $(use_with ewf libewf "${T}"/image) )
 	if use java; then
 		pushd "${S}"/bindings/java &>/dev/null || die
 		java-ant-2_src_configure
 		popd &>/dev/null || die
 	fi
 	econf "${myeconfargs[@]}"
 }
 src_compile() {
 	# Give it an existing bogus ivy home #672220
 	local -x IVY_HOME="${T}"
 	# Create symlinks of jars for the required dependencies
 	if use java; then
 		java-pkg_jar-from --into "${TSK_JAR_DIR}" c3p0
 		java-pkg_jar-from --into "${TSK_JAR_DIR}" commons-lang:3.6
 		java-pkg_jar-from --into "${TSK_JAR_DIR}" guava:20
 		java-pkg_jar-from --into "${TSK_JAR_DIR}" jdbc-postgresql
 		java-pkg_jar-from --into "${TSK_JAR_DIR}" joda-time
 		java-pkg_jar-from --into "${TSK_JAR_DIR}" sparsebitset
 		# case-uco needs gson and expects it under case-uco/java/lib
 		# symlink it to the jar dir we create for java bindings
 		ln -s "${TSK_JAR_DIR}" "${S}"/case-uco/java/lib || die
 	fi
 	# Create the doc output dirs if requested
 	if use doc; then
 		mkdir -p "${T}"/doc/{api-docs,jni-docs} || die
 	fi
 	emake all $(usex doc api-docs "")
 }
 src_install() {
 	# Give it an existing bogus ivy home #756766
 	local -x IVY_HOME="${T}"
 	local f
 	if use java; then
 		pushd "${S}"/bindings/java &>/dev/null || die
 		# Install case-uco
 		pushd "${S}"/case-uco/java &>/dev/null || die
 		java-pkg_newjar "dist/${PN}-caseuco-${PV}".jar "${PN}-caseuco.jar"
 		popd || die
 		# Install the bundled jar files as well as the
 		# sleuthkit jar installed here by case-uco
 		pushd "${TSK_JAR_DIR}" &>/dev/null || die
 		for f in *; do
 			# Skip the symlinks java-pkg_jar-from created
 			[[ -f ${f} ]] || continue
 			# Strip the version numbers as per eclass recommendation
 			[[ ${f} =~ -([0-9]+\.)+jar$ ]] || continue
 			java-pkg_newjar "${f}" "${f/${BASH_REMATCH[0]}/.jar}"
 		done
 		popd &>/dev/null || die
 		popd &>/dev/null || die
 	fi
 	default
 	# Default install target for case-uco installs the jar in the wrong place
 	rm -r "${ED}"/usr/share/java
 	# It unconditionally builds both api and jni docs
 	# We install conditionally based on the provided use flags
 	if use doc; then
 		dodoc -r "${T}"/doc/api-docs
 		use java && dodoc -r "${T}"/doc/jni-docs
 	fi
 	find "${D}" -name '*.la' -delete || die
 }
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@ -1 +1,2 @@
 DIST gnumeric-1.12.49.tar.xz 18057896 BLAKE2B 75ae1683feb7f37cdff4cb5fbec04b0f241e4590236ea68706180853c1a950092bf0d902652d65288b42dba13c384e1ac364cefb32b9d60c37a9948d9d7fc8eb SHA512 047d625aee3a15dd8881f2e11cc7c67d211d40be86ec018517d1b3140ff4bd031fb2cb86e48f1f6ee22432aa1f39c978bad5fd5bf5c6a1be9aa53411136429ed
 DIST gnumeric-1.12.50.tar.xz 18062104 BLAKE2B 46d15e5fe540cce904de07b263707d7fd8c29d9a2611105cdb117a3acd6693651e588b4d281038b48fbc36bba100d162c2c2ab1be589ea206272155cbd9046df SHA512 d5896cb8390c99fb3871c722116cc085b93b788fab91bf44d24f20228b8290170a0adc906160a6aa46431ae43b04079621c370dcda42658fa9ae3c1d8baf1730
--- a/app-office/gnumeric/gnumeric-1.12.50.ebuild
+++ b/app-office/gnumeric/gnumeric-1.12.50.ebuild
@ -0,0 +1,93 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{7..9} )
 inherit gnome.org libtool python-r1 xdg
 DESCRIPTION="The GNOME Spreadsheet"
 HOMEPAGE="http://www.gnumeric.org/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+introspection libgda perl"
 REQUIRED_USE="introspection? ( ${PYTHON_REQUIRED_USE} )"
 # Missing gnome-extra/libgnomedb required version in tree
 # but its upstream is dead and will be dropped soon.
 # lots of missing files, also fails tests due to 80-bit long story
 # upstream bug #721556
 RESTRICT="test"
 # Gnumeric has two python components
 # 1. The python loader for loading python-based plugins.
 #    This component is pure python 2 and a port "is not currently being worked on".
 # 2. The python gobject-based introspection API. This component is compatible
 #    with python 3.
 # Component 1. can only be re-enabled once someone has ported the upstream
 # codebase to python 3.
 # https://gitlab.gnome.org/GNOME/gnumeric/issues/419#note_618852
 RDEPEND="
 	app-arch/bzip2
 	sys-libs/zlib
 	>=dev-libs/glib-2.40.0:2
 	>=gnome-extra/libgsf-1.14.33:=
 	>=x11-libs/goffice-0.10.50:0.10
 	>=dev-libs/libxml2-2.4.12:2
 	>=x11-libs/pango-1.24.0:=
 	>=x11-libs/gtk+-3.8.7:3
 	x11-libs/cairo:=[svg]
 	introspection? (
 		${PYTHON_DEPS}
 		>=dev-libs/gobject-introspection-1:=
 	)
 	perl? ( dev-lang/perl:= )
 	libgda? ( gnome-extra/libgda:5[gtk] )"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	app-text/docbook-xml-dtd:4.5
 	app-text/yelp-tools
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.35.0
 	virtual/pkgconfig"
 src_prepare() {
 	default
 	# Manage gi overrides ourselves
 	sed '/SUBDIRS/ s/introspection//' -i Makefile.{am,in} || die
 	elibtoolize
 }
 src_configure() {
 	econf \
 		--disable-gtk-doc \
 		--disable-maintainer-mode \
 		--disable-schemas-compile \
 		--disable-static \
 		--without-psiconv \
 		--without-python \
 		--with-zlib \
 		$(use_with libgda gda) \
 		$(use_enable introspection) \
 		$(use_with perl)
 }
 src_install() {
 	default
 	dodoc HACKING MAINTAINERS
 	if use introspection; then
 		python_moduleinto gi.overrides
 		python_foreach_impl python_domodule introspection/gi/overrides/Gnm.py
 	fi
 	# no static archives
 	find "${ED}" -name '*.la' -delete || die
 }
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
--- a/dev-java/gradle-bin/metadata.xml
+++ b/dev-java/gradle-bin/metadata.xml
@ -5,8 +5,9 @@
    <email>chainsaw@gentoo.org</email>
    <name>Tony Vroon</name>
  </maintainer>
-  <maintainer type="person" proxied="yes">
+  <maintainer type="person">
-    <email>flo@geekplace.eu</email>
+    <email>flow@gentoo.org</email>
    <name>Florian Schmaus</name>
  </maintainer>
  <maintainer type="project">
    <email>java@gentoo.org</email>
--- a/dev-java/miglayout/miglayout-4.0-r2.ebuild
+++ b/dev-java/miglayout/miglayout-4.0-r2.ebuild
@ -13,7 +13,7 @@ SRC_URI="http://www.migcalendar.com/miglayout/versions/${PV}/${P}-sources.jar"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="swt"
 COMMON_DEPEND="swt? ( dev-java/swt:4.10 )"
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
--- a/dev-lang/moarvm/Manifest
+++ b/dev-lang/moarvm/Manifest
@ -1,3 +1 @@
-DIST MoarVM-2020.11.tar.gz 5402860 BLAKE2B f29ec4a8f4979fd65adb24cbfbbed586b69d47dd1176770e1e0e46a8bc35ef90146bae468fd6e088cd19201ba7e43d43d486d569970a81a695d6b642f57c2417 SHA512 c3ffe128db43316f93ad19f2804cd963cd2613dc46ffd29b099a165f122f6e7fdf28ce0b6c226a31f44abaeca72468f6774c39ceac3cea992596e8ce042ae7a5
+DIST MoarVM-2021.06.tar.gz 5449936 BLAKE2B 2bf6fc2e1a4dd0741819305e506945b09ed2a0fc1348ff98565cae397e76044176f05e87faeed1f52d5efadccb6d44edcb987553f5e164417153a8f23ba09493 SHA512 b23e20ed3e0830395ac09bd84a33ea3ab7ba52bce835c67b1feec45823ca2f0c9d04957d1f1b48b400fc30a48db37c5f89c3975b0273f684d9677145e2296f2c
 DIST MoarVM-2020.12.tar.gz 5429137 BLAKE2B dbf9b0b29226dde10b27ddb9195678c86efc77eff16b57745d31dbcef316c8ba4f5233e2c3672b436d089ce59d4ed9acc908e483d081768946c088708caf5711 SHA512 2e95a3336f0b5687f525a5117daf6cd62da6c59fd6d96d508637a30ca5a0bc7a86a35bb21f09f29068e2ec940b859944838eec4c4a2412a3f3bf8320c3d9cfd5
 DIST MoarVM-2021.02.tar.gz 5451480 BLAKE2B a714b135296c309812719b7fb14e2ea999820599a23796403e6512952edba327e4f685fb5f8ec8ea3b5ef2fc12c4303a6077a71a5bc325cdd287e27cc87e3e01 SHA512 23f54c0746aec4b4b35adcb07eb7f8cc81751d3552ef537ed29353d3ff9d46544c495475cb2c147bb80cb0917e79216e142ee5cf643fa4e76f72caadb3354f1c
--- a/dev-lang/moarvm/moarvm-2020.12.ebuild
+++ b/dev-lang/moarvm/moarvm-2020.12.ebuild
@ -1,60 +0,0 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit flag-o-matic
 MY_PN="MoarVM"
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
 	inherit git-r3
 	S="${WORKDIR}/${P}"
 else
 	SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
 DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6"
 HOMEPAGE="http://moarvm.org"
 LICENSE="Artistic-2"
 SLOT="0"
 IUSE="asan clang debug doc +jit optimize static-libs ubsan"
 RDEPEND="dev-libs/libatomic_ops
 		>=dev-libs/libuv-1.26
 		dev-libs/libffi"
 DEPEND="${RDEPEND}
 	clang? ( >=sys-devel/clang-3.1 )
 	dev-lang/perl"
 DOCS=( CREDITS README.markdown )
 # Tests are conducted via nqp
 RESTRICT=test
 src_configure() {
 	MAKEOPTS+=" NOISY=1"
 	use doc && DOCS+=( docs/* )
 	local prefix="${EPREFIX}/usr"
 	local libdir="${EPREFIX}/usr/$(get_libdir)"
 	einfo "--prefix '${prefix}'"
 	einfo "--libdir '${libdir}'"
 	local myconfigargs=(
 		"--prefix" "${prefix}"
 		"--has-libuv"
 		"--has-libatomic_ops"
 		"--has-libffi"
 		"--libdir" "${libdir}"
 		"--compiler" "$(usex clang clang gcc)"
 		"$(usex asan        --asan)"
 		"$(usex debug       --debug            --no-debug)"
 		"$(usex optimize    --optimize=        --no-optimize)"
 		"$(usex static-libs --static)"
 		"$(usex ubsan       --ubsan)"
 	)
 	perl Configure.pl "${myconfigargs[@]}" moarshared || die
 }
--- a/dev-lang/moarvm/moarvm-2021.02.ebuild
+++ b/dev-lang/moarvm/moarvm-2021.02.ebuild
@ -1,60 +0,0 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit flag-o-matic
 MY_PN="MoarVM"
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
 	inherit git-r3
 	S="${WORKDIR}/${P}"
 else
 	SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
 DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6"
 HOMEPAGE="http://moarvm.org"
 LICENSE="Artistic-2"
 SLOT="0"
 IUSE="asan clang debug doc +jit optimize static-libs ubsan"
 RDEPEND="dev-libs/libatomic_ops
 		>=dev-libs/libuv-1.26
 		dev-libs/libffi"
 DEPEND="${RDEPEND}
 	clang? ( >=sys-devel/clang-3.1 )
 	dev-lang/perl"
 DOCS=( CREDITS README.markdown )
 # Tests are conducted via nqp
 RESTRICT=test
 src_configure() {
 	MAKEOPTS+=" NOISY=1"
 	use doc && DOCS+=( docs/* )
 	local prefix="${EPREFIX}/usr"
 	local libdir="${EPREFIX}/usr/$(get_libdir)"
 	einfo "--prefix '${prefix}'"
 	einfo "--libdir '${libdir}'"
 	local myconfigargs=(
 		"--prefix" "${prefix}"
 		"--has-libuv"
 		"--has-libatomic_ops"
 		"--has-libffi"
 		"--libdir" "${libdir}"
 		"--compiler" "$(usex clang clang gcc)"
 		"$(usex asan        --asan)"
 		"$(usex debug       --debug            --no-debug)"
 		"$(usex optimize    --optimize=        --no-optimize)"
 		"$(usex static-libs --static)"
 		"$(usex ubsan       --ubsan)"
 	)
 	perl Configure.pl "${myconfigargs[@]}" moarshared || die
 }
--- a/dev-lang/moarvm/moarvm-2021.06.ebuild
+++ b/dev-lang/moarvm/moarvm-2021.06.ebuild
--- a/dev-lang/nqp/Manifest
+++ b/dev-lang/nqp/Manifest
@ -1,3 +1 @@
-DIST nqp-2020.11.tar.gz 3954688 BLAKE2B d273c78c8f2083908b2815dc10787fec31404eb13c1e64253e7e5ae896d27a3755cf5c8045d47c4f465178568731e0d74951db6e45d103cf3ee18470124e97e0 SHA512 51b5e7f9d290bca7ada24cf9c12c61608be92269fc848976cada49f7445694e0f26929b5f9e90a9153eb379f0d74a6bb8068cd5ebf383d4501f75535b70e7605
+DIST nqp-2021.06.tar.gz 5208065 BLAKE2B 7314f425e418161befc55f9490453a3a4c3caa0ddf13e2b3bbcc9a20a6204aba9517885b6ecccddbbaf078b60c74be90fe556bf99dcc6014e57a7c873e96381d SHA512 482ec4a99d09b3660f03fd3c822a2f8c72dbdfeda1bcfdac0b4bcfa364ec57cbfdebf3b2872f8649c86d3d2d7603961d75e00d73dc417e5ac2a32f643bcfcabe
 DIST nqp-2020.12.tar.gz 3957981 BLAKE2B d45ad66ebb0788db6e7191b4b7af4093b73e63e5f66ab4ccab62163b0285adb7d4e18a7c906c34f99dd63e0920f4d6e16e11005eb5df1d726796e9f106f9c4f8 SHA512 4ce87dc868c91565ebe896db766403bb018b2f5ea919bd0fb5b173498ba124712ffa795ec4e219240e5aabb59c55285bee5e46d3ac3d5869fc445b0ab3ea8485
 DIST nqp-2021.02.tar.gz 3987077 BLAKE2B 3f67e33b948805a7c4dad1999e310d36da0cd8d4663b20ada5af6079c8ad2966c1f65e9f24c620f16480b7dea42a166f73fec61f3849e2cdd79b28ec017b0d7f SHA512 ff6cf66f4c1d9bccbd4cc5f52e49d380aaeef3fa060ced9e1da6c233e674fa90c08a5f1fa86e1a7beb5661d1271454934b520ba3e07e27cebaece343be84bdfe
--- a/dev-lang/nqp/nqp-2020.12.ebuild
+++ b/dev-lang/nqp/nqp-2020.12.ebuild
@ -1,159 +0,0 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit java-pkg-opt-2 multibuild
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/perl6/${PN}.git"
 	inherit git-r3
 else
 	SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
 HOMEPAGE="https://rakudo.org"
 LICENSE="Artistic-2"
 SLOT="0"
 IUSE="doc clang java +moar test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="|| ( java moar )"
 CDEPEND="java? (
 		dev-java/asm:4
 		dev-java/jline:0
 		dev-java/jna:4
 	)
 	moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
 RDEPEND="${CDEPEND}
 	java? ( >=virtual/jre-1.8 )"
 DEPEND="${CDEPEND}"
 BDEPEND="${CDEPEND}
 	clang? ( sys-devel/clang )
 	java? ( >=virtual/jdk-1.8 )
 	dev-lang/perl"
 pkg_pretend() {
 	if has_version dev-lang/rakudo || has_version dev-lang/nqp; then
 		ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP"
 		ewarn "already being installed. So if it fails, try uninstalling both"
 		ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation."
 		ewarn "(see Bug #584394)"
 	fi
 }
 java_prepare() {
 	# Don't clean stage0 jars.
 	einfo "Cleaning upstream jars"
 	java-pkg_clean 3rdparty/
 	# Don't use jars we just deleted.
 	sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \
 		src/vm/jvm/runners/nqp-j || die
 }
 src_prepare() {
 	MULTIBUILD_VARIANTS=()
 	use moar && MULTIBUILD_VARIANTS+=( moar )
 	use java && MULTIBUILD_VARIANTS+=( jvm )
 	multibuild_copy_sources
 	# This will pull in conditional java_prepare
 	default
 }
 nqp_configure() {
 	pushd "${BUILD_DIR}" > /dev/null || die
 	local myconfargs=(
 		"--backend=${MULTIBUILD_VARIANT}"
 		"--prefix=${EPREFIX}/usr" )
 	perl Configure.pl "${myconfargs[@]}" || die
 	popd || die
 }
 nqp_compile() {
 	if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then
 		emake -j1 \
 			-C "${BUILD_DIR}" \
 			THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \
 			JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
 	elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then
 		emake -j1 \
 			-C "${BUILD_DIR}"
 	fi
 }
 nqp_test() {
 	emake -j1 \
 		-C "${BUILD_DIR}" \
 		test
 }
 nqp_install() {
 	# This is the actual reason we need multibuild.eclass.
 	# We need to distinguish the install procedure for MoarVM and JVM backends.
 	case "${MULTIBUILD_VARIANT}" in
 		moar)
 			emake \
 				DESTDIR="${ED}" \
 				-C "${BUILD_DIR}" \
 				install
 			;;
 		jvm)
 			pushd "${BUILD_DIR}" > /dev/null || die
 			# Set JAVA_PKG_JARDEST early.
 			java-pkg_init_paths_
 			# Upstream sets the classpath to this location. Perhaps it's
 			# used to locate the additional libraries?
 			java-pkg_addcp "${JAVA_PKG_JARDEST}"
 			insinto "${JAVA_PKG_JARDEST}"
 			local jar
 			for jar in *.jar; do
 				if has ${jar} ${PN}.jar ${PN}-runtime.jar; then
 					# jars for NQP itself.
 					java-pkg_dojar ${jar}
 				else
 					# jars used by NQP.
 					doins ${jar}
 				fi
 			done
 			# Upstream uses -Xbootclasspath/a, which is faster due to lack
 			# of verification, but gjl isn't flexible enough yet. :(
 			java-pkg_dolauncher ${PN}-j --main ${PN}
 			dosym ${PN}-j /usr/bin/${PN}
 			dobin tools/jvm/eval-client.pl
 			popd > /dev/null || die
 			;;
 		*)
 			die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}."
 			;;
 	esac
 }
 src_configure() {
 	multibuild_foreach_variant nqp_configure
 }
 src_compile() {
 	multibuild_foreach_variant nqp_compile
 }
 src_test() {
 	multibuild_foreach_variant nqp_test
 }
 src_install() {
 	multibuild_foreach_variant nqp_install
 	dodoc CREDITS README.pod
 	use doc && dodoc -r docs/*
 }
--- a/dev-lang/nqp/nqp-2021.02.ebuild
+++ b/dev-lang/nqp/nqp-2021.02.ebuild
@ -1,159 +0,0 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit java-pkg-opt-2 multibuild
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/perl6/${PN}.git"
 	inherit git-r3
 else
 	SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
 HOMEPAGE="https://rakudo.org"
 LICENSE="Artistic-2"
 SLOT="0"
 IUSE="doc clang java +moar test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="|| ( java moar )"
 CDEPEND="java? (
 		dev-java/asm:4
 		dev-java/jline:0
 		dev-java/jna:4
 	)
 	moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
 RDEPEND="${CDEPEND}
 	java? ( >=virtual/jre-1.8 )"
 DEPEND="${CDEPEND}"
 BDEPEND="${CDEPEND}
 	clang? ( sys-devel/clang )
 	java? ( >=virtual/jdk-1.8 )
 	dev-lang/perl"
 pkg_pretend() {
 	if has_version dev-lang/rakudo || has_version dev-lang/nqp; then
 		ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP"
 		ewarn "already being installed. So if it fails, try uninstalling both"
 		ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation."
 		ewarn "(see Bug #584394)"
 	fi
 }
 java_prepare() {
 	# Don't clean stage0 jars.
 	einfo "Cleaning upstream jars"
 	java-pkg_clean 3rdparty/
 	# Don't use jars we just deleted.
 	sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \
 		src/vm/jvm/runners/nqp-j || die
 }
 src_prepare() {
 	MULTIBUILD_VARIANTS=()
 	use moar && MULTIBUILD_VARIANTS+=( moar )
 	use java && MULTIBUILD_VARIANTS+=( jvm )
 	multibuild_copy_sources
 	# This will pull in conditional java_prepare
 	default
 }
 nqp_configure() {
 	pushd "${BUILD_DIR}" > /dev/null || die
 	local myconfargs=(
 		"--backend=${MULTIBUILD_VARIANT}"
 		"--prefix=${EPREFIX}/usr" )
 	perl Configure.pl "${myconfargs[@]}" || die
 	popd || die
 }
 nqp_compile() {
 	if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then
 		emake -j1 \
 			-C "${BUILD_DIR}" \
 			THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \
 			JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
 	elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then
 		emake -j1 \
 			-C "${BUILD_DIR}"
 	fi
 }
 nqp_test() {
 	emake -j1 \
 		-C "${BUILD_DIR}" \
 		test
 }
 nqp_install() {
 	# This is the actual reason we need multibuild.eclass.
 	# We need to distinguish the install procedure for MoarVM and JVM backends.
 	case "${MULTIBUILD_VARIANT}" in
 		moar)
 			emake \
 				DESTDIR="${ED}" \
 				-C "${BUILD_DIR}" \
 				install
 			;;
 		jvm)
 			pushd "${BUILD_DIR}" > /dev/null || die
 			# Set JAVA_PKG_JARDEST early.
 			java-pkg_init_paths_
 			# Upstream sets the classpath to this location. Perhaps it's
 			# used to locate the additional libraries?
 			java-pkg_addcp "${JAVA_PKG_JARDEST}"
 			insinto "${JAVA_PKG_JARDEST}"
 			local jar
 			for jar in *.jar; do
 				if has ${jar} ${PN}.jar ${PN}-runtime.jar; then
 					# jars for NQP itself.
 					java-pkg_dojar ${jar}
 				else
 					# jars used by NQP.
 					doins ${jar}
 				fi
 			done
 			# Upstream uses -Xbootclasspath/a, which is faster due to lack
 			# of verification, but gjl isn't flexible enough yet. :(
 			java-pkg_dolauncher ${PN}-j --main ${PN}
 			dosym ${PN}-j /usr/bin/${PN}
 			dobin tools/jvm/eval-client.pl
 			popd > /dev/null || die
 			;;
 		*)
 			die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}."
 			;;
 	esac
 }
 src_configure() {
 	multibuild_foreach_variant nqp_configure
 }
 src_compile() {
 	multibuild_foreach_variant nqp_compile
 }
 src_test() {
 	multibuild_foreach_variant nqp_test
 }
 src_install() {
 	multibuild_foreach_variant nqp_install
 	dodoc CREDITS README.pod
 	use doc && dodoc -r docs/*
 }
--- a/dev-lang/nqp/nqp-2021.06.ebuild
+++ b/dev-lang/nqp/nqp-2021.06.ebuild
--- a/dev-lang/rakudo/Manifest
+++ b/dev-lang/rakudo/Manifest
@ -1,3 +1 @@
-DIST rakudo-2020.11.tar.gz 5678270 BLAKE2B 314da91b516d509fcfcfff16e46444243083bdeb21294bc33a2996f1883317b663cc3442cbb6090c8339c5607b4e64a4c8c3c9f2fa5d728bd5c6513d6ef20bcf SHA512 d6c0f7849570b82611db311445f6b60000ecf1c0773d1bb5f4da0d27a9e0d443149ab72f954da2e75a8323d9be9c31f655dee1183a8ca714d89c63baa6e2489e
+DIST rakudo-2021.06.tar.gz 5211187 BLAKE2B e6a73ada3bc7550ad9e2415374f8ecd9aeed021faf8bc52697c8d4bd1fc16782036fecf346f1b132f2d50b894f99ebca548e6e4209b1ff643a045679415ae3fd SHA512 1141979c63a5128919d24c4660cff8011fade12487bd7f437dbaeb6d121ab2d93e42022227ad47d6d840ddb12118c9f1cde8285d87677ff88b135c4e9f079ecc
 DIST rakudo-2020.12.tar.gz 5690849 BLAKE2B 2f2bae068419279346d4dd49b734221d9a8bbeaac94b8fd44f03812ed33fbf8d4e096ba768388cb56571970d41f8ef319bf12d1f33a1cf36fe3ebb7ec6da40be SHA512 dfb94d1c8f75ec16e0149a37b57a9d9fc80ddaf256526edd3d3a23c0435881a187efbe88fd95a2174a9e9d93820987e561bb77745c7492e7ac50eb72879b4ab8
 DIST rakudo-2021.02.tar.gz 7530228 BLAKE2B 9b70b737abfe18ea43aea4c45d965567357ef811ab719b9013b8e31e610c91e2868dcdb978abe7a62a5e375ea81e1f914d8031b36c5947f73d32824c12f83dd2 SHA512 067abbc2d9f11251486c30aa70a7961f0864dd08aac12aaadf47c5d019066fb38433b2bcc27f5f70a50f6d213462df9fe6631c22e6ea0148f348659fb5030329
--- a/dev-lang/rakudo/rakudo-2020.11.ebuild
+++ b/dev-lang/rakudo/rakudo-2020.11.ebuild
@ -1,72 +0,0 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit java-pkg-opt-2
 DESCRIPTION="A compiler for the Perl 6 programming language"
 HOMEPAGE="https://rakudo.org"
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/rakudo/${PN}.git"
 	inherit git-r3
 else
 	SRC_URI="https://rakudo.org/dl/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 LICENSE="Artistic-2"
 SLOT="0"
 # TODO: add USE="javascript" once that's usable in nqp
 IUSE="clang java +moar test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="|| ( java moar )"
 CDEPEND="~dev-lang/nqp-${PV}:${SLOT}=[java?,moar?,clang=]"
 RDEPEND="${CDEPEND}
 	java? ( >=virtual/jre-1.7 )"
 DEPEND="${CDEPEND}
 	clang? ( sys-devel/clang )
 	java? ( >=virtual/jdk-1.7 )
 	>=dev-lang/perl-5.10"
 pkg_pretend() {
 	if has_version dev-lang/rakudo; then
 		ewarn "Rakudo is known to fail compilation/installation with Rakudo"
 		ewarn "already being installed. So if it fails, try unmerging dev-lang/rakudo,"
 		ewarn "then do a new installation."
 		ewarn "(see Bug #584394)"
 	fi
 }
 src_configure() {
 	local backends
 	use moar && backends+="moar,"
 	use java && backends+="jvm"
 	local myargs=(
 		"--prefix=/usr"
 		"--sysroot=/"
 		"--sdkroot=/"
 		"--backends=${backends}"
 	)
 	perl Configure.pl "${myargs[@]}" || die
 	if use java; then
 		NQP=$(java-pkg_getjars --with-dependencies nqp)
 	fi
 }
 src_compile() {
 	emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}"
 }
 src_install() {
 	emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" install
 }
 src_test() {
 	RAKUDO_PRECOMP_PREFIX=$(mktemp -d) default
 }
--- a/dev-lang/rakudo/rakudo-2020.12.ebuild
+++ b/dev-lang/rakudo/rakudo-2020.12.ebuild
@ -1,72 +0,0 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit java-pkg-opt-2
 DESCRIPTION="A compiler for the Perl 6 programming language"
 HOMEPAGE="https://rakudo.org"
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/rakudo/${PN}.git"
 	inherit git-r3
 else
 	SRC_URI="https://rakudo.org/dl/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 LICENSE="Artistic-2"
 SLOT="0"
 # TODO: add USE="javascript" once that's usable in nqp
 IUSE="clang java +moar test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="|| ( java moar )"
 CDEPEND="~dev-lang/nqp-${PV}:${SLOT}=[java?,moar?,clang=]"
 RDEPEND="${CDEPEND}
 	java? ( >=virtual/jre-1.7 )"
 DEPEND="${CDEPEND}
 	clang? ( sys-devel/clang )
 	java? ( >=virtual/jdk-1.7 )
 	>=dev-lang/perl-5.10"
 pkg_pretend() {
 	if has_version dev-lang/rakudo; then
 		ewarn "Rakudo is known to fail compilation/installation with Rakudo"
 		ewarn "already being installed. So if it fails, try unmerging dev-lang/rakudo,"
 		ewarn "then do a new installation."
 		ewarn "(see Bug #584394)"
 	fi
 }
 src_configure() {
 	local backends
 	use moar && backends+="moar,"
 	use java && backends+="jvm"
 	local myargs=(
 		"--prefix=/usr"
 		"--sysroot=/"
 		"--sdkroot=/"
 		"--backends=${backends}"
 	)
 	perl Configure.pl "${myargs[@]}" || die
 	if use java; then
 		NQP=$(java-pkg_getjars --with-dependencies nqp)
 	fi
 }
 src_compile() {
 	emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}"
 }
 src_install() {
 	emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" install
 }
 src_test() {
 	RAKUDO_PRECOMP_PREFIX=$(mktemp -d) default
 }
--- a/dev-lang/rakudo/rakudo-2021.06.ebuild
+++ b/dev-lang/rakudo/rakudo-2021.06.ebuild
@ -60,7 +60,7 @@ src_configure() {
 }
 src_compile() {
-	emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}"
+	emake NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}"
 }
 src_install() {
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/link-grammar/Manifest
+++ b/dev-libs/link-grammar/Manifest
@ -1,2 +1,3 @@
 DIST link-grammar-5.8.0.tar.gz 3782125 BLAKE2B 8027e91212d3269b8e3ceaa5c837ad961cd2dfd92849d3989094ab771d97d30f4b228cfc1e32e9e843676aa439d790fb444823f7db69004538ad068c7bf28a45 SHA512 1262e2faf1de6f05a62f9d622f43c02253b4c241342df9b443a70ae04bd328d1fc49cd2f91c881e694f67215005833fec8b1fa9d395b1e547985b376c7415d2e
 DIST link-grammar-5.8.1.tar.gz 3791847 BLAKE2B 8c89b95eaae87f0b576374c3f8c00529d61b62004718424d1ac1a41b694d8b56ba75d0a7068e1411376c260781f5adae8512976a6572e54f18d84abe98c1839e SHA512 0ef99d3ccb3d922a946f1f73b8b81cee9ece156886dab3367837e1e9f79944967da1391daf7f96ea5a95a0abdd346b642111a7939eb9aa079557c10b3efe8022
 DIST link-grammar-5.9.1.tar.gz 3809872 BLAKE2B fe0c407e2e4ea4201036647cbea7d4c2606fa9943653fcc2d3505963a00773006912b8af5c2762acf498220d2f48319a031736d59790c0fed616432973ea24ec SHA512 c8d8bc99ddd6f6190ebcb24fcafc79497c3eeab1deb3099691f55c735a0a607a8372a8dca5cd86ce7c20cd3a45e4f1cbf91bef39dc781a5b5a2246006b4f601e
--- a/dev-libs/link-grammar/link-grammar-5.9.1.ebuild
+++ b/dev-libs/link-grammar/link-grammar-5.9.1.ebuild
@ -0,0 +1,123 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{7..9} )
 inherit autotools java-pkg-opt-2 python-r1 out-of-source
 DESCRIPTION="A Syntactic English parser"
 HOMEPAGE="https://www.abisource.com/projects/link-grammar/ https://www.link.cs.cmu.edu/link/"
 SRC_URI="https://www.abisource.com/downloads/${PN}/${PV}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0/5"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="aspell +hunspell java python" # pcre
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # XXX: sqlite is automagic
 # Does not build with >=sci-mathematics/minisat-2, bug #593662
 # add pcre support: pcre? ( dev-libs/libpcre )
 RDEPEND="
 	dev-db/sqlite:3
 	aspell? ( app-text/aspell )
 	hunspell? ( app-text/hunspell )
 	java? (
 		>=virtual/jdk-1.6:*
 		dev-java/ant-core
 	)
 	python? ( ${PYTHON_DEPS} )
 	!sci-mathematics/minisat"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-lang/swig:0
 	sys-devel/autoconf-archive
 	virtual/pkgconfig"
 pkg_setup() {
 	if use aspell && use hunspell; then
 		ewarn "You have enabled 'aspell' and 'hunspell' support, but both cannot coexist,"
 		ewarn "only hunspell will be built. Press Ctrl+C and set only 'aspell' USE flag if"
 		ewarn "you want aspell support."
 	fi
 	use java && java-pkg-opt-2_pkg_setup
 }
 src_prepare() {
 	default
 	use java && java-pkg-opt-2_src_prepare
 	eapply "${FILESDIR}"/${PN}-5.8.1-lld.patch
 	eautoreconf
 }
 my_src_configure() {
 	local myconf=(
 		--disable-maintainer-mode
 		--disable-editline
 		--disable-perl-bindings
 		--disable-static
 		--enable-sat-solver=bundled
 		$(use_enable aspell)
 		$(use_enable hunspell)
 		$(usex hunspell --with-hunspell-dictdir="${EPREFIX}"/usr/share/myspell '')
 		$(use_enable java java-bindings)
 		# $(use_enable pcre regex-tokenizer)
 		# $(use_with pcre)
 	)
 	econf \
 		--disable-python-bindings \
 		"${myconf[@]}"
 	if use python; then
 		python_configure() {
 			econf \
 				--enable-python-bindings \
 				"${myconf[@]}"
 		}
 		python_foreach_impl run_in_build_dir python_configure
 	fi
 }
 my_src_compile() {
 	local -x MAIN_BUILD_DIR="${BUILD_DIR}"
 	default
 	if use python; then
 		python_compile() {
 			emake -C bindings/python \
 				VPATH="${S}:${MAIN_BUILD_DIR}" \
 				_clinkgrammar_la_DEPENDENCIES="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \
 				_clinkgrammar_la_LIBADD="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la
 		}
 		python_foreach_impl run_in_build_dir python_compile
 	fi
 }
 my_src_install() {
 	local -x MAIN_BUILD_DIR="${BUILD_DIR}"
 	default
 	if use python; then
 		python_install() {
 			emake -C bindings/python \
 				VPATH="${S}:${MAIN_BUILD_DIR}" \
 				_clinkgrammar_la_DEPENDENCIES="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \
 				_clinkgrammar_la_LIBADD="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \
 				DESTDIR="${D}" \
 				install
 		}
 		python_foreach_impl run_in_build_dir python_install
 	fi
 	# no static archives
 	find "${ED}" -name '*.la' -delete || die
 }
 pkg_preinst() {
 	use java && java-pkg-opt-2_pkg_preinst
 }
--- a/dev-libs/opencl-icd-loader/Manifest
+++ b/dev-libs/opencl-icd-loader/Manifest
@ -1,2 +1 @@
 DIST opencl-icd-loader-2020.06.16.tar.gz 60478 BLAKE2B e80bb051868842356a22141dc624a93a9e473673dc5b78e01d54b76c309c1deea256ae1fdf1e1777ea8842ffc33d3b92ab8b6fbe64454cbbf2ea0306523f0bfd SHA512 3cba77a0334976e27aeb60f3f29919b7b8e70ed1ea1d53e278a2873149a6b291323b19292e7a51a1decb27b304395ced22d400c1f750088f8a006c21d42fe94c
 DIST opencl-icd-loader-2021.04.29.tar.gz 81650 BLAKE2B 399aa3cf3b3fd5fa5bef94302face8630f7b3485c01000960687f77c823311a28f9f867f929c4c03ec873b724ae02e1ecbbe974fe3ddddf4334064609cb61b51 SHA512 4b57a168fe75cced8162e173bc1f5d32fd11285a0443478f938ace1b88f6422007d05ab6bfb272a28838129122ffcd98d33634a55e82b9df84be0b6d4e609178
--- a/dev-libs/opencl-icd-loader/opencl-icd-loader-2020.06.16.ebuild
+++ b/dev-libs/opencl-icd-loader/opencl-icd-loader-2020.06.16.ebuild
@ -1,50 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 CMAKE_ECLASS=cmake
 inherit cmake-multilib flag-o-matic
 MY_PN="OpenCL-ICD-Loader"
 MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Official Khronos OpenCL ICD Loader"
 HOMEPAGE="https://github.com/KhronosGroup/OpenCL-ICD-Loader"
 SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 DEPEND="dev-util/opencl-headers
 	!app-eselect/eselect-opencl
 	!dev-libs/ocl-icd"
 RDEPEND="${DEPEND}"
 S="${WORKDIR}/${MY_P}"
 src_prepare() {
 	# Until the next upstream release. Bug #716410
 	if use test; then
 		append-cflags $(test-flags-CC -fcommon)
 	fi
 	cmake_src_prepare
 }
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTING=$(usex test)
 		-DOPENCL_ICD_LOADER_HEADERS_DIR="${EPREFIX}/usr/include"
 	)
 	cmake_src_configure
 }
 multilib_src_test() {
 	OCL_ICD_FILENAMES="${BUILD_DIR}/test/driver_stub/libOpenCLDriverStub.so" \
 	cmake_src_test
 }
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
--- a/dev-lua/lualdap/Manifest
+++ b/dev-lua/lualdap/Manifest
@ -1,2 +1 @@
-DIST lua-compat-5.3-0.10.tar.gz 53695 BLAKE2B e570aedb23b8ed7ca38c4316ffab25b93a0f9f6f0fae79af563ca8a81dd6453ac273e1f9e70674c484a2dec68749e7d53a1c1736a72616c210b8e38a31b3f191 SHA512 f7f39085f4f6b16095f41e635b4c5477b3dab5e42b5b65a9d522941a3807ea521d4a27a77293a3c9d0ecea78a1f6c2a2497394b2d220f4d7d65e23510563d46d
+DIST lualdap-1.3.0.tar.gz 81987 BLAKE2B cd25cada91a3c330fb72ee1106298442c64b1bcae4a57f48937efb4311f70b53c5a0e96587caab4b1950b16d9957bb8c25b2b9e0d3753089f06fbae64180ff04 SHA512 dea4282928c5138a327cd97d3d8049341fac17b5e853440f5b0a6e115e3400bac908f24827d48e36bfe81720c7d2bacdc50ae189953ecbcdfb27cb23b78d0de8
 DIST lualdap-1.2.6.tar.gz 92669 BLAKE2B 49b4c8e639ff109e32321fa5a6313dcb6e83b76d1e5220b59d7297cc19d106233a2d05ff8fc43162ad242d3134700a9abe8fe8f4bcbd90a3f8f0217217decfaa SHA512 e32010caa8efea5c23f2a595bd6a339267ecd08cf23e39389005bf8e499d6bad63771d0c7faf3ab5b8f670ba22bb15bf7ae691ed67920e86d8ed2c5649d7a079
--- a/dev-lua/lualdap/lualdap-1.3.0.ebuild
+++ b/dev-lua/lualdap/lualdap-1.3.0.ebuild
@ -4,18 +4,12 @@
 EAPI=7
 LUA_COMPAT=( lua5-{1..4} luajit )
 MY_PN_LUACOMPAT="lua-compat-5.3"
 MY_PV_LUACOMPAT="0.10"
 MY_P_LUACOMPAT="${MY_PN_LUACOMPAT}-${MY_PV_LUACOMPAT}"
 inherit lua toolchain-funcs
 DESCRIPTION="A lua binding for the OpenLDAP client libraries"
 HOMEPAGE="https://github.com/lualdap/lualdap"
-SRC_URI="
+SRC_URI="https://github.com/lualdap/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	https://github.com/lualdap/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	https://github.com/keplerproject/${MY_PN_LUACOMPAT}/archive/v${MY_PV_LUACOMPAT}.tar.gz -> ${MY_P_LUACOMPAT}.tar.gz
 "
 LICENSE="MIT"
 SLOT="0"
@ -39,9 +33,6 @@ HTML_DOCS=( "docs/." )
 src_prepare() {
 	default
 	# Copy current lua-compat-5.3 files to support lua5-4
 	cp ../${MY_P_LUACOMPAT}/c-api/* src || die
 	lua_copy_sources
 }
--- a/dev-perl/HTTP-Entity-Parser/HTTP-Entity-Parser-0.250.0-r1.ebuild
+++ b/dev-perl/HTTP-Entity-Parser/HTTP-Entity-Parser-0.250.0-r1.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
 DIST_AUTHOR=KAZEBURO
 DIST_VERSION=0.25
@ -11,8 +11,7 @@ inherit perl-module
 DESCRIPTION="PSGI compliant HTTP Entity Parser"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test +xs"
+IUSE="+xs"
 RESTRICT="!test? ( test )"
 RDEPEND="
 	virtual/perl-Encode
@ -25,7 +24,7 @@ RDEPEND="
 	>=dev-perl/WWW-Form-UrlEncoded-0.230.0
 	xs? ( >=dev-perl/WWW-Form-UrlEncoded-XS-0.230.0 )
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	>=dev-perl/Module-Build-Tiny-0.35.0
 	test? (
 		virtual/perl-File-Spec
--- a/dev-perl/IO-Handle-Util/IO-Handle-Util-0.20.0.ebuild
+++ b/dev-perl/IO-Handle-Util/IO-Handle-Util-0.20.0.ebuild
@ -19,7 +19,7 @@ RDEPEND="
 	virtual/perl-parent
 "
 BDEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
+	>=dev-perl/Module-Build-Tiny-0.34.0
 	test? (
 		virtual/perl-File-Spec
 		>=virtual/perl-Test-Simple-1.1.10
--- a/dev-perl/IPC-Shareable/IPC-Shareable-1.0.0.ebuild
+++ b/dev-perl/IPC-Shareable/IPC-Shareable-1.0.0.ebuild
@ -19,3 +19,6 @@ BDEPEND="${RDEPEND}
 	>=virtual/perl-ExtUtils-MakeMaker-6.720.0
 	test? ( dev-perl/Test-SharedFork )
 "
 # tests fail when running parallelized, see bug 797445
 DIST_TEST=do
--- a/dev-perl/Lingua-EN-Inflect/Lingua-EN-Inflect-1.905.0.ebuild
+++ b/dev-perl/Lingua-EN-Inflect/Lingua-EN-Inflect-1.905.0.ebuild
@ -0,0 +1,14 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 DIST_AUTHOR=DCONWAY
 DIST_VERSION=1.905
 DIST_EXAMPLES=("demo/*")
 inherit perl-module
 DESCRIPTION="Perl module to pluralize English words"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
--- a/dev-perl/Lingua-EN-Inflect/Manifest
+++ b/dev-perl/Lingua-EN-Inflect/Manifest
@ -1 +1,2 @@
 DIST Lingua-EN-Inflect-1.902.tar.gz 59582 BLAKE2B c5f3b4a21062ad29551bfcfa9979038bc7be4cdc95aecb51b07912e5b30b83cceb350480e7478940fccd07660a6ae1040cda4ad1cc498baada7a32ac812293db SHA512 8fb64f67312ca09fe763a266b196c47e98e5c5f1b4ff76a41bac0d422be3b0405c155f46bc04dd134adcdc3c38a93e2b0cf69fea3acde6d111dbafac0247c39e
 DIST Lingua-EN-Inflect-1.905.tar.gz 59715 BLAKE2B 752d45125630c5df71b94d92575f9dd9e14a22964f2b63ecb7682edb2e71197dc7a8d121dc386db7d1cf29ac12de8401d46d2c14cdfb6d18f3063f6c8148d97e SHA512 394671c4a645edd426d3f8d7b3980aac10345b68f9c7d2558f46ec3b7ffadad86138c5f27d3afd64e2c193c6d20a537f179ff01aa40a84cd1cee718e4afde42b
--- a/dev-perl/Lingua-EN-NameCase/Lingua-EN-NameCase-1.210.0.ebuild
+++ b/dev-perl/Lingua-EN-NameCase/Lingua-EN-NameCase-1.210.0.ebuild
@ -0,0 +1,30 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 DIST_AUTHOR=NHORNE
 DIST_VERSION=1.21
 inherit perl-module
 DESCRIPTION="Correctly case a person's name from UPERCASE or lowcase"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 RDEPEND="
 	virtual/perl-Carp
 	virtual/perl-Exporter
 "
 BDEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 	test? (
 		virtual/perl-IO
 		>=virtual/perl-Test-Simple-0.700.0
 	)
 "
 src_test() {
 	perl_rm_files t/9{0,1,4,5,6}*.t
 	perl-module_src_test
 }
--- a/dev-perl/Lingua-EN-NameCase/Manifest
+++ b/dev-perl/Lingua-EN-NameCase/Manifest
@ -1 +1,2 @@
 DIST Lingua-EN-NameCase-1.19.tar.gz 10637 BLAKE2B 907fffaacf1d201b50a87d0edea6273ccf1f096e8dfd5d8d49be048085fe1037357527aeceff45078514de60990f24d3c10c044d427ab6d7f7c1f9defa274907 SHA512 8613414b43b138d4f7103b0e4f809108b87453c055d18f430f97d8cb1cc2aaa27669903604e98258b8fe39a5827d338d90ba70a3f275dcb4e1710d58b4282f76
 DIST Lingua-EN-NameCase-1.21.tar.gz 12160 BLAKE2B a3f519b2a26dbaf6764e53c11890c098519079183fcdd7c9e727c1cc3e750859c4c6a48186272ab0780a279b6812f6e39e06d9e8b211be46c646ab905de855e4 SHA512 1d510b1736b33ec1c0873eaa28b637f23d62811935512c1428b6bf6ad2b500c8cb4c09161870735bffff0f919eae4ac2feb660b1a6f68a9e2cb29e5c92fe2de3
--- a/dev-perl/Lingua-EN-NameParse/Lingua-EN-NameParse-1.380.0.ebuild
+++ b/dev-perl/Lingua-EN-NameParse/Lingua-EN-NameParse-1.380.0.ebuild
@ -0,0 +1,26 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 DIST_AUTHOR=KIMRYAN
 DIST_VERSION=1.38
 DIST_EXAMPLES=("examples/*")
 inherit perl-module
 DESCRIPTION="Routines for manipulating a person's name"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 RDEPEND="
 	>=dev-perl/Parse-RecDescent-1
 "
 BDEPEND="${RDEPEND}
 	>=dev-perl/Module-Build-0.380.0
 	test? (
 		>=virtual/perl-Test-Simple-0.940.0
 	)
 "
 PERL_RM_FILES=( t/pod.t t/pod-coverage.t )
--- a/dev-perl/Lingua-EN-NameParse/Manifest
+++ b/dev-perl/Lingua-EN-NameParse/Manifest
@ -1 +1,2 @@
 DIST Lingua-EN-NameParse-1.36.tar.gz 35648 BLAKE2B bc75b33b889977f1b14c4b68c79397607b8f6752b02d7f6e3e5d55a8e3a42a333d12b9f0ccfa078af35e5c59a88c780428621f8a57d2d78b4bb233b68376b775 SHA512 d82b6d5a7813dae5dafd36e5ae521792b3477757e918cac9ccff985afd0b3018a390c04cab39bf0d4b0cec9307941901d1aaa35febc650c25f85e8c77b03211e
 DIST Lingua-EN-NameParse-1.38.tar.gz 35857 BLAKE2B c1de7d612a4f5b4c34edebcc0ec46f22947ee9eb9e62a676e99a6ee267b8baa3a0f650394168b05a3b116534bd3cb17ab88e39f41bd269b0f0db64344d0874de SHA512 7c2ca5282f6a57d13e9592395290d8f84b77e51e3c96204a4eb0d533cd30383549bbb0e862b6a1aca97e36a17e2c51e599b2bbe2ed673f705505d871d07a5f55
--- a/dev-perl/Lingua-EN-Numbers-Ordinate/Lingua-EN-Numbers-Ordinate-1.50.0.ebuild
+++ b/dev-perl/Lingua-EN-Numbers-Ordinate/Lingua-EN-Numbers-Ordinate-1.50.0.ebuild
@ -0,0 +1,21 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 DIST_AUTHOR=NEILB
 DIST_VERSION=1.05
 inherit perl-module
 DESCRIPTION="Convert cardinal numbers(3) to ordinal numbers(3rd)"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
 RDEPEND="
 	virtual/perl-Exporter
 "
 BDEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 	test? ( >=virtual/perl-Test-Simple-0.880.0 )
 "
--- a/dev-perl/Lingua-EN-Numbers-Ordinate/Manifest
+++ b/dev-perl/Lingua-EN-Numbers-Ordinate/Manifest
@ -1 +1,2 @@
 DIST Lingua-EN-Numbers-Ordinate-1.04.tar.gz 12019 BLAKE2B 9f019c096c165cd1417ffd674b1ba92334cc50bda1b789c47909d437c0ae1b1efd2084d81de10ac9400a63f94d85a9465d14601b1c2ca4133b9f670f570adadb SHA512 f8f5cbfc9ae1d7b4e5e134c8fb089f6ec4ecfd90e0168ece874b007ae8b74936e5aecc38344c036c0845ab7a8c192d07c5a2cdad8f96176c71e89e2e4ae1211e
 DIST Lingua-EN-Numbers-Ordinate-1.05.tar.gz 12093 BLAKE2B 64a86f2f86b8f99b2e473c3780a2735f236c738ce4758c09be1f20f316a138abba7f797805bdd3bda0f03c147b7900506bc06ede061cfe1cf680a0ca84ddde30 SHA512 ff9d2b49e933c3975ce4598a2ac4719c52a2c3e07e3ff6bc82cdb43ec05a63e1c2931d49e23e526aee75cb1a3c368e7692459f6d6487f16dc3b6c36ee9a8337e
--- a/dev-perl/Lingua-Preferred/Lingua-Preferred-0.2.4-r2.ebuild
+++ b/dev-perl/Lingua-Preferred/Lingua-Preferred-0.2.4-r2.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=5
+EAPI=7
-MODULE_AUTHOR=EDAVIS
+DIST_AUTHOR=EDAVIS
 inherit perl-module
 DESCRIPTION="Pick a language based on user's preferences"
@ -11,9 +11,6 @@ DESCRIPTION="Pick a language based on user's preferences"
 SLOT="0"
 LICENSE="|| ( Artistic GPL-2+ )"
 KEYWORDS="amd64 ~arm ~arm64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 RDEPEND="dev-perl/Log-TraceMessages"
-DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}"
 SRC_TEST="do parallel"
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
--- a/dev-python/aiodns/aiodns-3.0.0.ebuild
+++ b/dev-python/aiodns/aiodns-3.0.0.ebuild
@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE=""
 # Tests fail with network-sandbox, since they try to resolve google.com
 PROPERTIES="test_network"
--- a/dev-python/cfgv/Manifest
+++ b/dev-python/cfgv/Manifest
@ -1,2 +1 @@
 DIST cfgv-3.2.0.tar.gz 10268 BLAKE2B 26cd22c1ed7b0de48638d2bb0e30a4ac0c3060d5020d04c29ca5c41c1337531d16a1c7de6e66044e90c3b0dbd5f4b15ba6c3dda2ae73953b8d6be3f74825b813 SHA512 6f1a54b505d298a9806a739edffc79feea41638f766ddc25f0712001e5bceb206153e3a957dcf4909fbe125b6e9bd077aba6317d00e632a06ed24f1dfd06c555
 DIST cfgv-3.3.0.tar.gz 10393 BLAKE2B d4cf565884aaab6a81716382ba8e3244e36a3381b771f7e206053fa80500205bd3b70b62b611ce4a7f0cb143a763d51eb10b1e29333b7f06e29cb406f9f7f6b8 SHA512 23a238c76635404b150bbc3bb1eafd8eb521171e69bb3f3fee55a0a24c12d2ee152cc7453a41952d2f41a6cb72575dacf4b990dbd443f69026a770c87a1e081f
--- a/dev-python/cfgv/cfgv-3.2.0.ebuild
+++ b/dev-python/cfgv/cfgv-3.2.0.ebuild
@ -1,18 +0,0 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 DESCRIPTION="Validate configuration and produce human-readable error messages"
 HOMEPAGE="https://github.com/asottile/cfgv"
 SRC_URI="https://github.com/asottile/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64"
 distutils_enable_tests pytest
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.50.0.ebuild
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.50.0.ebuild
@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 RDEPEND="
 	>=dev-python/aws-sam-translator-1.35.0[${PYTHON_USEDEP}]
--- a/dev-python/css-parser/css-parser-1.0.6.ebuild
+++ b/dev-python/css-parser/css-parser-1.0.6.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
--- a/dev-python/css-parser/metadata.xml
+++ b/dev-python/css-parser/metadata.xml
@ -4,6 +4,7 @@
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">ebook-utils/css-parser</remote-id>
 		<remote-id type="pypi">css-parser</remote-id>
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@ -1,3 +1,4 @@
 DIST dask-2021.5.0.tar.gz 3710206 BLAKE2B d02bd280a704cf03fb403c58567be33c414171ef3ee1eed2f788cf2b3026c2aa3806c19a8e9f239c93a0eb8ab2474f14fa80b8e1057ae0db1c0ce4a68f0cedad SHA512 bfc2c870df02f1879907621cb9abdce8bf03d07fea2823acea68b220ed414ee146036b73eb50c92608140ed18566e7a53807dcc1fdf534876920467979908592
 DIST dask-2021.6.0.tar.gz 3717136 BLAKE2B bc524dc4e885588ea92c0b24b6abe917b6a3989f7faa21d4dffa490f2952f4f7e90ce55e28ed97b34e44bf2c41a753fe80f092559999fa42e450b289c4b89933 SHA512 a4a1e86c286e0796f7ed79dd10c5c0f80e40bb246a7c25d45aed5e73a2d6c1da8743bf6b61ca784a8412403aa6e62007c937bbbdd8ffccf7170443454ff5601d
 DIST dask-2021.6.1.tar.gz 3725331 BLAKE2B 7b466507b968dafd2c6f3a3db70c3f557ed877bd489067ff5243794c44a9e77f9b72b4a000eb0865d2096845b3c6005739214bed1215ae053d9d1c313c6bb52c SHA512 c3c032ae8d67994cb924e23787a571ad75ac88ee682542aa486dd76b38ba25c809593e9bb11a716589eeea437aaf8b69a4ecdf676c417fe566d92a2b1a8678b6
 DIST dask-2021.6.2.tar.gz 3725731 BLAKE2B 957cf70c328462c87eb52bb2fe3d471705ab6bbc233badb8d5ba93ade4b7caa05e47399f26f37b69213df16e76fdf8f042a082a0d2d96797bca836311349a6b3 SHA512 2949a0a028d08794936faaeeea3b36c97ac1492288519efa0fd1e6bbb9b5b52b730657b8b342a47ca0183d98e9179836423847670fc12c14be0890daa4b773b4
--- a/dev-python/dask/dask-2021.6.2.ebuild
+++ b/dev-python/dask/dask-2021.6.2.ebuild
@ -0,0 +1,42 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{8..9} )
 inherit distutils-r1
 DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
 HOMEPAGE="https://dask.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 RDEPEND="
 	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
 	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
 	>=dev-python/numpy-1.15.1[${PYTHON_USEDEP}]
 	>=dev-python/pandas-0.25.0[${PYTHON_USEDEP}]
 	>=dev-python/partd-0.3.10[${PYTHON_USEDEP}]
 	dev-python/psutil[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	dev-python/toolz[${PYTHON_USEDEP}]
 	test? (
 		dev-python/moto[${PYTHON_USEDEP}]
 		dev-python/numexpr[${PYTHON_USEDEP}]
 		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
 		dev-python/scipy[${PYTHON_USEDEP}]
 		<dev-python/sqlalchemy-1.4[${PYTHON_USEDEP}]
 	)
 "
 distutils_enable_tests pytest
 python_test() {
 	epytest -p no:flaky -m "not network"
 }
--- a/dev-python/decorator/decorator-5.0.9.ebuild
+++ b/dev-python/decorator/decorator-5.0.9.ebuild
@ -12,7 +12,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 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 DOCS=( CHANGES.md )
--- a/dev-python/dogpile-cache/dogpile-cache-1.1.3.ebuild
+++ b/dev-python/dogpile-cache/dogpile-cache-1.1.3.ebuild
@ -14,7 +14,7 @@ S="${WORKDIR}/dogpile.cache-${PV}"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 RDEPEND="
 	>=dev-python/decorator-4.0.0[${PYTHON_USEDEP}]
--- a/dev-python/ewmh/Manifest
+++ b/dev-python/ewmh/Manifest
@ -0,0 +1 @@
 DIST ewmh-0.1.6.tar.gz 13065 BLAKE2B ba26d28f8976792b07e0bb200e1a2edcd7a04442bd17606a5d786ca41f01f4f3f96243134dde638fa228e49b79556d6ccbf25cf032c278e0b5233557746f34e9 SHA512 96c498cbd45bf03dca8b0c982cbb7e5644b00ce35b49df6abf119d36a18c08f907b635fc0ab12493d6351ba2c6645c75440d7c92d09d6feb06f6121bfd41391b
--- a/dev-python/ewmh/ewmh-0.1.6.ebuild
+++ b/dev-python/ewmh/ewmh-0.1.6.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_{8..10} )
 inherit distutils-r1
 DESCRIPTION="An implementation of Extended Window Manager Hints, based on Xlib"
 HOMEPAGE="https://github.com/parkouss/pyewmh https://pypi.python.org/pypi/ewmh"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="LGPL-3"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
 RDEPEND="dev-python/python-xlib[${PYTHON_USEDEP}]"
--- a/dev-python/ewmh/metadata.xml
+++ b/dev-python/ewmh/metadata.xml
@ -0,0 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>flow@gentoo.org</email>
 		<name>Florian Schmaus</name>
 	</maintainer>
 	<longdescription>
 		An implementation of EWMH (Extended Window Manager Hints) for python 2 and 3, based on Xlib.
 		It allows EWMH-compliant window managers (most modern WMs) to be queried and controlled.
 	</longdescription>
 </pkgmetadata>
--- a/dev-python/fields/fields-5.0.0-r2.ebuild
+++ b/dev-python/fields/fields-5.0.0-r2.ebuild
@ -1,11 +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
-DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 PYTHON_COMPAT=( python3_{7..9} pypy3 )
 inherit distutils-r1
 DESCRIPTION="Container class boilerplate killer"
@ -28,9 +26,11 @@ python_prepare_all() {
 	sed -r \
 		-e "/--benchmark-disable/d" \
 		-e 's|\[pytest\]|\[tool:pytest\]|' \
 		-e '/^[[:space:]]*--doctest-modules[[:space:]]*$/ d' \
 		-i setup.cfg || die
 	rm -rf tests/test_perf.py || die
 	distutils-r1_python_prepare_all
 }
 python_test() {
 	epytest --ignore tests/test_perf.py tests
 }
--- a/dev-python/flask-restful/flask-restful-0.3.9.ebuild
+++ b/dev-python/flask-restful/flask-restful-0.3.9.ebuild
@ -17,7 +17,7 @@ SRC_URI="
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="examples"
 RDEPEND="
--- a/dev-python/fonttools/metadata.xml
+++ b/dev-python/fonttools/metadata.xml
@ -5,7 +5,6 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">fonttools/fonttools</remote-id>
 		<remote-id type="pypi">fonttools</remote-id>
--- a/dev-python/google-api-core/google-api-core-1.28.0.ebuild
+++ b/dev-python/google-api-core/google-api-core-1.28.0.ebuild
@ -15,7 +15,7 @@ S="${WORKDIR}/${P//google/python}"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 RDEPEND="
 	dev-python/namespace-google[${PYTHON_USEDEP}]
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@ -1,3 +1,4 @@
 DIST google-api-python-client-2.10.0.tar.gz 25252980 BLAKE2B 25932dec798518217eb724b3514de6f45e57543703396516f3d1a4599f40cb258893d2b2c7e706ef341a6217459a08ebfdf61e2d16949bf8831aed2f79fa80c0 SHA512 acc6ff1a6cad0d568e3af2c7fa4ac5fc3f908adcda1bc846aebc473cdf9f63b873fdf3182c44c3afe50a1f26a645be21b7b33335e67afb09210c001ba22365ad
 DIST google-api-python-client-2.4.0.tar.gz 24853833 BLAKE2B 4ed2083a9bb8b4f8fe31ab5dbd7875c0c36c972cdb0f71a59565fe4eb23ff1ef0a40794acd7af9646c1ee3904fbab3caaeb2700a3660b66d3069d2bc4f811e76 SHA512 db545850b9d2746e3bcf7b4a2f12b0d4827bd68f44d5627fd80d39bff2ca3303c8d520f72ee17637fe700bc935548706ce885ff0d7fe737ae157668e0314fbc6
 DIST google-api-python-client-2.7.0.tar.gz 25488451 BLAKE2B a8a761944fed3970ae0cf53b2cb926a6670ac37323c39085a5f7fb4f354451292fca4bbb2c34a72d086dfa961b74a72f66319f6bbc2505ef70f5c94aff3f7a0e SHA512 531e919cc9d0cffc49b31d881a6ee3adb2d9cc166813b5884c300e9a3b63b28c9c269a0d1efe47961fa61f79ec5adb8a12e2208b644fd62ed4baa66c56d219ba
 DIST google-api-python-client-2.8.0.tar.gz 25286774 BLAKE2B b21aebda062984b9eb8f2f5c563016f0f8f663883dc8ddb913053ff3df32c652c6a83f924f3e19136e5edec085e12c43cc584bc9898630122c77a219810033bc SHA512 cc3c55438b2f5835b52d17d04a749919c4865991ff78cf95920d0941a55e1493eae502a13f6565cfe1db799ce9950659e8baaa690bada058d711309861c8d07e
--- a/dev-python/google-api-python-client/google-api-python-client-2.10.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.10.0.ebuild
@ -0,0 +1,49 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{8..9} )
 inherit distutils-r1
 DESCRIPTION="Google API Client for Python"
 HOMEPAGE="https://github.com/googleapis/google-api-python-client"
 SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 RDEPEND="
 	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
 	<dev-python/httplib2-1[${PYTHON_USEDEP}]
 	dev-python/google-api-core[${PYTHON_USEDEP}]
 	>=dev-python/google-auth-1.16.0[${PYTHON_USEDEP}]
 	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
 	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
 	<dev-python/uritemplate-4[${PYTHON_USEDEP}]
 	>=dev-python/six-1.13.0[${PYTHON_USEDEP}]
 	<dev-python/six-2[${PYTHON_USEDEP}]
 	"
 BDEPEND="
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/oauth2client[${PYTHON_USEDEP}]
 		dev-python/pandas[${PYTHON_USEDEP}]
 		dev-python/parameterized[${PYTHON_USEDEP}]
 		dev-python/unittest2[${PYTHON_USEDEP}]
 	)"
 distutils_enable_tests --install pytest
 python_test() {
 	local deselect=(
 		# require Internet access (and credentials)
 		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
 		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
 	)
 	distutils_install_for_testing
 	epytest ${deselect[@]/#/--deselect }
 }
--- a/dev-python/importlib_metadata/importlib_metadata-4.3.1.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-4.3.1.ebuild
@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 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"
 RDEPEND="
 	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7} pypy3)
--- a/dev-python/keystoneauth/keystoneauth-4.2.1-r1.ebuild
+++ b/dev-python/keystoneauth/keystoneauth-4.2.1-r1.ebuild
@ -0,0 +1,54 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{8..9} )
 inherit distutils-r1
 DESCRIPTION="This package contains tools for authenticating to an OpenStack-based cloud."
 HOMEPAGE="https://github.com/openstack/keystoneauth"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}1/${PN}1-${PV}.tar.gz"
 S="${WORKDIR}/${PN}1-${PV}"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0"
 RDEPEND="${CDEPEND}
 	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
 	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
 	>=dev-python/os-service-types-1.2.0[${PYTHON_USEDEP}]"
 BDEPEND="${CDEPEND}
 	test? (
 		>=dev-python/betamax-0.7.0[${PYTHON_USEDEP}]
 		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
 		dev-python/hacking[${PYTHON_USEDEP}]
 		>=dev-python/lxml-4.2.0[${PYTHON_USEDEP}]
 		>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
 		>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
 		>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
 		>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
 		>=dev-python/requests-kerberos-0.8.0[${PYTHON_USEDEP}]
 		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
 		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
 	)"
 distutils_enable_tests unittest
 src_prepare() {
 	# relies on specific test runner name
 	sed -i -e 's:run\.py:unittest_or_fail.py:' \
 		keystoneauth1/tests/unit/test_session.py || die
 	distutils-r1_src_prepare
 }
 python_test() {
 	eunittest -b
 }
--- a/dev-python/keystoneauth/keystoneauth-4.2.1.ebuild
+++ b/dev-python/keystoneauth/keystoneauth-4.2.1.ebuild
@ -2,9 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_7 python3_8 )
 DISTUTILS_USE_SETUPTOOLS=bdepend
 PYTHON_COMPAT=( python3_{8..9} )
 inherit distutils-r1
 DESCRIPTION="This package contains tools for authenticating to an OpenStack-based cloud."
--- a/dev-python/keystoneauth/metadata.xml
+++ b/dev-python/keystoneauth/metadata.xml
@ -5,6 +5,10 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">openstack/keystoneauth</remote-id>
--- a/dev-python/more-itertools/more-itertools-8.8.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-8.8.0.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 distutils_enable_sphinx docs \
 	dev-python/sphinx_rtd_theme
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@ -1,3 +1,4 @@
 DIST mypy-0.812.tar.gz 2122474 BLAKE2B 3bfbfe3010798d49bcf00aa1d926ffa8a54be50fb2e88f4ffc3cde3edba80a9b74853de17126394dc1806c07b740b5f8e7775f2fe4b2312e0a85134b446a690b SHA512 ee89f56a7a01214540f9b727f153a075a097b161b7f654d926d1080ae540ec68303629a4fe691fcb53d37c3eb08924bf01d22cdf1c3761b414a3bc40af3363e6
 DIST mypy-0.902.tar.gz 2549241 BLAKE2B ba8bce0434b08c379907f96f22c030048ff8c45f426eb4a6b6951059974bd3f35b5e6bc759b9b6ff0237d43811d01181e58ea2cf919fda3e2649c37825d86134 SHA512 b896d5a614982d60dbeffadf56a5faff3d809c4d2af299fc658a67c09c3f36cab961d8516d38ea682227d9a06613a3aff7bb041ba1346354b81ec1187316d258
 DIST mypy-0.910.tar.gz 2551057 BLAKE2B a3c6939c8f0e2ea19a3a3f91031330df2fb25a93cc3f9239535f15c17eedcca5716cc75c5412a1d345d8572d396c3d7128e38989fd694833cb6aec8366ac4afe SHA512 49060c13da8bf17385b6b1db6efa9ac5771f2bac92d26760c4087cf128de22846b8a062f38e83ecff524e7893f8c9cd0647a2ef89e10387138544436a2840459
 DIST typeshed-add4d92f050fb11d3901c6f0ee579a122d4a7a98.tar.gz 600241 BLAKE2B 2bf91ba7bfa2ed3e2369d70ab76ce152e00f321e79f36ef7c264d477e350579eaade222e8347b4105fb93b847d944ce0aa182466ce636649098a2df69c09ee5d SHA512 8497ee9719e162f84556407296d383e0b7e695cf6cd60bbf7f34c1d7aada3926fd5516ce7ea3863e11b3bcb87f12617733082f020718610e467877872f0b4487
--- a/dev-python/mypy/metadata.xml
+++ b/dev-python/mypy/metadata.xml
@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>ikelos@gentoo.org</email>
 		<name>Mike Auty</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
--- a/dev-python/mypy/mypy-0.910.ebuild
+++ b/dev-python/mypy/mypy-0.910.ebuild
@ -0,0 +1,58 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{8..9} )
 inherit distutils-r1
 DESCRIPTION="Optional static typing for Python"
 HOMEPAGE="http://www.mypy-lang.org/"
 TYPESHED_COMMIT="add4d92f050fb11d3901c6f0ee579a122d4a7a98"
 SRC_URI="
 	https://github.com/python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 "
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 # stubgen collides with this package: https://bugs.gentoo.org/585594
 RDEPEND="
 	!dev-util/stubgen
 	>=dev-python/psutil-4[${PYTHON_USEDEP}]
 	>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
 	<dev-python/typed-ast-1.5.0[${PYTHON_USEDEP}]
 	>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
 	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
 	<dev-python/mypy_extensions-0.5.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
 		>=dev-python/attrs-18.0[${PYTHON_USEDEP}]
 		>=dev-python/lxml-4.4.0[${PYTHON_USEDEP}]
 		>=dev-python/pytest-6.1.0[${PYTHON_USEDEP}]
 		>=dev-python/pytest-xdist-1.18[${PYTHON_USEDEP}]
 		>=dev-python/py-1.5.2[${PYTHON_USEDEP}]
 		>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]
 	)
 "
 distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
 distutils_enable_tests pytest
 # this requires packaging a lot of type stubs
 export MYPY_USE_MYPYC=0
 python_test() {
 	local deselect=(
 		# TODO
 		mypy/test/teststubtest.py
 	)
 	# Some mypy/test/testcmdline.py::PythonCmdlineSuite tests
 	# fail with high COLUMNS values
 	local -x COLUMNS=80
 	epytest ${deselect[@]/#/--deselect } \
 		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
 }
--- a/dev-python/openstacksdk/metadata.xml
+++ b/dev-python/openstacksdk/metadata.xml
@ -5,6 +5,10 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">openstack/python-openstacksdk</remote-id>
--- a/dev-python/openstacksdk/openstacksdk-0.50.0-r1.ebuild
+++ b/dev-python/openstacksdk/openstacksdk-0.50.0-r1.ebuild
@ -0,0 +1,77 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_8 )
 inherit distutils-r1
 DESCRIPTION="A collection of libraries for building applications to work with OpenStack."
 HOMEPAGE="https://github.com/openstack/python-openstacksdk"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0"
 RDEPEND="${CDEPEND}
 	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
 	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
 	>=dev-python/requestsexceptions-1.2.0[${PYTHON_USEDEP}]
 	>=dev-python/jsonpatch-1.16[${PYTHON_USEDEP}]
 	!~dev-python/jsonpatch-1.20[${PYTHON_USEDEP}]
 	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
 	>=dev-python/keystoneauth-3.18.0[${PYTHON_USEDEP}]
 	>=dev-python/munch-2.1.0[${PYTHON_USEDEP}]
 	>=dev-python/decorator-4.4.1[${PYTHON_USEDEP}]
 	>=dev-python/jmespath-0.9.0[${PYTHON_USEDEP}]
 	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
 	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
 	>=dev-python/dogpile-cache-0.6.5[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-2.7.0[${PYTHON_USEDEP}]
 	dev-python/importlib_metadata[${PYTHON_USEDEP}]
 "
 BDEPEND="${CDEPEND}
 	test? (
 		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
 		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
 		>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
 		dev-python/hacking[${PYTHON_USEDEP}]
 		>=dev-python/prometheus_client-0.4.2[${PYTHON_USEDEP}]
 		>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
 		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
 		>=dev-python/statsd-3.3.0[${PYTHON_USEDEP}]
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
 	)"
 distutils_enable_tests unittest
 python_test() {
 	distutils_install_for_testing
 	cd "${TEST_DIR}"/lib || die
 	# broken with the current version of dogpile.cache?
 	rm openstack/tests/unit/cloud/test_caching.py || die
 	# TODO
 	sed -e 's:test_generate_form:_&:' \
 		-e 's:test_create_static_large_object:_&:' \
 		-e 's:test_object_segment_retries:_&:' \
 		-e 's:test_object_segment_retry_failure:_&:' \
 		-e 's:test_slo_manifest_retry:_&:' \
 		-i openstack/tests/unit/cloud/test_object.py || die
 	# unhappy about paths due to test runner
 	sed -e 's:test_method_not_supported:_&:' \
 		-i openstack/tests/unit/test_exceptions.py || die
 	sed -e 's:test_repr:_&:' \
 		-i openstack/tests/unit/test_resource.py || die
 	# functional tests require cloud instance access
 	eunittest -b openstack/tests/unit
 }
--- a/dev-python/os-service-types/os-service-types-1.7.0-r1.ebuild
+++ b/dev-python/os-service-types/os-service-types-1.7.0-r1.ebuild
@ -0,0 +1,31 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{8..9} )
 inherit distutils-r1
 DESCRIPTION="A library to handle official service types for OpenStack and it's aliases."
 HOMEPAGE="https://github.com/openstack/os-service-types"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0"
 RDEPEND="${CDEPEND}"
 BDEPEND="
 	${CDEPEND}
 	test? (
 		>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
 		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
 	)
 "
 distutils_enable_tests unittest
--- a/dev-python/os-service-types/os-service-types-1.7.0.ebuild
+++ b/dev-python/os-service-types/os-service-types-1.7.0.ebuild
@ -1,8 +1,8 @@
-# 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_{7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 inherit distutils-r1
--- a/dev-python/pdoc3/Manifest
+++ b/dev-python/pdoc3/Manifest
@ -0,0 +1 @@
 DIST pdoc3-0.9.2.tar.gz 84803 BLAKE2B 5ff52a630722b9504d1de83bb236aaaafde95417ac163b79b3585156484a12b71a16de55d00ab7377b9e44eec7902384f1f648a514b8e7392da6f5e79f6f229f SHA512 653231a124239ec189dc5aa4dec59245c6d20e4ff6ca9cb7fa468410b712b766288f4c59f8c0d0b8c1a4190ce84603455ec0ad7c7b1e0dc4f28cd279bb69685f
--- a/dev-python/pdoc3/metadata.xml
+++ b/dev-python/pdoc3/metadata.xml
@ -0,0 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>flow@gentoo.org</email>
 		<name>Florian Schmaus</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pdoc3</remote-id>
 		<remote-id type="github">pdoc3/pdoc</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/dev-python/pdoc3/pdoc3-0.9.2.ebuild
+++ b/dev-python/pdoc3/pdoc3-0.9.2.ebuild
@ -0,0 +1,34 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{7..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 DESCRIPTION="Auto-generate API documentation for Python projects"
 HOMEPAGE="https://pdoc3.github.io/pdoc/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 SLOT="0"
 LICENSE="AGPL-3+"
 KEYWORDS="~amd64 ~x86"
 RDEPEND="
 	dev-python/mako[${PYTHON_USEDEP}]
 	>=dev-python/markdown-3.0[${PYTHON_USEDEP}]
 "
 DEPEND="
 	${RDEPEND}
 	dev-python/wheel[${PYTHON_USEDEP}]
 "
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 	sed -i \
 		-e "/setuptools_git/d" \
 		-e "/setuptools_scm/d" \
 		setup.py || die
 }
--- a/dev-python/pgspecial/pgspecial-1.13.0.ebuild
+++ b/dev-python/pgspecial/pgspecial-1.13.0.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/dbcli/pgspecial/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 RDEPEND="
 	>=dev-python/click-4.1[${PYTHON_USEDEP}]
--- a/dev-python/pikepdf/pikepdf-2.12.2.ebuild
+++ b/dev-python/pikepdf/pikepdf-2.12.2.ebuild
@ -15,7 +15,7 @@ S=${WORKDIR}/${MY_P}
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 DEPEND="app-text/qpdf:0="
 RDEPEND="${DEPEND}
--- a/dev-python/pip/pip-21.1.2-r1.ebuild
+++ b/dev-python/pip/pip-21.1.2-r1.ebuild
@ -32,7 +32,7 @@ SRC_URI="
 "
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
 SLOT="0"
 IUSE="test vanilla"
 RESTRICT="!test? ( test )"
--- a/dev-python/process-tests/process-tests-2.1.2.ebuild
+++ b/dev-python/process-tests/process-tests-2.1.2.ebuild
@ -3,7 +3,7 @@
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
--- a/dev-python/pydocstyle/pydocstyle-6.1.1.ebuild
+++ b/dev-python/pydocstyle/pydocstyle-6.1.1.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/PyCQA/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 RDEPEND="dev-python/snowballstemmer[${PYTHON_USEDEP}]"
 BDEPEND="
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@ -1,2 +1,3 @@
 DIST pyglet-1.5.16.tar.gz 6446875 BLAKE2B bdc40303b096a91924eb1b9c541cea199792ebf36d857f0466df4c5dff4ec2945dbc6e6c4933a293ae5bd5033dbcf49af913f3b0915082f33ea98a7d5f66fde6 SHA512 5cd1c604245c45f4b9d56c6a6290d301f8a925a4988d847df978b0f4431afb46046592f25d73b54cdf99402022a616afb3eb9c579d5ac29160408a74769f7a43
 DIST pyglet-1.5.17.tar.gz 6448500 BLAKE2B c2e27d5525c1e8eb5203b935b6a901283521ed12cf08b1d18297bd2772b83ee4fd721a9aac4fc41b6249b140b36e70d060d3649f4d2eb30f1e6f1f8fd42aa314 SHA512 3bb9594c02894fc58937b9312187b7848843d591fadb8e46553602ebad7c4b2bfd5dc615cc5f5d0cc1f8b59f10afda8e5130a0dee3c2066decb7af3faf114dae
 DIST pyglet-1.5.18.tar.gz 6440818 BLAKE2B cb7832000e0df96cd794f8eff9ba41aac8571542fbc45d1607df3935a7ed53ba8fd46b6bba40f6d5d53adfb2024aad1930cba1889b5d40d342457f7dc06db5d1 SHA512 d6ceddecccb36a90bef38c4a1608e866bb90ebb72eaaff693a2eb34678c7a50c99213a69042c569c22d54cc04a4b11d37ea8da47425958505261ebcf99bd28ce
--- a/dev-python/pyglet/pyglet-1.5.17.ebuild
+++ b/dev-python/pyglet/pyglet-1.5.17.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="
--- a/dev-python/pyglet/pyglet-1.5.18.ebuild
+++ b/dev-python/pyglet/pyglet-1.5.18.ebuild
@ -0,0 +1,62 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{8..9} )
 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
 	epytest tests/unit
 }
 python_install_all() {
 	if use examples; then
 		dodoc -r examples
 		docompress -x /usr/share/doc/${PF}/examples
 	fi
 	distutils-r1_python_install_all
 }
--- a/dev-python/pytest-cov/pytest-cov-2.12.1.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-2.12.1.ebuild
@ -3,7 +3,7 @@
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
--- a/dev-python/pytest-django/pytest-django-4.3.0.ebuild
+++ b/dev-python/pytest-django/pytest-django-4.3.0.ebuild
@ -17,7 +17,7 @@ SRC_URI="
 		-> ${P}.gh.tar.gz"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 RDEPEND="
--- a/dev-python/python-xlib/python-xlib-0.30.ebuild
+++ b/dev-python/python-xlib/python-xlib-0.30.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
 IUSE="doc"
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
--- a/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
+++ b/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
@ -1,8 +1,8 @@
-# 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_{7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 DISTUTILS_USE_SETUPTOOLS=bdepend
 inherit distutils-r1
@ -14,7 +14,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 DEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
 RDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
--- a/dev-python/sortedcontainers/sortedcontainers-2.4.0.ebuild
+++ b/dev-python/sortedcontainers/sortedcontainers-2.4.0.ebuild
@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 distutils_enable_tests pytest
--- a/dev-python/sphinx-notfound-page/metadata.xml
+++ b/dev-python/sphinx-notfound-page/metadata.xml
@ -8,6 +8,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">sphinx-notfound-page</remote-id>
 		<remote-id type="github">readthedocs/sphinx-notfound-page</remote-id>
--- a/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.7.1.ebuild
+++ b/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.7.1.ebuild
@ -17,7 +17,7 @@ SRC_URI="
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos"
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@ -1,4 +1,4 @@
 DIST spyder-4.2.5.tar.gz 11539071 BLAKE2B 9d7a98da018aae934803d640995fe2dfa6bbb20bfc7140bd00f5e7a00a09c47922fefd8df84f4b217a50176ee190515da6f4cbf498a03cae68e2ac4f5ec70664 SHA512 081b047a45b7522a69b1b21a221ab5cdef47f87f36ed4423ff63297d205f924c1627517c50622acb2d10efa094bc506fed4ec88f861775d3f58e81ac6ef017ac
-DIST spyder-5.0.4.tar.gz 20606964 BLAKE2B 20042d3d9b10da32aafe4036332608faa4bee458f36fb9359237cf2fd0651db68d8c7fb2a1bf653a350dcbd92fde856a4d37b4a8f85a37dffc6f8f31c750cbb3 SHA512 221c7b545d932a5c70f3f179b188f6ad9c2b1c632771f6766cba32115d1df56135708adbe2417c2236dc4b4fe847a734eaf1fb2920cad5b5e94969c308792d93
+DIST spyder-5.0.5.tar.gz 20606379 BLAKE2B 52f05ffcf0b6aabdac23a055af1c674c6aa80a7d4f3608779df1d46e0e51de63a71b4e97db286dc92e071cbb44a0dc827aa750d8ca538e6764b5e780f493d615 SHA512 17654ee76eb51c5f5b9f494d009af3d7813f869f27f22ceb8ad8ca96dcedcbcd6b86c7a3895bb63eba3cc60e4a57ab94128abb8d21f05c4672b8bb8d545fe1ff
 DIST spyder-docs-6ebb1ace2d7ce94e45e8b2c1b7ddb53395f86e67.tar.gz 78446300 BLAKE2B 4225589581ef47237d7025f506812840c959e589cddfe47d2c4d3a74d7fc876f67eda291ad07e82b054ff2666bed34fa0edca1e1c0e1ff5574efb2db1028a42a SHA512 4d0bd348ec3335e022456c19dc319295948061cea45b0f1e5a05c2640943776b5c3bdc2581fdc0571bd98fe8834af035134084394ce6711d5a69598515bd0e9b
 DIST spyder-docs-78b25754c69a20643258821146e398ad5535c920.tar.gz 69167467 BLAKE2B d2815d552002f329b5fac59329fba3b3b0cd592bcbdacc0878966919e44dbab29548533661e60a1b9b8fd763d57d1e4c2f761782ace1b0a814a5f0cec1f66af9 SHA512 10764367fd5f830d7a3620b9d9e7ec4ab74539c1f48326c0c40f7caff74a50401addc7609fe1558c57dac4649d0a214c0d2d77cecd100bd8574151134e49634d
 DIST spyder-docs-b317961de7600fc906d862238f344b3a315d28b1.tar.gz 80326831 BLAKE2B 0e9bb5d52c3cc1615f74f31a2c87be9fca5431bd19975594e147b5f9f3082f16f0cdfc476402533a0950bd928fda55de6c3850ed3a2780f1439fe88e349bf0f2 SHA512 8a1fe8e88c029402743c15b720e2e889fdbb73999a1035e81e5b3f998992515e041e14d8e361e23e7ec8a02cf30706349d12e9e0b37df9d1d7554b926831af78
--- a/dev-python/spyder/spyder-5.0.4-r1.ebuild
+++ b/dev-python/spyder/spyder-5.0.4-r1.ebuild
@ -9,7 +9,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit optfeature xdg distutils-r1
 # Commit of documentation to fetch
-DOCS_PV="b317961de7600fc906d862238f344b3a315d28b1"
+DOCS_PV="6ebb1ace2d7ce94e45e8b2c1b7ddb53395f86e67"
 DESCRIPTION="The Scientific Python Development Environment"
 HOMEPAGE="
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@ -1,9 +1,4 @@
 DIST SQLAlchemy-1.3.24.tar.gz 6353598 BLAKE2B 6eb92b20fa3412a1f1398e18e902e3338320973287afa4a37477ec28d47e7422a19c3a60e6290a6da7b23512c0d818a26400958d02097def778c917f098bb3db SHA512 4f5f0a23e80e1cebe541f8748a7e794e8964d986252803b3289a7cea732ad22557e00221775332e2766b6ff16ad5d9069223f441f8880ca6d0c47011f15fee5b
 DIST SQLAlchemy-1.4.11.tar.gz 7551299 BLAKE2B 65f560223f1f1656ec90a2b46b5447e92908cb7a8124f1a16f59ae04e5c22b9c4b7a30cbc0d1c8ebf31d31f544619223bdff0546fcfe6124195c4430bc8167c5 SHA512 28d5da109d754183e7f1887c652c47cd7162afec285a44ed6bc51566dc40d43cdb8cd1794f93f31b2e085488025f04243613d500936c220aaab3aedb75fb6dcd
 DIST SQLAlchemy-1.4.12.tar.gz 7583069 BLAKE2B a3097c53ba1c8e979c3eab712e51da39214710e174a90cdabd5f5588fcb01d2d45436e8019a1026780474e2fde7663495cffa411c58b255e847aa584a38ca26a SHA512 5863e4982c260d39e79db3a8fffd7ca6710b7f6ab0f73f9ddb09860e27d679fe2c92e0eaab9fe6914b38be4390c0eb685adef6624b06874fb43d96027b545659
 DIST SQLAlchemy-1.4.13.tar.gz 7589942 BLAKE2B 08e9fb6112aa71738f27dc4ce86ebe2274dd2513f39ded7211a5617ecd677f37fe31de754a24ecd519b227b141287ad86d0d0337f3d278d4c4ca5b67e2a1a79d SHA512 fb81c71922a768221f6675686fb2696b5e6d1f2e72231611e9afd20b7659193247eef4191841799fb1fe6a51304629efb6d3fba5dc298fdf70f248010bce8bb3
 DIST SQLAlchemy-1.4.14.tar.gz 7599698 BLAKE2B 500a6257829244e1181b8ef5cb39fb87b62ae2d7ca054fedb580b7431b32d15c8f68600b881eb67eb97a73301660ab96793ab12094ae901782ce4eebdc8929db SHA512 2f33ab034467344ffb19aa3934148faaa4a57e4ffa5f97008d814d54149da4e15cfca14d138b9fb656227e25932ca95cf7321209c31c2706405d3916dc2fb9c0
 DIST SQLAlchemy-1.4.15.tar.gz 7621840 BLAKE2B 74299b92e8ae9d6017c961c44281cc43921f8505e9b141c75cc19899f693a2276b2849daef6dbe35f0d62179354740c76adc318b6b37d551679cc8ba3c47681f SHA512 b9a640ccfb7caabb88c4891748699442073db2bea6d1e5a33eb508863616c94ddbf162b3ecd5e502daf20d798d20b8ef5b4b29ed679af9161e117a23862327c2
 DIST SQLAlchemy-1.4.16.tar.gz 7629704 BLAKE2B 46626cb38e3ec2c5b5c203a03da1a613cb5b66f2906edc54c03843b87ce8f12fbacb6fcd8b2b36584c53516de24b8c1bae041489a376472e4d2e6e2a301b707b SHA512 035c740b49356b1226ed79f188d022904d93190e5391edd350e44e63301333efcfc6c47477ce5119fdbebd49aa3e21b2764d3e4dcc6be5948428f1d8cf11c84c
 DIST SQLAlchemy-1.4.17.tar.gz 7630929 BLAKE2B 88b75c930caf674aa6d927336573f0e40fc89ae72735c11479eaa15de56754807b5412409d383857104a3027fcae346e747cc605525fe88c0a0f9d4ff39fcc7a SHA512 ff99a3a9c440fcdc10f6f43905672f72929fff430b3d9583b8e81693ff9d54ad5d9607b8041787074072cdf1ba03b31db9255cca1c50c8a43f275a0905e9f0bd
 DIST SQLAlchemy-1.4.18.tar.gz 7643090 BLAKE2B 8046bb9f9aa459eec95af57e597540552f6cd79ca3c393abf66d7370754e8433d743e739803929aaf0e2788b0c0419c022ddda1517d38da6580f3afeee1bc4d4 SHA512 06110bf727fd6d83404da2e031a27163c06059bf9eae4cc5b79ce047b5bab67b54432890091fa03abd9644156b92569001ae78c48c22799ab3bec220d4bbe1a0
 DIST SQLAlchemy-1.4.19.tar.gz 7675110 BLAKE2B 61afe9e8937cc1eca9a6c10eef03959422a6dc73e562b47c820b01fbeb61099113d1d30e4de0448ae07abc064db190a9a0b9550d4f8c324a73d277c2c9e7958b SHA512 656e5fd2c1e5c5f9979ad3e38b0f927e8756423d5c988ccb5247cde2f8d354b4623cb57af24c7226758878e429514ae828047fad623ee332ae524b714ab3f18f
--- a/Show More
+++ b/Show More
`@ -1 +1,2 @@`
	`DIST gnumeric-1.12.49.tar.xz 18057896 BLAKE2B 75ae1683feb7f37cdff4cb5fbec04b0f241e4590236ea68706180853c1a950092bf0d902652d65288b42dba13c384e1ac364cefb32b9d60c37a9948d9d7fc8eb SHA512 047d625aee3a15dd8881f2e11cc7c67d211d40be86ec018517d1b3140ff4bd031fb2cb86e48f1f6ee22432aa1f39c978bad5fd5bf5c6a1be9aa53411136429ed`	`DIST gnumeric-1.12.49.tar.xz 18057896 BLAKE2B 75ae1683feb7f37cdff4cb5fbec04b0f241e4590236ea68706180853c1a950092bf0d902652d65288b42dba13c384e1ac364cefb32b9d60c37a9948d9d7fc8eb SHA512 047d625aee3a15dd8881f2e11cc7c67d211d40be86ec018517d1b3140ff4bd031fb2cb86e48f1f6ee22432aa1f39c978bad5fd5bf5c6a1be9aa53411136429ed`
		`DIST gnumeric-1.12.50.tar.xz 18062104 BLAKE2B 46d15e5fe540cce904de07b263707d7fd8c29d9a2611105cdb117a3acd6693651e588b4d281038b48fbc36bba100d162c2c2ab1be589ea206272155cbd9046df SHA512 d5896cb8390c99fb3871c722116cc085b93b788fab91bf44d24f20228b8290170a0adc906160a6aa46431ae43b04079621c370dcda42658fa9ae3c1d8baf1730`
`@ -1,2 +1 @@`
	`DIST opencl-icd-loader-2020.06.16.tar.gz 60478 BLAKE2B e80bb051868842356a22141dc624a93a9e473673dc5b78e01d54b76c309c1deea256ae1fdf1e1777ea8842ffc33d3b92ab8b6fbe64454cbbf2ea0306523f0bfd SHA512 3cba77a0334976e27aeb60f3f29919b7b8e70ed1ea1d53e278a2873149a6b291323b19292e7a51a1decb27b304395ced22d400c1f750088f8a006c21d42fe94c`
	`DIST opencl-icd-loader-2021.04.29.tar.gz 81650 BLAKE2B 399aa3cf3b3fd5fa5bef94302face8630f7b3485c01000960687f77c823311a28f9f867f929c4c03ec873b724ae02e1ecbbe974fe3ddddf4334064609cb61b51 SHA512 4b57a168fe75cced8162e173bc1f5d32fd11285a0443478f938ace1b88f6422007d05ab6bfb272a28838129122ffcd98d33634a55e82b9df84be0b6d4e609178`	`DIST opencl-icd-loader-2021.04.29.tar.gz 81650 BLAKE2B 399aa3cf3b3fd5fa5bef94302face8630f7b3485c01000960687f77c823311a28f9f867f929c4c03ec873b724ae02e1ecbbe974fe3ddddf4334064609cb61b51 SHA512 4b57a168fe75cced8162e173bc1f5d32fd11285a0443478f938ace1b88f6422007d05ab6bfb272a28838129122ffcd98d33634a55e82b9df84be0b6d4e609178`
`@ -1,2 +1 @@`
	`DIST lua-compat-5.3-0.10.tar.gz 53695 BLAKE2B e570aedb23b8ed7ca38c4316ffab25b93a0f9f6f0fae79af563ca8a81dd6453ac273e1f9e70674c484a2dec68749e7d53a1c1736a72616c210b8e38a31b3f191 SHA512 f7f39085f4f6b16095f41e635b4c5477b3dab5e42b5b65a9d522941a3807ea521d4a27a77293a3c9d0ecea78a1f6c2a2497394b2d220f4d7d65e23510563d46d`	`DIST lualdap-1.3.0.tar.gz 81987 BLAKE2B cd25cada91a3c330fb72ee1106298442c64b1bcae4a57f48937efb4311f70b53c5a0e96587caab4b1950b16d9957bb8c25b2b9e0d3753089f06fbae64180ff04 SHA512 dea4282928c5138a327cd97d3d8049341fac17b5e853440f5b0a6e115e3400bac908f24827d48e36bfe81720c7d2bacdc50ae189953ecbcdfb27cb23b78d0de8`
	`DIST lualdap-1.2.6.tar.gz 92669 BLAKE2B 49b4c8e639ff109e32321fa5a6313dcb6e83b76d1e5220b59d7297cc19d106233a2d05ff8fc43162ad242d3134700a9abe8fe8f4bcbd90a3f8f0217217decfaa SHA512 e32010caa8efea5c23f2a595bd6a339267ecd08cf23e39389005bf8e499d6bad63771d0c7faf3ab5b8f670ba22bb15bf7ae691ed67920e86d8ed2c5649d7a079`
`@ -1 +1,2 @@`
	`DIST Lingua-EN-Inflect-1.902.tar.gz 59582 BLAKE2B c5f3b4a21062ad29551bfcfa9979038bc7be4cdc95aecb51b07912e5b30b83cceb350480e7478940fccd07660a6ae1040cda4ad1cc498baada7a32ac812293db SHA512 8fb64f67312ca09fe763a266b196c47e98e5c5f1b4ff76a41bac0d422be3b0405c155f46bc04dd134adcdc3c38a93e2b0cf69fea3acde6d111dbafac0247c39e`	`DIST Lingua-EN-Inflect-1.902.tar.gz 59582 BLAKE2B c5f3b4a21062ad29551bfcfa9979038bc7be4cdc95aecb51b07912e5b30b83cceb350480e7478940fccd07660a6ae1040cda4ad1cc498baada7a32ac812293db SHA512 8fb64f67312ca09fe763a266b196c47e98e5c5f1b4ff76a41bac0d422be3b0405c155f46bc04dd134adcdc3c38a93e2b0cf69fea3acde6d111dbafac0247c39e`
		`DIST Lingua-EN-Inflect-1.905.tar.gz 59715 BLAKE2B 752d45125630c5df71b94d92575f9dd9e14a22964f2b63ecb7682edb2e71197dc7a8d121dc386db7d1cf29ac12de8401d46d2c14cdfb6d18f3063f6c8148d97e SHA512 394671c4a645edd426d3f8d7b3980aac10345b68f9c7d2558f46ec3b7ffadad86138c5f27d3afd64e2c193c6d20a537f179ff01aa40a84cd1cee718e4afde42b`
`@ -1 +1,2 @@`
	`DIST Lingua-EN-NameCase-1.19.tar.gz 10637 BLAKE2B 907fffaacf1d201b50a87d0edea6273ccf1f096e8dfd5d8d49be048085fe1037357527aeceff45078514de60990f24d3c10c044d427ab6d7f7c1f9defa274907 SHA512 8613414b43b138d4f7103b0e4f809108b87453c055d18f430f97d8cb1cc2aaa27669903604e98258b8fe39a5827d338d90ba70a3f275dcb4e1710d58b4282f76`	`DIST Lingua-EN-NameCase-1.19.tar.gz 10637 BLAKE2B 907fffaacf1d201b50a87d0edea6273ccf1f096e8dfd5d8d49be048085fe1037357527aeceff45078514de60990f24d3c10c044d427ab6d7f7c1f9defa274907 SHA512 8613414b43b138d4f7103b0e4f809108b87453c055d18f430f97d8cb1cc2aaa27669903604e98258b8fe39a5827d338d90ba70a3f275dcb4e1710d58b4282f76`
		`DIST Lingua-EN-NameCase-1.21.tar.gz 12160 BLAKE2B a3f519b2a26dbaf6764e53c11890c098519079183fcdd7c9e727c1cc3e750859c4c6a48186272ab0780a279b6812f6e39e06d9e8b211be46c646ab905de855e4 SHA512 1d510b1736b33ec1c0873eaa28b637f23d62811935512c1428b6bf6ad2b500c8cb4c09161870735bffff0f919eae4ac2feb660b1a6f68a9e2cb29e5c92fe2de3`
`@ -1 +1,2 @@`
	`DIST Lingua-EN-NameParse-1.36.tar.gz 35648 BLAKE2B bc75b33b889977f1b14c4b68c79397607b8f6752b02d7f6e3e5d55a8e3a42a333d12b9f0ccfa078af35e5c59a88c780428621f8a57d2d78b4bb233b68376b775 SHA512 d82b6d5a7813dae5dafd36e5ae521792b3477757e918cac9ccff985afd0b3018a390c04cab39bf0d4b0cec9307941901d1aaa35febc650c25f85e8c77b03211e`	`DIST Lingua-EN-NameParse-1.36.tar.gz 35648 BLAKE2B bc75b33b889977f1b14c4b68c79397607b8f6752b02d7f6e3e5d55a8e3a42a333d12b9f0ccfa078af35e5c59a88c780428621f8a57d2d78b4bb233b68376b775 SHA512 d82b6d5a7813dae5dafd36e5ae521792b3477757e918cac9ccff985afd0b3018a390c04cab39bf0d4b0cec9307941901d1aaa35febc650c25f85e8c77b03211e`
		`DIST Lingua-EN-NameParse-1.38.tar.gz 35857 BLAKE2B c1de7d612a4f5b4c34edebcc0ec46f22947ee9eb9e62a676e99a6ee267b8baa3a0f650394168b05a3b116534bd3cb17ab88e39f41bd269b0f0db64344d0874de SHA512 7c2ca5282f6a57d13e9592395290d8f84b77e51e3c96204a4eb0d533cd30383549bbb0e862b6a1aca97e36a17e2c51e599b2bbe2ed673f705505d871d07a5f55`
`@ -1 +1,2 @@`
	`DIST Lingua-EN-Numbers-Ordinate-1.04.tar.gz 12019 BLAKE2B 9f019c096c165cd1417ffd674b1ba92334cc50bda1b789c47909d437c0ae1b1efd2084d81de10ac9400a63f94d85a9465d14601b1c2ca4133b9f670f570adadb SHA512 f8f5cbfc9ae1d7b4e5e134c8fb089f6ec4ecfd90e0168ece874b007ae8b74936e5aecc38344c036c0845ab7a8c192d07c5a2cdad8f96176c71e89e2e4ae1211e`	`DIST Lingua-EN-Numbers-Ordinate-1.04.tar.gz 12019 BLAKE2B 9f019c096c165cd1417ffd674b1ba92334cc50bda1b789c47909d437c0ae1b1efd2084d81de10ac9400a63f94d85a9465d14601b1c2ca4133b9f670f570adadb SHA512 f8f5cbfc9ae1d7b4e5e134c8fb089f6ec4ecfd90e0168ece874b007ae8b74936e5aecc38344c036c0845ab7a8c192d07c5a2cdad8f96176c71e89e2e4ae1211e`
		`DIST Lingua-EN-Numbers-Ordinate-1.05.tar.gz 12093 BLAKE2B 64a86f2f86b8f99b2e473c3780a2735f236c738ce4758c09be1f20f316a138abba7f797805bdd3bda0f03c147b7900506bc06ede061cfe1cf680a0ca84ddde30 SHA512 ff9d2b49e933c3975ce4598a2ac4719c52a2c3e07e3ff6bc82cdb43ec05a63e1c2931d49e23e526aee75cb1a3c368e7692459f6d6487f16dc3b6c36ee9a8337e`
`@ -1,2 +1 @@`
	`DIST cfgv-3.2.0.tar.gz 10268 BLAKE2B 26cd22c1ed7b0de48638d2bb0e30a4ac0c3060d5020d04c29ca5c41c1337531d16a1c7de6e66044e90c3b0dbd5f4b15ba6c3dda2ae73953b8d6be3f74825b813 SHA512 6f1a54b505d298a9806a739edffc79feea41638f766ddc25f0712001e5bceb206153e3a957dcf4909fbe125b6e9bd077aba6317d00e632a06ed24f1dfd06c555`
	`DIST cfgv-3.3.0.tar.gz 10393 BLAKE2B d4cf565884aaab6a81716382ba8e3244e36a3381b771f7e206053fa80500205bd3b70b62b611ce4a7f0cb143a763d51eb10b1e29333b7f06e29cb406f9f7f6b8 SHA512 23a238c76635404b150bbc3bb1eafd8eb521171e69bb3f3fee55a0a24c12d2ee152cc7453a41952d2f41a6cb72575dacf4b990dbd443f69026a770c87a1e081f`	`DIST cfgv-3.3.0.tar.gz 10393 BLAKE2B d4cf565884aaab6a81716382ba8e3244e36a3381b771f7e206053fa80500205bd3b70b62b611ce4a7f0cb143a763d51eb10b1e29333b7f06e29cb406f9f7f6b8 SHA512 23a238c76635404b150bbc3bb1eafd8eb521171e69bb3f3fee55a0a24c12d2ee152cc7453a41952d2f41a6cb72575dacf4b990dbd443f69026a770c87a1e081f`
		`@ -0,0 +1 @@`
							`DIST ewmh-0.1.6.tar.gz 13065 BLAKE2B ba26d28f8976792b07e0bb200e1a2edcd7a04442bd17606a5d786ca41f01f4f3f96243134dde638fa228e49b79556d6ccbf25cf032c278e0b5233557746f34e9 SHA512 96c498cbd45bf03dca8b0c982cbb7e5644b00ce35b49df6abf119d36a18c08f907b635fc0ab12493d6351ba2c6645c75440d7c92d09d6feb06f6121bfd41391b`
		`@ -0,0 +1 @@`
							`DIST pdoc3-0.9.2.tar.gz 84803 BLAKE2B 5ff52a630722b9504d1de83bb236aaaafde95417ac163b79b3585156484a12b71a16de55d00ab7377b9e44eec7902384f1f648a514b8e7392da6f5e79f6f229f SHA512 653231a124239ec189dc5aa4dec59245c6d20e4ff6ca9cb7fa468410b712b766288f4c59f8c0d0b8c1a4190ce84603455ec0ad7c7b1e0dc4f28cd279bb69685f`