gentoo auto-resync : 25:09:2023 - 17:25:57

4 files changed, 110 insertions, 34 deletions

diff --git a/dev-lang/moarvm/Manifest b/dev-lang/moarvm/Manifest
index 6aeb6f2e37ce..ab980e6f2a2a 100644
--- a/dev-lang/moarvm/Manifest
+++ b/dev-lang/moarvm/Manifest
@@ -1,4 +1,6 @@
+AUX moarvm-2023.02-fix-build-clang16.patch 1050 BLAKE2B fa384226d7eaa5fa5dfe26c51d9de6fcb355af8e808097c75839d3ca8eab8919391c5b1cde7863899a51c11a8237285fd3d0d6ae26a77a0c02cda6b008a6364a SHA512 2baea3fb8787a87cef2fc298e1aaa01d82143942e1cfdd0891609f2fbf51b8a54457fd3ecd7ad7d0e25a805db5f86cf6a8df3c25e9dd66f7c1d112a4cecdf516
 DIST MoarVM-2023.02.tar.gz 14917710 BLAKE2B 57ea0a3871f51f2cf2bf7f7d9d70f4d00052cf3ab255916fc73eb33fabd0e96e44155582e73158cf98042705817b5541f3fea0d557b09e38ad6e45cad14f172f SHA512 a3dd172a84aba72df4bb9228f50eea3c4d74d4db285b06f19dc4502523f3de09580ad8a5525cf181038928263e47f72b0187a5d57dba019f18b9783ba4247203
+EBUILD moarvm-2023.02-r1.ebuild 1402 BLAKE2B fa951e9d2f13e2df7846f93b5da6034176e4f5d789e958b877a07712f9eeef18a9afcd3d09a1c743916cdd1e3b0b698a44c38f5c8905d3d186ba10e3a0c8998f SHA512 b7a87557f65637070e6cfcbbf643dde183efde90a866cde91ca95bcddf5308de29eb9ec7fd6e42958d524ab47d9da569751ac165d600af799bf734e0c9611473
 EBUILD moarvm-2023.02.ebuild 1422 BLAKE2B ceed896054839c4acc8ee0b7b84dad8b35a02e8108e78bc6b89c544e440cdeff49a09b23a594b7e30275d815d63062c338cacf2cd94cf874ea94efaf94a52ab7 SHA512 9e825f0183aa1f179756731a449934c7f0e54932edd2fe35e7e0e4f20e8590366441ec083a7cf140febefda47c4921b066bc9cd9980d1215ea2efcf40fb7d694
-EBUILD moarvm-9999.ebuild 1709 BLAKE2B a3c4e11e37d493697dfde00a82ca32f25176ab46f354ce17155ecf7c736f21be28d925db1e70ac003cd688918503c7260116508cfd425d17089543511810761e SHA512 5888b0dae699be3c3f21cd644571fd5df65adc5a740f876016dd3a4a2561cf8998936f495c24672a39590b3ae1ca401f1af4d10bbce9e36184a7bc6921fc5d1b
+EBUILD moarvm-9999.ebuild 1336 BLAKE2B c526a7646806021b39ef4ef2d7f5c8f4446079728028e3303e272cafbfb22f4efe50ce7aef01cff47a430291448a3c7e5176840bc7d889f449c4d68667b7decf SHA512 9814284f2e8c1a0a63f601d17664253260e8c8b29b08f6d4488bb42b00f74ff20550847741f3bf1f5b22149c8b9333f1a7045a008a26159e0075802f1c016d0b
 MISC metadata.xml 803 BLAKE2B ae42152bd02136d44d034e1ae39e457893d720b496681234e1f804c0144d4023dec76ba9edba30df269bac7b9e2cd353b7197e3d21336bc92bcec3fbd877facd SHA512 93ba240a87a853f4df3ed542c0468cd820bd75935253a77f15259293269e1726c71cadcee076550f622444c032d359227f5377a97595e88ef6ef10d034d79aa5
