Updating liguros repov21.1.3

59 files changed, 2083 insertions, 2790 deletions

diff --git a/dev-lang/cilk/Manifest b/dev-lang/cilk/Manifest
deleted file mode 100644
index 17f6d1dabc95..000000000000
--- a/dev-lang/cilk/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cilk-5.4.6.tar.gz 1270768 BLAKE2B e340901034a082af0ad431e33cd68c3ba9b97fa06ad5efe44b1f7e9eb6159f0408048d6ba76315dfc54670faf548d45f282fdd0ae5300ae2a5d741a92639beec SHA512 1ad082c5e1f42a4f15130673d1d43a0b5dedd80ca0e3182765065be8dccce72b26087243ca3405460dcc90332a84c3c5b1decf5a4650505fb738e7e085998e0e
diff --git a/dev-lang/cilk/cilk-5.4.6-r1.ebuild b/dev-lang/cilk/cilk-5.4.6-r1.ebuild
deleted file mode 100644
index 59455c836b28..000000000000
--- a/dev-lang/cilk/cilk-5.4.6-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit flag-o-matic autotools eutils
-
-DESCRIPTION="Language for multithreaded parallel programming based on ANSI C"
-HOMEPAGE="https://supertech.csail.mit.edu/cilk"
-SRC_URI="http://supertech.csail.mit.edu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples static-libs"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-autotools.patch
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -D_XOPEN_SOURCE=600 -D_POSIX_C_SOURCE=200809L
-	replace-flags -O[2-9] -O1
-	econf --with-perfctr=no $(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc NEWS README THANKS
-	use doc && dodoc doc/manual.pdf
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/dev-lang/cilk/cilk-5.4.6-r2.ebuild b/dev-lang/cilk/cilk-5.4.6-r2.ebuild
deleted file mode 100644
index ade58bc2203d..000000000000
--- a/dev-lang/cilk/cilk-5.4.6-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic
-
-DESCRIPTION="Language for multithreaded parallel programming based on ANSI C"
-HOMEPAGE="https://supertech.csail.mit.edu/cilk"
-SRC_URI="http://supertech.csail.mit.edu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples static-libs"
-
-PATCHES=(
-	"${FILESDIR}/${P}-autotools.patch"
-)
-
-src_prepare() {
-	# fix #571060 by restoring pre-GCC5 inline semantics
-	append-cflags -std=gnu89
-	append-cppflags -D_XOPEN_SOURCE=600 -D_POSIX_C_SOURCE=200809L
-	replace-flags -O[2-9] -O1
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-perfctr=no \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc NEWS README THANKS
-	use doc && dodoc doc/manual.pdf
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/dev-lang/cilk/files/cilk-5.4.6-autotools.patch b/dev-lang/cilk/files/cilk-5.4.6-autotools.patch
deleted file mode 100644
index 9f2d62b90410..000000000000
--- a/dev-lang/cilk/files/cilk-5.4.6-autotools.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -Nur cilk-5.4.6.orig/cilk2c/Makefile.am cilk-5.4.6/cilk2c/Makefile.am
---- cilk-5.4.6.orig/cilk2c/Makefile.am	2012-11-12 21:18:50.374020109 -0800
-+++ cilk-5.4.6/cilk2c/Makefile.am	2012-11-12 21:19:09.667111443 -0800
-@@ -1,4 +1,6 @@
--pkglib_PROGRAMS = cilk2c
-+pkglibexec_PROGRAMS = cilk2c
-+
-+BUILT_SOURCES = ANSI-C.c ANSI-C.h
- 
- cilk2c_SOURCES = analyze.c ast.c complex-types.c constexpr.c		\
- container.c conversions.c dataflow.c elide.c initializer.c list.c	\
-diff -Nur cilk-5.4.6.orig/configure.ac cilk-5.4.6/configure.ac
---- cilk-5.4.6.orig/configure.ac	2012-11-12 21:18:50.371020111 -0800
-+++ cilk-5.4.6/configure.ac	2012-11-12 21:19:09.668111459 -0800
-@@ -1,8 +1,8 @@
- dnl Process this file with autoconf to produce a configure script.
- AC_INIT
- AC_CONFIG_SRCDIR([config.h.in])
--AM_CONFIG_HEADER([config.h runtime/cilk-sysdep.h])
--AC_PREREQ(2.53)
-+AC_CONFIG_HEADERS([config.h runtime/cilk-sysdep.h])
-+AC_PREREQ(2.68)
- AM_INIT_AUTOMAKE(cilk, 5.4.6)
- AC_CANONICAL_HOST
- 
-@@ -20,7 +20,7 @@
- 
- dnl Checks for required programs.
- if test "$GCC" != "yes"; then
--   AC_ERROR("I cannot find gcc.  gcc is required for Cilk to work.")
-+   AC_MSG_ERROR("I cannot find gcc.  gcc is required for Cilk to work.")
- fi
- 
- dnl Checks for libraries.
-diff -Nur cilk-5.4.6.orig/examples/Makefile.am cilk-5.4.6/examples/Makefile.am
---- cilk-5.4.6.orig/examples/Makefile.am	2012-11-12 21:18:50.370020112 -0800
-+++ cilk-5.4.6/examples/Makefile.am	2012-11-12 21:20:06.347380163 -0800
-@@ -5,13 +5,13 @@
- NPROC = 4
- PROGFLAGS = --nproc $(NPROC) --yield
- 
--CILKFLAGS=@CFLAGS@
-+CILKFLAGS=-O2
- CILKCOMPILE = $(CILK) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CILKFLAGS) $(CILKFLAGS)
- CILKLD = $(CILK)
- CILKLINK = $(CILKLD) $(AM_CILKFLAGS) $(CILKFLAGS) $(PERFCTR_LIBS) $(LDFLAGS) -o $@
- LINK=$(CILKLINK)
- 
--noinst_PROGRAMS=hello fib fib-serial testall ck magic knapsack queens	\
-+check_PROGRAMS=hello fib fib-serial testall ck magic knapsack queens	\
- cilksort fft test-locks bucket cholesky game nfib kalah matmul lu plu	\
- heat test-errno strassen rectmul spacemul \
- test-void-func \
-@@ -58,7 +58,7 @@
- EXTRA_DIST = knapsack-example1.input knapsack-example2.input	\
- knapsack-example3.input
- 
--check:  hello testall fft fib lu matmul cilksort heat test-locks test-errno
-+check-local:  hello testall fft fib lu matmul cilksort heat test-locks test-errno
- 	@echo "Runnig Cilk tests.  This will take a while."
- 	./hello $(PROGFLAGS)
- 	./test-void-func $(PROGFLAGS)
-diff -Nur cilk-5.4.6.orig/runtime/Makefile.am cilk-5.4.6/runtime/Makefile.am
---- cilk-5.4.6.orig/runtime/Makefile.am	2012-11-12 21:18:50.375020110 -0800
-+++ cilk-5.4.6/runtime/Makefile.am	2012-11-12 21:19:09.668111459 -0800
-@@ -1,5 +1,5 @@
- lib_LTLIBRARIES = libcilk.la libcilk.g.la libcilk.p.la libcilk.g.p.la
--pkglib_LIBRARIES = libcilkrt0.a libcilkrt0g.a libcilkrt0p.a libcilkrt0gp.a
-+lib_LIBRARIES = libcilkrt0.a libcilkrt0g.a libcilkrt0p.a libcilkrt0gp.a
- 
- CILK_HFILES = cilk-cilk2c.h cilk.h cilk-lib.h cilk-lib.cilkh	\
- gcc-builtin.h cilk-cilk2c-pre.h
-@@ -8,7 +8,7 @@
- cmdline.c internal-malloc.c timing.c invoke-main.c malloc.c debug.c	\
- workers.c mutex.c
- 
--pkginclude_HEADERS = $(CILK_HFILES) cilk-conf.h cilk-sysdep.h
-+include_HEADERS = $(CILK_HFILES) cilk-conf.h cilk-sysdep.h
- 
- CILK_SRC = cilk-internal.h $(CILK_CFILES) $(CILK_HFILES)
- COMMON_LINK_FLAGS = -version-info 1:3:0 @PTHREAD_LIBS@
diff --git a/dev-lang/cilk/metadata.xml b/dev-lang/cilk/metadata.xml
deleted file mode 100644
index 463622498566..000000000000
--- a/dev-lang/cilk/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sci@gentoo.org</email>
-		<name>Gentoo Science Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		Cilk is a language for multithreaded parallel programming based on
-		ANSI C. Cilk is especially effective for exploiting dynamic, highly
-		asynchronous parallelism, which can be difficult to write in data-parallel or
-		message-passing style. Cilk provides an effective platform for
-		programming dense and sparse numerical algorithms, such as matrix
-		factorization and N-body simulations. Cilk is algorithmic, in that
-		the runtime system employs a scheduler that allows the performance
-		of programs to be estimated accurately based on abstract complexity
-		measures.
-	</longdescription>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-lang/crystal/Manifest b/dev-lang/crystal/Manifest
index 1dbc5dcbd597..490b5e5e5c04 100644
--- a/dev-lang/crystal/Manifest
+++ b/dev-lang/crystal/Manifest
@@ -1,3 +1,6 @@
 DIST crystal-0.35.1-1-linux-i686.tar.gz 28330633 BLAKE2B 1f393ad53f2643b4514de54192047f549cffa22b14afbf25d9de00bf815378ec65a5049a9eee28753dc13bc9fea40447be109f21b55518a6ed8f06353a0b26e6 SHA512 333c2cdbd40ef65de52c1056e6089628ed83daf1a1e9d5243e876b622545d767077b485003ae7efaedeb7807c03c40e6f356cbdcce4dab2319c1686da120dac0
 DIST crystal-0.35.1-1-linux-x86_64.tar.gz 26653426 BLAKE2B a4ab58e784af3cd0298057a35079dfb48c9ca8d56388394377b86d7475d143a07cc3a800cdee3c9af3054d249ac9b87808d86b25747fc8f9322d01f25a3e3dec SHA512 1cceea5742651e2708e19ea49a7a884500d21beec3eaed75fc9e4b82e7dabaa521143b6c576ec48d2f5e27951163fd8c2ae417f46a1847c68f6e91c9b2a9a72a
 DIST crystal-0.35.1.tar.gz 2349984 BLAKE2B bf9078c949499e3f8469a055908c23335b04f2a58ab323345bdcdf1de70d00cdfe3aae7baf93e5098e21852c59d1cd8a0fb4faa91c9877d7ef2347a5faeaa69c SHA512 0381568330802de5838f8e66600567817b60ba0087bb3cc2b5df2944c5c42779039b606c81e0207bef34082bf25331b590a8140830f65ba4106ae465f717000b
+DIST crystal-0.36.0-1-linux-i686.tar.gz 30860920 BLAKE2B c2c9b55a100e65cb3dbefe69782c72a522e71751bcabcfd38f582e010585349f4213464af3fd6c7ddb90ddb7f579e56dc07ed56dc06b7c6bc7ae4b561f1705e6 SHA512 5363cef6622b86cf8786d65926e105a643790cb62bfdd2555df963d83fa06dd55f493e172115c4788fd82cecc477d92fb77b1c0b73f92e23a9378799dedfd64e
+DIST crystal-0.36.0-1-linux-x86_64.tar.gz 28383614 BLAKE2B a34e5448395bd079c10504b0f0d7de23fc916c8e0db51bc0b1462e13ec68c7f08eb04e73937756673e11a7100aa5cdd6d2d4aa8d38e145027bf6e4c19cd0bbbe SHA512 49710ba0ceb8aef39971e6731e5ce902274d7ac5f02289df6e1eb7b9bea73b7d6c188547df48e8acc44bc8088a2d3f7579770cdcd2fd118ec672b606ca073b9b
+DIST crystal-0.36.0.tar.gz 2411744 BLAKE2B b564199de1cf30a418b6e06ffb2d8045d1dcebe60b58143a0579dcee2eb5c0d514c30a7e7d083ad2f6c8393423dfa3c8bc8bbc2dfdf2d6387d258b1dab7caf66 SHA512 561c5f97a9355a616a42ec9c88853883ee06a6f472918bf5f2714c0dacefa87209b06bc419355da88c3f5248ce713710960e24e0bc8e9eca07ef9c8b970661b8
diff --git a/dev-lang/crystal/crystal-0.36.0.ebuild b/dev-lang/crystal/crystal-0.36.0.ebuild
new file mode 100644
index 000000000000..31b5378f2b33
--- /dev/null
+++ b/dev-lang/crystal/crystal-0.36.0.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 llvm multiprocessing toolchain-funcs
+
+BV=${PV}-1
+BV_AMD64=${BV}-linux-x86_64
+BV_X86=${BV}-linux-i686
+
+DESCRIPTION="The Crystal Programming Language"
+HOMEPAGE="https://crystal-lang.org"
+SRC_URI="https://github.com/crystal-lang/crystal/archive/${PV}.tar.gz -> ${P}.tar.gz
+	amd64? ( https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_AMD64}.tar.gz )
+	x86? ( https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_X86}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc debug examples blocking-stdio-hack +xml +yaml"
+
+RESTRICT=test # not stable for day-to-day runs
+
+LLVM_MAX_SLOT=11
+
+DEPEND="
+	sys-devel/llvm:${LLVM_MAX_SLOT}
+	dev-libs/boehm-gc[static-libs,threads]
+	dev-libs/libatomic_ops
+	dev-libs/libevent
+	dev-libs/libpcre
+	sys-libs/libunwind
+	dev-libs/pcl
+	dev-libs/gmp:0
+"
+RDEPEND="${DEPEND}
+	xml? ( dev-libs/libxml2 )
+	yaml? ( dev-libs/libyaml )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.31.0-verbose.patch
+	"${FILESDIR}"/${PN}-0.26.1-gentoo-tests-sandbox.patch
+	"${FILESDIR}"/${PN}-0.27.0-extra-spec-flags.patch
+	#"${FILESDIR}"/${PN}-0.27.0-max-age-0-test.patch
+	"${FILESDIR}"/${PN}-0.27.0-gentoo-tests-long-unix.patch
+	"${FILESDIR}"/${PN}-0.27.0-gentoo-tests-long-unix-2.patch
+)
+
+src_prepare() {
+	default
+
+	use blocking-stdio-hack && eapply "${FILESDIR}"/"${PN}"-0.22.0-blocking-stdio-hack.patch
+}
+
+src_compile() {
+	local bootstrap_path=${WORKDIR}/${PN}-${BV}/bin
+	if [[ ! -d ${bootstrap_path} ]]; then
+		eerror "Binary tarball does not contain expected directory:"
+		die "'${bootstrap_path}' path does not exist."
+	fi
+
+	# crystal uses 'LLVM_TARGETS' to override default list of targets
+	unset LLVM_TARGETS
+	emake \
+		$(usex debug "" release=1) \
+		progress=true \
+		stats=1 \
+		threads=$(makeopts_jobs) \
+		verbose=1 \
+		\
+		CC=$(tc-getCC) \
+		CXX=$(tc-getCXX) \
+		AR=$(tc-getAR) \
+		\
+		PATH="${bootstrap_path}:${PATH}" \
+		CRYSTAL_PATH=src \
+		CRYSTAL_CONFIG_VERSION=${PV} \
+		CRYSTAL_CONFIG_PATH="lib:${EPREFIX}/usr/$(get_libdir)/crystal"
+	use doc && emake docs
+}
+
+src_test() {
+	# EXTRA_SPEC_FLAGS is useful to debug individual tests
+	# as part of full build:
+	#    USE=debug EXTRA_SPEC_FLAGS='-e parse_set_cookie' emerge -1 crystal
+	emake spec \
+		$(usex debug "" release=1) \
+		progress=true \
+		stats=1 \
+		threads=$(makeopts_jobs) \
+		verbose=1 \
+		\
+		CC=$(tc-getCC) \
+		CXX=$(tc-getCXX) \
+		AR=$(tc-getAR) \
+		\
+		CRYSTAL_PATH=src \
+		CRYSTAL_CONFIG_VERSION=${PV} \
+		\
+		"EXTRA_SPEC_FLAGS=${EXTRA_SPEC_FLAGS}"
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/crystal
+	doins -r src/.
+	dobin .build/crystal
+
+	insinto /usr/share/zsh/site-functions
+	newins etc/completion.zsh _crystal
+
+	use examples && dodoc -r samples
+
+	if use doc ; then
+		docinto api
+		dodoc -r docs/.
+	fi
+
+	newbashcomp etc/completion.bash ${PN}
+}
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 9b1c6f1f1347..f5f637955a84 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -1,8 +1,8 @@
 DIST erlang-23.0.4.tar.gz 56394805 BLAKE2B 10a4e9e3084ad2d1bb10fa736d86eb03fa6b249f83b9d06bfef4c37f99ad86dd1415c2fbaa1524cddaf57dd228d25f388fa9fe9f5b4a03ba7477080e11020fb1 SHA512 53d4b7a5e76113bb3a9695a266e58dbebb57887b1eea4e8acb56bb85d194295231d739719d526dfc6d1f0bf745d7f059fdf5ec9dc79859f5b16a75c4d0a6b348
-DIST erlang-23.1.4.tar.gz 56503340 BLAKE2B f4b26aa5882bb3d2218897706734798a80cbb5113008be70b2a0c793a5cc1eb01eb1ace17ae525e19f176e47ffc85b108240b7fec71cf8eedb4d67860ecaa98b SHA512 864b69fc69f3843dfe839faf1c1e86ec505282ec4d86ed1add445998ba28bcc623522471d8d8636a9cf1e24e84f99d5cae3880a4b1171abab9651ef242a55367
 DIST erlang-23.1.5.tar.gz 56508089 BLAKE2B 7784cbed8df68d449cbace6d84b37208b739a3b12fbed1117f05c765883d348e877001f5eba15ffdec5acc47725bf69d06a7f02b48766efa5496a8326fb8eb8c SHA512 dccb863ace1f3c3fd17c848bf21c982338546e2be2a3b81ade35bcefeb4ff75afff28ebe2363ccf7f4680417f83bbeaa51c74274a23621139b5a4be6bb824955
 DIST erlang-23.2.1.tar.gz 56580525 BLAKE2B 4b5d4be9d0501dd2eb5d44357ccc9a169dc3b5742380264a7929e6aebf1d003327b2c109aa7dc4ad668f1576376e54022ff240f41df7af9010184d643eae2371 SHA512 444c19fac295a979321ccde1f516156a25faa79d66437ddf7bc0a197f3fb8d2ddd6c056d565f9b6bc47e8444b8feda790c4844dbe95ec0b300428fb22c4e0531
 DIST erlang-23.2.2.tar.gz 56594755 BLAKE2B 3f5c552d3cd070b36bc7a1112b9541f358001ee4ad49a62ccce3462b02b642d4abc0bf8844e5441168be850f5588cf4ecdbf545fcff60e7746cec637898f2c7e SHA512 26743a7a4b2e31e63c0940ed6fdad64427c22e0f08fc063e1b8639bea6fa89c6b24e9c87ca572475d3ce39a18857ef6143676653cdf97b374656ae49f5892633
+DIST erlang-23.2.3.tar.gz 56590563 BLAKE2B 319dbdeedfd74dc6341494d5ed81734c15475ea364f0b5690ff4d8030d7aea30fe66831fa06197e8a7334d48bdb4f0345effcf92afe1b70dd0ab79b5700cba1c SHA512 c1c176d908ac0a2470926997ec62d0e2d330aac25202e24314af1d57171d460fd5582e9ece9e289d7eb5c2728a6966b130e14ada10ba8ead04d47a849287ded4
 DIST erlang-23.2.tar.gz 56581092 BLAKE2B f3191b99465ab18eaf13c6d15f79ae150fb04337450b3ff145532aab0da229c44c082bb138a79c84860f09107a363c34e2b2505ce38c6c8dea1ede5fbe3ce044 SHA512 3bdb464992387c5a352c11bf9dc49c6a982dac10865d2b668d8db6fb45db15f4d79d38976d04fbbd51568ee9efb8b5295bb06b6fee37b81fde6fa43c51dcc313
 DIST erlang_doc_html_23.0.tar.gz 36238699 BLAKE2B bce5fb1d766d3a795728cf7c00529129690f52e5dbe7363095cb7e63d5331a4dfc05c2042d24f10c7f3facbd187284aa323a92c0ed7515c1750aee4cd890fbd4 SHA512 bd0b1adf8639674d31152024e1351105249c6e6f93f28362e9e4b66ce6daadbe5eef5917a5889c926130e81bd000cfc44895ebaa309bf9a0c1c125713b715927
 DIST erlang_doc_html_23.1.tar.gz 36285075 BLAKE2B e2e24ac4cecfc9c10853fd3718e8e332579a91bf25eaaf9e0fc2044d89bcd6d03fd251d6a8ab64a86439f1244e275ef398701b47933a741d4e64016838db48aa SHA512 c8fecb08344c9c7a4c7b911ac4f73e2d8c0c3778d665098c3377e055346a7ecfcc378bca28dff768c36dc7bf7447308f4fb58273875c22f2d6cd896fd6232656
diff --git a/dev-lang/erlang/erlang-23.1.5.ebuild b/dev-lang/erlang/erlang-23.1.5.ebuild
index a3053cbf9325..27ebfc6b45ee 100644
--- a/dev-lang/erlang/erlang-23.1.5.ebuild
+++ b/dev-lang/erlang/erlang-23.1.5.ebuild
@@ -22,7 +22,7 @@ LICENSE="Apache-2.0"
 # same build of ERTS that was used when compiling the code.  See
 # http://erlang.org/doc/system_principles/misc.html for more information.
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets"
 
 RDEPEND="
diff --git a/dev-lang/erlang/erlang-23.1.4.ebuild b/dev-lang/erlang/erlang-23.2.3.ebuild
index 27ebfc6b45ee..e78f4f36b069 100644
--- a/dev-lang/erlang/erlang-23.1.4.ebuild
+++ b/dev-lang/erlang/erlang-23.2.3.ebuild
@@ -22,7 +22,7 @@ LICENSE="Apache-2.0"
 # same build of ERTS that was used when compiling the code.  See
 # http://erlang.org/doc/system_principles/misc.html for more information.
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets"
 
 RDEPEND="
@@ -50,7 +50,6 @@ S="${WORKDIR}/otp-OTP-${PV}"
 PATCHES=(
 	"${FILESDIR}"/18.2.1-wx3.0.patch
 	"${FILESDIR}"/${PN}-22.0-dont-ignore-LDFLAGS.patch
-	"${FILESDIR}"/${PN}-23.1.2-ac2.70.patch
 )
 
 SITEFILE=50"${PN}"-gentoo.el
diff --git a/dev-lang/erlang/erlang-23.2.ebuild b/dev-lang/erlang/erlang-23.2.ebuild
index e266bd5246c6..27ebfc6b45ee 100644
--- a/dev-lang/erlang/erlang-23.2.ebuild
+++ b/dev-lang/erlang/erlang-23.2.ebuild
@@ -22,7 +22,7 @@ LICENSE="Apache-2.0"
 # same build of ERTS that was used when compiling the code.  See
 # http://erlang.org/doc/system_principles/misc.html for more information.
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets"
 
 RDEPEND="
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index 5adbdb1ef2d7..85fdcd7caf02 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -1,2 +1,4 @@
 DIST go1.14.13.src.tar.gz 22553900 BLAKE2B 35aed1c43a59e06c1d5feaa91a6c4120c586958257cb3e4f83ab4e767159e20ae953d70bc0debabd80722bca0965d1b129531a2bd89f558df0a8700cadc09edc SHA512 b54a0bc3b85809a78d4704fe2e97ad7417a2027608ec0f90c2784e2ddb28b505df3cda862dc6f1b99af2d136363cbb9b120e2fd6ed985cb300c43f8e539a5e28
+DIST go1.14.14.src.tar.gz 22557733 BLAKE2B aa3638c7a20f89e90bf17e9da1b12323cc8c0f52fb0a92ca6a850f7b2c94e406ea50a57fc28cc34b951bf7ecee0a9bb1ce884ad86dfc23241d7b62cd9435f881 SHA512 76213b19eeec66ca6c6b5bdef875bea0b64c3877c70eec64dd65f7869ceb8db016ff19193f01771f8944fd5f0ae3b54c68185e158f2622d1db5552fec1f37976
 DIST go1.15.6.src.tar.gz 23019337 BLAKE2B d328401af9843f4a099dee7d82433ad2a0b349add0f2ecb609635814cca610e17a6fc50215e9928b8cb0d8ea8dd6ae9d84ffca125e1362dfb18ba08783bb4264 SHA512 f20e495204f32170d6554e8f4b64763dae8302a7859005020f650d1d53a5b15de3afbaff28e0b6418287396166c67bdc4c6bee7a0fd7ba8a87bb79b6c1d38326
+DIST go1.15.7.src.tar.gz 23017978 BLAKE2B 15b0827fb56b8e9208c65e8f7f11c7f67820efce1627b4123e937301bb437c597e87adfff9a2eee9aaf53ba0f22eb2f10746bafb7247b4250566f20181b7a2a0 SHA512 7b3e8bcd2fc95baad41f8b5f0456c009e01896d160e65c2670d51c23d8cfcf7a6801e831e6f9a8877fe58c8f54ac8f75bf6e7935b38ba7aaa51dc8e46cf76ddb
diff --git a/dev-lang/go/go-1.14.13-r1.ebuild b/dev-lang/go/go-1.14.13-r1.ebuild
index ebfb8c5bc2b5..55fd0c4f6bf1 100644
--- a/dev-lang/go/go-1.14.13-r1.ebuild
+++ b/dev-lang/go/go-1.14.13-r1.ebuild
@@ -181,14 +181,6 @@ src_install()
 	# install the @golang-rebuild set for Portage
 	insinto /usr/share/portage/config/sets
 	newins "${FILESDIR}"/go-sets.conf go.conf
