Sync with portage [Wed Jan 27 08:43:03 MSK 2021].

3 years ago · 8a210096af
parent ca329b4b14
commit 8a210096af
616 changed files with 11757 additions and 5052 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/acct-group/Manifest.gz
+++ b/acct-group/Manifest.gz
--- a/acct-group/minio/Manifest
+++ b/acct-group/minio/Manifest
--- a/acct-group/minio/metadata.xml
+++ b/acct-group/minio/metadata.xml
@ -0,0 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>zlogene@gentoo.org</email>
 		<name>Mikle Kolyada</name>
 	</maintainer>
 </pkgmetadata>
--- a/acct-group/minio/minio-0.ebuild
+++ b/acct-group/minio/minio-0.ebuild
@ -0,0 +1,8 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit acct-group
 ACCT_GROUP_ID=309
--- a/acct-user/Manifest.gz
+++ b/acct-user/Manifest.gz
--- a/acct-user/minio/Manifest
+++ b/acct-user/minio/Manifest
--- a/acct-user/minio/metadata.xml
+++ b/acct-user/minio/metadata.xml
@ -0,0 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>zlogene@gentoo.org</email>
 		<name>Mikle Kolyada</name>
 	</maintainer>
 </pkgmetadata>
--- a/acct-user/minio/minio-0.ebuild
+++ b/acct-user/minio/minio-0.ebuild
@ -0,0 +1,13 @@
 # Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit acct-user
 DESCRIPTION="A user for minio"
 ACCT_USER_ID=309
 ACCT_USER_HOME=/var/lib/minio
 ACCT_USER_GROUPS=( minio )
 acct-user_add_deps
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/doas/Manifest
+++ b/app-admin/doas/Manifest
@ -1,2 +1,3 @@
 DIST OpenDoas-6.0.tar.gz 28482 BLAKE2B 8d35a12f18609c9dd7746ff8ce7c39d16d7c5e595a05c0f1b91211d757029ae78311573228178f95ef92624f7a49d6ca1d1d0efd264104d66e1d20a8aa623241 SHA512 2bf5e00895a45d87785e7a494a1506844afd843ef5375e0b0e3795ebc24712bb941c6feeb87e426e41a240d40aca9b4c099f77220745bb7142a7a4b303441f60
 DIST OpenDoas-6.6.1.tar.gz 30783 BLAKE2B cf6dabddb9a0ef837355516f7344efca33a639ede126e54466644521b5b1a7073b6cfa96cc8573ef16221a748ae6395f7e4fef4ff912ca7889742fb46d1a4da5 SHA512 390e0e139a2641be22c4493c3ed755d9cb4091f4ab8d590123b7c8c4f2f116cea3b3500926ff191fb98d92192ca9e92118cbcbeb463a7833763e00c65603e678
 DIST OpenDoas-6.8.tar.gz 32307 BLAKE2B f199e20ccd33ed215b280f325d10c36f1449a605aa25ca92c39b43e6d9118a2c2b09e351712489028a06e9c2c087593888a93bf0377a15d1b710c9d6f659cf81 SHA512 4a57079bba353247e645bc07a5d4e78fd01471d193e83751fd87b72cffa4e152c0f7ea172563f767a7193b14489f57bc066b4fee50842d30b5b7f7ce918434bb
--- a/app-admin/doas/doas-6.8.ebuild
+++ b/app-admin/doas/doas-6.8.ebuild
@ -0,0 +1,51 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit toolchain-funcs
 MY_PN=OpenDoas
 MY_P=${MY_PN}-${PV}
 DESCRIPTION="Run commands as super user or another user, alternative to sudo from OpenBSD"
 HOMEPAGE="https://github.com/Duncaen/OpenDoas"
 SRC_URI="https://github.com/Duncaen/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
 S="${WORKDIR}"/${MY_P}
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc"
 IUSE="pam persist"
 BDEPEND="virtual/yacc"
 RDEPEND="pam? ( sys-libs/pam )"
 DEPEND="${RDEPEND}"
 src_prepare() {
 	default
 	sed -i 's/-Werror //' GNUmakefile || die
 }
 src_configure() {
 	tc-export CC AR
 	./configure \
 		--prefix="${EPREFIX}"/usr \
 		--sysconfdir="${EPREFIX}"/etc \
 		$(use_with pam) \
 		$(use_with persist timestamp) \
 	|| die "Configure failed"
 }
 pkg_postinst() {
 	if use persist ; then
 		ewarn "The persist/timestamp feature is disabled by default upstream."
 		ewarn "It may not be as secure as on OpenBSD where proper kernel support exists."
 	fi
 	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
 		elog "By default, doas will deny all actions."
 		elog "You need to create your own custom configuration at ${EROOT}/etc/doas.conf."
 		elog "See https://wiki.gentoo.org/wiki/Doas for guidance."
 	fi
 }
--- a/app-admin/multilog-watch/multilog-watch-1.12-r1.ebuild
+++ b/app-admin/multilog-watch/multilog-watch-1.12-r1.ebuild
@ -1,22 +1,21 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
 inherit eutils
 DESCRIPTION="Watches a multilog file for irregularities"
 HOMEPAGE="https://www.eyrie.org/~eagle/software/multilog-watch/"
-SRC_URI="https://archives.eyrie.org/software/system/multilog-watch
+SRC_URI="https://archives.eyrie.org/software/system/multilog-watch"
-https://www.eyrie.org/%7Eeagle/software/multilog-watch/sample.filter"
+SRC_URI+=" https://www.eyrie.org/%7Eeagle/software/multilog-watch/sample.filter"
 LICENSE="Artistic GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
