diff options
Diffstat (limited to 'app-eselect/eselect-lua')
| -rw-r--r-- | app-eselect/eselect-lua/eselect-lua-4-r1.ebuild (renamed from app-eselect/eselect-lua/eselect-lua-1.ebuild) | 10 | ||||
| -rw-r--r-- | app-eselect/eselect-lua/files/lua.eselect-4 (renamed from app-eselect/eselect-lua/files/lua.eselect-1) | 95 | ||||
| -rw-r--r-- | app-eselect/eselect-lua/metadata.xml | 10 |
3 files changed, 50 insertions, 65 deletions
diff --git a/app-eselect/eselect-lua/eselect-lua-1.ebuild b/app-eselect/eselect-lua/eselect-lua-4-r1.ebuild index 321aa9120693..3b082835f9bd 100644 --- a/app-eselect/eselect-lua/eselect-lua-1.ebuild +++ b/app-eselect/eselect-lua/eselect-lua-4-r1.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 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" LICENSE="GPL-2" 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" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="" -DEPEND=">=app-admin/eselect-1.2.4" -RDEPEND="${DEPEND}" +RDEPEND="app-admin/eselect + !dev-lang/lua:0" S="${WORKDIR}" diff --git a/app-eselect/eselect-lua/files/lua.eselect-1 b/app-eselect/eselect-lua/files/lua.eselect-4 index d6f951098354..86c19460a15f 100644 --- a/app-eselect/eselect-lua/files/lua.eselect-1 +++ b/app-eselect/eselect-lua/files/lua.eselect-4 @@ -1,39 +1,41 @@ # -*-eselect-*- vim: ft=eselect -# Copyright 2014-2015 Gentoo Foundation +# Copyright 2014-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 inherit config multilib DESCRIPTION="Manage lua symlinks" -MAINTAINER="mabi@gentoo.org" +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 + 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 "${EROOT}"/usr/bin/lua{$ver,} - ln -s "${EROOT}"/usr/bin/luac{$ver,} - for dir in $(get_libdirs) ; do - ln -s "${dir}"/liblua{$ver,}.so - ln -s "${dir}"/pkgconfig/lua{$ver,}.pc - done - for orig in "${EROOT}"/usr/share/man/man1/lua*$ver.1* ; do - ln -s "${orig}" "${orig//$ver}" - done - for f in $HEADER_FILES ; do - ln -s "${EROOT}"/usr/include/lua$ver/$f "${EROOT}"/usr/include + 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 } @@ -42,32 +44,32 @@ get_libdirs() { for dir in $(list_libdirs); do [[ -L ${EROOT}/usr/${dir} ]] && continue ls "${EROOT}"/usr/${dir}/liblua*.* > /dev/null 2>&1 || continue - - libdirs+=' '${EPREFIX}/usr/${dir} + + libdirs+=' '/usr/${dir} done - echo ${libdirs:-${EPREFIX}/usr/lib} + echo ${libdirs:-/usr/lib} } find_targets() { local dirs - local prefix="${EROOT}/usr/bin/lua" - for f in ${prefix}5* ; do - dirs="${dirs} ${f##$prefix}" + local prefix="${EROOT}/usr/bin/" + for f in ${prefix}lua{5,jit-2}.* ; do + [[ -f "${f}" ]] && dirs="${dirs} ${f##$prefix}" done echo $dirs } -resolv_target() { +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 + echo $1 fi } get_active_version() { - readlink -e "${EROOT}"/usr/bin/lua | sed -ne "s:.*/usr/bin/lua\([\d.-]*\):\1:p" + readlink -e "${EROOT}"/usr/bin/lua | sed -ne "s:.*/usr/bin/\([\w.-]*\):\1:p" } ## Actual actions @@ -79,18 +81,25 @@ describe_set() { } describe_set_parameters() { - echo '<target>' + echo '[--if-unset] <target>' } describe_set_options() { - echo 'target: Target name or number (from "list" action)' + echo '--if-unset: Do not replace currently selected implementation' + echo 'target: Target name or number (from "list" action)' } - do_set() { - local target=$(resolv_target $1) + 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" + die -q "You need to specify a version" fi remove_symlinks set_symlinks $target @@ -122,29 +131,3 @@ describe_show() { 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 34308d2edfe1..7e0efa3dd0ef 100644 --- a/app-eselect/eselect-lua/metadata.xml +++ b/app-eselect/eselect-lua/metadata.xml @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>williamh@gentoo.org</email> <name>William Hubbs</name> </maintainer> - <longdescription lang="en"> - Lua eselect module - </longdescription> + <maintainer type="person"> + <email>mva@gentoo.org</email> + <name>Vadim Misbakh-Soloviov</name> + </maintainer> + <stabilize-allarches/> </pkgmetadata> |