gentoo resync : 30.06.2019

10 files changed, 6 insertions, 1755 deletions

diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 89db2b414d3d..c3f664f097f8 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/gemato/Manifest b/app-portage/gemato/Manifest
index 0e5c2be73508..daf60173a5c8 100644
--- a/app-portage/gemato/Manifest
+++ b/app-portage/gemato/Manifest
@@ -4,8 +4,8 @@ DIST gemato-14.1-multiprocessing.tar.gz 71707 BLAKE2B d7d22615a65bd598160b23e01a
 DIST gemato-14.1.tar.gz 71142 BLAKE2B a7c8f814f9c6875e977aa178d4a49e3454ea8d6e19750786452aa2f34f0904f0ccc0a9a58411a0214a68cecd571320769c6374b265e2aa7f52fbead53ba6b284 SHA512 de57f3b7aa17e650894876bc2423c4fa9809f2de25aa2fb8ef070e943faa182c80f7ea8a519ecdf6edec8098d11f786344ee872b9e98c69bd6739760652baa2e
 EBUILD gemato-14.0.ebuild 1352 BLAKE2B c2d1e7c84eb461f2b2f321f699958e480ec7d4459c001f542b36bd3219358ecdcf9f5211fa39ec320f32feb5fb07929f3631a3d243a5e7909f91a61fbfe4885b SHA512 caf7b72bf8cd730dcf8ac572223c1b2ec0ca4d7f6fa021cfed7d2d398e8c4bbb64211baac89dd7f317526a733a496dd3ef0559d81706d7fa7eb8c6af0260901a
 EBUILD gemato-14.0m.ebuild 1635 BLAKE2B ed2bb89c6b7f2fd7125fddb8429d1ea70d77fe3eacef38b65a3e5ef48a75f6fd9827d227668854090d565a4b3136c1888a901b6a3478175fff15418d3e0e9870 SHA512 763cfbbd2995d8a90e1b7278cc831ddafa7eb53dad2c4f461e1ca76db24e398ded702462bd22a65b0d389ca14952223c5c4c3601eb99c70ae33abde85db74591
-EBUILD gemato-14.1.ebuild 1355 BLAKE2B 98b86d290609513e03ba12b7fcf54412153a151e5cc6e385c77108420865cd4d2d0711a53273d43c098dbb1a9204a62ab3be50dec416fa729a9553b84f61258d SHA512 f74ebed6753f07e12890ccc9addba38559bace6758df0febccfb80a3c356f6ec4f976a7e5a23c15e08d2f6176c456ce3aa9b2e7e1e0b05bca3cfe1c6e312778b
-EBUILD gemato-14.1m.ebuild 1635 BLAKE2B ed2bb89c6b7f2fd7125fddb8429d1ea70d77fe3eacef38b65a3e5ef48a75f6fd9827d227668854090d565a4b3136c1888a901b6a3478175fff15418d3e0e9870 SHA512 763cfbbd2995d8a90e1b7278cc831ddafa7eb53dad2c4f461e1ca76db24e398ded702462bd22a65b0d389ca14952223c5c4c3601eb99c70ae33abde85db74591
+EBUILD gemato-14.1.ebuild 1379 BLAKE2B 6ba59769dea15167d5996c1263142b19c84baa5f6d9ab30d442d9f71c0b2c4f32607450e93331fad3bfa5d1a611696c7e2d04ba25861edbe500b15eab7da9589 SHA512 159eb02f6444c040780b1d922cb16cc4ca3ccf89cf4642ef9a61704f1597a50fec667ebb3e42584d3b498c2a9addf8329f0767620647240cb1d8e8376fd6cc30
+EBUILD gemato-14.1m.ebuild 1659 BLAKE2B a097ef71bbe477eb7b3b9e389e10b42d63df3e56ff5f5773d7fda06fa771677a64538acdc9a4b86b956ab825d680fa8516cfcc5d8bd415548432fd8b4abdb4ef SHA512 20e969002fd5861edfad5d538b96d2f47c7881f9e59034ba28ce98b37d663221bd2870308cacc9685add8b12dc281792a9d06a65c7f143ca83aa4c8b1935ef04
 EBUILD gemato-9999.ebuild 1271 BLAKE2B 761c2087c144d5936aefcb45cf2be23641c2605f1f836e07ade31b577f8bc6f82c8ffe7313580b371b89bea6f036996d7a1925fffbb03553cf57d02800ca370a SHA512 a910a795abe974d3c389a77cfc827fa7393e6adc603ade32d782dc5838eda46f7c255abdbb89de263ac7c38d948bfb616d1c3cb72088d3fb5a7da6bab027cd28
 EBUILD gemato-9999m.ebuild 1466 BLAKE2B 53d42b54cc09dd377a60bac37fabc82ae5e272cbd336fd7f5047fbd7d940dc9005ac1006ffce31576ca146c5f65c56af83405c1f0a93831e4a24051c0f075a8a SHA512 4deb02e736943d5014d53a05602da09b1d7436ed28a4f528240b18b65741fad352cea686f9532f81d6f60a0c62735a3e5db3ace44c6dd7308f55928d844a2562
 MISC metadata.xml 814 BLAKE2B 1e6845b23a861560cb0972f787a14f7ade2b471d98ff28f2ae3153e99011d98f2751d720d312a6006554117e3241e5ea8557211073f8d03bbfb751c23565c390 SHA512 d2367bd897e76939768a3cf8f173723e773ec5d12b7144793a69843a3a18aec50bcdb593956cce6644d45f27c263ebf1893ac375e5d4ee3d894dcb0bd4aa6d9e
diff --git a/app-portage/gemato/gemato-14.1.ebuild b/app-portage/gemato/gemato-14.1.ebuild
index 9548ad6f7eae..ca88cf6cbc3b 100644
--- a/app-portage/gemato/gemato-14.1.ebuild
+++ b/app-portage/gemato/gemato-14.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="+blake2 bzip2 +gpg lzma sha3 test tools"
 
 MODULE_RDEPEND="
diff --git a/app-portage/gemato/gemato-14.1m.ebuild b/app-portage/gemato/gemato-14.1m.ebuild
index 318a72bafc86..851a29675cc4 100644
--- a/app-portage/gemato/gemato-14.1m.ebuild
+++ b/app-portage/gemato/gemato-14.1m.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/mgorny/gemato/archive/v${MY_PV}.tar.gz -> ${MY_P}.ta
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="+blake2 bzip2 +gpg lzma sha3 test tools"
 
 MODULE_RDEPEND="
diff --git a/app-portage/prefix-toolkit/Manifest b/app-portage/prefix-toolkit/Manifest
index d1168401a921..677af425da8f 100644
--- a/app-portage/prefix-toolkit/Manifest
+++ b/app-portage/prefix-toolkit/Manifest
@@ -1,6 +1,3 @@
-EBUILD prefix-toolkit-0.ebuild 15920 BLAKE2B 2870e1ec8e65f26f38e15bad7f4ba5e6bedd909d34de3017885fa9d45a885646b586e26af29d226558103800e8b68db637516d5256007bba0f5e07452e565696 SHA512 87ca32003ec443f57d6980db36f098d2abc9bd28ae2c9361ef2f01fc9d9da66bac2fb2f1354b293212fa8cd53605cf5cc9a1974718e0d88f30a120f01816e50d
-EBUILD prefix-toolkit-1.ebuild 15932 BLAKE2B bd487e55cfc8bbd571d4668505914610d5be4627db4e43b5c941fe72e0ca276501e0312546078f5ca0e510e9630aff7212f9e696709dcd374cbb290f181f6de5 SHA512 86e1e36ca1460622cc6ae2ac2b75a02540966ed27e079b8dbf24d900bcccf5d9249c9d1133ba5228d83e27ad8eabb8bced37befde69b1fb93231425ae0e2ee5c
-EBUILD prefix-toolkit-2.ebuild 17557 BLAKE2B 333f8c9335aa18e718d408c1572001bdbb2a8d26b1c017b9a8d579d6811e9a909ab6c9b36d5126b2d68801b1972d0371b1caa9634aaa88c644ef45afb2bedf0e SHA512 fdf43f6380d2a172c6ff6814a8521fe7a2494a8b2485b1f97a6bdf7eba8907ec562c499f67af36124f6a0f652c56675f9cec639c7ea094a09c90023c8eac0c12
 EBUILD prefix-toolkit-3.ebuild 18363 BLAKE2B a5a805882f0e654dab5da79ba18940949591272e6ae5f81d11d6ba751faac22a8c39230aecf40df315731e696e86ff5a3861c8ff8aa3302db95ba507b5d85d9b SHA512 6053e11f3c5bb8aaee05da82efa6c78019f32872188da3a0cf6fab1585923241e108f089a7084feaded48827f60397b7d10af8471329d62a75fcfbdae4f19350
 EBUILD prefix-toolkit-4.ebuild 18547 BLAKE2B 927a0ba2788c00a605f7ecc826b28b4889c1f2317278eb9dff37c62d3e25526fc2d617cc50e61da2e65d9ac7b2aa7170eb126084f33762cf337377f0e766372d SHA512 c4ed8da3e01565350d67c4eafeebd9cb72a17d1a1e9588bf95b8eb6f7326196a7be2ffbdd222510bd1f132ad4302ad1104cea2cdcceda7589246856685c1b429
 MISC metadata.xml 243 BLAKE2B d650658b3e248940751d20c9e517a011a34f8d99df54d5203162d67c21df384f507e44ed0c848c1adc99fae8d511e204129f2709f5bdc5d1b2c8e41120bbe6db SHA512 8489be9ea6eac385511b0d193b1b61fad9c8e0d4cb86fd711e6faf04e66b2c935ae64ce6ce0a044d036e76de6787e5d440d67f831e89261a71e74b645a0999d9
