From dbe1a7c93c9c667428fd382dc77533e4251a6f6d Mon Sep 17 00:00:00 2001 From: "B. Wilson" Date: Mon, 15 Apr 2019 23:59:47 +0900 Subject: [PATCH] luarocks: specify package alternatives Subpackages for lua51 and lua52 provide wrapper scripts around `luarocks` and `luarocks-admin` to call with the correct lua version. This extends them to fully support XBPS' package alternatives mechanism. Closes: #10986 [via git-merge-pr] --- srcpkgs/luarocks/template | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/srcpkgs/luarocks/template b/srcpkgs/luarocks/template index 9e736c7d8d8..20e5849f70d 100644 --- a/srcpkgs/luarocks/template +++ b/srcpkgs/luarocks/template @@ -18,6 +18,9 @@ license="MIT" homepage="https://luarocks.org/" distfiles="https://luarocks.org/releases/luarocks-${version}.tar.gz" checksum=1236a307ca5c556c4fed9fdbd35a7e0e80ccf063024becc8c3bf212f37ff0edf +alternatives=" + luarocks:luarocks:/usr/bin/luarocks-5.3 + luarocks:luarocks-admin:/usr/bin/luarocks-admin-5.3" conf_files="/etc/luarocks/config-5.3.lua" @@ -45,20 +48,26 @@ post_install() { make DESTDIR="${DESTDIR}" LUA_VERSION=$lv install-config echo "#!/bin/sh" > ${DESTDIR}/usr/bin/luarocks-$lv - echo "exec luarocks --lua-version $lv \"\$@\"" >> ${DESTDIR}/usr/bin/luarocks-$lv + echo "exec luarocks-5.3 --lua-version $lv \"\$@\"" >> ${DESTDIR}/usr/bin/luarocks-$lv chmod +x ${DESTDIR}/usr/bin/luarocks-$lv echo "#!/bin/sh" > ${DESTDIR}/usr/bin/luarocks-admin-$lv - echo "exec luarocks-admin --lua-version $lv \"\$@\"" >> ${DESTDIR}/usr/bin/luarocks-admin-$lv + echo "exec luarocks-admin-5.3 --lua-version $lv \"\$@\"" >> ${DESTDIR}/usr/bin/luarocks-admin-$lv chmod +x ${DESTDIR}/usr/bin/luarocks-admin-$lv done + + mv ${DESTDIR}/usr/bin/luarocks{,-5.3} + mv ${DESTDIR}/usr/bin/luarocks-admin{,-5.3} } luarocks-lua52_package() { archs=noarch short_desc+=" - Lua52" - depends="luarocks>=${version}_${revision} lua52" + depends="${sourcepkg}>=${version}_${revision} lua52" conf_files="/etc/luarocks/config-5.2.lua" + alternatives=" + luarocks:luarocks:/usr/bin/luarocks-5.2 + luarocks:luarocks-admin:/usr/bin/luarocks-admin-5.2" pkg_install() { vmove usr/bin/luarocks-5.2 vmove usr/bin/luarocks-admin-5.2 @@ -69,8 +78,11 @@ luarocks-lua52_package() { luarocks-lua51_package() { archs=noarch short_desc+=" - Lua51" - depends="luarocks>=${version}_${revision} lua51" + depends="${sourcepkg}>=${version}_${revision} lua51" conf_files="/etc/luarocks/config-5.1.lua" + alternatives=" + luarocks:luarocks:/usr/bin/luarocks-5.1 + luarocks:luarocks-admin:/usr/bin/luarocks-admin-5.1" pkg_install() { vmove usr/bin/luarocks-5.1 vmove usr/bin/luarocks-admin-5.1