gentoo resync : 28.04.2021

6 files changed, 89 insertions, 91 deletions

diff --git a/dev-lang/mujs/Manifest b/dev-lang/mujs/Manifest
index 5e5edcab984b..70c09a4422ff 100644
--- a/dev-lang/mujs/Manifest
+++ b/dev-lang/mujs/Manifest
@@ -1,7 +1,7 @@
-AUX mujs-1.0.5-flags.patch 839 BLAKE2B 843d1bf60167dfb91a5736ee936098c8f6b716f7a70118512d102adb3dc00223d5a3f1fb8da3a57b89797d5b26ebf8120cc1ef2013162aeff288be07cb99d99f SHA512 35681b868e129edffe27e41b793ef073b9ebeb5842212116f9740257515a3fb0d2f00d828a72d96b630c7632184ff9340325a5d79503e5a4c5a52892bd26f4bd
 AUX mujs-1.1.0-flags.patch 376 BLAKE2B 6bcfc39f97b35ae2230aa33ca99d4338915224a9b1ffbc39d747bb9e1ec566d36510cefc75906695c729ea2b44b2c118519ba25998aebb09dee51ad622bd1f3e SHA512 fc86b1422db6b3a934bf6e0da5c18a7a61fbf8c691c2dbf1355c0b7fc669d7f324af81d7e39c6042b0006ad294e4b21cb4c16bf77b3f1be18a07fc9037e09039
-DIST mujs-1.0.9.tar.gz 123113 BLAKE2B c55deaf14508c412394bf5fe3a53ef581d4e4726024d65f2ba5155eb2400a6e2f043c9f6721b170d19297e2cd38c62c462f3b4e102eb4bfe6e7857b40156c18b SHA512 a3dbc8dbf5c16b7de9803954fe38ea9f77c0e5b7de3895966ec0877e063d463c9950499791ea0d102e464bd0426413689f3edb15e38db3f13915d72f27556725
+AUX mujs-1.1.1-flags.patch 313 BLAKE2B c0dfb2aa7721fe865b4c04141924da299db48d900a6fab883dc76bf274cd60ca8749febd80e6b106e60cc36c4fcefa76d5414e29ef1ef7c774a7e912088895c0 SHA512 8d189613398203693e35c4313d3b7688c73ec38b426eea93a9cf96a21df11bb651afe0191168ca3c23a69f9d77390ed2829c2bc2204f04cb7621fb9f286a7266
 DIST mujs-1.1.0.tar.gz 123450 BLAKE2B e7bc05d35566ff26346e713645e0f417a9acd1a73b5fb5c7f0c35bf940765fba1ab04199f4ed1dd6ce0e3bb2bf1547703335a1c125353da24de72f2b1adfb243 SHA512 10b61453f8483e3e67c95a742aa7868e255816b2ce25c84d8e24c5c737bad1f23ade67531c5c5bb914804be446da33c0cbe8e95a6d5889250dd8520ce56f23a0
