diff options
Diffstat (limited to 'dev-lang/nqp/nqp-9999.ebuild')
| -rw-r--r-- | dev-lang/nqp/nqp-9999.ebuild | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/dev-lang/nqp/nqp-9999.ebuild b/dev-lang/nqp/nqp-9999.ebuild index 849aaaf6aaee..fc12e500ef7b 100644 --- a/dev-lang/nqp/nqp-9999.ebuild +++ b/dev-lang/nqp/nqp-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit java-pkg-opt-2 multibuild @@ -23,17 +23,16 @@ RESTRICT="!test? ( test )" REQUIRED_USE="|| ( java moar )" CDEPEND="java? ( - dev-java/asm:4 - dev-java/jline:0 + 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() { @@ -45,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 ) @@ -80,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}" |