gentoo resync : 22.12.2021

3 files changed, 78 insertions, 4 deletions

diff --git a/dev-lang/mujs/Manifest b/dev-lang/mujs/Manifest
index e66fc89c42e2..221f6d97b026 100644
--- a/dev-lang/mujs/Manifest
+++ b/dev-lang/mujs/Manifest
@@ -3,7 +3,9 @@ AUX mujs-1.1.1-flags.patch 313 BLAKE2B c0dfb2aa7721fe865b4c04141924da299db48d900
 DIST mujs-1.1.0.tar.gz 123450 BLAKE2B e7bc05d35566ff26346e713645e0f417a9acd1a73b5fb5c7f0c35bf940765fba1ab04199f4ed1dd6ce0e3bb2bf1547703335a1c125353da24de72f2b1adfb243 SHA512 10b61453f8483e3e67c95a742aa7868e255816b2ce25c84d8e24c5c737bad1f23ade67531c5c5bb914804be446da33c0cbe8e95a6d5889250dd8520ce56f23a0
 DIST mujs-1.1.2.tar.xz 98340 BLAKE2B bbb290786c26fd604082eb123adc78a3b7d9387dafabf70df23bae97d016a3ad16a434fb1ab3a33da85c575cf813491d0a09d956ff351bd7c8d38cac675ec114 SHA512 66641855e6fe732541fb80a99fda4418545183965c6a6ffb4a05101084fd1cc073aca1e51115f37fffb56bc5518cec21a1586d0745c55aec08deb47736e33392
 DIST mujs-1.1.3.tar.xz 98332 BLAKE2B 4dc2c0e657d7dcbbd7f82765556e75e7992cdcaf15c7986bb76c0fb6c244057ba0771a2a59c246eaf7bb9ff080e8af6ade8ef9a95606dc8ebde99f7d73c245c1 SHA512 6a8d0650f1924b5889039ddd8529438226677c63f9317b980492fac4e8380385d5c33fe8a315f26ebd0f7ae94c6c3bc90fdb75a8e4a0df367e6e4e355692e890
+DIST mujs-1.2.0.tar.xz 99108 BLAKE2B 3661fb56a3c316f529251e93b50e18ae1835077af10d5fb636e92e77a766fb63410af0f61ffca6e6c12d6c5c984548d4e36ccee03ead44835493c0c28ef610a9 SHA512 04cc246091bf878aadfa2382ef46c8c42cd04924d9459558016f27474ae3ebca7fc7a0fda7b4efee1bd668b8b051030a2e1f9f40722cb547700c7f84857f4071
 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
-MISC metadata.xml 548 BLAKE2B abd337e2209ae21648bf71663030a5166f1f93f33c1da004ceb46f73a9e50b9734fedba335e6ea0cf2b8427f261f00fd3e109adf5b393ceebc569febdb20a03e SHA512 0004b6c2028f05d86a96ad47504709fc8342f9ce2bba6a0341c881278f79101f92763c9c997038b681af563f0d54a77bb5a820cc72e5f327b6709e7da56b34f0
+EBUILD mujs-1.2.0.ebuild 1820 BLAKE2B 1b7794aecadecee67932bb9fca40b081b6ccb28bdc073bf572858281c7974813619696bd41a04af32aa9f60a5b767f01f57c0e1d5d0c1e93926cb8089873a123 SHA512 6b98083ba44308faa2206db5a80b13211bb177c2fab64d8e3622d319118f0d7c4d6c5fc2530b59a64ef7769f01ffae0328a3b88a33931a79ebaf5e943eab2662
+MISC metadata.xml 713 BLAKE2B 854afbc1219508e2b29aad5f4b83d0a869f1a70c9380fd624ce844be2d4ac3001ad0fe406b8a96c244d2d4837d8921ffd68bb424cf997d804fb426da0d2888b9 SHA512 36d958686ead6fa0cb13dfd8048f036ed833146fe786da0f2ce4f829343925472846d4164c3bbdd1ad4a9e04e8be5fd9b68e44cfef5139194f1aa7359250ed21
diff --git a/dev-lang/mujs/metadata.xml b/dev-lang/mujs/metadata.xml
index ae5c7e5450f5..6ac2a7946bf4 100644
--- a/dev-lang/mujs/metadata.xml
+++ b/dev-lang/mujs/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>sam@gentoo.org</email>
-		<name>Sam James</name>
+	<maintainer type="person" proxied="yes">
+		<email>rndxelement@protonmail.com</email>
+		<name>Philipp Rösner</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription>
 		MuJS is a lightweight Javascript interpreter designed for embedding in
diff --git a/dev-lang/mujs/mujs-1.2.0.ebuild b/dev-lang/mujs/mujs-1.2.0.ebuild
new file mode 100644
index 000000000000..e25bff9dec49
--- /dev/null
+++ b/dev-lang/mujs/mujs-1.2.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="An embeddable JavaScript interpreter written in C"
+HOMEPAGE="https://mujs.com/ https://github.com/ccxvii/mujs"
+SRC_URI="https://mujs.com/downloads/${P}.tar.xz"
+
+LICENSE="ISC"
+# The subslot matches the SONAME
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+
+RDEPEND="sys-libs/readline:="
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.1-flags.patch
+)
+
+src_prepare() {
+	default
+
+	tc-export AR CC
+
+	append-cflags -fPIC
+
+	# The library's ABI (and API) might change in new releases
+	# Diff 'usr/include/mujs.h' across releases to validate
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		append-cflags -Wl,-install_name,"${EPREFIX}"/usr/$(get_libdir)/lib${PN}.${PV}.dylib
+	else
+		append-cflags -Wl,-soname=lib${PN}.so.${PV}
+	fi
+}
+
+src_compile() {
+	# We need to use ${PV} for the pkgconfig file, see: #784461
+	emake \
+		VERSION=${PV} \
+		XCFLAGS="${CFLAGS}" \
+		XCPPFLAGS="${CPPFLAGS}" \
+		prefix=/usr \
+		shell shared
+}
+
+src_install() {
+	emake \
+		DESTDIR="${ED}" \
+		VERSION=${PV} \
+		libdir="/usr/$(get_libdir)" \
+		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
+}