16 files changed, 62 insertions, 355 deletions

diff --git a/app-emulation/libguestfs/libguestfs-1.36.13-r1.ebuild b/app-emulation/libguestfs/libguestfs-1.36.13-r1.ebuild
index 258c8907bcca..001b38548e91 100644
--- a/app-emulation/libguestfs/libguestfs-1.36.13-r1.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.36.13-r1.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_6 )
-
-inherit eutils autotools linux-info perl-functions python-single-r1 versionator
+inherit eutils autotools linux-info perl-functions versionator
 
 MY_PV_1="$(get_version_component_range 1-2)"
 MY_PV_2="$(get_version_component_range 2)"
@@ -19,11 +17,9 @@ LICENSE="GPL-2 LGPL-2"
 SLOT="0/"${MY_PV_1}""
 
 KEYWORDS="~amd64"
-IUSE="bash-completion debug doc erlang +fuse gtk inspect-icons introspection lua ocaml +perl python ruby selinux static-libs systemtap test"
+IUSE="bash-completion debug doc erlang +fuse gtk inspect-icons introspection lua ocaml +perl ruby selinux static-libs systemtap test"
 RESTRICT="!test? ( test )"
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
 # Failures - doc
 # Failures - bash-completion, see GBZ #486306
 
@@ -60,7 +56,6 @@ COMMON_DEPEND="
 		>=app-misc/hivex-1.3.1[perl?]
 		dev-perl/String-ShellQuote
 	)
