[gentoo-commits] repo/gentoo:master commit in: dev-lang/nqp/

["罗百科" <patrick@gentoo.org>]

commit:     f94fd00ae0ca39fc553dd8e83f135c0004614e2b
Author:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 27 16:54:49 2023 +0000
Commit:     罗百科 <patrick <AT> gentoo <DOT> org>
CommitDate: Mon Feb 27 16:56:17 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f94fd00a

dev-lang/nqp: Improve java bits

While nqp-j builds now rakudo fails to use it,
so keep the java useflag masked for now.

Thanks to vaukai for the work in the PR.

Closes: https://github.com/gentoo/gentoo/pull/29299
Signed-off-by: Patrick Lauer <patrick <AT> gentoo.org>

 dev-lang/nqp/nqp-2023.02.ebuild |  8 ++++----
 dev-lang/nqp/nqp-9999.ebuild    | 19 ++++---------------
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/dev-lang/nqp/nqp-2023.02.ebuild b/dev-lang/nqp/nqp-2023.02.ebuild
index 7ca8384417e3..fc12e500ef7b 100644
--- a/dev-lang/nqp/nqp-2023.02.ebuild
+++ b/dev-lang/nqp/nqp-2023.02.ebuild
@@ -23,16 +23,16 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="|| ( java moar )"
 
 CDEPEND="java? (
-		dev-java/asm:4
+		dev-java/asm:9
 		dev-java/jna:4
 	)
 	moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
 RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.9 )"
+	java? ( >=virtual/jre-11 )"
 DEPEND="${CDEPEND}"
 BDEPEND="${CDEPEND}
 	clang? ( sys-devel/clang )
-	java? ( >=virtual/jdk-1.9 )
+	java? ( >=virtual/jdk-11 )
 	dev-lang/perl"
 
 pkg_pretend() {
@@ -69,7 +69,7 @@ nqp_compile() {
 	if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then
 		emake -j1 \
 			-C "${BUILD_DIR}" \
-			JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
+			JAVAC="$(java-pkg_get-javac)"
 	elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then
 		emake -j1 \
 			-C "${BUILD_DIR}"

diff --git a/dev-lang/nqp/nqp-9999.ebuild b/dev-lang/nqp/nqp-9999.ebuild
index 6a9c0f4a7c60..fc12e500ef7b 100644
--- a/dev-lang/nqp/nqp-9999.ebuild
+++ b/dev-lang/nqp/nqp-9999.ebuild
@@ -23,16 +23,16 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="|| ( java moar )"
 
 CDEPEND="java? (
-		dev-java/asm:4
+		dev-java/asm:9
 		dev-java/jna:4
 	)
 	moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
 RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.8 )"
+	java? ( >=virtual/jre-11 )"
 DEPEND="${CDEPEND}"
 BDEPEND="${CDEPEND}
 	clang? ( sys-devel/clang )
-	java? ( >=virtual/jdk-1.8 )
+	java? ( >=virtual/jdk-11 )
 	dev-lang/perl"
 
 pkg_pretend() {
@@ -44,16 +44,6 @@ pkg_pretend() {
 	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 )
@@ -79,8 +69,7 @@ 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)"
+			JAVAC="$(java-pkg_get-javac)"
 	elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then
 		emake -j1 \
 			-C "${BUILD_DIR}"