gentoo resync : 15.01.2020

5 files changed, 6 insertions, 488 deletions

diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest
index a0f34346890d..f17010dcc340 100644
--- a/dev-lang/nqp/Manifest
+++ b/dev-lang/nqp/Manifest
@@ -1,14 +1,8 @@
-DIST nqp-2018.06.official.tar.gz 3795050 BLAKE2B 9c5be1a93f5bba632778125fe3c13431606ef01b654775f890aef27c8bfd220930079cb820e933fdae2d151a7c3bacd57bd4f139547cd938e5c1eb0c54b16f19 SHA512 6b4a74098a3d55931a3c8934029f0e97e388b90c1babef023023e1bf3203dbe53b928155d24ecb6a3a54a3228e72a18a2a2747cd8389497569e24e22d489c68c
-DIST nqp-2018.08.official.tar.gz 3770932 BLAKE2B 2425c28a8192fe0d992650fe3d9c79e198c69abfece17276d62225cfa2029916af1ec7568f626a1a67eadc886a1544154af3c015370a67eb1e13e5da35e08bd8 SHA512 663b52677c49eb4b6c5f4ed68de821d9adbe4e3fbcabf2174227b1d3dfafffa357f720557b18a5fbd121c46704dda117395c996a78af70eb367f1b23d8b2564f
-DIST nqp-2018.09.official.tar.gz 3798897 BLAKE2B d9ac40be8f864a7c9a35cd21dde188396b15465568d7642dbd5dddc3468edc09b6e2f7997fb08a189e160cd5ec004cb4efdcee9262e23b6bb32650eb17d93c14 SHA512 5a673430c2dce5d51f90fd8da18636d1abfd5e841f8530a51020beaffd83635a77090e52968bcbcdee361681a436834490bd2f5c383b21972cf40a9d88b28020
-DIST nqp-2018.12.official.tar.gz 3930041 BLAKE2B 35876f63461aadc634e8ad3fd1a46aff4ead788ebf0d741eb1ff6a82e9227fd5edbcd1f733c184083f73073f2ac1a8dab094f2f8fe177183663697dc13da3065 SHA512 56b7821fc0164c8e8fcf58a16aa96c75347aa078cb3bf7f8f6c41df26338e51e2ddb6984049908de83126861c7406c4504e073e7203409c3f37b129661b8c2f8
 DIST nqp-2019.03.official.tar.gz 3951058 BLAKE2B 237b8cc0105396fc96349a0dd34502ab45fb7d02089dd2ef5aad2554610b4090adf11679271869e5ae06abfa509210959ae8762fbee30dfe6190d6a74ce32591 SHA512 248768c1b1c0f5e5bd19183404e2a1aa28ab488b05db0b1ed0f0bcceca8b9830885762e763ea38cdd2b54d975d2663e1defe236907096aabc5b668818d293533
 DIST nqp-2019.07.1.tar.gz 3937612 BLAKE2B 71f5ddadaa70d7eeadc122ef50f90c13bf7e3a1a4262069ee8564f739e99dfb780359e1155a28f61f90dd1cc419379e366d7274c9567a4319bd841005c3a51a9 SHA512 90c9cfbc3de165ba8c0b4653a849a6faafef9e3862743c3675277c25bc4578522a97a663a4ed7529831fa0b617c7412fcfe67b3e3ff1fc5994f6c42cdf7a4bc5