-
-	# fix install_name for test object (binutils_test) on Darwin, it
-	# is never used in real circumstances
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		local libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/
-		      libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64
-		install_name_tool -id "${libmac64}" "${D}${libmac64}"
-	fi
 }
 
 pkg_postinst() {
diff --git a/dev-lang/go/go-1.14.14.ebuild b/dev-lang/go/go-1.14.14.ebuild
new file mode 100644
index 000000000000..e9d4796bda49
--- /dev/null
+++ b/dev-lang/go/go-1.14.14.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+MY_PV=${PV/_/}
+
+inherit toolchain-funcs
+
+case ${PV}  in
+*9999*)
+	EGIT_REPO_URI="https://github.com/golang/go.git"
+	inherit git-r3
+	;;
+*)
+	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
+	S="${WORKDIR}"/go
+	case ${PV} in
+	*_beta*|*_rc*) ;;
+	*)
+		KEYWORDS="-* amd64 ~arm arm64 ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		;;
+	esac
+esac
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="https://golang.org"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+
+BDEPEND="|| (
+		dev-lang/go
+		dev-lang/go-bootstrap )"
+RDEPEND="!<dev-go/go-tools-0_pre20150902"
+
+# Do not complain about CFLAGS, etc, since Go doesn't use them.
+QA_FLAGS_IGNORED='.*'
+
+# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
+QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
+
+# Do not strip this package. Stripping is unsupported upstream and may
+# fail.
+RESTRICT+=" strip"
+
+DOCS=(
+AUTHORS
+CONTRIBUTING.md
+CONTRIBUTORS
+PATENTS
+README.md
+)
+
+go_arch()
+{
+	# By chance most portage arch names match Go
+	local portage_arch=$(tc-arch $@)
+	case "${portage_arch}" in
+		x86)	echo 386;;
+		x64-*)	echo amd64;;
+		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
+		s390) echo s390x ;;
+		*)		echo "${portage_arch}";;
+	esac
+}
+
+go_arm()
+{
+	case "${1:-${CHOST}}" in
+		armv5*)	echo 5;;
+		armv6*)	echo 6;;
+		armv7*)	echo 7;;
+		*)
+			die "unknown GOARM for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_os()
+{
+	case "${1:-${CHOST}}" in
+		*-linux*)	echo linux;;
+		*-darwin*)	echo darwin;;
+		*-freebsd*)	echo freebsd;;
+		*-netbsd*)	echo netbsd;;
+		*-openbsd*)	echo openbsd;;
+		*-solaris*)	echo solaris;;
+		*-cygwin*|*-interix*|*-winnt*)
+			echo windows
+			;;
+		*)
+			die "unknown GOOS for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_tuple()
+{
+	echo "$(go_os $@)_$(go_arch $@)"
+}
+
+go_cross_compile()
+{
+	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
+}
+
+src_compile()
+{
+	if has_version -b dev-lang/go; then
+		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go"
+	elif has_version -b dev-lang/go-bootstrap; then
+		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap"
+	else
+		eerror "Go cannot be built without go or go-bootstrap installed"
+		die "Should not be here, please report a bug"
+	fi
+
+	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
+	export GOROOT="$(pwd)"
+	export GOBIN="${GOROOT}/bin"
+
+	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
+	export GOHOSTARCH=$(go_arch ${CBUILD})
+	export GOHOSTOS=$(go_os ${CBUILD})
+	export CC=$(tc-getBUILD_CC)
+
+	export GOARCH=$(go_arch)
+	export GOOS=$(go_os)
+	export CC_FOR_TARGET=$(tc-getCC)
+	export CXX_FOR_TARGET=$(tc-getCXX)
+	if [[ ${ARCH} == arm ]]; then
+		export GOARM=$(go_arm)
+	fi
+
+	cd src
+	bash -x ./make.bash || die "build failed"
+}
+
+src_test()
+{
+	go_cross_compile && return 0
+
+	cd src
+	PATH="${GOBIN}:${PATH}" \
+	./run.bash -no-rebuild || die "tests failed"
+	cd ..
+	rm -fr pkg/*_race || die
+	rm -fr pkg/obj/go-build || die
+}
+
+src_install()
+{
+	# There is a known issue which requires the source tree to be installed [1].
+	# Once this is fixed, we can consider using the doc use flag to control
+	# installing the doc and src directories.
+	# The use of cp is deliberate in order to retain permissions
+	# [1] https://golang.org/issue/2775
+	dodir /usr/lib/go
+	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
+	einstalldocs
+
+	# testdata directories are not needed on the installed system
+	rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
+
+	local bin_path
+	if go_cross_compile; then
+		bin_path="bin/$(go_tuple)"
+	else
+		bin_path=bin
+	fi
+	local f x
+	for x in ${bin_path}/*; do
+		f=${x##*/}
+		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
+	done
+
+	# install the @golang-rebuild set for Portage
+	insinto /usr/share/portage/config/sets
+	newins "${FILESDIR}"/go-sets.conf go.conf
+}
+
+pkg_postinst() {
+	[[ -z ${REPLACING_VERSIONS} ]] && return
+	einfo "After ${CATEGORY}/${PN} is updated it is recommended to rebuild"
+	einfo "all packages compiled with previous versions of ${CATEGORY}/${PN}"
+	einfo "due to the static linking nature of go."
+	einfo "If this is not done, the packages compiled with the older"
+	einfo "version of the compiler will not be updated until they are"
+	einfo "updated individually, which could mean they will have"
+	einfo "vulnerabilities."
+	einfo "Run 'emerge @golang-rebuild' to rebuild all 'go' packages"
+	einfo "See https://bugs.gentoo.org/752153 for more info"
+}
diff --git a/dev-lang/go/go-1.15.6-r1.ebuild b/dev-lang/go/go-1.15.6-r1.ebuild
index ebfb8c5bc2b5..55fd0c4f6bf1 100644
--- a/dev-lang/go/go-1.15.6-r1.ebuild
+++ b/dev-lang/go/go-1.15.6-r1.ebuild
@@ -181,14 +181,6 @@ src_install()
 	# install the @golang-rebuild set for Portage
 	insinto /usr/share/portage/config/sets
 	newins "${FILESDIR}"/go-sets.conf go.conf
-
-	# fix install_name for test object (binutils_test) on Darwin, it
-	# is never used in real circumstances
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		local libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/
-		      libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64
-		install_name_tool -id "${libmac64}" "${D}${libmac64}"
-	fi
 }
 
 pkg_postinst() {
diff --git a/dev-lang/go/go-1.15.7.ebuild b/dev-lang/go/go-1.15.7.ebuild
new file mode 100644
index 000000000000..e9d4796bda49
--- /dev/null
+++ b/dev-lang/go/go-1.15.7.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+MY_PV=${PV/_/}
+
+inherit toolchain-funcs
+
+case ${PV}  in
+*9999*)
+	EGIT_REPO_URI="https://github.com/golang/go.git"
+	inherit git-r3
+	;;
+*)
+	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
+	S="${WORKDIR}"/go
+	case ${PV} in
+	*_beta*|*_rc*) ;;
+	*)
+		KEYWORDS="-* amd64 ~arm arm64 ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		;;
+	esac
+esac
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="https://golang.org"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+
+BDEPEND="|| (
+		dev-lang/go
+		dev-lang/go-bootstrap )"
+RDEPEND="!<dev-go/go-tools-0_pre20150902"
+
+# Do not complain about CFLAGS, etc, since Go doesn't use them.
+QA_FLAGS_IGNORED='.*'
+
+# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
+QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
+
+# Do not strip this package. Stripping is unsupported upstream and may
+# fail.
+RESTRICT+=" strip"
+
+DOCS=(
+AUTHORS
+CONTRIBUTING.md
+CONTRIBUTORS
+PATENTS
+README.md
+)
+
+go_arch()
+{
+	# By chance most portage arch names match Go
+	local portage_arch=$(tc-arch $@)
+	case "${portage_arch}" in
+		x86)	echo 386;;
+		x64-*)	echo amd64;;
+		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
+		s390) echo s390x ;;
+		*)		echo "${portage_arch}";;
+	esac
+}
+
+go_arm()
+{
+	case "${1:-${CHOST}}" in
+		armv5*)	echo 5;;
+		armv6*)	echo 6;;
+		armv7*)	echo 7;;
+		*)
+			die "unknown GOARM for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_os()
+{
+	case "${1:-${CHOST}}" in
+		*-linux*)	echo linux;;
+		*-darwin*)	echo darwin;;
+		*-freebsd*)	echo freebsd;;
+		*-netbsd*)	echo netbsd;;
+		*-openbsd*)	echo openbsd;;
+		*-solaris*)	echo solaris;;
+		*-cygwin*|*-interix*|*-winnt*)
+			echo windows
+			;;
+		*)
+			die "unknown GOOS for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_tuple()
+{
+	echo "$(go_os $@)_$(go_arch $@)"
+}
+
+go_cross_compile()
+{
+	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
+}
+
+src_compile()
+{
+	if has_version -b dev-lang/go; then
+		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go"
+	elif has_version -b dev-lang/go-bootstrap; then
+		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap"
+	else
+		eerror "Go cannot be built without go or go-bootstrap installed"
+		die "Should not be here, please report a bug"
+	fi
+
+	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
+	export GOROOT="$(pwd)"
+	export GOBIN="${GOROOT}/bin"
+
+	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
+	export GOHOSTARCH=$(go_arch ${CBUILD})
+	export GOHOSTOS=$(go_os ${CBUILD})
+	export CC=$(tc-getBUILD_CC)
+
+	export GOARCH=$(go_arch)
+	export GOOS=$(go_os)
+	export CC_FOR_TARGET=$(tc-getCC)
+	export CXX_FOR_TARGET=$(tc-getCXX)
+	if [[ ${ARCH} == arm ]]; then
+		export GOARM=$(go_arm)
+	fi
+
+	cd src
+	bash -x ./make.bash || die "build failed"
+}
+
+src_test()
+{
+	go_cross_compile && return 0
+
+	cd src
+	PATH="${GOBIN}:${PATH}" \
+	./run.bash -no-rebuild || die "tests failed"
+	cd ..
+	rm -fr pkg/*_race || die
+	rm -fr pkg/obj/go-build || die
+}
+
+src_install()
+{
+	# There is a known issue which requires the source tree to be installed [1].
+	# Once this is fixed, we can consider using the doc use flag to control
+	# installing the doc and src directories.
+	# The use of cp is deliberate in order to retain permissions
+	# [1] https://golang.org/issue/2775
+	dodir /usr/lib/go
+	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
+	einstalldocs
+
+	# testdata directories are not needed on the installed system
+	rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
+
+	local bin_path
+	if go_cross_compile; then
+		bin_path="bin/$(go_tuple)"
+	else
+		bin_path=bin
+	fi
+	local f x
+	for x in ${bin_path}/*; do
+		f=${x##*/}
+		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
+	done
+
+	# install the @golang-rebuild set for Portage
+	insinto /usr/share/portage/config/sets
+	newins "${FILESDIR}"/go-sets.conf go.conf
+}
+
+pkg_postinst() {
+	[[ -z ${REPLACING_VERSIONS} ]] && return
+	einfo "After ${CATEGORY}/${PN} is updated it is recommended to rebuild"
+	einfo "all packages compiled with previous versions of ${CATEGORY}/${PN}"
+	einfo "due to the static linking nature of go."
+	einfo "If this is not done, the packages compiled with the older"
+	einfo "version of the compiler will not be updated until they are"
+	einfo "updated individually, which could mean they will have"
+	einfo "vulnerabilities."
+	einfo "Run 'emerge @golang-rebuild' to rebuild all 'go' packages"
+	einfo "See https://bugs.gentoo.org/752153 for more info"
+}
diff --git a/dev-lang/go/go-9999.ebuild b/dev-lang/go/go-9999.ebuild
index 6bb792691ce1..39d69abc7b52 100644
--- a/dev-lang/go/go-9999.ebuild
+++ b/dev-lang/go/go-9999.ebuild
@@ -181,14 +181,6 @@ src_install()
 	# install the @golang-rebuild set for Portage
 	insinto /usr/share/portage/config/sets
 	newins "${FILESDIR}"/go-sets.conf go.conf