-	python? ( ${PYTHON_DEPS} )
 	fuse? ( sys-fs/fuse:= )
 	introspection? (
 		>=dev-libs/glib-2.26:2
@@ -109,8 +104,6 @@ DOCS=( AUTHORS BUGS ChangeLog HACKING README TODO )
 pkg_setup() {
 		CONFIG_CHECK="~KVM ~VIRTIO"
 		[ -n "${CONFIG_CHECK}" ] && check_extra_config;
-
-		use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -137,7 +130,7 @@ src_configure() {
 		--with-extra="-gentoo" \
 		--with-readline \
 		--disable-php \
-		$(use_enable python) \
+		--disable-python \
 		--without-java \
 		$(use_enable perl) \
 		$(use_enable fuse) \
diff --git a/app-emulation/libguestfs/libguestfs-1.36.15-r1.ebuild b/app-emulation/libguestfs/libguestfs-1.36.15-r1.ebuild
index 0bc5439dea8e..8f882320e7cb 100644
--- a/app-emulation/libguestfs/libguestfs-1.36.15-r1.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.36.15-r1.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_6 )
-
-inherit autotools bash-completion-r1 eapi7-ver eutils linux-info perl-functions python-single-r1 xdg-utils
+inherit autotools bash-completion-r1 eapi7-ver eutils linux-info perl-functions xdg-utils
 
 MY_PV_1="$(ver_cut 1-2)"
 MY_PV_2="$(ver_cut 2)"
@@ -19,11 +17,9 @@ LICENSE="GPL-2 LGPL-2"
 SLOT="0/"${MY_PV_1}""
 
 KEYWORDS="~amd64"
-IUSE="doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl python ruby selinux static-libs systemtap test"
+IUSE="doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl ruby selinux static-libs systemtap test"
 RESTRICT="!test? ( test )"
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
 # Failures - doc
 
 # FIXME: selinux support is automagic
@@ -59,7 +55,6 @@ COMMON_DEPEND="
 		>=app-misc/hivex-1.3.1[perl?]
 		dev-perl/String-ShellQuote
 	)
-	python? ( ${PYTHON_DEPS} )
 	fuse? ( sys-fs/fuse:= )
 	introspection? (
 		>=dev-libs/glib-2.26:2
@@ -114,8 +109,6 @@ PATCHES=(
 pkg_setup() {
 		CONFIG_CHECK="~KVM ~VIRTIO"
 		[ -n "${CONFIG_CHECK}" ] && check_extra_config;
-
-		use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -141,7 +134,7 @@ src_configure() {
 		--with-extra="-gentoo" \
 		--with-readline \
 		--disable-php \
-		$(use_enable python) \
+		--disable-python \
 		--without-java \
 		$(use_enable perl) \
 		$(use_enable fuse) \
diff --git a/app-emulation/libguestfs/libguestfs-1.38.6-r1.ebuild b/app-emulation/libguestfs/libguestfs-1.38.6-r1.ebuild
index 8764f049efc3..aeb2c8d3d6cf 100644
--- a/app-emulation/libguestfs/libguestfs-1.38.6-r1.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.38.6-r1.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_6 )
-
-inherit autotools bash-completion-r1 eapi7-ver eutils linux-info perl-functions python-single-r1 xdg-utils
+inherit autotools bash-completion-r1 eapi7-ver eutils linux-info perl-functions xdg-utils
 
 MY_PV_1="$(ver_cut 1-2)"
 MY_PV_2="$(ver_cut 2)"
@@ -19,11 +17,9 @@ LICENSE="GPL-2 LGPL-2"
 SLOT="0/"${MY_PV_1}""
 
 KEYWORDS="~amd64"
-IUSE="doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl python ruby selinux static-libs systemtap test"
+IUSE="doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl ruby selinux static-libs systemtap test"
 RESTRICT="!test? ( test )"
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
 # Failures - doc
 
 # FIXME: selinux support is automagic
@@ -59,7 +55,6 @@ COMMON_DEPEND="
 		>=app-misc/hivex-1.3.1[perl?]
 		dev-perl/String-ShellQuote
 	)
-	python? ( ${PYTHON_DEPS} )
 	fuse? ( sys-fs/fuse:= )
 	introspection? (
 		>=dev-libs/glib-2.26:2
@@ -110,8 +105,6 @@ PATCHES=(
 pkg_setup() {
 		CONFIG_CHECK="~KVM ~VIRTIO"
 		[ -n "${CONFIG_CHECK}" ] && check_extra_config;
-
-		use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -137,7 +130,7 @@ src_configure() {
 		--with-extra="-gentoo" \
 		--with-readline \
 		--disable-php \
-		$(use_enable python) \
+		--disable-python \
 		--without-java \
 		$(use_enable perl) \
 		$(use_enable fuse) \
diff --git a/app-emulation/libguestfs/libguestfs-1.38.6-r101.ebuild b/app-emulation/libguestfs/libguestfs-1.38.6-r101.ebuild
index 63600cbe2d16..72a08330bca8 100644
--- a/app-emulation/libguestfs/libguestfs-1.38.6-r101.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.38.6-r101.ebuild
@@ -4,9 +4,8 @@
 EAPI=7
 
 LUA_COMPAT=( lua5-1 )
-PYTHON_COMPAT=( python3_6 )
 
-inherit autotools bash-completion-r1 l10n linux-info lua-single perl-functions python-single-r1 xdg-utils
+inherit autotools bash-completion-r1 l10n linux-info lua-single perl-functions xdg-utils
 
 MY_PV_1="$(ver_cut 1-2)"
 MY_PV_2="$(ver_cut 2)"
@@ -20,11 +19,10 @@ LICENSE="GPL-2 LGPL-2"
 SLOT="0/"${MY_PV_1}""
 
 KEYWORDS="~amd64"
-IUSE="doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl python ruby selinux static-libs systemtap test"
+IUSE="doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl ruby selinux static-libs systemtap test"
 RESTRICT="!test? ( test )"
 
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 
 # Failures - doc
 
@@ -61,7 +59,6 @@ COMMON_DEPEND="
 		>=app-misc/hivex-1.3.1[perl?]
 		dev-perl/String-ShellQuote
 	)
-	python? ( ${PYTHON_DEPS} )
 	fuse? ( sys-fs/fuse:= )
 	introspection? (
 		>=dev-libs/glib-2.26:2
@@ -117,7 +114,6 @@ pkg_setup() {
 		[ -n "${CONFIG_CHECK}" ] && check_extra_config;
 
 		use lua && lua-single_pkg_setup
-		use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -143,7 +139,7 @@ src_configure() {
 		--with-extra="-gentoo" \
 		--with-readline \
 		--disable-php \
-		$(use_enable python) \
+		--disable-python \
 		--without-java \
 		$(use_enable perl) \
 		$(use_enable fuse) \
diff --git a/app-misc/hivex/Manifest b/app-misc/hivex/Manifest
index 933c62f73e32..7af733a86f68 100644
--- a/app-misc/hivex/Manifest
+++ b/app-misc/hivex/Manifest
@@ -1,2 +1 @@
-DIST hivex-1.3.14.tar.gz 1332257 BLAKE2B fe7c19e05d29c7e98a334842cc1144aa76b148a3b7aae91449a4923a124eb54227a9a004346ef3558732c688c4f92cacd0c9328056930c33dba0404465634da0 SHA512 dd7dd52dceda580179a815fc48a2a2c7e8f7234614beceb937fba7e317df17984e65453338160c4c467b70d7d4f9bd61b48aad3ca51e19bd5e4cfbca8ee3adb6
 DIST hivex-1.3.18.tar.gz 1542133 BLAKE2B 961d0797770a2bd3176ce288a509fab8685de91317d55f05e5295f9f56fd54c31acb64847e0cbb6a6074627ccbdfdf35bd0d35150beb7746a8b3de9128ac24e3 SHA512 1851351118921e81df9e505f90d00048a178572c2edd3de40194a69915176bdb615e2eb5afea408d57063e98257c8d1e3d0cd6730407153892cc9e3befc4aa3a
diff --git a/app-misc/hivex/hivex-1.3.14.ebuild b/app-misc/hivex/hivex-1.3.14.ebuild
deleted file mode 100644
index cd4e1de9670b..000000000000
--- a/app-misc/hivex/hivex-1.3.14.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25"
-RUBY_OPTIONAL=yes
-
-PYTHON_COMPAT=(python3_6)
-
-inherit eutils perl-module ruby-ng python-single-r1
-
-DESCRIPTION="Library for reading and writing Windows Registry 'hive' binary files"
-HOMEPAGE="http://libguestfs.org"
-SRC_URI="http://libguestfs.org/download/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="ocaml readline +perl python test ruby"
-
-RDEPEND="
-	virtual/libiconv
-	virtual/libintl
-	dev-libs/libxml2:2
-	ocaml? ( dev-lang/ocaml[ocamlopt]
-			 dev-ml/findlib[ocamlopt]
-			 )
-	readline? ( sys-libs/readline:0 )
-	perl? (
-		dev-lang/perl:=
-		dev-perl/IO-stringy
-	)
-	ruby? ( $(ruby_implementations_depend) )
-	python? ( ${PYTHON_DEPS} )
-	"
-
-DEPEND="${RDEPEND}
-	perl? (
-		test? ( dev-perl/Pod-Coverage
-			dev-perl/Test-Pod-Coverage )
-		  )
-	"
-
-ruby_add_bdepend "ruby? ( dev-ruby/rake
-			virtual/rubygems
-			dev-ruby/rdoc )"
-ruby_add_rdepend "ruby? ( virtual/rubygems )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-			ruby? ( || ( $(ruby_get_use_targets) ) )"
-
-DOCS=( README )
-
-S="${WORKDIR}/${P}"
-
-pkg_setup() {
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	default
-	cp -prlP "${WORKDIR}/${P}" "${WORKDIR}"/all
-}
-
-src_configure() {
-	ruby-ng_src_configure
-
-	if use perl; then
-		pushd perl
-		perl-module_src_configure
-		popd
-	fi
-
-	local myeconfargs=(
-		$(use_with readline)
-		$(use_enable ocaml)
-		$(use_enable perl)
-		--enable-nls
-		--disable-ruby
-		$(use_enable python)
-		--disable-rpath
-		--disable-static
-		)
-
-	econf ${myeconfargs[@]}
-}
-
-src_compile() {
-	default
-	ruby-ng_src_compile
-}
-
-src_install() {
-	strip-linguas -i po
-
-	emake install DESTDIR="${ED}" "LINGUAS=""${LINGUAS}"""
-
-	ruby-ng_src_install
-
-	if use perl; then
-		perl_delete_localpod
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/eclass/office-ext-r1.eclass b/eclass/office-ext-r1.eclass
index 298f958a13aa..a1649ac8d6aa 100644
--- a/eclass/office-ext-r1.eclass
+++ b/eclass/office-ext-r1.eclass
@@ -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
 
 # @ECLASS: office-ext-r1.eclass
@@ -6,21 +6,18 @@
 # The office team <office@gentoo.org>
 # @AUTHOR:
 # Tomáš Chvátal <scarabeus@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7
-# @BLURB: Eclass for installing libreoffice/openoffice extensions
+# @SUPPORTED_EAPIS: 5 7
+# @BLURB: Eclass for installing libreoffice extensions
 # @DESCRIPTION:
-# Eclass for easing maintenance of libreoffice/openoffice extensions.
+# Eclass for easing maintenance of libreoffice extensions.
 
 case "${EAPI:-0}" in
-	5|6) inherit multilib ;;
-	7) ;;
+	5) inherit eutils multilib ;;
+	7) inherit eutils ;;
 	*) die "EAPI=${EAPI} is not supported" ;;
 esac
 
-# eutils.eclass: emktemp
-inherit eutils
-
-OEXT_EXPORTED_FUNCTIONS="src_unpack src_install pkg_postinst pkg_prerm"
+EXPORT_FUNCTIONS src_unpack src_install
 
 # @ECLASS-VARIABLE: OFFICE_REQ_USE
 # @DESCRIPTION:
@@ -43,9 +40,9 @@ fi
 #
 # Example:
 # @CODE
-# OFFICE_IMPLEMENTATIONS=( "libreoffice" "openoffice" )
+# OFFICE_IMPLEMENTATIONS=( "libreoffice" )
 # @CODE
-[[ -z ${OFFICE_IMPLEMENTATIONS} ]] && OFFICE_IMPLEMENTATIONS=( "libreoffice" "openoffice" )
+[[ -z ${OFFICE_IMPLEMENTATIONS} ]] && OFFICE_IMPLEMENTATIONS=( "libreoffice" )
 
 # @ECLASS-VARIABLE: OFFICE_EXTENSIONS
 # @REQUIRED
@@ -76,14 +73,7 @@ RDEPEND=""
 
 for i in ${OFFICE_IMPLEMENTATIONS[@]}; do
 	IUSE+=" office_implementation_${i}"
-	if [[ ${i} == "openoffice" ]]; then
-		# special only binary
-		RDEPEND+="
-			office_implementation_openoffice? (
-				app-office/openoffice-bin${OFFICE_REQ_USE}
-			)
-		"
-	else
+	if [[ ${i} == "libreoffice" ]]; then
 		RDEPEND+="
 			office_implementation_${i}? (
 				|| (
@@ -123,12 +113,12 @@ office-ext-r1_src_unpack() {
 		if [[ -f "${OFFICE_EXTENSIONS_LOCATION}/${i}" ]] ; then
 			case ${i} in
 				*.oxt)
-					mkdir -p "${WORKDIR}/${i}/"
-					pushd "${WORKDIR}/${i}/" > /dev/null
-					echo ">>> Unpacking "${OFFICE_EXTENSIONS_LOCATION}/${i}" to ${PWD}"
+					mkdir -p "${WORKDIR}/${i}/" || die
+					pushd "${WORKDIR}/${i}/" > /dev/null || die
+					einfo "Unpacking "${OFFICE_EXTENSIONS_LOCATION}/${i}" to ${PWD}"
 					unzip -qo ${OFFICE_EXTENSIONS_LOCATION}/${i}
 					assert "failed unpacking ${OFFICE_EXTENSIONS_LOCATION}/${i}"
-					popd > /dev/null
+					popd > /dev/null || die
 					;;
 				*) unpack ${i} ;;
 			esac
@@ -147,97 +137,12 @@ office-ext-r1_src_install() {
 
 	for i in ${OFFICE_IMPLEMENTATIONS[@]}; do
 		if use office_implementation_${i}; then
-			if [[ ${i} == openoffice ]]; then
-				# OOO needs to use uno because direct deployment segfaults.
-				# This is bug by their side, but i don't want to waste time
-				# fixing it myself.
-				insinto /usr/$(get_libdir)/${i}/share/extension/install
-				for j in ${OFFICE_EXTENSIONS[@]}; do
-					doins ${OFFICE_EXTENSIONS_LOCATION}/${j}
-				done
-			else
-				for j in ${OFFICE_EXTENSIONS[@]}; do
-					pushd "${WORKDIR}/${j}/" > /dev/null
-					insinto /usr/$(get_libdir)/${i}/share/extensions/${j/.oxt/}
-					doins -r *
-					popd > /dev/null
-				done
-			fi
+			for j in ${OFFICE_EXTENSIONS[@]}; do
+				pushd "${WORKDIR}/${j}/" > /dev/null || die
+				insinto /usr/$(get_libdir)/${i}/share/extensions/${j/.oxt/}
+				doins -r *
+				popd > /dev/null || die
+			done
 		fi
 	done
 }
-
-#### OPENOFFICE COMPAT CODE
-
-UNOPKG_BINARY="/usr/lib64/openoffice/program/unopkg"
-
-# @FUNCTION: office-ext-r1_add_extension
-# @DESCRIPTION:
-# Install the extension into the libreoffice/openoffice.
-office-ext-r1_add_extension() {
-	debug-print-function ${FUNCNAME} "$@"
-	local ext=$1
-	local tmpdir=$(emktemp -d)
-
-	debug-print "${FUNCNAME}: ${UNOPKG_BINARY} add --shared \"${ext}\""
-	ebegin "Adding office extension: \"${ext}\""
-	${UNOPKG_BINARY} add --suppress-license \
-		--shared "${ext}" \
-		"-env:UserInstallation=file:///${tmpdir}" \
-		"-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1"
-	eend $?
-	${UNOPKG_BINARY} list --shared > /dev/null
-	rm -r "${tmpdir}" || dir "failed to clean up"
-}
-
-# @FUNCTION: office-ext-r1_remove_extension
-# @DESCRIPTION:
-# Remove the extension from the libreoffice/openoffice.
-office-ext-r1_remove_extension() {
-	debug-print-function ${FUNCNAME} "$@"
-	local ext=$1
-	local tmpdir=$(mktemp -d --tmpdir="${T}")
-
-	debug-print "${FUNCNAME}: ${UNOPKG_BINARY} remove --shared \"${ext}\""
-	ebegin "Removing office extension: \"${ext}\""
-	${UNOPKG_BINARY} remove --suppress-license \
-		--shared "${ext}" \
-		"-env:UserInstallation=file:///${tmpdir}" \
-		"-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1"
-	eend $?
-	${UNOPKG_BINARY} list --shared > /dev/null
-	rm -r "${tmpdir}" || dir "failed to clean up"
-}
-
-# @FUNCTION: office-ext-r1_pkg_postinst
-# @DESCRIPTION:
-# Add the extensions to the openoffice.
-office-ext-r1_pkg_postinst() {
-	if in_iuse office_implementation_openoffice && use office_implementation_openoffice; then
-		debug-print-function ${FUNCNAME} "$@"
-		debug-print "Extensions: ${OFFICE_EXTENSIONS[@]}"
-		local i
-
-		for i in ${OFFICE_EXTENSIONS[@]}; do
-			office-ext-r1_add_extension "/usr/lib64/openoffice/share/extension/install/${i}"
-		done
-	fi
-}
-
-# @FUNCTION: office-ext-r1_pkg_prerm
-# @DESCRIPTION:
-# Remove the extensions from the openoffice.
-office-ext-r1_pkg_prerm() {
-	if in_iuse office_implementation_openoffice && use office_implementation_openoffice; then
-		debug-print-function ${FUNCNAME} "$@"
-		debug-print "Extensions: ${OFFICE_EXTENSIONS[@]}"
-		local i
-
-		for i in ${OFFICE_EXTENSIONS[@]}; do
-			office-ext-r1_remove_extension "${i}"
-		done
-	fi
-}
-
-EXPORT_FUNCTIONS ${OEXT_EXPORTED_FUNCTIONS}
-unset OEXT_EXPORTED_FUNCTIONS
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 9c8b6a14d2ac..6d482aa106c0 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -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
 
 # @ECLASS: python-utils-r1.eclass
@@ -41,7 +41,7 @@ inherit toolchain-funcs
 _PYTHON_ALL_IMPLS=(
 	pypy3
 	python2_7
-	python3_6 python3_7 python3_8 python3_9
+	python3_7 python3_8 python3_9
 )
 readonly _PYTHON_ALL_IMPLS
 
@@ -53,7 +53,7 @@ _PYTHON_HISTORICAL_IMPLS=(
 	jython2_7
 	pypy pypy1_{8,9} pypy2_0
 	python2_{5,6}
-	python3_{1,2,3,4,5}
+	python3_{1..6}
 )
 readonly _PYTHON_HISTORICAL_IMPLS
 
@@ -69,38 +69,6 @@ readonly _PYTHON_HISTORICAL_IMPLS
 # which can involve revisions of this eclass that support a different
 # set of Python implementations.
 
-# @FUNCTION: _python_impl_supported
-# @USAGE: <impl>
-# @INTERNAL
-# @DESCRIPTION:
-# Check whether the implementation <impl> (PYTHON_COMPAT-form)
-# is still supported.
-#
-# Returns 0 if the implementation is valid and supported. If it is
-# unsupported, returns 1 -- and the caller should ignore the entry.
-# If it is invalid, dies with an appopriate error messages.
-_python_impl_supported() {
-	debug-print-function ${FUNCNAME} "${@}"
-
-	[[ ${#} -eq 1 ]] || die "${FUNCNAME}: takes exactly 1 argument (impl)."
-
-	local impl=${1}
-
-	# keep in sync with _PYTHON_ALL_IMPLS!
-	# (not using that list because inline patterns shall be faster)
-	case "${impl}" in
-		python2_7|python3_[6789]|pypy3)
-			return 0
-			;;
-		jython2_7|pypy|pypy1_[89]|pypy2_0|python2_[56]|python3_[12345])
-			return 1
-			;;
-		*)
-			[[ ${PYTHON_COMPAT_NO_STRICT} ]] && return 1
-			die "Invalid implementation in PYTHON_COMPAT: ${impl}"
-	esac
-}
-
 # @FUNCTION: _python_verify_patterns
 # @USAGE: <pattern>...
 # @INTERNAL
@@ -149,10 +117,26 @@ _python_set_impls() {
 	if [[ $(declare -p PYTHON_COMPAT) != "declare -a"* ]]; then
 		die 'PYTHON_COMPAT must be an array.'
 	fi
-	for i in "${PYTHON_COMPAT[@]}"; do
-		# trigger validity checks
-		_python_impl_supported "${i}"
-	done
+	if [[ ! ${PYTHON_COMPAT_NO_STRICT} ]]; then
+		for i in "${PYTHON_COMPAT[@]}"; do
+			# check for incorrect implementations
+			# we're using pattern matching as an optimization
+			# please keep them in sync with _PYTHON_ALL_IMPLS
+			# and _PYTHON_HISTORICAL_IMPLS
+			case ${i} in
+				jython2_7|pypy|pypy1_[89]|pypy2_0|pypy3|python2_[5-7]|python3_[1-9])
+					;;
+				*)
+					if has "${i}" "${_PYTHON_ALL_IMPLS[@]}" \
+						"${_PYTHON_HISTORICAL_IMPLS[@]}"
+					then
+						die "Mis-synced patterns in _python_set_impls: missing ${i}"
+					else
+						die "Invalid implementation in PYTHON_COMPAT: ${i}"
+					fi
+			esac
+		done
+	fi
 
 	local supp=() unsupp=()
 
diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh
index 86b87ec173d4..eb8223ec6ac0 100755
--- a/eclass/tests/python-utils-r1.sh
+++ b/eclass/tests/python-utils-r1.sh
@@ -183,24 +183,6 @@ test_fix_shebang '#!/usr/bin/foo' python2.7 FAIL
 # regression test for bug #522080
 test_fix_shebang '#!/usr/bin/python ' python2.7 '#!/usr/bin/python2.7 '
 
-# make sure we don't break pattern matching
-test_is "_python_impl_supported python2_5" 1
-test_is "_python_impl_supported python2_6" 1
-test_is "_python_impl_supported python2_7" 0
-test_is "_python_impl_supported python3_1" 1
-test_is "_python_impl_supported python3_2" 1
-test_is "_python_impl_supported python3_3" 1
-test_is "_python_impl_supported python3_4" 1
-test_is "_python_impl_supported python3_5" 1
-test_is "_python_impl_supported python3_6" 0
-test_is "_python_impl_supported python3_7" 0
-test_is "_python_impl_supported python3_8" 0
-test_is "_python_impl_supported pypy1_8" 1
-test_is "_python_impl_supported pypy1_9" 1
-test_is "_python_impl_supported pypy2_0" 1
-test_is "_python_impl_supported pypy" 1
-test_is "_python_impl_supported pypy3" 0
-
 # check _python_impl_matches behavior
 test_is "_python_impl_matches python2_7 -2" 0
 test_is "_python_impl_matches python3_6 -2" 1
diff --git a/media-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-9999.ebuild
index bcc8a14c9a32..58b02287943b 100644
--- a/media-video/aegisub/aegisub-9999.ebuild
+++ b/media-video/aegisub/aegisub-9999.ebuild
@@ -12,8 +12,8 @@ PLOCALES="ar be bg ca cs da de el es eu fa fi fr_FR gl hu id it ja ko nl pl pt_B
 inherit autotools l10n lua-single wxwidgets xdg-utils git-r3
 
 DESCRIPTION="Advanced subtitle editor"
-HOMEPAGE="http://www.aegisub.org/ https://github.com/Aegisub/Aegisub"
-EGIT_REPO_URI="https://github.com/${PN^}/${PN^}.git"
+HOMEPAGE="http://www.aegisub.org/ https://github.com/wangqr/Aegisub"
+EGIT_REPO_URI="https://github.com/wangqr/${PN^}.git"
 # Submodules are used to pull bundled libraries.
 EGIT_SUBMODULES=()
 
diff --git a/media-video/aegisub/files/aegisub-9999-git.patch b/media-video/aegisub/files/aegisub-9999-git.patch
index 80fd243703b1..a5883336757b 100644
--- a/media-video/aegisub/files/aegisub-9999-git.patch
+++ b/media-video/aegisub/files/aegisub-9999-git.patch
@@ -59,20 +59,3 @@ index e45a54767..1bd0120ed 100644
    CPPFLAGS="$aegisub_save_CPPFLAGS"
    LIBS="$aegisub_save_LIBS"
  ])
-diff --git a/src/libresrc/libresrc.cpp b/src/libresrc/libresrc.cpp
-index 79dc0f16c..8648d2987 100644
---- a/src/libresrc/libresrc.cpp
-+++ b/src/libresrc/libresrc.cpp
-@@ -22,9 +22,10 @@
- 
- wxBitmap libresrc_getimage(const unsigned char *buff, size_t size, double scale, int dir) {
- 	wxMemoryInputStream mem(buff, size);
-+        auto img = wxImage(mem);
- 	if (dir != wxLayout_RightToLeft)
--		return wxBitmap(wxImage(mem), -1, scale);
--	return wxBitmap(wxImage(mem).Mirror(), -1, scale);
-+            return wxBitmap(img.Scale(img.GetHeight() * scale, img.GetWidth() * scale));
-+	return wxBitmap(img.Mirror().Scale(img.GetHeight() * scale, img.GetWidth() * scale));
- }
- 
- wxIcon libresrc_geticon(const unsigned char *buff, size_t size) {
diff --git a/profiles/arch/riscv/use.mask b/profiles/arch/riscv/use.mask
index 4dc60e18d16c..702524e3a479 100644
--- a/profiles/arch/riscv/use.mask
+++ b/profiles/arch/riscv/use.mask
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Unmask the flag which corresponds to ARCH.
@@ -8,9 +8,7 @@
 -systemd
 # Our Python has a lot of trouble with the two-level libdir.
 python_targets_python2_7
-python_targets_python3_6
 python_single_target_python2_7
-python_single_target_python3_6
 
 # Ben Kohler <bkohler@gentoo.org> (2019-01-09)
 # no fam providers keyworded yet
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index 52f7499a622d..59d626b66363 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -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
 
 # Lars Wendler <polynomial-c@gentoo.org> (2020-12-31)
@@ -163,7 +163,6 @@ app-shells/bash:0 readline
 # Force-enable all PYTHON_TARGETS for python-exec to avoid using private
 # API. Please remember to keep it in sync with python_targets.desc.
 dev-lang/python-exec python_targets_python2_7
-dev-lang/python-exec python_targets_python3_6
 dev-lang/python-exec python_targets_python3_7
 dev-lang/python-exec python_targets_python3_8
 dev-lang/python-exec python_targets_python3_9
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 11e7560900e2..ca2703dd53e4 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -10,14 +10,6 @@
 php_targets_php7-2
 php7-2
 
-# Michał Górny <mgorny@gentoo.org> (2021-01-01)
-# The support for python3.6 target in Gentoo is discontinued.
-# The flags are masked to permit removal of the last backport packages.
-# Once they're gone, the eclass support will be disabled and the flags
-# removed.
-python_targets_python3_6
-python_single_target_python3_6
-
 # Alexis Ballier <aballier@gentoo.org> (2020-10-13)
 # Nothing depends on those ROS messages. dev-ros/geneus
 # is half broken in our setup where it looks for packages
diff --git a/profiles/desc/python_single_target.desc b/profiles/desc/python_single_target.desc
index 8101fce1ec74..08637d9955cf 100644
--- a/profiles/desc/python_single_target.desc
+++ b/profiles/desc/python_single_target.desc
@@ -1,10 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors.
+# Copyright 1999-2021 Gentoo Authors.
 # Distributed under the terms of the GNU General Public License v2
 
 # This file contains descriptions of PYTHON_SINGLE_TARGET USE_EXPAND flags.
 
 python2_7 - Build for Python 2.7 only
-python3_6 - Build for Python 3.6 only
 python3_7 - Build for Python 3.7 only
 python3_8 - Build for Python 3.8 only
 python3_9 - Build for Python 3.9 only
diff --git a/profiles/desc/python_targets.desc b/profiles/desc/python_targets.desc
index da103c797788..0bea2b637481 100644
--- a/profiles/desc/python_targets.desc
+++ b/profiles/desc/python_targets.desc
@@ -1,10 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors.
+# Copyright 1999-2021 Gentoo Authors.
 # Distributed under the terms of the GNU General Public License v2
 
 # This file contains descriptions of PYTHON_TARGETS USE_EXPAND flags.
 
 python2_7 - Build with Python 2.7
-python3_6 - Build with Python 3.6
 python3_7 - Build with Python 3.7
 python3_8 - Build with Python 3.8
 python3_9 - Build with Python 3.9