gentoo christmass resync : 25.12.2020

5 files changed, 135 insertions, 174 deletions

diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index cbfda970e66b..37e93e966529 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-lua/Manifest b/app-eselect/eselect-lua/Manifest
index eb90296df138..9a29981cd356 100644
--- a/app-eselect/eselect-lua/Manifest
+++ b/app-eselect/eselect-lua/Manifest
@@ -1,3 +1,3 @@
-AUX lua.eselect-2 4192 BLAKE2B 90c8241a3dcc822466aa9a95420143bcdcd5a9aed3d8688958cc2bd30005f298399f8d34834ffb7a727a1186acfd9e98b765cc5a949ef81e39ca96e83c028afa SHA512 fa7dfa52542d9410dcc5f60bc4ef63db7b8396c7ba6115f2d83951a171d996aea3c13530ac2d7ef5025b5047aacb2e4936527377aec0d53229f46d518bd79845
-EBUILD eselect-lua-2.ebuild 602 BLAKE2B 4a1c3ca6d59532d64a2b608706bb9be2e614330a01d5b4ff06b5e98d102e7a205b182862577303c87d39911d5a53f44bf2290bdf449d2c8b4dd1bbdccc10ab6d SHA512 76e3c7bcd7b565f54eee8c0c068e3e5a3724cab720b083affcd983252e3424215c458d9be98a3ab2aee286f3ba44547165ffe24ee51703d73cd6fd796ca66c54
+AUX lua.eselect-4 2864 BLAKE2B cb6a5333e4e0dead16a51e8eda7eff01fcbb5046d1cd463fef4666aae2c466798b8939d1b48fd5ce056d80489f255a1252dab1d97f69edc0e4140416e683cb9b SHA512 4fdd56d94954f87bf8b1d18cba67d571facfadbce05d99fcaa0b96a48ee9653a452f730f54ebdf1f7421cc23a731168b8064b5f81aca9b7e27cb536a62488ba7
+EBUILD eselect-lua-4-r1.ebuild 602 BLAKE2B 4a1c3ca6d59532d64a2b608706bb9be2e614330a01d5b4ff06b5e98d102e7a205b182862577303c87d39911d5a53f44bf2290bdf449d2c8b4dd1bbdccc10ab6d SHA512 76e3c7bcd7b565f54eee8c0c068e3e5a3724cab720b083affcd983252e3424215c458d9be98a3ab2aee286f3ba44547165ffe24ee51703d73cd6fd796ca66c54
 MISC metadata.xml 361 BLAKE2B 8202a11a4a9534a7dcdcaacd6018aa2a0fa02f914fd630782b536ce4d7f5182e9315038544eff0c3ab30d01959ff87b25390e5fb1a4ad1057ad68d6e91c0239f SHA512 a382c700bed10e7c62c6f66560551c3f152de4f57d7ebc3ee127d57eb06a72df3d214fa39dde03f431b881250cf80de5e0a2b3528f6c4365bf5fbbe950e982ad
diff --git a/app-eselect/eselect-lua/eselect-lua-2.ebuild b/app-eselect/eselect-lua/eselect-lua-4-r1.ebuild
index 3529ad194141..3529ad194141 100644
--- a/app-eselect/eselect-lua/eselect-lua-2.ebuild
+++ b/app-eselect/eselect-lua/eselect-lua-4-r1.ebuild
diff --git a/app-eselect/eselect-lua/files/lua.eselect-2 b/app-eselect/eselect-lua/files/lua.eselect-2
deleted file mode 100644
index 02a942788b9d..000000000000
--- a/app-eselect/eselect-lua/files/lua.eselect-2
+++ /dev/null
@@ -1,172 +0,0 @@
-# -*-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/files/lua.eselect-4 b/app-eselect/eselect-lua/files/lua.eselect-4
new file mode 100644
index 000000000000..86c19460a15f
--- /dev/null
+++ b/app-eselect/eselect-lua/files/lua.eselect-4
@@ -0,0 +1,133 @@
+# -*-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 
+	rm -f "${EROOT}"/usr/share/man/man1/lua{,c}.1{,.*} &>/dev/null
+	# Possible leftovers from earlier versions
+	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
+}
+
+_dup() {
+	dirname ${1}/.
+}
+
+set_symlinks() {
+	local ver=${1#lua}
+	local bin_prefix="${EROOT}/usr/bin"
+	ln -s lua${ver} $(_dup "${bin_prefix}"/lua)
+	if [[ -f "${bin_prefix}"/luac${ver} ]]; then
+		ln -s luac${ver} $(_dup "${bin_prefix}"/luac)
+	fi
+	for manpage in "${EROOT}"/usr/share/man/man1/lua{,c}${ver}.1.* ; do
+		test -f ${manpage} &&
+		ln -s $(basename "${manpage}") $(_dup "${manpage//${ver}}")
+	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/"
+	for f in ${prefix}lua{5,jit-2}.* ; do
+		[[ -f "${f}" ]] && dirs="${dirs} ${f##$prefix}"
+	done
+	echo $dirs
+}
+
+resolve_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/\([\w.-]*\):\1:p"
+}
+
+## Actual actions
+
+## set action
+
+describe_set() {
+	echo "Sets the current version of lua"
+}
+
+describe_set_parameters() {
+	echo '[--if-unset] <target>'
+}
+
+describe_set_options() {
+	echo '--if-unset:  Do not replace currently selected implementation'
+	echo 'target:      Target name or number (from "list" action)'
+}
+
+do_set() {
+	if [ "${1}" == "--if-unset" ]; then
+		if [[ -n "$(get_active_version)" ]]; then
+			return
+		fi
+		shift
+	fi
+
+	local target=$(resolve_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
+}