-RDEPEND="dev-lang/perl
+RDEPEND="
-		virtual/qmail"
+	dev-lang/perl
 	virtual/qmail
 "
 src_unpack() {
 	mkdir "${S}" || die
@ -31,7 +30,6 @@ src_compile() {
 }
 src_install() {
 	dodir /etc/multilog-watch
 	insinto /etc/multilog-watch
 	doins sample.filter
--- a/app-admin/needrestart/needrestart-3.3.ebuild
+++ b/app-admin/needrestart/needrestart-3.3.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
@ -7,7 +7,6 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/liske/${PN}.git"
 	inherit git-r3
 	SRC_URI=""
 	KEYWORDS="amd64 x86"
 else
 	SRC_URI="https://github.com/liske/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="amd64 x86"
--- a/app-admin/needrestart/needrestart-3.5.ebuild
+++ b/app-admin/needrestart/needrestart-3.5.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
@ -7,7 +7,6 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/liske/${PN}.git"
 	inherit git-r3
 	SRC_URI=""
 	KEYWORDS=""
 else
 	SRC_URI="https://github.com/liske/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
--- a/app-admin/needrestart/needrestart-9999.ebuild
+++ b/app-admin/needrestart/needrestart-9999.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
@ -7,7 +7,6 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/liske/${PN}.git"
 	inherit git-r3
 	SRC_URI=""
 	KEYWORDS=""
 else
 	SRC_URI="https://github.com/liske/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@ -1,3 +1 @@
-DIST sudo-1.9.3p1.tar.gz 3958071 BLAKE2B b681c120faa5dc7f25e27c1be423d68cea70f63dcdfea2183fd386a34dec0376555453399d3f8886c66c6507343648d40b59a058710432154061b210df2a704c SHA512 3ad13fd03e5b371fd6bf7909731ffc11431d2182a744b654f7e5d4b810e47955d49bc78f551afe13ec56acbce694139c33a15bc022cea41b17af5496b8b7f89f
+DIST sudo-1.9.5p2.tar.gz 4012277 BLAKE2B 41913887463e4f775564af8d614fb5ed762200aa777dc789ec333842d4f432323474fc952a531fe929b33607cdfbcd18d7fe7470a15d67139deaf855841ed11f SHA512 f0fe914963c31a6f8ab6c86847ff6cdd125bd5a839b27f46dcae03963f4fc413b3d4cca54c1979feb825c8479b44c7df0642c07345c941eecf6f9f1e03ea0e27
 DIST sudo-1.9.4p2.tar.gz 3994184 BLAKE2B 110562792fa3d6f3f30fb0f07eefca975f062d41743fb84a34c27bf4c72296aa5f581de1f74895deedd6b47cb235399c52b9d3d818d274c6cdc61c741a0a287e SHA512 5258531d3dca0e812df5f4f8f26665f643c036d42534e3b98f5dd463624e9df0bba2a92c15da0c9958bda7e68f6f10b7b34875792ac9c205d1e70a12bc4f98a4
 DIST sudo-1.9.5p1.tar.gz 4008926 BLAKE2B f033a0dcea98d5b038ee310e76cb9f532abc3aa33880e4f606cb9463d5daf231c7697670c68b2829e3f33f687280c15e026ae700dec527a380e26d6e20fc1171 SHA512 0168f0b61a6c2d2f60a92b5b4d3c3254aed4116decabac3821d9ac2fd7f74bb7b019e35bb8955335315b3b00ddf4e4acd82540df0addc1d9bf4f44b60447a878
--- a/app-admin/sudo/sudo-1.9.4_p2-r1.ebuild
+++ b/app-admin/sudo/sudo-1.9.4_p2-r1.ebuild
@ -1,263 +0,0 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit pam multilib libtool systemd tmpfiles
 MY_P="${P/_/}"
 MY_P="${MY_P/beta/b}"
 DESCRIPTION="Allows users or groups to run commands as other users"
 HOMEPAGE="https://www.sudo.ws/"
 if [[ ${PV} == "9999" ]] ; then
 	inherit mercurial
 	EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
 else
 	uri_prefix=
 	case ${P} in
 		*_beta*|*_rc*) uri_prefix=beta/ ;;
 	esac
 	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
 	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
 		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris"
 	fi
 fi
 # Basic license is ISC-style as-is, some files are released under
 # 3-clause BSD license
 LICENSE="ISC BSD"
 SLOT="0"
 IUSE="gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd"
 DEPEND="
 	sys-libs/zlib:=
 	gcrypt? ( dev-libs/libgcrypt:= )
 	ldap? (
 		>=net-nds/openldap-2.1.30-r1
 		sasl? (
 			dev-libs/cyrus-sasl
 			net-nds/openldap[sasl]
 		)
 	)
 	pam? ( sys-libs/pam )
 	sasl? ( dev-libs/cyrus-sasl )
 	skey? ( >=sys-auth/skey-1.1.5-r1 )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
 	)
 	sssd? ( sys-auth/sssd[sudo] )
 "
 RDEPEND="
 	${DEPEND}
 	>=app-misc/editor-wrapper-3
 	virtual/editor
 	ldap? ( dev-lang/perl )
 	pam? ( sys-auth/pambase )
 	selinux? ( sec-policy/selinux-sudo )
 	sendmail? ( virtual/mta )
 "
 BDEPEND="
 	sys-devel/bison
 	virtual/pkgconfig
 "
 S="${WORKDIR}/${MY_P}"
 REQUIRED_USE="
 	?? ( pam skey )
 	?? ( gcrypt ssl )
 "
 MAKEOPTS+=" SAMPLES="
 src_prepare() {
 	default
 	elibtoolize
 }
 set_secure_path() {
 	# FIXME: secure_path is a compile time setting. using PATH or
 	# ROOTPATH is not perfect, env-update may invalidate this, but until it
 	# is available as a sudoers setting this will have to do.
 	einfo "Setting secure_path ..."
 	# first extract the default ROOTPATH from build env
 	SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env;
 		echo "${ROOTPATH}")
 		case "${SECURE_PATH}" in
 			*/usr/sbin*) ;;
 			*) SECURE_PATH=$(unset PATH;
 				. "${EPREFIX}"/etc/profile.env; echo "${PATH}")
 				;;
 		esac
 	if [[ -z ${SECURE_PATH} ]] ; then
 		ewarn "	Failed to detect SECURE_PATH, please report this"
 	fi
 	# then remove duplicate path entries
 	cleanpath() {
 		local newpath thisp IFS=:
 		for thisp in $1 ; do
 			if [[ :${newpath}: != *:${thisp}:* ]] ; then
 				newpath+=:${thisp}
 			else
 				einfo "   Duplicate entry ${thisp} removed..."
 			fi
 		done
 		SECURE_PATH=${newpath#:}
 	}
 	cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
 	# finally, strip gcc paths #136027
 	rmpath() {
 		local e newpath thisp IFS=:
 		for thisp in ${SECURE_PATH} ; do
 			for e ; do [[ ${thisp} == ${e} ]] && continue 2 ; done
 			newpath+=:${thisp}
 		done
 		SECURE_PATH=${newpath#:}
 	}
 	rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
 	einfo "... done"
 }
 src_configure() {
 	local SECURE_PATH
 	set_secure_path
 	# audit: somebody got to explain me how I can test this before I
 	# enable it.. - Diego
 	# plugindir: autoconf code is crappy and does not delay evaluation
 	# until `make` time, so we have to use a full path here rather than
 	# basing off other values.
 	myeconfargs=(
 		# requires some python eclass
 		--disable-python
 		--enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
 		--enable-zlib=system
 		--with-editor="${EPREFIX}"/usr/libexec/editor
 		--with-env-editor
 		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
 		--with-rundir="${EPREFIX}"/run/sudo
 		--with-vardir="${EPREFIX}"/var/db/sudo
 		--without-linux-audit
 		--without-opie
 		$(use_enable gcrypt)
 		$(use_enable nls)
 		$(use_enable sasl)
 		$(use_enable ssl openssl)
 		$(use_with ldap)
 		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
 		$(use_with offensive insults)
 		$(use_with offensive all-insults)
 		$(use_with pam)
 		$(use_with pam pam-login)
 		$(use_with secure-path secure-path "${SECURE_PATH}")
 		$(use_with selinux)
 		$(use_with sendmail)
 		$(use_with skey)
 		$(use_with sssd)
 	)
 	econf "${myeconfargs[@]}"
 }
 src_install() {
 	default
 	if use ldap ; then
 		dodoc README.LDAP
 		cat <<-EOF > "${T}"/ldap.conf.sudo
 		# See ldap.conf(5) and README.LDAP for details
 		# This file should only be readable by root
 		# supported directives: host, port, ssl, ldap_version
 		# uri, binddn, bindpw, sudoers_base, sudoers_debug
 		# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
 		EOF
 		if use sasl ; then
 			cat <<-EOF >> "${T}"/ldap.conf.sudo
 			# SASL directives: use_sasl, sasl_mech, sasl_auth_id
 			# sasl_secprops, rootuse_sasl, rootsasl_auth_id, krb5_ccname
 			EOF
 		fi
 		insinto /etc
 		doins "${T}"/ldap.conf.sudo
 		fperms 0440 /etc/ldap.conf.sudo
 		insinto /etc/openldap/schema
 		newins doc/schema.OpenLDAP sudo.schema
 	fi
 	if use pam; then
 		pamd_mimic system-auth sudo auth account session
 		pamd_mimic system-auth sudo-i auth account session
 	fi
 	keepdir /var/db/sudo/lectured
 	fperms 0700 /var/db/sudo/lectured
 	fperms 0711 /var/db/sudo #652958
 	# Don't install into /run as that is a tmpfs most of the time
 	# (bug #504854)
 	rm -rf "${ED}"/run || die
 	find "${ED}" -type f -name "*.la" -delete || die #697812
 }
 pkg_postinst() {
 	tmpfiles_process sudo.conf
 	#652958
 	local sudo_db="${EROOT}/var/db/sudo"
 	if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
 		chmod 711 "${sudo_db}" || die
 	fi
 	if use ldap ; then
 		ewarn
 		ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
 		ewarn
 		if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
 			ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
 			ewarn "configured in /etc/nsswitch.conf."
 			ewarn
 			ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
 			ewarn "  sudoers: ldap files"
 			ewarn
 		fi
 	fi
 	if use prefix ; then
 		ewarn
 		ewarn "To use sudo, you need to change file ownership and permissions"
 		ewarn "with root privileges, as follows:"
 		ewarn
 		ewarn "  # chown root:root ${EPREFIX}/usr/bin/sudo"
 		ewarn "  # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
 		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers"
 		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers.d"
 		ewarn "  # chown root:root ${EPREFIX}/var/db/sudo"
 		ewarn "  # chmod 4111 ${EPREFIX}/usr/bin/sudo"
 		ewarn
 	fi
 	elog "To use the -A (askpass) option, you need to install a compatible"
 	elog "password program from the following list. Starred packages will"
 	elog "automatically register for the use with sudo (but will not force"
 	elog "the -A option):"
 	elog ""
 	elog " [*] net-misc/ssh-askpass-fullscreen"
 	elog "     net-misc/x11-ssh-askpass"
 	elog ""
 	elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
 	elog "variable to the program you want to use."
 }
--- a/app-admin/sudo/sudo-1.9.5_p1-r1.ebuild
+++ b/app-admin/sudo/sudo-1.9.5_p1-r1.ebuild
@ -1,262 +0,0 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit pam multilib libtool systemd tmpfiles
 MY_P="${P/_/}"
 MY_P="${MY_P/beta/b}"
 DESCRIPTION="Allows users or groups to run commands as other users"
 HOMEPAGE="https://www.sudo.ws/"
 if [[ ${PV} == "9999" ]] ; then
 	inherit mercurial
 	EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
 else
 	uri_prefix=
 	case ${P} in
 		*_beta*|*_rc*) uri_prefix=beta/ ;;
 	esac
 	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
 	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
 		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~sparc-solaris"
 	fi
 fi
 # Basic license is ISC-style as-is, some files are released under
 # 3-clause BSD license
 LICENSE="ISC BSD"
 SLOT="0"
 IUSE="gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd"
 DEPEND="
 	sys-libs/zlib:=
 	gcrypt? ( dev-libs/libgcrypt:= )
 	ldap? (
 		>=net-nds/openldap-2.1.30-r1
 		sasl? (
 			dev-libs/cyrus-sasl
 			net-nds/openldap[sasl]
 		)
 	)
 	pam? ( sys-libs/pam )
 	sasl? ( dev-libs/cyrus-sasl )
 	skey? ( >=sys-auth/skey-1.1.5-r1 )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
 	)
 	sssd? ( sys-auth/sssd[sudo] )
 "
 RDEPEND="
 	${DEPEND}
 	>=app-misc/editor-wrapper-3
 	virtual/editor
 	ldap? ( dev-lang/perl )
 	pam? ( sys-auth/pambase )
 	selinux? ( sec-policy/selinux-sudo )
 	sendmail? ( virtual/mta )
 "
 BDEPEND="
 	sys-devel/bison
 	virtual/pkgconfig
 "
 S="${WORKDIR}/${MY_P}"
 REQUIRED_USE="
 	?? ( pam skey )
 	?? ( gcrypt ssl )
 "
 MAKEOPTS+=" SAMPLES="
 src_prepare() {
 	default
 	elibtoolize
 }
 set_secure_path() {
 	# FIXME: secure_path is a compile time setting. using PATH or
 	# ROOTPATH is not perfect, env-update may invalidate this, but until it
 	# is available as a sudoers setting this will have to do.
 	einfo "Setting secure_path ..."
 	# first extract the default ROOTPATH from build env
 	SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env;
 		echo "${ROOTPATH}")
 		case "${SECURE_PATH}" in
 			*/usr/sbin*) ;;
 			*) SECURE_PATH=$(unset PATH;
 				. "${EPREFIX}"/etc/profile.env; echo "${PATH}")
 				;;
 		esac
 	if [[ -z ${SECURE_PATH} ]] ; then
 		ewarn "	Failed to detect SECURE_PATH, please report this"
 	fi
 	# then remove duplicate path entries
 	cleanpath() {
 		local newpath thisp IFS=:
 		for thisp in $1 ; do
 			if [[ :${newpath}: != *:${thisp}:* ]] ; then
 				newpath+=:${thisp}
 			else
 				einfo "   Duplicate entry ${thisp} removed..."
 			fi
 		done
 		SECURE_PATH=${newpath#:}
 	}
 	cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
 	# finally, strip gcc paths #136027
 	rmpath() {
 		local e newpath thisp IFS=:
 		for thisp in ${SECURE_PATH} ; do
 			for e ; do [[ ${thisp} == ${e} ]] && continue 2 ; done
 			newpath+=:${thisp}
 		done
 		SECURE_PATH=${newpath#:}
 	}
 	rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
 	einfo "... done"
 }
 src_configure() {
 	local SECURE_PATH
 	set_secure_path
 	# audit: somebody got to explain me how I can test this before I
 	# enable it.. - Diego
 	# plugindir: autoconf code is crappy and does not delay evaluation
 	# until `make` time, so we have to use a full path here rather than
 	# basing off other values.
 	myeconfargs=(
 		# requires some python eclass
 		--disable-python
 		--enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
 		--enable-zlib=system
 		--with-editor="${EPREFIX}"/usr/libexec/editor
 		--with-env-editor
 		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
 		--with-rundir="${EPREFIX}"/run/sudo
 		--with-vardir="${EPREFIX}"/var/db/sudo
 		--without-linux-audit
 		--without-opie
 		$(use_enable gcrypt)
 		$(use_enable nls)
 		$(use_enable sasl)
 		$(use_enable ssl openssl)
 		$(use_with ldap)
 		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
 		$(use_with offensive insults)
 		$(use_with offensive all-insults)
 		$(use_with pam)
 		$(use_with pam pam-login)
 		$(use_with secure-path secure-path "${SECURE_PATH}")
 		$(use_with selinux)
 		$(use_with sendmail)
 		$(use_with skey)
 		$(use_with sssd)
 	)
 	econf "${myeconfargs[@]}"
 }
 src_install() {
 	default
 	if use ldap ; then
 		dodoc README.LDAP
 		cat <<-EOF > "${T}"/ldap.conf.sudo
 		# See ldap.conf(5) and README.LDAP for details
 		# This file should only be readable by root
 		# supported directives: host, port, ssl, ldap_version
 		# uri, binddn, bindpw, sudoers_base, sudoers_debug
 		# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
 		EOF
 		if use sasl ; then
 			cat <<-EOF >> "${T}"/ldap.conf.sudo
 			# SASL directives: use_sasl, sasl_mech, sasl_auth_id
 			# sasl_secprops, rootuse_sasl, rootsasl_auth_id, krb5_ccname
 			EOF
 		fi
 		insinto /etc
 		doins "${T}"/ldap.conf.sudo
 		fperms 0440 /etc/ldap.conf.sudo
 		insinto /etc/openldap/schema
 		newins doc/schema.OpenLDAP sudo.schema
 	fi
 	if use pam; then
 		pamd_mimic system-auth sudo auth account session
 		pamd_mimic system-auth sudo-i auth account session
 	fi
 	keepdir /var/db/sudo/lectured
 	fperms 0700 /var/db/sudo/lectured
 	fperms 0711 /var/db/sudo #652958
 	# Don't install into /run as that is a tmpfs most of the time
 	# (bug #504854)
 	rm -rf "${ED}"/run || die
 	find "${ED}" -type f -name "*.la" -delete || die #697812
 }
 pkg_postinst() {
 	tmpfiles_process sudo.conf
 	#652958
 	local sudo_db="${EROOT}/var/db/sudo"
 	if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
 		chmod 711 "${sudo_db}" || die
 	fi
 	if use ldap ; then
 		ewarn
 		ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
 		ewarn
 		if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
 			ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
 			ewarn "configured in /etc/nsswitch.conf."
 			ewarn
 			ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
 			ewarn "  sudoers: ldap files"
 			ewarn
 		fi
 	fi
 	if use prefix ; then
 		ewarn
 		ewarn "To use sudo, you need to change file ownership and permissions"
 		ewarn "with root privileges, as follows:"
 		ewarn
 		ewarn "  # chown root:root ${EPREFIX}/usr/bin/sudo"
 		ewarn "  # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
 		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers"
 		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers.d"
 		ewarn "  # chown root:root ${EPREFIX}/var/db/sudo"
 		ewarn "  # chmod 4111 ${EPREFIX}/usr/bin/sudo"
 		ewarn
 	fi
 	elog "To use the -A (askpass) option, you need to install a compatible"
 	elog "password program from the following list. Starred packages will"
 	elog "automatically register for the use with sudo (but will not force"
 	elog "the -A option):"
 	elog ""
 	elog " [*] net-misc/ssh-askpass-fullscreen"
 	elog "     net-misc/x11-ssh-askpass"
 	elog ""
 	elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
 	elog "variable to the program you want to use."
 }
--- a/app-admin/sudo/sudo-1.9.3_p1-r1.ebuild
+++ b/app-admin/sudo/sudo-1.9.3_p1-r1.ebuild
@ -197,7 +197,6 @@ src_install() {
 		insinto /etc/openldap/schema
 		newins doc/schema.OpenLDAP sudo.schema
 	fi
 	if use pam; then
 		pamd_mimic system-auth sudo auth account session
 		pamd_mimic system-auth sudo-i auth account session
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/backupninja/Manifest
+++ b/app-backup/backupninja/Manifest
@ -1,2 +1,3 @@
 DIST backupninja-backupninja_upstream-1.1.0.tar.gz 188991 BLAKE2B 0fb7b10b4a7e635ec29238590e1fae8778e3031cdcd906bb81c4fd97e3ddf083db0e063daadbdfd0c0efe6e2447a7704a25767f65f7229705dba8f8f64c2ee2b SHA512 bea1b024f5bb8d103618f942afa07a7677f0b1896cbef611c461ba586e98c4667112282aa57fdc195f899920072b9cde7cbf97dee7c332fff67df36bb5288f87
 DIST backupninja-backupninja_upstream-1.2.0.tar.gz 186229 BLAKE2B dc96e10a2db2002d548f6340c807d79b258be7b02d6075450763467b2b9a1fa0c3141093c1725f3fece8efff5d5a35d3fc5deb9cb509c97068836cdd5f160049 SHA512 59c7d64136027f93c1e1fe8051d449405298e1fbb47f93db9af180a64e1356e1ee0a4f83db483c7b26c0ecd0c5a6b7cf023ab1b9bdb123ee04cb44b449442246
 DIST backupninja-backupninja_upstream-1.2.1.tar.gz 186791 BLAKE2B 2e761b5538c77f359b2cc8b8c593589303f36b5b4d4d9f65457a1786cc671bdc57ad067c5bc7678fbe1afdd17406c3dedd641f2553213ec28186defd4b9d1fd4 SHA512 974276697f908cbf2203fd0cd3ebfe4f44c350714616d3a74191df4f9e101ce6d5f90cd2887dc06c5ed937ea19f9b72db28f5735255fae9d6db4faeaacee808c
--- a/app-backup/backupninja/backupninja-1.2.1.ebuild
+++ b/app-backup/backupninja/backupninja-1.2.1.ebuild
@ -0,0 +1,21 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 DESCRIPTION="lightweight, extensible meta-backup system"
 HOMEPAGE="https://0xacab.org/liberate/backupninja"
 SRC_URI="https://0xacab.org/liberate/backupninja/-/archive/backupninja_upstream/${PV}/backupninja-backupninja_upstream-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 RDEPEND="dev-util/dialog"
 DEPEND=""
 S="${WORKDIR}/${PN}-${PN}_upstream-${PV}"
 src_configure() {
 	econf --localstatedir=/var #578614
 }
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/pius/pius-3.0.0-r1.ebuild
+++ b/app-crypt/pius/pius-3.0.0-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
@ -23,10 +23,10 @@ RDEPEND="${DEPEND}
 	dev-lang/perl"
 PATCHES=(
-  "${FILESDIR}/${P}-Fix-typos-132.patch"
+	"${FILESDIR}/${P}-Fix-typos-132.patch"
-  "${FILESDIR}/${P}-pius-keyring-mgr-Fix-constants-134.patch"
+	"${FILESDIR}/${P}-pius-keyring-mgr-Fix-constants-134.patch"
-  "${FILESDIR}/${P}-Fix-typo-in-readme-135.patch"
+	"${FILESDIR}/${P}-Fix-typo-in-readme-135.patch"
-  "${FILESDIR}/${P}-Minor-fixes-for-pius-report-137.patch"
+	"${FILESDIR}/${P}-Minor-fixes-for-pius-report-137.patch"
 )
 python_test() {
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@ -1,3 +1,2 @@
 DIST docker-compose-1.27.4.tar.gz 309308 BLAKE2B 098af5e0308de4fe72f8f7d5c9cbdb285ec1cb6fbd492baef8a4223f93591321c585ebabd4c7e4a40d7a1bce3ab2d7ccf4cee1d0a15e7f59bb80eb4df5b6c8d6 SHA512 b41b7cf88b1380021a30f9becb7567d1e154ef875c42b37483673b5107f1a26dae6868b92c6a61f695001eb63759b25f3729e6783272eb784047717cafea3b80
 DIST docker-compose-1.28.0.tar.gz 318112 BLAKE2B 2e721f2aed08f8c63c7c75aa91e6ee28d997763a7d93921e9a62c41b7d48943221aa2135e6ba3925db67b2376f662f81ef71df15180895ea4d5ced1edd0cc493 SHA512 c673f25ff993e7dcaf75512c378339bb7435d96310bf9a47ee3fd3a515967b323ed911b77c030a8e9c1d04b8aca235565a0ca0eaeab401c4ac48110712da405e
 DIST docker-compose-1.28.1.tar.gz 318162 BLAKE2B 3ad0815863eb9ef793d859dad82317f3badf77b888416169cd91514948d3b9d58ad827ed923d15f855cf587f8edb7890d1f659fd4713e22fea739c9391f681f9 SHA512 06a9e5b7aca2076b49ccb5ec000436d9e7f9facdf71f8b90fa9b293257c64a1dd6f328631dc900d6b31adb3adb3257be58c52af4270934d86e19b960b48a6e29
--- a/app-emulation/docker-compose/docker-compose-1.28.1.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.28.1.ebuild
@ -1,73 +0,0 @@
 # Copyright 2018-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit bash-completion-r1 distutils-r1
 MY_PV=${PV/_/-}
 DESCRIPTION="Multi-container orchestration for Docker"
 HOMEPAGE="https://github.com/docker/compose"
 SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
 	>=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
 	>=dev-python/docker-py-4.4.0[${PYTHON_USEDEP}]
 	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
 	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
 	>=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
 	dev-python/paramiko[${PYTHON_USEDEP}]
 	>=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
 	>=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
 	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	test? (
 		>=dev-python/pytest-5[${PYTHON_USEDEP}]
 		>=dev-python/ddt-1.2.2[${PYTHON_USEDEP}]
 	)"
 S="${WORKDIR}/compose-${MY_PV}"
 PATCHES=(
 	# Bug #679968 -- https://bugs.gentoo.org/679968
 	# Bug #681002 -- https://bugs.gentoo.org/681002
 	"${FILESDIR}"/${PN}-1.28.0_rc2-setup-py.patch
 )
 DOCS=( CHANGELOG.md README.md )
 src_prepare() {
 	# Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
 	sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
 	default
 }
 python_test() {
 	distutils_install_for_testing
 	${PYTHON} -m pytest tests/unit/ || die "tests failed under ${EPYTHON}"
 }
 python_install_all() {
 	newbashcomp contrib/completion/bash/docker-compose ${PN}
 	insinto /usr/share/zsh/site-functions
 	doins contrib/completion/zsh/*
 	distutils-r1_python_install_all
 }
--- a/app-emulation/libguestfs/libguestfs-1.36.13-r2.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.36.13-r2.ebuild
@ -71,7 +71,7 @@ COMMON_DEPEND="
 		>=dev-lang/ocaml-4.02:=[ocamlopt]
 		dev-ml/findlib[ocamlopt]
 		|| (
-			<dev-ml/ocaml-gettext-0.4.2[ocamlopt]
+			<dev-ml/ocaml-gettext-0.4.2
 			dev-ml/ocaml-gettext-stub[ocamlopt]
 		)
 		>=dev-ml/ounit-2[ocamlopt]
--- a/app-emulation/libguestfs/libguestfs-1.36.15-r2.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.36.15-r2.ebuild
@ -69,7 +69,7 @@ COMMON_DEPEND="
 		>=dev-lang/ocaml-4.02:=[ocamlopt]
 		dev-ml/findlib[ocamlopt]
 		|| (
-			<dev-ml/ocaml-gettext-0.4.2[ocamlopt]
+			<dev-ml/ocaml-gettext-0.4.2
 			dev-ml/ocaml-gettext-stub[ocamlopt]
 		)
 		>=dev-ml/ounit-2[ocamlopt]
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
--- a/app-office/gnumeric/gnumeric-1.12.48.ebuild
+++ b/app-office/gnumeric/gnumeric-1.12.48.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
@ -12,7 +12,7 @@ HOMEPAGE="http://www.gnumeric.org/"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+introspection libgda perl"
 REQUIRED_USE="introspection? ( ${PYTHON_REQUIRED_USE} )"
--- a/app-office/homebank/Manifest
+++ b/app-office/homebank/Manifest
@ -1,4 +1,3 @@
 DIST homebank-5.2.2.tar.gz 2601784 BLAKE2B e0a66cebbdc9247aeba9946c4adf5b6677abb49cd93d212fc8008c44c53a21966ee4fa1291f887196fe3168de992a892d54fe82aec228a88f613b45358076dd2 SHA512 83ccf7f96b1eb9f2e5c134b151dce53790092e2ecb06f5e6a5e50057d6a32cde6cf45b9e98c07a81e7f224d33dae5d98e4693e57c413df675f63d21b418525b0
 DIST homebank-5.2.8.tar.gz 2730743 BLAKE2B e5a1cd143f72cdb09b5e097853c89b2dac8ad3e35e0aa5d0f3372350545d887a96ae630cd8a5cb8c605230e84e4402a2c63cef8af76d00ff2c1875aea2313545 SHA512 e1cb0595f1a5cedad83d1b51223d15ea7f37ced9d14edad1f1af8ad8e0eed2938518ed936981558879b5a1bd8aa80d88f4303e69fff0d6e503a8abe61bf872be
 DIST homebank-5.3.2.tar.gz 2906468 BLAKE2B 0672890c469e9580a2128f130230a73d5bdc9e6b50830b1c0ead4f83d7e83837a2df4f50b49218dac9da6eb89f484a6866fcc748e65d5705ba5691e9772b7977 SHA512 777ee682f816f1b3a8f5d018148d79743be9fd17301d16e9c837e9fd46f8bd67cd393bfe9ef2960d87a7066a7f80fa7b88d7826ce62d4542693d3e09d7d5e887
 DIST homebank-5.4.2.tar.gz 2974448 BLAKE2B 0b6f6ad57633ecf560f821295797e9bcc83bb7f69b7b74ad38792f091593b5ae9dc79693b9d44f46414ee3e6f9e9d4fdc2dd5a174f2a50e79177d68506a2235c SHA512 6c28fed7f7a0019be87cd86d37f52a0ddedb0c2752bd311986a4ddfe33913a34e362eadc69e9238e391009fddb45a3a2b59e1176f2ca3f1901293a1b0989223e
 DIST homebank-5.4.3.tar.gz 3014659 BLAKE2B 7ec6aa1c8bdc7d26bae8ae751200a4ad9effd9aac08bd39a1969897d7904468f60606307be1b6e6587a662fd7874c8f73460e559c6d06820056811dd4e8fb85f SHA512 e2b3b45a6d35205c3d2bf24d4c0c065889fa4e7d92cc9551db873b8b33cc15e6c1dd721936b438db0725509233bf265446b0512e23973cbebae7af4a7dce96ba
--- a/app-office/homebank/homebank-5.2.2.ebuild
+++ b/app-office/homebank/homebank-5.2.2.ebuild
@ -1,50 +0,0 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI="6"
 inherit xdg-utils gnome2-utils
 DESCRIPTION="Free, easy, personal accounting for everyone"
 HOMEPAGE="http://homebank.free.fr/index.php"
 SRC_URI="http://homebank.free.fr/public/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="+ofx"
 KEYWORDS="amd64 ppc ~ppc64 x86"
 RDEPEND=">=dev-libs/glib-2.39
 	>=net-libs/libsoup-2.26
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf
 	>=x11-libs/gtk+-3.22:3
 	x11-libs/pango
 	ofx? ( >=dev-libs/libofx-0.8.3:= )"
 DEPEND="${RDEPEND}
 	>=dev-lang/perl-5.8.1
 	dev-perl/XML-Parser
 	>=dev-util/intltool-0.40.5
 	sys-devel/gettext
 	virtual/pkgconfig"
 DOCS=( AUTHORS ChangeLog README )
 src_configure() {
 	econf $(use_with ofx)
 }
 pkg_preinst() {
 	gnome2_icon_savelist
 }
 pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
 pkg_postrm() {
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
--- a/app-office/homebank/homebank-5.4.3.ebuild
+++ b/app-office/homebank/homebank-5.4.3.ebuild
@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="7"
-inherit xdg-utils gnome2-utils
+inherit xdg
 DESCRIPTION="Free, easy, personal accounting for everyone"
 HOMEPAGE="http://homebank.free.fr/index.php"
@ -20,8 +20,8 @@ RDEPEND=">=dev-libs/glib-2.39
 	>=x11-libs/gtk+-3.22:3
 	x11-libs/pango
 	ofx? ( >=dev-libs/libofx-0.8.3:= )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
-	>=dev-lang/perl-5.8.1
+BDEPEND=">=dev-lang/perl-5.8.1
 	dev-perl/XML-Parser
 	>=dev-util/intltool-0.40.5
 	sys-devel/gettext
@ -29,22 +29,13 @@ DEPEND="${RDEPEND}
 DOCS=( AUTHORS ChangeLog README )
-src_configure() {
+src_prepare() {
-	econf $(use_with ofx)
+	default
 }
-pkg_preinst() {
+	# avoid using eautoreconf
-	gnome2_icon_savelist
+	sed -i -e 's|\$(datadir)/appdata|\$(datadir)/metainfo|' data/Makefile.{am,in} ||die
 }
-pkg_postinst() {
+src_configure() {
-	xdg_desktop_database_update
+	econf $(use_with ofx)
 	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
 pkg_postrm() {
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/cvector/cvector-1.0.3.1.ebuild
+++ b/dev-libs/cvector/cvector-1.0.3.1.ebuild
@ -1,42 +1,40 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-inherit base eutils toolchain-funcs versionator
+inherit toolchain-funcs
 MY_PN=CVector
 MY_P="${MY_PN}-${PV}"
 DESCRIPTION="An ANSI C implementation of dynamic arrays (approximation of C++ vectors)"
 HOMEPAGE="http://cvector.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/${MY_PN}-$(get_version_component_range 1-3)/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/${MY_PN}-$(ver_cut 1-3)/${MY_P}.tar.gz"
 S="${WORKDIR}"/${MY_P}
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 S="${WORKDIR}"/${MY_P}
 PATCHES=(
 	"${FILESDIR}"/${P}-LDFLAGS.patch
 	"${FILESDIR}"/1.0.3-dynlib.patch
-	)
+)
 src_compile() {
 	emake \
-		CC=$(tc-getCC) \
+		CC="$(tc-getCC)" \
-		CXX=$(tc-getCXX) \
+		CXX="$(tc-getCXX)" \
 		CFLAGS="${CFLAGS}" \
 		all
 }
 src_install() {
-	ln -sf libCVector.so.$(get_version_component_range 1-3) libCVector.so.$(get_major_version) || die
+	ln -sf libCVector.so.$(ver_cut 1-3) libCVector.so.$(ver_cut 1) || die
-	ln -sf libCVector.so.$(get_version_component_range 1-3) libCVector.so || die
+	ln -sf libCVector.so.$(ver_cut 1-3) libCVector.so || die
 	dolib.so libCVector.so*
 	dolib.so libCVector.so*
 	doheader *.h
 	dodoc README_CVector.txt
--- a/dev-libs/cvector/files/1.0.3-dynlib.patch
+++ b/dev-libs/cvector/files/1.0.3-dynlib.patch
@ -1,5 +1,3 @@
 diff --git a/Makefile b/Makefile
 index 865db81..2691108 100644
 --- a/Makefile
 +++ b/Makefile
@@ -96,8 +96,8 @@ BUILD_COMMAND_STATIC   =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -static -I $(IN
--- a/dev-libs/cvector/files/cvector-1.0.3.1-LDFLAGS.patch
+++ b/dev-libs/cvector/files/cvector-1.0.3.1-LDFLAGS.patch
@ -1,5 +1,5 @@
--- Makefile	2009-07-08 04:02:56.000000000 +0200
+--- a/Makefile
-+++ Makefile.new	2009-07-25 11:59:27.000000000 +0200
+++ b/Makefile
@@ -89,10 +89,10 @@
 endif
--- a/dev-libs/glib/glib-2.64.5.ebuild
+++ b/dev-libs/glib/glib-2.64.5.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
@ -14,7 +14,7 @@ SLOT="2"
 IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
 RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 # * libelf isn't strictly necessary, but makes gresource tool more useful, and
 # the check is automagic in gio/meson.build. gresource is not a multilib tool
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild
@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.bz2"
 # clause "or later" so we use LGPL-2.1 without +
 LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
 SLOT="0/2" # soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="+cxx static-libs test"
 RDEPEND="app-eselect/eselect-cdparanoia
--- a/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild
+++ b/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild
@ -17,7 +17,7 @@ LICENSE="|| ( WTFPL-2 public-domain )"
 # Helpful site:
 # https://abi-laboratory.pro/index.php?view=timeline&l=libtomcrypt
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86"
 IUSE="+gmp +libtommath tomsfastmath"
 BDEPEND="
--- a/dev-libs/libwbxml/Manifest
+++ b/dev-libs/libwbxml/Manifest
@ -1,2 +1,3 @@
 DIST libwbxml-0.11.2.tar.bz2 354176 BLAKE2B bedc86dc269c876d788b682b67fbc021a50ee6742dad4424a118edee061e5f745941dff5589c2b4da562822f655b277c09858382615564831317bcb5b51a4c16 SHA512 1eb01e35b1fab548163caca8ba024216926995adaf2e3bd7a001927858c51a792620eb7e9ca111fc6bdf5af5c1a1cbd3eac3fe53d427cd1a6d9e8aadfc51bf1f
 DIST libwbxml-0.11.6.tar.bz2 360001 BLAKE2B 96fca6a457369b7546c50bb4459490e2dc7b2bf97c3c198abc386e099695a3a1912b7292bb541b841fe63a225d8c387bb13100b458ca17a4daf252751a9a861d SHA512 534c647bae41bf703bb48158d63dc0dd168ead5c4bcd6e775e2ce2588e1bce82f3f9f94ebd863fea2a40f0e9d4af39849a673093e66d7b26f77ab012cf6f108d
 DIST libwbxml-0.11.7.tar.gz 427429 BLAKE2B 1ec456032d4d343f5b11c60dfe5fa5dfb8750c87f1e05c48b1671257822ce7ec121a7006ed9749aacd84d4ce9f5dfa0c358cf3f3581a4a24a34db1c91338f74a SHA512 fc855650661593596a158527682d2c40d800c1fa44169d79e9ca9c6d64d67b6c660807ed89b1bddd644f114c27711356627ac919af91fd7f19d409879505512f
--- a/dev-libs/libwbxml/libwbxml-0.11.7.ebuild
+++ b/dev-libs/libwbxml/libwbxml-0.11.7.ebuild
@ -0,0 +1,33 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit cmake
 DESCRIPTION="Library and tools to parse, encode and handle WBXML documents"
 HOMEPAGE="https://github.com/libwbxml/libwbxml"
 SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 RDEPEND="dev-libs/expat
 	virtual/libiconv"
 DEPEND="${RDEPEND}
 	test? ( dev-libs/check )"
 DOCS=( BUGS ChangeLog README References THANKS TODO )
 S=${WORKDIR}/${PN}-${P}
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_INSTALL_DOC=OFF
 		-DENABLE_UNIT_TEST=$(usex test)
 	)
 	cmake_src_configure
 }
--- a/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild
+++ b/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild
@ -16,7 +16,7 @@ LICENSE="Unlicense"
 # Helpful site:
 # https://abi-laboratory.pro/index.php?view=timeline&l=tomsfastmath
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86"
 BDEPEND="sys-devel/libtool"
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
--- a/dev-ml/camlp4/camlp4-4.11_p1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.11_p1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
@ -20,6 +20,8 @@ RDEPEND="${DEPEND}"
 DEPEND="${DEPEND}
 	dev-ml/ocamlbuild"
 QA_FLAGS_IGNORED='.*'
 S=${WORKDIR}/${P/_p/-}
 PATCHES=( "${FILESDIR}/reload.patch" )
--- a/dev-ml/camlp4/metadata.xml
+++ b/dev-ml/camlp4/metadata.xml
@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>ml@gentoo.org</email>
 		<name>ML</name>
 	</maintainer>
 	<maintainer type="person">
 		<email>gienah@gentoo.org</email>
 		<name>Mark Wright</name>
--- a/dev-ml/core/core-0.14.0-r2.ebuild
+++ b/dev-ml/core/core-0.14.0-r2.ebuild
@ -19,8 +19,8 @@ RESTRICT="test"
 RDEPEND="
 	dev-ml/base:=
 	dev-ml/configurator:=
 	dev-ml/core_kernel:=
 	dev-ml/jst-config:=
 	dev-ml/ppx_assert:=
 	dev-ml/ppx_driver:=
 	dev-ml/ppx_jane:=
--- a/dev-ml/core_kernel/core_kernel-0.14.1-r2.ebuild
+++ b/dev-ml/core_kernel/core_kernel-0.14.1-r2.ebuild
@ -18,10 +18,10 @@ RDEPEND="
 	dev-lang/ocaml:=
 	dev-ml/base:=
 	dev-ml/base_bigstring:=
-	dev-ml/bin-prot:=
+	dev-ml/bin_prot:=
 	dev-ml/configurator:=
 	dev-ml/fieldslib:=
 	dev-ml/jane-street-headers:=
 	dev-ml/jst-config:=
 	dev-ml/ppx_assert:=
 	dev-ml/ppx_base:=
 	dev-ml/ppx_driver:=
--- a/dev-ml/cudf/cudf-0.9.ebuild
+++ b/dev-ml/cudf/cudf-0.9.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
@ -28,6 +28,8 @@ DEPEND="${RDEPEND}
 "
 PATCHES=( "${FILESDIR}/ounit2.patch" )
 QA_FLAGS_IGNORED='.*'
 src_prepare() {
 	default
--- a/dev-ml/cudf/metadata.xml
+++ b/dev-ml/cudf/metadata.xml
@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>ml@gentoo.org</email>
 		<name>ML</name>
 	</maintainer>
 	<maintainer type="person">
 		<email>gienah@gentoo.org</email>
 		<name>Mark Wright</name>
--- a/dev-ml/dose3/dose3-5.0.1-r1.ebuild
+++ b/dev-ml/dose3/dose3-5.0.1-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
@ -35,6 +35,8 @@ DEPEND="${RDEPEND}
 # missing test data
 RESTRICT="test"
 QA_FLAGS_IGNORED='.*'
 S="${WORKDIR}/${MY_P}"
 src_prepare() {
--- a/dev-ml/dose3/metadata.xml
+++ b/dev-ml/dose3/metadata.xml
@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>ml@gentoo.org</email>
 		<name>ML</name>
 	</maintainer>
 	<maintainer type="person">
 		<email>gienah@gentoo.org</email>
 		<name>Mark Wright</name>
--- a/dev-ml/dune/dune-2.8.2.ebuild
+++ b/dev-ml/dune/dune-2.8.2.ebuild
@ -17,6 +17,8 @@ DEPEND="dev-lang/ocaml"
 RDEPEND="${DEPEND}
 	!dev-ml/jbuilder"
 QA_FLAGS_IGNORED=/usr/bin/dune
 src_configure() {
 	:
 }
--- a/dev-ml/findlib/findlib-1.8.1-r2.ebuild
+++ b/dev-ml/findlib/findlib-1.8.1-r2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
@ -16,6 +16,8 @@ DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]
 	tk? ( dev-ml/labltk:= )"
 RDEPEND="${DEPEND}"
 QA_FLAGS_IGNORED='.*'
 PATCHES=( "${FILESDIR}"/externalmeta7.patch )
 src_prepare() {
--- a/dev-ml/ocaml-gettext-camomile/ocaml-gettext-camomile-0.4.2.ebuild
+++ b/dev-ml/ocaml-gettext-camomile/ocaml-gettext-camomile-0.4.2.ebuild
@ -24,14 +24,14 @@ BDEPEND="
 	dev-ml/dune-configurator
 "
 RDEPEND="
-	dev-ml/base:=[ocamlopt]
+	dev-ml/base:=
 	dev-ml/camomile:=[ocamlopt]
-	dev-ml/ocaml-gettext:=[ocamlopt=]
+	dev-ml/ocaml-gettext:=
 "
 DEPEND="
 	${RDEPEND}
 	test? (
 		dev-ml/ounit[ocamlopt=]
-		dev-ml/ocaml-fileutils[ocamlopt=]
+		dev-ml/ocaml-fileutils
 	)
 "
--- a/dev-ml/ocaml-gettext-stub/ocaml-gettext-stub-0.4.2.ebuild
+++ b/dev-ml/ocaml-gettext-stub/ocaml-gettext-stub-0.4.2.ebuild
@ -24,14 +24,14 @@ BDEPEND="
 	dev-ml/dune-configurator
 "
 RDEPEND="
-	dev-ml/base:=[ocamlopt=]
+	dev-ml/base:=
 	dev-ml/camomile:=[ocamlopt=]
-	dev-ml/ocaml-gettext:=[ocamlopt=]
+	dev-ml/ocaml-gettext:=
 "
 DEPEND="
 	${RDEPEND}
 	test? (
-		dev-ml/ocaml-fileutils[ocamlopt=]
+		dev-ml/ocaml-fileutils
 		dev-ml/ounit[ocamlopt=]
 	)
 "
--- a/dev-ml/ocaml-gettext/ocaml-gettext-0.4.2.ebuild
+++ b/dev-ml/ocaml-gettext/ocaml-gettext-0.4.2.ebuild
@ -21,7 +21,7 @@ BDEPEND="
 	dev-ml/dune-configurator
 "
 RDEPEND="
-	dev-ml/base:=[ocamlopt=]
+	dev-ml/base:=
 	>=dev-ml/camomile-0.8.3:=[ocamlopt=]
 	>=dev-ml/ocaml-fileutils-0.4.0:=[ocamlopt=]
 	sys-devel/gettext
--- a/dev-ml/ocamlbuild/metadata.xml
+++ b/dev-ml/ocamlbuild/metadata.xml
@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>ml@gentoo.org</email>
 		<name>ML</name>
 	</maintainer>
 	<maintainer type="person">
 		<email>gienah@gentoo.org</email>
 		<name>Mark Wright</name>
--- a/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild
@ -24,6 +24,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.14.0-Disable-tests-failing-with-OCaml-4.08.0.patch
 )
 QA_FLAGS_IGNORED='.*'
 src_configure() {
 	emake -f configure.make Makefile.config \
 		PREFIX="${EPREFIX}/usr" \
--- a/dev-ml/ocamlweb/metadata.xml
+++ b/dev-ml/ocamlweb/metadata.xml
@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>ml@gentoo.org</email>
 		<name>ML</name>
 	</maintainer>
 	<maintainer type="person">
 		<email>gienah@gentoo.org</email>
 		<name>Mark Wright</name>
--- a/dev-ml/ocamlweb/ocamlweb-1.41.ebuild
+++ b/dev-ml/ocamlweb/ocamlweb-1.41.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
@ -12,19 +12,24 @@ SRC_URI="https://www.lri.fr/~filliatr/ftp/ocamlweb/${P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 DEPEND=">=dev-lang/ocaml-4.08.0:=
 	virtual/latex-base
-	dev-texlive/texlive-latexextra
+	dev-texlive/texlive-latexextra"
-	"
+BDEPEND="test? ( dev-tex/hevea )"
 PATCHES=(
 	"${FILESDIR}/${PN}-1.41-strip.patch"
 	"${FILESDIR}/${PN}-1.41-ocaml-4.08.0.patch"
 	)
 QA_FLAGS_IGNORED=/usr/bin/ocamlweb
 src_compile() {
-	emake
+	default
 }
 src_install() {
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
--- a/dev-python/bleach/Manifest
+++ b/dev-python/bleach/Manifest
@ -1,2 +1,3 @@
 DIST bleach-3.2.1.tar.gz 179763 BLAKE2B 5288277ceae1f51fb76c360db72fb646e1d391b3e51f29ba2b25f5dba7704af8ef7cfd2db017237dad42ff4a99e502daa29cdf4edd82952e15842e288c50c0dd SHA512 61710f48f00333b38d251360736e19078063433ca4d7aada210a986f7d79b08c79c64b412686c67f360e4b2e8420c40c4b515eb175ab92bd546f88e2ba0e5835
 DIST bleach-3.2.2.tar.gz 180189 BLAKE2B 14b496ced66abb5dadabbfaca7663124deda939c494cfc79803db875bcd4195f3b951962d219d56780de56320948c4d5be294a73a8244d1dfa1ced3fe92862d2 SHA512 20e58b58f6464d819ffbf70d0dbaf4b52eac8894d089291b40c2e27440d5c78577f653020ab6296ca72de27bbad60f58e07ce4bcf140ccb21928b0f600f1c236
 DIST bleach-3.2.3.tar.gz 180414 BLAKE2B 2b46fbedd109649e61b17719cc6fbbaa34e03e878938eee17aa81c66e11887ca9156e5e1b2a99b19f319c99df9fd0ce4d91106acae1638cf2569df0f1c41b788 SHA512 0bee6415ed0d6349311e92b68c4897b830a9ae8c0b1399a35da8ebb76af7b989b67c3e90c24cc34fd8afb903ee5f8de1062a0fa0e34a75328a281cf1706193a0
--- a/dev-python/bleach/bleach-3.2.3.ebuild
+++ b/dev-python/bleach/bleach-3.2.3.ebuild
@ -0,0 +1,39 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{7..9} pypy3 )
 inherit distutils-r1
 DESCRIPTION="an easy whitelist-based HTML-sanitizing tool"
 HOMEPAGE="https://github.com/mozilla/bleach https://pypi.org/project/bleach/"
 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 ~s390 ~sparc ~x86 ~x64-macos"
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
 	>=dev-python/html5lib-1.0.1-r1[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/webencodings[${PYTHON_USEDEP}]
 "
 distutils_enable_tests pytest
 PATCHES=(
 	"${FILESDIR}"/bleach-3.2.1-py39.patch
 )
 src_prepare() {
 	# unbundle unpatched broken html5lib
 	rm -r bleach/_vendor || die
 	sed -i -e 's:bleach\._vendor\.::' \
 		bleach/html5lib_shim.py \
 		bleach/sanitizer.py \
 		tests/test_clean.py || die
 	distutils-r1_src_prepare
 }
--- a/dev-python/blosc/blosc-1.10.1.ebuild
+++ b/dev-python/blosc/blosc-1.10.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@ -5,3 +5,4 @@ DIST boto3-1.16.56.tar.gz 344547 BLAKE2B da32affd031a7efd7f55ec390f657d02caaf37d
 DIST boto3-1.16.57.tar.gz 344712 BLAKE2B 572a70f9afad3502d9f2bbaa5950654e45d40269bbb995e96d94573b423d4e182d314e36de97435c93f9608c780b79e073da79fcd4dd699899a83b60d864907d SHA512 a588ebdd03d189b63999523a2f68c0f1021b82299bf9875f7aebc3120b8db61afd9d784fb65885c87efe9e8ebe416f3c601ddd9615965a61a5910bb1f8e89e9f
 DIST boto3-1.16.58.tar.gz 344789 BLAKE2B dfaac853e0e26b17612dbf20ffa83363c3bfcfcaca4f31b1c6e987c073c291eebe3c692a0f530b0491bc5042b3de627607694bd90df57f4df8503057233dfb14 SHA512 6d1fba2f614398b7b897e422a387553fcd796027f9929f6df5dc862ce06385d2b21e119246ad7e86b71ca050cd3f29a9801101d0cf3bdb8f5fd7772bb6ee9e66
 DIST boto3-1.16.59.tar.gz 344923 BLAKE2B 24c81452191a5c48b8fde37c5ba08c2c9f4cd521220cf2dfbf8b275261e3a90a66a1f5091455f79d113dd7fbcbb9ccb3f3938fdf1a845df631e6e7a444b3faf6 SHA512 1ed87af12e4672690b184df791bfaac82345a46148a7e7b4cb5c67c42b6091cba15453df5b049c796d0d8baff3cd0220fca279ef9b6df1ee1f489e39fb8e8e30
 DIST boto3-1.16.60.tar.gz 344983 BLAKE2B c479bc65a04ef01576b046452b125eef931274923dcc3122ca216affd7de55198ace650cf3923fe062ee9a1246d9bd6b2a9e512b88aa91ca5dd8426f3c341958 SHA512 cc7764ace2f94b657de3f6fba977c0b8dcf3e71d159e3ea93fe2d2a6c2e02357655dc08d5ad21e4884173f5a79204c8405d833b4f78063e7f071e7ff8299de7f
--- a/dev-python/boto3/boto3-1.16.43.ebuild
+++ b/dev-python/boto3/boto3-1.16.43.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
@ -17,7 +17,7 @@ if [[ "${PV}" == "9999" ]]; then
 	BOTOCORE_PV=${PV}
 else
 	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 	# botocore is x.(y+3).z
 	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
--- a/dev-python/boto3/boto3-1.16.60.ebuild
+++ b/dev-python/boto3/boto3-1.16.60.ebuild
@ -0,0 +1,56 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_USE_SETUPTOOLS=bdepend
 inherit distutils-r1
 DESCRIPTION="The AWS SDK for Python"
 HOMEPAGE="https://github.com/boto/boto3"
 LICENSE="Apache-2.0"
 SLOT="0"
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/boto/boto3"
 	inherit git-r3
 	BOTOCORE_PV=${PV}
 else
 	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 	# botocore is x.(y+3).z
 	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
 fi
 RDEPEND="
 	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
 	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
 	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 	)
 "
 distutils_enable_sphinx docs/source \
 	'dev-python/guzzle_sphinx_theme'
 distutils_enable_tests nose
 python_prepare_all() {
 	# don't lock versions to narrow ranges
 	sed -e '/botocore/ d' \
 		-e '/jmespath/ d' \
 		-e '/s3transfer/ d' \
 		-i setup.py || die
 	# prevent an infinite loop
 	rm tests/functional/docs/test_smoke.py || die
 	distutils-r1_python_prepare_all
 }
 python_test() {
 	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
 }
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@ -5,3 +5,4 @@ DIST botocore-1.19.56.tar.gz 7390812 BLAKE2B 3bec12ce19f39f12a72f7f59f226568cb5a
 DIST botocore-1.19.57.tar.gz 7393040 BLAKE2B 1eb29dbf95a373fc516febfe2222129f42f2c82fc37a5a6c8e1519b3f5fe63e760c0b4440573c7eb86c94a1463ecddc3046c024cc0415fe53e1a76e9362edc71 SHA512 da4cc5009a755f3be975169ba5226586f4de425f3bed2ea6eda3235bd4fc4591155715a410f47073afa7f606b290f371e776643b0d8d43a00313599630f7390a
 DIST botocore-1.19.58.tar.gz 7395107 BLAKE2B 8ec21595faef30401cc84802cd1863cf9557240e733d2bd4c9ce2418f8fa3ab93d5e7f7fb4a3e35f0a5f4bc3c79bdc87be1fed3d5a66943a545d263d674cf54e SHA512 8fc7348df4a755097ba6c68db67f4685c137ccd2a82257d035588cab6dc72a4765aaf8c9748962a4e5ee5b19f8aa0c5f25feac051592464a04acad27e8fd1e09
 DIST botocore-1.19.59.tar.gz 7430783 BLAKE2B 1837dc9c3dd2948dcb37adbe5b0421c0dc4fbd245be94ef5947f8544e06b271670a78e1927cd3805906389855d973801b45b615b89dcc7c766a5252dad76d5ea SHA512 c3a9cafe5f1f8c7fecf41a7119d0b99062c4bc9be0cd1f0a7e255a13e9809af05b5e8b1e4468afda3236e8babd080241d1dc237ef668161933b5d722b3e3f7dd
 DIST botocore-1.19.60.tar.gz 7432208 BLAKE2B 6dd879a5c0c812dd218a71f9712758ec6195b4770afc582bb1e062be360e7909e33ef62896e08be1bc8c57840333cc6fb8f4ce3817b248acff58258654b6a138 SHA512 d38a278dbca897b06d4d7589084b6f3d385051ec346a716b9ce90f1e8980abc2c617f94aa6e3f13960fc86820393dd7c1ed2d391a6bf1fea3edc6f1ba750b24d
--- a/dev-python/botocore/botocore-1.19.43.ebuild
+++ b/dev-python/botocore/botocore-1.19.43.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
@ -16,7 +16,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 fi
 RDEPEND="
--- a/dev-python/botocore/botocore-1.19.60.ebuild
+++ b/dev-python/botocore/botocore-1.19.60.ebuild
@ -0,0 +1,59 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 DESCRIPTION="Low-level, data-driven core of boto 3"
 HOMEPAGE="https://github.com/boto/botocore"
 LICENSE="Apache-2.0"
 SLOT="0"
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/boto/botocore"
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 fi
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/jmespath[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/jsonschema[${PYTHON_USEDEP}]
 	)
 "
 PATCHES=(
 	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
 )
 distutils_enable_sphinx docs/source \
 	'dev-python/guzzle_sphinx_theme'
 distutils_enable_tests nose
 src_prepare() {
 	# unpin deps
 	sed -i -e "s:>=.*':':" setup.py || die
 	# very unstable
 	sed -i -e 's:test_stress_test_token_bucket:_&:' \
 		tests/functional/retries/test_bucket.py || die
 	distutils-r1_src_prepare
 }
 python_test() {
 	# note: suites need to be run separately as one of the unit tests
 	# seems to be leaking mocks and breaking a few functional tests
 	nosetests -v tests/unit ||
 		die "unit tests failed under ${EPYTHON}"
 	nosetests -v tests/functional ||
 		die "functional tests failed under ${EPYTHON}"
 }
--- a/dev-python/bpython/bpython-0.21.ebuild
+++ b/dev-python/bpython/bpython-0.21.ebuild
@ -32,7 +32,7 @@ BDEPEND="
 	dev-python/sphinx[${PYTHON_USEDEP}]
 	"
-DOCS=( AUTHORS CHANGELOG sample.theme light.theme )
+DOCS=( AUTHORS.rst CHANGELOG.rst )
 distutils_enable_sphinx doc/sphinx/source --no-autodoc
 distutils_enable_tests unittest
--- a/dev-python/braintree/metadata.xml
+++ b/dev-python/braintree/metadata.xml
@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
 	<maintainer type="person">
 		<email>cedk@gentoo.org</email>
 		<name>Cédric Krier</name>
--- a/dev-python/construct/Manifest
+++ b/dev-python/construct/Manifest
@ -1 +1,2 @@
 DIST construct-2.10.56.tar.gz 1184110 BLAKE2B 01ce1800970826ae3584a9733de171e04dd926e7d19d8b48b4364406b4aa0f4d878ec52f9a7f755bb249aeeaca75ae6221d6bdf302d4342d4974d268b1782175 SHA512 cc9aa126c26a017a3fb7b78a6b8f2056194028a44c8ed615a6dc4a445d50f0463e2de0b80810ab5a252070925a56b5a61dbb601a3de9e445d861356231a146d5
 DIST construct-2.10.57.tar.gz 1184585 BLAKE2B abaeebf5872cc97cc67d47cf79370fecdb1abafb62fa80b6acfa63de9087f70fa67fd69e90ab4e78e7ac179c1bb1011529e34201c3c2270e1a2651c97cc678b2 SHA512 ef2f0bbcf4cbcf4862033b16ccb428f84d63ca5c867157b47e38b441cb439c953b543cf69f352c0542525fd07b37d1b3b68910ae5331c482e75b4af937e116a1
--- a/dev-python/construct/construct-2.10.57.ebuild
+++ b/dev-python/construct/construct-2.10.57.ebuild
@ -0,0 +1,36 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1
 DESCRIPTION="A powerful declarative parser for binary data"
 HOMEPAGE="https://construct.readthedocs.io/en/latest/ https://pypi.org/project/construct/"
 SRC_URI="https://github.com/construct/construct/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 BDEPEND="
 	test? (
 		dev-python/arrow[${PYTHON_USEDEP}]
 		>=dev-python/numpy-1.15.4[${PYTHON_USEDEP}]
 		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
 	)"
 distutils_enable_tests pytest
 src_prepare() {
 	distutils-r1_src_prepare
 	rm tests/test_benchmarks.py || die
 }
 pkg_postinst() {
 	ewarn "Version 2.10.x has significant API and implementation changes from"
 	ewarn "previous 2.9.x releases. Please read the documentation at"
 	ewarn "https://construct.readthedocs.io/en/latest/transition210.html"
 	ewarn "for more info."
 }
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@ -1,3 +1,4 @@
 DIST coverage-4.5.4.tar.gz 385185 BLAKE2B 9d040bff13cebd1cb7147f15c3ec03bb08648cf801b5b2bb046a6b5bcadb3d3886be8bf0a624d225f25d10a5ca82fe5fb88f55e44e92a0a3285836b837972970 SHA512 ba534e04fe35cbadc4b16735f25c08f579a49a6677ec106680f222f2dfb3d0f1e011d0962f1c2108c375173ac4588bea1619ecda05ff9ba6fd888daddfd27b0e
 DIST coverage-5.3.1.tar.gz 684457 BLAKE2B 82c8e311d85a6f758c46767957199e94099838e3c340f5da1472813a2877293245583cb190acc0139cddf3363ee5f299fb42f955c59912b80d9d1ece8cfb09fa SHA512 981ebc9f9490efe613edd68afdef83cb161b303e6de266335ffd2d1d3634bd5a088cbff249b0243071b55cb4f31b4b0c7537b5764660ccc86a7059307badd571
 DIST coverage-5.3.tar.gz 693632 BLAKE2B 9daa3a0fd7f8c3ff7c9d68603e11a0a419d3ab50e3c3fb6be5b694aa1f7566040e1212b7175dfa4f71a0a309db325c00f94a85e0e9e755ae8c4f09c499d0daf4 SHA512 f40a21c394b1a72118965f702ae2b8e09c4e0b2fe92709aedf1de4c8074cd9c2cae0ed4860fbb863e4e5479f1067ff806d7051f7683d6b324de9945c0cacfc39
 DIST coverage-5.4.tar.gz 687727 BLAKE2B 54c9e605eaed551aff0c6764bf2747e2ce64a7c0596cb78cb4ad6998c4b7d79fe31bfe98eb240aee4c838dde6a4536f8e84d00c14846bb671b51b28168a96947 SHA512 c682806bce603fff1ff09234c72e17370093192053961656f06ef4bcc7928f052ef4a350e80687c640d7608a22f4f3434e1836d83674eebca53459745838f519
--- a/dev-python/coverage/coverage-5.3.1.ebuild
+++ b/dev-python/coverage/coverage-5.3.1.ebuild
@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc ~x86 ~x64-macos"
 #IUSE="test"
 # The tests are impossible to appease.  Please run them externally
 # via tox.  Or fix the ebuild if you have hours of time to spend
--- a/dev-python/coverage/coverage-5.4.ebuild
+++ b/dev-python/coverage/coverage-5.4.ebuild
@ -0,0 +1,69 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 PYTHON_REQ_USE="threads(+),sqlite(+)"
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 DESCRIPTION="Code coverage measurement for Python"
 HOMEPAGE="https://coverage.readthedocs.io/en/latest/ https://pypi.org/project/coverage/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 #IUSE="test"
 # The tests are impossible to appease.  Please run them externally
 # via tox.  Or fix the ebuild if you have hours of time to spend
 # on something utterly useless.
 RESTRICT="test"
 #BDEPEND="
 #	test? (
 #		dev-python/PyContracts[${PYTHON_USEDEP}]
 #		dev-python/flaky[${PYTHON_USEDEP}]
 #		dev-python/hypothesis[${PYTHON_USEDEP}]
 #		dev-python/mock[${PYTHON_USEDEP}]
 #		dev-python/pytest[${PYTHON_USEDEP}]
 #		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
 #	)
 #"
 src_prepare() {
 	# avoid the dep on xdist, run tests verbosely
 	sed -i -e '/^addopts/s:-n3:-v:' setup.cfg || die
 	distutils-r1_src_prepare
 }
 python_compile() {
 	if [[ ${EPYTHON} == python2.7 ]]; then
 		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
 		export CFLAGS
 	fi
 	distutils-r1_python_compile
 }
 python_test() {
 	distutils_install_for_testing
 	local bindir=${TEST_DIR}/scripts
 	pushd tests/eggsrc >/dev/null || die
 	distutils_install_for_testing
 	popd >/dev/null || die
 	"${EPYTHON}" igor.py zip_mods || die
 	PATH="${bindir}:${PATH}" "${EPYTHON}" igor.py test_with_tracer py || die
 	# No C extensions under pypy
 	if [[ ${EPYTHON} != pypy* ]]; then
 		cp -l -- "${TEST_DIR}"/lib/*/coverage/*.so coverage/ || die
 		PATH="${bindir}:${PATH}" "${EPYTHON}" igor.py test_with_tracer c || die
 	fi
 	# clean up leftover "egg1" directory
 	rm -rf build/lib/egg1 || die
 }
--- a/dev-python/cvxopt/cvxopt-1.2.5-r1.ebuild
+++ b/dev-python/cvxopt/cvxopt-1.2.5-r1.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
-PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit distutils-r1 toolchain-funcs
--- a/dev-python/dogpile-cache/Manifest
+++ b/dev-python/dogpile-cache/Manifest
@ -1 +1,2 @@
 DIST dogpile.cache-1.1.1.tar.gz 366464 BLAKE2B 95887bd73cce4cc8b017cee43182d94efeacdaa91ce94907e18c0e9a762065abb334866bd592f5e2010eb07fd33a049e330b4b925a4c9d8e14e22dee5f802446 SHA512 86d5620c746e48fc596137cdba85d91fb65def9f9dd13f85bbe5d9411db257edfcf119b8787673aa37efb965ce2895063906c1518c8b432af8b0ac16cec7941b
 DIST dogpile.cache-1.1.2.tar.gz 370404 BLAKE2B 6895ffe057ef614ef6bcc4ba58a4bb2fe69b8e57943cff38dfc472bd3dec5ad4e34fc65d9fa0830a2396f6a789aedd6cd1e1e06dff911a3197ca4b64fdca1c36 SHA512 e68c2b358e6822d2db90422b92f1e9c9b997c89087ca69c8fc9511be1e06cdfeb14eef759085fdbca4dfc668dabf3901cddeb6a6c2f327d28c8968975908c160
--- a/dev-python/dogpile-cache/dogpile-cache-1.1.2.ebuild
+++ b/dev-python/dogpile-cache/dogpile-cache-1.1.2.ebuild
@ -0,0 +1,30 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1
 DESCRIPTION="A locking API for expiring values while a single thread generates a new value."
 HOMEPAGE="https://github.com/sqlalchemy/dogpile.cache"
 SRC_URI="mirror://pypi/${PN:0:1}/dogpile.cache/dogpile.cache-${PV}.tar.gz"
 S="${WORKDIR}/dogpile.cache-${PV}"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 RDEPEND="
 	>=dev-python/decorator-4.0.0[${PYTHON_USEDEP}]
 	>=dev-python/stevedore-3.0.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/mako[${PYTHON_USEDEP}]
 	)
 "
 distutils_enable_tests pytest
--- a/dev-python/flask-security/Manifest
+++ b/dev-python/flask-security/Manifest
@ -1,2 +1,3 @@
 DIST flask-security-3.4.4.gh.tar.gz 348525 BLAKE2B 77a851c2549be9ce8612e3b186ad2d83d272b277f286885da491f3f0fe99e8836d145749ae137f1e75625c34b2214270ba4d24f1bfaa514012064dd38f083230 SHA512 1c1a4f079199704d7a2a4e11351cd199e3a790f5d0c7f68b240c299e83b129227fac4ca00caf45401efbf14520c1d65d3b710b85e8f53b495283b94a164f97a2
 DIST flask-security-3.4.5.gh.tar.gz 348928 BLAKE2B 9890227e9775c4a28fc364affb0bf767407463d514f6dc3cd359dd8a026e8325d943a547f294f6363a276f9e7d97336c526dd45f4549c7cfaff2d6ef9ef0316a SHA512 f9ac7f46b2e1ab7dbb44ba925b01e16304e8f8d6d5d56f4e558d07b80dfffa59f04c2597e17c00a7d7ae11be3a97c78ccf8d79993b7451be4a7f75f85bc89f6f
 DIST flask-security-4.0.0.gh.tar.gz 381592 BLAKE2B 62f8ceb5b6912839ad69a9f26793a831304f0d03cd40c73bd7c6701421d22955bec1e43713b2e07004ff9686591370378d9ff6e2e61e6bdc9a6472f18b28bfad SHA512 1d616121d0220bdef6081f4feb2c56b6feb346609548ad74c7bbbb60f4d65e9b3ec92a35fa9e077c35db9ab398d921461450594185956d05d5dda063fe972b72
--- a/dev-python/flask-security/files/flask-security-4.0.0-test-install.patch
+++ b/dev-python/flask-security/files/flask-security-4.0.0-test-install.patch
@ -0,0 +1,25 @@
 From 09fb542d472c863495a88c9cd73d692d86e86c22 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
 Date: Tue, 26 Jan 2021 10:50:08 +0100
 Subject: [PATCH] Do not install global-scope 'tests' package
 ---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/setup.py b/setup.py
 index 1d832b7..7abc0f3 100755
 --- a/setup.py
 +++ b/setup.py
@@ -19,7 +19,7 @@ install_requires = [
     "passlib>=1.7.2",
 ]
 -packages = find_packages()
 +packages = find_packages(exclude=['tests'])
 setup(
     name="Flask-Security-Too",
 -- 
 2.30.0
--- a/dev-python/flask-security/flask-security-4.0.0.ebuild
+++ b/dev-python/flask-security/flask-security-4.0.0.ebuild
@ -0,0 +1,65 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1
 DESCRIPTION="Simple security for Flask apps"
 HOMEPAGE="
 	https://github.com/Flask-Middleware/flask-security/
 	https://pypi.org/project/Flask-Security-Too/"
 SRC_URI="
 	https://github.com/Flask-Middleware/flask-security/archive/${PV}.tar.gz
 		-> ${P}.gh.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 RDEPEND="
 	dev-python/cachetools[${PYTHON_USEDEP}]
 	>=dev-python/flask-1.1.1[${PYTHON_USEDEP}]
 	>=dev-python/flask-babelex-0.9.3[${PYTHON_USEDEP}]
 	>=dev-python/flask-login-0.4.1[${PYTHON_USEDEP}]
 	>=dev-python/flask-principal-0.4.0[${PYTHON_USEDEP}]
 	>=dev-python/flask-wtf-0.14.3[${PYTHON_USEDEP}]
 	>=dev-python/itsdangerous-1.1.0[${PYTHON_USEDEP}]
 	>=dev-python/passlib-1.7.2[${PYTHON_USEDEP}]
 	>=dev-python/python-email-validator-1.1.1[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	dev-python/Babel[${PYTHON_USEDEP}]
 	test? (
 		>=dev-python/argon2-cffi-19.1.0[${PYTHON_USEDEP}]
 		>=dev-python/bcrypt-3.1.5[${PYTHON_USEDEP}]
 		>=dev-python/cryptography-2.3.1[${PYTHON_USEDEP}]
 		>=dev-python/flask-mail-0.9.1[${PYTHON_USEDEP}]
 		>=dev-python/flask-mongoengine-0.9.5[${PYTHON_USEDEP}]
 		>=dev-python/flask-sqlalchemy-2.3[${PYTHON_USEDEP}]
 		>=dev-python/mongomock-3.19.0[${PYTHON_USEDEP}]
 		>=dev-python/peewee-3.11.2[${PYTHON_USEDEP}]
 		>=dev-python/phonenumbers-8.11.1[${PYTHON_USEDEP}]
 		>=dev-python/pony-0.7.11[${PYTHON_USEDEP}]
 		>=dev-python/psycopg-2.8.4:2[${PYTHON_USEDEP}]
 		>=dev-python/pymysql-0.9.3[${PYTHON_USEDEP}]
 		>=dev-python/pyqrcode-1.2[${PYTHON_USEDEP}]
 		>=dev-python/zxcvbn-4.4.28[${PYTHON_USEDEP}]
 	)"
 distutils_enable_tests pytest
 PATCHES=(
 	"${FILESDIR}"/flask-security-4.0.0-test-install.patch
 )
 src_prepare() {
 	sed -i -e 's@--cache-clear@-p no:httpbin@' pytest.ini || die
 	distutils-r1_src_prepare
 }
 python_configure_all() {
 	esetup.py compile_catalog
 }
--- a/dev-python/funcy/funcy-1.14-r1.ebuild
+++ b/dev-python/funcy/funcy-1.14-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
--- a/dev-python/gevent/gevent-20.12.0.ebuild
+++ b/dev-python/gevent/gevent-20.12.0.ebuild
@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~mips ~ppc ppc64 s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
--- a/dev-python/graphviz/graphviz-0.16.ebuild
+++ b/dev-python/graphviz/graphviz-0.16.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
@ -12,7 +12,7 @@ HOMEPAGE="https://graphviz.readthedocs.io/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 RDEPEND="media-gfx/graphviz"
--- a/dev-python/jedi/jedi-0.18.0.ebuild
+++ b/dev-python/jedi/jedi-0.18.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
@ -23,7 +23,7 @@ SRC_URI="
 LICENSE="MIT
 	test? ( Apache-2.0 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
 RDEPEND="=dev-python/parso-0.8*[${PYTHON_USEDEP}]"
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@ -1,3 +1,4 @@
 DIST keyring-21.7.0.tar.gz 46998 BLAKE2B 469d2de254ed88604a40a4e05c001f50986f55296d35b54969cfa8612473cbd5184f36bd6babdfb6631ab908e03f81858434b7e52471a2d366f97293c2c0ed93 SHA512 8fc5e8f0f0cf2a336c6ce900d59fcd31b4ec270d62559a1c2b4c36803428532b463bad0b2ace9af33b6fb0d50de94229449c4ef4042287ecaa8f1fac37c5faf8
 DIST keyring-21.8.0.tar.gz 47639 BLAKE2B 3b8b11cd7ea121f9d8544a5775d9f62de23613da0265f0d815687ad311f4a7b6ed431142682df3059fbe43a342c6151871782a850c416a5b50c1df14a64d609a SHA512 4acadf421946644466b5c43481eddd111170185ba3993f4fec38cad0129259bd17aebad4dc2e2d2e88e84aa814e62d37b39efe7385ccd569e40a5291d5f4ae40
 DIST keyring-22.0.0.tar.gz 47693 BLAKE2B 88a151327778e5e039c43caa68e53705d985d6ef2b7b668df1d941160b843f47a0e2f6f79c9afc39bc66a36373c0374333296a3cb98f1c65c620a8fad3f43fec SHA512 5e9e27cf9b09f042747909b442864a1ea0669b36f69592538b487978a582e16e58056d6bd68b35566143000ed3f5c7733e3ef471c66935a811e09fc4b7f56f6f
 DIST keyring-22.0.1.tar.gz 47782 BLAKE2B ec9f5c0418b2c279f111cbcb8ccc1fc05f64e859e2e675041289a639c7e2d4681e562c9c023e46f1eacb99f88114af97545ad36f71037db0b77e83d927785ce0 SHA512 2e264570d2e905ce4862d71fe4b02fcf0631218a693292c13159fdbad0032e91d81910f84d787e948057e2f428fcf8677ebdd83af4da54c3359347f642db0441
--- a/dev-python/keyring/keyring-22.0.1.ebuild
+++ b/dev-python/keyring/keyring-22.0.1.ebuild
@ -0,0 +1,43 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( pypy3 python3_{7..9} )
 inherit distutils-r1
 DESCRIPTION="Provides access to the system keyring service"
 HOMEPAGE="https://github.com/jaraco/keyring"
 SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 SLOT="0"
 LICENSE="PSF-2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
 RDEPEND="
 	dev-python/secretstorage[${PYTHON_USEDEP}]
 	dev-python/entrypoints[${PYTHON_USEDEP}]
 	dev-python/jeepney[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
 		dev-python/importlib_metadata[${PYTHON_USEDEP}]
 	' pypy3 python3_7)
 "
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	dev-python/toml[${PYTHON_USEDEP}]
 "
 distutils_enable_tests pytest
 distutils_enable_sphinx docs \
 	dev-python/jaraco-packaging \
 	dev-python/rst-linker
 python_prepare_all() {
 	rm tests/backends/test_kwallet.py || die
 	distutils-r1_python_prepare_all
 	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
 }
--- a/dev-python/notebook/notebook-6.1.6.ebuild
+++ b/dev-python/notebook/notebook-6.1.6.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 RDEPEND="
 	>=dev-libs/mathjax-2.4
--- a/dev-python/pendulum/pendulum-2.1.2-r1.ebuild
+++ b/dev-python/pendulum/pendulum-2.1.2-r1.ebuild
@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86"
 # Requires timezone information which is not installed by default
 # with dev-python/pytzdata, and otherwise approx. 50 out of 1600
-# tests are failing for now. Keeping the test dependencies 
+# tests are failing for now. Keeping the test dependencies
 # commented for future tests fixups
 RESTRICT="test"
--- a/dev-python/pycryptodome/pycryptodome-3.9.9-r1.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.9.9-r1.ebuild
@ -18,7 +18,7 @@ SRC_URI="
 LICENSE="BSD-2 Unlicense"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="
--- a/dev-python/pydata-sphinx-theme/Manifest
+++ b/dev-python/pydata-sphinx-theme/Manifest
@ -1,2 +1,3 @@
 DIST pydata-sphinx-theme-0.4.1.tar.gz 3279361 BLAKE2B d3538dea9444272f1cb314d8b2bd8656b5114b916f31c4cca078867b02a24c60fc91e5ac367d09335b3ce4b9c9fb44405f61ed70b19ae9fed5d8919fc68f1566 SHA512 dbca1f7bde25c20a5ffb5b37ac808d84c938e6cadb6e0a6bc2d72101993889f4f7be3bdc50488bed1945779d30ca0f131bf74b16be2df00b5fa093f8491fad39
 DIST pydata-sphinx-theme-0.4.2.tar.gz 3279200 BLAKE2B d1229e0af813fd5f69aa1b4d2f6e1b882f9e469cfd296e16a35e7d9aba4336faf245f0b52053b606be9839e490f690d24624ecc8fe4a3b40a6057081224889dc SHA512 9d786937d5b05e86af779893f28f553b13220e8e208c87235ba311cf830aaf718aafa2142c400b77728c407d6cff4ce66e0c0b9bec91efb61be8f75473c6a1d0
 DIST pydata-sphinx-theme-0.4.3.tar.gz 3279359 BLAKE2B c2a57fc7dd70f8d57a0b56bb45907615658b1dbb705f177fd40e04995754180dd637256618b36b0a6ee59e865558eb013d191f2a5f461365f07cf647427056e9 SHA512 9f4f0b1fab88e92302211957df798a7e1bbae034e9935260f94959bba50bc3384ef818ff0cdcd04c3a4b4d09a5285c3d165e35fa3114d6dbb15452cc6895703f
--- a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.4.3.ebuild
+++ b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.4.3.ebuild
@ -0,0 +1,33 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1
 DESCRIPTION="Bootstrap-based Sphinx theme from the PyData community"
 HOMEPAGE="https://github.com/pandas-dev/pydata-sphinx-theme"
 SRC_URI="https://github.com/pandas-dev/pydata-sphinx-theme/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD-with-disclosure"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 BDEPEND="
 	test? (
 		dev-python/beautifulsoup[${PYTHON_USEDEP}]
 		dev-python/pytest-regressions[${PYTHON_USEDEP}]
 	)"
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
 # ModuleNotFoundError: No module named 'plotly' even if dev-python/plotly is installed
 #distutils_enable_sphinx docs dev-python/commonmark dev-python/recommonmark dev-python/numpydoc dev-python/jupyter-sphinx dev-python/plotly
 distutils_enable_tests pytest
 python_test() {
 	local -x PYTHONPATH="${S}"
 	pytest -vv || die "Tests failed with ${EPYTHON}"
 }
--- a/dev-python/pygame/pygame-2.0.1.ebuild
+++ b/dev-python/pygame/pygame-2.0.1.ebuild
@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc examples midi opengl test X"
 RESTRICT="!test? ( test )"
--- a/dev-python/pygobject/pygobject-3.36.1-r1.ebuild
+++ b/dev-python/pygobject/pygobject-3.36.1-r1.ebuild
@ -12,7 +12,7 @@ HOMEPAGE="https://pygobject.readthedocs.io/"
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cairo examples test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
--- a/dev-python/pyjwt/Manifest
+++ b/dev-python/pyjwt/Manifest
@ -1,3 +1,2 @@
 DIST PyJWT-1.7.1.tar.gz 41979 BLAKE2B 5604b309838b2dfb2f95e18e291c43703954664aa8acb7439072f002c1c8a1e49ff2c21d907be77a4d2f86e695ec71970d550aad2541252ac85bd7133e300b28 SHA512 70cd38127b6848933992c8b88303725ef71bfb430ad42eb63247e549b0bdab2a194137349d43ab02a1c97212dbc89f447ee3f0c5403dd14632b8b4b6b9235fc4
 DIST PyJWT-2.0.0.tar.gz 56981 BLAKE2B e093bf23beb86a287e494018aed6bd6870d5923697b6502e4269f0b991b28c4ea6a53261b88789b0786b59e03b3d4eb763006becf0666921a81d0528c7677af5 SHA512 1831c93f100cd481e2ea80e23ff9f5114806cc493efc1c42ec6ff3ecc07e716d9ba2557b0b66fd8413946d166eebc1a44c453ec5407dfeef0529d222c9187e45
 DIST PyJWT-2.0.1.tar.gz 57496 BLAKE2B 1258734d2cd5ca6a4012691bef0ae2a7d6539083241cde7ef27da155cff0808211eddd56b9455e812bae4c739f83fed1c6fd84abcc85208203d86e5834d5952b SHA512 a59b975fb465b44e4d84e3ef0380ed5107438e202e073238700bd700e8871098b9c59a849d157ade7888eef32609078571e2b8af09dca0752d7a18c370c2a0a5
--- a/Show More
+++ b/Show More
`@ -1 +1,2 @@`
	`DIST construct-2.10.56.tar.gz 1184110 BLAKE2B 01ce1800970826ae3584a9733de171e04dd926e7d19d8b48b4364406b4aa0f4d878ec52f9a7f755bb249aeeaca75ae6221d6bdf302d4342d4974d268b1782175 SHA512 cc9aa126c26a017a3fb7b78a6b8f2056194028a44c8ed615a6dc4a445d50f0463e2de0b80810ab5a252070925a56b5a61dbb601a3de9e445d861356231a146d5`	`DIST construct-2.10.56.tar.gz 1184110 BLAKE2B 01ce1800970826ae3584a9733de171e04dd926e7d19d8b48b4364406b4aa0f4d878ec52f9a7f755bb249aeeaca75ae6221d6bdf302d4342d4974d268b1782175 SHA512 cc9aa126c26a017a3fb7b78a6b8f2056194028a44c8ed615a6dc4a445d50f0463e2de0b80810ab5a252070925a56b5a61dbb601a3de9e445d861356231a146d5`
		`DIST construct-2.10.57.tar.gz 1184585 BLAKE2B abaeebf5872cc97cc67d47cf79370fecdb1abafb62fa80b6acfa63de9087f70fa67fd69e90ab4e78e7ac179c1bb1011529e34201c3c2270e1a2651c97cc678b2 SHA512 ef2f0bbcf4cbcf4862033b16ccb428f84d63ca5c867157b47e38b441cb439c953b543cf69f352c0542525fd07b37d1b3b68910ae5331c482e75b4af937e116a1`
`@ -1 +1,2 @@`
	`DIST dogpile.cache-1.1.1.tar.gz 366464 BLAKE2B 95887bd73cce4cc8b017cee43182d94efeacdaa91ce94907e18c0e9a762065abb334866bd592f5e2010eb07fd33a049e330b4b925a4c9d8e14e22dee5f802446 SHA512 86d5620c746e48fc596137cdba85d91fb65def9f9dd13f85bbe5d9411db257edfcf119b8787673aa37efb965ce2895063906c1518c8b432af8b0ac16cec7941b`	`DIST dogpile.cache-1.1.1.tar.gz 366464 BLAKE2B 95887bd73cce4cc8b017cee43182d94efeacdaa91ce94907e18c0e9a762065abb334866bd592f5e2010eb07fd33a049e330b4b925a4c9d8e14e22dee5f802446 SHA512 86d5620c746e48fc596137cdba85d91fb65def9f9dd13f85bbe5d9411db257edfcf119b8787673aa37efb965ce2895063906c1518c8b432af8b0ac16cec7941b`
		`DIST dogpile.cache-1.1.2.tar.gz 370404 BLAKE2B 6895ffe057ef614ef6bcc4ba58a4bb2fe69b8e57943cff38dfc472bd3dec5ad4e34fc65d9fa0830a2396f6a789aedd6cd1e1e06dff911a3197ca4b64fdca1c36 SHA512 e68c2b358e6822d2db90422b92f1e9c9b997c89087ca69c8fc9511be1e06cdfeb14eef759085fdbca4dfc668dabf3901cddeb6a6c2f327d28c8968975908c160`