gentoo resync : 18.08.2019

10 files changed, 201 insertions, 94 deletions

diff --git a/dev-lang/moarvm/Manifest b/dev-lang/moarvm/Manifest
index b0b03d69f385..46be1a389e7a 100644
--- a/dev-lang/moarvm/Manifest
+++ b/dev-lang/moarvm/Manifest
@@ -4,12 +4,14 @@ DIST MoarVM-2018.08.tar.gz 5047553 BLAKE2B bcb3350e4a063958eee508885784f3f8eda20
 DIST MoarVM-2018.09.tar.gz 5070458 BLAKE2B 6c391907eb7bcda7eb6629d9f1aea16414fa9ee62d97ec3c72cea6c9b8f6323ef2869e560d8574d30b339889aff92ad73cfd174f9b23f4a98ef359873e053a94 SHA512 14d5ca1f6a8c77ee89fd05d66057b640b1e222391fded17631a4e11801de25e1fb3eb6b8b4dd977990e64952f7067482bf405a9ef5ebb6fdacdfa7c11bee21b1
 DIST MoarVM-2018.12.tar.gz 5238765 BLAKE2B ac0a7ba8107bcf79cfa58011c0968b5c960d9b2f2e59754b25a2f29e66f86e1d2524e16bce84323f2426f264476a4f3d307761c340ca6f09d3983eacde336704 SHA512 b55efc942a581e1d14a571b44a58a76e18f01ca1fabb4c68476003bb42fd4f3663fd532e75814cad6f7b1e1cf5562fe6b1aa68b956c1d8e6769e9dc1bce2b0a7
 DIST MoarVM-2019.03.tar.gz 5136086 BLAKE2B 695e5528934002b17f547a281482dc0015b3901b2c9626ce6fcf8aaa2df07c293f501871311ee3be47d009b972ca22a268bb34c859fde6a13566e8d03d1d3f04 SHA512 aa50dcf1499e83247c4c490384f80896160d08fb72a5a6da1f91748c6dc343fa30dcf35adca3e9e8329a2919026a4bdb299129865abf611ce49d73d05cce4285
+DIST MoarVM-2019.07.1.tar.gz 5189731 BLAKE2B 3dde716f6911fb8392346b34763439c37866da34361875e7bf1d9d15a4e2b1d9c1dbb668c42611172dcfd6c9060f9c95ec4bac0e5ac614af3038cc4752d9b6d9 SHA512 c8ffaf962191a60f643e6e1b765ec700664988ffc629765c273baf32d2748763480f9fd7a2d978b7f99d3ba4bf962775f4dca40053ace2ddd8cd0bffbd977d84
 DIST MoarVM-2019.07.tar.gz 5187102 BLAKE2B a9c56453edf5b5834d33187aea6eabacac9a721e7a27471a02b82585560ffbb5bb8807ae8c738f3138c5b0453217ad101aab23bef2c8b727cd2f8a56574abfd5 SHA512 ff5370cb2c7dc4357825f02387757e36a5e03b711021c896043ba5f68e573308146a0d94c7855ec9b4860906a3b0720d316d119ca5bbda908f17d3f4f14f4999
