gentoo resync : 25.08.2020

35 files changed, 237 insertions, 477 deletions

diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index af0a0499fa0d..00d11d5ee0be 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-awk/Manifest b/app-eselect/eselect-awk/Manifest
index 65829bcf8d7f..7b7eeec46c64 100644
--- a/app-eselect/eselect-awk/Manifest
+++ b/app-eselect/eselect-awk/Manifest
@@ -1,5 +1,5 @@
 DIST eselect-awk-0.2.tar.gz 1541 BLAKE2B 4ad07b02869672bef3c905a7417706344ccc11a9a46fcfe85cefa95881a4e727c11481bcefe17f96a77f1adc64d5ad3b1f2dfcc259bfcb8365d03ad68d88d365 SHA512 ef00ac8e8b962c17dc8094d64e5cbf44654a747cc648a5cf38346c3a90e0d685726693094ac265398b40d9d325600073ea2c4905b813f1e40fbfc7627930a5de
 DIST eselect-awk-0.3.tar.gz 1543 BLAKE2B 9ff340002d76a3bc3569501d7b92a8d216eac65e9c009be2a7b43802512050fdae962b53e66bbd0e5df6d295968aa4e3d56c8442adce5eac5d7c8b1f30b1e924 SHA512 d90ed1c8edddd996e2b62b4a927d2c5ead5790aff275e3a79f4a1361358c4debef0c50ec2c8d6da5a210755a5d51cad4b2c5d6ee90553227f0f24b251b52e383
 EBUILD eselect-awk-0.2.ebuild 496 BLAKE2B dabe1c0990015d8ec9d4d1b90e9f5734e63b415c51657db846231d1c3a7337c7fa7438e420e32634a824482146f93b264181713fc2842b2c6e0cf64ecfec7d06 SHA512 4bb01e01ddf6806b0dd2d1bdadde1544edf6d44c683c8aba40a6ca2987477a797fe54b9c7d8fa9388421901bf09bb0c8da242a0fd5b911abfe60754cb9066a61
