gentoo auto-resync : 24:12:2022 - 14:02:21

5 files changed, 63 insertions, 43 deletions

diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 155a9d5233e4..f047545a56d1 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/ispc/Manifest b/dev-lang/ispc/Manifest
index 43cad783a58e..55a6ef4aaa53 100644
--- a/dev-lang/ispc/Manifest
+++ b/dev-lang/ispc/Manifest
@@ -1,6 +1,5 @@
 AUX ispc-1.18.0-curses-cmake.patch 597 BLAKE2B 083a949e99a00819b1eed3ecb4276c7018f914a4902ea4c41dbd2a10c934d908ef2bc29a45e869ce290d5e787a7642de1ed630bc697b02e07267bb4e848fa1fc SHA512 6ba529e8dd4ce1483149e51a9a8ed28b476f604fcec263f806be7f9ec1b55decf8603126ea70600dce3d6947a328d907d046d25cc401847f6701cc9741d6cd14
 AUX ispc-1.18.0-llvm.patch 1410 BLAKE2B 77027da9032fa230c72d8608c2a6cd63c33601e17acab0260101c64dbb50a0aa3cc30702c4480ae5d63e95ec3e962e28bdbbd90cd72f4e91d30dc364b82367b6 SHA512 116078d5ab99c849584cc4ece8dc3ebc817221a2377e26083071e206b5e83c4f3ed594f84b86c9659ef86a497bd3cd058ee32138238e12e6aa9dac0f11cf1440
-AUX ispc-9999-llvm.patch 1688 BLAKE2B 1eb6cfa4a8c42bed5e5472a0e81962edb4d823af34f67025a782833a5211c3e9925a68d0fd7137ad58ff21f113fe9cfedac47c29d04dad7c1c934d4fc7f238f3 SHA512 8f986ef14bb138a8777c6d82bbb0519a6722eb34fcda86107b268d5e63c7283cdc1242162fad57080a4cb32e0ddd0fa0010400211cd731df63aeeb6f198e26b7
 DIST ispc-1.17.0.tar.gz 19436681 BLAKE2B 11af6e22c4c297a2fbd0ae1bfe2a37ce2f836607b2caf42634cff0b0fe1116542e71f056de12e3472724db04f1c5174c0deb47c2bd64fb756b4bdaef48935707 SHA512 b1c67381bb8b71d268c6e68c95cc5e2d64411ce351506de96d31850b879f7777fbc1cb33f3761437f84e52ae726fabbb794ebba9cf05d5200acaca07a2ebf0ac
 DIST ispc-1.18.0.tar.gz 19469764 BLAKE2B dd95ec177120899066d5539add0f35685d73f65512e8be1cc42cf6725741d7f307fbecefc22c4944d9be0e3659d511546b15506213f3dbb97829953507996283 SHA512 350b43876d6885ab4c5c0d49c5b44323fd258d5cf7c68fcdea774baa92589542f2caeea93c347a37f0dab3dcf14e7b3e685973b41694f08ce7a2da64dc81bf06
 EBUILD ispc-1.17.0-r2.ebuild 1649 BLAKE2B 5547751ed9b2631c4ea5b1466d9580a98b16d92e191e85d16fe71cbb04dd28acc05818c52b9bccd2893e487902d074ed1678af12294f3968acbf02813ef57eba SHA512 f979e3d8cbf68d2c40f0c9169d7a5037c444dcb914592e49daf4a04de7cd46f72c4eb03d18a237fe5508eeb787055cb4122d9ee31f4420d83771c99c844ab339