diff --git a/dev-lang/moarvm/files/moarvm-2023.02-fix-build-clang16.patch b/dev-lang/moarvm/files/moarvm-2023.02-fix-build-clang16.patch
new file mode 100644
index 000000000000..9f8a60672ee2
--- /dev/null
+++ b/dev-lang/moarvm/files/moarvm-2023.02-fix-build-clang16.patch
@@ -0,0 +1,22 @@
+Bug: https://bugs.gentoo.org/881335
+Upstream PR: https://github.com/MoarVM/MoarVM/pull/1764
+--- a/src/6model/containers.c
++++ b/src/6model/containers.c
+@@ -114,7 +114,7 @@ static const MVMContainerSpec code_pair_spec = {
+     code_pair_fetch_s,
+     code_pair_store,
+     code_pair_store_i,
+-    code_pair_store_i, /* FIXME need a code_pair_store_u but lacking tests showing this need */
++    (void *)code_pair_store_i, /* FIXME need a code_pair_store_u but lacking tests showing this need */
+     code_pair_store_n,
+     code_pair_store_s,
+     code_pair_store,
+@@ -371,7 +371,7 @@ static const MVMContainerSpec value_desc_cont_spec = {
+     value_desc_cont_fetch_s,
+     value_desc_cont_store,
+     value_desc_cont_store_i,
+-    value_desc_cont_store_i, /* FIXME need a value_desc_cont_store_u but lacking tests showing this need */
++    (void *)value_desc_cont_store_i, /* FIXME need a value_desc_cont_store_u but lacking tests showing this need */
+     value_desc_cont_store_n,
+     value_desc_cont_store_s,
+     value_desc_cont_store_unchecked,
diff --git a/dev-lang/moarvm/moarvm-2023.02-r1.ebuild b/dev-lang/moarvm/moarvm-2023.02-r1.ebuild
new file mode 100644
index 000000000000..c9ff509ceca5
--- /dev/null
+++ b/dev-lang/moarvm/moarvm-2023.02-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo
+
+MY_PN="MoarVM"
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
+	inherit git-r3
+else
+	SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+DESCRIPTION="A 6model-based VM for NQP and Raku"
+HOMEPAGE="http://moarvm.org"
+
+LICENSE="Artistic-2"
+SLOT="0"
+IUSE="asan clang debug doc +jit optimize static-libs ubsan"
+# Tests are conducted via nqp
+RESTRICT=test
+
+RDEPEND="
+	app-arch/zstd:=
+	dev-libs/libatomic_ops
+	>=dev-libs/libuv-1.26:=
+	dev-libs/libffi:=
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	clang? ( >=sys-devel/clang-3.1 )
+"
+
+DOCS=( CREDITS README.markdown )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2023.02-fix-build-clang16.patch
+)
+
+src_configure() {
+	MAKEOPTS+=" NOISY=1"
+	use doc && DOCS+=( docs/* )
+	local myconfigargs=(
+		"--prefix" "${EPREFIX}/usr"
+		"--has-libuv"
+		"--has-libatomic_ops"
+		"--has-libffi"
+		"--libdir"   "${EPREFIX}/usr/$(get_libdir)"
+		"--compiler" "$(usex clang clang gcc)"
+		"$(usex asan        --asan        "")"
+		"$(usex debug       --debug       --no-debug)"
+		"$(usex optimize    --optimize=   --no-optimize)"
+		"$(usex static-libs --static      "")"
+		"$(usex ubsan       --ubsan       "")"
+	)
+
+	edo perl Configure.pl "${myconfigargs[@]}" moarshared
+}
diff --git a/dev-lang/moarvm/moarvm-9999.ebuild b/dev-lang/moarvm/moarvm-9999.ebuild
index 71cb25f7c82f..2ee7ef322dd1 100644
--- a/dev-lang/moarvm/moarvm-9999.ebuild
+++ b/dev-lang/moarvm/moarvm-9999.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=8
 
+inherit edo
+
 MY_PN="MoarVM"
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
-	EGIT_SUBMODULES=( '*' '-3rdparty/libatomicops' '-3rdparty/libuv' )
 	inherit git-r3
-	S="${WORKDIR}/${P}"
 else
 	SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
@@ -17,52 +17,42 @@ fi
 
 DESCRIPTION="A 6model-based VM for NQP and Raku"
 HOMEPAGE="http://moarvm.org"
+
 LICENSE="Artistic-2"
 SLOT="0"
-IUSE="asan clang debug doc static-libs optimize ubsan"
+IUSE="asan clang debug doc +jit optimize static-libs ubsan"
+# Tests are conducted via nqp
+RESTRICT=test
 
-RDEPEND="dev-libs/libatomic_ops
-		>=dev-libs/libuv-1.26:=
-		dev-libs/libffi:="
-DEPEND="${RDEPEND}"
-BDEPEND="${RDEPEND}
+RDEPEND="
+	app-arch/zstd:=
+	dev-libs/libatomic_ops
+	>=dev-libs/libuv-1.26:=
+	dev-libs/libffi:=
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
 	clang? ( >=sys-devel/clang-3.1 )
-	dev-lang/perl"
+"
 
 DOCS=( CREDITS README.markdown )
 
-# Tests are conducted via nqp
-RESTRICT=test
-
-src_prepare() {
-	if [[ "${PV}" == "9999" ]]; then
-		# Stupid upstream try to auto-fetch this themselves
-		git rm -f 3rdparty/{libatomicops,libuv} ||
-			die "Can't strip unused submodules"
-	fi
-	default
-}
-
 src_configure() {
 	MAKEOPTS+=" NOISY=1"
 	use doc && DOCS+=( docs/* )
-	local prefix="${EPREFIX}/usr"
-	local libdir="${EPREFIX}/usr/$(get_libdir)"
-	einfo "--prefix '${prefix}'"
-	einfo "--libdir '${libdir}'"
 	local myconfigargs=(
-		"--prefix" "${prefix}"
+		"--prefix" "${EPREFIX}/usr"
 		"--has-libuv"
 		"--has-libatomic_ops"
 		"--has-libffi"
-		"--libdir" "${libdir}"
+		"--libdir"   "${EPREFIX}/usr/$(get_libdir)"
 		"--compiler" "$(usex clang clang gcc)"
-		"$(usex asan        --asan)"
-		"$(usex debug       --debug            --no-debug)"
-		"$(usex optimize    --optimize=        --no-optimize)"
-		"$(usex static-libs --static)"
-		"$(usex ubsan       --ubsan)"
+		"$(usex asan        --asan        "")"
+		"$(usex debug       --debug       --no-debug)"
+		"$(usex optimize    --optimize=   --no-optimize)"
+		"$(usex static-libs --static      "")"
+		"$(usex ubsan       --ubsan       "")"
 	)
 
-	perl Configure.pl "${myconfigargs[@]}" moarshared || die
+	edo perl Configure.pl "${myconfigargs[@]}" moarshared
 }