-EBUILD mujs-1.0.9.ebuild 1364 BLAKE2B e0682dcdbead4c69eace7aeae2ec28ffe16053b3a6c1cd1acd131f578e7eceee66a21b6c010d577d5a6348678fb1b26ef54259e839cb0ef522b2b223fc8aa044 SHA512 57fe108671f8c38bdf5a1383ffcffda90e4a9bea73e3088cd9b77167e776754edcf4a0eddcf52f3be9a1f59abcf2c4f60cd72f615172b2aadec5e4bcf6568fc5
-EBUILD mujs-1.1.0.ebuild 1365 BLAKE2B e1be97d705ead3695cf59b68f89d44e0ff5da225055371b0001fcba75d7079f48b72d67ceea81fd90e3bde0c62daafbe411725c5d20b6dde322e4172eb5a3b60 SHA512 65946b1e7be60e890a921a5cc0ff3e96c4c3b2bc311af6332ce94497874a685c98801c45cab30a849d3d00cb8ffcb8ba0c3c2d967f2d2fbb09e3235d77ee4ff2
+DIST mujs-1.1.1.tar.xz 95448 BLAKE2B df19d045a16603b94fae6e8f996af32ab5986983a191041bf82cde67c876b34e9574b2c5ea75be8dba36da6692761608ce56117c7cf98833795eadec37ee546e SHA512 8978cb120458b982cd8fa2242ca648c1bb19a837f3b41a88226f95c6d48796b92f221d95b4c2cb73c4a4257ee33045640aee8c3c849cf0725a686fa452f2cc84
+EBUILD mujs-1.1.0.ebuild 1365 BLAKE2B 4f940033e75d77ae741f68a915efef418cabc9f15ae3ecf4c388a0d2020cc7fbe8c003327653b3fdee4b8b7f591be929d19c77bf017f03811c037087130c4fb2 SHA512 cb79454936f47f9442ecaae261eeb1ad62635430ce416845cac82e14d24be7e7b86d07c2cccae0a83166f29e2e805d0458ef0ba98bb1d0da7f96bdc8027edfb1
+EBUILD mujs-1.1.1-r2.ebuild 1908 BLAKE2B a82ab3a14c96be2dc6bab9717a58355ca8668eebb7dcc237d05ab1b599a5a5768028d04ff0eb1bfb45430723ffbba1a1ed434d1441c3816b7420114541860814 SHA512 7dd96efaa1300d34516da9edbf3fd89a885c5f8bd507f711647767283c0ee51300afdd20ada2281ad4a10cc2d52dd9404dc3175dec375e985df199624e6f1471
 MISC metadata.xml 547 BLAKE2B fcf818d9a103347b5b47f7b7c77654e84db6aa2a8dd12f169d58522cb47a455f02f0bf66fc85057a2a10916c4a24dcdca87a5f2e12c54d184ea8d5af1db65810 SHA512 e6bac32e74df77c2ded4e9a9e6200ab76e06217b9a236d6bf5f0df23a031eab2519f26e3d402ff106f9506a4dbe3baf66cae5f961f6d016e7c42fe83fc532799