-EBUILD nqp-2018.06-r1.ebuild 3652 BLAKE2B 98256f4c5d360e3702c9afccb52fb2deafb0acc00e734498f279a624ea369b409dd1a703e80a2c3e864c50cbce722c5a7f19baa510b44f44cc3e6f6485d0e55c SHA512 b26d0662ee6c72592052b89abe6cdd6d2509f9a8b917c19fd695f1b2fef42860b7331637356e1e61e2325b0a4ce69a5892acc901cea9d43e9937ddfc202e35cb
-EBUILD nqp-2018.08-r1.ebuild 3652 BLAKE2B 98256f4c5d360e3702c9afccb52fb2deafb0acc00e734498f279a624ea369b409dd1a703e80a2c3e864c50cbce722c5a7f19baa510b44f44cc3e6f6485d0e55c SHA512 b26d0662ee6c72592052b89abe6cdd6d2509f9a8b917c19fd695f1b2fef42860b7331637356e1e61e2325b0a4ce69a5892acc901cea9d43e9937ddfc202e35cb
-EBUILD nqp-2018.09-r1.ebuild 3652 BLAKE2B 98256f4c5d360e3702c9afccb52fb2deafb0acc00e734498f279a624ea369b409dd1a703e80a2c3e864c50cbce722c5a7f19baa510b44f44cc3e6f6485d0e55c SHA512 b26d0662ee6c72592052b89abe6cdd6d2509f9a8b917c19fd695f1b2fef42860b7331637356e1e61e2325b0a4ce69a5892acc901cea9d43e9937ddfc202e35cb
-EBUILD nqp-2018.12-r1.ebuild 3652 BLAKE2B 98256f4c5d360e3702c9afccb52fb2deafb0acc00e734498f279a624ea369b409dd1a703e80a2c3e864c50cbce722c5a7f19baa510b44f44cc3e6f6485d0e55c SHA512 b26d0662ee6c72592052b89abe6cdd6d2509f9a8b917c19fd695f1b2fef42860b7331637356e1e61e2325b0a4ce69a5892acc901cea9d43e9937ddfc202e35cb
+DIST nqp-2019.11.tar.gz 3942494 BLAKE2B 241c4131fc94d7055b51a44b7be824fb53a00fc51370f59dcba1d92655de66e2db536c622084bf9466d9d753d5ad804411b4af07b2767ad1a4f09e065c6693f8 SHA512 3b9fea9d9c4d2ae2ca065536bcca5b483067f9e723c3a89c7e238199c0f52ea6ba23ae4429dacbd42bea69dccbbc836efe5046d1691185d5452f30912f4e6a40
 EBUILD nqp-2019.03-r1.ebuild 3652 BLAKE2B 98256f4c5d360e3702c9afccb52fb2deafb0acc00e734498f279a624ea369b409dd1a703e80a2c3e864c50cbce722c5a7f19baa510b44f44cc3e6f6485d0e55c SHA512 b26d0662ee6c72592052b89abe6cdd6d2509f9a8b917c19fd695f1b2fef42860b7331637356e1e61e2325b0a4ce69a5892acc901cea9d43e9937ddfc202e35cb
 EBUILD nqp-2019.07.1.ebuild 3649 BLAKE2B 61c3ee8cb3bf94c237f88983827101e382d3ad917f3b9420320dd6dd084c58948bcc67065c63aad7a7526838234489d4488010e102915d69e7b97f45a6051806 SHA512 0d44d1b29f60588a01b48990411eb1a3c3878e34760137d3c64c96311d5f2f2405b2d8dba467fa7feefa392557f6fdfcb2edfbdcf714b809ffdd555f648281e6
+EBUILD nqp-2019.11.ebuild 3649 BLAKE2B 61c3ee8cb3bf94c237f88983827101e382d3ad917f3b9420320dd6dd084c58948bcc67065c63aad7a7526838234489d4488010e102915d69e7b97f45a6051806 SHA512 0d44d1b29f60588a01b48990411eb1a3c3878e34760137d3c64c96311d5f2f2405b2d8dba467fa7feefa392557f6fdfcb2edfbdcf714b809ffdd555f648281e6
 EBUILD nqp-9999.ebuild 3649 BLAKE2B 61c3ee8cb3bf94c237f88983827101e382d3ad917f3b9420320dd6dd084c58948bcc67065c63aad7a7526838234489d4488010e102915d69e7b97f45a6051806 SHA512 0d44d1b29f60588a01b48990411eb1a3c3878e34760137d3c64c96311d5f2f2405b2d8dba467fa7feefa392557f6fdfcb2edfbdcf714b809ffdd555f648281e6
 MISC metadata.xml 634 BLAKE2B 1ef5daf7c995ddad1df4b2c7d33ecfc7a4cd146cb518314f88d58e370ede9e986bb47747b10952cf0ee6d587fe5925ba5b0086006182f3e16bd114d49e1a0f3a SHA512 a093877d22e76bbbced97c7752ed76d6aa110eb8d0676f97ae3d38ad79ab7b8ba770243b64e618b588faebf179713813fe6fc8ec7371c695c9f0979f6bce3dc0