diff --git a/app-portage/prefix-toolkit/prefix-toolkit-0.ebuild b/app-portage/prefix-toolkit/prefix-toolkit-0.ebuild
deleted file mode 100644
index ae2ca111babd..000000000000
--- a/app-portage/prefix-toolkit/prefix-toolkit-0.ebuild
+++ /dev/null
@@ -1,565 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Utilities for users of Gentoo Prefix"
-HOMEPAGE="https://prefix.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-3"
-SLOT="0"
-
-[[ ${PV} == 9999 ]] ||
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-
-DEPEND=""
-RDEPEND="
-	>sys-apps/portage-2.3.62
-	!app-portage/prefix-chain-setup
-	!sys-apps/prefix-chain-utils
-	prefix-stack? (
-		>=sys-apps/baselayout-prefix-2.6
-	)
-"
-
-S="${WORKDIR}"
-
-my_unpack() {
-	local infile=$1
-	local outfile=${2:-${infile}}
-	ebegin "extracting ${outfile}"
-	sed -ne "/^: ${infile} /,/EOIN/{/EOIN/d;p}" "${EBUILD}" \
-		> "${outfile}" || die "Failed to unpack ${outfile}"
-	eend $?
-}
-
-src_unpack() {
-	if use prefix-stack ; then
-		my_unpack prefix-stack.bash_login
-		my_unpack prefix-stack.bashrc
-		my_unpack prefix-stack.envd.99stack
-		my_unpack prefix-stack-ccwrap
-		local editor pager
-		for editor in "${EDITOR}" {"${EPREFIX}","${BROOT}"}/bin/nano
-		do
-			[[ -x ${editor} ]] || continue
-		done
-		for pager in "${PAGER}" {"${EPREFIX}","${BROOT}"}/usr/bin/less
-		do
-			[[ -x ${pager} ]] || continue
-		done
-		printf '%s\n' "EDITOR=\"${editor}\"" "PAGER=\"${pager}\"" > 000fallback
-	else
-		my_unpack prefix-stack-setup
-	fi
-	my_unpack startprefix
-}
-
-my_prefixify() {
-	local ebash eenv
-	if use prefix-stack ; then
-		ebash="${BROOT}/bin/bash"
-		eenv="${BROOT}/usr/bin/env"
-	else
-		ebash="${EPREFIX}/bin/bash"
-		eenv="${EPREFIX}/usr/bin/env"
-	fi
-
-	# the @=@ prevents repoman from believing we set readonly vars
-	sed -e "s,@GENTOO_PORTAGE_BPREFIX@,${BROOT},g" \
-		-e "s,@GENTOO_PORTAGE_EPREFIX@,${EPREFIX},g" \
-		-e "s,@GENTOO_PORTAGE_CHOST@,${CHOST},g" \
-		-e "s,@GENTOO_PORTAGE_EBASH@,${ebash},g" \
-		-e "s,@GENTOO_PORTAGE_EENV@,${eenv},g" \
-		-e "s,@=@,=,g" \
-		-i "$@" || die
-}
-
-src_configure() {
-	# do not eprefixify during unpack, to allow userpatches to apply
-	my_prefixify *
-}
-
-src_install-prefix-stack-ccwrap() {
-	# install toolchain wrapper.
-	local wrapperdir=/usr/${CHOST}/gcc-bin/${CHOST}-${PN}/${PV}
-	local wrappercfg=${CHOST}-${P}
-
-	exeinto $wrapperdir
-	doexe prefix-stack-ccwrap
-
-	local cc
-	for cc in \
-		gcc \
-		g++ \
-		cpp \
-		c++ \
-		windres \
-	; do
-		dosym prefix-stack-ccwrap $wrapperdir/${CHOST}-${cc}
-		dosym ${CHOST}-${cc} $wrapperdir/${cc}
-	done
-
-	# LDPATH is required to keep gcc-config happy :(
-	cat > ./${wrappercfg} <<-EOF
-		GCC_PATH="${EPREFIX}$wrapperdir"
-		LDPATH="${EPREFIX}$wrapperdir"
-		EOF
-
-	insinto /etc/env.d/gcc
-	doins ./${wrappercfg}
-}
-
-src_install() {
-	if use prefix-stack; then
-		src_install-prefix-stack-ccwrap
-		insinto /etc
-		doins prefix-stack.bash_login
-		insinto /etc/bash
-		newins prefix-stack.bashrc bashrc
-		newenvd prefix-stack.envd.99stack 99stack
-		doenvd 000fallback
-	else
-		dobin prefix-stack-setup
-	fi
-	exeinto /
-	doexe startprefix
-}
-
-return 0
-
-: startprefix <<'EOIN'
-#!@GENTOO_PORTAGE_EBASH@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen <grobian@gentoo.org> -- 2007-03-10
-# Enters the prefix environment by starting a login shell from the
-# prefix.  The SHELL environment variable is elevated in order to make
-# applications that start login shells to work, such as `screen`.
-
-# if you come from a substantially polluted environment (another
-# Prefix), a cleanup as follows resolves most oddities I've ever seen:
-# env -i HOME=$HOME TERM=$TERM USER=$USER $SHELL -l
-# hence this script starts the Prefix shell like this
-
-if [[ ${SHELL#@GENTOO_PORTAGE_EPREFIX@} != ${SHELL} ]]
-then
-	echo "You appear to be in prefix already (SHELL=${SHELL})" > /dev/stderr
-	exit -1
-elif [[ ${SHELL#@GENTOO_PORTAGE_BPREFIX@} != ${SHELL} ]] &&
-	 [[ ${EPREFIX-unset} == '@GENTOO_PORTAGE_EPREFIX@' ]]
-then
-	echo "You appear to be in stacked prefix already (EPREFIX=${EPREFIX})" > /dev/stderr
-	exit -1
-fi
-
-# What is our prefix?
-EPREFIX@=@'@GENTOO_PORTAGE_EPREFIX@'
-BPREFIX@=@'@GENTOO_PORTAGE_BPREFIX@'
-
-# not all systems have the same location for shells, however what it
-# boils down to, is that we need to know what the shell is, and then we
-# can find it in the bin dir of our prefix
-for SHELL in \
-	"${EPREFIX}/bin/${SHELL##*/}" \
-	"${BPREFIX}/bin/${SHELL##*/}" \
-	${SHELL##*/}
-do
-	[[ ${SHELL} == */* && -x ${SHELL} ]] && break
-done
-
-# check if the shell exists
-if [[ ${SHELL} != */* ]]
-then
-	echo "Failed to find the Prefix shell, this is probably" > /dev/stderr
-	echo "because you didn't emerge the shell ${SHELL}" > /dev/stderr
-	exit 1
-fi
-
-# set the prefix shell in the environment
-export SHELL
-
-# give a small notice
-echo "Entering Gentoo Prefix ${EPREFIX}"
-# start the login shell, clean the entire environment but what's needed
-RETAIN="HOME=$HOME TERM=$TERM USER=$USER SHELL=$SHELL"
-# PROFILEREAD is necessary on SUSE not to wipe the env on shell start
-[[ -n ${PROFILEREAD} ]] && RETAIN+=" PROFILEREAD=$PROFILEREAD"
-# ssh-agent is handy to keep, of if set, inherit it
-[[ -n ${SSH_AUTH_SOCK} ]] && RETAIN+=" SSH_AUTH_SOCK=$SSH_AUTH_SOCK"
-# if we're on some X terminal, makes sense to inherit that too
-[[ -n ${DISPLAY} ]] && RETAIN+=" DISPLAY=$DISPLAY"
-# do it!
-if [[ ${SHELL#${EPREFIX}} != ${SHELL} ]] ; then
-	'@GENTOO_PORTAGE_EENV@' -i $RETAIN $SHELL -l
-elif [[ ' bash ' == *" ${SHELL##*/} "* ]] ; then
-	# shell coming from different prefix would load it's own
-	# etc/profile upon -l, so we have to override
-	'@GENTOO_PORTAGE_EENV@' -i ${RETAIN} "${SHELL}" --rcfile "${EPREFIX}"/etc/prefix-stack.bash_login -i
-else
-	echo "Only bash is supported with stacked Prefix (you have ${SHELL##*/}), sorry!" > /dev/stderr
-	exit 1
-fi
-# and leave a message when we exit... the shell might return non-zero
-# without having real problems, so don't send alarming messages about
-# that
-echo "Leaving Gentoo Prefix with exit status $?"
-EOIN
-
-: prefix-stack.bashrc <<'EOIN'
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-#
-# In stacked Prefix there is no bash installed, yet
-# etc/bash/bashrc from base Prefix still is useful.
-#
-
-if [[ $- != *i* ]] ; then
-	# Shell is non-interactive, bashrc does not apply
-	return
-fi
-
-if [[ -r @GENTOO_PORTAGE_BPREFIX@/etc/bash/bashrc ]] ; then
-	source '@GENTOO_PORTAGE_BPREFIX@/etc/bash/bashrc'
-	# only if base Prefix does have an etc/bash/bashrc, we also
-	# run bashrc snippets provided by packages in stacked Prefix
-	for sh in '@GENTOO_PORTAGE_EPREFIX@'/etc/bash/bashrc.d/* ; do
-		[[ -r ${sh} ]] && source "${sh}"
-	done
-	unset sh
-else
-	# etc/profile does expect etc/bash/bashrc to set PS1
-	PS1='\u@\h \w \$ '
-fi
-EOIN
-
-: prefix-stack.bash_login <<'EOIN'
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-#
-# In stacked Prefix there is no bash installed, so there is
-# no bash able to load this Prefix' profile as login shell.
-# Instead, you can specify this one as bash rcfile to mimic
-# a bash login shell using this stacked Prefix profile.
-#
-
-if [[ -s '@GENTOO_PORTAGE_EPREFIX@/etc/profile' ]] ; then
-	. '@GENTOO_PORTAGE_EPREFIX@/etc/profile'
-fi
-if [[ -s ~/.bash_profile ]] ; then
-	. ~/.bash_profile
-elif [[ -s ~/.bash_login ]] ; then
-	. ~/.bash_login
-elif [[ -s ~/.profile ]] ; then
-	. ~/.profile
-fi
-EOIN
-
-: prefix-stack.envd.99stack <<'EOIN'
-PKG_CONFIG_PATH@=@"@GENTOO_PORTAGE_EPREFIX@/usr/lib/pkgconfig:@GENTOO_PORTAGE_EPREFIX@/usr/share/pkgconfig"
-PORTAGE_CONFIGROOT@=@"@GENTOO_PORTAGE_EPREFIX@"
-EPREFIX@=@"@GENTOO_PORTAGE_EPREFIX@"
-EOIN
-
-: prefix-stack-setup <<'EOIN'
-#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-PARENT_EPREFIX="@GENTOO_PORTAGE_EPREFIX@"
-PARENT_CHOST="@GENTOO_PORTAGE_CHOST@"
-CHILD_EPREFIX=
-CHILD_PROFILE=
-
-#
-# get ourselfs the functions.sh script for ebegin/eend/etc.
-#
-for f in \
-	/lib/gentoo/functions.sh \
-	/etc/init.d/functions.sh \
-	/sbin/functions.sh \
-; do
-	if [[ -r ${PARENT_EPREFIX}${f} ]] ; then
-		. "${PARENT_EPREFIX}${f}"
-		f=found
-		break
-	fi
-done
-
-if [[ ${f} != found ]] ; then
-	echo "Cannot find Gentoo functions, aborting." >&2
-	exit 1
-fi
-
-for arg in "$@"; do
-	case "${arg}" in
-	--eprefix=*)	CHILD_EPREFIX="${arg#--eprefix=}"	;;
-	--profile=*)	CHILD_PROFILE="${arg#--profile=}"	;;
-
-	--help)
-		einfo "$0 usage:"
-		einfo "  --eprefix=[PATH]       Path to new EPREFIX to create stacked to the prefix"
-		einfo "                         where this script is installed (${PARENT_EPREFIX})"
-		einfo "  --profile=[PATH]       The absolute path to the profile to use. This path"
-		einfo "                         must point to a directory within ${PARENT_EPREFIX}"
-		exit 0
-		;;
-	esac
-done
-
-#
-# sanity check of given values
-#
-
-test -n "${CHILD_EPREFIX}" || { eerror "no eprefix argument given"; exit 1; }
-test -d "${CHILD_EPREFIX}" && { eerror "${CHILD_EPREFIX} already exists"; exit 1; }
-test -n "${CHILD_PROFILE}" || { eerror "no profile argument given"; exit 1; }
-test -d "${CHILD_PROFILE}" || { eerror "${CHILD_PROFILE} does not exist"; exit 1; }
-
-einfo "creating stacked prefix ${CHILD_EPREFIX}"
-
-#
-# functions needed below.
-#
-eend_exit() {
-	eend $1
-	[[ $1 != 0 ]] && exit 1
-}
-
-#
-# create the directories required to bootstrap the least.
-#
-ebegin "creating directory structure"
-(
-	set -e
-	mkdir -p "${CHILD_EPREFIX}"/etc/portage/profile/use.mask
-	mkdir -p "${CHILD_EPREFIX}"/etc/portage/profile/use.force
-	mkdir -p "${CHILD_EPREFIX}"/etc/portage/env
-	mkdir -p "${CHILD_EPREFIX}"/etc/portage/package.env
-	ln -s "${PARENT_EPREFIX}"/etc/portage/repos.conf "${CHILD_EPREFIX}"/etc/portage/repos.conf
-)
-eend_exit $?
-
-#
-# create a make.conf and set PORTDIR and PORTAGE_TMPDIR
-#
-ebegin "creating make.conf"
-(
-	set -e
-	echo "#"
-	echo "# The following values where taken from the parent prefix's"
-	echo "# environment. Feel free to adopt them as you like."
-	echo "#"
-	echo "CFLAGS=\"$(portageq envvar CFLAGS)\""
-	echo "CXXFLAGS=\"$(portageq envvar CXXFLAGS)\""
-	echo "MAKEOPTS=\"$(portageq envvar MAKEOPTS)\""
-	niceness=$(portageq envvar PORTAGE_NICENESS || true)
-	[[ -n ${niceness} ]] &&
-		echo "PORTAGE_NICENESS=\"${niceness}\""
-	echo
-	echo "# Mirrors from parent prefix."
-	echo "GENTOO_MIRRORS=\"$(portageq envvar GENTOO_MIRRORS || true)\""
-	echo
-	echo "# Below comes the prefix-stack setup. Only change things"
-	echo "# if you know exactly what you are doing!"
-	echo "EPREFIX=\"${CHILD_EPREFIX}\""
-	echo "PORTAGE_OVERRIDE_EPREFIX=\"${PARENT_EPREFIX}\""
-	echo "BROOT=\"${PARENT_EPREFIX}\""
-) > "${CHILD_EPREFIX}"/etc/portage/make.conf
-eend_exit $?
-
-ebegin "creating use.mask/prefix-stack"
-printf -- '-%s\n' prefix{,-guest,-stack} > "${CHILD_EPREFIX}"/etc/portage/profile/use.mask/prefix-stack
-eend_exit $?
-
-ebegin "creating use.force/prefix-stack"
-printf -- '%s\n' prefix{,-guest,-stack} > "${CHILD_EPREFIX}"/etc/portage/profile/use.force/prefix-stack
-eend_exit $?
-
-ebegin "creating env/host-cc.conf"
-cat > "${CHILD_EPREFIX}"/etc/portage/env/host-cc.conf <<-EOM
-	CC=${PARENT_CHOST}-gcc
-	CXX=${PARENT_CHOST}-g++
-	EOM
-eend_exit $?
-
-ebegin "creating package.env/prefix-stack"
-cat > "${CHILD_EPREFIX}"/etc/portage/package.env/prefix-stack <<-'EOM'
-	# merge with the parent's chost. this forces the use of the parent
-	# compiler, which generally would be illegal - this is an exception.
-	# This is required for example on winnt, because the wrapper has to
-	# be able to use/resolve symlinks, etc. native winnt binaries miss
-	# that ability, but cygwin binaries don't.
-	sys-devel/gcc-config host-cc.conf
-	sys-apps/gentoo-functions host-cc.conf
-	EOM
-eend_exit $?
-
-#
-# create the make.profile symlinks.
-#
-ebegin "creating make.profile"
-(
-	ln -s "${CHILD_PROFILE}" "${CHILD_EPREFIX}/etc/portage/make.profile"
-)
-eend_exit $?
-
-#
-# adjust permissions of generated files.
-#
-ebegin "adjusting permissions"
-(
-	set -e
-	chmod 644 "${CHILD_EPREFIX}"/etc/portage/make.conf
-	chmod 644 "${CHILD_EPREFIX}"/etc/portage/env/host-cc.conf
-	chmod 644 "${CHILD_EPREFIX}"/etc/portage/package.env/prefix-stack
-)
-eend_exit $?
-
-#
-# now merge some basics.
-#
-ebegin "installing required basic packages"
-(
-	set -e
-	export PORTAGE_CONFIGROOT@=@"${CHILD_EPREFIX}"
-	export EPREFIX@=@"${CHILD_EPREFIX}"
-	export PORTAGE_OVERRIDE_EPREFIX@=@"${PARENT_EPREFIX}"
-
-#	# this -pv is there to avoid the global update output, which is
-#	# there on the first emerge run. (thus, just cosmetics).
-#	emerge --pretend --oneshot --nodeps baselayout-prefix
-
-	# let baselayout create the directories
-	USE@=@"${USE} build" \
-	emerge --verbose --nodeps --oneshot \
-		'>=baselayout-prefix-2.6'
-
-	# Record the prefix-toolkit into @world file, as it provides the
-	# env.d telling the PM to manage this stacked Prefix, but may not
-	# (unlike baselayout) be part of @system set per the profile.
-	emerge --verbose --nodeps \
-		prefix-toolkit
-
-	emerge --verbose --nodeps --oneshot \
-		gentoo-functions \
-		elt-patches \
-		gnuconfig \
-		gcc-config
-
-	# select the stack wrapper profile from gcc-config
-	env -i PORTAGE_CONFIGROOT="${CHILD_EPREFIX}" "$(type -P bash)" "${CHILD_EPREFIX}"/usr/bin/gcc-config 1
-
-	# do this _after_ selecting the correct compiler!
-	emerge --verbose --nodeps --oneshot \
-		libtool
-)
-eend_exit $?
-
-#
-# wow, all ok :)
-#
-ewarn
-ewarn "all done. don't forget to tune ${CHILD_EPREFIX}/etc/portage/make.conf."
-ewarn "to enter the new prefix, run \"${CHILD_EPREFIX}/startprefix\"."
-ewarn
-EOIN
-
-: prefix-stack-ccwrap <<'EOIN'
-#!@GENTOO_PORTAGE_BPREFIX@/bin/bash
-
-if [ -r /cygdrive/. ]; then
-	winpath2unix() { cygpath -u "$1"; }
-	unixpath2win() { cygpath -w "$1"; }
-fi
-
-myself=${0##*/} # basename $0
-link_dirs=()
-opts=()
-chost="@GENTOO_PORTAGE_CHOST@"
-prefix="@GENTOO_PORTAGE_EPREFIX@"
-absprefix=${prefix}
-if [[ ${chost} == *"-winnt"* ]]; then
-	# we may get called from windows binary, like pkgdata in dev-libs/icu
-	# in this case, PATH elements get the "/dev/fs/C/WINDOWS/SUA" prefix
-	absprefix=$(winpath2unix "$(unixpath2win "${absprefix}")")
-fi
-[[ ${myself} == *windres* ]] && mode=compile || mode=link
-orig_args=("$@")
-
-for opt in "$@"
-do
-	case "$opt" in
-	-L)
-		link_dirs=("${link_dirs[@]}" "-L$1")
-		shift
-		;;
-	-L*)
-		link_dirs=("${link_dirs[@]}" "${opt}")
-		;;
-	*)
-		case "${opt}" in
-		-v)
-			# -v done right: only use mode version if -v is the _only_
-			# argument on the command line.
-			[[ ${#orig_args[@]} -gt 1 ]] || mode=version
-			;;
-		--version)	mode=version ;;
-		-c|-E|-S)	mode=compile ;;
-		-print-search-dirs) mode=dirs ;;
-		esac
-		opts=("${opts[@]}" "${opt}")
-		;;
-	esac
-done
-
-# remove any path to current prefix, need base prefix only
-new_path=
-save_ifs=$IFS
-IFS=':'
-for p in $PATH
-do
-	IFS=$save_ifs
-	[[ ${p#${absprefix}} != "${p}" ]] && continue
-	if [[ -z "${new_path}" ]]; then
-		new_path="${p}"
-	else
-		new_path="${new_path}:${p}"
-	fi
-done
-IFS=$save_ifs
-
-PATH=${new_path}
-
-# binutils-config's ldwrapper understands '-R' for aix and hpux too.
-# parity (winnt) understands -rpath only ...
-case "${chost}" in
-*-winnt*) rpath_opt="-Wl,-rpath," ;;
-*) rpath_opt="-Wl,-R," ;;
-esac
-
-pfx_link=("-L${prefix}/usr/lib" "-L${prefix}/lib")
-pfx_link_r=("${rpath_opt}${prefix}/lib" "${rpath_opt}${prefix}/usr/lib")
-pfx_comp=("-I${prefix}/include" "-I${prefix}/usr/include")
-
-# ensure we run the right chost program in base prefix
-[[ ${myself} == *-*-*-* ]] || myself=${chost}-${myself#${chost}-}
-
-case "$mode" in
-link)    exec "${myself}" "${link_dirs[@]}" "${pfx_link[@]}" "${opts[@]}" "${pfx_comp[@]}" "${pfx_link_r[@]}" ;;
-compile) exec "${myself}" "${link_dirs[@]}" "${opts[@]}" "${pfx_comp[@]}" ;;
-version) exec "${myself}" "${orig_args[@]}" ;;
-dirs)
-	"${myself}" "${orig_args[@]}" | while read line; do
-		if [[ "${line}" == "libraries: ="* ]]; then
-			echo "libraries: =${prefix}/usr/lib:${prefix}/lib:${line#"libraries: ="}"
-		else
-			echo "${line}"
-		fi
-	done
-	;;
-*)			echo "cannot infer ${myself}'s mode from comamnd line arguments"; exit 1 ;;
-esac
-EOIN
diff --git a/app-portage/prefix-toolkit/prefix-toolkit-1.ebuild b/app-portage/prefix-toolkit/prefix-toolkit-1.ebuild
deleted file mode 100644
index 0b61ff486871..000000000000
--- a/app-portage/prefix-toolkit/prefix-toolkit-1.ebuild
+++ /dev/null
@@ -1,567 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Utilities for users of Gentoo Prefix"
-HOMEPAGE="https://prefix.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-3"
-SLOT="0"
-
-[[ ${PV} == 9999 ]] ||
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-
-BDEPEND="
-	>sys-apps/portage-2.3.62
-"
-DEPEND=""
-RDEPEND="
-	!app-portage/prefix-chain-setup
-	!sys-apps/prefix-chain-utils
-	prefix-stack? (
-		>=sys-apps/baselayout-prefix-2.6
-	)
-"
-
-S="${WORKDIR}"
-
-my_unpack() {
-	local infile=$1
-	local outfile=${2:-${infile}}
-	ebegin "extracting ${outfile}"
-	sed -ne "/^: ${infile} /,/EOIN/{/EOIN/d;p}" "${EBUILD}" \
-		> "${outfile}" || die "Failed to unpack ${outfile}"
-	eend $?
-}
-
-src_unpack() {
-	if use prefix-stack ; then
-		my_unpack prefix-stack.bash_login
-		my_unpack prefix-stack.bashrc
-		my_unpack prefix-stack.envd.99stack
-		my_unpack prefix-stack-ccwrap
-		local editor pager
-		for editor in "${EDITOR}" {"${EPREFIX}","${BROOT}"}/bin/nano
-		do
-			[[ -x ${editor} ]] || continue
-		done
-		for pager in "${PAGER}" {"${EPREFIX}","${BROOT}"}/usr/bin/less
-		do
-			[[ -x ${pager} ]] || continue
-		done
-		printf '%s\n' "EDITOR=\"${editor}\"" "PAGER=\"${pager}\"" > 000fallback
-	else
-		my_unpack prefix-stack-setup
-	fi
-	my_unpack startprefix
-}
-
-my_prefixify() {
-	local ebash eenv
-	if use prefix-stack ; then
-		ebash="${BROOT}/bin/bash"
-		eenv="${BROOT}/usr/bin/env"
-	else
-		ebash="${EPREFIX}/bin/bash"
-		eenv="${EPREFIX}/usr/bin/env"
-	fi
-
-	# the @=@ prevents repoman from believing we set readonly vars
-	sed -e "s,@GENTOO_PORTAGE_BPREFIX@,${BROOT},g" \
-		-e "s,@GENTOO_PORTAGE_EPREFIX@,${EPREFIX},g" \
-		-e "s,@GENTOO_PORTAGE_CHOST@,${CHOST},g" \
-		-e "s,@GENTOO_PORTAGE_EBASH@,${ebash},g" \
-		-e "s,@GENTOO_PORTAGE_EENV@,${eenv},g" \
-		-e "s,@=@,=,g" \
-		-i "$@" || die
-}
-
-src_configure() {
-	# do not eprefixify during unpack, to allow userpatches to apply
-	my_prefixify *
-}
-
-src_install-prefix-stack-ccwrap() {
-	# install toolchain wrapper.
-	local wrapperdir=/usr/${CHOST}/gcc-bin/${CHOST}-${PN}/${PV}
-	local wrappercfg=${CHOST}-${P}
-
-	exeinto $wrapperdir
-	doexe prefix-stack-ccwrap
-
-	local cc
-	for cc in \
-		gcc \
-		g++ \
-		cpp \
-		c++ \
-		windres \
-	; do
-		dosym prefix-stack-ccwrap $wrapperdir/${CHOST}-${cc}
-		dosym ${CHOST}-${cc} $wrapperdir/${cc}
-	done
-
-	# LDPATH is required to keep gcc-config happy :(
-	cat > ./${wrappercfg} <<-EOF
-		GCC_PATH="${EPREFIX}$wrapperdir"
-		LDPATH="${EPREFIX}$wrapperdir"
-		EOF
-
-	insinto /etc/env.d/gcc
-	doins ./${wrappercfg}
-}
-
-src_install() {
-	if use prefix-stack; then
-		src_install-prefix-stack-ccwrap
-		insinto /etc
-		doins prefix-stack.bash_login
-		insinto /etc/bash
-		newins prefix-stack.bashrc bashrc
-		newenvd prefix-stack.envd.99stack 99stack
-		doenvd 000fallback
-	else
-		dobin prefix-stack-setup
-	fi
-	exeinto /
-	doexe startprefix
-}
-
-return 0
-
-: startprefix <<'EOIN'
-#!@GENTOO_PORTAGE_EBASH@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen <grobian@gentoo.org> -- 2007-03-10
-# Enters the prefix environment by starting a login shell from the
-# prefix.  The SHELL environment variable is elevated in order to make
-# applications that start login shells to work, such as `screen`.
-
-# if you come from a substantially polluted environment (another
-# Prefix), a cleanup as follows resolves most oddities I've ever seen:
-# env -i HOME=$HOME TERM=$TERM USER=$USER $SHELL -l
-# hence this script starts the Prefix shell like this
-
-if [[ ${SHELL#@GENTOO_PORTAGE_EPREFIX@} != ${SHELL} ]]
-then
-	echo "You appear to be in prefix already (SHELL=${SHELL})" > /dev/stderr
-	exit -1
-elif [[ ${SHELL#@GENTOO_PORTAGE_BPREFIX@} != ${SHELL} ]] &&
-	 [[ ${EPREFIX-unset} == '@GENTOO_PORTAGE_EPREFIX@' ]]
-then
-	echo "You appear to be in stacked prefix already (EPREFIX=${EPREFIX})" > /dev/stderr
-	exit -1
-fi
-
-# What is our prefix?
-EPREFIX@=@'@GENTOO_PORTAGE_EPREFIX@'
-BPREFIX@=@'@GENTOO_PORTAGE_BPREFIX@'
-
-# not all systems have the same location for shells, however what it
-# boils down to, is that we need to know what the shell is, and then we
-# can find it in the bin dir of our prefix
-for SHELL in \
-	"${EPREFIX}/bin/${SHELL##*/}" \
-	"${BPREFIX}/bin/${SHELL##*/}" \
-	${SHELL##*/}
-do
-	[[ ${SHELL} == */* && -x ${SHELL} ]] && break
-done
-
-# check if the shell exists
-if [[ ${SHELL} != */* ]]
-then
-	echo "Failed to find the Prefix shell, this is probably" > /dev/stderr
-	echo "because you didn't emerge the shell ${SHELL}" > /dev/stderr
-	exit 1
-fi
-
-# set the prefix shell in the environment
-export SHELL
-
-# give a small notice
-echo "Entering Gentoo Prefix ${EPREFIX}"
-# start the login shell, clean the entire environment but what's needed
-RETAIN="HOME=$HOME TERM=$TERM USER=$USER SHELL=$SHELL"
-# PROFILEREAD is necessary on SUSE not to wipe the env on shell start
-[[ -n ${PROFILEREAD} ]] && RETAIN+=" PROFILEREAD=$PROFILEREAD"
-# ssh-agent is handy to keep, of if set, inherit it
-[[ -n ${SSH_AUTH_SOCK} ]] && RETAIN+=" SSH_AUTH_SOCK=$SSH_AUTH_SOCK"
-# if we're on some X terminal, makes sense to inherit that too
-[[ -n ${DISPLAY} ]] && RETAIN+=" DISPLAY=$DISPLAY"
-# do it!
-if [[ ${SHELL#${EPREFIX}} != ${SHELL} ]] ; then
-	'@GENTOO_PORTAGE_EENV@' -i $RETAIN $SHELL -l
-elif [[ ' bash ' == *" ${SHELL##*/} "* ]] ; then
-	# shell coming from different prefix would load it's own
-	# etc/profile upon -l, so we have to override
-	'@GENTOO_PORTAGE_EENV@' -i ${RETAIN} "${SHELL}" --rcfile "${EPREFIX}"/etc/prefix-stack.bash_login -i
-else
-	echo "Only bash is supported with stacked Prefix (you have ${SHELL##*/}), sorry!" > /dev/stderr
-	exit 1
-fi
-# and leave a message when we exit... the shell might return non-zero
-# without having real problems, so don't send alarming messages about
-# that
-echo "Leaving Gentoo Prefix with exit status $?"
-EOIN
-
-: prefix-stack.bashrc <<'EOIN'
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-#
-# In stacked Prefix there is no bash installed, yet
-# etc/bash/bashrc from base Prefix still is useful.
-#
-
-if [[ $- != *i* ]] ; then
-	# Shell is non-interactive, bashrc does not apply
-	return
-fi
-
-if [[ -r @GENTOO_PORTAGE_BPREFIX@/etc/bash/bashrc ]] ; then
-	source '@GENTOO_PORTAGE_BPREFIX@/etc/bash/bashrc'
-	# only if base Prefix does have an etc/bash/bashrc, we also
-	# run bashrc snippets provided by packages in stacked Prefix
-	for sh in '@GENTOO_PORTAGE_EPREFIX@'/etc/bash/bashrc.d/* ; do
-		[[ -r ${sh} ]] && source "${sh}"
-	done
-	unset sh
-else
-	# etc/profile does expect etc/bash/bashrc to set PS1
-	PS1='\u@\h \w \$ '
-fi
-EOIN
-
-: prefix-stack.bash_login <<'EOIN'
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-#
-# In stacked Prefix there is no bash installed, so there is
-# no bash able to load this Prefix' profile as login shell.
-# Instead, you can specify this one as bash rcfile to mimic
-# a bash login shell using this stacked Prefix profile.
-#
-
-if [[ -s '@GENTOO_PORTAGE_EPREFIX@/etc/profile' ]] ; then
-	. '@GENTOO_PORTAGE_EPREFIX@/etc/profile'
-fi
-if [[ -s ~/.bash_profile ]] ; then
-	. ~/.bash_profile
-elif [[ -s ~/.bash_login ]] ; then
-	. ~/.bash_login
-elif [[ -s ~/.profile ]] ; then
-	. ~/.profile
-fi
-EOIN
-
-: prefix-stack.envd.99stack <<'EOIN'
-PKG_CONFIG_PATH@=@"@GENTOO_PORTAGE_EPREFIX@/usr/lib/pkgconfig:@GENTOO_PORTAGE_EPREFIX@/usr/share/pkgconfig"
-PORTAGE_CONFIGROOT@=@"@GENTOO_PORTAGE_EPREFIX@"
-EPREFIX@=@"@GENTOO_PORTAGE_EPREFIX@"
-EOIN
-
-: prefix-stack-setup <<'EOIN'
-#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-PARENT_EPREFIX="@GENTOO_PORTAGE_EPREFIX@"
-PARENT_CHOST="@GENTOO_PORTAGE_CHOST@"
-CHILD_EPREFIX=
-CHILD_PROFILE=
-
-#
-# get ourselfs the functions.sh script for ebegin/eend/etc.
-#
-for f in \
-	/lib/gentoo/functions.sh \
-	/etc/init.d/functions.sh \
-	/sbin/functions.sh \
-; do
-	if [[ -r ${PARENT_EPREFIX}${f} ]] ; then
-		. "${PARENT_EPREFIX}${f}"
-		f=found
-		break
-	fi
-done
-
-if [[ ${f} != found ]] ; then
-	echo "Cannot find Gentoo functions, aborting." >&2
-	exit 1
-fi
-
-for arg in "$@"; do
-	case "${arg}" in
-	--eprefix=*)	CHILD_EPREFIX="${arg#--eprefix=}"	;;
-	--profile=*)	CHILD_PROFILE="${arg#--profile=}"	;;
-
-	--help)
-		einfo "$0 usage:"
-		einfo "  --eprefix=[PATH]       Path to new EPREFIX to create stacked to the prefix"
-		einfo "                         where this script is installed (${PARENT_EPREFIX})"
-		einfo "  --profile=[PATH]       The absolute path to the profile to use. This path"
-		einfo "                         must point to a directory within ${PARENT_EPREFIX}"
-		exit 0
-		;;
-	esac
-done
-
-#
-# sanity check of given values
-#
-
-test -n "${CHILD_EPREFIX}" || { eerror "no eprefix argument given"; exit 1; }
-test -d "${CHILD_EPREFIX}" && { eerror "${CHILD_EPREFIX} already exists"; exit 1; }
-test -n "${CHILD_PROFILE}" || { eerror "no profile argument given"; exit 1; }
-test -d "${CHILD_PROFILE}" || { eerror "${CHILD_PROFILE} does not exist"; exit 1; }
-
-einfo "creating stacked prefix ${CHILD_EPREFIX}"
-
-#
-# functions needed below.
-#
-eend_exit() {
-	eend $1
-	[[ $1 != 0 ]] && exit 1
-}
-
-#
-# create the directories required to bootstrap the least.
-#
-ebegin "creating directory structure"
-(
-	set -e
-	mkdir -p "${CHILD_EPREFIX}"/etc/portage/profile/use.mask
-	mkdir -p "${CHILD_EPREFIX}"/etc/portage/profile/use.force
-	mkdir -p "${CHILD_EPREFIX}"/etc/portage/env
-	mkdir -p "${CHILD_EPREFIX}"/etc/portage/package.env
-	ln -s "${PARENT_EPREFIX}"/etc/portage/repos.conf "${CHILD_EPREFIX}"/etc/portage/repos.conf
-)
-eend_exit $?
-
-#
-# create a make.conf and set PORTDIR and PORTAGE_TMPDIR
-#
-ebegin "creating make.conf"
-(
-	set -e
-	echo "#"
-	echo "# The following values where taken from the parent prefix's"
-	echo "# environment. Feel free to adopt them as you like."
-	echo "#"
-	echo "CFLAGS=\"$(portageq envvar CFLAGS)\""
-	echo "CXXFLAGS=\"$(portageq envvar CXXFLAGS)\""
-	echo "MAKEOPTS=\"$(portageq envvar MAKEOPTS)\""
-	niceness=$(portageq envvar PORTAGE_NICENESS || true)
-	[[ -n ${niceness} ]] &&
-		echo "PORTAGE_NICENESS=\"${niceness}\""
-	echo
-	echo "# Mirrors from parent prefix."
-	echo "GENTOO_MIRRORS=\"$(portageq envvar GENTOO_MIRRORS || true)\""
-	echo
-	echo "# Below comes the prefix-stack setup. Only change things"
-	echo "# if you know exactly what you are doing!"
-	echo "EPREFIX=\"${CHILD_EPREFIX}\""
-	echo "PORTAGE_OVERRIDE_EPREFIX=\"${PARENT_EPREFIX}\""
-	echo "BROOT=\"${PARENT_EPREFIX}\""
-) > "${CHILD_EPREFIX}"/etc/portage/make.conf
-eend_exit $?
-
-ebegin "creating use.mask/prefix-stack"
-printf -- '-%s\n' prefix{,-guest,-stack} > "${CHILD_EPREFIX}"/etc/portage/profile/use.mask/prefix-stack
-eend_exit $?
-
-ebegin "creating use.force/prefix-stack"
-printf -- '%s\n' prefix{,-guest,-stack} > "${CHILD_EPREFIX}"/etc/portage/profile/use.force/prefix-stack
-eend_exit $?
-
-ebegin "creating env/host-cc.conf"
-cat > "${CHILD_EPREFIX}"/etc/portage/env/host-cc.conf <<-EOM
-	CC=${PARENT_CHOST}-gcc
-	CXX=${PARENT_CHOST}-g++
-	EOM
-eend_exit $?
-
-ebegin "creating package.env/prefix-stack"
-cat > "${CHILD_EPREFIX}"/etc/portage/package.env/prefix-stack <<-'EOM'
-	# merge with the parent's chost. this forces the use of the parent
-	# compiler, which generally would be illegal - this is an exception.
-	# This is required for example on winnt, because the wrapper has to
-	# be able to use/resolve symlinks, etc. native winnt binaries miss
-	# that ability, but cygwin binaries don't.
-	sys-devel/gcc-config host-cc.conf
-	sys-apps/gentoo-functions host-cc.conf
-	EOM
-eend_exit $?
-
-#
-# create the make.profile symlinks.
-#
-ebegin "creating make.profile"
-(
-	ln -s "${CHILD_PROFILE}" "${CHILD_EPREFIX}/etc/portage/make.profile"
-)
-eend_exit $?
-
-#
-# adjust permissions of generated files.
-#
-ebegin "adjusting permissions"
-(
-	set -e
-	chmod 644 "${CHILD_EPREFIX}"/etc/portage/make.conf
-	chmod 644 "${CHILD_EPREFIX}"/etc/portage/env/host-cc.conf
-	chmod 644 "${CHILD_EPREFIX}"/etc/portage/package.env/prefix-stack
-)
-eend_exit $?
-
-#
-# now merge some basics.
-#
-ebegin "installing required basic packages"
-(
-	set -e
-	export PORTAGE_CONFIGROOT@=@"${CHILD_EPREFIX}"
-	export EPREFIX@=@"${CHILD_EPREFIX}"
-	export PORTAGE_OVERRIDE_EPREFIX@=@"${PARENT_EPREFIX}"
-
-#	# this -pv is there to avoid the global update output, which is
-#	# there on the first emerge run. (thus, just cosmetics).
-#	emerge --pretend --oneshot --nodeps baselayout-prefix
-
-	# let baselayout create the directories
-	USE@=@"${USE} build" \
-	emerge --verbose --nodeps --oneshot \
-		'>=baselayout-prefix-2.6'
-
-	# Record the prefix-toolkit into @world file, as it provides the
-	# env.d telling the PM to manage this stacked Prefix, but may not
-	# (unlike baselayout) be part of @system set per the profile.
-	emerge --verbose --nodeps \
-		prefix-toolkit
-
-	emerge --verbose --nodeps --oneshot \
-		gentoo-functions \
-		elt-patches \
-		gnuconfig \
-		gcc-config
-
-	# select the stack wrapper profile from gcc-config
-	env -i PORTAGE_CONFIGROOT="${CHILD_EPREFIX}" "$(type -P bash)" "${CHILD_EPREFIX}"/usr/bin/gcc-config 1
-
-	# do this _after_ selecting the correct compiler!
-	emerge --verbose --nodeps --oneshot \
-		libtool
-)
-eend_exit $?
-
-#
-# wow, all ok :)
-#
-ewarn
-ewarn "all done. don't forget to tune ${CHILD_EPREFIX}/etc/portage/make.conf."
-ewarn "to enter the new prefix, run \"${CHILD_EPREFIX}/startprefix\"."
-ewarn
-EOIN
-
-: prefix-stack-ccwrap <<'EOIN'
-#!@GENTOO_PORTAGE_BPREFIX@/bin/bash
-
-if [ -r /cygdrive/. ]; then
-	winpath2unix() { cygpath -u "$1"; }
-	unixpath2win() { cygpath -w "$1"; }
-fi
-
-myself=${0##*/} # basename $0
-link_dirs=()
-opts=()
-chost="@GENTOO_PORTAGE_CHOST@"
-prefix="@GENTOO_PORTAGE_EPREFIX@"
-absprefix=${prefix}
-if [[ ${chost} == *"-winnt"* ]]; then
-	# we may get called from windows binary, like pkgdata in dev-libs/icu
-	# in this case, PATH elements get the "/dev/fs/C/WINDOWS/SUA" prefix
-	absprefix=$(winpath2unix "$(unixpath2win "${absprefix}")")
-fi
-[[ ${myself} == *windres* ]] && mode=compile || mode=link
-orig_args=("$@")
-
-for opt in "$@"
-do
-	case "$opt" in
-	-L)
-		link_dirs=("${link_dirs[@]}" "-L$1")
-		shift
-		;;
-	-L*)
-		link_dirs=("${link_dirs[@]}" "${opt}")
-		;;
-	*)
-		case "${opt}" in
-		-v)
-			# -v done right: only use mode version if -v is the _only_
-			# argument on the command line.
-			[[ ${#orig_args[@]} -gt 1 ]] || mode=version
-			;;
-		--version)	mode=version ;;
-		-c|-E|-S)	mode=compile ;;
-		-print-search-dirs) mode=dirs ;;
-		esac
-		opts=("${opts[@]}" "${opt}")
-		;;
-	esac
-done
-
-# remove any path to current prefix, need base prefix only
-new_path=
-save_ifs=$IFS
-IFS=':'
-for p in $PATH
-do
-	IFS=$save_ifs
-	[[ ${p#${absprefix}} != "${p}" ]] && continue
-	if [[ -z "${new_path}" ]]; then
-		new_path="${p}"
-	else
-		new_path="${new_path}:${p}"
-	fi
-done
-IFS=$save_ifs
-
-PATH=${new_path}
-
-# binutils-config's ldwrapper understands '-R' for aix and hpux too.
-# parity (winnt) understands -rpath only ...
-case "${chost}" in
-*-winnt*) rpath_opt="-Wl,-rpath," ;;
-*) rpath_opt="-Wl,-R," ;;
-esac
-
-pfx_link=("-L${prefix}/usr/lib" "-L${prefix}/lib")
-pfx_link_r=("${rpath_opt}${prefix}/lib" "${rpath_opt}${prefix}/usr/lib")
-pfx_comp=("-I${prefix}/include" "-I${prefix}/usr/include")
-
-# ensure we run the right chost program in base prefix
-[[ ${myself} == *-*-*-* ]] || myself=${chost}-${myself#${chost}-}
-
-case "$mode" in
-link)    exec "${myself}" "${link_dirs[@]}" "${pfx_link[@]}" "${opts[@]}" "${pfx_comp[@]}" "${pfx_link_r[@]}" ;;
-compile) exec "${myself}" "${link_dirs[@]}" "${opts[@]}" "${pfx_comp[@]}" ;;
-version) exec "${myself}" "${orig_args[@]}" ;;
-dirs)
-	"${myself}" "${orig_args[@]}" | while read line; do
-		if [[ "${line}" == "libraries: ="* ]]; then
-			echo "libraries: =${prefix}/usr/lib:${prefix}/lib:${line#"libraries: ="}"
-		else
-			echo "${line}"
-		fi
-	done
-	;;
-*)			echo "cannot infer ${myself}'s mode from comamnd line arguments"; exit 1 ;;
-esac
-EOIN
diff --git a/app-portage/prefix-toolkit/prefix-toolkit-2.ebuild b/app-portage/prefix-toolkit/prefix-toolkit-2.ebuild
deleted file mode 100644
index 21c172139b10..000000000000
--- a/app-portage/prefix-toolkit/prefix-toolkit-2.ebuild
+++ /dev/null
@@ -1,614 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Utilities for users of Gentoo Prefix"
-HOMEPAGE="https://prefix.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-3"
-SLOT="0"
-
-[[ ${PV} == 9999 ]] ||
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-
-DEPEND="
-	!app-portage/prefix-chain-setup
-	!sys-apps/prefix-chain-utils
-"
-BDEPEND="${DEPEND}
-	>sys-apps/portage-2.3.62
-"
-# In prefix-stack, these dependencies actually are the @system set,
-# as we rely on the base prefix anyway for package management,
-# which should have a proper @system set.
-# See als: pkg_preinst
-RDEPEND="${DEPEND}
-	prefix-stack? (
-		>=sys-apps/baselayout-prefix-2.6
-		sys-apps/gentoo-functions
-		app-portage/elt-patches
-		sys-devel/gnuconfig
-		sys-devel/gcc-config
-	)
-"
-
-S="${WORKDIR}"
-
-my_unpack() {
-	local infile=$1
-	local outfile=${2:-${infile}}
-	ebegin "extracting ${outfile}"
-	sed -ne "/^: ${infile} /,/EOIN/{/EOIN/d;p}" "${EBUILD}" \
-		> "${outfile}" || die "Failed to unpack ${outfile}"
-	eend $?
-}
-
-src_unpack() {
-	if use prefix-stack ; then
-		my_unpack prefix-stack.bash_login
-		my_unpack prefix-stack.bashrc
-		my_unpack prefix-stack.envd.99stack
-		my_unpack prefix-stack-ccwrap
-		local editor pager
-		for editor in "${EDITOR}" {"${EPREFIX}","${BROOT}"}/bin/nano
-		do
-			[[ -x ${editor} ]] || continue
-		done
-		for pager in "${PAGER}" {"${EPREFIX}","${BROOT}"}/usr/bin/less
-		do
-			[[ -x ${pager} ]] || continue
-		done
-		printf '%s\n' "EDITOR=\"${editor}\"" "PAGER=\"${pager}\"" > 000fallback
-	else
-		my_unpack prefix-stack-setup
-	fi
-	my_unpack startprefix
-}
-
-my_prefixify() {
-	local ebash eenv
-	if use prefix-stack ; then
-		ebash="${BROOT}/bin/bash"
-		eenv="${BROOT}/usr/bin/env"
-	else
-		ebash="${EPREFIX}/bin/bash"
-		eenv="${EPREFIX}/usr/bin/env"
-	fi
-
-	# the @=@ prevents repoman from believing we set readonly vars
-	sed -e "s,@GENTOO_PORTAGE_BPREFIX@,${BROOT},g" \
-		-e "s,@GENTOO_PORTAGE_EPREFIX@,${EPREFIX},g" \
-		-e "s,@GENTOO_PORTAGE_CHOST@,${CHOST},g" \
-		-e "s,@GENTOO_PORTAGE_EBASH@,${ebash},g" \
-		-e "s,@GENTOO_PORTAGE_EENV@,${eenv},g" \
-		-e "s,@=@,=,g" \
-		-i "$@" || die
-}
-
-src_configure() {
-	# do not eprefixify during unpack, to allow userpatches to apply
-	my_prefixify *
-}
-
-src_install-prefix-stack-ccwrap() {
-	# install toolchain wrapper.
-	local wrapperdir=/usr/${CHOST}/gcc-bin/${CHOST}-${PN}/${PV}
-	local wrappercfg=${CHOST}-${P}
-
-	exeinto $wrapperdir
-	doexe prefix-stack-ccwrap
-
-	local cc
-	for cc in \
-		gcc \
-		g++ \
-		cpp \
-		c++ \
-		windres \
-	; do
-		dosym prefix-stack-ccwrap $wrapperdir/${CHOST}-${cc}
-		dosym ${CHOST}-${cc} $wrapperdir/${cc}
-	done
-
-	# LDPATH is required to keep gcc-config happy :(
-	cat > ./${wrappercfg} <<-EOF
-		GCC_PATH="${EPREFIX}$wrapperdir"
-		LDPATH="${EPREFIX}$wrapperdir"
-		EOF
-
-	insinto /etc/env.d/gcc
-	doins ./${wrappercfg}
-}
-
-src_install() {
-	if use prefix-stack; then
-		src_install-prefix-stack-ccwrap
-		insinto /etc
-		doins prefix-stack.bash_login
-		insinto /etc/bash
-		newins prefix-stack.bashrc bashrc
-		newenvd prefix-stack.envd.99stack 99stack
-		doenvd 000fallback
-	else
-		dobin prefix-stack-setup
-	fi
-	exeinto /
-	doexe startprefix
-}
-
-pkg_preinst() {
-	use prefix-stack || return 0
-	ebegin "Purging @system package set for prefix stack"
-	# In prefix stack we empty out the @system set defined via make.profile,
-	# as we may be using some normal profile, but that @system set applies
-	# to the base prefix only.
-	# Instead, we only put ourselve into the @system set, and have additional
-	# @system packages in our RDEPEND.
-	my_lsprofile() {
-		(
-			cd -P "${1:-.}" || exit 1
-			[[ -r ./parent ]] &&
-				for p in $(<parent)
-				do
-					my_lsprofile "${p}" || exit 1
-				done
-			pwd -P
-		)
-	}
-	local systemset="/etc/portage/profile/packages"
-	dodir "${systemset%/*}"
-	[[ -s ${EROOT}${systemset} ]] &&
-		grep -v "# maintained by ${PN}" \
-			"${EROOT}${systemset}" \
-			> "${ED}${systemset}"
-	local p
-	for p in $(my_lsprofile "${EPREFIX}"/etc/portage/make.profile)
-	do
-		[[ -s ${p}/${systemset##*/} ]] || continue
-		awk '/^[ \t]*[^-#]/{print "-" $1 " # maintained by '"${PN}-${PVR}"'"}' \
-			< "${p}"/packages || die
-	done | sort -u >> "${ED}${systemset}"
-	[[ ${PIPESTATUS[@]} == "0 0" ]] || die "failed to collect for ${systemset}"
-	echo "*${CATEGORY}/${PN} # maintained by ${PN}-${PVR}" >> "${ED}${systemset}" || die
-	eend $?
-}
-
-return 0
-
-: startprefix <<'EOIN'
-#!@GENTOO_PORTAGE_EBASH@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen <grobian@gentoo.org> -- 2007-03-10
-# Enters the prefix environment by starting a login shell from the
-# prefix.  The SHELL environment variable is elevated in order to make
-# applications that start login shells to work, such as `screen`.
-
-# if you come from a substantially polluted environment (another
-# Prefix), a cleanup as follows resolves most oddities I've ever seen:
-# env -i HOME=$HOME TERM=$TERM USER=$USER $SHELL -l
-# hence this script starts the Prefix shell like this
-
-if [[ ${SHELL#@GENTOO_PORTAGE_EPREFIX@} != ${SHELL} ]]
-then
-	echo "You appear to be in prefix already (SHELL=${SHELL})" > /dev/stderr
-	exit -1
-elif [[ ${SHELL#@GENTOO_PORTAGE_BPREFIX@} != ${SHELL} ]] &&
-	 [[ ${EPREFIX-unset} == '@GENTOO_PORTAGE_EPREFIX@' ]]
-then
-	echo "You appear to be in stacked prefix already (EPREFIX=${EPREFIX})" > /dev/stderr
-	exit -1
-fi
-
-# What is our prefix?
-EPREFIX@=@'@GENTOO_PORTAGE_EPREFIX@'
-BPREFIX@=@'@GENTOO_PORTAGE_BPREFIX@'
-
-# not all systems have the same location for shells, however what it
-# boils down to, is that we need to know what the shell is, and then we
-# can find it in the bin dir of our prefix
-for SHELL in \
-	"${EPREFIX}/bin/${SHELL##*/}" \
-	"${BPREFIX}/bin/${SHELL##*/}" \
-	${SHELL##*/}
-do
-	[[ ${SHELL} == */* && -x ${SHELL} ]] && break
-done
-
-# check if the shell exists
-if [[ ${SHELL} != */* ]]
-then
-	echo "Failed to find the Prefix shell, this is probably" > /dev/stderr
-	echo "because you didn't emerge the shell ${SHELL}" > /dev/stderr
-	exit 1
-fi
-
-# set the prefix shell in the environment
-export SHELL
-
-# give a small notice
-echo "Entering Gentoo Prefix ${EPREFIX}"
-# start the login shell, clean the entire environment but what's needed
-RETAIN="HOME=$HOME TERM=$TERM USER=$USER SHELL=$SHELL"
-# PROFILEREAD is necessary on SUSE not to wipe the env on shell start
-[[ -n ${PROFILEREAD} ]] && RETAIN+=" PROFILEREAD=$PROFILEREAD"
-# ssh-agent is handy to keep, of if set, inherit it
-[[ -n ${SSH_AUTH_SOCK} ]] && RETAIN+=" SSH_AUTH_SOCK=$SSH_AUTH_SOCK"
-# if we're on some X terminal, makes sense to inherit that too
-[[ -n ${DISPLAY} ]] && RETAIN+=" DISPLAY=$DISPLAY"
-# do it!
-if [[ ${SHELL#${EPREFIX}} != ${SHELL} ]] ; then
-	'@GENTOO_PORTAGE_EENV@' -i $RETAIN $SHELL -l
-elif [[ ' bash ' == *" ${SHELL##*/} "* ]] ; then
-	# shell coming from different prefix would load it's own
-	# etc/profile upon -l, so we have to override
-	'@GENTOO_PORTAGE_EENV@' -i ${RETAIN} "${SHELL}" --rcfile "${EPREFIX}"/etc/prefix-stack.bash_login -i
-else
-	echo "Only bash is supported with stacked Prefix (you have ${SHELL##*/}), sorry!" > /dev/stderr
-	exit 1
-fi
-# and leave a message when we exit... the shell might return non-zero
-# without having real problems, so don't send alarming messages about
-# that
-echo "Leaving Gentoo Prefix with exit status $?"
-EOIN
-
-: prefix-stack.bashrc <<'EOIN'
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-#
-# In stacked Prefix there is no bash installed, yet
-# etc/bash/bashrc from base Prefix still is useful.
-#
-
-if [[ $- != *i* ]] ; then
-	# Shell is non-interactive, bashrc does not apply
-	return
-fi
-
-if [[ -r @GENTOO_PORTAGE_BPREFIX@/etc/bash/bashrc ]] ; then
-	source '@GENTOO_PORTAGE_BPREFIX@/etc/bash/bashrc'
-	# only if base Prefix does have an etc/bash/bashrc, we also
-	# run bashrc snippets provided by packages in stacked Prefix
-	for sh in '@GENTOO_PORTAGE_EPREFIX@'/etc/bash/bashrc.d/* ; do
-		[[ -r ${sh} ]] && source "${sh}"
-	done
-	unset sh
-else
-	# etc/profile does expect etc/bash/bashrc to set PS1
-	PS1='\u@\h \w \$ '
-fi
-EOIN
-
-: prefix-stack.bash_login <<'EOIN'
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-#
-# In stacked Prefix there is no bash installed, so there is
-# no bash able to load this Prefix' profile as login shell.
-# Instead, you can specify this one as bash rcfile to mimic
-# a bash login shell using this stacked Prefix profile.
-#
-
-if [[ -s '@GENTOO_PORTAGE_EPREFIX@/etc/profile' ]] ; then
-	. '@GENTOO_PORTAGE_EPREFIX@/etc/profile'
-fi
-if [[ -s ~/.bash_profile ]] ; then
-	. ~/.bash_profile
-elif [[ -s ~/.bash_login ]] ; then
-	. ~/.bash_login
-elif [[ -s ~/.profile ]] ; then
-	. ~/.profile
-fi
-EOIN
-
-: prefix-stack.envd.99stack <<'EOIN'
-PKG_CONFIG_PATH@=@"@GENTOO_PORTAGE_EPREFIX@/usr/lib/pkgconfig:@GENTOO_PORTAGE_EPREFIX@/usr/share/pkgconfig"
-PORTAGE_CONFIGROOT@=@"@GENTOO_PORTAGE_EPREFIX@"
-EPREFIX@=@"@GENTOO_PORTAGE_EPREFIX@"
-EOIN
-
-: prefix-stack-setup <<'EOIN'
-#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-PARENT_EPREFIX="@GENTOO_PORTAGE_EPREFIX@"
-PARENT_CHOST="@GENTOO_PORTAGE_CHOST@"
-CHILD_EPREFIX=
-CHILD_PROFILE=
-
-#
-# get ourselfs the functions.sh script for ebegin/eend/etc.
-#
-for f in \
-	/lib/gentoo/functions.sh \
-	/etc/init.d/functions.sh \
-	/sbin/functions.sh \
-; do
-	if [[ -r ${PARENT_EPREFIX}${f} ]] ; then
-		. "${PARENT_EPREFIX}${f}"
-		f=found
-		break
-	fi
-done
-
-if [[ ${f} != found ]] ; then
-	echo "Cannot find Gentoo functions, aborting." >&2
-	exit 1
-fi
-
-for arg in "$@"; do
-	case "${arg}" in
-	--eprefix=*)	CHILD_EPREFIX="${arg#--eprefix=}"	;;
-	--profile=*)	CHILD_PROFILE="${arg#--profile=}"	;;
-
-	--help)
-		einfo "$0 usage:"
-		einfo "  --eprefix=[PATH]       Path to new EPREFIX to create stacked to the prefix"
-		einfo "                         where this script is installed (${PARENT_EPREFIX})"
-		einfo "  --profile=[PATH]       The absolute path to the profile to use. This path"
-		einfo "                         must point to a directory within ${PARENT_EPREFIX}"
-		exit 0
-		;;
-	esac
-done
-
-#
-# sanity check of given values
-#
-
-test -n "${CHILD_EPREFIX}" || { eerror "no eprefix argument given"; exit 1; }
-test -d "${CHILD_EPREFIX}" && { eerror "${CHILD_EPREFIX} already exists"; exit 1; }
-test -n "${CHILD_PROFILE}" || { eerror "no profile argument given"; exit 1; }
-test -d "${CHILD_PROFILE}" || { eerror "${CHILD_PROFILE} does not exist"; exit 1; }
-
-einfo "creating stacked prefix ${CHILD_EPREFIX}"
-
-#
-# functions needed below.
-#
-eend_exit() {
-	eend $1
-	[[ $1 != 0 ]] && exit 1
-}
-
-#
-# create the directories required to bootstrap the least.
-#
-ebegin "creating directory structure"
-(
-	set -e
-	mkdir -p "${CHILD_EPREFIX}"/etc/portage/profile/use.mask
-	mkdir -p "${CHILD_EPREFIX}"/etc/portage/profile/use.force
-	mkdir -p "${CHILD_EPREFIX}"/etc/portage/env
-	mkdir -p "${CHILD_EPREFIX}"/etc/portage/package.env
-	ln -s "${PARENT_EPREFIX}"/etc/portage/repos.conf "${CHILD_EPREFIX}"/etc/portage/repos.conf
-)
-eend_exit $?
-
-#
-# create a make.conf and set PORTDIR and PORTAGE_TMPDIR
-#
-ebegin "creating make.conf"
-(
-	set -e
-	echo "#"
-	echo "# The following values where taken from the parent prefix's"
-	echo "# environment. Feel free to adopt them as you like."
-	echo "#"
-	echo "CFLAGS=\"$(portageq envvar CFLAGS)\""
-	echo "CXXFLAGS=\"$(portageq envvar CXXFLAGS)\""
-	echo "MAKEOPTS=\"$(portageq envvar MAKEOPTS)\""
-	niceness=$(portageq envvar PORTAGE_NICENESS || true)
-	[[ -n ${niceness} ]] &&
-		echo "PORTAGE_NICENESS=\"${niceness}\""
-	echo
-	echo "# Mirrors from parent prefix."
-	echo "GENTOO_MIRRORS=\"$(portageq envvar GENTOO_MIRRORS || true)\""
-	echo
-	echo "# Below comes the prefix-stack setup. Only change things"
-	echo "# if you know exactly what you are doing!"
-	echo "EPREFIX=\"${CHILD_EPREFIX}\""
-	echo "PORTAGE_OVERRIDE_EPREFIX=\"${PARENT_EPREFIX}\""
-	echo "BROOT=\"${PARENT_EPREFIX}\""
-) > "${CHILD_EPREFIX}"/etc/portage/make.conf
-eend_exit $?
-
-ebegin "creating use.mask/prefix-stack"
-printf -- '-%s\n' prefix{,-guest,-stack} > "${CHILD_EPREFIX}"/etc/portage/profile/use.mask/prefix-stack
-eend_exit $?
-
-ebegin "creating use.force/prefix-stack"
-printf -- '%s\n' prefix{,-guest,-stack} > "${CHILD_EPREFIX}"/etc/portage/profile/use.force/prefix-stack
-eend_exit $?
-
-ebegin "creating env/host-cc.conf"
-cat > "${CHILD_EPREFIX}"/etc/portage/env/host-cc.conf <<-EOM
-	CC=${PARENT_CHOST}-gcc
-	CXX=${PARENT_CHOST}-g++
-	EOM
-eend_exit $?
-
-ebegin "creating package.env/prefix-stack"
-cat > "${CHILD_EPREFIX}"/etc/portage/package.env/prefix-stack <<-'EOM'
-	# merge with the parent's chost. this forces the use of the parent
-	# compiler, which generally would be illegal - this is an exception.
-	# This is required for example on winnt, because the wrapper has to
-	# be able to use/resolve symlinks, etc. native winnt binaries miss
-	# that ability, but cygwin binaries don't.
-	sys-devel/gcc-config host-cc.conf
-	sys-apps/gentoo-functions host-cc.conf
-	EOM
-eend_exit $?
-
-#
-# create the make.profile symlinks.
-#
-ebegin "creating make.profile"
-(
-	ln -s "${CHILD_PROFILE}" "${CHILD_EPREFIX}/etc/portage/make.profile"
-)
-eend_exit $?
-
-#
-# adjust permissions of generated files.
-#
-ebegin "adjusting permissions"
-(
-	set -e
-	chmod 644 "${CHILD_EPREFIX}"/etc/portage/make.conf
-	chmod 644 "${CHILD_EPREFIX}"/etc/portage/env/host-cc.conf
-	chmod 644 "${CHILD_EPREFIX}"/etc/portage/package.env/prefix-stack
-)
-eend_exit $?
-
-#
-# now merge some basics.
-#
-ebegin "installing required basic packages"
-(
-	set -e
-	export PORTAGE_CONFIGROOT@=@"${CHILD_EPREFIX}"
-	export EPREFIX@=@"${CHILD_EPREFIX}"
-	export PORTAGE_OVERRIDE_EPREFIX@=@"${PARENT_EPREFIX}"
-
-	# let baselayout create the directories
-	USE@=@"${USE} build" \
-	emerge --verbose --nodeps --oneshot \
-		'>=baselayout-prefix-2.6'
-
-	# In prefix-stack, app-portage/prefix-toolkit does
-	# install/update an etc/portage/profile/packages file,
-	# removing all @system packages from current make.profile,
-	# and adding itself to @system set instead.
-	emerge --verbose --nodeps --oneshot \
-		app-portage/prefix-toolkit
-
-	# In prefix-stack, prefix-toolkit does have an RDEPEND on them,
-	# to hold them in the @system set.
-	emerge --verbose --nodeps --oneshot \
-		sys-apps/gentoo-functions \
-		app-portage/elt-patches \
-		sys-devel/gnuconfig \
-		sys-devel/gcc-config
-
-	# select the stack wrapper profile from gcc-config
-	env -i PORTAGE_CONFIGROOT="${CHILD_EPREFIX}" \
-		"$(type -P bash)" "${CHILD_EPREFIX}"/usr/bin/gcc-config 1
-)
-eend_exit $?
-
-#
-# wow, all ok :)
-#
-ewarn
-ewarn "all done. don't forget to tune ${CHILD_EPREFIX}/etc/portage/make.conf."
-ewarn "to enter the new prefix, run \"${CHILD_EPREFIX}/startprefix\"."
-ewarn
-EOIN
-
-: prefix-stack-ccwrap <<'EOIN'
-#!@GENTOO_PORTAGE_BPREFIX@/bin/bash
-
-if [ -r /cygdrive/. ]; then
-	winpath2unix() { cygpath -u "$1"; }
-	unixpath2win() { cygpath -w "$1"; }
-fi
-
-myself=${0##*/} # basename $0
-link_dirs=()
-opts=()
-chost="@GENTOO_PORTAGE_CHOST@"
-prefix="@GENTOO_PORTAGE_EPREFIX@"
-absprefix=${prefix}
-if [[ ${chost} == *"-winnt"* ]]; then
-	# we may get called from windows binary, like pkgdata in dev-libs/icu
-	# in this case, PATH elements get the "/dev/fs/C/WINDOWS/SUA" prefix
-	absprefix=$(winpath2unix "$(unixpath2win "${absprefix}")")
-fi
-[[ ${myself} == *windres* ]] && mode=compile || mode=link
-orig_args=("$@")
-
-for opt in "$@"
-do
-	case "$opt" in
-	-L)
-		link_dirs=("${link_dirs[@]}" "-L$1")
-		shift
-		;;
-	-L*)
-		link_dirs=("${link_dirs[@]}" "${opt}")
-		;;
-	*)
-		case "${opt}" in
-		-v)
-			# -v done right: only use mode version if -v is the _only_
-			# argument on the command line.
-			[[ ${#orig_args[@]} -gt 1 ]] || mode=version
-			;;
-		--version)	mode=version ;;
-		-c|-E|-S)	mode=compile ;;
-		-print-search-dirs) mode=dirs ;;
-		esac
-		opts=("${opts[@]}" "${opt}")
-		;;
-	esac
-done
-
-# remove any path to current prefix, need base prefix only
-new_path=
-save_ifs=$IFS
-IFS=':'
-for p in $PATH
-do
-	IFS=$save_ifs
-	[[ ${p#${absprefix}} != "${p}" ]] && continue
-	if [[ -z "${new_path}" ]]; then
-		new_path="${p}"
-	else
-		new_path="${new_path}:${p}"
-	fi
-done
-IFS=$save_ifs
-
-PATH=${new_path}
-
-pfx_comp=("-I${prefix}/include" "-I${prefix}/usr/include")
-pfx_link=("-L${prefix}/usr/lib" "-L${prefix}/lib")
-# binutils-config's ldwrapper understands '-R' for aix and hpux too.
-pfx_link_r=("-Wl,-R,${prefix}/lib" "-Wl,-R,${prefix}/usr/lib")
-case "${chost}" in
-*-winnt*)
-	# parity (winnt) understands -rpath only ...
-	pfx_link_r=("-Wl,-rpath,${prefix}/lib" "-Wl,-rpath,${prefix}/usr/lib")
-	;;
-*-linux*)
-	# With gcc, -isystem would avoid warning messages in installed headers,
-	# but that breaks with AIX host headers.
-	pfx_comp=("-isystem" "${prefix}/include" "-isystem" "${prefix}/usr/include")
-	;;
-esac
-
-# ensure we run the right chost program in base prefix
-[[ ${myself} == *-*-*-* ]] || myself=${chost}-${myself#${chost}-}
-
-case "$mode" in
-link)    exec "${myself}" "${link_dirs[@]}" "${pfx_link[@]}" "${opts[@]}" "${pfx_comp[@]}" "${pfx_link_r[@]}" ;;
-compile) exec "${myself}" "${link_dirs[@]}" "${opts[@]}" "${pfx_comp[@]}" ;;
-version) exec "${myself}" "${orig_args[@]}" ;;
-dirs)
-	"${myself}" "${orig_args[@]}" | while read line; do
-		if [[ "${line}" == "libraries: ="* ]]; then
-			echo "libraries: =${prefix}/usr/lib:${prefix}/lib:${line#"libraries: ="}"
-		else
-			echo "${line}"
-		fi
-	done
-	;;
-*)			echo "cannot infer ${myself}'s mode from comamnd line arguments"; exit 1 ;;
-esac
-EOIN
diff --git a/app-portage/repoman/Manifest b/app-portage/repoman/Manifest
index 84b3ade76233..4974e3452686 100644
--- a/app-portage/repoman/Manifest
+++ b/app-portage/repoman/Manifest
@@ -1,8 +1,8 @@
 DIST repoman-2.3.11.tar.bz2 86807 BLAKE2B f5bf8e9b7bac7816ee9b1139d0e0d30e99fc06da4fb742e430c237d9be0e6261bcf5d8f3412f1c20a34e2766c5acc86176b4731f20adc9554de9949bd5622a5d SHA512 331614554bb7ba49b8b63b8612642426fb458aa84de78bb9958be85d03e43d662fc094ecd2472a6f06c6b4f0368ec0542083b04c25f7d8b6aabb432cd2b32367
-DIST repoman-2.3.14.tar.bz2 86586 BLAKE2B 71ff01bc19817eedb80ff6b3dcd801bb48c49394503a88f2243fc04d56851836a079b6484ec72f794e28bbf9c74b8a99fbae6992ea2d2b5cee0d99fbe366d812 SHA512 1abbb139a63070ad2bf772ee2d0bd6e379f1cb6d32f1fed2f120325a856c2f919b8b26d2a27722eb64057c5f05a035c516ffcf2c6e7a878fdfcca978a622cb02
 DIST repoman-2.3.15.tar.bz2 86707 BLAKE2B 4c890fa311426d523c34fcaaf4e473fbaba6e3247cb55464709bf8547898df89420b4231a10181c06aafdeaa7ab6fffc02f8191f573487541dfd392945864b28 SHA512 d3f8d5d9b743d8fcd9e1a856a4c371747e235620105ed47f9c8b5933fbdcea7e8d556fc89e517834141bc575f15851cd833a56121bfdd55a1d81b3f86f859b74
+DIST repoman-2.3.16.tar.bz2 86739 BLAKE2B dc3e3b5e72df751cfacc17e6f5c847160438a4d6f5d86b4dd17ab8a3a69cd0502f2965934c456ea7538f228c40364535e861c489ab2a09a0df14183b111e9a38 SHA512 d0e8bee1e3bd6dd8aecb1278fc7877768552612c4638488b61a9b8856ad9cd7333c7d52f0c334925d90170a1d8af20e9ead6533edbc10cae02baec629dece121
 EBUILD repoman-2.3.11.ebuild 1943 BLAKE2B b241eb055f279b28a6629a58b90b9d8f16f2df9dbfce8a816e7640a328aa5e71dbc3dd867d3bda6292315d728e533e76ad5fbef4585ed1d8c161c5c8f171f6da SHA512 c83557586c069c566aeb68d995685cd28e72f15eb274f11ed9439e85aff514666f4d4cc3df59388eba97ccc0b0ab313ae089c4935a07cae03561ae6f4bc32f4a
-EBUILD repoman-2.3.14.ebuild 1963 BLAKE2B 4dc7b5a7e24ae8e9267d424271c4f8a185727ab7dab85667a4339082ce9314520544f096cd8f3c0f90b6d2d1b24bd3607be1191414b36df4184e97c58fb47d98 SHA512 926ca8fbf0a9ee482205c891b913ffae61e4a41455eee82aea0da10e93c9a6dbb9100cbacc0a2f3075e5819db78885b7df19edf95d7e208a092d021950ee670b
 EBUILD repoman-2.3.15.ebuild 1963 BLAKE2B 4dc7b5a7e24ae8e9267d424271c4f8a185727ab7dab85667a4339082ce9314520544f096cd8f3c0f90b6d2d1b24bd3607be1191414b36df4184e97c58fb47d98 SHA512 926ca8fbf0a9ee482205c891b913ffae61e4a41455eee82aea0da10e93c9a6dbb9100cbacc0a2f3075e5819db78885b7df19edf95d7e208a092d021950ee670b
+EBUILD repoman-2.3.16.ebuild 1963 BLAKE2B 4dc7b5a7e24ae8e9267d424271c4f8a185727ab7dab85667a4339082ce9314520544f096cd8f3c0f90b6d2d1b24bd3607be1191414b36df4184e97c58fb47d98 SHA512 926ca8fbf0a9ee482205c891b913ffae61e4a41455eee82aea0da10e93c9a6dbb9100cbacc0a2f3075e5819db78885b7df19edf95d7e208a092d021950ee670b
 EBUILD repoman-9999.ebuild 1984 BLAKE2B 731d6bd31c3f65e5402c3ca736afda5e7c566a25d59e869fde16a39cad2541a9261820d72c67150e8789464c8043f24d8329d40c3e8121ce61bc1bc6daa3795c SHA512 e411f9c7ba86104fb32f0013c12956362fe3de11fe5d3238999c4b5c3c625bdd6c7fe6fb136de24993e2525655b9c22c0a06d285323a8babccfb6fc0572a4924
 MISC metadata.xml 472 BLAKE2B 7433ca0ddf5b8554caba0893b28e5681419f18e7f8d28c1c202c98b9a198ea4222958dd537247e29e2f3300ee051860315b15ca7fbd92ba2c4fe614a43171942 SHA512 53566a405056159de7412ea3b447ce6a7b73833fe927a04b5576bc77b2f4b181de8413956ff2b0b1836025352566b0a44252c2ebaf313cfea4020ea5490f3ab0
diff --git a/app-portage/repoman/repoman-2.3.14.ebuild b/app-portage/repoman/repoman-2.3.16.ebuild
index f4313d582c61..f4313d582c61 100644
--- a/app-portage/repoman/repoman-2.3.14.ebuild
+++ b/app-portage/repoman/repoman-2.3.16.ebuild