gentoo resync : 23.09.2020

14 files changed, 418 insertions, 8 deletions

diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index d11c54fa02cd..62573172d07c 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-java/Manifest b/app-eselect/eselect-java/Manifest
index 1ddee0ceac81..afaae640109b 100644
--- a/app-eselect/eselect-java/Manifest
+++ b/app-eselect/eselect-java/Manifest
@@ -1,3 +1,5 @@
 DIST eselect-java-0.4.0.tar.xz 13412 BLAKE2B da3df5c342b1632d1cc597909283cfcb7cb71d4bff04c2aa3253110f06b8addc5121efe1a50409f2b297c70c4f816a385a0199e68821acb6c48e3065d3097b37 SHA512 a1bdb2554e4dc78d980cab80591f6e0c537f983ae78d2ca98bda8f5292cf749fa5a9983dc51c6576176566f2fcc255ca40b04c26bd1b5d7f1db2d12b76048567
+DIST eselect-java-0.4.2.tar.bz2 13782 BLAKE2B 10fd7faa3759f5b0d52c04bcd5a9f1c438814f4b477c12d2f0843c146d10cd8f7db43594ca4dc29de85bc33864fe1b205c69f9d2dc10c739ca1d50071fac6aad SHA512 dbb9ff873cf3073f60ba783e32b5a75c88114f790643d4a898db5429d04452f64cc5757a1ec2fb7c33beee1fc4509abeb7016f112c2bc75543a4250a85cb19cb
 EBUILD eselect-java-0.4.0.ebuild 1192 BLAKE2B df2205542d5a61c7996562f62c21c748ce08fc242bda09ec551d3417603e086fb9ca4f4534592110c5a9bfcbe659651c171445f7ecf6c9c60e67d69d0e082221 SHA512 33d5979af99ca95e32f3736acdcf7441ad9776482dc6ffdbdf7d67ce81c681b9568274f5be338e305024fd931bb079c4b6439c0e15b543bf1c7e6a1aa29cb74d
+EBUILD eselect-java-0.4.2.ebuild 1199 BLAKE2B a66fb0fbedc2232ae0c89d6d16c8c0026bb155f25ecbe83d6f640dcdcae3debb7276cd4f4e913ab18b9f3fa9849dffa006f97a46d69d2fd54c3b758cea62dabc SHA512 34ab609fa2171b7551c259364fff5b22628f9f7b46c401e6271d3527fc18c3cb9e0ce744b7731a6661b6e9cc1a65f9d7c92fd3d382291f608be49095880ab42f
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/app-eselect/eselect-java/eselect-java-0.4.2.ebuild b/app-eselect/eselect-java/eselect-java-0.4.2.ebuild
new file mode 100644
index 000000000000..396c12444044
--- /dev/null
+++ b/app-eselect/eselect-java/eselect-java-0.4.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A set of eselect modules for Java"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
+SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	!app-eselect/eselect-ecj
+	!app-eselect/eselect-maven
+	!<dev-java/java-config-2.2
+	app-admin/eselect"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+pkg_postinst() {
+	local REMOVED=0
+
+	rm -v "${EROOT}"/usr/lib*/nsbrowser/plugins/javaplugin.so 2>/dev/null && REMOVED=1
+	rm -v "${EROOT}"/etc/java-config-2/current-icedtea-web-vm 2>/dev/null && REMOVED=1
+
+	if [[ ${REMOVED} = 1 ]]; then
+		elog "The eselect java-nsplugin module has been removed and your configuration"
+		elog "has been cleaned up. From now on, you may only install either Oracle or"
+		elog "IcedTea's plugin but not both. Note you can use IcedTea's plugin with an"
+		elog "Oracle VM. See the README installed with icedtea-web for more details."
+	fi
+}
diff --git a/app-eselect/eselect-lua/Manifest b/app-eselect/eselect-lua/Manifest
index f191120bcf19..667940d3f7db 100644
--- a/app-eselect/eselect-lua/Manifest
+++ b/app-eselect/eselect-lua/Manifest
@@ -1,3 +1,4 @@
 AUX lua.eselect-1 3217 BLAKE2B c3f2723afd8177878443bad6fbb51d16a0b90a9f439fe0f2dd150105488db540481136e2ff5f3d2a0b71bdcc88e95f6751a63c7c0a6bea4c32445f8871aa4163 SHA512 653aa84caf8a3706206099de78d8e1b2bbd41cda40dd7dac2b022c85a1988d864a80f490389db3fc2450555d301f965189df132a964a4425ee2bab6c2b7be220