-EBUILD eselect-awk-0.3.ebuild 505 BLAKE2B 9dbe4ffdcc4125e8fee3941657ca4bd990c7e0ac2b1aa71627f4417936f052796518c216003b468d6b44355da6524b3dbdae62df6bea1f6b8435c347a4211fdc SHA512 3dfb86763dd44d1410b6418513b64ed8a482a592f71175e77ea9ff03f7e30310864aa3243714fcf55918e3763804ec81ce67843b85b0c3d5c3da8f900f2dc408
-MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
+EBUILD eselect-awk-0.3.ebuild 496 BLAKE2B f3a225815be29c3c035401c45704d005dc741f9fcc43dc4c57701f409cde0d4fba64b64079acb4577e60fdb701c2412d3443783b623873601ae5146b24f21087 SHA512 8395caf4f63e1edda625833092454fc87b17adb2d1e370ca0a8bc416d143de6b182d93e74838b34de3a4fce0ef7f8fc7d36ce34458324f57429d26ccfc5614f3
+MISC metadata.xml 281 BLAKE2B 2aae5ea5778d806017d2b9a5ec265d4f50db5cab57712dc18e1441cd7a1a91d595d478926fc465437e1e729ef541d8fbcc8a9a9c09765270f093d4e16ac0072c SHA512 e9c907d7513327937e8a9f400bd097524d23001932d4416f533d43a94b07ba4eaf3f95d28df4193a2a7c8c1a8ce7b512c66a86386cc1bb82325b6bfeea9bc65e
diff --git a/app-eselect/eselect-awk/eselect-awk-0.3.ebuild b/app-eselect/eselect-awk/eselect-awk-0.3.ebuild
index 8289afe8cc93..21ad5fd0d1cc 100644
--- a/app-eselect/eselect-awk/eselect-awk-0.3.ebuild
+++ b/app-eselect/eselect-awk/eselect-awk-0.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~junghans/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-macos"
 IUSE=""
 
 src_install() {
diff --git a/app-eselect/eselect-awk/metadata.xml b/app-eselect/eselect-awk/metadata.xml
index 4eb20a048df2..e70c63a3ec25 100644
--- a/app-eselect/eselect-awk/metadata.xml
+++ b/app-eselect/eselect-awk/metadata.xml
@@ -5,4 +5,5 @@
 		<email>base-system@gentoo.org</email>
 		<name>Gentoo Base System</name>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-eselect/eselect-iptables/Manifest b/app-eselect/eselect-iptables/Manifest
index 712d722d2a30..038effc8b08b 100644
--- a/app-eselect/eselect-iptables/Manifest
+++ b/app-eselect/eselect-iptables/Manifest
@@ -1,3 +1,3 @@
 DIST eselect-iptables-20200508.tar.xz 2152 BLAKE2B e28e566d15116134308ae122443dddb8e66bcbdbbe6f6448bab0b7061710cb3b5610a9f058f43c41c3b130150c5046a6b00b0697d28fea6f2c9049485486c3c4 SHA512 b76734a53a8d1a14e662758516e0bd6d5eefbf8bca5718dae67c912365e21aecc800d63ab9dee626807db8e065469d4019f9b5369937a5b123e25f91faa43d2e
-EBUILD eselect-iptables-20200508.ebuild 650 BLAKE2B a76c4780d29d3d01b4d4e579efbf4898d15cb9d5975bc3d8459c9a4de2043a71d959728862b5a83be6a5af4676c056e77c299d89809b2bf4406878d62e284961 SHA512 b483e75486908db19c0efdc353dc3cba01b46545391fbb10f28ef8bfd2a8d0d39895e52b50948865ed2f491f5613c84055ccee94a8ff4475069717af3688c853
+EBUILD eselect-iptables-20200508.ebuild 643 BLAKE2B 1cac9523c872a1bc74729f55c46e83471325823503ab831468cadf9ee6b6450d45009fb7ad16ee2314f08bae19bd096a60ea213f78af65c99f31d5a82c3ce745 SHA512 f2b068b29b266e213ad5e2193a3ca90422a2580528f3999d687a1587a979059d92a16bb82ad02edd28cc751ce928204dc9d53450294c67b2c9b45aef0eb5a604
 MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
diff --git a/app-eselect/eselect-iptables/eselect-iptables-20200508.ebuild b/app-eselect/eselect-iptables/eselect-iptables-20200508.ebuild
index f033207e9698..060fccc647d1 100644
--- a/app-eselect/eselect-iptables/eselect-iptables-20200508.ebuild
+++ b/app-eselect/eselect-iptables/eselect-iptables-20200508.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~chutzpah/dist/iptables/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv s390 sparc x86"
 
 RDEPEND="app-admin/eselect"
 
diff --git a/app-eselect/eselect-mpost/Manifest b/app-eselect/eselect-mpost/Manifest
deleted file mode 100644
index e6581e1a3d12..000000000000
--- a/app-eselect/eselect-mpost/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-AUX mpost.eselect-0.3 3728 BLAKE2B 24404fd63aa87c430319512d2598ff37c2f342d7966606fd7a861ba8016103257859384932261f7705a26db3ef197ecf89471b2c28829921ce2e77dc2e2d92f1 SHA512 b2cd807c3ebf7933410dddc9a56129a6ecb284cb163510aac7340ca44ce4dd42e69953b24e002da3898b3961f2a661a27615fefec79b5ffed04dac5637c41b01
-EBUILD eselect-mpost-0.3.ebuild 706 BLAKE2B d8073315c6dd25569b147abf6838d860e5db309245aa37d60c8a541cba62b9240e1ec8e15e2dda9dc0d8eeb0cd645b4f729e6aa2180b7a4dcb519c9cb8c8ac7c SHA512 4a1227da522989a46023e19c25745d9ffc98c9c09361c05d2f126b0405098964ca7c0f7ccf77f31aeb35ce6ad3d58f87560e1605fe7523c03eefa4cec9c5ca94
-MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-eselect/eselect-mpost/eselect-mpost-0.3.ebuild b/app-eselect/eselect-mpost/eselect-mpost-0.3.ebuild
deleted file mode 100644
index 8fa30ba755a2..000000000000
--- a/app-eselect/eselect-mpost/eselect-mpost-0.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="mpost module for eselect"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:TeX"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 s390 sparc x86"
-IUSE=""
-
-DEPEND=""
-# Depend on texlive-core-2008 that allows usage of this module, otherwise it
-# will not work so nicely.
-RDEPEND=">=app-admin/eselect-1.2.3
-	>=app-text/texlive-core-2008"
-
-S="${WORKDIR}"
-
-src_install() {
-	local MODULEDIR="/usr/share/eselect/modules"
-	local MODULE="mpost"
-	dodir ${MODULEDIR}
-	insinto ${MODULEDIR}
-	newins "${FILESDIR}/${MODULE}.eselect-${PVR}" ${MODULE}.eselect
-}
diff --git a/app-eselect/eselect-mpost/files/mpost.eselect-0.3 b/app-eselect/eselect-mpost/files/mpost.eselect-0.3
deleted file mode 100644
index 4b772d175000..000000000000
--- a/app-eselect/eselect-mpost/files/mpost.eselect-0.3
+++ /dev/null
@@ -1,147 +0,0 @@
-# -*-eselect-*-  vim: ft=eselect
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="Manage /usr/bin/mpost implementations"
-MAINTAINER="ml@gentoo.org"
-SVN_DATE='$Date: 2015/03/31 16:51:56 $'
-VERSION=$(svn_date_to_version "${SVN_DATE}" )
-
-# find a list of mpost symlink targets, best first
-find_targets() {
-	local f
-	for f in "${ROOT}"/usr/bin/mpost-*; do
-		if [[ -f ${f} ]] ; then
-			echo "${f##*/mpost-}"
-		fi
-	done | sort
-}
-
-# find version number of currently symlinked version
-identify_target() {
-	local f
-	f="$(canonicalise "${ROOT}"/usr/bin/mpost)"
-	echo "${f##*/mpost-}"
-}
-
-# try to remove the mpost symlink
-remove_symlinks() {
-	rm -f "${ROOT}"/usr/bin/mpost &>/dev/null
-}
-
-# set the mpost symlink
-set_symlinks() {
-	local target="${1}" targets
-	if is_number "${target}" && [[ ${target} -ge 1 ]] ; then
-		targets=( $(find_targets ) )
-		target=${targets[$(( ${target} - 1 ))]}
-	fi
-	if [[ -f "${ROOT}/usr/bin/mpost-${target}" ]] ; then
-		remove_symlinks
-		ln -s "mpost-${target}" "${ROOT}/usr/bin/mpost" || \
-			die "Could not set ${target} /usr/bin/mpost symlink"
-		echo "Updating TeX formats"
-		"${ROOT}"/usr/bin/fmtutil-sys --all &>/dev/null || write_warning_msg "Could not update TeX formats for some reason, mpost may not work properly."
-	else
-		die -q "Target \"${target}\" doesn't appear to be valid!"
-	fi
-}
-
-### show action ###
-
-describe_show() {
-	echo "Show the current mpost version"
-}
-
-do_show() {
-	[[ -z "${@}" ]] || die -q "Too many parameters"
-
-	write_list_start "Current mpost version:"
-	if [[ -L "${ROOT}/usr/bin/mpost" ]] ; then
-		write_kv_list_entry "$(identify_target)" ""
-	elif [[ -e "${ROOT}/usr/bin/mpost" ]] ; then
-		write_kv_list_entry "(not a symlink)" ""
-	else
-		write_kv_list_entry "(unset)" ""
-	fi
-}
-
-### list action ###
-
-describe_list() {
-	echo "List available mpost versions"
-}
-
-do_list() {
-	[[ -z "${@}" ]] || die -q "Too many parameters"
-
-	local i targets current
-	targets=( $(find_targets ) )
-	current=$(identify_target)
-	for (( i = 0; i < ${#targets[@]}; i++ )); do
-		[[ ${targets[i]} = ${current} ]] \
-			&& targets[i]=$(highlight_marker "${targets[i]}")
-	done
-	write_list_start "Available mpost versions:"
-	write_numbered_list -m "(none found)" "${targets[@]}"
-}
-
-### set action ###
-
-describe_set() {
-	echo "Set a new mpost version"
-}
-
-describe_set_options() {
-	echo "target : Target version number or index from 'list' action"
-}
-
-describe_set_parameters() {
-	echo "<target>"
-}
-
-do_set() {
-	if [[ -z "${1}" ]] ; then
-		die -q "You didn't give me a version number"
-
-	elif [[ -n "${2}" ]] ; then
-		die -q "Too many parameters"
-
-	elif [[ -L "${ROOT}/usr/bin/mpost" ]] ; then
-		if ! remove_symlinks ; then
-			die -q "Can't remove existing version symlink"
-		elif ! set_symlinks "${1}" ; then
-			die -q "Can't set new version"
-		fi
-
-	elif [[ -e "${ROOT}/usr/bin/mpost" ]] ; then
-		die -q "${ROOT}/usr/bin/mpost seems to be from an old ebuild, please remove manually"
-	else
-		set_symlinks "${1}" || die -q "Can't set new version"
-	fi
-}
-
-### update action ###
-
-describe_update() {
-	echo "Automatically update the mpost version number"
-}
-
-describe_update_options() {
-	echo "--if-unset : Do not override currently selected version"
-}
-
-do_update() {
-	[[ -z "${1}" ]] || ( [[ -z "${2}" ]] && [[ "${1}" == "--if-unset" ]] ) || \
-		die -q "Usage error"
-
-	if [[ -L "${ROOT}/usr/bin/mpost" ]] ; then
-		[[ ${1} == "--if-unset" ]] && return
-		remove_symlinks || die -q "Can't remove existing symlink"
-	fi
-	if [[ -e "${ROOT}/usr/bin/mpost" ]] ; then
-		die -q "${ROOT}/usr/bin/mpost seems to be from an old ebuild, please remove manually"
-	elif ! [[ -z $(find_targets ) ]] ; then
-		set_symlinks 1 || die -q "Can't set a new version"
-	fi
-}
diff --git a/app-eselect/eselect-mpost/metadata.xml b/app-eselect/eselect-mpost/metadata.xml
deleted file mode 100644
index 13170c3184d8..000000000000
--- a/app-eselect/eselect-mpost/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>tex@gentoo.org</email>
-	<name>Gentoo TeX Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-eselect/eselect-pdftex/Manifest b/app-eselect/eselect-pdftex/Manifest
deleted file mode 100644
index 02e2fe68b230..000000000000
--- a/app-eselect/eselect-pdftex/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-AUX pdftex.eselect-0.3 3756 BLAKE2B d63f515ddae49219141093f8bba3830b4d1daaa0d0bf176537b0a0156bf65d3868bd467e337b6bdfff7e04a54cd54d2d4204141d0b2324630fcfef5c6110a7b4 SHA512 6821ae3dda5fdc35f9d8a41e789870e38c525cfafba0079fa912048a74b873236382367e5752ef3e7115799a9bd22e2b2147a5d778e5a2b688d86e550d534b2d
-EBUILD eselect-pdftex-0.3.ebuild 699 BLAKE2B 1d55448678bd84e6571cb57fa94f04a3d5b1dbfcac2a86ba388beb9b6b56dbc3addb2e6c6f6cf525e360643a6d8683930dda4deea7d6e133111876f1d3f61ff9 SHA512 798288a83939d2a10339ea28dfbe4eebf8ce252294983c90481d2c2014db7097b63d5b32e903b80ba8412d3071e3f8470621d07083b8ba14d06afc8c9e6fdcc1
-MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-eselect/eselect-pdftex/eselect-pdftex-0.3.ebuild b/app-eselect/eselect-pdftex/eselect-pdftex-0.3.ebuild
deleted file mode 100644
index b99e6436cf8a..000000000000
--- a/app-eselect/eselect-pdftex/eselect-pdftex-0.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="pdftex module for eselect"
-HOMEPAGE="https://www.gentoo.org/proj/en/eselect/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 s390 sparc x86"
-
-DEPEND=""
-# Depend on texlive-core-2008 that allows usage of this module, otherwise it
-# will not work so nicely.
-RDEPEND=">=app-admin/eselect-1.2.3
-	>=app-text/texlive-core-2008"
-
-S="${WORKDIR}"
-
-src_install() {
-	local MODULEDIR="/usr/share/eselect/modules"
-	local MODULE="pdftex"
-	dodir ${MODULEDIR}
-	insinto ${MODULEDIR}
-	newins "${FILESDIR}/${MODULE}.eselect-${PVR}" ${MODULE}.eselect
-}
diff --git a/app-eselect/eselect-pdftex/files/pdftex.eselect-0.3 b/app-eselect/eselect-pdftex/files/pdftex.eselect-0.3
deleted file mode 100644
index f382c8f876bf..000000000000
--- a/app-eselect/eselect-pdftex/files/pdftex.eselect-0.3
+++ /dev/null
@@ -1,147 +0,0 @@
-# -*-eselect-*-  vim: ft=eselect
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="Manage /usr/bin/pdftex implementations"
-MAINTAINER="tex@gentoo.org"
-SVN_DATE='$Date: 2015/03/31 16:53:36 $'
-VERSION=$(svn_date_to_version "${SVN_DATE}" )
-
-# find a list of pdftex symlink targets, best first
-find_targets() {
-	local f
-	for f in "${ROOT}"/usr/bin/pdftex-*; do
-		if [[ -f ${f} ]] ; then
-			echo "${f##*/pdftex-}"
-		fi
-	done | sort
-}
-
-# find version number of currently symlinked version
-identify_target() {
-	local f
-	f="$(canonicalise "${ROOT}"/usr/bin/pdftex)"
-	echo "${f##*/pdftex-}"
-}
-
-# try to remove the pdftex symlink
-remove_symlinks() {
-	rm -f "${ROOT}"/usr/bin/pdftex &>/dev/null
-}
-
-# set the pdftex symlink
-set_symlinks() {
-	local target="${1}" targets
-	if is_number "${target}" && [[ ${target} -ge 1 ]] ; then
-		targets=( $(find_targets ) )
-		target=${targets[$(( ${target} - 1 ))]}
-	fi
-	if [[ -f "${ROOT}/usr/bin/pdftex-${target}" ]] ; then
-		remove_symlinks
-		ln -s "pdftex-${target}" "${ROOT}/usr/bin/pdftex" || \
-			die "Could not set ${target} /usr/bin/pdftex symlink"
-		echo "Updating TeX formats"
-		"${ROOT}"/usr/bin/fmtutil-sys --all &>/dev/null || write_warning_msg "Could not update TeX formats for some reason, pdftex may not work properly."
-	else
-		die -q "Target \"${target}\" doesn't appear to be valid!"
-	fi
-}
-
-### show action ###
-
-describe_show() {
-	echo "Show the current pdftex version"
-}
-
-do_show() {
-	[[ -z "${@}" ]] || die -q "Too many parameters"
-
-	write_list_start "Current pdftex verson:"
-	if [[ -L "${ROOT}/usr/bin/pdftex" ]] ; then
-		write_kv_list_entry "$(identify_target)" ""
-	elif [[ -e "${ROOT}/usr/bin/pdftex" ]] ; then
-		write_kv_list_entry "(not a symlink)" ""
-	else
-		write_kv_list_entry "(unset)" ""
-	fi
-}
-
-### list action ###
-
-describe_list() {
-	echo "List available pdftex versions"
-}
-
-do_list() {
-	[[ -z "${@}" ]] || die -q "Too many parameters"
-
-	local i targets current
-	targets=( $(find_targets ) )
-	current=$(identify_target)
-	for (( i = 0; i < ${#targets[@]}; i++ )); do
-		[[ ${targets[i]} = ${current} ]] \
-			&& targets[i]=$(highlight_marker "${targets[i]}")
-	done
-	write_list_start "Available pdftex versions:"
-	write_numbered_list -m "(none found)" "${targets[@]}"
-}
-
-### set action ###
-
-describe_set() {
-	echo "Set a new pdftex version"
-}
-
-describe_set_options() {
-	echo "target : Target version number or index from 'list' action"
-}
-
-describe_set_parameters() {
-	echo "<target>"
-}
-
-do_set() {
-	if [[ -z "${1}" ]] ; then
-		die -q "You didn't give me a version number"
-
-	elif [[ -n "${2}" ]] ; then
-		die -q "Too many parameters"
-
-	elif [[ -L "${ROOT}/usr/bin/pdftex" ]] ; then
-		if ! remove_symlinks ; then
-			die -q "Can't remove existing version symlink"
-		elif ! set_symlinks "${1}" ; then
-			die -q "Can't set new version"
-		fi
-
-	elif [[ -e "${ROOT}/usr/bin/pdftex" ]] ; then
-		die -q "${ROOT}/usr/bin/pdftex seems to be from an old ebuild, please remove manually"
-	else
-		set_symlinks "${1}" || die -q "Can't set new version"
-	fi
-}
-
-### update action ###
-
-describe_update() {
-	echo "Automatically update the pdftex version number"
-}
-
-describe_update_options() {
-	echo "--if-unset : Do not override currently selected version"
-}
-
-do_update() {
-	[[ -z "${1}" ]] || ( [[ -z "${2}" ]] && [[ "${1}" == "--if-unset" ]] ) || \
-		die -q "Usage error"
-
-	if [[ -L "${ROOT}/usr/bin/pdftex" ]] ; then
-		[[ ${1} == "--if-unset" ]] && return
-		remove_symlinks || die -q "Can't remove existing symlink"
-	fi
-	if [[ -e "${ROOT}/usr/bin/pdftex" ]] ; then
-		die -q "${ROOT}/usr/bin/pdftex seems to be from an old ebuild, please remove manually"
-	elif ! [[ -z $(find_targets ) ]] ; then
-		set_symlinks 1 || die -q "Can't set a new version"
-	fi
-}
diff --git a/app-eselect/eselect-pdftex/metadata.xml b/app-eselect/eselect-pdftex/metadata.xml
deleted file mode 100644
index 13170c3184d8..000000000000
--- a/app-eselect/eselect-pdftex/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>tex@gentoo.org</email>
-	<name>Gentoo TeX Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-eselect/eselect-python/Manifest b/app-eselect/eselect-python/Manifest
index 50e0bacfe047..a99b6350566f 100644
--- a/app-eselect/eselect-python/Manifest
+++ b/app-eselect/eselect-python/Manifest
@@ -1,4 +1,6 @@
 DIST eselect-python-20190417.tar.bz2 46698 BLAKE2B 6f0acad0abb21d8e4768cbeb12f7e871c316a940ebae4c02bdb1336095991cb6b6bf05661ab659115a67f29a09f2a9b57cfb0868019606ed550b5aa1863f6f71 SHA512 a461263a50a29f0493127ee4a027e49ca4d7631e9c8d16cffc8bdb98cc7e75b0796e45e70951d5559fb86f0db14141a3ea6a53bd4cf1e0cc83ed5c7f24173695
+DIST eselect-python-20200719.tar.bz2 47313 BLAKE2B 37270b1f5ad3dfcd4e19c71ae74da585e803afe89c43f8b912bccf0fbdb936916cf58fc780b654692bb9e6ab44310514bae5f10d19dcde6a0e63042f76abe81d SHA512 4b205a099ad079e5e28d3fdbe774c22f54b7c16bff2d28b54d0e20ee36be2339e928d4050eed74ef969d5815bf4bb691bf5ed6e98023b28972da6d5c7d8a2545
 EBUILD eselect-python-20190417.ebuild 1084 BLAKE2B 8ee22b070bcd50d555ef896d49e25e9590c973e3f36e433116176d085221f04f340713c613572e53f5dd7cd2857f2ece56ca543d83568a59a33f331d6928e574 SHA512 2e5ed3e5315ad862d8b43f1278dad4d56daef65e3a5b103e3f0981e28b7f0fef1df4b3a3a45a4c5db93696c7a85e081ef8452e4df8234b4920792e4af54bdc2a
-EBUILD eselect-python-99999999.ebuild 1094 BLAKE2B a07607d61e97ef3c29dcf22a5aa05c1028cfab576e88451af88d5955b21f0b281d01a0b2a8fd806786708701679b72147c509f638d95c7052b4e6ce36d688d5d SHA512 fb293c5d9c1f1beea28bfd8a2bfa696be40cbe5c7b651545ffcd17047dadb40c28c6f648da33db93f67cd5a789b64aa600dfdf114cd0f3ba9e332dcb76f4625d
+EBUILD eselect-python-20200719.ebuild 1095 BLAKE2B d7cbdeabdabff6889cb3ccb8d80472413f97b94fba5a68501172bb4f874108c99177a3ac2f499758bf73c4a3510819c602448bcb1909fa50a4907f38f503e30f SHA512 f63dc03a54d8b7bee0eb4bc161992e9cebb4c3b83929651f2dd5cb1a802c6aaa7e0c97138ae8fd7f9ec0e6dc3b3f78577ee79cbd6a4d6f2cecf7e374b925d49b
+EBUILD eselect-python-99999999.ebuild 1095 BLAKE2B d7cbdeabdabff6889cb3ccb8d80472413f97b94fba5a68501172bb4f874108c99177a3ac2f499758bf73c4a3510819c602448bcb1909fa50a4907f38f503e30f SHA512 f63dc03a54d8b7bee0eb4bc161992e9cebb4c3b83929651f2dd5cb1a802c6aaa7e0c97138ae8fd7f9ec0e6dc3b3f78577ee79cbd6a4d6f2cecf7e374b925d49b
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/app-eselect/eselect-python/eselect-python-20200719.ebuild b/app-eselect/eselect-python/eselect-python-20200719.ebuild
new file mode 100644
index 000000000000..745d4e05cb20
--- /dev/null
+++ b/app-eselect/eselect-python/eselect-python-20200719.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == "99999999" ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
+else
+	SRC_URI="https://dev.gentoo.org/~chutzpah/dist/misc/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Eselect module for management of multiple Python versions"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Python"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+# python-exec-2.4.2 for working -l option
+RDEPEND="
+	>=app-admin/eselect-1.2.3
+	>=dev-lang/python-exec-2.4.2
+"
+
+src_prepare() {
+	default
+	[[ ${PV} == "99999999" ]] && eautoreconf
+}
+
+pkg_postinst() {
+	local py
+
+	if has_version 'dev-lang/python'; then
+		eselect python update --if-unset
+	fi
+
+	if has_version "=dev-lang/python-3*"; then
+		eselect python update "--python3" --if-unset
+	fi
+}
diff --git a/app-eselect/eselect-python/eselect-python-99999999.ebuild b/app-eselect/eselect-python/eselect-python-99999999.ebuild
index 8e05fb549b51..745d4e05cb20 100644
--- a/app-eselect/eselect-python/eselect-python-99999999.ebuild
+++ b/app-eselect/eselect-python/eselect-python-99999999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ ${PV} == "99999999" ]] ; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
 else
-	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.bz2"
+	SRC_URI="https://dev.gentoo.org/~chutzpah/dist/misc/${P}.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
@@ -16,11 +16,12 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Python"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
 
 # python-exec-2.4.2 for working -l option
-RDEPEND=">=app-admin/eselect-1.2.3
-	>=dev-lang/python-exec-2.4.2"
+RDEPEND="
+	>=app-admin/eselect-1.2.3
+	>=dev-lang/python-exec-2.4.2
+"
 
 src_prepare() {
 	default
diff --git a/app-eselect/eselect-repository/Manifest b/app-eselect/eselect-repository/Manifest
index dbb35f555ed4..11bafe157a81 100644
--- a/app-eselect/eselect-repository/Manifest
+++ b/app-eselect/eselect-repository/Manifest
@@ -1,3 +1,3 @@
 DIST eselect-repository-7.tar.gz 6768 BLAKE2B f648b880ab188b5beb21161dd011d8cea0bc9dd124d524d747a1867a37f334667363be9c0ad9f04275aa1534b904a519d7551c25ea547ae2acff625382c35dbd SHA512 87569158dce3acfdd81a469387fe1a7a7c268cae2e15cfdb12d8377984be5feb674c9b385f0171d27dbe8c2066ae98b2c9a74214340e85380cba173ba26d6f0f
-EBUILD eselect-repository-7.ebuild 996 BLAKE2B 9b906b5ead66be05fee296caac87a065d20c902668ada905aab953c2b8f6734a97e42482cce4cffddac7da18b57e055bcda2e83869742d837d3f619be621f299 SHA512 b78d348da631d1e64b5f0a0297d7d89cf6c03a78662c7d4f2ab10bfd3707fee390757d1eab36448141cddf995bcd5fca6b5ecefd533033b4607f1b9ae9e838e6
+EBUILD eselect-repository-7.ebuild 990 BLAKE2B f1c0d89f71b66b999704bd09ef61d5bb63a0ebfcfa62ef2855b7b5228e8f9538cfcd6a208fa532fa167fc1ea86c69bbc544228364f5c8b5805508df3be8c21b4 SHA512 f69f5704b42ad027996f1b3468a1883331f0f1c287af39e7023dc2985c956e98cb185eebcb52d5942a5f9330049de870db7eca1025c801bd5e0be2dcba8eef87
 MISC metadata.xml 361 BLAKE2B 65f6d76855e7205041fd10b416774d373f2cbf3ef3c13ccbad5069edb5f2d980c67cd1f188471df59ce784ff5b8a100c984644dadacaa4ace8d42c22993fc594 SHA512 40082f5d7899074e331edbe92d13784a3ccff5e04f60db71297ded20b2f1cca88e70b1f4fd6cc94e76048b7f3a718b586ced406452d816333e969e64ac5a3c8e
diff --git a/app-eselect/eselect-repository/eselect-repository-7.ebuild b/app-eselect/eselect-repository/eselect-repository-7.ebuild
index fd7d9fabf887..b2093824acb7 100644
--- a/app-eselect/eselect-repository/eselect-repository-7.ebuild
+++ b/app-eselect/eselect-repository/eselect-repository-7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mgorny/eselect-repository/archive/v${PV}.tar.gz -> $
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE=""
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
diff --git a/app-eselect/eselect-rust/Manifest b/app-eselect/eselect-rust/Manifest
index da88f11e83c1..ab0254f3f855 100644
--- a/app-eselect/eselect-rust/Manifest
+++ b/app-eselect/eselect-rust/Manifest
@@ -1,3 +1,3 @@
 DIST eselect-rust-20200419.tar.bz2 50278 BLAKE2B 5d5e773a0e0481403e1645cb5fdf642e1ce5d1819e9699a79fcaf822ff3e6f258b2d1958548e00df200d9aaf061be1d3b1773e6b0e92b498fe75316ac13ff235 SHA512 68db32df19864a8365e272946161966b9cb513d7403dd1df7a4c7d87fba3b8bfcad59b407dca7dd6c8e0756f2e5cbde367ade69629eaa78d019d2b524051f741
-EBUILD eselect-rust-20200419.ebuild 748 BLAKE2B 1654719606a9bf15c2a6bf31c5e42b8a7f1869f5fad8e52bef4a83fe7bd239ee69ceb1d171e876a2518d95a5cbcfe17f31e2d2cfefb29af552f757f91aa6c3fb SHA512 8f34597fcba494bdf10720a0f5d599d0ab9fa4dcc361025138c87b462233942b1c16c49563c9f0e074f264f23e173c6cff45bbc41041f65db8bd6cc246b00abb
+EBUILD eselect-rust-20200419.ebuild 747 BLAKE2B ac121d02e3775ee599906724d4da991b80e0a0381e36c29c7473f2d860f8c0929bbe6dbcef11a1fed027138fe23e71bc91c2157d12292a7737d4d855d0f9c239 SHA512 fa943b3644c8a77b97e2b162426250d6af92b04e29c40f09239af766185c954b2806f4b81d9e402d5723eb11dca02cf7191494cda77a40cee438dd37f88328e0
 MISC metadata.xml 301 BLAKE2B b569454ab084e600cd974251af1ec665c54a5f37b03d6fdfd43384a36d0c738482ca4605031a8e6a000de46c7d1f756338417b313dd0212e2b0671dc7839a94d SHA512 63b1c2f65bc5f26653ee98ca2722f5da05f1a8b3d430b5921b685c7506c3d685c36d0bc2c2eb293529ffda32d50e1a59783c24d2399c1f647b1bdedb68d48616
diff --git a/app-eselect/eselect-rust/eselect-rust-20200419.ebuild b/app-eselect/eselect-rust/eselect-rust-20200419.ebuild
index 505dc6789336..e8554ff59f49 100644
--- a/app-eselect/eselect-rust/eselect-rust-20200419.ebuild
+++ b/app-eselect/eselect-rust/eselect-rust-20200419.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
 else
 	SRC_URI="https://dev.gentoo.org/~whissi/dist/${PN}/${P}.tar.bz2"
-	KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ppc64 x86"
 fi
 
 DESCRIPTION="Eselect module for management of multiple Rust versions"
diff --git a/app-eselect/eselect-sh/Manifest b/app-eselect/eselect-sh/Manifest
index 43790201f7e1..ee268f309858 100644
--- a/app-eselect/eselect-sh/Manifest
+++ b/app-eselect/eselect-sh/Manifest
@@ -1,5 +1,3 @@
-AUX sh.eselect-0.4-r2 347 BLAKE2B a67b9287c40f2f5d96e3a849f889e092a3861423db7bbe5653fddfd5583a7475edee2eb071792b92980269ce19cae24ca774404e95c51a42b6b67f960d9a38ad SHA512 ab8ff220613e1de75e6ffc4bd0b021e55f80658d0071af9fc1036d28f81cdea35e209869803c33e89ea90fb3c980f511b91bf4e64d56f530e92af5fccff522be
 AUX sh.eselect-0.4.1 341 BLAKE2B 9f1723010505a9a364c83799af6ae4a354bf40e31c911a47cbd93b79362bfa255c8cd7eb1e1a50c3e10dbd02cbb22b53c8727571f63a362fa55c4c76afc2029c SHA512 610078d4c889708ba00a3c6cc6185b6d395b64c680e2da0dfd72a4e9debdbb3b001a089d8bddf0e7d8bb92175a80be823867331661e9b7b3e66a0bf754c4cf8c
-EBUILD eselect-sh-0.4-r2.ebuild 596 BLAKE2B 8addb4b4a9d997d4a3e46241ffc9ed75ba00a8d175ec196606557f29c46a709850777f4c791a5b32275bc7fe1ea9b086877aa8354f108191f4c968de4189cdc6 SHA512 29cd9cc68ace0b699dc360ed3b4a5df2ef0a8f376be0c91008b6d05bab97c26d56d68599b8d209df861d68084648d09b632fc8e9a414f6a5eace9f61e5e122f8
-EBUILD eselect-sh-0.4.1.ebuild 615 BLAKE2B fc3894eff5e5cc2347a8292ce515aa72a973148727f61b64f1eaff35c9953ec7e5cc6dfea4598609534c61d7a8e5202c5f805c760ce8f5897e9ca346cb122c5e SHA512 640bf88060aa3bd585b56d98b926b84807139dac5e74c9667f4469b7d761ada6d57bf86aebb850177a47fab3229bf3b5fa174d9aac501fa6b314a132d0f4c2bf
-MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
+EBUILD eselect-sh-0.4.1.ebuild 607 BLAKE2B 15b26c02a85bdc4ccd398f3f3b5216eca25a5760c370b97f72d0b9f43da0158773d6507afce5aebd529eea131f873d6b40719e5aa0f8956006314d387d318e67 SHA512 cb7a5e5134a296256b1b797ac938b3b7d9a3306eeff30f6d3aa07294652b2d2e8527616505a84a12065c813dca591abbd97fad4dcca70ed5e4dcf618e829998c
+MISC metadata.xml 271 BLAKE2B 21ff27fce9fb36fa286e0cb5324edaf0721e2315d14456c837330d40dabd66369da85b94fc33169ae0caf233d634dd6fd2c29c37c0a78e38307e4adc134381ae SHA512 fa6aa60030292b6236a4b68b26095c3eea1b8dc1decc2be6b36ebb33979c52c39915e6169bfb54ad6f3a8380b1decc23d62f079b134484d97587ab64aa2e1663
diff --git a/app-eselect/eselect-sh/eselect-sh-0.4-r2.ebuild b/app-eselect/eselect-sh/eselect-sh-0.4-r2.ebuild
deleted file mode 100644
index 14e200fd4c89..000000000000
--- a/app-eselect/eselect-sh/eselect-sh-0.4-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Manages the /bin/sh (POSIX shell) symlink"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="app-eselect/eselect-lib-bin-symlink"
-
-S=${FILESDIR}
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	newins sh.eselect-${PVR} sh.eselect
-}
diff --git a/app-eselect/eselect-sh/eselect-sh-0.4.1.ebuild b/app-eselect/eselect-sh/eselect-sh-0.4.1.ebuild
index 2d22ada5e0b1..1220192d9dea 100644
--- a/app-eselect/eselect-sh/eselect-sh-0.4.1.ebuild
+++ b/app-eselect/eselect-sh/eselect-sh-0.4.1.ebuild
@@ -10,7 +10,7 @@ S=${WORKDIR}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="app-eselect/eselect-lib-bin-symlink"
diff --git a/app-eselect/eselect-sh/files/sh.eselect-0.4-r2 b/app-eselect/eselect-sh/files/sh.eselect-0.4-r2
deleted file mode 100644
index 7e7ae94de2da..000000000000
--- a/app-eselect/eselect-sh/files/sh.eselect-0.4-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="Manage /bin/sh (POSIX shell) implementations"
-MAINTAINER="mgorny@gentoo.org"
-VERSION="0.4"
-
-SYMLINK_PATH=/bin/sh
-SYMLINK_TARGETS=( bash dash posh mksh )
-SYMLINK_DESCRIPTION='POSIX shell'
-SYMLINK_CRUCIAL=1
-
-inherit bin-symlink
diff --git a/app-eselect/eselect-sh/metadata.xml b/app-eselect/eselect-sh/metadata.xml
index 0319eec4c8be..5a5a3aaf4299 100644
--- a/app-eselect/eselect-sh/metadata.xml
+++ b/app-eselect/eselect-sh/metadata.xml
@@ -5,4 +5,5 @@
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-eselect/eselect-sndpeek/Manifest b/app-eselect/eselect-sndpeek/Manifest
index 870aafd1a48d..ca0c49d8bdb4 100644
--- a/app-eselect/eselect-sndpeek/Manifest
+++ b/app-eselect/eselect-sndpeek/Manifest
@@ -1,3 +1,3 @@
-DIST sndpeek.eselect-1.0.1.bz2 1263 BLAKE2B ab2ed4019fd3bd991803375dd6219e4ca8bcade739c435beaf034d701324db52d12b0967821716351455f39d181657d6153d889cc313c2a3761994afbd79194d SHA512 39cc065d4fbe408db9c406d84a0ebf4a69a9c50f440f26b714b5f154bf7b5de497df4226434d60c0b1e4e073bbe3a0ca96c3bd574148772a4912e2fc9c9c6b5b
-EBUILD eselect-sndpeek-1.0.1.ebuild 494 BLAKE2B b49f51ce32d3e090c7f6e4752c4f25f8e5c82e8d851c863e7b895c031e1faddfc33960ba42bdac1e667f9dc6016661bf4981055d8d66565588980503d1dfe142 SHA512 251e7a0d63e0102c713c1be9089562dd5765aa139797ba11b185cb0c5dd9f80c7182962fef4aec8dbfefd2700aa1b33ff93de6082bbbc7fb9712df0f61a5d24a
+AUX sndpeek.eselect-1.0.2 3421 BLAKE2B 3a878997876345421b86bbb95dbdf0a4f50562449236bac050d5fc7ff2432315f45160c5a74486814a71691178ce97a48480f56ac3957a3d24edc447446befd8 SHA512 f72e13fad3d2acda398c8e6674d45236effa1060e2e801397ffc80ab06ee61f881564e72de8d83c28286fc09ee3cae6e46d7560d156be9b8cfbdcfd2d46e6f20
+EBUILD eselect-sndpeek-1.0.2.ebuild 452 BLAKE2B 455ac3fe09169af1e99fa9e7703a8fde43f8f8d657fff3627a093fb167d5cd3d2ddbbcfb93835e4f2f975489ff12ac950780bb746c877f2e550ff1565357e90b SHA512 5bf579b600c81d8aa7d4b12bd4d59f4f3793091b25413127a7892bfec5583c80b241933faac59da4fdcd792834465ac7c5c4eb3f6b0df4e4f2b29bba662ec69f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-eselect/eselect-sndpeek/eselect-sndpeek-1.0.1.ebuild b/app-eselect/eselect-sndpeek/eselect-sndpeek-1.0.2.ebuild
index f9b2155ae3d9..0214ffce2cdf 100644
--- a/app-eselect/eselect-sndpeek/eselect-sndpeek-1.0.1.ebuild
+++ b/app-eselect/eselect-sndpeek/eselect-sndpeek-1.0.2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Manages the /usr/bin/sndpeek symlink"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/sndpeek.eselect-${PVR}.bz2"
+SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -18,5 +18,5 @@ S="${WORKDIR}"
 
 src_install() {
 	insinto /usr/share/eselect/modules
-	newins "${WORKDIR}/sndpeek.eselect-${PVR}" sndpeek.eselect
+	newins "${FILESDIR}/sndpeek.eselect-${PV}" sndpeek.eselect
 }
diff --git a/app-eselect/eselect-sndpeek/files/sndpeek.eselect-1.0.2 b/app-eselect/eselect-sndpeek/files/sndpeek.eselect-1.0.2
new file mode 100644
index 000000000000..edb54442ceb6
--- /dev/null
+++ b/app-eselect/eselect-sndpeek/files/sndpeek.eselect-1.0.2
@@ -0,0 +1,143 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Manage /usr/bin/sndpeek audio engine"
+MAINTAINER="cedk@gentoo.org"
+
+# find a list of sndpeek symlink targets, best first
+find_targets() {
+	local f
+	for f in \
+			${ROOT}/usr/bin/sndpeek-alsa \
+			${ROOT}/usr/bin/sndpeek-jack \
+			${ROOT}/usr/bin/sndpeek-oss \
+		; do
+		if [[ -f ${f} ]] ; then
+			echo $(basename ${f} )
+		fi
+	done
+}
+
+# try to remove the sndpeek symlink
+remove_symlinks() {
+	rm -f "${ROOT}"/usr/bin/sndpeek &>/dev/null
+}
+
+# set the sndpeek symlink
+set_symlinks() {
+	local target="${1}" targets
+	if is_number "${target}" && [[ ${target} -ge 1 ]] ; then
+		targets=( $(find_targets ) )
+		target=${targets[$(( ${target} - 1 ))]}
+	fi
+	if [[ -f "${ROOT}/usr/bin/${target}" ]] ; then
+		remove_symlinks
+
+		# it's not okay if these fail
+		ln -s "${ROOT}/usr/bin/${target}" "${ROOT}/usr/bin/sndpeek" || \
+			die "Couldn't set ${target} /usr/bin/sndpeek symlink"
+	else
+		die -q  "Target \"${1}\" doesn't appear to be valid!"
+	fi
+}
+
+### show action ###
+
+describe_show() {
+	echo "Show the current sndpeek audio engine"
+}
+
+do_show() {
+	[[ -z "${@}" ]] || die -q "Too many parameters"
+
+	write_list_start "Current sndpeek audio engine:"
+	if [[ -L "${ROOT}/usr/bin/sndpeek" ]] ; then
+		write_kv_list_entry "$(basename $(canonicalise ${ROOT}/usr/bin/sndpeek ) )" ""
+	elif [[ -e "${ROOT}/usr/bin/sndpeek" ]] ; then
+		write_kv_list_entry "(not a symlink)" ""
+	else
+		write_kv_list_entry "(unset)" ""
+	fi
+}
+
+### list action ###
+
+describe_list() {
+	echo "List available sndpeek audio engines"
+}
+
+do_list() {
+	[[ -z "${@}" ]] || die -q "Too many parameters"
+
+	local i targets
+	targets=( $(find_targets ) )
+	write_list_start "Available sndpeek audio engines:"
+	for (( i = 0 ; i < ${#targets[@]} ; i = i + 1 )) ; do
+		[[ ${targets[${i}]} == $(basename $(canonicalise ${ROOT}/usr/bin/sndpeek ) ) ]] && \
+			targets[${i}]=$(highlight_marker "${targets[${i}]}")
+	done
+	write_numbered_list -m "(none found)" "${targets[@]}"
+}
+
+### set action ###
+
+describe_set() {
+	echo "Set a new sndpeek audio engines"
+}
+
+describe_set_options() {
+	echo "target : Target name or number (from 'list' action)"
+}
+
+describe_set_parameters() {
+	echo "<target>"
+}
+
+do_set() {
+	if [[ -z "${1}" ]] ; then
+		die -q "You didn't give me an audio engine"
+
+	elif [[ -n "${2}" ]] ; then
+		die -q "Too many parameters"
+
+	elif [[ -L "${ROOT}/usr/bin/sndpeek" ]] ; then
+		if ! remove_symlinks ; then
+			die -q "Can't remove existing provider"
+		elif ! set_symlinks "${1}" ; then
+			die -q "Can't set new provider"
+		fi
+
+	elif [[ -e "${ROOT}/usr/bin/sndpeek" ]] ; then
+		die -q "Sorry, ${ROOT}/usr/bin/sndpeek confuses me"
+
+	else
+		set_symlinks "${1}" || die -q "Can't set a new audio engine"
+	fi
+}
+
+### update action ###
+
+describe_update() {
+	echo "Automatically update the audio engine"
+}
+
+describe_update_options() {
+	echo "--if-unset : Do not override existing audio engine"
+}
+
+do_update() {
+	[[ -z "${1}" ]] || ( [[ -z "${2}" ]] && [[ "${1}" == "--if-unset" ]] ) || \
+		die -q "Usage error"
+
+	if [[ -L "${ROOT}/usr/bin/sndpeek" ]] ; then
+		[[ ${1} == "--if-unset" ]] && return
+		remove_symlinks || die -q "Can't remove existing link"
+	fi
+	if [[ -e "${ROOT}/usr/bin/sndpeek" ]] ; then
+		die -q "Can't set a new provider"
+	elif ! [[ -z $(find_targets ) ]] ; then
+		set_symlinks 1 || die -q "Can't set a new provider"
+	fi
+}
+
+# vim: set ft=eselect :
diff --git a/app-eselect/eselect-timidity/Manifest b/app-eselect/eselect-timidity/Manifest
index ad0a525b3407..9d90509b4f9b 100644
--- a/app-eselect/eselect-timidity/Manifest
+++ b/app-eselect/eselect-timidity/Manifest
@@ -1,3 +1,3 @@
 DIST timidity.eselect-20110513.bz2 1689 BLAKE2B 80d99984f3407a8130969626e12212f4c62f1587ef3ed4a0b953d480286f87fa32c57cf84a5794d8effef4690bdfc1d8b7c9c0031919b61ba4e123544bd2df5f SHA512 9af37f195dde3595cb55e3ca467928fd04b5f755545cf41ce0b3198a21107ad35e28365c1d310a77561f8ffcb1b10909b618fbdc55ca06b77492711b48c17afe
-EBUILD eselect-timidity-20110513.ebuild 534 BLAKE2B 1c1464816b127a3fff594d67c6409e7c5db3f6922d0a97e4f79fecdf99fbd6f31456c192501a829f1a07997abb878df94e6b83c6ddffd28a6ec495a3f6baca3f SHA512 025e4ab4e745a4fc1fed93285247f4aff30592867ef83c1ff979968dc5afe243421d65deb4fdee2cfdeccfb3f9d004355a573c307b430de5188975d525c51cab
+EBUILD eselect-timidity-20110513.ebuild 533 BLAKE2B 2faa6d76714f7de686d779612eb76962a3907687152d94788432e4ea4e67711ae529e6343bbf29ddf1b29e0d62ec7950ad4c93dd4dacde9ee4eaf15e2d83c4c1 SHA512 ce201454bdf8aaf3e13197dae0d0e8de4b0596e89383345f5d821605eddb74971e723b3dcf6ca32fefe435dbbbdc91502b4175c816f8209dc28561092147b843
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/app-eselect/eselect-timidity/eselect-timidity-20110513.ebuild b/app-eselect/eselect-timidity/eselect-timidity-20110513.ebuild
index 20346b6264bc..bf5e371cf9fc 100644
--- a/app-eselect/eselect-timidity/eselect-timidity-20110513.ebuild
+++ b/app-eselect/eselect-timidity/eselect-timidity-20110513.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/timidity.eselect-${PVR}.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
 
 RDEPEND=">=app-admin/eselect-1.2.3"
 S="${WORKDIR}"
diff --git a/app-eselect/eselect-vi/Manifest b/app-eselect/eselect-vi/Manifest
index 3e0d9b543763..f30c5029fc50 100644
--- a/app-eselect/eselect-vi/Manifest
+++ b/app-eselect/eselect-vi/Manifest
@@ -1,4 +1,3 @@
-DIST eselect-vi-1.1.9.tar.xz 6236 BLAKE2B 09853ac48d1f904de5602244306ab35cb0597d14ddfbb1865ee54adf53bf190df6574cb5d8c27e3e41b12768c79f10ed1482b7ffb66015375b0214d32d17dbe3 SHA512 618c83d1e93a6c137b1c787c9bf9df19b68b7ef6679ba6179f13582f67e494d365da778b4646aff4af7196399468204c249e59e104a69851bb411fff1b3d038f
-EBUILD eselect-vi-1.1.9-r1.ebuild 622 BLAKE2B d945046cf6f7d627e8231a8fac1fabeb824f4c397826064b726a4bdb851aeb098fdaca0c868d84b514c02b9a135953ddcbe26e7664e58daf09025bc6b5df0f02 SHA512 f53469343836844b128baeb82e22a8f99b66a73ddd784fd5343070c4b583f86b928375b77cbfba360f766ab59cdac0d792c198353204ecc3cff05d0fdb817e24
-EBUILD eselect-vi-1.1.9.ebuild 622 BLAKE2B 5184466895f5425fc3e8e1b3fa27f3e4dd9e9b612d2268cbcd77158cce20b538511dc52285f6e4723e911990483d6b95710faf04c29f9deaf27d0e1bb548052f SHA512 5b493bbe4ba4ff59d31ebf2772ea2b81c7971a48592d538696f0794077442fb78996bcb9cca2956dc6dd045e226ea34f3426639e84e92be290d710b1e27971db
+DIST eselect-vi-1.2.tar.gz 2078 BLAKE2B 0f78afe201d9db72de005e035fd044435faf76b0027ce570cad09f3b4f0f497631f57107222de5e649c8badc0cbc3172edd1f1600e5b7bee8ba6f78b2ae9277a SHA512 77ec5281a25156d4a6c4b35fb154aa5837e4d2335637ecdb66a75984419439526f2215abe39a4d08e68d8dd3e337f47947f5a8fbf89ae7ecca8631e7dbf50dc5
+EBUILD eselect-vi-1.2.ebuild 634 BLAKE2B 18ad8a2475ff84c73a33ff672e3f3d384689cb0f7ec1d7f3057bad2dee7a0b1d6c1609e4992825e98a2451b5a024029c3d9819270611c85a17e707fe7e9821e3 SHA512 15fd1a7083ae100255e814f0bd73a0c5a24c6efb603ed23fd5f136fc5a73a1f17a79fec25b58d9d833be357439530764703f8f12853de2eaef5aa64effc1e9f3
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-eselect/eselect-vi/eselect-vi-1.1.9-r1.ebuild b/app-eselect/eselect-vi/eselect-vi-1.1.9-r1.ebuild
deleted file mode 100644
index babee4ae5969..000000000000
--- a/app-eselect/eselect-vi/eselect-vi-1.1.9-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Manages the /usr/bin/vi symlink"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="app-admin/eselect"
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	doins vi.eselect
-}
diff --git a/app-eselect/eselect-vi/eselect-vi-1.1.9.ebuild b/app-eselect/eselect-vi/eselect-vi-1.1.9.ebuild
deleted file mode 100644
index 63b066d61b92..000000000000
--- a/app-eselect/eselect-vi/eselect-vi-1.1.9.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Manages the /usr/bin/vi symlink"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=app-admin/eselect-1.0.6"
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	doins vi.eselect
-}
diff --git a/app-eselect/eselect-vi/eselect-vi-1.2.ebuild b/app-eselect/eselect-vi/eselect-vi-1.2.ebuild
new file mode 100644
index 000000000000..53174634927e
--- /dev/null
+++ b/app-eselect/eselect-vi/eselect-vi-1.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Manages the /usr/bin/vi symlink"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Vim"
+SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="app-admin/eselect"
+
+src_prepare() {
+	default
+	eautoreconf
+}