dev-lang/nqp: Force JDK/JRE 8 in dependencies
authorKent Fredric <kentnl@gentoo.org>
Wed, 7 Aug 2019 09:59:09 +0000 (21:59 +1200)
committerKent Fredric <kentnl@gentoo.org>
Wed, 7 Aug 2019 11:41:45 +0000 (23:41 +1200)
Due to jdk/jre-1.7 being mentioned in (R)DEPEND, java-pkg_javac-args
injects "-source 1.7 -target 1.7" into the javac invocation, which is
silly, as nqp then appends "-source 1.8" to it anyway, resulting in:

  javac -source 1.7 -target 1.7 -source 1.8 ....

And javac then barfs:

  javac: source release 1.8 requires target release 1.8

Bumping the values in DEPENDS changes the javac invocation to:

  javac -source 1.8 -target 1.8 -source 1.8 ...

Which of course then works.

Subsequently, all existing nqp versions (other than -9999) now work
for me with USE="java" just fine, where previously they wouldn't work
at all.

Closes: https://bugs.gentoo.org/631226
Closes: https://bugs.gentoo.org/626486
Closes: https://bugs.gentoo.org/635902
Package-Manager: Portage-2.3.66, Repoman-2.3.16
Signed-off-by: Kent Fredric <kentnl@gentoo.org>
dev-lang/nqp/nqp-2018.06-r1.ebuild [moved from dev-lang/nqp/nqp-2018.06.ebuild with 98% similarity]
dev-lang/nqp/nqp-2018.08-r1.ebuild [moved from dev-lang/nqp/nqp-2018.08.ebuild with 98% similarity]
dev-lang/nqp/nqp-2018.09-r1.ebuild [moved from dev-lang/nqp/nqp-2018.09.ebuild with 98% similarity]
dev-lang/nqp/nqp-2018.12-r1.ebuild [moved from dev-lang/nqp/nqp-2018.12.ebuild with 98% similarity]
dev-lang/nqp/nqp-2019.03-r1.ebuild [new file with mode: 0644]
dev-lang/nqp/nqp-2019.03.ebuild [deleted file]
dev-lang/nqp/nqp-9999.ebuild

similarity index 98%
rename from dev-lang/nqp/nqp-2018.06.ebuild
rename to dev-lang/nqp/nqp-2018.06-r1.ebuild
index b74d0ba1f5cfc22f232da0e20182d7de5dc822d3..b940317f245919507871c5af2301f58925637aad 100644 (file)
@@ -29,10 +29,10 @@ CDEPEND="java? (
        )
        moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
 RDEPEND="${CDEPEND}
-       java? ( >=virtual/jre-1.7 )"
+       java? ( >=virtual/jre-1.8 )"
 DEPEND="${CDEPEND}
        clang? ( sys-devel/clang )
-       java? ( >=virtual/jdk-1.7 )
+       java? ( >=virtual/jdk-1.8 )
        dev-lang/perl"
 
 pkg_pretend() {
similarity index 98%
rename from dev-lang/nqp/nqp-2018.08.ebuild
rename to dev-lang/nqp/nqp-2018.08-r1.ebuild
index b74d0ba1f5cfc22f232da0e20182d7de5dc822d3..b940317f245919507871c5af2301f58925637aad 100644 (file)
@@ -29,10 +29,10 @@ CDEPEND="java? (
        )
        moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
 RDEPEND="${CDEPEND}
-       java? ( >=virtual/jre-1.7 )"
+       java? ( >=virtual/jre-1.8 )"
 DEPEND="${CDEPEND}
        clang? ( sys-devel/clang )
-       java? ( >=virtual/jdk-1.7 )
+       java? ( >=virtual/jdk-1.8 )
        dev-lang/perl"
 
 pkg_pretend() {
similarity index 98%
rename from dev-lang/nqp/nqp-2018.09.ebuild
rename to dev-lang/nqp/nqp-2018.09-r1.ebuild
index b74d0ba1f5cfc22f232da0e20182d7de5dc822d3..b940317f245919507871c5af2301f58925637aad 100644 (file)
@@ -29,10 +29,10 @@ CDEPEND="java? (
        )
        moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
 RDEPEND="${CDEPEND}
-       java? ( >=virtual/jre-1.7 )"
+       java? ( >=virtual/jre-1.8 )"
 DEPEND="${CDEPEND}
        clang? ( sys-devel/clang )
-       java? ( >=virtual/jdk-1.7 )
+       java? ( >=virtual/jdk-1.8 )
        dev-lang/perl"
 
 pkg_pretend() {
similarity index 98%
rename from dev-lang/nqp/nqp-2018.12.ebuild
rename to dev-lang/nqp/nqp-2018.12-r1.ebuild
index b74d0ba1f5cfc22f232da0e20182d7de5dc822d3..b940317f245919507871c5af2301f58925637aad 100644 (file)
@@ -29,10 +29,10 @@ CDEPEND="java? (
        )
        moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
 RDEPEND="${CDEPEND}
-       java? ( >=virtual/jre-1.7 )"
+       java? ( >=virtual/jre-1.8 )"
 DEPEND="${CDEPEND}
        clang? ( sys-devel/clang )
-       java? ( >=virtual/jdk-1.7 )
+       java? ( >=virtual/jdk-1.8 )
        dev-lang/perl"
 
 pkg_pretend() {
diff --git a/dev-lang/nqp/nqp-2019.03-r1.ebuild b/dev-lang/nqp/nqp-2019.03-r1.ebuild
new file mode 100644 (file)
index 0000000..b940317
--- /dev/null
@@ -0,0 +1,158 @@
+# 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"
+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=/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-2019.03.ebuild b/dev-lang/nqp/nqp-2019.03.ebuild
deleted file mode 100644 (file)
index b74d0ba..0000000
+++ /dev/null
@@ -1,158 +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"
-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.7 )"
-DEPEND="${CDEPEND}
-       clang? ( sys-devel/clang )
-       java? ( >=virtual/jdk-1.7 )
-       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=/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/*
-}
index 9c9a3c5b474bbfad2ff0eac036a1215fcece9f3b..61c5c890f018cd49721098dbc93bfca82208eec4 100644 (file)
@@ -29,10 +29,10 @@ CDEPEND="java? (
        )
        moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
 RDEPEND="${CDEPEND}
-       java? ( >=virtual/jre-1.7 )"
+       java? ( >=virtual/jre-1.8 )"
 DEPEND="${CDEPEND}
        clang? ( sys-devel/clang )
-       java? ( >=virtual/jdk-1.7 )
+       java? ( >=virtual/jdk-1.8 )
        dev-lang/perl"
 
 pkg_pretend() {