-EBUILD eselect-lua-1.ebuild 605 BLAKE2B 25d04cde1981dfd1d7779c3aef7667bab3b36aad6241748352ba46556461e20810067756dc55a6b2d131fba43c70021c2919762dabec6c9dc9508c190a49d5b6 SHA512 8ca272a71ccce716bcd11b77f759efa1f2edcf1be72bcec31fe72be9c0140f9cd827e60c45e1299338d38595be9a558643998f7e2d69ec0453e5f36d4f32f305
-MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
+AUX lua.eselect-2 4192 BLAKE2B 90c8241a3dcc822466aa9a95420143bcdcd5a9aed3d8688958cc2bd30005f298399f8d34834ffb7a727a1186acfd9e98b765cc5a949ef81e39ca96e83c028afa SHA512 fa7dfa52542d9410dcc5f60bc4ef63db7b8396c7ba6115f2d83951a171d996aea3c13530ac2d7ef5025b5047aacb2e4936527377aec0d53229f46d518bd79845
+EBUILD eselect-lua-2.ebuild 791 BLAKE2B 029dd825b07c7a8406658dd34dd1e5699624900a35683befe97e045cd3c492bc9acbeee0c7d1a963742a4284da4e5f231ab27952ab9e971fe0822f9d8fad1d16 SHA512 bc52a5adf91a1029fea819be865040f5f6d77d88d4e22e9f6af1780966b1bb1f07e4d7bf19a83c87abdb5df2560d9a6ea3e9cd2a29eed96976317cdd7536236c
+MISC metadata.xml 361 BLAKE2B d4e3b671abc0924f33030927fed5591df325b49a42711b7d5d9c4c9052433903414434402c12dbebf907f8197fb0f82bf9d44202599e255ccbc01b6e3d78bbed SHA512 425998f090c34d79e2190c0aa0ad81601a9e2fca458f7e9fe0fd4b09f2abb10c7eb4a02307d97e28d5b3aee3098eda57715d0e0cdbe254ba9f2768def2e74654
diff --git a/app-eselect/eselect-lua/eselect-lua-1.ebuild b/app-eselect/eselect-lua/eselect-lua-2.ebuild
index 321aa9120693..82abd3207ea4 100644
--- a/app-eselect/eselect-lua/eselect-lua-1.ebuild
+++ b/app-eselect/eselect-lua/eselect-lua-2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Lua eselect module"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
@@ -11,9 +11,24 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-DEPEND=">=app-admin/eselect-1.2.4"
+DEPEND="
+	!dev-lang/lua:0
+	>=app-admin/eselect-1.2.4
+"
 RDEPEND="${DEPEND}"
