[gentoo-commits] proj/lua:master commit in: app-eselect/eselect-luajit/files/

[gentoo-commits] proj/lua:master commit in: app-eselect/eselect-luajit/files/

[Vadim A. Misbakh-Soloviov]

commit:     e3c9fe0de6266749dc3522da7a8747d38b8a7295
Author:     Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Fri Apr  3 19:53:06 2015 +0000
Commit:     Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Fri Apr  3 19:53:06 2015 +0000
URL:        https://gitweb.gentoo.org/proj/lua.git/commit/?id=e3c9fe0d

[app-eselect/eselect-luajit] Fixed pkgconfig symlinking

Signed-off-by: Vadim A. Misbakh-Soloviov <git <AT> mva.name>

 app-eselect/eselect-luajit/files/luajit-1.eselect | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app-eselect/eselect-luajit/files/luajit-1.eselect b/app-eselect/eselect-luajit/files/luajit-1.eselect
index ac90226..fdd1e8d 100644
--- a/app-eselect/eselect-luajit/files/luajit-1.eselect
+++ b/app-eselect/eselect-luajit/files/luajit-1.eselect
@@ -43,6 +43,7 @@ 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
@@ -62,8 +63,9 @@ set_symlinks() {
 	elif [[ -f ${EROOT}/usr/bin/${target} ]]; then
 		ln -s "${target}" "${EROOT}/usr/bin/luajit"
 		for dir in $(get_libdirs) ; do
-			[[ -f "${dir}/lib${target}.so" ]] && ln -s "lib${target}.so" "${dir}/libluajit-5.1.so"
-			[[ -f "${dir}/lib${target}.a" ]] && ln -s "lib${target}.a" "${dir}/libluajit-5.1.a"
+			[[ -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}"

[gentoo-commits] proj/lua:master commit in: app-eselect/eselect-luajit/files/

[Vadim A. Misbakh-Soloviov]

commit:     f127bc03084f3ece242a4e10fbeb6789a67f3ae8
Author:     Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Wed Nov  1 18:24:25 2017 +0000
Commit:     Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Wed Nov  1 18:24:25 2017 +0000
URL:        https://gitweb.gentoo.org/proj/lua.git/commit/?id=f127bc03

eselect-luajit: some prefix-related fixes

 app-eselect/eselect-luajit/files/luajit-1.eselect | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/app-eselect/eselect-luajit/files/luajit-1.eselect b/app-eselect/eselect-luajit/files/luajit-1.eselect
index 3e6f376..95d4d54 100644
--- a/app-eselect/eselect-luajit/files/luajit-1.eselect
+++ b/app-eselect/eselect-luajit/files/luajit-1.eselect
@@ -27,14 +27,18 @@ find_targets() {
 }
 
 get_libdirs() {
-	local dir libdirs
+	local dir libdirs=() ret;
 	for dir in $(list_libdirs); do
-		[[ -L ${EROOT}/usr/${dir} ]] && continue
-		ls "${EROOT}"/usr/${dir}/libluajit*.* > /dev/null 2>&1 || continue
+		[[ -L "${EROOT}/usr/${dir}" ]] && continue
+		ls "${EROOT}"/usr/"${dir}"/libluajit*.* > /dev/null 2>&1 || continue
 
-		libdirs+=' '/usr/${dir}
+		libdirs+=("${EROOT}/usr/${dir}")
 	done
-	echo ${libdirs:-/usr/lib}
+
+	ret=${libdirs[@]}
+	ret=${ret:-/usr/lib}
+
+	echo ${ret}
 }