From 3517852e3b8a68d1e997770fc0650c5053bafc6c Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Tue, 4 Jan 2022 01:27:12 +0000
Subject: gentoo resync : 04.01.2022

---
 dev-lang/mujs/Manifest          |  2 +-
 dev-lang/mujs/mujs-1.2.0.ebuild | 15 ++++-----------
 2 files changed, 5 insertions(+), 12 deletions(-)

(limited to 'dev-lang/mujs')

diff --git a/dev-lang/mujs/Manifest b/dev-lang/mujs/Manifest
index 221f6d97b026..108852263583 100644
--- a/dev-lang/mujs/Manifest
+++ b/dev-lang/mujs/Manifest
@@ -7,5 +7,5 @@ DIST mujs-1.2.0.tar.xz 99108 BLAKE2B 3661fb56a3c316f529251e93b50e18ae1835077af10
 EBUILD mujs-1.1.0.ebuild 1365 BLAKE2B 4f940033e75d77ae741f68a915efef418cabc9f15ae3ecf4c388a0d2020cc7fbe8c003327653b3fdee4b8b7f591be929d19c77bf017f03811c037087130c4fb2 SHA512 cb79454936f47f9442ecaae261eeb1ad62635430ce416845cac82e14d24be7e7b86d07c2cccae0a83166f29e2e805d0458ef0ba98bb1d0da7f96bdc8027edfb1
 EBUILD mujs-1.1.2.ebuild 1891 BLAKE2B 4022b431b28790f8b73996d2769ffe3d9095b48564afaa0f99068b55434e600a6be763402b31abbce4e244e54c9083d441c5a46dd83aa5819c5d33261ada88ad SHA512 3faa64cf406c803c63937cdb47ccdb2272daa3f7bc08892dfc7aad849042ea958e0cff759c57cdc4cdd9869d667e16167a8f3753af7a75284bce16d964b22775
 EBUILD mujs-1.1.3.ebuild 1898 BLAKE2B c4a225d6e301b169c0f945e3ad2550cb61b235c1c0431b575a3128fdbcd08a5ba4d9929bb150877164166e29dc0e018f3dde2f6dce78053feaf37d91e23c958f SHA512 4b4b8232baad6b2305d8423f8e4f8a8f2badcbbbd1911c3763b19d0d8e11c0375c6324ca6a6c59f10fe6e677ad5f1793bec58aa4449980fe4a63843f6bdb3987
-EBUILD mujs-1.2.0.ebuild 1820 BLAKE2B 1b7794aecadecee67932bb9fca40b081b6ccb28bdc073bf572858281c7974813619696bd41a04af32aa9f60a5b767f01f57c0e1d5d0c1e93926cb8089873a123 SHA512 6b98083ba44308faa2206db5a80b13211bb177c2fab64d8e3622d319118f0d7c4d6c5fc2530b59a64ef7769f01ffae0328a3b88a33931a79ebaf5e943eab2662
+EBUILD mujs-1.2.0.ebuild 1647 BLAKE2B f41e22293713fb9af8338558f1b801bf5093a28cabcbaf76e8435ef89bedb0b62fd0b2052ae746ef863d393c94174f1dc24b51a20fcac36c653b5b109efac4e6 SHA512 a9a631fc865ef19edd39d8a61ddfbe6033d64e5fea747a553bc10c7e275b59a1f4d47662d6769f538e2c96a743804cf01fcd0c6da4e8ce046ee111a87321e50d
 MISC metadata.xml 713 BLAKE2B 854afbc1219508e2b29aad5f4b83d0a869f1a70c9380fd624ce844be2d4ac3001ad0fe406b8a96c244d2d4837d8921ffd68bb424cf997d804fb426da0d2888b9 SHA512 36d958686ead6fa0cb13dfd8048f036ed833146fe786da0f2ce4f829343925472846d4164c3bbdd1ad4a9e04e8be5fd9b68e44cfef5139194f1aa7359250ed21
diff --git a/dev-lang/mujs/mujs-1.2.0.ebuild b/dev-lang/mujs/mujs-1.2.0.ebuild
index e25bff9dec49..53c9edbaa46a 100644
--- a/dev-lang/mujs/mujs-1.2.0.ebuild
+++ b/dev-lang/mujs/mujs-1.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit flag-o-matic toolchain-funcs
+inherit flag-o-matic multilib toolchain-funcs
 
 DESCRIPTION="An embeddable JavaScript interpreter written in C"
 HOMEPAGE="https://mujs.com/ https://github.com/ccxvii/mujs"
@@ -55,14 +55,7 @@ src_install() {
 		prefix=/usr \
 		install-shared
 
-	# TODO: Tidy up this logic, improve readability
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		mv -v "${ED}"/usr/$(get_libdir)/lib${PN}.so "${ED}"/usr/$(get_libdir)/lib${PN}.${PV}.dylib || die
-		dosym lib${PN}.${PV}.dylib /usr/$(get_libdir)/lib${PN}.dylib
-		dosym lib${PN}.${PV}.dylib /usr/$(get_libdir)/lib${PN}.${PV:0:1}.dylib
-	else
-		mv -v "${ED}"/usr/$(get_libdir)/lib${PN}.so{,.${PV}} || die
-		dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so
-		dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so.${PV:0:1}
-	fi
+	mv -v "${ED}"/usr/$(get_libdir)/lib${PN}$(get_libname) "${ED}"/usr/$(get_libdir)/lib${PN}$(get_libname ${PV}) || die "Failed adding version suffix to mujs shared library"
+	dosym lib${PN}$(get_libname ${PV}) /usr/$(get_libdir)/lib${PN}$(get_libname)
+	dosym lib${PN}$(get_libname ${PV}) /usr/$(get_libdir)/lib${PN}$(get_libname ${PV:0:1})
 }
-- 
cgit v1.2.3