-EBUILD moarvm-2018.06.ebuild 1333 BLAKE2B ec472c7a10310ffb82fbb697553aaaafc83aee62a8d3e439ce3ce68f21ab91313e753caed1546588c9a1320ab0efccff9bcdc8da646b84b112e8c31bc4c75755 SHA512 c7c78307c949b6122bc6437051ba4033f24b79f6a8c5d8f2b248e4b296d7efee9bf0fc6370b116fcd2ff7b9bb548beeb46ba472a4dd5c054341542318bb9900d
-EBUILD moarvm-2018.08.ebuild 1333 BLAKE2B ec472c7a10310ffb82fbb697553aaaafc83aee62a8d3e439ce3ce68f21ab91313e753caed1546588c9a1320ab0efccff9bcdc8da646b84b112e8c31bc4c75755 SHA512 c7c78307c949b6122bc6437051ba4033f24b79f6a8c5d8f2b248e4b296d7efee9bf0fc6370b116fcd2ff7b9bb548beeb46ba472a4dd5c054341542318bb9900d
-EBUILD moarvm-2018.09.ebuild 1330 BLAKE2B ada4198e9dd0f44f7e45a2eeb8da46aaaab31e0bfb05f21ca4c934921acde306fba8332fb94beff0c65879abf9f0bbbaea67be2f9d5a967fa90cb9104ab31f78 SHA512 220c957f8a73db7e18d9e252a1bfe6df53548e07abfc76b3a6b67ccfcb796a991123863230f68266530ba7af1a1647356474b9a8be65c0b1eee3b0f0cf4bbfc7
-EBUILD moarvm-2018.12.ebuild 1330 BLAKE2B ac9b962bcfe75d3b6f926b10256323e108aa6a8398442d19b10821ae1973185f5482e592bb13c24a8f58512df88dc84f22f5c3e84bce3cd90fd711f0b2bda0b2 SHA512 33ef0444e5d62ef1d849bbf1008b03251efa46465d0045b16f64a8f4360186f73f04384436ceefdc5bc02075e91945bd41d5bb0500adce38b4c8d9a21142a36e
-EBUILD moarvm-2019.03.ebuild 1337 BLAKE2B fc42ff48598e9947039df3f978524f9b65ba97cac303d1f5f29ef48c5f5cd5b15f1e098ffa31a6e73d48c42f04ddcb2918147af9f95a0f6d3eca37417d85fd84 SHA512 f5f5fd228947c619ff1aed0ae2c464ee90d60a1d121645627bf3f45745ceaf25b3316c93b46993cb1c7f8ae5662b2d6e44296a2f719ed20424ae664d797c48f1
-EBUILD moarvm-2019.07.ebuild 1352 BLAKE2B 75beb3754d0edd201686578c9106e1709441299d1957f06b0f79323b08338914006d7750677407b80eac7469c47a9844503fbeacc7923dd80497f9d1abfc6724 SHA512 6dc1c54d1d014a881fde6138d19fce004bfe1e9593fe805e9bba23ed8328d14cc6ed8debbe8d72f44d3ce3feff03bced01b026d6cd3cddd55929725026edee60
-EBUILD moarvm-9999.ebuild 1475 BLAKE2B b9ca271b78afab4ebc5e5f05ed13e3361cf96267191dbd8e80ba4c6923d945a1f136376439b890d60ee8345caa782c0baed9fee94a80e15302c258702c2eba63 SHA512 76b99f341f78085656bc196d97ca66ff170b590f6e7e06fab95ef02244d393b6083a217463bffdf389682b823ca7af684b9bba2fcabfd1632901639beab8763f
+EBUILD moarvm-2018.06-r1.ebuild 1478 BLAKE2B 6820e0c854d6f0951cf123be905c001fcd0550e8207cc8f7e97b19a951c66d0861f2da41766f8983f94bfa8d69aa7c579b0e31e676692114db7b293ffde6ba5d SHA512 88b5820ae464d04ee24f9ea256369ba42ae687cf9a862d776afa389d335930f5b1368d8309915c431dfb5852f6328e7ae92f69e1d6135edabfbda7706755a45d
+EBUILD moarvm-2018.08-r1.ebuild 1478 BLAKE2B 6820e0c854d6f0951cf123be905c001fcd0550e8207cc8f7e97b19a951c66d0861f2da41766f8983f94bfa8d69aa7c579b0e31e676692114db7b293ffde6ba5d SHA512 88b5820ae464d04ee24f9ea256369ba42ae687cf9a862d776afa389d335930f5b1368d8309915c431dfb5852f6328e7ae92f69e1d6135edabfbda7706755a45d
+EBUILD moarvm-2018.09-r1.ebuild 1478 BLAKE2B 6820e0c854d6f0951cf123be905c001fcd0550e8207cc8f7e97b19a951c66d0861f2da41766f8983f94bfa8d69aa7c579b0e31e676692114db7b293ffde6ba5d SHA512 88b5820ae464d04ee24f9ea256369ba42ae687cf9a862d776afa389d335930f5b1368d8309915c431dfb5852f6328e7ae92f69e1d6135edabfbda7706755a45d
+EBUILD moarvm-2018.12-r1.ebuild 1478 BLAKE2B 6820e0c854d6f0951cf123be905c001fcd0550e8207cc8f7e97b19a951c66d0861f2da41766f8983f94bfa8d69aa7c579b0e31e676692114db7b293ffde6ba5d SHA512 88b5820ae464d04ee24f9ea256369ba42ae687cf9a862d776afa389d335930f5b1368d8309915c431dfb5852f6328e7ae92f69e1d6135edabfbda7706755a45d
+EBUILD moarvm-2019.03-r1.ebuild 1478 BLAKE2B 6820e0c854d6f0951cf123be905c001fcd0550e8207cc8f7e97b19a951c66d0861f2da41766f8983f94bfa8d69aa7c579b0e31e676692114db7b293ffde6ba5d SHA512 88b5820ae464d04ee24f9ea256369ba42ae687cf9a862d776afa389d335930f5b1368d8309915c431dfb5852f6328e7ae92f69e1d6135edabfbda7706755a45d
+EBUILD moarvm-2019.07-r1.ebuild 1493 BLAKE2B 0e15cd4b95f9f91ccd71e3dbc5d2302dfed31514796aca4290b060d8134f4d0cb839b12f63dc3ff818f4d19e49ceabc48045c62472e11f47a3580a9e65a730ca SHA512 196d8b57e2ff5d1bef0ad762e0a5f531b5e885611e9710f61ccb8909cf435656934a655253353310dde9fc84fdbb48b658e6cf7ec9e8f74b6359c8a72682dcd5
+EBUILD moarvm-2019.07.1-r1.ebuild 1743 BLAKE2B 7be5c68c44b7a9071022e0a556cbf7ac5b4a9dc88c43e89ba64ae4a33bd1aaa82b26fb7824427d510e91b992cde8949d63e0bba0bc052481e30b7eb6e141ef58 SHA512 53c6fdb23dec12240bbdc40914a484c23583727e76887aa77a5c3e697830c7c80106e287fb13ba1e5bd5b635ef9d589cb69f65a01098391b7859d5022182456c
+EBUILD moarvm-9999.ebuild 1743 BLAKE2B 7be5c68c44b7a9071022e0a556cbf7ac5b4a9dc88c43e89ba64ae4a33bd1aaa82b26fb7824427d510e91b992cde8949d63e0bba0bc052481e30b7eb6e141ef58 SHA512 53c6fdb23dec12240bbdc40914a484c23583727e76887aa77a5c3e697830c7c80106e287fb13ba1e5bd5b635ef9d589cb69f65a01098391b7859d5022182456c
 MISC metadata.xml 920 BLAKE2B dc15290595649a4f4c514f26cd219c3d8a97bb589fedac8cca202b64abe49f6851fe50d24f95f82c0dd61d183ed1f4091a4fb0f500e8f89a9b91dd7e932cc1ff SHA512 9250682955318d688f59e27b740e1b04095a85f036578d8fe2a2eeb31e159e34845a191734ba4997034dca80a32e29c8f4a0658b9a76ea78ff5fb4479124696b