diff --git a/dev-lang/mujs/files/mujs-1.0.5-flags.patch b/dev-lang/mujs/files/mujs-1.0.5-flags.patch
deleted file mode 100644
index 50de4fcff21e..000000000000
--- a/dev-lang/mujs/files/mujs-1.0.5-flags.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/Makefile	2018-09-11 12:47:31.000000000 +0200
-+++ b/Makefile	2018-10-28 20:09:17.000000000 +0100
-@@ -15,7 +15,7 @@
- 
- # Compiler flags for various configurations:
- 
--CFLAGS := -std=c99 -pedantic -Wall -Wextra -Wno-unused-parameter
-+CFLAGS += -std=c99 -pedantic -Wall -Wextra -Wno-unused-parameter
- 
- ifeq "$(CC)" "clang"
-   CFLAGS += -Wunreachable-code
-@@ -30,9 +30,6 @@
- else ifeq "$(build)" "sanitize"
-   CFLAGS += -pipe -g -fsanitize=address -fno-omit-frame-pointer
-   LDFLAGS += -fsanitize=address
--else
--  CFLAGS += -Os
--  LDFLAGS += -Wl,-s
- endif
- 
- ifeq "$(HAVE_READLINE)" "yes"
-@@ -78,7 +75,7 @@
- 
- $(OUT)/libmujs.so: one.c $(HDRS)
- 	@ mkdir -p $(dir $@)
--	$(CC) $(CFLAGS) -fPIC -shared -o $@ $< -lm
-+	$(CC) $(CFLAGS) $(LDFLAGS) -fPIC -shared -o $@ $< -lm
- 
- $(OUT)/mujs: $(OUT)/libmujs.o $(OUT)/main.o
- 	@ mkdir -p $(dir $@)
diff --git a/dev-lang/mujs/files/mujs-1.1.1-flags.patch b/dev-lang/mujs/files/mujs-1.1.1-flags.patch
new file mode 100644
index 000000000000..f3dbdfd44cd1
--- /dev/null
+++ b/dev-lang/mujs/files/mujs-1.1.1-flags.patch
@@ -0,0 +1,12 @@
+--- a/Makefile
++++ b/Makefile
+@@ -32,9 +32,6 @@ ifeq "$(build)" "debug"
+ else ifeq "$(build)" "sanitize"
+   CFLAGS += -pipe -g -fsanitize=address -fno-omit-frame-pointer
+   LDFLAGS += -fsanitize=address
+-else ifeq "$(build)" "release"
+-  CFLAGS += -O2
+-  LDFLAGS += -Wl,-s
+ endif
+ 
+ ifeq "$(HAVE_READLINE)" "yes"
diff --git a/dev-lang/mujs/mujs-1.0.9.ebuild b/dev-lang/mujs/mujs-1.0.9.ebuild
deleted file mode 100644
index 352f7eef3635..000000000000
--- a/dev-lang/mujs/mujs-1.0.9.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="An embeddable JavaScript interpreter in C"
-HOMEPAGE="https://mujs.com/ https://github.com/ccxvii/mujs"
-SRC_URI="https://github.com/ccxvii/mujs/archive/${PV}.tar.gz -> ${P}.tar.gz"
-# Not available right now.
-#SRC_URI="https://mujs.com/downloads/${P}.tar.xz"
-
-LICENSE="ISC"
-# subslot matches SONAME
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
-IUSE="static-libs"
-
-RDEPEND="sys-libs/readline:0="
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.5-flags.patch"
-)
-
-src_prepare() {
-	default
-
-	tc-export AR CC
-
-	# library's ABI (and API) changes in ~each release:
-	# diff 'usr/includemujs.h' across releases to validate
-	append-cflags -fPIC -Wl,-soname=lib${PN}.so.${PV}
-}
-
-src_compile() {
-	emake VERSION=${PV} prefix=/usr shared
-}
-
-src_install() {
-	local myemakeargs=(
-		DESTDIR="${ED}"
-		libdir="/usr/$(get_libdir)"
-		prefix="/usr"
-		VERSION="${PV}"
-		$(usex static-libs install-static '')
-	)
-
-	emake "${myemakeargs[@]}" install-shared
-
-	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}
-}
diff --git a/dev-lang/mujs/mujs-1.1.0.ebuild b/dev-lang/mujs/mujs-1.1.0.ebuild
index 3d30abd6e9bf..c8b2f49f3e40 100644
--- a/dev-lang/mujs/mujs-1.1.0.ebuild
+++ b/dev-lang/mujs/mujs-1.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ccxvii/mujs/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="ISC"
 # subslot matches SONAME
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="static-libs"
 
 RDEPEND="sys-libs/readline:0="
diff --git a/dev-lang/mujs/mujs-1.1.1-r2.ebuild b/dev-lang/mujs/mujs-1.1.1-r2.ebuild
new file mode 100644
index 000000000000..bc0c2a8caca1
--- /dev/null
+++ b/dev-lang/mujs/mujs-1.1.1-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="An embeddable JavaScript interpreter in C"
+HOMEPAGE="https://mujs.com/ https://github.com/ccxvii/mujs"
+SRC_URI="https://mujs.com/downloads/${P}.tar.xz"
+#SRC_URI=" https://github.com/ccxvii/mujs/archive/${PV}.tar.xz -> ${P}.tar.xz"
+
+LICENSE="ISC"
+# subslot matches SONAME
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+
+RDEPEND="sys-libs/readline:0="
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.1-flags.patch
+)
+
+src_prepare() {
+	default
+
+	tc-export AR CC
+
+	append-cflags -fPIC
+
+	# library's ABI (and API) changes in ~each release:
+	# diff 'usr/includemujs.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
+	# #784461
+	emake \
+		VERSION=${PV} \
+		XCFLAGS="${CFLAGS}" \
+		XCPPFLAGS="${CPPFLAGS}" \
+		prefix=/usr \
+		shell shared
+}
+
+src_install() {
+	local myemakeargs=(
+		DESTDIR="${ED}"
+		VERSION=${PV}
+		libdir="/usr/$(get_libdir)"
+		prefix=/usr
+	)
+
+	emake "${myemakeargs[@]}" 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
+}