-
+PDEPEND="
+	|| (
+		dev-lang/lua:5.1
+		dev-lang/lua:5.2
+		dev-lang/lua:5.3
+		(
+			dev-lang/luajit:2
+			app-eselect/eselect-luajit
+		)
+	)
+"
+#		dev-lang/lua:5.4
+# TODO: ^
 S="${WORKDIR}"
 
 src_install() {
diff --git a/app-eselect/eselect-lua/files/lua.eselect-2 b/app-eselect/eselect-lua/files/lua.eselect-2
new file mode 100644
index 000000000000..02a942788b9d
--- /dev/null
+++ b/app-eselect/eselect-lua/files/lua.eselect-2
@@ -0,0 +1,172 @@
+# -*-eselect-*-  vim: ft=eselect
+# Copyright 2014-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+inherit config multilib
+
+DESCRIPTION="Manage lua symlinks"
+MAINTAINER="mva@gentoo.org"
+
+HEADER_FILES="lauxlib.h luaconf.h lua.h lua.hpp lualib.h"
+
+remove_symlinks() {
+	rm -f "${EROOT}"/usr/bin/{lua,luac} &>/dev/null 
+	for dir in $(get_libdirs) ; do
+		rm -f "${EROOT}"${dir}/liblua.so &>/dev/null && \
+		rm -f "${EROOT}"${dir}/pkgconfig/lua.pc &>/dev/null
+	done
+	for f in $HEADER_FILES ; do
+		rm -f "${EROOT}"/usr/include/${f}
+	done
+	rm -f "${EROOT}"/usr/share/man/man1/{lua,luac}.1{,.gz,.bz2,.lzma} &>/dev/null
+}
+
+_dup() {
+	dirname ${1}/.
+}
+
+set_symlinks() {
+	local ver=$1
+	ln -s lua${ver} $(_dup "${EROOT}"/usr/bin/lua)
+	ln -s luac${ver} $(_dup "${EROOT}"/usr/bin/luac)
+	for dir in $(get_libdirs) ; do
+		if has 'jit*' ${ver}; then
+			type -p lua${ver} &>/dev/null || die -q "It's something wrong with your lua${ver} installation: it's binary leads to broken symlink"
+			local abi=$(lua${ver} -e 'print(_VERSION:match("%d.%d"))')
+			local libname=libluajit-${abi}.so.${ver##jit-}
+			test -f "${EROOT}/${dir}/${libname}" || die -q "Can't find libluajit for lua${ver} (lua abi: ${abi})"
+			ln -s ${libname} $(_dup "${EROOT}/${dir}"/liblua.so)
+		else
+			ln -s liblua${ver}.so $(_dup "${EROOT}/${dir}"/liblua.so)
+		fi
+		ln -s lua${ver}.pc $(_dup "${EROOT}/${dir}"/pkgconfig/lua.pc)
+	done
+	for manpage in "${EROOT}"/usr/share/man/man1/lua*${ver}.1* ; do
+		test -f ${manpage} &&
+		ln -s $(basename "${manpage}") $(_dup "${manpage//${ver}}")
+	done
+	for header in $HEADER_FILES ; do
+		local hdr;
+		if has 'jit*' ${ver}; then
+			type -p lua${ver} &>/dev/null || die -q "lua${ver} binary is missing (or leads to broken symlink)"
+			local jit_v=$(lua${ver} -e 'print(jit.version:match("%d.%d"))')
+			hdr=luajit-${jit_v}/${header};
+		else
+			hdr=lua${ver}/${header};
+		fi
+		test -f "${EROOT}/usr/include/${hdr}" || die -q "Missing header: ${header}"
+		ln -s "${hdr}" $(_dup "${EROOT}"/usr/include/${header})
+	done
+}
+
+get_libdirs() {
+	local dir libdirs
+	for dir in $(list_libdirs); do
+		[[ -L ${EROOT}/usr/${dir} ]] && continue
+		ls "${EROOT}"/usr/${dir}/liblua*.* > /dev/null 2>&1 || continue
+
+		libdirs+=' '/usr/${dir}
+	done
+	echo ${libdirs:-/usr/lib}
+}
+
+find_targets() {
+	local dirs
+	local prefix="${EROOT}/usr/bin/lua"
+	for f in ${prefix}{5,jit-2}.* ; do
+		[[ -f "${f}" ]] && dirs="${dirs} ${f##$prefix}"
+	done
+	echo $dirs
+}
+
+resolv_target() {
+	local targets=( $(find_targets) )
+	if is_number $1; then
+		[[ $1 -le ${#targets[@]} && $1 -gt 0 ]] && echo "${targets[ $(( $1 - 1 )) ]}"
+	elif has $1 ${targets[@]}; then
+	  echo $1
+	fi
+}
+
+get_active_version() {
+	readlink -e "${EROOT}"/usr/bin/lua | sed -ne "s:.*/usr/bin/lua\([\w.-]*\):\1:p"
+}
+
+## Actual actions
+
+## set action
+
+describe_set() {
+	echo "Sets the current version of lua"
+}
+
+describe_set_parameters() {
+	echo '<target>'
+}
+
+describe_set_options() {
+	echo 'target:	Target name or number (from "list" action)'
+}
+
+
+do_set() {
+	local target=$(resolv_target $1)
+	if [[ -z "${target}" ]]; then
+	  die -q "You need to specify a version"
+	fi
+	remove_symlinks
+	set_symlinks $target
+}
+
+## List action
+
+describe_list() {
+	echo 'Lists available lua versions'
+}
+
+do_list() {
+	local targets
+	local a
+	targets=( $(find_targets) )
+	a=$(get_active_version)
+	for (( i = 0; i < ${#targets[@]}; i++ )) ; do
+		[[ $a == ${targets[i]} ]] && targets[i]=$(highlight_marker "${targets[i]}")
+	done
+	write_numbered_list -m '(none found)' "${targets[@]}"
+}
+
+## Show action
+
+describe_show() {
+	echo 'Show the active lua version'
+}
+
+do_show() {
+	get_active_version
+}
+
+## update action
+
+describe_update() {
+	echo 'Automatically update the lua version'
+}
+
+describe_update_options() {
+	echo 'ifunset : Do not override existing implementation'
+}
+
+do_update() {
+	[[ -n ${1} && ! ( ${1} == ifunset || ${1} == '--if-unset' ) ]] && \
+		die -q 'Usage error'
+
+	[[ ( ${1} == ifunset || ${1} == '--if-unset' ) && -n $(get_active_version) ]] && \
+		return
+
+	remove_symlinks
+	
+	local targets=( $(find_targets) )
+	if [[ -n ${#targets[@]} ]] ; then
+		local target=${targets[${#targets[@]} - 1]}
+		set_symlinks $target || echo 'Nothing to update'
+	fi
+}
diff --git a/app-eselect/eselect-lua/metadata.xml b/app-eselect/eselect-lua/metadata.xml
index c36c37139fad..c4df8c7ed369 100644
--- a/app-eselect/eselect-lua/metadata.xml
+++ b/app-eselect/eselect-lua/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>mva@gentoo.org</email>
+		<name>Vadim Misbakh-Soloviov</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
diff --git a/app-eselect/eselect-luajit/Manifest b/app-eselect/eselect-luajit/Manifest
new file mode 100644
index 000000000000..eefbaed2d87c
--- /dev/null
+++ b/app-eselect/eselect-luajit/Manifest
@@ -0,0 +1,3 @@
+AUX luajit-1.eselect 3831 BLAKE2B 8c45b01c3a4ae73e337b7a5f89621e6bdd1c6889dcd67a7a53dfea3b28264955bc9bd1cb7690f55194e312326c9742a533f1a4b5fefd4e1e5c6f8e4d4ec545f0 SHA512 0165d80704a5c8a0a4b0b2f88b722d95e3019f57ccdc23b15ba2bd301c9c7e30cc31198ae9dd819a15b185af9f56f05a23300f27e794f8b27428e3fd415b71d7
+EBUILD eselect-luajit-1.ebuild 517 BLAKE2B 8dc467373707b1f7a7c2f475f6a797fd20fbdb487d756e5118df4d0281be51c4e3515eafd61fe502a11e6626eef743e71a6d4759062802bc7913a4ad9c574ddd SHA512 b39463a9fb68654c259102e8ee89658d54a8b12680a04c68b0e6819a112f5ea341381361655bfa3d4e4648e4e57eadcc4a5c678902f74e588d0ffb379a1de179
+MISC metadata.xml 258 BLAKE2B c9d41f235ff5268faadf1490ac88a639ead04bc9370d4a9526768d0b717d271760fdfb108aeca184224520f267c87788f888fead6b6e0b2baa0610146e2f4179 SHA512 79a8777af770b37b175ce865feba8ca73e60d5ac37467ed15e193d5759400f61e5059a1f102913d3df14e33bba1cdf6fdf186a4ff611b1fb9d8318955356bb9d
diff --git a/app-eselect/eselect-luajit/eselect-luajit-1.ebuild b/app-eselect/eselect-luajit/eselect-luajit-1.ebuild
new file mode 100644
index 000000000000..8af9b87635fd
--- /dev/null
+++ b/app-eselect/eselect-luajit/eselect-luajit-1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Manages LuaJIT symlinks"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	>=app-admin/eselect-1.2.4
+"
+
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/eselect/modules
+	newins "${FILESDIR}/luajit-${PV}.eselect" luajit.eselect || die "newins failed"
+}
diff --git a/app-eselect/eselect-luajit/files/luajit-1.eselect b/app-eselect/eselect-luajit/files/luajit-1.eselect
new file mode 100644
index 000000000000..327e3d73a9ec
--- /dev/null
+++ b/app-eselect/eselect-luajit/files/luajit-1.eselect
@@ -0,0 +1,141 @@
+# -*-eselect-*-  vim: ft=eselect
+# Copyright 2005-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2 or later
+# $Id: luajit.eselect mva $
+
+inherit config multilib
+
+DESCRIPTION="Manage the LuaJIT symlink"
+MAINTAINER="mva@gentoo.org"
+VERSION="1"
+
+# sort function for luajit versions, to be used in a pipe
+sort_luajit_versions() {
+	local vsort="sort --version-sort"
+	${vsort} </dev/null &>/dev/null || vsort=sort
+	sed -e 's/^\(luajit-\)\?\([[:digit:].]\+\)[-_]beta/\2 0 &/' \
+		-e 't;s/^\(luajit-\)\?\([[:digit:].]\+\)/\2 1 &/' \
+		| LC_ALL=C ${vsort} | sed 's/.* //'
+}
+
+# find a list of luajit symlink targets
+find_targets() {
+	local f
+	for f in $(find "${EROOT}"/usr/bin/ -type f -iname 'luajit-[[:digit:]]*'); do
+		basename "${f}"
+	done | sort_luajit_versions
+}
+
+get_libdirs() {
+	local dir libdirs
+	for dir in $(list_libdirs); do
+		[[ -L ${EROOT}/usr/${dir} ]] && continue
+		ls "${EROOT}"/usr/${dir}/libluajit*.* > /dev/null 2>&1 || continue
+
+		libdirs+=' '/usr/${dir}
+	done
+	echo ${libdirs:-/usr/lib}
+}
+
+
+# remove the luajit symlink
+remove_symlinks() {
+	for dir in $(get_libdirs) ; do
+		[[ -L "${dir}/libluajit-5.1.so" ]] && rm "${dir}/libluajit-5.1.so"
+		[[ -L "${dir}/libluajit-5.1.a" ]] && rm "${dir}/libluajit-5.1.a"
+		[[ -L "${dir}/pkgconfig/luajit.pc" ]] && rm "${dir}/pkgconfig/luajit.pc"
+	done
+	[[ -L "${EROOT}/usr/bin/luajit" ]] && rm "${EROOT}/usr/bin/luajit"
+	rm -f "${EROOT}"/usr/share/man/man1/luajit.1{,.gz,.bz2,.lzma} &>/dev/null
+}
+
+# set the luajit symlink
+set_symlinks() {
+	local target=$1
+
+	if is_number "${target}"; then
+		local targets=( $(find_targets) )
+		target=${targets[target-1]}
+	fi
+
+	if [[ -z ${target} ]]; then
+		die -q "Target \"$1\" doesn't appear to be valid!"
+	elif [[ -f ${EROOT}/usr/bin/${target} ]]; then
+		ln -s "${target}" "${EROOT}/usr/bin/luajit"
+		for dir in $(get_libdirs) ; do
+			[[ -e "${dir}/lib${target}.so" ]] && ln -s "lib${target}.so" "${dir}/libluajit-5.1.so"
+			[[ -e "${dir}/lib${target}.a" ]] && ln -s "lib${target}.a" "${dir}/libluajit-5.1.a"
+			[[ -e "${dir}/pkgconfig/${target}.pc" ]] && ln -s "${target}.pc" "${dir}/pkgconfig/luajit.pc"
+		done
+		for orig in "${EROOT}"/usr/share/man/man1/$target.1* ; do
+			ln -s "$(basename ${orig})" "${orig/$target/luajit}"
+		done
+	else
+		die -q "Target \"$1\" doesn't appear to be valid!"
+	fi
+}
+
+### show action ###
+
+describe_show() {
+	echo "Show the current luajit symlink"
+}
+
+do_show() {
+	write_list_start "Current luajit symlink:"
+	if [[ -L ${EROOT}/usr/bin/luajit ]]; then
+		local SV=$(readlink "${EROOT}/usr/bin/luajit")
+		write_kv_list_entry "${SV%/}"
+	else
+		write_kv_list_entry "(unset)"
+	fi
+}
+
+### list action ###
+
+describe_list() {
+	echo "List available luajit symlink targets"
+}
+
+do_list() {
+	local i targets=( $(find_targets) )
+
+	write_list_start "Available luajit symlink targets:"
+		local SV=$(readlink "${EROOT}/usr/bin/luajit")
+	for (( i = 0; i < ${#targets[@]}; i++ )); do
+		[[ ${targets[i]} = \
+			$(basename "${SV}") ]] \
+			&& targets[i]=$(highlight_marker "${targets[i]}")
+	done
+	write_numbered_list -m "(none found)" "${targets[@]}"
+}
+
+### set action ###
+
+describe_set() {
+	echo "Set a new luajit symlink target"
+}
+
+describe_set_parameters() {
+	echo "<target>"
+}
+
+describe_set_options() {
+	echo "target : Target name or number (from 'list' action)"
+}
+
+do_set() {
+	[[ -z $1 ]] && die -q "You didn't tell me what to set the symlink to"
+	[[ $# -gt 1 ]] && die -q "Too many parameters"
+
+	if [[ -L ${EROOT}/usr/bin/luajit ]]; then
+		# existing symlink
+		remove_symlinks || die -q "Couldn't remove existing symlink"
+		set_symlinks "$1" || die -q "Couldn't set a new symlink"
+	elif [[ -e ${EROOT}/usr/bin/luajit ]]; then
+		# we have something strange
+		die -q "${EROOT}/usr/bin/luajit exists but is not a symlink"
+	else
+		set_symlinks "$1" || die -q "Couldn't set a new symlink"
+	fi
+}
diff --git a/app-eselect/eselect-luajit/metadata.xml b/app-eselect/eselect-luajit/metadata.xml
new file mode 100644
index 000000000000..b0783342d4b3
--- /dev/null
+++ b/app-eselect/eselect-luajit/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mva@gentoo.org</email>
+    <name>Vadim Misbakh-Soloviov</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-eselect/eselect-python/Manifest b/app-eselect/eselect-python/Manifest
index a99b6350566f..705a8aaeed49 100644
--- a/app-eselect/eselect-python/Manifest
+++ b/app-eselect/eselect-python/Manifest
@@ -1,6 +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-20200719.ebuild 1095 BLAKE2B d7cbdeabdabff6889cb3ccb8d80472413f97b94fba5a68501172bb4f874108c99177a3ac2f499758bf73c4a3510819c602448bcb1909fa50a4907f38f503e30f SHA512 f63dc03a54d8b7bee0eb4bc161992e9cebb4c3b83929651f2dd5cb1a802c6aaa7e0c97138ae8fd7f9ec0e6dc3b3f78577ee79cbd6a4d6f2cecf7e374b925d49b
+EBUILD eselect-python-20200719.ebuild 1086 BLAKE2B 63aacf96c48c4b32b16ca75573a0b1188b4bdc9e2528e6a9a1cc82519b9c1c8471cda7c6f55c5909101ef7f21ab854e38e17b8fe99f3db26d885593033a65893 SHA512 88bd9a2f13e8081b14ba430dbdc7034c5b7f8cb5c5449edab147a4e0002f54899fdcd990c449bd1f1f2aa45268f6e5de8f7dcd9b67ffab42c4211491ef87de65
 EBUILD eselect-python-99999999.ebuild 1095 BLAKE2B d7cbdeabdabff6889cb3ccb8d80472413f97b94fba5a68501172bb4f874108c99177a3ac2f499758bf73c4a3510819c602448bcb1909fa50a4907f38f503e30f SHA512 f63dc03a54d8b7bee0eb4bc161992e9cebb4c3b83929651f2dd5cb1a802c6aaa7e0c97138ae8fd7f9ec0e6dc3b3f78577ee79cbd6a4d6f2cecf7e374b925d49b
-MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
+MISC metadata.xml 264 BLAKE2B f956660bd90e0c6757ce9a7284329bd8f9d14053624a6ac4a017e5a1ffba57ee084542dbc9ac887756dd64930cdb00e33dd56361404bbbd2d2d27213f84da4c5 SHA512 4d8147ee0077ed9f48ca883928f98dd317506bc25a1ba5c96fcd32870dcefae56ff47560cb99eb23a5339f893d19fa4529cc432afb7999dfa04c727cc6989eaf
diff --git a/app-eselect/eselect-python/eselect-python-20200719.ebuild b/app-eselect/eselect-python/eselect-python-20200719.ebuild
index 745d4e05cb20..68f04d80d643 100644
--- a/app-eselect/eselect-python/eselect-python-20200719.ebuild
+++ b/app-eselect/eselect-python/eselect-python-20200719.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	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"
+	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"
diff --git a/app-eselect/eselect-python/metadata.xml b/app-eselect/eselect-python/metadata.xml
index 7f4f33c6dbc9..4c43a15ce6f4 100644
--- a/app-eselect/eselect-python/metadata.xml
+++ b/app-eselect/eselect-python/metadata.xml
@@ -5,4 +5,5 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>