diff --git a/dev-lang/moarvm/moarvm-2019.03.ebuild b/dev-lang/moarvm/moarvm-2018.06-r1.ebuild
index 6acaeabca78a..e9f95796d05a 100644
--- a/dev-lang/moarvm/moarvm-2019.03.ebuild
+++ b/dev-lang/moarvm/moarvm-2018.06-r1.ebuild
@@ -38,12 +38,16 @@ RESTRICT=test
 
 src_configure() {
 	use doc && DOCS+=( docs/* )
+	local prefix="${EPREFIX%/}/usr"
+	local libdir="${EPREFIX%/}/usr/$(get_libdir)"
+	einfo "--prefix '${prefix}'"
+	einfo "--libdir '${libdir}'"
 	local myconfigargs=(
-		"--prefix=/usr"
+		"--prefix=${prefix}"
 		"--has-libuv"
 		"--has-libatomic_ops"
 		"--has-libffi"
-		"--libdir=$(get_libdir)"
+		"--libdir=${libdir}"
 		"--compiler=$(usex clang clang gcc)"
 		"$(usex asan        --asan)"
 		"$(usex debug       --debug            --no-debug)"
diff --git a/dev-lang/moarvm/moarvm-2018.06.ebuild b/dev-lang/moarvm/moarvm-2018.06.ebuild
deleted file mode 100644
index 1e5dbdd984e3..000000000000
--- a/dev-lang/moarvm/moarvm-2018.06.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-MY_PN="MoarVM"
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
-	inherit git-r3
-	KEYWORDS=""
-	S="${WORKDIR}/${P}"
-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 Rakudo Perl 6"
-HOMEPAGE="http://moarvm.org"
-LICENSE="Artistic-2"
-SLOT="0"
-IUSE="asan clang debug doc +jit static-libs optimize ubsan"
-
-RDEPEND="dev-libs/libatomic_ops
-		dev-libs/libuv
-		dev-lang/lua:=
-		virtual/libffi"
-DEPEND="${RDEPEND}
-	clang? ( >=sys-devel/clang-3.1 )
-	dev-lang/perl"
-
-DOCS=( CREDITS README.markdown )
-
-# Tests are conducted via nqp
-RESTRICT=test
-
-src_configure() {
-	use doc && DOCS+=( docs/* )
-	local myconfigargs=(
-		"--prefix=/usr"
-		"--has-libuv"
-		"--has-libatomic_ops"
-		"--has-libffi"
-		"--libdir=$(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)"
-	)
-	use optimize && filter-flags '-O*'
-
-	perl Configure.pl "${myconfigargs[@]}" || die
-}
diff --git a/dev-lang/moarvm/moarvm-2018.12.ebuild b/dev-lang/moarvm/moarvm-2018.08-r1.ebuild
index de8b1e480a4b..e9f95796d05a 100644
--- a/dev-lang/moarvm/moarvm-2018.12.ebuild
+++ b/dev-lang/moarvm/moarvm-2018.08-r1.ebuild
@@ -24,7 +24,7 @@ SLOT="0"
 IUSE="asan clang debug doc +jit static-libs optimize ubsan"
 
 RDEPEND="dev-libs/libatomic_ops
-		dev-libs/libuv
+		>=dev-libs/libuv-1.26
 		dev-lang/lua:=
 		virtual/libffi"
 DEPEND="${RDEPEND}
@@ -38,12 +38,16 @@ RESTRICT=test
 
 src_configure() {
 	use doc && DOCS+=( docs/* )
+	local prefix="${EPREFIX%/}/usr"
+	local libdir="${EPREFIX%/}/usr/$(get_libdir)"
+	einfo "--prefix '${prefix}'"
+	einfo "--libdir '${libdir}'"
 	local myconfigargs=(
-		"--prefix=/usr"
+		"--prefix=${prefix}"
 		"--has-libuv"
 		"--has-libatomic_ops"
 		"--has-libffi"
-		"--libdir=$(get_libdir)"
+		"--libdir=${libdir}"
 		"--compiler=$(usex clang clang gcc)"
 		"$(usex asan        --asan)"
 		"$(usex debug       --debug            --no-debug)"
diff --git a/dev-lang/moarvm/moarvm-2018.08.ebuild b/dev-lang/moarvm/moarvm-2018.09-r1.ebuild
index 1e5dbdd984e3..e9f95796d05a 100644
--- a/dev-lang/moarvm/moarvm-2018.08.ebuild
+++ b/dev-lang/moarvm/moarvm-2018.09-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,7 @@ SLOT="0"
 IUSE="asan clang debug doc +jit static-libs optimize ubsan"
 
 RDEPEND="dev-libs/libatomic_ops
-		dev-libs/libuv
+		>=dev-libs/libuv-1.26
 		dev-lang/lua:=
 		virtual/libffi"
 DEPEND="${RDEPEND}
@@ -38,12 +38,16 @@ RESTRICT=test
 
 src_configure() {
 	use doc && DOCS+=( docs/* )
+	local prefix="${EPREFIX%/}/usr"
+	local libdir="${EPREFIX%/}/usr/$(get_libdir)"
+	einfo "--prefix '${prefix}'"
+	einfo "--libdir '${libdir}'"
 	local myconfigargs=(
-		"--prefix=/usr"
+		"--prefix=${prefix}"
 		"--has-libuv"
 		"--has-libatomic_ops"
 		"--has-libffi"
-		"--libdir=$(get_libdir)"
+		"--libdir=${libdir}"
 		"--compiler=$(usex clang clang gcc)"
 		"$(usex asan        --asan)"
 		"$(usex debug       --debug            --no-debug)"
diff --git a/dev-lang/moarvm/moarvm-2018.09.ebuild b/dev-lang/moarvm/moarvm-2018.12-r1.ebuild
index 55ae9205a866..e9f95796d05a 100644
--- a/dev-lang/moarvm/moarvm-2018.09.ebuild
+++ b/dev-lang/moarvm/moarvm-2018.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,7 @@ SLOT="0"
 IUSE="asan clang debug doc +jit static-libs optimize ubsan"
 
 RDEPEND="dev-libs/libatomic_ops
-		dev-libs/libuv
+		>=dev-libs/libuv-1.26
 		dev-lang/lua:=
 		virtual/libffi"
 DEPEND="${RDEPEND}
@@ -38,12 +38,16 @@ RESTRICT=test
 
 src_configure() {
 	use doc && DOCS+=( docs/* )
+	local prefix="${EPREFIX%/}/usr"
+	local libdir="${EPREFIX%/}/usr/$(get_libdir)"
+	einfo "--prefix '${prefix}'"
+	einfo "--libdir '${libdir}'"
 	local myconfigargs=(
-		"--prefix=/usr"
+		"--prefix=${prefix}"
 		"--has-libuv"
 		"--has-libatomic_ops"
 		"--has-libffi"
-		"--libdir=$(get_libdir)"
+		"--libdir=${libdir}"
 		"--compiler=$(usex clang clang gcc)"
 		"$(usex asan        --asan)"
 		"$(usex debug       --debug            --no-debug)"
diff --git a/dev-lang/moarvm/moarvm-2019.03-r1.ebuild b/dev-lang/moarvm/moarvm-2019.03-r1.ebuild
new file mode 100644
index 000000000000..e9f95796d05a
--- /dev/null
+++ b/dev-lang/moarvm/moarvm-2019.03-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+MY_PN="MoarVM"
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
+	inherit git-r3
+	KEYWORDS=""
+	S="${WORKDIR}/${P}"
+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 Rakudo Perl 6"
+HOMEPAGE="http://moarvm.org"
+LICENSE="Artistic-2"
+SLOT="0"
+IUSE="asan clang debug doc +jit static-libs optimize ubsan"
+
+RDEPEND="dev-libs/libatomic_ops
+		>=dev-libs/libuv-1.26
+		dev-lang/lua:=
+		virtual/libffi"
+DEPEND="${RDEPEND}
+	clang? ( >=sys-devel/clang-3.1 )
+	dev-lang/perl"
+
+DOCS=( CREDITS README.markdown )
+
+# Tests are conducted via nqp
+RESTRICT=test
+
+src_configure() {
+	use doc && DOCS+=( docs/* )
+	local prefix="${EPREFIX%/}/usr"
+	local libdir="${EPREFIX%/}/usr/$(get_libdir)"
+	einfo "--prefix '${prefix}'"
+	einfo "--libdir '${libdir}'"
+	local myconfigargs=(
+		"--prefix=${prefix}"
+		"--has-libuv"
+		"--has-libatomic_ops"
+		"--has-libffi"
+		"--libdir=${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)"
+	)
+	use optimize && filter-flags '-O*'
+
+	perl Configure.pl "${myconfigargs[@]}" || die
+}
diff --git a/dev-lang/moarvm/moarvm-2019.07.ebuild b/dev-lang/moarvm/moarvm-2019.07-r1.ebuild
index 316046a745eb..ff7796fe5a35 100644
--- a/dev-lang/moarvm/moarvm-2019.07.ebuild
+++ b/dev-lang/moarvm/moarvm-2019.07-r1.ebuild
@@ -43,12 +43,16 @@ PATCHES="${FILESDIR}/fix-quoting.patch"
 
 src_configure() {
 	use doc && DOCS+=( docs/* )
+	local prefix="${EPREFIX%/}/usr"
+	local libdir="${EPREFIX%/}/usr/$(get_libdir)"
+	einfo "--prefix '${prefix}'"
+	einfo "--libdir '${libdir}'"
 	local myconfigargs=(
-		"--prefix" "/usr"
+		"--prefix" "${prefix}"
 		"--has-libuv"
 		"--has-libatomic_ops"
 		"--has-libffi"
-		"--libdir" "$(get_libdir)"
+		"--libdir" "${libdir}"
 		"--compiler" "$(usex clang clang gcc)"
 		"$(usex asan        --asan)"
 		"$(usex debug       --debug            --no-debug)"
diff --git a/dev-lang/moarvm/moarvm-2019.07.1-r1.ebuild b/dev-lang/moarvm/moarvm-2019.07.1-r1.ebuild
new file mode 100644
index 000000000000..a819b78d97e6
--- /dev/null
+++ b/dev-lang/moarvm/moarvm-2019.07.1-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+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
+	KEYWORDS=""
+	S="${WORKDIR}/${P}"
+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 Rakudo Perl 6"
+HOMEPAGE="http://moarvm.org"
+LICENSE="Artistic-2"
+SLOT="0"
+IUSE="asan clang debug doc static-libs optimize ubsan"
+
+RDEPEND="dev-libs/libatomic_ops
+		>=dev-libs/libuv-1.26
+		dev-lang/lua:=
+		virtual/libffi"
+DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}
+	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() {
+	use doc && DOCS+=( docs/* )
+	local prefix="${EPREFIX}/usr"
+	local libdir="${EPREFIX}/usr/$(get_libdir)"
+	einfo "--prefix '${prefix}'"
+	einfo "--libdir '${libdir}'"
+	local myconfigargs=(
+		"--prefix" "${prefix}"
+		"--has-libuv"
+		"--has-libatomic_ops"
+		"--has-libffi"
+		"--libdir" "${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)"
+	)
+
+	perl Configure.pl "${myconfigargs[@]}" moarshared || die
+}
diff --git a/dev-lang/moarvm/moarvm-9999.ebuild b/dev-lang/moarvm/moarvm-9999.ebuild
index f119a7ae28bc..a819b78d97e6 100644
--- a/dev-lang/moarvm/moarvm-9999.ebuild
+++ b/dev-lang/moarvm/moarvm-9999.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic
 
 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
 	KEYWORDS=""
 	S="${WORKDIR}/${P}"
@@ -21,15 +22,14 @@ DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6"
 HOMEPAGE="http://moarvm.org"
 LICENSE="Artistic-2"
 SLOT="0"
-IUSE="asan clang debug doc +jit static-libs optimize ubsan"
+IUSE="asan clang debug doc static-libs optimize ubsan"
 
 RDEPEND="dev-libs/libatomic_ops
-		>=dev-libs/libtommath-1.0
-		dev-libs/libuv
-		jit? ( dev-lang/lua:0[deprecated]
-			dev-lua/LuaBitOp )
+		>=dev-libs/libuv-1.26
+		dev-lang/lua:=
 		virtual/libffi"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}
 	clang? ( >=sys-devel/clang-3.1 )
 	dev-lang/perl"
 
@@ -38,24 +38,34 @@ 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() {
 	use doc && DOCS+=( docs/* )
+	local prefix="${EPREFIX}/usr"
+	local libdir="${EPREFIX}/usr/$(get_libdir)"
+	einfo "--prefix '${prefix}'"
+	einfo "--libdir '${libdir}'"
 	local myconfigargs=(
-		"--prefix=/usr"
-		"--has-libtommath"
+		"--prefix" "${prefix}"
 		"--has-libuv"
 		"--has-libatomic_ops"
 		"--has-libffi"
-		"--libdir=$(get_libdir)"
-		"--compiler=$(usex clang clang gcc)"
+		"--libdir" "${libdir}"
+		"--compiler" "$(usex clang clang gcc)"
 		"$(usex asan        --asan)"
 		"$(usex debug       --debug            --no-debug)"
-		"$(usex jit         --lua=/usr/bin/lua --no-jit)"
 		"$(usex optimize    --optimize=        --no-optimize)"
 		"$(usex static-libs --static)"
 		"$(usex ubsan       --ubsan)"
 	)
-	use optimize && filter-flags '-O*'
 
-	perl Configure.pl "${myconfigargs[@]}" || die
+	perl Configure.pl "${myconfigargs[@]}" moarshared || die
 }