diff --git a/dev-lang/ispc/files/ispc-9999-llvm.patch b/dev-lang/ispc/files/ispc-9999-llvm.patch
deleted file mode 100644
index 934d9eaf5a60..000000000000
--- a/dev-lang/ispc/files/ispc-9999-llvm.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 13e66268..27ff8364 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -218,10 +218,7 @@ if (WASM_ENABLED)
-     list(APPEND ISPC_TARGETS wasm-i32x4)
- endif()
-
--set(CLANG_LIBRARY_LIST clangFrontend clangDriver clangSerialization clangParse clangSema clangAnalysis clangAST clangBasic clangEdit clangLex)
-+set(CLANG_LIBRARY_LIST clang clang-cpp)
--if (${LLVM_VERSION_NUMBER} VERSION_GREATER_EQUAL "15.0.0")
--    list(APPEND CLANG_LIBRARY_LIST clangSupport)
--endif()
- set(LLVM_COMPONENTS engine ipo bitreader bitwriter instrumentation linker option frontendopenmp)
- if (${LLVM_VERSION_NUMBER} VERSION_GREATER_EQUAL "15.0.0")
-     # windowsdriver is a small library introduced in LLVM 15. While it's targeted at Windows only,
-@@ -402,11 +402,8 @@ if (ISPC_USE_ASAN)
- endif()
- 
- # Link against Clang libraries
--foreach(clangLib ${CLANG_LIBRARY_LIST})
--    find_library(${clangLib}Path NAMES ${clangLib} HINTS ${LLVM_LIBRARY_DIRS})
--    list(APPEND CLANG_LIBRARY_FULL_PATH_LIST ${${clangLib}Path})
--endforeach()
--target_link_libraries(${PROJECT_NAME} ${CLANG_LIBRARY_FULL_PATH_LIST})
-+find_package(Clang REQUIRED)
-+target_link_libraries(${PROJECT_NAME} ${CLANG_LIBRARY_LIST})
- 
- # Link against LLVM libraries
- target_link_libraries(${PROJECT_NAME} ${LLVM_LIBRARY_LIST} ${CMAKE_DL_LIBS})
-diff --git a/src/llvmutil.cpp b/src/llvmutil.cpp
-index 06fab989..57a7130f 100644
---- a/src/llvmutil.cpp
-+++ b/src/llvmutil.cpp
-@@ -42,6 +42,7 @@
- #include <llvm/IR/BasicBlock.h>
- #include <llvm/IR/Instructions.h>
- #include <llvm/IR/Module.h>
-+#include <llvm/Support/raw_ostream.h>
-
- #ifdef ISPC_GENX_ENABLED
- #include <llvm/GenXIntrinsics/GenXIntrinsics.h>
diff --git a/dev-lang/mujs/Manifest b/dev-lang/mujs/Manifest
index 24f904eedd9c..cea5a3717b56 100644
--- a/dev-lang/mujs/Manifest
+++ b/dev-lang/mujs/Manifest
@@ -1,6 +1,8 @@
 AUX mujs-1.1.1-flags.patch 313 BLAKE2B c0dfb2aa7721fe865b4c04141924da299db48d900a6fab883dc76bf274cd60ca8749febd80e6b106e60cc36c4fcefa76d5414e29ef1ef7c774a7e912088895c0 SHA512 8d189613398203693e35c4313d3b7688c73ec38b426eea93a9cf96a21df11bb651afe0191168ca3c23a69f9d77390ed2829c2bc2204f04cb7621fb9f286a7266
 DIST mujs-1.2.0.tar.xz 99108 BLAKE2B 3661fb56a3c316f529251e93b50e18ae1835077af10d5fb636e92e77a766fb63410af0f61ffca6e6c12d6c5c984548d4e36ccee03ead44835493c0c28ef610a9 SHA512 04cc246091bf878aadfa2382ef46c8c42cd04924d9459558016f27474ae3ebca7fc7a0fda7b4efee1bd668b8b051030a2e1f9f40722cb547700c7f84857f4071
 DIST mujs-1.3.0.tar.gz 127929 BLAKE2B 589dbe16b05b3b0b59a551d162edcc4d3ba7d3623de5646cd87640c6f3ee1b7e2765909c4a0fdc0457022a8575daeeefe8efb4c3c7d2a5d900101e60406362a9 SHA512 1e9590892b1a0b139f8959a64e4255f5695c8e2dca355858155275628345ac3bb4168779dc6115bd6ac62b8615932762d3f348a1c6d0ee8d56cb43a863c4e0c3
+DIST mujs-1.3.2.tar.gz 127899 BLAKE2B 4de5e1e60c5d6af9a20d8bb1fe2612d6c90a6b5557a66524bf81747e893a89a88b4da7e5393325923c6eb0788679da4013f25032cad23e547f15a1d49cf0a738 SHA512 ccffb04171f7ecec2cfa6f0e59859acc911836370a648e4c6703db174631ce316413a64ebf4b32eea3d3b09221ff01861cda91f4b1b9bebf495168f26f90daf5
 EBUILD mujs-1.2.0.ebuild 1647 BLAKE2B 6175a6ac7b322841eeaf61081e66cdf67c9303f24cf559c6d263025dacbb62a093c38a522fc405ab93040ab9f0a932f9a71be218ceba9737f204e5ead18b4a22 SHA512 f12c266225b783e512aa5c2a04977b054651c240dbea4f685321b829fd151d5d0fcfeae68d3f4bac9da7cba9cdff3662dcd154131777688fe506ba1c243bde68
 EBUILD mujs-1.3.0.ebuild 1654 BLAKE2B 1e504a6fccd349f6a57f6fca1408cee3135c24ff37d04d870f17b737ab30e5aef9d3c5037e5a0c8fc24b53eb331630141917bde2427f537e4914e65803686c10 SHA512 93d0d863c16d084abd707b59eff56e68d853abe2d514250d9541d221d1043bc464dc454b85bc7f0acf800e26ea39735c1d41fbee9f4f4b6239d19b0cb384d413
+EBUILD mujs-1.3.2.ebuild 1654 BLAKE2B 1e504a6fccd349f6a57f6fca1408cee3135c24ff37d04d870f17b737ab30e5aef9d3c5037e5a0c8fc24b53eb331630141917bde2427f537e4914e65803686c10 SHA512 93d0d863c16d084abd707b59eff56e68d853abe2d514250d9541d221d1043bc464dc454b85bc7f0acf800e26ea39735c1d41fbee9f4f4b6239d19b0cb384d413
 MISC metadata.xml 713 BLAKE2B 854afbc1219508e2b29aad5f4b83d0a869f1a70c9380fd624ce844be2d4ac3001ad0fe406b8a96c244d2d4837d8921ffd68bb424cf997d804fb426da0d2888b9 SHA512 36d958686ead6fa0cb13dfd8048f036ed833146fe786da0f2ce4f829343925472846d4164c3bbdd1ad4a9e04e8be5fd9b68e44cfef5139194f1aa7359250ed21
diff --git a/dev-lang/mujs/mujs-1.3.2.ebuild b/dev-lang/mujs/mujs-1.3.2.ebuild
new file mode 100644
index 000000000000..267cf273a319
--- /dev/null
+++ b/dev-lang/mujs/mujs-1.3.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic multilib 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.gz"
+
+LICENSE="ISC"
+# The subslot matches the SONAME
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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
+
+	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})
+}