diff --git a/dev-lang/nqp/nqp-2018.08-r1.ebuild b/dev-lang/nqp/nqp-2018.08-r1.ebuild
deleted file mode 100644
index 663242f61de6..000000000000
--- a/dev-lang/nqp/nqp-2018.08-r1.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-pkg-opt-2 multibuild
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/perl6/${PN}.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.official.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
-HOMEPAGE="https://rakudo.org"
-
-LICENSE="Artistic-2"
-SLOT="0"
-IUSE="doc clang java +moar test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( java moar )"
-
-CDEPEND="java? (
-		dev-java/asm:4
-		dev-java/jline:0
-		dev-java/jna:4
-	)
-	moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.8 )"
-DEPEND="${CDEPEND}
-	clang? ( sys-devel/clang )
-	java? ( >=virtual/jdk-1.8 )
-	dev-lang/perl"
-
-pkg_pretend() {
-	if has_version dev-lang/rakudo || has_version dev-lang/nqp; then
-		ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP"
-		ewarn "already being installed. So if it fails, try uninstalling both"
-		ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation."
-		ewarn "(see Bug #584394)"
-	fi
-}
-
-java_prepare() {
-	# Don't clean stage0 jars.
-	einfo "Cleaning upstream jars"
-	java-pkg_clean 3rdparty/
-
-	# Don't use jars we just deleted.
-	sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \
-		src/vm/jvm/runners/nqp-j || die
-}
-
-src_prepare() {
-	MULTIBUILD_VARIANTS=()
-	use moar && MULTIBUILD_VARIANTS+=( moar )
-	use java && MULTIBUILD_VARIANTS+=( jvm )
-
-	multibuild_copy_sources
-
-	# This will pull in conditional java_prepare
-	default
-}
-
-nqp_configure() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-	local myconfargs=(
-		"--backend=${MULTIBUILD_VARIANT}"
-		"--prefix=${EPREFIX%/}/usr" )
-
-	perl Configure.pl "${myconfargs[@]}" || die
-	popd || die
-}
-
-nqp_compile() {
-	if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then
-		emake -j1 \
-			-C "${BUILD_DIR}" \
-			THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \
-			JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
-	elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then
-		emake -j1 \
-			-C "${BUILD_DIR}"
-	fi
-}
-
-nqp_test() {
-	emake -j1 \
-		-C "${BUILD_DIR}" \
-		test
-}
-
-nqp_install() {
-	# This is the actual reason we need multibuild.eclass.
-	# We need to distinguish the install procedure for MoarVM and JVM backends.
-	case "${MULTIBUILD_VARIANT}" in
-		moar)
-			emake \
-				DESTDIR="${ED}" \
-				-C "${BUILD_DIR}" \
-				install
-			;;
-		jvm)
-			pushd "${BUILD_DIR}" > /dev/null || die
-			# Set JAVA_PKG_JARDEST early.
-			java-pkg_init_paths_
-
-			# Upstream sets the classpath to this location. Perhaps it's
-			# used to locate the additional libraries?
-			java-pkg_addcp "${JAVA_PKG_JARDEST}"
-
-			insinto "${JAVA_PKG_JARDEST}"
-			local jar
-
-			for jar in *.jar; do
-				if has ${jar} ${PN}.jar ${PN}-runtime.jar; then
-					# jars for NQP itself.
-					java-pkg_dojar ${jar}
-				else
-					# jars used by NQP.
-					doins ${jar}
-				fi
-			done
-
-			# Upstream uses -Xbootclasspath/a, which is faster due to lack
-			# of verification, but gjl isn't flexible enough yet. :(
-			java-pkg_dolauncher ${PN}-j --main ${PN}
-			dosym ${PN}-j /usr/bin/${PN}
-			dobin tools/jvm/eval-client.pl
-			popd > /dev/null || die
-			;;
-		*)
-			die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}."
-			;;
-	esac
-}
-
-src_configure() {
-	multibuild_foreach_variant nqp_configure
-}
-
-src_compile() {
-	multibuild_foreach_variant nqp_compile
-}
-
-src_test() {
-	multibuild_foreach_variant nqp_test
-}
-
-src_install() {
-	multibuild_foreach_variant nqp_install
-
-	dodoc CREDITS README.pod
-	use doc && dodoc -r docs/*
-}
diff --git a/dev-lang/nqp/nqp-2018.09-r1.ebuild b/dev-lang/nqp/nqp-2018.09-r1.ebuild
deleted file mode 100644
index 663242f61de6..000000000000
--- a/dev-lang/nqp/nqp-2018.09-r1.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-pkg-opt-2 multibuild
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/perl6/${PN}.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.official.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
-HOMEPAGE="https://rakudo.org"
-
-LICENSE="Artistic-2"
-SLOT="0"
-IUSE="doc clang java +moar test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( java moar )"
-
-CDEPEND="java? (
-		dev-java/asm:4
-		dev-java/jline:0
-		dev-java/jna:4
-	)
-	moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.8 )"
-DEPEND="${CDEPEND}
-	clang? ( sys-devel/clang )
-	java? ( >=virtual/jdk-1.8 )
-	dev-lang/perl"
-
-pkg_pretend() {
-	if has_version dev-lang/rakudo || has_version dev-lang/nqp; then
-		ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP"
-		ewarn "already being installed. So if it fails, try uninstalling both"
-		ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation."
-		ewarn "(see Bug #584394)"
-	fi
-}
-
-java_prepare() {
-	# Don't clean stage0 jars.
-	einfo "Cleaning upstream jars"
-	java-pkg_clean 3rdparty/
-
-	# Don't use jars we just deleted.
-	sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \
-		src/vm/jvm/runners/nqp-j || die
-}
-
-src_prepare() {
-	MULTIBUILD_VARIANTS=()
-	use moar && MULTIBUILD_VARIANTS+=( moar )
-	use java && MULTIBUILD_VARIANTS+=( jvm )
-
-	multibuild_copy_sources
-
-	# This will pull in conditional java_prepare
-	default
-}
-
-nqp_configure() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-	local myconfargs=(
-		"--backend=${MULTIBUILD_VARIANT}"
-		"--prefix=${EPREFIX%/}/usr" )
-
-	perl Configure.pl "${myconfargs[@]}" || die
-	popd || die
-}
-
-nqp_compile() {
-	if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then
-		emake -j1 \
-			-C "${BUILD_DIR}" \
-			THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \
-			JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
-	elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then
-		emake -j1 \
-			-C "${BUILD_DIR}"
-	fi
-}
-
-nqp_test() {
-	emake -j1 \
-		-C "${BUILD_DIR}" \
-		test
-}
-
-nqp_install() {
-	# This is the actual reason we need multibuild.eclass.
-	# We need to distinguish the install procedure for MoarVM and JVM backends.
-	case "${MULTIBUILD_VARIANT}" in
-		moar)
-			emake \
-				DESTDIR="${ED}" \
-				-C "${BUILD_DIR}" \
-				install
-			;;
-		jvm)
-			pushd "${BUILD_DIR}" > /dev/null || die
-			# Set JAVA_PKG_JARDEST early.
-			java-pkg_init_paths_
-
-			# Upstream sets the classpath to this location. Perhaps it's
-			# used to locate the additional libraries?
-			java-pkg_addcp "${JAVA_PKG_JARDEST}"
-
-			insinto "${JAVA_PKG_JARDEST}"
-			local jar
-
-			for jar in *.jar; do
-				if has ${jar} ${PN}.jar ${PN}-runtime.jar; then
-					# jars for NQP itself.
-					java-pkg_dojar ${jar}
-				else
-					# jars used by NQP.
-					doins ${jar}
-				fi
-			done
-
-			# Upstream uses -Xbootclasspath/a, which is faster due to lack
-			# of verification, but gjl isn't flexible enough yet. :(
-			java-pkg_dolauncher ${PN}-j --main ${PN}
-			dosym ${PN}-j /usr/bin/${PN}
-			dobin tools/jvm/eval-client.pl
-			popd > /dev/null || die
-			;;
-		*)
-			die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}."
-			;;
-	esac
-}
-
-src_configure() {
-	multibuild_foreach_variant nqp_configure
-}
-
-src_compile() {
-	multibuild_foreach_variant nqp_compile
-}
-
-src_test() {
-	multibuild_foreach_variant nqp_test
-}
-
-src_install() {
-	multibuild_foreach_variant nqp_install
-
-	dodoc CREDITS README.pod
-	use doc && dodoc -r docs/*
-}
diff --git a/dev-lang/nqp/nqp-2018.12-r1.ebuild b/dev-lang/nqp/nqp-2018.12-r1.ebuild
deleted file mode 100644
index 663242f61de6..000000000000
--- a/dev-lang/nqp/nqp-2018.12-r1.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-pkg-opt-2 multibuild
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/perl6/${PN}.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.official.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
-HOMEPAGE="https://rakudo.org"
-
-LICENSE="Artistic-2"
-SLOT="0"
-IUSE="doc clang java +moar test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( java moar )"
-
-CDEPEND="java? (
-		dev-java/asm:4
-		dev-java/jline:0
-		dev-java/jna:4
-	)
-	moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.8 )"
-DEPEND="${CDEPEND}
-	clang? ( sys-devel/clang )
-	java? ( >=virtual/jdk-1.8 )
-	dev-lang/perl"
-
-pkg_pretend() {
-	if has_version dev-lang/rakudo || has_version dev-lang/nqp; then
-		ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP"
-		ewarn "already being installed. So if it fails, try uninstalling both"
-		ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation."
-		ewarn "(see Bug #584394)"
-	fi
-}
-
-java_prepare() {
-	# Don't clean stage0 jars.
-	einfo "Cleaning upstream jars"
-	java-pkg_clean 3rdparty/
-
-	# Don't use jars we just deleted.
-	sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \
-		src/vm/jvm/runners/nqp-j || die
-}
-
-src_prepare() {
-	MULTIBUILD_VARIANTS=()
-	use moar && MULTIBUILD_VARIANTS+=( moar )
-	use java && MULTIBUILD_VARIANTS+=( jvm )
-
-	multibuild_copy_sources
-
-	# This will pull in conditional java_prepare
-	default
-}
-
-nqp_configure() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-	local myconfargs=(
-		"--backend=${MULTIBUILD_VARIANT}"
-		"--prefix=${EPREFIX%/}/usr" )
-
-	perl Configure.pl "${myconfargs[@]}" || die
-	popd || die
-}
-
-nqp_compile() {
-	if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then
-		emake -j1 \
-			-C "${BUILD_DIR}" \
-			THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \
-			JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
-	elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then
-		emake -j1 \
-			-C "${BUILD_DIR}"
-	fi
-}
-
-nqp_test() {
-	emake -j1 \
-		-C "${BUILD_DIR}" \
-		test
-}
-
-nqp_install() {
-	# This is the actual reason we need multibuild.eclass.
-	# We need to distinguish the install procedure for MoarVM and JVM backends.
-	case "${MULTIBUILD_VARIANT}" in
-		moar)
-			emake \
-				DESTDIR="${ED}" \
-				-C "${BUILD_DIR}" \
-				install
-			;;
-		jvm)
-			pushd "${BUILD_DIR}" > /dev/null || die
-			# Set JAVA_PKG_JARDEST early.
-			java-pkg_init_paths_
-
-			# Upstream sets the classpath to this location. Perhaps it's
-			# used to locate the additional libraries?
-			java-pkg_addcp "${JAVA_PKG_JARDEST}"
-
-			insinto "${JAVA_PKG_JARDEST}"
-			local jar
-
-			for jar in *.jar; do
-				if has ${jar} ${PN}.jar ${PN}-runtime.jar; then
-					# jars for NQP itself.
-					java-pkg_dojar ${jar}
-				else
-					# jars used by NQP.
-					doins ${jar}
-				fi
-			done
-
-			# Upstream uses -Xbootclasspath/a, which is faster due to lack
-			# of verification, but gjl isn't flexible enough yet. :(
-			java-pkg_dolauncher ${PN}-j --main ${PN}
-			dosym ${PN}-j /usr/bin/${PN}
-			dobin tools/jvm/eval-client.pl
-			popd > /dev/null || die
-			;;
-		*)
-			die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}."
-			;;
-	esac
-}
-
-src_configure() {
-	multibuild_foreach_variant nqp_configure
-}
-
-src_compile() {
-	multibuild_foreach_variant nqp_compile
-}
-
-src_test() {
-	multibuild_foreach_variant nqp_test
-}
-
-src_install() {
-	multibuild_foreach_variant nqp_install
-
-	dodoc CREDITS README.pod
-	use doc && dodoc -r docs/*
-}
diff --git a/dev-lang/nqp/nqp-2018.06-r1.ebuild b/dev-lang/nqp/nqp-2019.11.ebuild
index 663242f61de6..c6689cf62d83 100644
--- a/dev-lang/nqp/nqp-2018.06-r1.ebuild
+++ b/dev-lang/nqp/nqp-2019.11.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit java-pkg-opt-2 multibuild
 
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 	KEYWORDS=""
 else
-	SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.official.tar.gz"
+	SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -31,7 +31,8 @@ CDEPEND="java? (
 	moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
 RDEPEND="${CDEPEND}
 	java? ( >=virtual/jre-1.8 )"
-DEPEND="${CDEPEND}
+DEPEND="${CDEPEND}"
+BDEPEND="${CDEPEND}
 	clang? ( sys-devel/clang )
 	java? ( >=virtual/jdk-1.8 )
 	dev-lang/perl"