-
-	# fix install_name for test object (binutils_test) on Darwin, it
-	# is never used in real circumstances
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		local libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/
-		      libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64
-		install_name_tool -id "${libmac64}" "${D}${libmac64}"
-	fi
 }
 
 pkg_postinst() {
diff --git a/dev-lang/lua/lua-5.1.5-r106.ebuild b/dev-lang/lua/lua-5.1.5-r106.ebuild
index 5e38cf0738b2..7da97a9910c4 100644
--- a/dev-lang/lua/lua-5.1.5-r106.ebuild
+++ b/dev-lang/lua/lua-5.1.5-r106.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.lua.org/ftp/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="5.1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+deprecated readline"
 
 COMMON_DEPEND="
diff --git a/dev-lang/lua/lua-5.2.4-r3.ebuild b/dev-lang/lua/lua-5.2.4-r3.ebuild
index 7b7c1c61f732..c4f04433efb2 100644
--- a/dev-lang/lua/lua-5.2.4-r3.ebuild
+++ b/dev-lang/lua/lua-5.2.4-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="5.2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+deprecated readline test test-complete"
 
 COMMON_DEPEND="
diff --git a/dev-lang/lua/lua-5.3.6-r2.ebuild b/dev-lang/lua/lua-5.3.6-r2.ebuild
index c47b745cd1cb..b6b2375e5e19 100644
--- a/dev-lang/lua/lua-5.3.6-r2.ebuild
+++ b/dev-lang/lua/lua-5.3.6-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="5.3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+deprecated readline test test-complete"
 
 COMMON_DEPEND="
diff --git a/dev-lang/lua/lua-5.4.2-r1.ebuild b/dev-lang/lua/lua-5.4.2-r1.ebuild
index 3840219215a7..d1d1b431e953 100644
--- a/dev-lang/lua/lua-5.4.2-r1.ebuild
+++ b/dev-lang/lua/lua-5.4.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="5.4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+deprecated readline test test-complete"
 
 COMMON_DEPEND="
diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index e308fc5a33e5..e3dcc3fd7efb 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -1,10 +1,2 @@
-DIST mercury-extras-14.01.1-gentoo-patchset-4.tar.gz 4361 BLAKE2B a1939e4b76782cb01fc7ee5dcb1ccbb885e93992d0e6f540552eb987f405b3a70671527dfacb873323f6030bb6de2f6cdd23768dbc36e8b656d836e2890b7d8a SHA512 e30ac4e9c0592a1ea5253663bf351814e91977ea53892dca4d996b217aac959265563910cc21aa64ee12a93ea379cb8143730585c7d32390bcf05f2a1b0590d7
-DIST mercury-extras-20.01-gentoo-patchset-0.tar.gz 542 BLAKE2B 4f24f5af21cbd566eb72ce03d618d858f16d02a921b506c933342181ea057d98377077535571223c85b1f1fa5854e52005f67f40dd75bb392929faaad889eed1 SHA512 6a2eb1dbaac1f028c0ce5f0e21a8f24bd4ba9b068f1ea5d8554c5fb7376642797709f0aa93db336d2f015b6f815d0aa27c7d60720aab340ace180d49791bd852
-DIST mercury-extras-20.01.1-gentoo-patchset-0.tar.gz 732 BLAKE2B 32287e116b94b540ca0b710eac8921669ff9a56b5d8a812eba8443609ccfc8c937baaa53a0ae4704abdc78013d58eddd0dc5cda7c807d7a0b724ebda1dede723 SHA512 0d3ca2984eb054ec2add5e05fb49d4fa711b3c78038b4e9777c4767083fc3bae552a261677fed6f07c293d2fb1ebf632ba633eb64a3a8ab4880c6f6619a197ea
-DIST mercury-extras-20.01.2-gentoo-patchset-1.tar.gz 922 BLAKE2B 3713bb18147328acfda4e605ca241a000b19c787f15998ba79b9198bf0bd2e5597df3198837efc24679655d923c56391973085c59498d5441626cab4bbce6226 SHA512 70fa7bb240ccee87557eaf84dba712f162543c0caca4e80ec2ab47ed9f5a81cc8f1ad47a85671cfe3f917c4757a653a6602e1c6461307887656683f638db225d
 DIST mercury-extras-20.06-gentoo-patchset-0.tar.gz 1093 BLAKE2B cd0087a7a878c303a610e0007b352deec2e54b8223af1fbdcdd5e1fec0a7d6b4533895ba4ec01d4f90734349535a4c16c69f4ec60495f5a7888f99e4580e3ce3 SHA512 abd74dee931a01085a75f45d2793109737662345bdc68f4cf25dd874b59726da6a5ec8acd84cc8f0957052eeb9e5a9e3502090a0688fbea817d05c6948728ecb
-DIST mercury-srcdist-14.01.1.tar.gz 52658945 BLAKE2B 6497921a0227b9a6fbcbabdd309ef3325f32dda14fc4ddb443368385b89be4011d677a24b30b3702147d1b782fe2597760ad66dd34503aa6aebaf79707466529 SHA512 a128ef0fd4955abadea32019ec59297ffe32537415f32e9e948cbc1c3439bb40eb09de77569690fb18dd7d6969a2b1141b3ae5baeb87f2627eaa65ad93add92c
-DIST mercury-srcdist-20.01.1.tar.gz 47088335 BLAKE2B 1e3285dadc3748934e801b8ac0316d3005fbe24c20c9ceb694e9fc316d820fdb89c659107b25ee474fd6ac50d661dd029af9ca5082016a3b0827dd640a54a707 SHA512 24ad0bbecee46ab6ff669d63d64096b37a0d010bb44978a1785eee2701a8b30a83eab229af97cbbb18bca55b5e89be9ba74fe126d1d430da1e1e909366dc5b90
-DIST mercury-srcdist-20.01.2.tar.gz 46789217 BLAKE2B bc9637c1b4afb81d4bf35cd94a1f1d87b17094d8a6cbb7e5c8b0ff9c99ce59178d9e32bae246dd041ad781fe5d04e68db8f5effbb6bfcc29b76a83aad91a5666 SHA512 0deed9c0a13ebf793fb80def3fe6d9ee0aa4f0f2974865364eff81bdcac1ec0c41aafbec3e0146c8bdcf3245789e1003b2e4f8e219b53bec71e90074867a834d
-DIST mercury-srcdist-20.01.tar.gz 47103868 BLAKE2B 68be786e925bdf94dcba6c6a2a746a384da345ee33250785d8d2b9281815694a4525cdd694c26f58051c097f2a897291e640e2139729ccede9bd2e472077d8c9 SHA512 90e36faa375603e596b2dd692363528120fda62ae6d2e2b119cf76de1656dae4028aff00858a4bff3fdfb9b2210ea17db0aa516ce4283604c46a5935dd2cd4b7
 DIST mercury-srcdist-20.06.tar.gz 47768559 BLAKE2B f242aa2ef7da53aa2dfa054e4fee8646434d276f0748b014e33ea52d22f2a8a37e6fecaa20617f4943c4c1e7d8c179ed0603a344fde2dd58da98b2bacadf1a71 SHA512 b76bd22d8eb16242c68b614ff122ed7ee7535efef6c0ceb8cc798fee4c550bc41b6faff2135cea43b24c652b654bb35ae049656585d8e7bf3a1122d07cb1ecf4
diff --git a/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild b/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild
deleted file mode 100644
index 3f6429f9e843..000000000000
--- a/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib vcs-clean
-
-PATCHSET_VER="4"
-MY_P=mercury-srcdist-${PV}
-
-DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"
-HOMEPAGE="https://www.mercurylang.org/index.html"
-SRC_URI="http://dl.mercurylang.org/release/${MY_P}.tar.gz
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="X cairo examples glut iodbc ncurses odbc opengl ssl tcl tk xml"
-
-RDEPEND="~dev-lang/mercury-${PV}
-	cairo? ( >=x11-libs/cairo-1.10.0 )
-	glut? ( media-libs/freeglut )
-	odbc? ( dev-db/unixODBC )
-	iodbc? ( !odbc? ( dev-db/libiodbc ) )
-	ncurses? ( sys-libs/ncurses:= )
-	opengl? (
-		virtual/opengl
-		virtual/glu
-	)
-	tcl? ( tk? (
-			dev-lang/tcl:0
-			dev-lang/tk:0
-			x11-libs/libX11
-			x11-libs/libXmu
-		)
-	)"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_P}/extras
-
-mercury_pkgs()
-{
-	echo   "base64
-		cgi
-		complex_numbers
-		dynamic_linking
-		error
-		fixed
-		lex
-		moose
-		posix
-		solver_types/library
-		$(use ncurses && echo curs curses)
-		$(use glut && echo graphics/mercury_glut)
-		$(use opengl && echo graphics/mercury_opengl)
-		$(use tcl && use tk && echo graphics/mercury_tcltk)
-		$(use odbc && echo odbc || (use iodbc && echo odbc) )
-		$(has_version dev-lang/mercury[trail] && echo references)
-		$(usev xml)"
-}
-
-src_prepare() {
-	cd "${WORKDIR}"
-
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		epatch "${WORKDIR}"/${PV}
-	fi
-
-	cd "${S}"
-	if use odbc; then
-		cp odbc/Mmakefile.odbc odbc/Mmakefile
-	elif use iodbc; then
-		cp odbc/Mmakefile.iodbc odbc/Mmakefile
-	fi
-}
-
-src_compile() {
-	local MERCURY_PKGS="$(mercury_pkgs)"
-
-	# Mercury dependency generation must be run single-threaded
-	mmake -j1 \
-		SUBDIRS="${MERCURY_PKGS}" \
-		depend || die "mmake depend failed"
-
-	# Compiling Mercury submodules is not thread-safe
-	mmake -j1 \
-		SUBDIRS="${MERCURY_PKGS}" \
-		EXTRA_MLFLAGS=--no-strip \
-		EXTRA_CFLAGS="${CFLAGS}" \
-		EXTRA_LDFLAGS="${LDFLAGS} -L/usr/$(get_libdir)" \
-		EXTRA_LD_LIBFLAGS="${LDFLAGS} -L/usr/$(get_libdir)" \
-		|| die "mmake failed"
-
-	if use cairo; then
-		cd "${S}"/graphics/mercury_cairo
-		mmc --make libmercury_cairo \
-			|| die "mmc --make libmercury_cairo failed"
-	fi
-}
-
-src_install() {
-	local MERCURY_PKGS="$(mercury_pkgs)"
-
-	# Compiling Mercury submodules is not thread-safe
-	mmake -j1 \
-		SUBDIRS="${MERCURY_PKGS}" \
-		EXTRA_MLFLAGS=--no-strip \
-		EXTRA_CFLAGS="${CFLAGS}" \
-		EXTRA_LDFLAGS="${LDFLAGS} -L/usr/$(get_libdir)" \
-		EXTRA_LD_LIBFLAGS="${LDFLAGS} -L/usr/$(get_libdir)" \
-		DESTDIR="${D}" \
-		INSTALL_PREFIX="${D}"/usr \
-		install || die "mmake install failed"
-
-	if use cairo; then
-		cd "${S}"/graphics/mercury_cairo
-		INSTALL_PREFIX="${D}"/usr \
-		mmc --make libmercury_cairo.install \
-			|| die "mmc --make libmercury_cairo.install failed"
-	fi
-
-	find "${D}"/usr/$(get_libdir)/mercury -type l | xargs rm
-
-	cd "${S}"
-	if use examples; then
-		insinto /usr/share/doc/${PF}/samples/base64
-		doins base64/*.m
-
-		insinto /usr/share/doc/${PF}/samples/complex_numbers
-		doins complex_numbers/samples/*
-
-		insinto /usr/share/doc/${PF}/samples/dynamic_linking
-		doins dynamic_linking/hello.m
-
-		insinto /usr/share/doc/${PF}/samples/error
-		doins error/*
-
-		insinto /usr/share/doc/${PF}/samples/fixed
-		doins fixed/*.m
-
-		insinto /usr/share/doc/${PF}/samples/gator
-		doins -r gator/*
-
-		insinto /usr/share/doc/${PF}/samples/lex
-		doins lex/samples/*
-
-		insinto /usr/share/doc/${PF}/samples/log4m
-		doins log4m/*.m
-
-		insinto /usr/share/doc/${PF}/samples/monte
-		doins monte/*.m
-
-		insinto /usr/share/doc/${PF}/samples/moose
-		doins moose/samples/*
-
-		insinto /usr/share/doc/${PF}/samples/net
-		doins net/*.m
-
-		if use ncurses; then
-			insinto /usr/share/doc/${PF}/samples/curs
-			doins curs/samples/*
-
-			insinto /usr/share/doc/${PF}/samples/curses
-			doins curses/sample/*
-		fi
-
-		if use X; then
-			insinto /usr/share/doc/${PF}/samples/graphics
-			doins graphics/easyx/samples/*.m
-		fi
-
-		if use glut && use opengl; then
-			insinto /usr/share/doc/${PF}/samples/graphics
-			doins graphics/samples/calc/*
-			doins graphics/samples/gears/*
-			doins graphics/samples/maze/*
-			doins graphics/samples/pent/*
-		fi
-
-		if use opengl && use tcl && use tk; then
-			insinto /usr/share/doc/${PF}/samples/graphics
-			doins graphics/samples/pent/*.m
-		fi
-
-		if use ssl; then
-			insinto /usr/share/doc/${PF}/samples/mopenssl
-			doins mopenssl/*.m
-		fi
-
-		ecvs_clean
-	fi
-
-	dodoc README
-}
diff --git a/dev-lang/mercury-extras/mercury-extras-20.01.1.ebuild b/dev-lang/mercury-extras/mercury-extras-20.01.1.ebuild
deleted file mode 100644
index 370231cebd8c..000000000000
--- a/dev-lang/mercury-extras/mercury-extras-20.01.1.ebuild
+++ /dev/null
@@ -1,317 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils multilib vcs-clean
-
-PATCHSET_VER="0"
-MY_P=mercury-srcdist-${PV}
-
-DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"
-HOMEPAGE="https://www.mercurylang.org/index.html"
-SRC_URI="http://dl.mercurylang.org/release/${MY_P}.tar.gz
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="cairo examples glut gmp iodbc ncurses odbc opengl ssl tk tommath X xml"
-REQUIRED_USE="?? ( odbc iodbc )"
-
-RDEPEND="
-	~dev-lang/mercury-${PV}
-	cairo? ( >=x11-libs/cairo-1.10.0 )
-	gmp? ( dev-libs/gmp:0 )
-	glut? ( media-libs/freeglut )
-	odbc? ( dev-db/unixODBC )
-	iodbc? ( dev-db/libiodbc )
-	tommath? ( dev-libs/libtommath )
-	ncurses? ( sys-libs/ncurses:= )
-	opengl? (
-		virtual/opengl
-		virtual/glu
-	)
-	tk? (
-		dev-lang/tcl:0
-		dev-lang/tk:0
-	)
-	X? ( x11-libs/libX11 )"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_P}/extras
-
-mercury_pkgs() {
-	echo "
-		align_right/align_right:bin:
-		base64/mercury_base64:lib:
-		cgi/mercury_www:lib:
-		complex_numbers/complex_numbers:lib:
-		$(use ncurses && echo \
-			curs/curs:lib:ncurses,panel curses/mcurses:lib:ncurses)
-		dynamic_linking/dl:lib:
-		error/error:bin:
-		fixed/fixed:lib:
-		$(use gmp && echo gmp_int/gmp_int:lib:)
-		$(use tommath && echo mp_int/mp_int:lib:libtommath)
-		$(use X && echo graphics/easyx/easyx:lib:x11)
-		$(use cairo && echo graphics/mercury_cairo/mercury_cairo:lib:cairo)
-		$(use glut && echo graphics/mercury_glut/mercury_glut:lib:freeglut)
-		$(use opengl && echo graphics/mercury_opengl/mercury_opengl:lib:gl,glu)
-		$(use tk && echo graphics/mercury_tcltk/mercury_tcltk:lib:tk)
-		lex/lex:lib:
-		lex/regex:lib:
-		moose/moose:bin:
-		net/net:lib:
-		net/echo:bin:
-		$(use ssl && echo mopenssl/mopenssl:lib:openssl)
-		$(use odbc && echo odbc/odbc:lib:)
-		$(use iodbc && echo odbc/odbc:lib:libiodbc)
-		posix/posix:lib:
-		$(has_version dev-lang/mercury[trail] && echo \
-			references/global:lib: trailed_update/trailed_update:lib:)
-		show_ops/show_ops:bin:
-		solver_types/library/any:lib:
-		$(use xml && echo xml/xml:lib:)"
-}
-
-mercury_pkg_setup() {
-	mercury_pkg=${1%%:*}
-	mercury_pkg_dir=${mercury_pkg%/*}
-	mercury_pkg_name=${mercury_pkg##*/}
-
-	mercury_pkg_atts=${1#*:}
-	mercury_pkg_type=${mercury_pkg_atts%%:*}
-	mercury_pkg_deps=${mercury_pkg_atts#*:}
-
-	cd "${S}"/${mercury_pkg_dir} || die
-
-	echo ">> Preparing Mercury package: ${mercury_pkg}"
-
-	if ! test -f "${S}"/${mercury_pkg_dir}/gentoo.params; then
-		echo "LIBGRADES := \$(filter-out java,\$(LIBGRADES))" \
-			> "${S}"/${mercury_pkg_dir}/gentoo.params
-		echo "LIBGRADES := \$(filter-out erlang,\$(LIBGRADES))" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-		echo "LIBGRADES := \$(filter-out csharp,\$(LIBGRADES))" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-		echo "include gentoo.params" > "${S}"/${mercury_pkg_dir}/Mmakefile
-	fi
-
-	if test -n "$mercury_pkg_deps"; then
-		echo "EXTRA_CFLAGS += $(pkg-config --cflags ${mercury_pkg_deps/,/ })" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-		echo "EXTRA_MLLIBS += $(pkg-config --libs ${mercury_pkg_deps/,/ })" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-	fi
-
-	if test ${mercury_pkg_name} = dl; then
-		echo "EXTRA_MLLIBS = -ldl" >> "${S}"/${mercury_pkg_dir}/gentoo.params
-	elif test ${mercury_pkg_name} = gmp_int; then
-		echo "EXTRA_MLLIBS = -lgmp" >> "${S}"/${mercury_pkg_dir}/gentoo.params
-	elif test ${mercury_pkg_name} = mercury_tcltk; then
-		echo "EXTRA_CFLAGS += -DUSE_INTERP_RESULT" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-	elif test ${mercury_pkg_name} = mopenssl; then
-		local net_libdir="${D}/usr/$(get_libdir)/mercury/extras/lib/\$(GRADE)"
-		echo "EXTRA_MLLIBS += -L${net_libdir} -L../net -lnet" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-		echo "net%:" >> "${S}"/${mercury_pkg_dir}/gentoo.params
-		echo "	cp ../net/\$@ \$@" >> "${S}"/${mercury_pkg_dir}/gentoo.params
-	elif test ${mercury_pkg_name} = odbc && use odbc; then
-		echo "EXTRA_CFLAGS = -DMODBC_UNIX -DMODBC_MYSQL" \
-			>> "${S}"/${mercury_pkg_dir}/Mmakefile
-		echo "EXTRA_MLLIBS = -lodbc" >> "${S}"/${mercury_pkg_dir}/gentoo.params
-	elif test ${mercury_pkg_name} = odbc && use iodbc; then
-		echo "EXTRA_CFLAGS += -DMODBC_IODBC -DMODBC_MYSQL" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-	fi
-}
-
-mercury_pkg_compile() {
-	mercury_pkg=${1%%:*}
-	mercury_pkg_dir=${mercury_pkg%/*}
-	mercury_pkg_name=${mercury_pkg##*/}
-
-	mercury_pkg_atts=${1#*:}
-	mercury_pkg_type=${mercury_pkg_atts%:*}
-
-	cd "${S}"/${mercury_pkg_dir} || die
-
-	echo ">> Compiling Mercury package: ${mercury_pkg}"
-
-	if test "${mercury_pkg_type}" = "bin"; then
-		mercury_mmc_target=${mercury_pkg_name}
-	else
-		mercury_mmc_target=lib${mercury_pkg_name}
-	fi
-
-	# Mercury dependency generation must be run single-threaded
-	mmc -f *.m || die "mmc -f .m failed"
-	mmake -j1 \
-		${mercury_pkg_name}.depend \
-		|| die "mmake ${mercury_pkg} depend failed"
-
-	# Compiling Mercury submodules is not thread-safe
-	mmake -j1 \
-		MLFLAGS=--no-strip \
-		CFLAGS="${CFLAGS}" \
-		LD_LIBFLAGS="${LDFLAGS}" \
-		${mercury_mmc_target} || die "mmake ${mercury_pkg} failed"
-
-}
-
-mercury_pkg_install() {
-	mercury_pkg=${1%%:*}
-	mercury_pkg_dir=${mercury_pkg%/*}
-	mercury_pkg_name=${mercury_pkg##*/}
-
-	mercury_pkg_atts=${1#*:}
-	mercury_pkg_type=${mercury_pkg_atts%:*}
-
-	cd "${S}"/${mercury_pkg_dir} || die
-
-	echo ">> Installing Mercury package: ${mercury_pkg}"
-
-	if test "${mercury_pkg_type}" = "bin"; then
-		into /usr/$(get_libdir)/mercury/extras
-		dobin ${mercury_pkg_name}
-	else
-		# Compiling Mercury submodules is not thread-safe
-		mmake -j1 \
-			MLFLAGS=--no-strip \
-			CFLAGS="${CFLAGS}" \
-			LD_LIBFLAGS="${LDFLAGS}" \
-			INSTALL_LIBDIR="${D}/usr/$(get_libdir)/mercury/extras" \
-			lib${mercury_pkg_name}.install || die "mmake ${mercury_pkg} failed"
-	fi
-}
-
-src_prepare() {
-	cd "${WORKDIR}"/${MY_P}
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		eapply "${WORKDIR}"/${PV}
-	fi
-	eapply_user
-
-	cd "${S}"
-	for mercury_pkg in $(mercury_pkgs); do
-		mercury_pkg_setup ${mercury_pkg}
-	done
-}
-
-src_compile() {
-	for mercury_pkg in $(mercury_pkgs); do
-		mercury_pkg_compile ${mercury_pkg}
-	done
-}
-
-src_install() {
-	for mercury_pkg in $(mercury_pkgs); do
-		mercury_pkg_install ${mercury_pkg}
-	done
-
-	cd "${S}"
-	dodoc README
-
-	if use examples; then
-		docinto samples/cgi
-		dodoc cgi/form_test.m
-
-		docinto samples/complex_numbers
-		dodoc complex_numbers/samples/*.m
-
-		if use ncurses; then
-			docinto samples/curs
-			dodoc curs/samples/*.m
-
-			docinto samples/curses
-			dodoc curses/sample/*.m
-		fi
-
-		docinto samples/dynamic_linking
-		dodoc dynamic_linking/{hello,dl_test}.m
-
-		docinto samples/gator
-		dodoc -r gator/*
-
-		if use gmp; then
-			docinto samples/gmp_int
-			dodoc gmp_int/gmp_int_test.m
-		fi
-
-		if use tommath; then
-			docinto samples/mp_int
-			dodoc mp_int/mp_int_test.m
-		fi
-
-		if use X; then
-			docinto samples/graphics
-			dodoc graphics/easyx/samples/*.m
-		fi
-
-		if use glut && use opengl; then
-			docinto samples/graphics
-			dodoc graphics/samples/gears/*.m
-			dodoc graphics/samples/maze/*.m
-		fi
-
-		if use tk; then
-			docinto samples/graphics
-			dodoc graphics/samples/calc/*.m
-		fi
-
-		if use opengl && use tk; then
-			docinto samples/graphics
-			dodoc graphics/samples/pent/*.m
-		fi
-
-		docinto samples/lex
-		dodoc lex/samples/*.m
-
-		docinto samples/log4m
-		dodoc log4m/*.m
-
-		docinto samples/monte
-		dodoc monte/*.m
-
-		docinto samples/moose
-		dodoc moose/samples/*
-
-		docinto samples/net
-		dodoc net/test_lookups.m
-
-		if use odbc || use iodbc; then
-			docinto samples/odbc
-			dodoc odbc/odbc_test.m
-		fi
-
-		docinto samples/posix
-		dodoc posix/samples/*.m
-
-		docinto samples/random
-		dodoc random/*.m
-
-		if has_version dev-lang/mercury[trail]; then
-			docinto samples/references
-			dodoc references/samples/*.m
-
-			docinto samples/trail
-			dodoc trail/*.m
-
-			docinto samples/trailed_update
-			dodoc trailed_update/samples/*.m
-		fi
-
-		if use xml; then
-			docinto samples/xml
-			dodoc xml/tryit.m
-			dodoc xml/samples/*
-			dodoc xml_stylesheets/*.xsl
-		fi
-
-		ecvs_clean
-	fi
-}
diff --git a/dev-lang/mercury-extras/mercury-extras-20.01.2.ebuild b/dev-lang/mercury-extras/mercury-extras-20.01.2.ebuild
deleted file mode 100644
index bce2fa7c29f2..000000000000
--- a/dev-lang/mercury-extras/mercury-extras-20.01.2.ebuild
+++ /dev/null
@@ -1,319 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils multilib vcs-clean
-
-PATCHSET_VER="1"
-MY_P=mercury-srcdist-${PV}
-
-DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"
-HOMEPAGE="https://www.mercurylang.org/index.html"
-SRC_URI="https://dl.mercurylang.org/release/${MY_P}.tar.gz
-	https://dev.gentoo.org/~keri/distfiles/mercury-extras/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="cairo examples glut gmp iodbc ncurses odbc opengl ssl tk tommath X xml"
-REQUIRED_USE="?? ( odbc iodbc )"
-
-RDEPEND="
-	~dev-lang/mercury-${PV}
-	cairo? ( >=x11-libs/cairo-1.10.0 )
-	gmp? ( dev-libs/gmp:0 )
-	glut? ( media-libs/freeglut )
-	odbc? ( dev-db/unixODBC )
-	iodbc? ( dev-db/libiodbc )
-	tommath? ( dev-libs/libtommath )
-	ncurses? ( sys-libs/ncurses:= )
-	opengl? (
-		virtual/opengl
-		virtual/glu
-	)
-	tk? (
-		dev-lang/tcl:0
-		dev-lang/tk:0
-	)
-	X? ( x11-libs/libX11 )"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_P}/extras
-
-mercury_pkgs() {
-	echo "
-		align_right/align_right:bin:
-		base64/mercury_base64:lib:
-		cgi/mercury_www:lib:
-		complex_numbers/complex_numbers:lib:
-		$(use ncurses && echo \
-			curs/curs:lib:ncurses,panel curses/mcurses:lib:ncurses)
-		dynamic_linking/dl:lib:
-		error/error:bin:
-		fixed/fixed:lib:
-		$(use gmp && echo gmp_int/gmp_int:lib:)
-		$(use tommath && echo mp_int/mp_int:lib:libtommath)
-		$(use X && echo graphics/easyx/easyx:lib:x11)
-		$(use cairo && echo graphics/mercury_cairo/mercury_cairo:lib:cairo)
-		$(use glut && echo graphics/mercury_glut/mercury_glut:lib:freeglut)
-		$(use opengl && echo graphics/mercury_opengl/mercury_opengl:lib:gl,glu)
-		$(use tk && echo graphics/mercury_tcltk/mercury_tcltk:lib:tk)
-		lex/lex:lib:
-		lex/regex:lib:
-		moose/moose:bin:
-		net/net:lib:
-		net/echo:bin:
-		$(use ssl && echo mopenssl/mopenssl:lib:openssl)
-		$(use odbc && echo odbc/odbc:lib:)
-		$(use iodbc && echo odbc/odbc:lib:libiodbc)
-		posix/posix:lib:
-		$(has_version dev-lang/mercury[trail] && echo \
-			references/global:lib: trailed_update/trailed_update:lib:)
-		show_ops/show_ops:bin:
-		solver_types/library/any:lib:
-		$(use xml && echo xml/xml:lib:)"
-}
-
-mercury_pkg_setup() {
-	mercury_pkg=${1%%:*}
-	mercury_pkg_dir=${mercury_pkg%/*}
-	mercury_pkg_name=${mercury_pkg##*/}
-
-	mercury_pkg_atts=${1#*:}
-	mercury_pkg_type=${mercury_pkg_atts%%:*}
-	mercury_pkg_deps=${mercury_pkg_atts#*:}
-
-	cd "${S}"/${mercury_pkg_dir} || die
-
-	echo ">> Preparing Mercury package: ${mercury_pkg}"
-
-	if ! test -f "${S}"/${mercury_pkg_dir}/gentoo.params; then
-		echo "LIBGRADES := \$(filter-out java,\$(LIBGRADES))" \
-			> "${S}"/${mercury_pkg_dir}/gentoo.params
-		echo "LIBGRADES := \$(filter-out erlang,\$(LIBGRADES))" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-		echo "LIBGRADES := \$(filter-out csharp,\$(LIBGRADES))" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-		echo "include gentoo.params" > "${S}"/${mercury_pkg_dir}/Mmakefile
-	fi
-
-	if test -n "$mercury_pkg_deps"; then
-		echo "EXTRA_CFLAGS += $(pkg-config --cflags ${mercury_pkg_deps/,/ })" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-		echo "EXTRA_MLLIBS += $(pkg-config --libs ${mercury_pkg_deps/,/ })" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-	fi
-
-	if test ${mercury_pkg_name} = dl; then
-		echo "EXTRA_MLLIBS = -ldl" >> "${S}"/${mercury_pkg_dir}/gentoo.params
-	elif test ${mercury_pkg_name} = gmp_int; then
-		echo "EXTRA_MLLIBS = -lgmp" >> "${S}"/${mercury_pkg_dir}/gentoo.params
-	elif test ${mercury_pkg_name} = mercury_tcltk; then
-		echo "EXTRA_CFLAGS += -DUSE_INTERP_RESULT" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-	elif test ${mercury_pkg_name} = mopenssl; then
-		local net_libdir="${D}/usr/$(get_libdir)/mercury/extras/lib/\$(GRADE)"
-		echo "EXTRA_MLLIBS += -L${net_libdir} -L../net -lnet" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-		echo "net%:" >> "${S}"/${mercury_pkg_dir}/gentoo.params
-		echo "	cp ../net/\$@ \$@" >> "${S}"/${mercury_pkg_dir}/gentoo.params
-	elif test ${mercury_pkg_name} = odbc && use odbc; then
-		echo "EXTRA_CFLAGS = -DMODBC_UNIX -DMODBC_MYSQL" \
-			>> "${S}"/${mercury_pkg_dir}/Mmakefile
-		echo "EXTRA_MLLIBS = -lodbc" >> "${S}"/${mercury_pkg_dir}/gentoo.params
-	elif test ${mercury_pkg_name} = odbc && use iodbc; then
-		echo "EXTRA_CFLAGS += -DMODBC_IODBC -DMODBC_MYSQL" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-	fi
-}
-
-mercury_pkg_compile() {
-	mercury_pkg=${1%%:*}
-	mercury_pkg_dir=${mercury_pkg%/*}
-	mercury_pkg_name=${mercury_pkg##*/}
-
-	mercury_pkg_atts=${1#*:}
-	mercury_pkg_type=${mercury_pkg_atts%:*}
-
-	cd "${S}"/${mercury_pkg_dir} || die
-
-	echo ">> Compiling Mercury package: ${mercury_pkg}"
-
-	if test "${mercury_pkg_type}" = "bin"; then
-		mercury_mmc_target=${mercury_pkg_name}
-	else
-		mercury_mmc_target=lib${mercury_pkg_name}
-	fi
-
-	# Mercury dependency generation must be run single-threaded
-	mmc -f *.m || die "mmc -f .m failed"
-	mmake -j1 \
-		${mercury_pkg_name}.depend \
-		|| die "mmake ${mercury_pkg} depend failed"
-
-	# Compiling Mercury submodules is not thread-safe
-	mmake -j1 \
-		MLFLAGS=--no-strip \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		LD_LIBFLAGS="${LDFLAGS}" \
-		${mercury_mmc_target} || die "mmake ${mercury_pkg} failed"
-
-}
-
-mercury_pkg_install() {
-	mercury_pkg=${1%%:*}
-	mercury_pkg_dir=${mercury_pkg%/*}
-	mercury_pkg_name=${mercury_pkg##*/}
-
-	mercury_pkg_atts=${1#*:}
-	mercury_pkg_type=${mercury_pkg_atts%:*}
-
-	cd "${S}"/${mercury_pkg_dir} || die
-
-	echo ">> Installing Mercury package: ${mercury_pkg}"
-
-	if test "${mercury_pkg_type}" = "bin"; then
-		into /usr/$(get_libdir)/mercury/extras
-		dobin ${mercury_pkg_name}
-	else
-		# Compiling Mercury submodules is not thread-safe
-		mmake -j1 \
-			MLFLAGS=--no-strip \
-			CFLAGS="${CFLAGS}" \
-			LDFLAGS="${LDFLAGS}" \
-			LD_LIBFLAGS="${LDFLAGS}" \
-			INSTALL_LIBDIR="${D}/usr/$(get_libdir)/mercury/extras" \
-			lib${mercury_pkg_name}.install || die "mmake ${mercury_pkg} failed"
-	fi
-}
-
-src_prepare() {
-	cd "${WORKDIR}"/${MY_P}
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		eapply "${WORKDIR}"/${PV}
-	fi
-	eapply_user
-
-	cd "${S}"
-	for mercury_pkg in $(mercury_pkgs); do
-		mercury_pkg_setup ${mercury_pkg}
-	done
-}
-
-src_compile() {
-	for mercury_pkg in $(mercury_pkgs); do
-		mercury_pkg_compile ${mercury_pkg}
-	done
-}
-
-src_install() {
-	for mercury_pkg in $(mercury_pkgs); do
-		mercury_pkg_install ${mercury_pkg}
-	done
-
-	cd "${S}"
-	dodoc README
-
-	if use examples; then
-		docinto samples/cgi
-		dodoc cgi/form_test.m
-
-		docinto samples/complex_numbers
-		dodoc complex_numbers/samples/*.m
-
-		if use ncurses; then
-			docinto samples/curs
-			dodoc curs/samples/*.m
-
-			docinto samples/curses
-			dodoc curses/sample/*.m
-		fi
-
-		docinto samples/dynamic_linking
-		dodoc dynamic_linking/{hello,dl_test}.m
-
-		docinto samples/gator
-		dodoc -r gator/*
-
-		if use gmp; then
-			docinto samples/gmp_int
-			dodoc gmp_int/gmp_int_test.m
-		fi
-
-		if use tommath; then
-			docinto samples/mp_int
-			dodoc mp_int/mp_int_test.m
-		fi
-
-		if use X; then
-			docinto samples/graphics
-			dodoc graphics/easyx/samples/*.m
-		fi
-
-		if use glut && use opengl; then
-			docinto samples/graphics
-			dodoc graphics/samples/gears/*.m
-			dodoc graphics/samples/maze/*.m
-		fi
-
-		if use tk; then
-			docinto samples/graphics
-			dodoc graphics/samples/calc/*.m
-		fi
-
-		if use opengl && use tk; then
-			docinto samples/graphics
-			dodoc graphics/samples/pent/*.m
-		fi
-
-		docinto samples/lex
-		dodoc lex/samples/*.m
-
-		docinto samples/log4m
-		dodoc log4m/*.m
-
-		docinto samples/monte
-		dodoc monte/*.m
-
-		docinto samples/moose
-		dodoc moose/samples/*
-
-		docinto samples/net
-		dodoc net/test_lookups.m
-
-		if use odbc || use iodbc; then
-			docinto samples/odbc
-			dodoc odbc/odbc_test.m
-		fi
-
-		docinto samples/posix
-		dodoc posix/samples/*.m
-
-		docinto samples/random
-		dodoc random/*.m
-
-		if has_version dev-lang/mercury[trail]; then
-			docinto samples/references
-			dodoc references/samples/*.m
-
-			docinto samples/trail
-			dodoc trail/*.m
-
-			docinto samples/trailed_update
-			dodoc trailed_update/samples/*.m
-		fi
-
-		if use xml; then
-			docinto samples/xml
-			dodoc xml/tryit.m
-			dodoc xml/samples/*
-			dodoc xml_stylesheets/*.xsl
-		fi
-
-		ecvs_clean
-	fi
-}
diff --git a/dev-lang/mercury-extras/mercury-extras-20.01.ebuild b/dev-lang/mercury-extras/mercury-extras-20.01.ebuild
deleted file mode 100644
index 94b7fd25ad49..000000000000
--- a/dev-lang/mercury-extras/mercury-extras-20.01.ebuild
+++ /dev/null
@@ -1,317 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils multilib vcs-clean
-
-PATCHSET_VER="0"
-MY_P=mercury-srcdist-${PV}
-
-DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"
-HOMEPAGE="https://www.mercurylang.org/index.html"
-SRC_URI="http://dl.mercurylang.org/release/${MY_P}.tar.gz
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="cairo examples glut gmp iodbc ncurses odbc opengl ssl tk tommath X xml"
-REQUIRED_USE="?? ( odbc iodbc )"
-
-RDEPEND="
-	~dev-lang/mercury-${PV}
-	cairo? ( >=x11-libs/cairo-1.10.0 )
-	gmp? ( dev-libs/gmp:0 )
-	glut? ( media-libs/freeglut )
-	odbc? ( dev-db/unixODBC )
-	iodbc? ( dev-db/libiodbc )
-	tommath? ( dev-libs/libtommath )
-	ncurses? ( sys-libs/ncurses:= )
-	opengl? (
-		virtual/opengl
-		virtual/glu
-	)
-	tk? (
-		dev-lang/tcl:0
-		dev-lang/tk:0
-	)
-	X? ( x11-libs/libX11 )"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_P}/extras
-
-mercury_pkgs() {
-	echo "
-		align_right/align_right:bin:
-		base64/mercury_base64:lib:
-		cgi/mercury_www:lib:
-		complex_numbers/complex_numbers:lib:
-		$(use ncurses && echo \
-			curs/curs:lib:ncurses,panel curses/mcurses:lib:ncurses)
-		dynamic_linking/dl:lib:
-		error/error:bin:
-		fixed/fixed:lib:
-		$(use gmp && echo gmp_int/gmp_int:lib:)
-		$(use tommath && echo mp_int/mp_int:lib:libtommath)
-		$(use X && echo graphics/easyx/easyx:lib:x11)
-		$(use cairo && echo graphics/mercury_cairo/mercury_cairo:lib:cairo)
-		$(use glut && echo graphics/mercury_glut/mercury_glut:lib:freeglut)
-		$(use opengl && echo graphics/mercury_opengl/mercury_opengl:lib:gl,glu)
-		$(use tk && echo graphics/mercury_tcltk/mercury_tcltk:lib:tk)
-		lex/lex:lib:
-		lex/regex:lib:
-		moose/moose:bin:
-		net/net:lib:
-		net/echo:bin:
-		$(use ssl && echo mopenssl/mopenssl:lib:openssl)
-		$(use odbc && echo odbc/odbc:lib:)
-		$(use iodbc && echo odbc/odbc:lib:libiodbc)
-		posix/posix:lib:
-		$(has_version dev-lang/mercury[trail] && echo \
-			references/global:lib: trailed_update/trailed_update:lib:)
-		show_ops/show_ops:bin:
-		solver_types/library/any:lib:
-		$(use xml && echo xml/xml:lib:)"
-}
-
-mercury_pkg_setup() {
-	mercury_pkg=${1%%:*}
-	mercury_pkg_dir=${mercury_pkg%/*}
-	mercury_pkg_name=${mercury_pkg##*/}
-
-	mercury_pkg_atts=${1#*:}
-	mercury_pkg_type=${mercury_pkg_atts%%:*}
-	mercury_pkg_deps=${mercury_pkg_atts#*:}
-
-	cd "${S}"/${mercury_pkg_dir} || die
-
-	echo ">> Preparing Mercury package: ${mercury_pkg}"
-
-	if ! test -f "${S}"/${mercury_pkg_dir}/gentoo.params; then
-		echo "LIBGRADES := \$(filter-out java,\$(LIBGRADES))" \
-			> "${S}"/${mercury_pkg_dir}/gentoo.params
-		echo "LIBGRADES := \$(filter-out erlang,\$(LIBGRADES))" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-		echo "LIBGRADES := \$(filter-out csharp,\$(LIBGRADES))" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-		echo "include gentoo.params" > "${S}"/${mercury_pkg_dir}/Mmakefile
-	fi
-
-	if test -n "$mercury_pkg_deps"; then
-		echo "EXTRA_CFLAGS += $(pkg-config --cflags ${mercury_pkg_deps/,/ })" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-		echo "EXTRA_MLLIBS += $(pkg-config --libs ${mercury_pkg_deps/,/ })" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-	fi
-
-	if test ${mercury_pkg_name} = dl; then
-		echo "EXTRA_MLLIBS = -ldl" >> "${S}"/${mercury_pkg_dir}/gentoo.params
-	elif test ${mercury_pkg_name} = gmp_int; then
-		echo "EXTRA_MLLIBS = -lgmp" >> "${S}"/${mercury_pkg_dir}/gentoo.params
-	elif test ${mercury_pkg_name} = mercury_tcltk; then
-		echo "EXTRA_CFLAGS += -DUSE_INTERP_RESULT" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-	elif test ${mercury_pkg_name} = mopenssl; then
-		local net_libdir="${D}/usr/$(get_libdir)/mercury/extras/lib/\$(GRADE)"
-		echo "EXTRA_MLLIBS += -L${net_libdir} -L../net -lnet" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-		echo "net%:" >> "${S}"/${mercury_pkg_dir}/gentoo.params
-		echo "	cp ../net/\$@ \$@" >> "${S}"/${mercury_pkg_dir}/gentoo.params
-	elif test ${mercury_pkg_name} = odbc && use odbc; then
-		echo "EXTRA_CFLAGS = -DMODBC_UNIX -DMODBC_MYSQL" \
-			>> "${S}"/${mercury_pkg_dir}/Mmakefile
-		echo "EXTRA_MLLIBS = -lodbc" >> "${S}"/${mercury_pkg_dir}/gentoo.params
-	elif test ${mercury_pkg_name} = odbc && use iodbc; then
-		echo "EXTRA_CFLAGS += -DMODBC_IODBC -DMODBC_MYSQL" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-	fi
-}
-
-mercury_pkg_compile() {
-	mercury_pkg=${1%%:*}
-	mercury_pkg_dir=${mercury_pkg%/*}
-	mercury_pkg_name=${mercury_pkg##*/}
-
-	mercury_pkg_atts=${1#*:}
-	mercury_pkg_type=${mercury_pkg_atts%:*}
-
-	cd "${S}"/${mercury_pkg_dir} || die
-
-	echo ">> Compiling Mercury package: ${mercury_pkg}"
-
-	if test "${mercury_pkg_type}" = "bin"; then
-		mercury_mmc_target=${mercury_pkg_name}
-	else
-		mercury_mmc_target=lib${mercury_pkg_name}
-	fi
-
-	# Mercury dependency generation must be run single-threaded
-	mmc -f *.m || die "mmc -f .m failed"
-	mmake -j1 \
-		${mercury_pkg_name}.depend \
-		|| die "mmake ${mercury_pkg} depend failed"
-
-	# Compiling Mercury submodules is not thread-safe
-	mmake -j1 \
-		MLFLAGS=--no-strip \
-		CFLAGS="${CFLAGS}" \
-		LD_LIBFLAGS="${LDFLAGS} -L/usr/$(get_libdir)" \
-		${mercury_mmc_target} || die "mmake ${mercury_pkg} failed"
-
-}
-
-mercury_pkg_install() {
-	mercury_pkg=${1%%:*}
-	mercury_pkg_dir=${mercury_pkg%/*}
-	mercury_pkg_name=${mercury_pkg##*/}
-
-	mercury_pkg_atts=${1#*:}
-	mercury_pkg_type=${mercury_pkg_atts%:*}
-
-	cd "${S}"/${mercury_pkg_dir} || die
-
-	echo ">> Installing Mercury package: ${mercury_pkg}"
-
-	if test "${mercury_pkg_type}" = "bin"; then
-		into /usr/$(get_libdir)/mercury/extras
-		dobin ${mercury_pkg_name}
-	else
-		# Compiling Mercury submodules is not thread-safe
-		mmake -j1 \
-			MLFLAGS=--no-strip \
-			CFLAGS="${CFLAGS}" \
-			LD_LIBFLAGS="${LDFLAGS} -L/usr/$(get_libdir)" \
-			INSTALL_LIBDIR="${D}/usr/$(get_libdir)/mercury/extras" \
-			lib${mercury_pkg_name}.install || die "mmake ${mercury_pkg} failed"
-	fi
-}
-
-src_prepare() {
-	cd "${WORKDIR}"/${MY_P}
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		eapply "${WORKDIR}"/${PV}
-	fi
-	eapply_user
-
-	cd "${S}"
-	for mercury_pkg in $(mercury_pkgs); do
-		mercury_pkg_setup ${mercury_pkg}
-	done
-}
-
-src_compile() {
-	for mercury_pkg in $(mercury_pkgs); do
-		mercury_pkg_compile ${mercury_pkg}
-	done
-}
-
-src_install() {
-	for mercury_pkg in $(mercury_pkgs); do
-		mercury_pkg_install ${mercury_pkg}
-	done
-
-	cd "${S}"
-	dodoc README
-
-	if use examples; then
-		docinto samples/cgi
-		dodoc cgi/form_test.m
-
-		docinto samples/complex_numbers
-		dodoc complex_numbers/samples/*.m
-
-		if use ncurses; then
-			docinto samples/curs
-			dodoc curs/samples/*.m
-
-			docinto samples/curses
-			dodoc curses/sample/*.m
-		fi
-
-		docinto samples/dynamic_linking
-		dodoc dynamic_linking/{hello,dl_test}.m
-
-		docinto samples/gator
-		dodoc -r gator/*
-
-		if use gmp; then
-			docinto samples/gmp_int
-			dodoc gmp_int/gmp_int_test.m
-		fi
-
-		if use tommath; then
-			docinto samples/mp_int
-			dodoc mp_int/mp_int_test.m
-		fi
-
-		if use X; then
-			docinto samples/graphics
-			dodoc graphics/easyx/samples/*.m
-		fi
-
-		if use glut && use opengl; then
-			docinto samples/graphics
-			dodoc graphics/samples/gears/*.m
-			dodoc graphics/samples/maze/*.m
-		fi
-
-		if use tk; then
-			docinto samples/graphics
-			dodoc graphics/samples/calc/*.m
-		fi
-
-		if use opengl && use tk; then
-			docinto samples/graphics
-			dodoc graphics/samples/pent/*.m
-		fi
-
-		docinto samples/lex
-		dodoc lex/samples/*.m
-
-		docinto samples/log4m
-		dodoc log4m/*.m
-
-		docinto samples/monte
-		dodoc monte/*.m
-
-		docinto samples/moose
-		dodoc moose/samples/*
-
-		docinto samples/net
-		dodoc net/test_lookups.m
-
-		if use odbc || use iodbc; then
-			docinto samples/odbc
-			dodoc odbc/odbc_test.m
-		fi
-
-		docinto samples/posix
-		dodoc posix/samples/*.m
-
-		docinto samples/random
-		dodoc random/*.m
-
-		if has_version dev-lang/mercury[trail]; then
-			docinto samples/references
-			dodoc references/samples/*.m
-
-			docinto samples/trail
-			dodoc trail/*.m
-
-			docinto samples/trailed_update
-			dodoc trailed_update/samples/*.m
-		fi
-
-		if use xml; then
-			docinto samples/xml
-			dodoc xml/tryit.m
-			dodoc xml/samples/*
-			dodoc xml_stylesheets/*.xsl
-		fi
-
-		ecvs_clean
-	fi
-}
diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 81b026c9b23c..92e703f5328d 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -1,10 +1,2 @@
-DIST mercury-14.01.1-gentoo-patchset-5.tar.gz 5693 BLAKE2B 300de3254bc0d2f59493c0e2243b0d8786fccce714134a11ce510120b7d9f05ebe4835f084ec2db2ddaf2d405cbae65e86d809847079a7d63a6a68021d9d29e8 SHA512 3f9f1e2359f372e4f510b9a00c197978657b28d1308d12cba4d08a982877e2311d7fb6e626dad07d0fa09d24f97334575557cb49003508fdc7b32288c1ae8f2d
-DIST mercury-20.01-gentoo-patchset-0.tar.gz 3862 BLAKE2B 79ef6d30add63a5d419e3dd5b376fd9c1727038102db2bc0e8ccd8b71cdc1c80e721647f34764b0aa4fd6d58b9e38c9675f234714f381f94be572b9b64b478e1 SHA512 2835b4740453bcc358363f9eaa0264706125b5e5f7a38802d5f280ccd777d4c760124ed3a635f17ecc2ae772767e9fa5d61093c40094358a0a96a726a23ff08e
-DIST mercury-20.01.1-gentoo-patchset-0.tar.gz 3943 BLAKE2B 0fd149c622715bf191182bd93e264096327d7869e30aaa10bb19b70bec5563520026e2561cc6607c62801ed00ed6b5907bbae4be997869b9facb2f9d65ec0c7a SHA512 d866b35b6df14645ef60ff25497f9bbf0c2caeae2145bc0aef2adea0e651379c673c1815c717f1a51457d93cc67e9ae3dafe5d9fce1d4734bf1673e4cfcbd367
-DIST mercury-20.01.2-gentoo-patchset-1.tar.gz 4562 BLAKE2B f1e9d040cfd5930c4f4d9722fc10e11532272f1fa0ab6bd25cc0d2ed42eb0edfbe6f9bc1d41972775fa720b80601d5fdae1681d56f677861fab15e10cc6d05cb SHA512 4f89b09e1e196a61892811167bc0dc1b3ee868ef336efdf66e417574c18ea53b557bd87d5c5300eee8194a3c4250b47e70f5991fcc25b1c58d956a4b097eaec5
 DIST mercury-20.06-gentoo-patchset-1.tar.gz 4555 BLAKE2B 8609ba7cd43d82ceb6b6e25fd6af3b2c750df6446c1235bd9c6f8e3bc87bb1fe0a43cafb9f1d061562bb80ade1deb7809889bf0d703c99ea1e2286bbeb7c5182 SHA512 23fae769c5c1204154c6ed55cc31644967e3554f499b23a6585d34615d062a214d6485de3a4acf8cf90a582a229aeab519e57a6df80cee62e9e6789f210e8256
-DIST mercury-srcdist-14.01.1.tar.gz 52658945 BLAKE2B 6497921a0227b9a6fbcbabdd309ef3325f32dda14fc4ddb443368385b89be4011d677a24b30b3702147d1b782fe2597760ad66dd34503aa6aebaf79707466529 SHA512 a128ef0fd4955abadea32019ec59297ffe32537415f32e9e948cbc1c3439bb40eb09de77569690fb18dd7d6969a2b1141b3ae5baeb87f2627eaa65ad93add92c
-DIST mercury-srcdist-20.01.1.tar.gz 47088335 BLAKE2B 1e3285dadc3748934e801b8ac0316d3005fbe24c20c9ceb694e9fc316d820fdb89c659107b25ee474fd6ac50d661dd029af9ca5082016a3b0827dd640a54a707 SHA512 24ad0bbecee46ab6ff669d63d64096b37a0d010bb44978a1785eee2701a8b30a83eab229af97cbbb18bca55b5e89be9ba74fe126d1d430da1e1e909366dc5b90
-DIST mercury-srcdist-20.01.2.tar.gz 46789217 BLAKE2B bc9637c1b4afb81d4bf35cd94a1f1d87b17094d8a6cbb7e5c8b0ff9c99ce59178d9e32bae246dd041ad781fe5d04e68db8f5effbb6bfcc29b76a83aad91a5666 SHA512 0deed9c0a13ebf793fb80def3fe6d9ee0aa4f0f2974865364eff81bdcac1ec0c41aafbec3e0146c8bdcf3245789e1003b2e4f8e219b53bec71e90074867a834d
-DIST mercury-srcdist-20.01.tar.gz 47103868 BLAKE2B 68be786e925bdf94dcba6c6a2a746a384da345ee33250785d8d2b9281815694a4525cdd694c26f58051c097f2a897291e640e2139729ccede9bd2e472077d8c9 SHA512 90e36faa375603e596b2dd692363528120fda62ae6d2e2b119cf76de1656dae4028aff00858a4bff3fdfb9b2210ea17db0aa516ce4283604c46a5935dd2cd4b7
 DIST mercury-srcdist-20.06.tar.gz 47768559 BLAKE2B f242aa2ef7da53aa2dfa054e4fee8646434d276f0748b014e33ea52d22f2a8a37e6fecaa20617f4943c4c1e7d8c179ed0603a344fde2dd58da98b2bacadf1a71 SHA512 b76bd22d8eb16242c68b614ff122ed7ee7535efef6c0ceb8cc798fee4c550bc41b6faff2135cea43b24c652b654bb35ae049656585d8e7bf3a1122d07cb1ecf4
diff --git a/dev-lang/mercury/mercury-14.01.1-r1.ebuild b/dev-lang/mercury/mercury-14.01.1-r1.ebuild
deleted file mode 100644
index 92e63ce89ad3..000000000000
--- a/dev-lang/mercury/mercury-14.01.1-r1.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib vcs-clean xdg-utils
-
-PATCHSET_VER="5"
-MY_P=${PN}-srcdist-${PV}
-
-DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
-HOMEPAGE="https://www.mercurylang.org/index.html"
-SRC_URI="http://dl.mercurylang.org/release/${MY_P}.tar.gz
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="debug doc emacs erlang examples java mono profile readline threads trail"
-
-DEPEND="!dev-libs/mpatrol
-	!dev-util/mono-debugger
-	net-libs/libnsl:0=
-	readline? ( sys-libs/readline:= )
-	erlang? ( dev-lang/erlang )
-	java? ( >=virtual/jdk-1.6:= )
-	mono? ( dev-lang/mono )
-	doc? ( sys-apps/texinfo )"
-
-RDEPEND="${DEPEND}
-	emacs? ( >=app-editors/emacs-23.1:* )"
-
-S="${WORKDIR}"/${MY_P}
-
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		epatch "${WORKDIR}"/${PV}
-	fi
-
-	sed -i -e "s/@libdir@/$(get_libdir)/" \
-		"${S}"/scripts/Mmake.vars.in \
-		|| die "sed libdir failed"
-
-	cd "${S}" || die
-	eautoconf
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	strip-flags
-
-	local myconf
-	myconf="--libdir=/usr/$(get_libdir) \
-		$(use_enable mono csharp-grade) \
-		$(use_enable erlang erlang-grade) \
-		$(use_enable java java-grade) \
-		$(use_enable debug debug-grades) \
-		$(use_enable profile prof-grades) \
-		$(use_enable threads par-grades) \
-		$(use_enable trail trail-grades) \
-		$(use_with readline)"
-
-	econf ${myconf}
-}
-
-src_compile() {
-	# Prepare mmake flags
-	echo "EXTRA_CFLAGS  = ${CFLAGS}"  >> Mmake.params
-	echo "EXTRA_LDFLAGS = ${LDFLAGS}" >> Mmake.params
-	echo "EXTRA_MLFLAGS = --no-strip" >> Mmake.params
-
-	if use x86; then
-		echo "CFLAGS-ml_backend.ml_closure_gen = -O0" >> Mmake.params
-		echo "CFLAGS-ml_backend.ml_unify_gen = -O0" >> Mmake.params
-		echo "CFLAGS-ml_backend.rtti_to_mlds = -O0" >> Mmake.params
-		echo "CFLAGS-display_report = -O0" >> Mmake.params
-		echo "CFLAGS-mercury_ho_call = -O0" >> Mmake.params
-		echo "CFLAGS-mercury_trace_vars = -O0" >> Mmake.params
-	fi
-
-	# Build Mercury using bootstrap grade
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		TEXI2DVI="" PDFTEX=""
-
-	# We can now patch .m Mercury compiler files since we
-	# have just built mercury_compiler.
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	if [[ -d "${WORKDIR}"/${PV}-mmc ]] ; then
-		epatch "${WORKDIR}"/${PV}-mmc
-	fi
-
-	sed -i -e "s/@libdir@/$(get_libdir)/" \
-		"${S}"/compiler/file_util.m \
-		"${S}"/compiler/make.program_target.m \
-		|| die "sed libdir failed"
-
-	# Rebuild Mercury compiler using the just built mercury_compiler
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		TEXI2DVI="" PDFTEX=""
-
-	# The default Mercury grade may not be the same as the bootstrap
-	# grade. Since src_test() is run before src_install() we compile
-	# the default grade now
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		TEXI2DVI="" PDFTEX="" \
-		default_grade
-}
-
-src_test() {
-	TEST_GRADE=$(scripts/ml --print-grade)
-	if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
-		TWS="${S}"/install_grade_dir.${TEST_GRADE}
-		cp runtime/mer_rt.init "${TWS}"/runtime/
-		cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
-		cp browser/mer_browser.init "${TWS}"/browser/
-	else
-		TWS="${S}"
-	fi
-
-	cd "${S}"/tests || die
-	sed -e "s:@WORKSPACE@:${TWS}:" \
-		< WS_FLAGS.ws \
-		> WS_FLAGS \
-		|| die "sed WORKSPACE failed"
-	sed -e "s:@WORKSPACE@:${TWS}:" \
-		< .mgnuc_copts.ws \
-		> .mgnuc_copts \
-		|| die "sed WORKSPACE failed"
-	find . -mindepth 1 -type d -exec cp .mgnuc_opts  {} \;
-	find . -mindepth 1 -type d -exec cp .mgnuc_copts {} \;
-
-	# Mercury tests must be run in C locale since Mercury output is
-	# compared to hard-coded warnings/errors
-	LC_ALL="C" \
-	PATH="${TWS}"/scripts:"${TWS}"/util:"${S}"/slice:"${PATH}" \
-	TERM="" \
-	WORKSPACE="${TWS}" \
-	WORKSPACE_FLAGS=yes \
-	MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
-	MMAKE_DIR="${TWS}"/scripts \
-	MERCURY_SUPPRESS_STACK_TRACE=yes \
-	GRADE=${TEST_GRADE} \
-		mmake || die "mmake test failed"
-}
-
-src_install() {
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		TEXI2DVI="" PDFTEX="" \
-		DESTDIR="${D}" \
-		INSTALL_PREFIX="${D}"/usr \
-		INSTALL_MAN_DIR="${D}"/usr/share/man \
-		INSTALL_INFO_DIR="${D}"/usr/share/info \
-		INSTALL_HTML_DIR="${D}"/usr/share/doc/${PF}/html \
-		INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
-		install
-
-	if use java; then
-		keepdir /usr/$(get_libdir)/mercury/modules/java
-	fi
-
-	if use mono; then
-		keepdir /usr/$(get_libdir)/mercury/modules/csharp
-	fi
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-			|| die "elisp-site-file-install failed"
-	fi
-
-	dodoc \
-		BUGS HISTORY LIMITATIONS NEWS README README.Linux \
-		README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
-		RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS || die
-
-	if use erlang; then
-		dodoc README.Erlang
-	fi
-
-	if use java; then
-		dodoc README.Java
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/samples
-		doins samples/{*.m,README,Mmakefile}
-		doins -r samples/c_interface \
-			samples/diff \
-			samples/muz \
-			samples/rot13 \
-			samples/solutions \
-			samples/solver_types
-
-		if use java; then
-			doins -r samples/java_interface
-		fi
-
-		ecvs_clean "${D}"/usr/share/doc/${PF}/samples
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lang/mercury/mercury-20.01.1.ebuild b/dev-lang/mercury/mercury-20.01.1.ebuild
deleted file mode 100644
index c3ee8114c51b..000000000000
--- a/dev-lang/mercury/mercury-20.01.1.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib vcs-clean xdg-utils
-
-PATCHSET_VER="0"
-MY_P=${PN}-srcdist-${PV}
-
-DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
-HOMEPAGE="https://www.mercurylang.org/index.html"
-SRC_URI="http://dl.mercurylang.org/release/${MY_P}.tar.gz
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug doc emacs erlang examples java mono profile readline threads trail"
-
-DEPEND="net-libs/libnsl:0=
-	readline? ( sys-libs/readline:= )
-	erlang? ( dev-lang/erlang )
-	java? ( >=virtual/jdk-1.6:= )
-	mono? ( dev-lang/mono )
-	doc? ( sys-apps/texinfo )"
-
-RDEPEND="${DEPEND}
-	emacs? ( >=app-editors/emacs-23.1:* )"
-
-S="${WORKDIR}"/${MY_P}
-
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		eapply "${WORKDIR}"/${PV}
-	fi
-	eapply_user
-
-	AT_M4DIR=m4 eautoreconf
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	strip-flags
-
-	local myconf
-	myconf="--libdir=/usr/$(get_libdir) \
-		$(use_enable mono csharp-grade) \
-		$(use_enable erlang erlang-grade) \
-		$(use_enable java java-grade) \
-		$(use_enable debug debug-grades) \
-		$(use_enable profile prof-grades) \
-		$(use_enable threads par-grades) \
-		$(use_enable trail trail-grades) \
-		$(use_with readline)"
-
-	econf ${myconf}
-}
-
-src_compile() {
-	# Prepare mmake flags
-	echo "EXTRA_CFLAGS  = ${CFLAGS}"  >> Mmake.params
-	echo "EXTRA_LD_LIBFLAGS = ${LDFLAGS}" >> Mmake.params
-	echo "EXTRA_MLFLAGS = --no-strip" >> Mmake.params
-
-	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libgc.so" >> boehm_gc/Mmake.boehm_gc.params
-	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_rt.so" >> runtime/Mmake.runtime.params
-	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_std.so" >> library/Mmake.library.params
-
-	# Build Mercury using bootstrap grade
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		TEXI2DVI="" PDFTEX=""
-
-	# We can now patch .m Mercury compiler files since we
-	# have just built mercury_compiler.
-	if [[ -d "${WORKDIR}"/${PV}-mmc ]] ; then
-		eapply "${WORKDIR}"/${PV}-mmc
-	fi
-
-	# Rebuild Mercury compiler using the just built mercury_compiler
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		TEXI2DVI="" PDFTEX=""
-
-	# The default Mercury grade may not be the same as the bootstrap
-	# grade. Since src_test() is run before src_install() we compile
-	# the default grade now
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		TEXI2DVI="" PDFTEX="" \
-		default_grade
-}
-
-src_test() {
-	TEST_GRADE=$(scripts/ml --print-grade)
-	if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
-		TWS="${S}"/install_grade_dir.${TEST_GRADE}
-		cp runtime/mer_rt.init "${TWS}"/runtime/
-		cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
-		cp browser/mer_browser.init "${TWS}"/browser/
-	else
-		TWS="${S}"
-	fi
-
-	cd "${S}"/tests || die
-	sed -e "s:@WORKSPACE@:${TWS}:" \
-		< WS_FLAGS.ws \
-		> WS_FLAGS \
-		|| die "sed WORKSPACE failed"
-	sed -e "s:@WORKSPACE@:${TWS}:" \
-		< .mgnuc_copts.ws \
-		> .mgnuc_copts \
-		|| die "sed WORKSPACE failed"
-	find . -mindepth 1 -type d -exec cp .mgnuc_opts  {} \;
-	find . -mindepth 1 -type d -exec cp .mgnuc_copts {} \;
-
-	# Mercury tests must be run in C locale since Mercury output is
-	# compared to hard-coded warnings/errors
-	LC_ALL="C" \
-	PATH="${TWS}"/scripts:"${TWS}"/util:"${S}"/slice:"${PATH}" \
-	TERM="" \
-	WORKSPACE="${TWS}" \
-	WORKSPACE_FLAGS=yes \
-	MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
-	MMAKE_DIR="${TWS}"/scripts \
-	MERCURY_SUPPRESS_STACK_TRACE=yes \
-	GRADE=${TEST_GRADE} \
-		mmake || die "mmake test failed"
-}
-
-src_install() {
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		TEXI2DVI="" PDFTEX="" \
-		DESTDIR="${D}" \
-		INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
-		install
-
-	if use java; then
-		keepdir /usr/$(get_libdir)/mercury/modules/java
-	fi
-
-	if use mono; then
-		keepdir /usr/$(get_libdir)/mercury/modules/csharp
-	fi
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-			|| die "elisp-site-file-install failed"
-	fi
-
-	dodoc \
-		BUGS HISTORY LIMITATIONS NEWS README README.Linux \
-		README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
-		RELEASE_NOTES VERSION || die
-
-	if use erlang; then
-		dodoc README.Erlang
-	fi
-
-	if use java; then
-		dodoc README.Java
-	fi
-
-	if use mono; then
-		dodoc README.CSharp
-	fi
-
-	if use examples; then
-		docinto /usr/share/doc/${PF}/samples
-		dodoc samples/{*.m,README,Mmakefile}
-		dodoc -r samples/c_interface \
-			samples/diff \
-			samples/muz \
-			samples/rot13 \
-			samples/solutions \
-			samples/solver_types
-
-		if use java; then
-			dodoc -r samples/java_interface
-		fi
-
-		ecvs_clean "${D}"/usr/share/doc/${PF}/samples
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lang/mercury/mercury-20.01.2.ebuild b/dev-lang/mercury/mercury-20.01.2.ebuild
deleted file mode 100644
index b0c5ecffdb0f..000000000000
--- a/dev-lang/mercury/mercury-20.01.2.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib vcs-clean xdg-utils
-
-PATCHSET_VER="1"
-MY_P=${PN}-srcdist-${PV}
-
-DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
-HOMEPAGE="https://www.mercurylang.org/index.html"
-SRC_URI="https://dl.mercurylang.org/release-20.01/${MY_P}.tar.gz
-	https://dev.gentoo.org/~keri/distfiles/mercury/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug doc emacs erlang examples java mono profile readline threads trail"
-
-DEPEND="net-libs/libnsl:0=
-	readline? ( sys-libs/readline:= )
-	erlang? ( dev-lang/erlang )
-	java? ( >=virtual/jdk-1.6:= )
-	mono? ( dev-lang/mono )
-	doc? ( sys-apps/texinfo )"
-
-RDEPEND="${DEPEND}
-	emacs? ( >=app-editors/emacs-23.1:* )"
-
-S="${WORKDIR}"/${MY_P}
-
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		eapply "${WORKDIR}"/${PV}
-	fi
-	eapply_user
-
-	AT_M4DIR=m4 eautoreconf
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	strip-flags
-
-	local myconf
-	myconf="--libdir=/usr/$(get_libdir) \
-		$(use_enable mono csharp-grade) \
-		$(use_enable erlang erlang-grade) \
-		$(use_enable java java-grade) \
-		$(use_enable debug debug-grades) \
-		$(use_enable profile prof-grades) \
-		$(use_enable threads par-grades) \
-		$(use_enable trail trail-grades) \
-		$(use_with readline)"
-
-	econf ${myconf}
-}
-
-src_compile() {
-	# Prepare mmake flags
-	echo "EXTRA_CFLAGS = ${CFLAGS}"  >> Mmake.params
-	echo "EXTRA_LDFLAGS = ${LDFLAGS}" >> Mmake.params
-	echo "EXTRA_LD_LIBFLAGS = ${LDFLAGS}" >> Mmake.params
-	echo "EXTRA_MLFLAGS = --no-strip" >> Mmake.params
-
-	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libgc.so" >> boehm_gc/Mmake.boehm_gc.params
-	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_rt.so" >> runtime/Mmake.runtime.params
-	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_std.so" >> library/Mmake.library.params
-
-	# Build Mercury using bootstrap grade
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		TEXI2DVI="" PDFTEX=""
-
-	# We can now patch .m Mercury compiler files since we
-	# have just built mercury_compiler.
-	if [[ -d "${WORKDIR}"/${PV}-mmc ]] ; then
-		eapply "${WORKDIR}"/${PV}-mmc
-	fi
-
-	# Rebuild Mercury compiler using the just built mercury_compiler
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		TEXI2DVI="" PDFTEX=""
-
-	# The default Mercury grade may not be the same as the bootstrap
-	# grade. Since src_test() is run before src_install() we compile
-	# the default grade now
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		TEXI2DVI="" PDFTEX="" \
-		default_grade
-}
-
-src_test() {
-	TEST_GRADE=$(scripts/ml --print-grade)
-	if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
-		TWS="${S}"/install_grade_dir.${TEST_GRADE}
-		cp runtime/mer_rt.init "${TWS}"/runtime/
-		cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
-		cp browser/mer_browser.init "${TWS}"/browser/
-	else
-		TWS="${S}"
-	fi
-
-	cd "${S}"/tests || die
-	sed -e "s:@WORKSPACE@:${TWS}:" \
-		< WS_FLAGS.ws \
-		> WS_FLAGS \
-		|| die "sed WORKSPACE failed"
-	sed -e "s:@WORKSPACE@:${TWS}:" \
-		< .mgnuc_copts.ws \
-		> .mgnuc_copts \
-		|| die "sed WORKSPACE failed"
-	find . -mindepth 1 -type d -exec cp .mgnuc_opts  {} \;
-	find . -mindepth 1 -type d -exec cp .mgnuc_copts {} \;
-
-	# Mercury tests must be run in C locale since Mercury output is
-	# compared to hard-coded warnings/errors
-	LC_ALL="C" \
-	PATH="${TWS}"/scripts:"${TWS}"/util:"${S}"/slice:"${PATH}" \
-	TERM="" \
-	WORKSPACE="${TWS}" \
-	WORKSPACE_FLAGS=yes \
-	MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
-	MMAKE_DIR="${TWS}"/scripts \
-	MERCURY_SUPPRESS_STACK_TRACE=yes \
-	GRADE=${TEST_GRADE} \
-		mmake || die "mmake test failed"
-}
-
-src_install() {
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		TEXI2DVI="" PDFTEX="" \
-		DESTDIR="${D}" \
-		INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
-		install
-
-	if use java; then
-		keepdir /usr/$(get_libdir)/mercury/modules/java
-	fi
-
-	if use mono; then
-		keepdir /usr/$(get_libdir)/mercury/modules/csharp
-	fi
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-			|| die "elisp-site-file-install failed"
-	fi
-
-	dodoc \
-		BUGS HISTORY LIMITATIONS NEWS README README.Linux \
-		README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
-		RELEASE_NOTES VERSION || die
-
-	if use erlang; then
-		dodoc README.Erlang
-	fi
-
-	if use java; then
-		dodoc README.Java
-	fi
-
-	if use mono; then
-		dodoc README.CSharp
-	fi
-
-	if use examples; then
-		docinto /usr/share/doc/${PF}/samples
-		dodoc samples/{*.m,README,Mmakefile}
-		dodoc -r samples/c_interface \
-			samples/diff \
-			samples/muz \
-			samples/rot13 \
-			samples/solutions \
-			samples/solver_types
-
-		if use java; then
-			dodoc -r samples/java_interface
-		fi
-
-		ecvs_clean "${D}"/usr/share/doc/${PF}/samples
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lang/mercury/mercury-20.01.ebuild b/dev-lang/mercury/mercury-20.01.ebuild
deleted file mode 100644
index 81583b6687be..000000000000
--- a/dev-lang/mercury/mercury-20.01.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib vcs-clean xdg-utils
-
-PATCHSET_VER="0"
-MY_P=${PN}-srcdist-${PV}
-
-DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
-HOMEPAGE="https://www.mercurylang.org/index.html"
-SRC_URI="http://dl.mercurylang.org/release/${MY_P}.tar.gz
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug doc emacs erlang examples java mono profile readline threads trail"
-
-DEPEND="net-libs/libnsl:0=
-	readline? ( sys-libs/readline:= )
-	erlang? ( dev-lang/erlang )
-	java? ( >=virtual/jdk-1.6:= )
-	mono? ( dev-lang/mono )
-	doc? ( sys-apps/texinfo )"
-
-RDEPEND="${DEPEND}
-	emacs? ( >=app-editors/emacs-23.1:* )"
-
-S="${WORKDIR}"/${MY_P}
-
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		eapply "${WORKDIR}"/${PV}
-	fi
-	eapply_user
-
-	AT_M4DIR=m4 eautoreconf
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	strip-flags
-
-	local myconf
-	myconf="--libdir=/usr/$(get_libdir) \
-		$(use_enable mono csharp-grade) \
-		$(use_enable erlang erlang-grade) \
-		$(use_enable java java-grade) \
-		$(use_enable debug debug-grades) \
-		$(use_enable profile prof-grades) \
-		$(use_enable threads par-grades) \
-		$(use_enable trail trail-grades) \
-		$(use_with readline)"
-
-	econf ${myconf}
-}
-
-src_compile() {
-	# Prepare mmake flags
-	echo "EXTRA_CFLAGS  = ${CFLAGS}"  >> Mmake.params
-	echo "EXTRA_LD_LIBFLAGS = ${LDFLAGS}" >> Mmake.params
-	echo "EXTRA_MLFLAGS = --no-strip" >> Mmake.params
-
-	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libgc.so" >> boehm_gc/Mmake.boehm_gc.params
-	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_rt.so" >> runtime/Mmake.runtime.params
-	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_std.so" >> library/Mmake.library.params
-
-	# Build Mercury using bootstrap grade
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		TEXI2DVI="" PDFTEX=""
-
-	# We can now patch .m Mercury compiler files since we
-	# have just built mercury_compiler.
-	if [[ -d "${WORKDIR}"/${PV}-mmc ]] ; then
-		eapply "${WORKDIR}"/${PV}-mmc
-	fi
-
-	sed -i -e "s/@libdir@/$(get_libdir)/" \
-		"${S}"/compiler/file_util.m \
-		"${S}"/compiler/make.program_target.m \
-		|| die "sed libdir failed"
-
-	# Rebuild Mercury compiler using the just built mercury_compiler
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		TEXI2DVI="" PDFTEX=""
-
-	# The default Mercury grade may not be the same as the bootstrap
-	# grade. Since src_test() is run before src_install() we compile
-	# the default grade now
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		TEXI2DVI="" PDFTEX="" \
-		default_grade
-}
-
-src_test() {
-	TEST_GRADE=$(scripts/ml --print-grade)
-	if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
-		TWS="${S}"/install_grade_dir.${TEST_GRADE}
-		cp runtime/mer_rt.init "${TWS}"/runtime/
-		cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
-		cp browser/mer_browser.init "${TWS}"/browser/
-	else
-		TWS="${S}"
-	fi
-
-	cd "${S}"/tests || die
-	sed -e "s:@WORKSPACE@:${TWS}:" \
-		< WS_FLAGS.ws \
-		> WS_FLAGS \
-		|| die "sed WORKSPACE failed"
-	sed -e "s:@WORKSPACE@:${TWS}:" \
-		< .mgnuc_copts.ws \
-		> .mgnuc_copts \
-		|| die "sed WORKSPACE failed"
-	find . -mindepth 1 -type d -exec cp .mgnuc_opts  {} \;
-	find . -mindepth 1 -type d -exec cp .mgnuc_copts {} \;
-
-	# Mercury tests must be run in C locale since Mercury output is
-	# compared to hard-coded warnings/errors
-	LC_ALL="C" \
-	PATH="${TWS}"/scripts:"${TWS}"/util:"${S}"/slice:"${PATH}" \
-	TERM="" \
-	WORKSPACE="${TWS}" \
-	WORKSPACE_FLAGS=yes \
-	MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
-	MMAKE_DIR="${TWS}"/scripts \
-	MERCURY_SUPPRESS_STACK_TRACE=yes \
-	GRADE=${TEST_GRADE} \
-		mmake || die "mmake test failed"
-}
-
-src_install() {
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		TEXI2DVI="" PDFTEX="" \
-		DESTDIR="${D}" \
-		INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
-		install
-
-	if use java; then
-		keepdir /usr/$(get_libdir)/mercury/modules/java
-	fi
-
-	if use mono; then
-		keepdir /usr/$(get_libdir)/mercury/modules/csharp
-	fi
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-			|| die "elisp-site-file-install failed"
-	fi
-
-	dodoc \
-		BUGS HISTORY LIMITATIONS NEWS README README.Linux \
-		README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
-		RELEASE_NOTES VERSION || die
-
-	if use erlang; then
-		dodoc README.Erlang
-	fi
-
-	if use java; then
-		dodoc README.Java
-	fi
-
-	if use mono; then
-		dodoc README.CSharp
-	fi
-
-	if use examples; then
-		docinto /usr/share/doc/${PF}/samples
-		dodoc samples/{*.m,README,Mmakefile}
-		dodoc -r samples/c_interface \
-			samples/diff \
-			samples/muz \
-			samples/rot13 \
-			samples/solutions \
-			samples/solver_types
-
-		if use java; then
-			dodoc -r samples/java_interface
-		fi
-
-		ecvs_clean "${D}"/usr/share/doc/${PF}/samples
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 31450f944336..5741964b2b2a 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -3,5 +3,6 @@ DIST perl-5.30.3-patches-1.tar.xz 20292 BLAKE2B 34ca8dbdf08650deaaa59bba634c3a40
 DIST perl-5.30.3.tar.xz 12375128 BLAKE2B ff0668c896e46ea35a1b8bd4a7d800c8668d6995185cd8c43fca332da2fa63965bb5276b2d5cf9738c0b7fb735140f6e33f1b4582899017903f86753065f417b SHA512 0ea62cf17532ee99217a218c39aa530472857c7a1982494f3a01693683062b4cdebe383a79f7b64452c713337b554ed5e0fd6eda018ea29e83c3538a13c24f3c
 DIST perl-5.32.0-patches-1.tar.xz 20220 BLAKE2B 46ebca5c74f59aa935ceec2a5807426c0e653ad7ba27de441d26e049e62dc67b17d58dfe5755f31bdd157e349d47fd46a98699207729f8f4f747930ed1064ba2 SHA512 42ed00f5f6be40af59e02691ff439a048cccd96fb970cca0976209faa921af98a773cc4cb1466e164328350d58cb46950ffa8c6f2fddabbeb3e8819349b06849
 DIST perl-5.32.0.tar.xz 12717336 BLAKE2B 4abad9f1ddabaad5f2bbfe8ab6d061aeb8c558e458d4bf1bcf737a8ecc1cf20f7dffaddd0bc867578b457787ec284fa81be3fae1edd7f72d58aeec7b5cd744e5 SHA512 1540247415893bbd94dfeede7b4fba6052688dc0bf27ced817f448246fcdc6e9a6486abc34577dec5b00bf02ed607b2d24ccd4977c3b3c51e8e6edfc0b81c760
+DIST perl-5.32.1.tar.xz 12610988 BLAKE2B 9f89bcf9cffb245a0f2cb0afa17c25f092c84cc2f29bb1c744294c2f0393c72dc3beb9fcbe256cf252677b33bc594b294b3f6a4774ad9e30b771aceed1f4f147 SHA512 3443c75aea91f0fe3712fee576239f1946d2301b8f7390b690e2f5d070fe71af8f9fa7769e42086c2d33d5f84370f80368fa9350b4f10cc0ac3e6c1f6209d8f9
 DIST perl-cross-1.3.2.tar.gz 108350 BLAKE2B ddb352fdbec66a04de62425f5cae1aaa3bc7251b9d6f4837b66a0bd79c53c60212fad3997dad4c38055774a2769d45b5b83927bf48b0fb00a130fee429eba702 SHA512 d61d25066a8d87c34aeacc5b9bd86fab964b33c4c65e84a89e4077fe1d8011c0bdf810a304631af44fae32edcffd6c99fc17b0c584ea83d1ce5ce492aaedfea5
 DIST perl-cross-1.3.4.tar.gz 108461 BLAKE2B 28f207d235f51ebf681598cf85f7f16923574aafb593426a59d67578135ee3632efb12b9e1a672759195a79f80e49f5c929ec42b2b4571b1d36f5d8c8dceadc2 SHA512 7e1fc7b2b19d8c2e2fb8615e074e218b2e1a4d276b563ffabccfd0c7398bc8680fca96da89cc61d611993f38a2c67dfbb0201c58658e05437395ad8c00d31874
diff --git a/dev-lang/perl/perl-5.32.1.ebuild b/dev-lang/perl/perl-5.32.1.ebuild
new file mode 100644
index 000000000000..73933f140243
--- /dev/null
+++ b/dev-lang/perl/perl-5.32.1.ebuild
@@ -0,0 +1,821 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit alternatives flag-o-matic toolchain-funcs multilib multiprocessing
+
+PATCH_VER=1
+CROSS_VER=1.3.4
+PATCH_BASE="perl-5.32.0-patches-${PATCH_VER}"
+PATCH_DEV=kentnl
+
+DIST_AUTHOR=XSAWYERX
+
+# Greatest first, don't include yourself
+# Devel point-releases are not ABI-intercompatible, but stable point releases are
+# BIN_OLDVERSEN is contains only C-ABI-intercompatible versions
+PERL_BIN_OLDVERSEN=""
+
+# Yes we can.
+PERL_SINGLE_SLOT=y
+
+if [[ "${PV##*.}" == "9999" ]]; then
+	DIST_VERSION=5.30.0
+else
+	DIST_VERSION="${PV/_rc/-RC}"
+fi
+SHORT_PV="${DIST_VERSION%.*}"
+# Even numbered major versions are ABI intercompatible
+# Odd numbered major versions are not
+if [[ $(( ${SHORT_PV#*.} % 2 )) == 1 ]]; then
+	SUBSLOT="${DIST_VERSION%-RC*}"
+else
+	SUBSLOT="${DIST_VERSION%.*}"
+fi
+# Used only in tar paths
+MY_P="perl-${DIST_VERSION}"
+# Used in library paths
+MY_PV="${DIST_VERSION%-RC*}"
+
+DESCRIPTION="Larry Wall's Practical Extraction and Report Language"
+
+SRC_URI="
+	mirror://cpan/src/5.0/${MY_P}.tar.xz
+	mirror://cpan/authors/id/${DIST_AUTHOR:0:1}/${DIST_AUTHOR:0:2}/${DIST_AUTHOR}/${MY_P}.tar.xz
+	https://github.com/gentoo-perl/perl-patchset/releases/download/${PATCH_BASE}/${PATCH_BASE}.tar.xz
+	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${PATCH_BASE}.tar.xz
+	https://github.com/arsv/perl-cross/releases/download/${CROSS_VER}/perl-cross-${CROSS_VER}.tar.gz
+"
+HOMEPAGE="https://www.perl.org/"
+
+LICENSE="|| ( Artistic GPL-1+ )"
+SLOT="0/${SUBSLOT}"
+
+if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then
+# SOMEWHAT EXPERIMENTAL CODE, DO NOT USE WITHOUT AN ADULT PRESENT, CHECK CHANGELOG
+# FOR DETAILS
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+IUSE="berkdb debug doc gdbm ithreads minimal"
+
+RDEPEND="
+	berkdb? ( sys-libs/db:= )
+	gdbm? ( >=sys-libs/gdbm-1.8.3:= )
+	app-arch/bzip2
+	sys-libs/zlib
+	virtual/libcrypt:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}"
+
+PDEPEND="
+	!minimal? (
+		>=app-admin/perl-cleaner-2.5
+		>=virtual/perl-File-Temp-0.230.400-r2
+		>=virtual/perl-Data-Dumper-2.154.0
+		virtual/perl-Test-Harness
+	)
+"
+# bug 390719, bug 523624
+# virtual/perl-Test-Harness is here for the bundled ExtUtils::MakeMaker
+
+S="${WORKDIR}/${MY_P}"
+
+dual_scripts() {
+	src_remove_dual      perl-core/Archive-Tar        2.360.0       ptar ptardiff ptargrep
+	src_remove_dual      perl-core/CPAN               2.270.0       cpan
+	src_remove_dual      perl-core/Digest-SHA         6.20.0        shasum
+	src_remove_dual      perl-core/Encode             3.60.0        enc2xs piconv
+	src_remove_dual      perl-core/ExtUtils-MakeMaker 7.440.0       instmodsh
+	src_remove_dual      perl-core/ExtUtils-ParseXS   3.400.0       xsubpp
+	src_remove_dual      perl-core/IO-Compress        2.93.0        zipdetails
+	src_remove_dual      perl-core/JSON-PP            4.40.0        json_pp
+	src_remove_dual      perl-core/Module-CoreList    5.202.101.23  corelist
+	src_remove_dual      perl-core/Pod-Checker        1.730.0       podchecker
+	src_remove_dual      perl-core/Pod-Perldoc        3.280.100     perldoc
+	src_remove_dual      perl-core/Pod-Usage          1.690.0       pod2usage
+	src_remove_dual      perl-core/Test-Harness       3.420.0       prove
+	src_remove_dual      perl-core/podlators          4.140.0       pod2man pod2text
+	src_remove_dual_man  perl-core/podlators          4.140.0       /usr/share/man/man1/perlpodstyle.1
+}
+
+check_rebuild() {
+	# Fresh install
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		return 0;
+	# Major Upgrade
+	# doesn't matter if there's multiple copies, it still needs a rebuild
+	# if the string is anything other than "5.CURRENTMAJOR"
+	elif [[ "${REPLACING_VERSIONS%.*}" != "${PV%.*}" ]]; then
+		echo ""
+		ewarn "UPDATE THE PERL MODULES:"
+		ewarn "After updating dev-lang/perl the installed Perl modules"
+		ewarn "have to be re-installed. In most cases, this is done automatically"
+		ewarn "by the package manager, but subsequent steps are still recommended"
+		ewarn "to ensure system consistency."
+		ewarn
+		ewarn "You should start with a depclean to remove any unused perl dependencies"
+		ewarn "that may confuse portage in future. Regular depcleans are also encouraged"
+		ewarn "as part of your regular update cycle, as that will keep perl upgrades working."
+		ewarn "Recommended: emerge --depclean -va"
+		ewarn
+		ewarn "You should then call perl-cleaner to clean up any old files and trigger any"
+		ewarn "remaining rebuilds portage may have missed."
+		ewarn "Use: perl-cleaner --all"
+		return 0;
+
+	# Reinstall w/ USE Change
+	elif (   use ithreads && ! has_version dev-lang/perl[ithreads] ) || \
+		 ( ! use ithreads &&   has_version dev-lang/perl[ithreads] ) || \
+		 (   use debug    && ! has_version dev-lang/perl[debug]    ) || \
+		 ( ! use debug    &&   has_version dev-lang/perl[debug]    ) ; then
+		echo ""
+		ewarn "TOGGLED USE-FLAGS WARNING:"
+		ewarn "You changed one of the use-flags ithreads or debug."
+		ewarn "You must rebuild all perl-modules installed."
+		ewarn "Use: perl-cleaner --modules ; perl-cleaner --force --libperl"
+	fi
+}
+
+pkg_setup() {
+	case ${CHOST} in
+		*-freebsd*)   osname="freebsd" ;;
+		*-dragonfly*) osname="dragonfly" ;;
+		*-netbsd*)    osname="netbsd" ;;
+		*-openbsd*)   osname="openbsd" ;;
+		*-darwin*)    osname="darwin" ;;
+		*-solaris*)   osname="solaris" ;;
+		*-cygwin*)    osname="cygwin" ;;
+		*)            osname="linux" ;;
+	esac
+
+	myarch="${CHOST%%-*}-${osname}"
+	if use debug ; then
+		myarch+="-debug"
+	fi
+	if use ithreads ; then
+		mythreading="-multi"
+		myarch+="-thread"
+	fi
+
+	PRIV_BASE="/usr/$(get_libdir)/perl5"
+	SITE_BASE="/usr/local/$(get_libdir)/perl5"
+	VENDOR_BASE="/usr/$(get_libdir)/perl5/vendor_perl"
+
+	LIBPERL="libperl$(get_libname ${MY_PV} )"
+
+	# This ENV var tells perl to build with a directory like "5.30"
+	# regardless of its patch version. This is for experts only
+	# at this point.
+	if [[ -z "${PERL_SINGLE_SLOT}" ]]; then
+		PRIV_LIB="${PRIV_BASE}/${MY_PV}"
+		ARCH_LIB="${PRIV_BASE}/${MY_PV}/${myarch}${mythreading}"
+		SITE_LIB="${SITE_BASE}/${MY_PV}"
+		SITE_ARCH="${SITE_BASE}/${MY_PV}/${myarch}${mythreading}"
+		VENDOR_LIB="${VENDOR_BASE}/${MY_PV}"
+		VENDOR_ARCH="${VENDOR_BASE}/${MY_PV}/${myarch}${mythreading}"
+	else
+		PRIV_LIB="${PRIV_BASE}/${SUBSLOT}"
+		ARCH_LIB="${PRIV_BASE}/${SUBSLOT}/${myarch}${mythreading}"
+		SITE_LIB="${SITE_BASE}/${SUBSLOT}"
+		SITE_ARCH="${SITE_BASE}/${SUBSLOT}/${myarch}${mythreading}"
+		VENDOR_LIB="${VENDOR_BASE}/${SUBSLOT}"
+		VENDOR_ARCH="${VENDOR_BASE}/${SUBSLOT}/${myarch}${mythreading}"
+	fi
+
+	dual_scripts
+}
+
+src_remove_dual_file() {
+	local i pkg ver
+	pkg="$1"
+	ver="$2"
+	shift 2
+	case "${EBUILD_PHASE:-none}" in
+		postinst|postrm)
+			for i in "$@" ; do
+				alternatives_auto_makesym "${i}" "${i}-[0-9]*"
+			done
+			;;
+		setup)
+			for i in "$@" ; do
+				if [[ -f ${EROOT}${i} && ! -h ${EROOT}${i} ]] ; then
+					has_version ${pkg} && ewarn "You must reinstall ${pkg} !"
+					break
+				fi
+			done
+			;;
+		install)
+			for i in "$@" ; do
+				if ! [[ -f "${ED}"${i} ]] ; then
+					ewarn "${i} does not exist!"
+					continue
+				fi
+				mv "${ED}"${i}{,-${ver}-${P}} || die
+			done
+			;;
+	esac
+}
+
+src_remove_dual_man() {
+	local i pkg ver ff
+	pkg="$1"
+	ver="$2"
+	shift 2
+	case "${EBUILD_PHASE:-none}" in
+		postinst|postrm)
+			for i in "$@" ; do
+				ff=`echo "${EROOT}${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}}"*`
+				ff=${ff##*${i#${i%.[0-9]}}}
+				alternatives_auto_makesym "${i}${ff}" "${i%.[0-9]}-[0-9]*"
+			done
+			;;
+		install)
+			for i in "$@" ; do
+				if ! [[ -f "${ED}"${i} ]] ; then
+					ewarn "${i} does not exist!"
+					continue
+				fi
+				mv "${ED}"${i} "${ED}"${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}} || die
+			done
+			;;
+	esac
+}
+
+src_remove_dual() {
+	local i pkg ver
+	pkg="$1"
+	ver="$2"
+	shift 2
+	for i in "$@" ; do
+		src_remove_dual_file  "${pkg}" "${ver}" "/usr/bin/${i}"
+		src_remove_dual_man   "${pkg}" "${ver}" "/usr/share/man/man1/${i}.1"
+	done
+}
+
+src_prepare_perlcross() {
+	cp -a ../perl-cross-${CROSS_VER}/* . || die
+
+	# bug 604072
+	MAKEOPTS+=" -j1"
+	export MAKEOPTS
+}
+src_prepare_dynamic() {
+	ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) || die
+	ln -s ${LIBPERL} libperl$(get_libname ) || die
+}
+
+# Copy a patch into the patch series
+# add_patch SRC_PATH DEST_NAME ['description'] ['bug'] ['bug']
+# - description is optional, but recommended
+# - all arguments after descriptions are bug URLs
+add_patch() {
+	local patchdir="${WORKDIR}/patches"
+	local infodir="${WORKDIR}/patch-info"
+	local src_name dest_name desc
+	src_name="$1"
+	dest_name="$2"
+	desc="$3"
+	shift; shift; shift;
+	einfo "Adding ${dest_name} to patch bundle"
+	cp "${src_name}" "${patchdir}/${dest_name}" || die "Couldn't copy ${src_name} to ${dest_name}"
+	if [[ -n "${desc}" ]]; then
+		printf "%s" "${desc}" > "${infodir}/${dest_name}.desc" || die "Couldn't write ${dest_name}.desc"
+	fi
+	if [[ $# -gt 0 ]]; then
+		# Note: when $@ is more than one element, this emits a
+		# line for each element
+		printf "%s\n" "$@" > "${infodir}/${dest_name}.bugs" || die "Couldn't write ${dest_name}.bugs"
+	fi
+}
+# Remove a patch using a glob expr
+# eg:
+#	 rm_patch *-darin-Use-CC*
+#
+rm_patch() {
+	local patchdir="${WORKDIR}/patches"
+	local expr="$1"
+	local patch="$( cd "${patchdir}"; echo $expr )"
+	einfo "Removing $patch ($expr) from patch bundle"
+	if [[ -e "${patchdir}/${patch}" ]]; then
+		rm -f "${patchdir}/${patch}" || die "Can't remove ${patch} ( $expr )"
+	else
+		ewarn "No ${expr} found in ${patchdir} to remove"
+	fi
+}
+# Yes, this is a reasonable amount of code for something seemingly simple
+# but this is far easier to debug when things go wrong, and things went wrong
+# multiple times while I was getting the exact number of slashes right, which
+# requires circumnavigating both bash and sed escape mechanisms.
+c_escape_string() {
+	local slash dquote
+	slash='\'
+	dquote='"'
+	re_slash="${slash}${slash}"
+	re_dquote="${slash}${dquote}"
+
+	# Convert \ to \\,
+	#         " to \"
+	echo "$1" |\
+		sed "s|${re_slash}|${re_slash}${re_slash}|g" |\
+		sed "s|${re_dquote}|${re_slash}${re_dquote}|g"
+}
+c_escape_file() {
+	c_escape_string "$(cat "$1")"
+}
+
+apply_patchdir() {
+	local patchdir="${WORKDIR}/patches"
+	local infodir="${WORKDIR}/patch-info"
+	local patchoutput="patchlevel-gentoo.h"
+
+	# Inject Patch-Level info into description for patchlevel.h patch
+	# to show in -V
+	local patch_expr="*List-packaged-patches*"
+	local patch="$( cd "${patchdir}"; echo $patch_expr )";
+	einfo "Injecting patch-level info into ${patch}.desc ( $patch_expr )"
+
+	if [[ -e "${patchdir}/${patch}" ]]; then
+		printf "List packaged patches for %s(%s) in patchlevel.h" "${PF}" "${PATCH_BASE}"\
+			>"${infodir}/${patch}.desc" || die "Can't rewrite ${patch}.desc"
+	else
+		eerror "No $patch_expr found in ${patchdir}"
+	fi
+
+	# Compute patch list to apply
+	# different name other than PATCHES to stop default
+	# reapplying it
+	# Single depth is currently only supported, as artifacts can reside
+	# from the old layout being multiple-directories, as well as it grossly
+	# simplifying the patchlevel_gentoo.h generation.
+	local PERL_PATCHES=($(
+		find "${patchdir}" -maxdepth 1 -mindepth 1 -type f -printf "%f\n" |\
+			grep -E '[.](diff|patch)$' |\
+			sort -n
+	))
+
+	for patch in "${PERL_PATCHES[@]}"; do
+		eapply "${WORKDIR}"/patches/${patch}
+	done
+
+	einfo "Generating $patchoutput"
+
+	# This code creates a header file, each iteration
+	# creates one-or-more-lines for each entry found in PERL_PATCHES
+	# and STDOUT is redirected to the .h file
+	for patch in "${PERL_PATCHES[@]}"; do
+		local desc_f="${infodir}/${patch}.desc"
+		local bugs_f="${infodir}/${patch}.bugs"
+
+		printf ',"%s"\n' "${patch}"
+		if [[ ! -e "${desc_f}" ]]; then
+			ewarn "No description provided for ${patch} (expected: ${desc_f} )"
+		else
+			local desc="$(c_escape_file "${desc_f}")"
+			printf ',"- %s"\n' "${desc}"
+		fi
+		if [[ -e "${bugs_f}" ]]; then
+			while read -d $'\n' -r line; do
+				local esc_line="$(c_escape_string "${line}")"
+				printf ',"- Bug: %s"\n' "${esc_line}"
+			done <"${bugs_f}"
+		fi
+	done > "${S}/${patchoutput}"
+	printf "%s\n" "${patchoutput}" >> "${S}/MANIFEST"
+
+}
+src_prepare() {
+	local patchdir="${WORKDIR}/patches"
+
+	# Prepare Patch dir with additional patches / remove unwanted patches
+	# Inject bug/desc entries for perl -V
+	if use hppa ; then
+		# bug 634162
+		add_patch "${FILESDIR}/${PN}-5.26.2-hppa.patch" "100-5.26.2-hppa.patch"\
+			"Fix broken miniperl on hppa"\
+			"https://bugs.debian.org/869122" "https://bugs.gentoo.org/634162"
+	fi
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# do NOT mess with nsl, on Solaris this is always necessary,
+		# when -lsocket is used e.g. to get h_errno
+		rm_patch "*-nsl-and-cl*"
+	fi
+
+	apply_patchdir
+
+	tc-is-cross-compiler && src_prepare_perlcross
+
+	tc-is-static-only || src_prepare_dynamic
+
+	if use gdbm; then
+		sed -i "s:INC => .*:INC => \"-I${EROOT}/usr/include/gdbm\":g" \
+			ext/NDBM_File/Makefile.PL || die
+	fi
+
+	# Use errno.h from prefix rather than from host system, bug #645804
+	if use prefix && [[ -e "${EPREFIX}"/usr/include/errno.h ]] ; then
+		sed -i "/my..sysroot/s:'':'${EPREFIX}':" ext/Errno/Errno_pm.PL || die
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# set a soname, fix linking against just built libperl
+		sed -i -e 's/netbsd\*/netbsd*|solaris*/' Makefile.SH || die
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# fix install_name (soname) not to reference $D
+		sed -i -e '/install_name `pwd/s/`pwd`/\\$(shrpdir)/' Makefile.SH || die
+
+		# Upstreamed, but not in this version.
+		# Need to recognise macOS 11 / 10.16. #757249
+		eapply "${FILESDIR}/${PN}-5.30.3-darwin-macos11.patch"
+	fi
+
+	default
+}
+
+myconf() {
+	# the myconf array is declared in src_configure
+	myconf=( "${myconf[@]}" "$@" )
+}
+
+# Outputs a list of versions which have been seen in any of the
+# primary perl @INC prefix paths, such as:
+#  /usr/lib64/perl5/<NUMBER>
+#  /usr/local/lib64/perl5/<NUMBER>
+#  /usr/lib64/perl5/vendor_perl/<NUMBER>
+#
+# All values of NUMBER must be like "5.x.y", unless PERL_SUPPORT_SINGLE_SLOT
+# is enabled, where it will also allow numbers like "5.x"
+#
+# PERL_SUPPORT_SINGLE_SLOT should only be used to transition *away* from PERL_SINGLE_SLOT
+# if you used that.
+find_candidate_inc_versions() {
+	local regex='.*/5[.][0-9]+[.][0-9]+$';
+	if [[ ! -z "${PERL_SUPPORT_SINGLE_SLOT}" || ! -z "${PERL_SINGLE_SLOT}" ]]; then
+		regex='.*/5[.][0-9]+\([.][0-9]+\|\)$'
+	fi
+	local dirs=(
+		"${EROOT}${PRIV_BASE}"
+		"${EROOT}${SITE_BASE}"
+		"${EROOT}${VENDOR_BASE}"
+	)
+	for dir in "${dirs[@]}"; do
+		if [[ ! -e "${dir}" ]]; then
+			continue
+		fi
+		# Without access to readdir() on these dirs, find will not be able
+		# to reveal any @INC directories inside them, and will subsequently prune
+		# them from the built perl's @INC support, breaking our compatiblity options
+		# entirely.
+		if [[ ! -r "${dir}" || ! -x "${dir}" ]]; then
+			eerror "Bad permissions on ${dir}, this will probably break things"
+			eerror "Ensure ${dir} is +rx for at least uid=$EUID"
+			eerror "Recommended permission is +rx for all"
+			eerror "> chmod o+rx ${dir}"
+		fi
+	done
+	einfo "Scanning for old @INC dirs matching '$regex' in: ${dirs[*]}"
+	find "${dirs[@]}" -maxdepth 1 -mindepth 1 -type d -regex "${regex}" -printf "%f "  2>/dev/null
+}
+# Sort versions passed versiony-ly, remove self-version if present
+# dedup. Takes each version as an argument
+sanitize_inc_versions() {
+	local vexclude="${DIST_VERSION%-RC}"
+	if [[ ! -z "${PERL_SINGLE_SLOT}" ]]; then
+		vexclude="${SUBSLOT}"
+	fi
+	einfo "Normalizing/Sorting candidate list: $*"
+	einfo " to remove '${vexclude}'"
+	# Note, general numeric sort has to be used
+	# for the last component, or unique will convert
+	#  5.30.0 + 5.30 into just 5.30
+	printf "%s\n" "$@" |\
+		grep -vxF "${vexclude}" |\
+		sort -u -nr -t'.' -k1,1rn -k2,2rn -k3,3rg
+}
+
+versions_to_inclist() {
+	local oldv="${PERL_BIN_OLDVERSEN}"
+	if [[ ! -z "${PERL_SINGLE_SLOT}" ]]; then
+		oldv="${DIST_VERSION%-RC} ${PERL_BIN_OLDVERSEN}"
+	fi
+	for v;	do
+			has "${v}" ${oldv} && echo -n "${v}/${myarch}${mythreading}/ ";
+			echo -n "${v}/ ";
+	done
+}
+versions_to_gentoolibdirs() {
+	local oldv="${PERL_BIN_OLDVERSEN}"
+	local root
+	local v
+	if [[ ! -z "${PERL_SINGLE_SLOT}" ]]; then
+		oldv="${DIST_VERSION%-RC} ${PERL_BIN_OLDVERSEN}"
+	fi
+	for v;	do
+		for root in "${PRIV_BASE}" "${VENDOR_BASE}" "${SITE_BASE}"; do
+			local fullpath="${EROOT}${root}/${v}"
+			if [[ -e "${fullpath}" ]]; then
+				has "${v}" ${oldv} && printf "%s:" "${fullpath}/${myarch}${mythreading}";
+				printf "%s:" "${fullpath}"
+			fi
+		done
+	done
+}
+
+src_configure() {
+	declare -a myconf
+
+	export LC_ALL="C"
+	[[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091
+
+	# Perl has problems compiling with -Os in your flags with glibc
+	use elibc_uclibc || replace-flags "-Os" "-O2"
+
+	# xlocale.h is going away in glibc-2.26, so it's counterproductive
+	# if we use it and include it in CORE/perl.h ... Perl builds just
+	# fine with glibc and locale.h only.
+	# However, the darwin prefix people have no locale.h ...
+	use elibc_glibc && myconf -Ui_xlocale
+
+	# This flag makes compiling crash in interesting ways
+	filter-flags "-malign-double"
+
+	# Generic LTO broken since 5.28, triggers EUMM failures
+	filter-flags "-flto"
+
+	use sparc && myconf -Ud_longdbl
+
+	export BUILD_BZIP2=0
+	export BZIP2_INCLUDE=${EROOT}/usr/include
+	export BZIP2_LIB=${EROOT}/usr/$(get_libdir)
+
+	export BUILD_ZLIB=False
+	export ZLIB_INCLUDE=${EROOT}/usr/include
+	export ZLIB_LIB=${EROOT}/usr/$(get_libdir)
+
+	# allow either gdbm to provide ndbm (in <gdbm/ndbm.h>) or db1
+	myndbm='U'
+	mygdbm='U'
+	mydb='U'
+	if use gdbm ; then
+		mygdbm='D'
+		if use berkdb ; then
+			myndbm='D'
+		fi
+	fi
+	if use berkdb ; then
+		mydb='D'
+		has_version '=sys-libs/db-1*' && myndbm='D'
+	fi
+
+	myconf "-${myndbm}i_ndbm" "-${mygdbm}i_gdbm" "-${mydb}i_db"
+
+	if use alpha && [[ "$(tc-getCC)" = "ccc" ]] ; then
+		ewarn "Perl will not be built with berkdb support, use gcc if you needed it..."
+		myconf -Ui_db -Ui_ndbm
+	fi
+
+	use ithreads && myconf -Dusethreads
+
+	if use debug ; then
+		append-cflags "-g"
+		myconf -DDEBUGGING
+	elif [[ ${CFLAGS} == *-g* ]] ; then
+		myconf -DDEBUGGING=-g
+	else
+		myconf -DDEBUGGING=none
+	fi
+
+	# Autodiscover all old version directories, some of them will even be newer
+	# if you downgrade
+	if [[ -z ${PERL_OLDVERSEN} ]]; then
+		PERL_OLDVERSEN="$( find_candidate_inc_versions )"
+	fi
+
+	# Fixup versions, removing self match, fixing order and dupes
+	PERL_OLDVERSEN="$( sanitize_inc_versions ${PERL_OLDVERSEN} )"
+
+	# Experts who want a "Pure" install can set PERL_OLDVERSEN to an empty string
+	if [[ -n "${PERL_OLDVERSEN// }" ]]; then
+		local inclist="$( versions_to_inclist ${PERL_OLDVERSEN} )"
+		einfo "This version of perl may partially support modules previously"
+		einfo "installed in any of the following paths:"
+		for incpath in ${inclist}; do
+			[[ -e "${EROOT}${VENDOR_BASE}/${incpath}" ]] && einfo " ${EROOT}${VENDOR_BASE}/${incpath}"
+			[[ -e "${EROOT}${PRIV_BASE}/${incpath}"   ]] && einfo " ${EROOT}${PRIV_BASE}/${incpath}"
+			[[ -e "${EROOT}${SITE_BASE}/${incpath}"   ]] && einfo " ${EROOT}${SITE_BASE}/${incpath}"
+		done
+		einfo "This is a temporary measure and you should aim to cleanup these paths"
+		einfo "via world updates and perl-cleaner"
+		# myconf -Dinc_version_list="${inclist}"
+		myconf -Dgentoolibdirs="$( versions_to_gentoolibdirs ${PERL_OLDVERSEN} )"
+	fi
+
+	[[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a"
+
+	# Make sure we can do the final link #523730, need to set deployment
+	# target to override hardcoded 10.3 which breaks on modern OSX
+	[[ ${CHOST} == *-darwin* ]] && \
+		myconf "-Dld=env MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} $(tc-getCC)"
+
+	# Older macOS with non-Apple GCC chokes on inline in system headers
+	# using c89 mode as injected by cflags.SH
+	[[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \
+		append-cflags -Dinline=__inline__
+
+	# flock on 32-bit sparc Solaris is broken, fall back to fcntl
+	[[ ${CHOST} == sparc-*-solaris* ]] && \
+		myconf -Ud_flock
+
+	# Prefix: the host system needs not to follow Gentoo multilib stuff, and in
+	# Prefix itself we don't do multilib either, so make sure perl can find
+	# something compatible.
+	if use prefix ; then
+		# Set a hook to check for each detected library whether it actually works.
+		export libscheck="
+			( echo 'main(){}' > '${T}'/conftest.c &&
+				$(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null
+			) || xxx=/dev/null"
+
+		# Use all host paths that might contain useful stuff, the hook above will filter out bad choices.
+		local paths="/lib/*-linux-gnu /usr/lib/*-linux-gnu /lib64 /lib/64 /usr/lib64 /usr/lib/64 /lib32 /usr/lib32 /lib /usr/lib"
+		myconf "-Dlibpth=${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir) ${paths}"
+	elif [[ $(get_libdir) != "lib" ]] ; then
+		# We need to use " and not ', as the written config.sh use ' ...
+		myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)"
+	fi
+
+	# don't try building ODBM, bug #354453
+	disabled_extensions="ODBM_File"
+
+	if ! use gdbm ; then
+		# workaround for bug #157774: don't try building GDBM related stuff with USE="-gdbm"
+		disabled_extensions="${disabled_extensions} GDBM_File NDBM_File"
+	fi
+
+	myconf -Dnoextensions="${disabled_extensions}"
+
+	[[ "${PV##*.}" == "9999" ]] && myconf -Dusedevel -Uversiononly
+
+	[[ -n "${EXTRA_ECONF}" ]] && ewarn During Perl build, EXTRA_ECONF=${EXTRA_ECONF}
+	# allow fiddling via EXTRA_ECONF, bug 558070
+	eval "local -a EXTRA_ECONF=(${EXTRA_ECONF})"
+
+	# setting -Dld= to tc-getLD breaks perl and all perl things
+	# https://github.com/Perl/perl5/issues/17791#issuecomment-630145202
+	myconf \
+		-Duseshrplib \
+		-Darchname="${myarch}" \
+		-Dcc="$(tc-getCC)" \
+		-Dar="$(tc-getAR)" \
+		-Dnm="$(tc-getNM)" \
+		-Dcpp="$(tc-getCPP)" \
+		-Dranlib="$(tc-getRANLIB)" \
+		-Doptimize="${CFLAGS}" \
+		-Dldflags="${LDFLAGS}" \
+		-Dprefix="${EPREFIX}"'/usr' \
+		-Dsiteprefix="${EPREFIX}"'/usr/local' \
+		-Dvendorprefix="${EPREFIX}"'/usr' \
+		-Dscriptdir="${EPREFIX}"'/usr/bin' \
+		-Dprivlib="${EPREFIX}${PRIV_LIB}" \
+		-Darchlib="${EPREFIX}${ARCH_LIB}" \
+		-Dsitelib="${EPREFIX}${SITE_LIB}" \
+		-Dsitearch="${EPREFIX}${SITE_ARCH}" \
+		-Dvendorlib="${EPREFIX}${VENDOR_LIB}" \
+		-Dvendorarch="${EPREFIX}${VENDOR_ARCH}" \
+		-Dman1dir="${EPREFIX}"/usr/share/man/man1 \
+		-Dman3dir="${EPREFIX}"/usr/share/man/man3 \
+		-Dsiteman1dir="${EPREFIX}"/usr/local/man/man1 \
+		-Dsiteman3dir="${EPREFIX}"/usr/local/man/man3 \
+		-Dvendorman1dir="${EPREFIX}"/usr/share/man/man1 \
+		-Dvendorman3dir="${EPREFIX}"/usr/share/man/man3 \
+		-Dman1ext='1' \
+		-Dman3ext='3pm' \
+		-Dlibperl="${LIBPERL}" \
+		-Dlocincpth="${EPREFIX}"'/usr/include ' \
+		-Dglibpth="${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir)"' ' \
+		-Duselargefiles \
+		-Dd_semctl_semun \
+		-Dcf_by='Gentoo' \
+		-Dmyhostname='localhost' \
+		-Dperladmin='root@localhost' \
+		-Ud_csh \
+		-Dsh="${EPREFIX}"/bin/sh \
+		-Dtargetsh="${EPREFIX}"/bin/sh \
+		-Uusenm \
+		"${myconf[@]}" \
+		"${EXTRA_ECONF[@]}"
+
+	if tc-is-cross-compiler; then
+		./configure \
+			--target="${CHOST}" \
+			--build="${CBUILD}" \
+			-Dinstallprefix='' \
+			-Dinstallusrbinperl='undef' \
+			-Dusevendorprefix='define' \
+			"${myconf[@]}" \
+			|| die "Unable to configure"
+	else
+		sh Configure \
+			-des \
+			-Dinstallprefix="${EPREFIX}"'/usr' \
+			-Dinstallusrbinperl='n' \
+			"${myconf[@]}" \
+			|| die "Unable to configure"
+	fi
+}
+
+src_test() {
+	export NO_GENTOO_NETWORK_TESTS=1;
+	export GENTOO_ASSUME_SANDBOXED="${GENTOO_ASSUME_SANDBOXED:-1}"
+	export GENTOO_NO_PORTING_TESTS="${GENTOO_NO_PORTING_TESTS:-1}"
+	if [[ ${EUID} == 0 ]] ; then
+		ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..."
+		return 0
+	fi
+	use elibc_uclibc && export MAKEOPTS+=" -j1"
+	TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed"
+}
+
+src_install() {
+	local i
+	local coredir="${ARCH_LIB}/CORE"
+
+	emake DESTDIR="${D}" install
+
+	rm -f "${ED}/usr/bin/perl${MY_PV}"
+	ln -s perl "${ED}"/usr/bin/perl${MY_PV} || die
+
+	if ! tc-is-static-only ; then
+		dolib.so "${ED}"${coredir}/${LIBPERL}
+		rm -f "${ED}"${coredir}/${LIBPERL}
+		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname ${SHORT_PV}) || die
+		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname) || die
+
+		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/${LIBPERL} || die
+		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname ${SHORT_PV}) || die
+		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname) || die
+	fi
+
+	rm -rf "${ED}"/usr/share/man/man3 || die "Unable to remove module man pages"
+
+	# This removes ${D} from Config.pm
+	for i in $(find "${D}" -iname "Config.pm" ) ; do
+		einfo "Removing ${D} from ${i}..."
+		sed -i -e "s:${D}::" "${i}" || die "Sed failed"
+	done
+
+	dodoc Changes* README AUTHORS
+
+	if use doc ; then
+		# HTML Documentation
+		# We expect errors, warnings, and such with the following.
+
+		dodir /usr/share/doc/${PF}/html
+		LD_LIBRARY_PATH=. ./perl installhtml \
+			--podroot='.' \
+			--podpath='lib:ext:pod:vms' \
+			--recurse \
+			--htmldir="${ED}/usr/share/doc/${PF}/html"
+	fi
+
+	[[ -d ${ED}/usr/local ]] && rm -r "${ED}"/usr/local
+
+	dual_scripts
+}
+
+pkg_preinst() {
+	check_rebuild
+}
+
+pkg_postinst() {
+	dual_scripts
+
+	if [[ "${ROOT}" = "/" ]] ; then
+		local INC DIR file
+		INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${SHORT_PV}'|etc|local|perl$/; print "$line\n" }')
+		einfo "Removing old .ph files"
+		for DIR in ${INC} ; do
+			if [[ -d "${DIR}" ]] ; then
+				for file in $(find "${DIR}" -name "*.ph" -type f ) ; do
+					rm -f "${file}"
+					einfo "<< ${file}"
+				done
+			fi
+		done
+		# Silently remove the now empty dirs
+		for DIR in ${INC} ; do
+			if [[ -d "${DIR}" ]] ; then
+				find "${DIR}" -depth -type d -print0 | xargs -0 -r rmdir &> /dev/null
+			fi
+		done
+
+	fi
+}
+
+pkg_postrm() {
+	dual_scripts
+}
diff --git a/dev-lang/php/php-7.3.26.ebuild b/dev-lang/php/php-7.3.26.ebuild
index 61f3dba48c99..7fb97fec058c 100644
--- a/dev-lang/php/php-7.3.26.ebuild
+++ b/dev-lang/php/php-7.3.26.ebuild
@@ -19,7 +19,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
diff --git a/dev-lang/php/php-7.4.14.ebuild b/dev-lang/php/php-7.4.14.ebuild
index 1bf3fa44bce0..6fee9aef25d3 100644
--- a/dev-lang/php/php-7.4.14.ebuild
+++ b/dev-lang/php/php-7.4.14.ebuild
@@ -21,7 +21,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
diff --git a/dev-lang/python-exec-conf/Manifest b/dev-lang/python-exec-conf/Manifest
new file mode 100644
index 000000000000..706afff2be92
--- /dev/null
+++ b/dev-lang/python-exec-conf/Manifest
@@ -0,0 +1 @@
+DIST python-exec-2.4.6.tar.bz2 87634 BLAKE2B 7b6de8ad0e0603fafd3284e6e3c5247ad83f145ab4db6728914318ae8e6f5aaa3c0247f4e01238fca11519ef72fb1b11436aea7e2b8c988b8717b3f6a2a43c37 SHA512 e05eaf01b83de196a10933636ab6b1a5489a421592df49b8b58eabd0e732de970f902744cd3a06b5ab530a6d69fe6dfa8f270fbb09b9fe3df4ae04d516828050
diff --git a/dev-lang/python-exec-conf/metadata.xml b/dev-lang/python-exec-conf/metadata.xml
new file mode 100644
index 000000000000..901b8f151197
--- /dev/null
+++ b/dev-lang/python-exec-conf/metadata.xml
@@ -0,0 +1,9 @@
+<?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>
+		<name>Python</name>
+	</maintainer>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-lang/python-exec-conf/python-exec-conf-2.4.6.ebuild b/dev-lang/python-exec-conf/python-exec-conf-2.4.6.ebuild
new file mode 100644
index 000000000000..db918e82c65e
--- /dev/null
+++ b/dev-lang/python-exec-conf/python-exec-conf-2.4.6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit python-utils-r1
+
+MY_P=${P/-conf}
+DESCRIPTION="Configuration file for dev-lang/python-exec"
+HOMEPAGE="https://github.com/mgorny/python-exec/"
+SRC_URI="https://github.com/mgorny/python-exec/releases/download/v${PV}/${MY_P}.tar.bz2"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+# Internal Python project hack.  Do not copy it.  Ever.
+IUSE="${_PYTHON_ALL_IMPLS[@]/#/python_targets_}"
+
+RDEPEND="!<dev-lang/python-exec-2.4.6-r4"
+
+src_configure() {
+	:
+}
+
+src_install() {
+	local pyimpls=() i EPYTHON
+	for i in "${_PYTHON_ALL_IMPLS[@]}"; do
+		if use "python_targets_${i}"; then
+			_python_export "${i}" EPYTHON
+			pyimpls+=( "${EPYTHON}" )
+		fi
+	done
+
+	# Prepare and own the template
+	insinto /etc/python-exec
+	newins - python-exec.conf \
+		< <(sed -n -e '/^#/p' config/python-exec.conf.example &&
+			printf '%s\n' "${pyimpls[@]}" | tac)
+}
diff --git a/dev-lang/python-exec/python-exec-2.4.6-r4.ebuild b/dev-lang/python-exec/python-exec-2.4.6-r4.ebuild
new file mode 100644
index 000000000000..414d52b94501
--- /dev/null
+++ b/dev-lang/python-exec/python-exec-2.4.6-r4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit python-utils-r1
+
+DESCRIPTION="Python script wrapper"
+HOMEPAGE="https://github.com/mgorny/python-exec/"
+SRC_URI="https://github.com/mgorny/python-exec/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+# Internal Python project hack.  Do not copy it.  Ever.
+IUSE="${_PYTHON_ALL_IMPLS[@]/#/python_targets_} +native-symlinks"
+
+RDEPEND="
+	dev-lang/python-exec-conf
+	!<=dev-lang/python-2.7.18-r3:2.7"
+
+src_configure() {
+	local pyimpls=() i EPYTHON
+	for i in "${_PYTHON_ALL_IMPLS[@]}"; do
+		if use "python_targets_${i}"; then
+			_python_export "${i}" EPYTHON
+			pyimpls+=( "${EPYTHON}" )
+		fi
+	done
+
+	local myconf=(
+		--with-fallback-path="${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin"
+		--with-python-impls="${pyimpls[*]}"
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	if use native-symlinks; then
+		local programs=( python python3 )
+		local scripts=( python-config python3-config 2to3 idle pydoc pyvenv )
+
+		local f
+		for f in "${programs[@]}"; do
+			# symlink the C wrapper for python to avoid shebang recursion
+			# bug #568974
+			dosym python-exec2c /usr/bin/"${f}"
+		done
+		for f in "${scripts[@]}"; do
+			# those are python scripts (except for new python-configs)
+			# so symlink them via the python wrapper
+			dosym ../lib/python-exec/python-exec2 /usr/bin/"${f}"
+		done
+	fi
+}
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 7e22da81b459..45902c68973f 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -10,7 +10,7 @@ DIST Python-3.4.10.tar.xz 14559088 BLAKE2B ea1e333f04c286fe715c1ce97ade37c6a768e
 DIST Python-3.5.9.tar.xz 15388876 BLAKE2B 6086ed2350b6dce3203360f24c2fddf77df65a5815d6da019809796b30c2f43440a9e349c7defd0187cfc3a50a387352dfa63594c2ec513dd6bf585e7c34ec51 SHA512 58127793adef42ed57ae4d56338268866e14c2d084f09f57f26fc6b1c9454e70cc6d3dffc638f8d56f182acc0884021a4dbb578f312dd6fc01995fa85e31377e
 DIST Python-3.6.12.tar.xz 17202980 BLAKE2B c8d22e4d57bcaffe77cd902cda3a473e73adf2b74ab104c23b4d846f19632a24cc0c478af84079b16d784bd1c0956824c06c1f6134fd24f54e58aaab0fe96bb6 SHA512 1462801f3f6626a853097d34ccdca9838c4c5bd81ecc3abc751003f5f2f8d36eecdaa4130ef4218de351c5586093c11669639a34492668fbc5a2a4a241f4a070
 DIST Python-3.7.9.tar.xz 17389636 BLAKE2B 484833aa2aa4e29051a02969294f72099ff6f1a47d944b1a0dd15f8e6c22a0406d551bcbcd1048cf89defedaccf060733211e34b38e31fd8391dd823eaa35bc0 SHA512 e4217b25529b5336e43b63d17f3758a8177a58184564cf02bd92a312f58dba9e096485c9e3cb3544f966e847ea15b3ab30ed065d28a6ca52a6d7e0faddf7d9f9
-DIST Python-3.8.6.tar.xz 18233864 BLAKE2B c8a8ef6055e344dda30eb808804cfa62016b4f840257cffd5a495e5932f5696e50579d49b8181a487c9cd4a89bdb95656e80981039783a21d20f7980aa2c9883 SHA512 22faec84f6e172e1ac7c6bd6fd37e9b6ae4afc91cf5136aa8cac8ebbed8d18793f9196e8749b8ccc43447cb6c41cb450f65ea72dd363c06dfaeb14e0455f5560
+DIST Python-3.8.7.tar.xz 18261096 BLAKE2B 6ac20efef41e828cb796aabcb7808400d494b9b48759950c8c15ee90762394f6763163d8e37ab407c1c79ebb9cda09189eaa969a75f96c86a96ccee962443924 SHA512 6a27d8eab3076930df46b0cf127f9b664f8d4147349b2b98132f464deb7f69d87e0167e8ee8e6c64249125ad73760d965ecbc81c252b63a1e7aac95594c62b74
 DIST Python-3.9.1.tar.xz 18897104 BLAKE2B bcbce176510e8e7c6ba6070588bedc52121c21c5271f59b3d629dfb542c51ee62622b2ca53a6e2041f1a51b2d089368cc4de9bb749e8ebad9a2c4eb4de83538e SHA512 b90029d6825751685983e9dcf0e0ec9e46f18e6c7d37b0dd7a245a94316f8c0090308ad7c2b2b49ed2514b0b909177231dd5bcad03031bf4624e37136fcf8019
 DIST python-gentoo-patches-2.7.18-r4.tar.xz 21352 BLAKE2B d322f5afd63813d7c9280c75f942bde75ee19793e121d0406c4f229ead53324bf3996342eed9a6c1aa474894afe7f2dd70aec38aee8042993a5274abc288fd31 SHA512 1cb0be8e79d0c6c55fcbe3f3dabf8b760aea0e60d888ea39d3e69de03b55738c50b2cca06586c1cd2896956f5764eefd6d3f9fbf2de0d0ddfd8aab86837976b6
 DIST python-gentoo-patches-3.10.0a1.tar.xz 8592 BLAKE2B 066fe89725469649a88a0b0c9f62d7d1380feb704ed12c696871cd595e4e920f23b54a2c771e15b5d2345dcdab21694365ef9b29e93f552f74d13642ebc59200 SHA512 e86df9e08ec7306f6457b5e3490171966022964fb700046587088bceb3d8977a45fe7e944f7dd39ad473000654f69f495b8c67edebb13bc12000b32716845533
@@ -18,14 +18,14 @@ DIST python-gentoo-patches-3.4.10.tar.xz 21340 BLAKE2B c2ca41fc4bc81ae6be9426d77
 DIST python-gentoo-patches-3.5.9.tar.xz 13548 BLAKE2B 9afe277c1c7c42aee21b4279cea5539d31b4a7088fd124bedb9af34299252ef2ab275e602adb5dfbb6944d06b375161924b05fc690f7d0d78860ed3e5f89599c SHA512 def5435a315e58d3794d8bce8fb04105a36ff37bd90a437cf7588a0c0ec8d420af5b68009ab153823286e71e52056e12a0eba4dc4d958eeb8d6b914b24f0de81
 DIST python-gentoo-patches-3.6.12-r1.tar.xz 16540 BLAKE2B 8204b6f25e1f7c6fef024933d54bfa6085158ac624a6e5a8d51576da2047b6db791be5d071c483fdec5c033b8fa8ee3d4e176a3e442defa556b34a304de3b7f3 SHA512 ad74c73b4f963427e66ac6187e1569dbfbbe3c916c24971a1eba4ad7e2f94e39c970f80e197c0498820451f036b12f3076b46cfd73bb5d6d56183ac05453d9ad
 DIST python-gentoo-patches-3.7.9-r1.tar.xz 15664 BLAKE2B 271b95a52f4ba83c1aee6f68385462c9af8f2ab575267ac068a793e99f7c9739eb4b98dfa7e9280510a709557d418db04f26b5b31bbfe95dfdc13c1773510d2d SHA512 38df628de2f2835f975f6f06395d32cd63051af87b9bf8b06eef2f987bde26a883923bcab333568c122554b900bb17995a8c7290b6a58f942bd942dcbc70d030
-DIST python-gentoo-patches-3.8.6-r1.tar.xz 15880 BLAKE2B 9a08cd23af56bcc2ed0dffe4850698be6e0bcf7c44d3eafeb250e328a93833dc3e9ce084f1be89450d1e123cd72d81c6271edfe34046d1bab3d7c10a98d0d9c5 SHA512 83474915cab0928d1d2f4229832bef7c093b2943770fa900a7445bfaa633544f50791aa8b4bc4191662af56feef166814d98eb6fad2c0a0eb9db1f8f4806e689
+DIST python-gentoo-patches-3.8.6.tar.xz 10956 BLAKE2B e3241d97f886d0a37f85735102db8f00902df59ee12e8501b6c7f549dd4b26a6289bf34ff8dba02b369ed7875fad3d18e177afe9e367db4cb06f2ee908482f9e SHA512 7afa8e54f7b7e6ab35edc16d4214384b8ad8a03068d1984656876d6477b278af931e8c797d03d1bed2f10f9d58ac387db1a43921e54fb17cf4b779f33820abc0
 DIST python-gentoo-patches-3.9.0rc1.tar.xz 8856 BLAKE2B 7bd032dfd047640c6a53633b5b9ee7b24199106b985230f772dda978d3b79fe0406eea64c4a842603a20afb71a90469befa7ec59a5ef1f793e4c901aa85952d1 SHA512 85a7d4397abf2a0f3c3d07a94a3e184ba3dcb347f3b70ee2cb77e81aac63846b01323a0228afd0fd1d32b3cafb64b18f82e6f5bfd88e4d564261ddae11e747eb
-EBUILD python-2.7.18-r5.ebuild 11466 BLAKE2B fae03489b77c380e5103a9a0a29aa062612c91cbc65f04f792fa8c5689328c1c4185aeacc395b19e1c761c1c47487aeb0989213d2545cfe61854c9c3e77ba856 SHA512 5bf65d75667736cbbecef870d50d4befdd46911b99c2026703a57deb5a9415a31c7a30fad29b88a017d9ab277f242fe4bd196941025f2163bf2d4b4e5b65a1b2
-EBUILD python-3.10.0_alpha3.ebuild 10812 BLAKE2B 84cac49e8d9a51d6ee5dba4880ae9ccd861be155b0735823c8027e043a6d7cb82a6b757ccf77b9be637227953104d2a71008c35fb5d42fff156b10491ea4b2ec SHA512 ad53d2d48869c5932fae532fa94e6539cd779364978254d8cd34847d43f8f9ffe194222821a23a72b8c8260ed23a85a1ecc9207eaf1b46e8a4517a36c534e17c
-EBUILD python-3.4.10-r1.ebuild 11680 BLAKE2B 6b64a015cbc21de1f42667987b85e2befd0d4a12ad10b172da2fc58a18a77796f3624d7fe8a9c392ed721cbd9d2494ad4c4ae4ddb9141fea5824e861bf2c338d SHA512 a4d5afc3f49eb78d9132e0c4d48618f1e88bb402ef2cd688c4fa718ec14b7ff5a8299f82140463559fe9c8c9cc8cc76882c6ae62b4a721c9aaed597a18afe6a1
-EBUILD python-3.5.9-r1.ebuild 12232 BLAKE2B 90f97470859131ca50bf92420fc46fcef49541537a6d5e42aaa9cb15518bc6a6151531fa4dd7b00e49361a5f9e4f63b352813aba2b2f3358180d5252c1662f4a SHA512 c6afb2e4f9dac20240d41651c2359b5d01f125f7ef10d99f74f9c3166be56cdccdd11416e760202f0026eeab053cd1ec81b5603cc4d48b82dfe48be0fcd6a67e
-EBUILD python-3.6.12-r1.ebuild 11872 BLAKE2B a21bed9a29aa727d780c87f5d8a4eeb4b349731b6c5856ab777ed11d4e645cf2c3599e65a7aa6d5f88152dbf2c425f17ee7f3d9c897b9fc17e639831caf83acf SHA512 7cd5c6c2fdea1182de1019a669ac022c8983182bb4b8b9ca9d985fcd5e2e4782f3f09a44dc085b603ffdc28cff4316e416e75091dbafde50d8834046731825c0
-EBUILD python-3.7.9-r1.ebuild 11700 BLAKE2B 27708e4faa615660e2d51cb131da32370c43ac3b30cc4b1202def54c9a350a911285a0adf2e584989cbb2ceddaf472bf504c997e1ec4e90f9cb3d68cf2e55385 SHA512 63376ff73a4db5653e807043185888fa049a02d050b716f01faee500e684813ee38a3ee5ed373c59c9136ecfd3d921ad0cd17279ca10b72c4290f3c83d69d37c
-EBUILD python-3.8.6-r1.ebuild 11662 BLAKE2B a9bdaaa94bb83d5f427c3826475f0039a9d90f1a4627be400bd874621fd4f4255ee25c78bbf65214f0bb2074fb118199c535d60d4c6f321ace8700bfb6db3a29 SHA512 a48432ac301a4ca7280b0a12fcb9083dad13e5c243883c0e482ff060326599cd7e53edb727773062cdfd814b778d9e174153d7abe8b97702a1116921d11b0924
-EBUILD python-3.9.1.ebuild 10806 BLAKE2B b9c29802773427faf0bfb8ded2a1e82912e84cea1ab4e83d83ac28001c38a9e99af009d4ab754f303e62f41f88fea706dfb7235e7e1831f1422b9fb4b5db8d74 SHA512 2d8a15ffd8dcb2add12b01b915cd4752d5b314114b8ed7e7dc687fe9397031f19957c37f0e3fc6d7bcd4f51f5e99561aeb1d10c4e4427a6733b9aa783191a10d
+EBUILD python-2.7.18_p4.ebuild 11018 BLAKE2B 0ed1e2e881321ec826a713a2e87c6782867fe9c9b92cbb818ec3185e21d545c5111c49f707c0c6382d08c5327eb00aa1b49ece21aa44f02d5421d833559234c6 SHA512 bd97e9493c8c796f65d36442ec72ca0eb0114657221a68d251796b5ff3d1930273294f6edec8d49b0cb944b0160595604a9d088bdeef115c604913755b9fb624
+EBUILD python-3.10.0_alpha3.ebuild 10841 BLAKE2B 9dd919ce58a8a4e280249ba64ac343f12216975fae7716bf3d5dcc1e7157bb7fb9a3f1686bc82eff0c0c1130af480cb426d1af46e3e7332d88e2a509e1700bc9 SHA512 35cf3067272e109afd30dbc12911cf0878eacb0622a97f49cc4eb17b0662fc6dbf2a2ee1582f7a5de7ce1bdc8195e0154251e406c54286e32e9fcc7c59f1672f
+EBUILD python-3.4.10_p1.ebuild 10783 BLAKE2B 219b73472df237e95ae0b62d3a35db2386ab6629dc068a69bc1e669ffec2c096952885036bc2903dbfbd28bd3ec1aff340ad187c734939f2bba4b5dbc9085182 SHA512 f934ab68cc6ebfa785b3c6b8cd69b7246d499510242a5e29d82b5daefcd5279f65958f61117f00b8800894790dc508aec08f8379969cd79c328e2ab629c87f63
+EBUILD python-3.5.9_p1.ebuild 11335 BLAKE2B 9ed29b0c10bb0676efae3f1df0aa5fe3eb7faf7f1f1b87c3daf7a876c69fb908f4a7ebcb34dfa191eb96538843506531260cafbfbf76bc96e4eb5130e1a136a7 SHA512 625e1691dd685b13f34669ca3fcce8521e6c2f32370820de44f679a890103fa83c9a791f8b95165eb324ee8789bfeb1cd26f4e5e5de41be0115884a20bc4ea66
+EBUILD python-3.6.12_p1.ebuild 10979 BLAKE2B 8984df39bca7be9a3c232cd591a4a5e94b5087a235455a1c781c3521e4e1c4692cd214acfa408af91b1cb9b60dedad3863e10acca2c48a71738e939cd58f1549 SHA512 821325a993bb23eb7f8fd9ffb2164585cbfae8a5ce5ede024f8f15040f042cf6b6b68b9d5d90226d20c77b2f39756b6d987bb1690b29dd981c8382f88e2d892f
+EBUILD python-3.7.9_p1.ebuild 10807 BLAKE2B 29a3520bdcac1a3f1fdfeb378a6b478ce2ce323330ef0c9aa2c2638e0a8d62be64ee0b319d1aceba733a3213f36c423a64845e97a5476b48f3f3f99334ebbcfe SHA512 1f09f3d9ed75ea7c260fbd077df4448ac26338e63df48cc8153afb98e7e55da69fd811b567d2bcf4898f94133296a70db8430fc440ebda8eb443aeadb6088a11
+EBUILD python-3.8.7_p1.ebuild 10763 BLAKE2B 52d0d69fddba9ff3435e5826e3c12ca2601238b47f27ec0b88bca75c44f16cfb2cf2a2c72665a6140d725d7731a238e17c28786ad96a6873080a284efe11af77 SHA512 3cc3661cd97ff6a3b985462ce21a76699446074ca3dbd7822d0c95cb07f34c5466b1475f3d17c1468dee0ca26bdeb577304462d21c8e911656dbc0846dbf7868
+EBUILD python-3.9.1_p1.ebuild 10774 BLAKE2B 37bc2c78e92e9577298513a6a703c962862e8fcce9c28c2c53419f89012ec7a61d79bb3dbe20f1401b07ede2c5a7f1a608ef0f05fee8dca18c1f05a727750669 SHA512 f99a88bd1ebb3ef461ce3a520ec9fe162b21a52f267946e48a475f053f3d247f78aef7a2430bd4a2993fdc5f28d1e79068f0e85d0b080d4e055b1e842240c362
 MISC metadata.xml 819 BLAKE2B 120c7c65d77488e726c5a0f4aa19469867ea6900e747169fae2f9cf8f14ec2936089d5edfe1935ce610bec26387273e261b1cc4b023680c8c4b229f2141a7223 SHA512 08f45707e5490067a21951b9d37c8ae67064ab67cccc5b8d8c204eab8d4a004fb910627b62989c67b849b89d301618f8f8f7996e99e1ef5bab38a239c49c124d
diff --git a/dev-lang/python/python-2.7.18-r5.ebuild b/dev-lang/python/python-2.7.18_p4.ebuild
index 82d8b6ea8887..57fead8d19e6 100644
--- a/dev-lang/python/python-2.7.18-r5.ebuild
+++ b/dev-lang/python/python-2.7.18_p4.ebuild
@@ -6,13 +6,14 @@ WANT_LIBTOOL="none"
 
 inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs
 
-MY_P="Python-${PV}"
+MY_P="Python-${PV%%_*}"
+MY_PV="${PV%%_*}"
 PYVER=$(ver_cut 1-2)
 PATCHSET="python-gentoo-patches-2.7.18-r4"
 
 DESCRIPTION="An interpreted, interactive, object-oriented programming language"
 HOMEPAGE="https://www.python.org/"
-SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
+SRC_URI="https://www.python.org/ftp/python/${MY_PV}/${MY_P}.tar.xz
 	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
 S="${WORKDIR}/${MY_P}"
 
@@ -65,7 +66,6 @@ DEPEND="${RDEPEND}
 RDEPEND+="
         !build? ( app-misc/mime-types )
         !<=dev-lang/python-exec-2.4.6-r1"
-PDEPEND=">=app-eselect/eselect-python-20140125-r1"
 
 pkg_setup() {
 	if use berkdb; then
@@ -375,24 +375,3 @@ src_install() {
 	dosym "python${PYVER}" "/usr/bin/python${pymajor}"
 	dosym "python${PYVER}-config" "/usr/bin/python${pymajor}-config"
 }
-
-eselect_python_update() {
-	if [[ -z "$(eselect python show)" || \
-			! -f "${EROOT}/usr/bin/$(eselect python show)" ]]; then
-		eselect python update
-	fi
-
-	if [[ -z "$(eselect python show --python${PV%%.*})" || \
-			! -f "${EROOT}/usr/bin/$(eselect python show --python${PV%%.*})" ]]
-	then
-		eselect python update --python${PV%%.*}
-	fi
-}
-
-pkg_postinst() {
-	eselect_python_update
-}
-
-pkg_postrm() {
-	eselect_python_update
-}
diff --git a/dev-lang/python/python-3.10.0_alpha3.ebuild b/dev-lang/python/python-3.10.0_alpha3.ebuild
index 46f61abe61de..82078ac1d1c7 100644
--- a/dev-lang/python/python-3.10.0_alpha3.ebuild
+++ b/dev-lang/python/python-3.10.0_alpha3.ebuild
@@ -52,11 +52,13 @@ RDEPEND="app-arch/bzip2:=
 # bluetooth requires headers from bluez
 DEPEND="${RDEPEND}
 	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils[extra-filters(+)] )
+	test? ( app-arch/xz-utils[extra-filters(+)] )"
+# autoconf-archive needed to eautoreconf
+BDEPEND="
+	sys-devel/autoconf-archive
 	virtual/pkgconfig
 	!sys-devel/gcc[libffi(-)]"
 RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND=">=app-eselect/eselect-python-20140125-r1"
 
 # large file tests involve a 2.5G file being copied (duplicated)
 CHECKREQS_DISK_BUILD=5500M
diff --git a/dev-lang/python/python-3.4.10-r1.ebuild b/dev-lang/python/python-3.4.10_p1.ebuild
index 9ed156945b8d..6575d45906ba 100644
--- a/dev-lang/python/python-3.4.10-r1.ebuild
+++ b/dev-lang/python/python-3.4.10_p1.ebuild
@@ -6,13 +6,14 @@ WANT_LIBTOOL="none"
 
 inherit autotools flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs
 
-MY_P="Python-${PV}"
+MY_P="Python-${PV%%_*}"
+MY_PV="${PV%%_*}"
 PYVER=$(ver_cut 1-2)
 PATCHSET="python-gentoo-patches-3.4.10"
 
 DESCRIPTION="An interpreted, interactive, object-oriented programming language"
 HOMEPAGE="https://www.python.org/"
-SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
+SRC_URI="https://www.python.org/ftp/python/${MY_PV}/${MY_P}.tar.xz
 	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
 S="${WORKDIR}/${MY_P}"
 
@@ -55,7 +56,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	!sys-devel/gcc[libffi(-)]"
 RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND=">=app-eselect/eselect-python-20140125-r1"
 
 src_prepare() {
 	# Ensure that internal copies of expat, libffi and zlib are not used.
@@ -356,37 +356,3 @@ src_install() {
 			"${D}${PYTHON_SCRIPTDIR}/idle" || die
 	fi
 }
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then
-		python_updater_warning="1"
-	fi
-}
-
-eselect_python_update() {
-	if [[ -z "$(eselect python show)" || \
-			! -f "${EROOT}/usr/bin/$(eselect python show)" ]]; then
-		eselect python update
-	fi
-
-	if [[ -z "$(eselect python show --python${PV%%.*})" || \
-			! -f "${EROOT}/usr/bin/$(eselect python show --python${PV%%.*})" ]]
-	then
-		eselect python update --python${PV%%.*}
-	fi
-}
-
-pkg_postinst() {
-	eselect_python_update
-
-	if [[ "${python_updater_warning}" == "1" ]]; then
-		ewarn "You have just upgraded from an older version of Python."
-		ewarn
-		ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
-	fi
-}
-
-pkg_postrm() {
-	eselect_python_update
-}
-
diff --git a/dev-lang/python/python-3.5.9-r1.ebuild b/dev-lang/python/python-3.5.9_p1.ebuild
index 9a327be76f8d..f6d3c6066271 100644
--- a/dev-lang/python/python-3.5.9-r1.ebuild
+++ b/dev-lang/python/python-3.5.9_p1.ebuild
@@ -6,13 +6,14 @@ WANT_LIBTOOL="none"
 
 inherit autotools flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs
 
-MY_P="Python-${PV}"
+MY_P="Python-${PV%%_*}"
+MY_PV="${PV%%_*}"
 PYVER=$(ver_cut 1-2)
 PATCHSET="python-gentoo-patches-3.5.9"
 
 DESCRIPTION="An interpreted, interactive, object-oriented programming language"
 HOMEPAGE="https://www.python.org/"
-SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
+SRC_URI="https://www.python.org/ftp/python/${MY_PV}/${MY_P}.tar.xz
 	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
 S="${WORKDIR}/${MY_P}"
 
@@ -55,7 +56,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	!sys-devel/gcc[libffi(-)]"
 RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND=">=app-eselect/eselect-python-20140125-r1"
 
 src_prepare() {
 	# Ensure that internal copies of expat, libffi and zlib are not used.
@@ -370,37 +370,3 @@ src_install() {
 			"${D}${PYTHON_SCRIPTDIR}/idle" || die
 	fi
 }
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then
-		python_updater_warning="1"
-	fi
-}
-
-eselect_python_update() {
-	if [[ -z "$(eselect python show)" || \
-			! -f "${EROOT}/usr/bin/$(eselect python show)" ]]; then
-		eselect python update
-	fi
-
-	if [[ -z "$(eselect python show --python${PV%%.*})" || \
-			! -f "${EROOT}/usr/bin/$(eselect python show --python${PV%%.*})" ]]
-	then
-		eselect python update --python${PV%%.*}
-	fi
-}
-
-pkg_postinst() {
-	eselect_python_update
-
-	if [[ "${python_updater_warning}" == "1" ]]; then
-		ewarn "You have just upgraded from an older version of Python."
-		ewarn
-		ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
-	fi
-}
-
-pkg_postrm() {
-	eselect_python_update
-}
-
diff --git a/dev-lang/python/python-3.6.12-r1.ebuild b/dev-lang/python/python-3.6.12_p1.ebuild
index 2b780d5736ec..9ed03c597272 100644
--- a/dev-lang/python/python-3.6.12-r1.ebuild
+++ b/dev-lang/python/python-3.6.12_p1.ebuild
@@ -6,13 +6,14 @@ WANT_LIBTOOL="none"
 
 inherit autotools flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs
 
-MY_P="Python-${PV}"
+MY_P="Python-${PV%%_*}"
+MY_PV="${PV%%_*}"
 PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${PV}-r1"
+PATCHSET="python-gentoo-patches-${MY_PV}-r1"
 
 DESCRIPTION="An interpreted, interactive, object-oriented programming language"
 HOMEPAGE="https://www.python.org/"
-SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
+SRC_URI="https://www.python.org/ftp/python/${MY_PV}/${MY_P}.tar.xz
 	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
 S="${WORKDIR}/${MY_P}"
 
@@ -55,7 +56,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	!sys-devel/gcc[libffi(-)]"
 RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND=">=app-eselect/eselect-python-20140125-r1"
 
 src_prepare() {
 	# Ensure that internal copies of expat, libffi and zlib are not used.
@@ -364,36 +364,3 @@ src_install() {
 			"${scriptdir}/idle" || die
 	fi
 }
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then
-		python_updater_warning="1"
-	fi
-}
-
-eselect_python_update() {
-	if [[ -z "$(eselect python show)" || \
-			! -f "${EROOT}/usr/bin/$(eselect python show)" ]]; then
-		eselect python update
-	fi
-
-	if [[ -z "$(eselect python show --python${PV%%.*})" || \
-			! -f "${EROOT}/usr/bin/$(eselect python show --python${PV%%.*})" ]]
-	then
-		eselect python update --python${PV%%.*}
-	fi
-}
-
-pkg_postinst() {
-	eselect_python_update
-
-	if [[ "${python_updater_warning}" == "1" ]]; then
-		ewarn "You have just upgraded from an older version of Python."
-		ewarn
-		ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
-	fi
-}
-
-pkg_postrm() {
-	eselect_python_update
-}
diff --git a/dev-lang/python/python-3.7.9-r1.ebuild b/dev-lang/python/python-3.7.9_p1.ebuild
index 3824484bd512..ea134dfda9b8 100644
--- a/dev-lang/python/python-3.7.9-r1.ebuild
+++ b/dev-lang/python/python-3.7.9_p1.ebuild
@@ -6,13 +6,14 @@ WANT_LIBTOOL="none"
 
 inherit autotools flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs
 
-MY_P="Python-${PV}"
+MY_P="Python-${PV%%_*}"
+MY_PV="${PV%%_*}"
 PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${PV}-r1"
+PATCHSET="python-gentoo-patches-${MY_PV}-r1"
 
 DESCRIPTION="An interpreted, interactive, object-oriented programming language"
 HOMEPAGE="https://www.python.org/"
-SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
+SRC_URI="https://www.python.org/ftp/python/${MY_PV}/${MY_P}.tar.xz
 	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
 S="${WORKDIR}/${MY_P}"
 
@@ -56,7 +57,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	!sys-devel/gcc[libffi(-)]"
 RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND=">=app-eselect/eselect-python-20140125-r1"
 
 src_prepare() {
 	# Ensure that internal copies of expat, libffi and zlib are not used.
@@ -356,36 +356,3 @@ src_install() {
 			"${scriptdir}/idle" || die
 	fi
 }
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then
-		python_updater_warning="1"
-	fi
-}
-
-eselect_python_update() {
-	if [[ -z "$(eselect python show)" || \
-			! -f "${EROOT}/usr/bin/$(eselect python show)" ]]; then
-		eselect python update
-	fi
-
-	if [[ -z "$(eselect python show --python${PV%%.*})" || \
-			! -f "${EROOT}/usr/bin/$(eselect python show --python${PV%%.*})" ]]
-	then
-		eselect python update --python${PV%%.*}
-	fi
-}
-
-pkg_postinst() {
-	eselect_python_update
-
-	if [[ "${python_updater_warning}" == "1" ]]; then
-		ewarn "You have just upgraded from an older version of Python."
-		ewarn
-		ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
-	fi
-}
-
-pkg_postrm() {
-	eselect_python_update
-}
diff --git a/dev-lang/python/python-3.8.6-r1.ebuild b/dev-lang/python/python-3.8.7_p1.ebuild
index 37a182d60deb..d26e0833c823 100644
--- a/dev-lang/python/python-3.8.6-r1.ebuild
+++ b/dev-lang/python/python-3.8.7_p1.ebuild
@@ -6,13 +6,14 @@ WANT_LIBTOOL="none"
 
 inherit autotools flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs
 
-MY_P="Python-${PV}"
+MY_P="Python-${PV%%_*}"
+MY_PV="${PV%%_*}"
 PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${PV}-r1"
+PATCHSET="python-gentoo-patches-3.8.6"
 
 DESCRIPTION="An interpreted, interactive, object-oriented programming language"
 HOMEPAGE="https://www.python.org/"
-SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
+SRC_URI="https://www.python.org/ftp/python/${MY_PV}/${MY_P}.tar.xz
 	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
 S="${WORKDIR}/${MY_P}"
 
@@ -56,7 +57,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	!sys-devel/gcc[libffi(-)]"
 RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND=">=app-eselect/eselect-python-20140125-r1"
 
 src_prepare() {
 	# Ensure that internal copies of expat, libffi and zlib are not used.
@@ -354,36 +354,3 @@ src_install() {
 			"${scriptdir}/idle" || die
 	fi
 }
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then
-		python_updater_warning="1"
-	fi
-}
-
-eselect_python_update() {
-	if [[ -z "$(eselect python show)" || \
-			! -f "${EROOT}/usr/bin/$(eselect python show)" ]]; then
-		eselect python update
-	fi
-
-	if [[ -z "$(eselect python show --python${PV%%.*})" || \
-			! -f "${EROOT}/usr/bin/$(eselect python show --python${PV%%.*})" ]]
-	then
-		eselect python update --python${PV%%.*}
-	fi
-}
-
-pkg_postinst() {
-	eselect_python_update
-
-	if [[ "${python_updater_warning}" == "1" ]]; then
-		ewarn "You have just upgraded from an older version of Python."
-		ewarn
-		ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
-	fi
-}
-
-pkg_postrm() {
-	eselect_python_update
-}
diff --git a/dev-lang/python/python-3.9.1.ebuild b/dev-lang/python/python-3.9.1_p1.ebuild
index 5ee8493c3162..d994de3137ba 100644
--- a/dev-lang/python/python-3.9.1.ebuild
+++ b/dev-lang/python/python-3.9.1_p1.ebuild
@@ -6,13 +6,14 @@ WANT_LIBTOOL="none"
 
 inherit autotools check-reqs flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs
 
-MY_P="Python-${PV/_/}"
+MY_P="Python-${PV%%_*}"
+MY_PV="${PV%%_*}"
 PYVER=$(ver_cut 1-2)
 PATCHSET="python-gentoo-patches-3.9.0rc1"
 
 DESCRIPTION="An interpreted, interactive, object-oriented programming language"
 HOMEPAGE="https://www.python.org/"
-SRC_URI="https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz
+SRC_URI="https://www.python.org/ftp/python/${MY_PV}/${MY_P}.tar.xz
 	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
 S="${WORKDIR}/${MY_P}"
 
@@ -56,7 +57,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	!sys-devel/gcc[libffi(-)]"
 RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND=">=app-eselect/eselect-python-20140125-r1"
 
 # large file tests involve a 2.5G file being copied (duplicated)
 CHECKREQS_DISK_BUILD=5500M
diff --git a/dev-lang/qu-prolog/Manifest b/dev-lang/qu-prolog/Manifest
index d597ed1cbce5..6c18791ba650 100644
--- a/dev-lang/qu-prolog/Manifest
+++ b/dev-lang/qu-prolog/Manifest
@@ -1,3 +1 @@
-DIST qp10.4.tar.gz 1671144 BLAKE2B 293cbc09a058714f762e5d371074ca1b87e8177868851a3db2606a837810b474e926c43f6715c5088c718f2b1841c46f9668795ac53edc0266a9a6d5d04386f5 SHA512 39193ba2c39dc24b234092a47f9834af5b8dff6edc34ba6e0ceb6a4bda60c2f30b951bc17ef72da1dd220ef62563c88f4106dd0115a5bf8e51045abfb96151c6
-DIST qp10.5.tar.gz 1670927 BLAKE2B 74fd47beb18f7081ade39bf215a999066a2a5e99753ee8e48751c37d7bff111d355a7713f13af43a1cffc2fa6ca5efdf89a633fba45accdef17ee265f068e57a SHA512 6a7d46f09015304ffa222c82be5d9fb28c272ce27641455113740f3a4a08887369208456c478320b30d9464d8eeea0f7fcc1c1e56e1a130134e2fe54d5446958
 DIST qp10.6.tar.gz 1671349 BLAKE2B 189ddd733a0bbf939387de60ec76e8e41a430af5f4684a9a3b8cc3effa4e402cfd4471c955f4d626d2de8cf14eb93c2977540ad209d06ce9b562325a4b984fea SHA512 425b35c758ba86cc14a1faf5c19f2c091142be6c42261323dc6f551efd6c80f7223584cd2be239748539eaf25308f777d95fd5bfdc65b33ca3245377e1766299
diff --git a/dev-lang/qu-prolog/files/qu-prolog-10.5-gcc-version.patch b/dev-lang/qu-prolog/files/qu-prolog-10.5-gcc-version.patch
deleted file mode 100644
index cfc7cbfd4c14..000000000000
--- a/dev-lang/qu-prolog/files/qu-prolog-10.5-gcc-version.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- qp10.5.orig/configure.in	2019-12-29 00:57:44.000000000 +0100
-+++ qp10.5/configure.in	2020-06-25 08:53:32.610430095 +0200
-@@ -209,22 +209,6 @@
- 		uname \
- 		)
- 
--#----------------------------------------------------------------------------
--dnl Check for CPP version
--AC_MSG_CHECKING([for GCC version])
--qp_cpp_ver=[`gcc --version 2>/dev/null | head -1 | sed -e 's/^[^[:digit:]]*\([[:digit:]][^[:space:]]*\).*$/\1/'`]
--if test -n "$qp_cpp_ver"; then
--    AC_MSG_RESULT($qp_cpp_ver)
--    case "$qp_cpp_ver" in
--      2.*)
--        AC_DEFINE(GCC_VERSION_2, 1, [Whether or not the GCC is gcc 2])
--        ;;
--    esac
--else
--    AC_MSG_RESULT(not found)
--    AC_MSG_ERROR(Could not determine GCC version)
--fi
--
- #-----------------------------------------------------------------------------
- dnl Check for -fno-strict-aliasing
- AC_MSG_CHECKING([for -fno-strict-aliasing])
diff --git a/dev-lang/qu-prolog/qu-prolog-10.4.ebuild b/dev-lang/qu-prolog/qu-prolog-10.4.ebuild
deleted file mode 100644
index a841c2e7db18..000000000000
--- a/dev-lang/qu-prolog/qu-prolog-10.4.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils multilib qmake-utils
-
-MY_P=qp${PV}
-
-DESCRIPTION="Extended Prolog supporting quantifiers, object-variables and substitutions"
-HOMEPAGE="https://www.itee.uq.edu.au/~pjr/HomePages/QuPrologHome.html"
-SRC_URI="http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug doc examples pedro qt5 readline threads"
-
-RDEPEND="
-	!dev-util/mpatch
-	!dev-util/rej
-	qt5? (
-		dev-qt/qtwidgets:5
-		dev-qt/qtgui:5
-	 )
-	pedro? ( net-misc/pedro )
-	readline? ( app-misc/rlwrap )"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-10.x-qt5.patch
-	eapply_user
-}
-
-src_configure() {
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		$(use_enable debug) \
-		$(use_enable threads multiple-threads)
-
-	if use qt5; then
-		cd "${S}"/src/xqp || die
-		eqmake5 xqp.pro
-	fi
-}
-
-src_compile() {
-	emake OPTIMISATION="${CXXFLAGS}"
-
-	if use qt5; then
-		cd "${S}"/src/xqp || die
-		emake
-	fi
-}
-
-src_install() {
-	sed \
-		-e "s|${S}|/usr/$(get_libdir)/qu-prolog|g" \
-		-i bin/qc bin/qc1.qup bin/qecat bin/qg bin/qp || die
-
-	dobin bin/{qc,qecat,qp,kq}
-
-	use qt5 && dobin src/xqp/xqp
-
-	into /usr/$(get_libdir)/${PN}
-	dobin bin/{qa,qc1.qup,qdeal,qem,qg,ql,qppp}
-
-	insinto /usr/$(get_libdir)/${PN}/bin
-	doins bin/rl_commands
-	doins bin/{qc1.qup,qecat,qg,qp}.qx
-
-	insinto /usr/$(get_libdir)/${PN}/library
-	doins prolog/library/*.qo
-
-	insinto /usr/$(get_libdir)/${PN}/compiler
-	doins prolog/compiler/*.qo
-
-	doman doc/man/man1/*.1
-
-	dodoc README
-
-	if use doc ; then
-		docinto reference-manual
-		dodoc doc/manual/*.html
-		docinto user-guide
-		dodoc doc/user/main.pdf
-	fi
-
-	if use examples ; then
-		docinto examples
-		newdoc examples/README README.examples
-		dodoc examples/*.ql
-	fi
-}
diff --git a/dev-lang/qu-prolog/qu-prolog-10.5.ebuild b/dev-lang/qu-prolog/qu-prolog-10.5.ebuild
deleted file mode 100644
index 09c3b2858ea2..000000000000
--- a/dev-lang/qu-prolog/qu-prolog-10.5.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools eutils multilib qmake-utils
-
-MY_P=qp${PV}
-
-DESCRIPTION="Extended Prolog supporting quantifiers, object-variables and substitutions"
-HOMEPAGE="https://www.itee.uq.edu.au/~pjr/HomePages/QuPrologHome.html"
-SRC_URI="http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug doc examples pedro qt5 readline threads"
-
-RDEPEND="
-	!dev-util/mpatch
-	!dev-util/rej
-	qt5? (
-		dev-qt/qtwidgets:5
-		dev-qt/qtgui:5
-	 )
-	pedro? ( net-misc/pedro )
-	readline? ( app-misc/rlwrap )"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-10.x-qt5.patch
-	eapply "${FILESDIR}"/${PN}-10.5-gcc-version.patch
-	eapply_user
-
-	eautoconf
-}
-
-src_configure() {
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		$(use_enable debug) \
-		$(use_enable threads multiple-threads)
-
-	if use qt5; then
-		cd "${S}"/src/xqp || die
-		eqmake5 xqp.pro
-	fi
-}
-
-src_compile() {
-	emake OPTIMISATION="${CXXFLAGS}"
-
-	if use qt5; then
-		cd "${S}"/src/xqp || die
-		emake
-	fi
-}
-
-src_install() {
-	sed \
-		-e "s|${S}|/usr/$(get_libdir)/qu-prolog|g" \
-		-i bin/qc bin/qc1.qup bin/qecat bin/qg bin/qp || die
-
-	dobin bin/{qc,qecat,qp,kq}
-
-	use qt5 && dobin src/xqp/xqp
-
-	into /usr/$(get_libdir)/${PN}
-	dobin bin/{qa,qc1.qup,qdeal,qem,qg,ql,qppp}
-
-	insinto /usr/$(get_libdir)/${PN}/bin
-	doins bin/rl_commands
-	doins bin/{qc1.qup,qecat,qg,qp}.qx
-
-	insinto /usr/$(get_libdir)/${PN}/library
-	doins prolog/library/*.qo
-
-	insinto /usr/$(get_libdir)/${PN}/compiler
-	doins prolog/compiler/*.qo
-
-	doman doc/man/man1/*.1
-
-	dodoc README
-
-	if use doc ; then
-		docinto reference-manual
-		dodoc doc/manual/*.html
-		docinto user-guide
-		dodoc doc/user/main.pdf
-	fi
-
-	if use examples ; then
-		docinto examples
-		newdoc examples/README README.examples
-		dodoc examples/*.ql
-	fi
-}
diff --git a/dev-lang/sassc/sassc-3.6.1.ebuild b/dev-lang/sassc/sassc-3.6.1.ebuild
index 309816f17dd5..82d1a97e1181 100644
--- a/dev-lang/sassc/sassc-3.6.1.ebuild
+++ b/dev-lang/sassc/sassc-3.6.1.ebuild
@@ -21,5 +21,6 @@ DOCS=( Readme.md )
 
 src_prepare() {
 	default
+	[[ -f VERSION ]] || echo "${PV}" > VERSION
 	eautoreconf
 }
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 9f61526c28bd..fc700ec5cca1 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -1,6 +1,7 @@
 DIST firefox-68.0-patches-15.tar.xz 16060 BLAKE2B f9e6cd58ea51bed1af90a9d30fd551dc7e939afcd1b4d00de1271bd4bda94021c6f1799fd9945962c14ffa1fd0b6a6429369c4e45efc2000f179b9b2e46971e7 SHA512 9cb2479637dd8b84e0ab68dc0fe144acd2dc74feca282fd3c4b485ca6f0de8190244587622713a5421b243ccda153f738e9a8f463e87e15e93e9b725d943e128
 DIST firefox-68.12.0esr.source.tar.xz 313856956 BLAKE2B eeaa4acc9fabf15ec1b313170a30cee8e1fc10a8b08512b915b83b7d6a81c09b365733ed94638bd434864fd7b0cb8cbf1bc2e43441be69e31117e8e6a099234c SHA512 839b02422e4c87bdb12e0995cd35ca8c1996f3fba00bbb46b419e46b67df5ec48a264cb14632db777ce29166ee4fdcb06e2ee3ce847e64328c58c9a2f9129f4c
 DIST firefox-78.6.0esr.source.tar.xz 338098664 BLAKE2B 9d082b6104bffbd0d918dc1adf2a01ac32613d8048faf399177834c4949714a00c1f4383b778a21d6b6684296d8f9bd44fa547ee2507a8631d206e3764d2ceeb SHA512 a1e2d6af0020784d00ed3cb4d778c136685e7c2f6ae536cc270fbd331d51d483d17dff9acd7ad8e6b3b231b9df894c146092889357b23715814a080c6f08d11a
+DIST firefox-78.7.0esr.source.tar.xz 332849732 BLAKE2B 66e224021cbd15b6b625da3c0a98b05026f4f284afbef5299368a218c16da24cd05431ab82c52859b835baf63298ec832681fbc58b3bfe833e68dea1737c6dcb SHA512 afa37d2f6bbe04715d84a8964f75139042364501c358da98771115d7fe7d23788e95b6ff29d77c064a9cfcd208c1424924017ef2a72cbb79dbb45d6f365f030c
 DIST firefox-78esr-patches-07.tar.xz 66156 BLAKE2B 8f69883432dcbd484b1fb15e3fde1630b1424e502ba78d9ec3cbe70cb2676a6876853d3477c8bfe35e92bca91b200e2d14543de1778d895676a52d2608109af2 SHA512 b4a01d3499002bd33a7fb45a1a80e9e73ba27a0986b6bfa43b3482dd8d82a686a14ae0c5e013402c8c8f359a642632a40bf4c362a0e83a1f53b453914f42e3a7
 DIST js185-1.0.0.tar.gz 6164605 BLAKE2B 76a37f0ceae05d3475853875bd0ce4be6e525e4114816f8f281ea6fc6b60a71060975a0fa1cb843f57ad1e2f842dfb26b24244fa0fd6c20f6ae2ebbe430f70be SHA512 2af7122a7c7007fd7b6668776fe1222515a810b3e43bbf0f76b8f94e1ef406ffd3fb5ccec393021b00274c05b38a77235bc8d6886994c56762fcaf0aa7cf6718
 DIST mozjs-52.9.1pre1.tar.bz2 30178574 BLAKE2B 0920432b5140e78297a9bcbccb54268d75a223d5e75e4ff90b3b01aab4f7736b4a4e05c47b3a925ff0a74607a0abad3b6583c75d070ef5142009b20ebaf6e4bf SHA512 187b231b246a5ae09e55c0fef77866b316d75f38f4c2e066d5d4325d8da63433027020c929439cab46af3253ac63ab2f780223a8fd2c6ff535b3409bb6c4aa0f
diff --git a/dev-lang/spidermonkey/spidermonkey-78.7.0.ebuild b/dev-lang/spidermonkey/spidermonkey-78.7.0.ebuild
new file mode 100644
index 000000000000..83affa0a915e
--- /dev/null
+++ b/dev-lang/spidermonkey/spidermonkey-78.7.0.ebuild
@@ -0,0 +1,436 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+# Patch version
+FIREFOX_PATCHSET="firefox-78esr-patches-07.tar.xz"
+SPIDERMONKEY_PATCHSET="spidermonkey-78-patches-03.tar.xz"
+
+LLVM_MAX_SLOT=11
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+WANT_AUTOCONF="2.1"
+
+inherit autotools check-reqs flag-o-matic llvm multiprocessing python-any-r1 toolchain-funcs
+
+MY_PN="mozjs"
+MY_PV="${PV/_pre*}" # Handle Gentoo pre-releases
+
+MY_MAJOR=$(ver_cut 1)
+
+MOZ_ESR=yes
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="firefox"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+if [[ ${PV} == *_rc* ]] ; then
+	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+fi
+
+PATCH_URIS=(
+	https://dev.gentoo.org/~{whissi,polynomial-c,axs}/mozilla/patchsets/${FIREFOX_PATCHSET}
+	https://dev.gentoo.org/~{whissi,polynomial-c,axs}/mozilla/patchsets/${SPIDERMONKEY_PATCHSET}
+)
+
+SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
+	${PATCH_URIS[@]}"
+
+DESCRIPTION="SpiderMonkey is Mozilla's JavaScript engine written in C and C++"
+HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~s390 ~x86"
+
+SLOT="78"
+LICENSE="MPL-2.0"
+IUSE="clang cpu_flags_arm_neon debug +jit lto test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="${PYTHON_DEPS}
+	>=virtual/rust-1.41.0
+	virtual/pkgconfig
+	|| (
+		(
+			sys-devel/llvm:11
+			clang? (
+				sys-devel/clang:11
+				lto? ( =sys-devel/lld-11* )
+			)
+		)
+		(
+			sys-devel/llvm:10
+			clang? (
+				sys-devel/clang:10
+				lto? ( =sys-devel/lld-10* )
+			)
+		)
+		(
+			sys-devel/llvm:9
+			clang? (
+				sys-devel/clang:9
+				lto? ( =sys-devel/lld-9* )
+			)
+		)
+	)
+	lto? (
+		!clang? ( sys-devel/binutils[gold] )
+	)"
+
+CDEPEND=">=dev-libs/icu-67.1:=
+	>=dev-libs/nspr-4.25
+	sys-libs/readline:0=
+	>=sys-libs/zlib-1.2.3"
+
+DEPEND="${CDEPEND}
+	test? (
+		$(python_gen_any_dep 'dev-python/six[${PYTHON_USEDEP}]')
+	)"
+
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}/firefox-${MY_PV}/js/src"
+
+llvm_check_deps() {
+	if use clang ; then
+		if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
+			ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if use lto ; then
+			if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
+				ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+				return 1
+			fi
+		fi
+	fi
+
+	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
+}
+
+python_check_deps() {
+	if use test ; then
+		has_version "dev-python/six[${PYTHON_USEDEP}]"
+	fi
+}
+
+pkg_pretend() {
+	if use test ; then
+		CHECKREQS_DISK_BUILD="7600M"
+	else
+		CHECKREQS_DISK_BUILD="6400M"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use test ; then
+			CHECKREQS_DISK_BUILD="7600M"
+		else
+			CHECKREQS_DISK_BUILD="6400M"
+		fi
+
+		check-reqs_pkg_setup
+
+		llvm_pkg_setup
+
+		if use clang && use lto ; then
+			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
+			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
+			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
+
+			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
+			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
+			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
+
+			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
+				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
+				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
+				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
+				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
+				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
+				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
+			fi
+		fi
+
+		python-any-r1_pkg_setup
+
+		# Build system is using /proc/self/oom_score_adj, bug #604394
+		addpredict /proc/self/oom_score_adj
+
+		if ! mountpoint -q /dev/shm ; then
+			# If /dev/shm is not available, configure is known to fail with
+			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
+			ewarn "/dev/shm is not mounted -- expect build failures!"
+		fi
+
+		# Ensure we use C locale when building, bug #746215
+		export LC_ALL=C
+	fi
+}
+
+src_prepare() {
+	pushd ../.. &>/dev/null || die
+
+	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
+
+	eapply "${WORKDIR}"/firefox-patches
+	eapply "${WORKDIR}"/spidermonkey-patches
+
+	default
+
+	# Make LTO respect MAKEOPTS
+	sed -i \
+		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		build/moz.configure/lto-pgo.configure \
+		|| die "sed failed to set num_cores"
+
+	# sed-in toolchain prefix
+	sed -i \
+		-e "s/objdump/${CHOST}-objdump/" \
+		python/mozbuild/mozbuild/configure/check_debug_ranges.py \
+		|| die "sed failed to set toolchain prefix"
+
+	einfo "Removing pre-built binaries ..."
+	find third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
+
+	MOZJS_BUILDDIR="${WORKDIR}/build"
+	mkdir "${MOZJS_BUILDDIR}" || die
+
+	popd &>/dev/null || die
+	eautoconf
+}
+
+src_configure() {
+	# Show flags set at the beginning
+	einfo "Current CFLAGS:    ${CFLAGS}"
+	einfo "Current CXXFLAGS:  ${CXXFLAGS}"
+	einfo "Current LDFLAGS:   ${LDFLAGS}"
+	einfo "Current RUSTFLAGS: ${RUSTFLAGS}"
+
+	local have_switched_compiler=
+	if use clang && ! tc-is-clang ; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+		have_switched_compiler=yes
+		AR=llvm-ar
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+	elif ! use clang && ! tc-is-gcc ; then
+		# Force gcc
+		have_switched_compiler=yes
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		AR=gcc-ar
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+		NM=gcc-nm
+		RANLIB=gcc-ranlib
+	fi
+
+	if [[ -n "${have_switched_compiler}" ]] ; then
+		# Because we switched active compiler we have to ensure
+		# that no unsupported flags are set
+		strip-unsupported-flags
+	fi
+
+	# Ensure we use correct toolchain
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+	cd "${MOZJS_BUILDDIR}" || die
+
+	# ../python/mach/mach/mixin/process.py fails to detect SHELL
+	export SHELL="${EPREFIX}/bin/bash"
+
+	local -a myeconfargs=(
+		--host="${CBUILD:-${CHOST}}"
+		--target="${CHOST}"
+		--disable-jemalloc
+		--disable-optimize
+		--disable-strip
+		--enable-readline
+		--enable-shared-js
+		--with-intl-api
+		--with-system-icu
+		--with-system-nspr
+		--with-system-zlib
+		--with-toolchain-prefix="${CHOST}-"
+		$(use_enable debug)
+		$(use_enable jit)
+		$(use_enable test tests)
+	)
+
+	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
+		myeconfargs+=( --enable-rust-simd )
+	fi
+
+	# Modifications to better support ARM, bug 717344
+	if use cpu_flags_arm_neon ; then
+		myeconfargs+=( --with-fpu=neon )
+
+		if ! tc-is-clang ; then
+			# thumb options aren't supported when using clang, bug 666966
+			myeconfargs+=( --with-thumb=yes )
+			myeconfargs+=( --with-thumb-interwork=no )
+		fi
+	fi
+
+	# Tell build system that we want to use LTO
+	if use lto ; then
+		myeconfargs+=( --enable-lto )
+
+		if use clang ; then
+			myeconfargs+=( --enable-linker=lld )
+		else
+			myeconfargs+=( --enable-linker=gold )
+		fi
+	fi
+
+	# LTO flag was handled via configure
+	filter-flags '-flto*'
+
+	if tc-is-gcc ; then
+		if ver_test $(gcc-fullversion) -ge 10 ; then
+			einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
+			append-cxxflags -fno-tree-loop-vectorize
+		fi
+	fi
+
+	# Show flags we will use
+	einfo "Build CFLAGS:    ${CFLAGS}"
+	einfo "Build CXXFLAGS:  ${CXXFLAGS}"
+	einfo "Build LDFLAGS:   ${LDFLAGS}"
+	einfo "Build RUSTFLAGS: ${RUSTFLAGS}"
+
+	# Forcing system-icu allows us to skip patching bundled ICU for PPC
+	# and other minor arches
+	ECONF_SOURCE="${S}" \
+		econf \
+		${myeconfargs[@]} \
+		XARGS="${EPREFIX}/usr/bin/xargs"
+}
+
+src_compile() {
+	cd "${MOZJS_BUILDDIR}" || die
+	default
+}
+
+src_test() {
+	if "${MOZJS_BUILDDIR}/js/src/js" -e 'print("Hello world!")'; then
+		einfo "Smoke-test successful, continuing with full test suite"
+	else
+		die "Smoke-test failed: did interpreter initialization fail?"
+	fi
+
+	local -a KNOWN_TESTFAILURES
+	KNOWN_TESTFAILURES+=( non262/Date/reset-time-zone-cache-same-offset.js )
+	KNOWN_TESTFAILURES+=( non262/Date/time-zone-path.js )
+	KNOWN_TESTFAILURES+=( non262/Date/time-zones-historic.js )
+	KNOWN_TESTFAILURES+=( non262/Date/time-zones-imported.js )
+	KNOWN_TESTFAILURES+=( non262/Date/toString-localized.js )
+	KNOWN_TESTFAILURES+=( non262/Date/toString-localized-posix.js )
+	KNOWN_TESTFAILURES+=( non262/Intl/Date/toLocaleString_timeZone.js )
+	KNOWN_TESTFAILURES+=( non262/Intl/Date/toLocaleDateString_timeZone.js )
+	KNOWN_TESTFAILURES+=( non262/Intl/DateTimeFormat/format.js )
+	KNOWN_TESTFAILURES+=( non262/Intl/DateTimeFormat/format_timeZone.js )
+	KNOWN_TESTFAILURES+=( non262/Intl/DateTimeFormat/timeZone_backward_links.js )
+	KNOWN_TESTFAILURES+=( non262/Intl/DateTimeFormat/tz-environment-variable.js )
+	KNOWN_TESTFAILURES+=( non262/Intl/DisplayNames/language.js )
+	KNOWN_TESTFAILURES+=( non262/Intl/DisplayNames/region.js )
+	KNOWN_TESTFAILURES+=( non262/Intl/Locale/likely-subtags.js )
+	KNOWN_TESTFAILURES+=( non262/Intl/Locale/likely-subtags-generated.js )
+	KNOWN_TESTFAILURES+=( test262/intl402/Locale/prototype/minimize/removing-likely-subtags-first-adds-likely-subtags.js )
+
+	if use x86 ; then
+		KNOWN_TESTFAILURES+=( non262/Date/timeclip.js )
+		KNOWN_TESTFAILURES+=( test262/built-ins/Number/prototype/toPrecision/return-values.js )
+		KNOWN_TESTFAILURES+=( test262/language/types/number/S8.5_A2.1.js )
+		KNOWN_TESTFAILURES+=( test262/language/types/number/S8.5_A2.2.js )
+	fi
+
+	if [[ $(tc-endian) == "big" ]] ; then
+		KNOWN_TESTFAILURES+=( test262/built-ins/TypedArray/prototype/set/typedarray-arg-set-values-same-buffer-other-type.js )
+	fi
+
+	echo "" > "${T}"/known_failures.list || die
+
+	local KNOWN_TESTFAILURE
+	for KNOWN_TESTFAILURE in ${KNOWN_TESTFAILURES[@]} ; do
+		echo "${KNOWN_TESTFAILURE}" >> "${T}"/known_failures.list
+	done
+
+	PYTHONPATH="${S}/tests/lib" \
+		${PYTHON} \
+		"${S}"/tests/jstests.py -d -s -t 1800 --wpt=disabled --no-progress \
+		--exclude-file="${T}"/known_failures.list \
+		"${MOZJS_BUILDDIR}"/js/src/js \
+		|| die
+
+	if use jit ; then
+		KNOWN_TESTFAILURES=()
+
+		echo "" > "${T}"/known_failures.list || die
+
+		for KNOWN_TESTFAILURE in ${KNOWN_TESTFAILURES[@]} ; do
+			echo "${KNOWN_TESTFAILURE}" >> "${T}"/known_failures.list
+		done
+
+		PYTHONPATH="${S}/tests/lib" \
+			${PYTHON} \
+			"${S}"/tests/jstests.py -d -s -t 1800 --wpt=disabled --no-progress \
+			--exclude-file="${T}"/known_failures.list \
+			"${MOZJS_BUILDDIR}"/js/src/js basic \
+			|| die
+	fi
+}
+
+src_install() {
+	cd "${MOZJS_BUILDDIR}" || die
+	default
+
+	# fix soname links
+	pushd "${ED}"/usr/$(get_libdir) &>/dev/null || die
+	mv lib${MY_PN}-${MY_MAJOR}.so lib${MY_PN}-${MY_MAJOR}.so.0.0.0 || die
+	ln -s lib${MY_PN}-${MY_MAJOR}.so.0.0.0 lib${MY_PN}-${MY_MAJOR}.so.0 || die
+	ln -s lib${MY_PN}-${MY_MAJOR}.so.0 lib${MY_PN}-${MY_MAJOR}.so || die
+	popd &>/dev/null || die
+
+	# remove unneeded files
+	rm \
+		"${ED}"/usr/bin/js${MY_MAJOR}-config \
+		"${ED}"/usr/$(get_libdir)/libjs_static.ajs \
+		|| die
+
+	# fix permissions
+	chmod -x \
+		"${ED}"/usr/$(get_libdir)/pkgconfig/*.pc \
+		"${ED}"/usr/include/mozjs-${MY_MAJOR}/js-config.h \
+		|| die
+}
diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest
index e99cccb67058..d61cb3f94dea 100644
--- a/dev-lang/tk/Manifest
+++ b/dev-lang/tk/Manifest
@@ -1,6 +1,7 @@
 DIST tk8.5.17-src.tar.gz 4095985 BLAKE2B 4cbb140c30ca717ee499b9ad9e1a3df27a470a78613edbaec425c39afaa41d59276bbe487933a4e77a9722fcafa9113b203cf5c828660bdeb38f667c3263c3cd SHA512 ddadc738c2567e35d1257b59212c8a0eb70a1bf041d986bc6df3b841b51d934d79a0ef389c928223a64516a92cae3357b2c789edca9c8a626ff4c1cf320c4f4f
 DIST tk8.6.10-src.tar.gz 4444764 BLAKE2B f56647e005778c802352aee0257c0a8f5e0014c9d21362592f08030252d83141cca385f0fb95c0e7e930016255c3b2cef49a65064e056a877214b7d7a1a01246 SHA512 d12ef3a5bde9e10209a24e9f978bd23360a979d8fa70a859cf750a79ca51067a11ef6df7589303b52fe2a2baed4083583ddaa19e2c7cb433ea523639927f1be5
 DIST tk8.6.11-src.tar.gz 4496914 BLAKE2B c3050a48d5cb3bd3095b2c439b3d33992551f953a981bf23eedbf774368b383abc77fb3156aa4bcaae658d0706495cff03536ab8258f9d824ff8f4325b36cc38 SHA512 2e11490f2f51ef7e723661dd91c95622234fb97850e80d8ecd564be8c28f7c8fb0334a97cf8267af9d68f63e4adea887a1a4eec8d2e807d6a970b5912f99d3f2
+DIST tk8.6.11.1-src.tar.gz 4496008 BLAKE2B d7bae2fa535411ad8620ec81cdc0b34a1206fed82f50dbd98d3977af46ac43f794166cb7029f274f7903228c62ce83dfbd56cea06669ff1e382b185d733b0792 SHA512 e2a1d27ba63601731d43c4c4e2b658771a14afd97ef8231f8bc7854e762b83a42f23b8db600e4b4a4a14ae6fc97378d0b9a9a180ae09308b9d12436ec2b176c4
 DIST tk8.6.8-src.tar.gz 4319854 BLAKE2B 167c5dc6c32e49653c04bc067c3d75df022ca230657be32797021b0e2f7748215d9ad0493c8020b8d1be1f005b9b2d561339a6a0b209721c0d05dd222d47d377 SHA512 d0d30637b733fb0b0d38461b6d872934c04af422fcdb7ec41a72331b2529cc94414e6f441f95a98642d69505e4f41469847fedd1cbe58bd08cdd818fcabd1db9
 DIST tk8.6.9-src.tar.gz 4364606 BLAKE2B 9c96d977aa72dcc0c8d2a570d644284a1eef217ef082d8a78461bdcb4845e206ccad59cb5bc21ef80e32ea19951fa3a845e45059bb9eaf0756f128a95530260c SHA512 654d73aad006e628110057681477b958b7ec0a42287bc78259fb4b84635e7ebe757e69099d66c0c73479bc506ca66fa5baf13f13b0f403d60b2c54fd48a4a686
 DIST tk8.6.9.1-src.tar.gz 4364603 BLAKE2B 3d96637ceadc28977f8b4532be071907d64f11bd22881baf02aa6fa2778b607437edce8f1ed02e7011bcf78468128f7bfe81ee6dac9bd73a796e7fefae130dcf SHA512 b9c811ffc8326331ae03c6fb25ea71f7a5eaeebd9d5a16a51a1671d0f0422268bd351b077e17ae925f0a7eddac9642aa640658615c52d4269c299373af031a92
diff --git a/dev-lang/tk/tk-8.6.11.1.ebuild b/dev-lang/tk/tk-8.6.11.1.ebuild
new file mode 100644
index 000000000000..0a8ce08af40d
--- /dev/null
+++ b/dev-lang/tk/tk-8.6.11.1.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal prefix toolchain-funcs virtualx
+
+MY_P="${PN}${PV/_beta/b}"
+
+DESCRIPTION="Tk Widget Set"
+HOMEPAGE="https://www.tcl.tk/"
+SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
+
+LICENSE="tcltk"
+SLOT="0/8.6"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug +threads truetype aqua xscreensaver"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!aqua? (
+		>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+		truetype? ( >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}] )
+		xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
+	)
+	~dev-lang/tcl-$(ver_cut 1-3):0=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	!aqua? ( x11-base/xorg-proto )"
+
+# Not bumped to 8.6
+#RESTRICT=test
+
+SPARENT="${WORKDIR}/${PN}$(ver_cut 1-3 ${PV})"
+S="${SPARENT}"/unix
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.6.10-multilib.patch
+	"${FILESDIR}"/${PN}-8.4.15-aqua.patch
+	"${FILESDIR}"/${PN}-8.6.9-conf.patch # Bug 125971
+	"${FILESDIR}"/${PN}-8.6.11-test.patch
+)
+
+src_prepare() {
+	find \
+		"${SPARENT}"/compat/* \
+		-delete || die
+
+	pushd "${SPARENT}" &>/dev/null || die
+	default
+	popd &>/dev/null || die
+	eprefixify Makefile.in
+
+	# Make sure we use the right pkg-config, and link against fontconfig
+	# (since the code base uses Fc* functions).
+	sed \
+		-e 's/FT_New_Face/XftFontOpen/g' \
+		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
+		-e 's:xft freetype2:xft freetype2 fontconfig:' \
+		-i configure.in || die
+	rm configure || die
+
+	tc-export CC
+
+	sed \
+		-e '/chmod/s:555:755:g' \
+		-i Makefile.in || die
+
+	sed \
+		-e 's:-O[2s]\?::g' \
+		-i tcl.m4 || die
+
+	mv configure.{in,ac} || die
+
+	eautoconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	if tc-is-cross-compiler ; then
+		export ac_cv_func_strtod=yes
+		export tcl_cv_strtod_buggy=1
+	fi
+
+	local mylibdir=$(get_libdir)
+
+	econf \
+		--with-tcl="${EPREFIX}/usr/${mylibdir}" \
+		$(use_enable threads) \
+		$(use_enable aqua) \
+		$(use_enable truetype xft) \
+		$(use_enable xscreensaver xss) \
+		$(use_enable debug symbols)
+}
+
+multilib_src_test() {
+	CI=1 virtx emake test
+}
+
+multilib_src_install() {
+	#short version number
+	local v1=$(ver_cut 1-2)
+	local mylibdir=$(get_libdir)
+
+	S= default
+
+	# normalize $S path, bug #280766 (pkgcore)
+	local nS="$(cd "${S}"; pwd)"
+
+	# fix the tkConfig.sh to eliminate refs to the build directory
+	# and drop unnecessary -L inclusion to default system libdir
+
+	sed \
+		-e "/^TK_BUILD_LIB_SPEC=/s:-L${S}-\w*\.\w* ::g" \
+		-e "/^TK_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+		-e "/^TK_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tk${v1}/include:g" \
+		-e "/^TK_BUILD_STUB_LIB_SPEC=/s:-L${S}-\w*\.\w* *::g" \
+		-e "/^TK_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+		-e "/^TK_BUILD_STUB_LIB_PATH=/s:${S}-\w*\.\w*:${EPREFIX}/usr/${mylibdir}:g" \
+		-e "/^TK_LIB_FILE=/s:'libtk${v1}..TK_DBGX..so':\"libk${v1}\$\{TK_DBGX\}.so\":g" \
+		-i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
+	if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
+		sed \
+			-e "/^TK_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
+			-e "/^TK_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
+			-i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
+	fi
+
+	# install private headers
+	insinto /usr/${mylibdir}/tk${v1}/include/unix
+	doins "${S}"/*.h
+	insinto /usr/${mylibdir}/tk${v1}/include/generic
+	doins "${SPARENT}"/generic/*.h
+	rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/{tk,tkDecls,tkPlatDecls}.h || die
+
+	# install symlink for libraries
+	dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname)
+	dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
+
+	if multilib_is_native_abi; then
+		dosym wish${v1} /usr/bin/wish
+		dodoc "${SPARENT}"/{ChangeLog*,README.md,changes}
+	fi
+}
diff --git a/dev-lang/yap/Manifest b/dev-lang/yap/Manifest
index 247d4e3dacd2..bacd4a12df44 100644
--- a/dev-lang/yap/Manifest
+++ b/dev-lang/yap/Manifest
@@ -1,4 +1,2 @@
 DIST YAP-6.3.4.tar.gz 11007893 BLAKE2B d8024fb68269bbb4f9a434e2be13b4a42aa250f7e6505ef8f6e4c76d50510e04e9a2985796ce66b1d426a877646eafeecb30774c353f5a820c32dc3cbdf20b1c SHA512 67884b98bbc564f23f88cbb1462127a47f3d0602ac347d1c8b0857e5d8ebd9d0ca28770229a6beb52493c6c3256b6cdf8dad25ed2963c64102093f70c4c20a3a
-DIST yap-6.3.3-gentoo-patchset-13.tar.gz 8677 BLAKE2B ebaea8e2851a5025482422161cfca8f5c65bea65e08ed0fd8032956a909bcf8e486558705b663004aa506a614dc4d638107e3ad5fc590fc3b74a0fd203fb33d3 SHA512 b1a2b202ce05c97aebf8c869d24276f7ca12c6f1027886902d8cd7267cd623ed73c5652f49e7e58386a93b37dcfbdfc83e3b0bd1aeddb95245a5f0e8adcc852b
-DIST yap-6.3.3.tar.gz 7879301 BLAKE2B 1b12a3113dd57634df64680726fd49575979b84126a7a9e1f4d1429be90e1b95599166151ffe62c9ef990ac3c32f57a1efae081b864fc22225c93d21807f412b SHA512 4ef45277ec84b6e072fa54afc7d6c18f11c3a0cdf477e35e35a0ce2181c9ff2e693f8735f63a1899373f6baf79ce0a972b37e1ae6ed8271bec60663f477bbe80
 DIST yap-6.3.4-gentoo-patchset-0.tar.gz 5165 BLAKE2B 1f6c9f91f2d2c0e9488f26e1a8079a40ed30c1c83c7171024dd0c0115874e336bbdfa449246e363d0030bd05dc0d86e9efa19cc2fdc4d04b96faeb33b9ade9d0 SHA512 a2a39869042cb647dc022b34a4dd0881a6a35ad0bf88527380d6d74e5307f9dd0ab5feea8e9e922524e3dce39132ab6c8cadd78f92735e2c368d7b277cbe6944
diff --git a/dev-lang/yap/yap-6.3.3-r1.ebuild b/dev-lang/yap/yap-6.3.3-r1.ebuild
deleted file mode 100644
index 84faa8d2089e..000000000000
--- a/dev-lang/yap/yap-6.3.3-r1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic java-pkg-opt-2
-
-PATCHSET_VER="13"
-
-DESCRIPTION="YAP is a high-performance Prolog compiler"
-HOMEPAGE="https://www.dcc.fc.up.pt/~vsc/Yap/"
-SRC_URI="http://www.dcc.fc.up.pt/~vsc/Yap/${P}.tar.gz
-	https://dev.gentoo.org/~keri/distfiles/yap/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="Artistic LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="R debug doc examples gmp java mpi mysql odbc readline static threads"
-
-RDEPEND="sys-libs/zlib
-	gmp? ( dev-libs/gmp:0 )
-	java? ( >=virtual/jdk-1.4:= )
-	mpi? ( virtual/mpi )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	odbc? ( dev-db/unixODBC )
-	readline? ( sys-libs/readline:= sys-libs/ncurses:= )
-	R? ( dev-lang/R )"
-
-DEPEND="${RDEPEND}
-	doc? ( app-text/texi2html )"
-
-PATCHES=( "${WORKDIR}"/${PV} )
-
-src_prepare() {
-	default
-	rm -rf "${S}"/yap || die "failed to remove yap xcode project"
-
-	# Fix QA error on doc location
-	local mFile
-	for mFile in Makefile.in packages/Dialect.defs.in \
-			$(find packages -name Makefile.in) ; do
-		sed -i -e "s~doc/Yap~doc/${PF}~" "${mFile}" || die
-	done
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	local myddas_conf
-	if use mysql || use odbc; then
-		myddas_conf="--enable-myddas"
-	else
-		myddas_conf="--disable-myddas"
-	fi
-	if use mysql; then
-		myddas_conf="$myddas_conf yap_with_mysql=yes"
-	fi
-	if use odbc; then
-		myddas_conf="$myddas_conf yap_with_odbc=yes"
-	fi
-
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		--disable-chr \
-		--disable-prism \
-		--disable-gecode \
-		$(use_enable !static dynamic-loading) \
-		$(use_enable threads) \
-		$(use_enable threads pthread-locking) \
-		$(use_enable debug debug-yap) \
-		$(use_enable debug low-level-tracer) \
-		$(use_with gmp) \
-		$(use_with readline) \
-		$(use_with mpi) \
-		$(use_with mpi mpe) \
-		$(use_with java) \
-		$(use_with R) \
-		${myddas_conf}
-}
-
-src_compile() {
-	default
-
-	if use doc ; then
-		emake html
-	fi
-}
-
-src_test() {
-	# libtai package contains check.c which confuses the default
-	# src_test() function
-	true
-}
-
-src_install() {
-	default
-
-	dodoc changes*.html README
-
-	if use doc ; then
-		dodoc yap.html
-	fi
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples/chr
-		doins packages/chr/Examples/*
-		insinto /usr/share/doc/${PF}/examples/clib
-		doins packages/clib/demo/*
-		insinto /usr/share/doc/${PF}/examples/http
-		doins -r packages/http/examples/*
-		insinto /usr/share/doc/${PF}/examples/plunit
-		doins packages/plunit/examples/*
-		if use java ; then
-			insinto /usr/share/doc/${PF}/examples/jpl/prolog
-			doins packages/jpl/examples/prolog/*
-			insinto /usr/share/doc/${PF}/examples/jpl/java
-			doins packages/jpl/examples/java/README
-			doins -r packages/jpl/examples/java/*/*.{java,pl}
-		fi
-		if use mpi ; then
-			insinto /usr/share/doc/${PF}/examples/mpi
-			doins library/mpi/examples/*.pl
-		fi
-	fi
-}