diff options
Diffstat (limited to 'dev-java')
6 files changed, 9 insertions, 9 deletions
diff --git a/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15-r1.ebuild b/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15-r1.ebuild index deb9566f57c0..89ef362dfe55 100644 --- a/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15-r1.ebuild +++ b/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ HOMEPAGE="http://www.mojohaus.org/animal-sniffer/animal-sniffer-annotations/" SRC_URI="https://github.com/mojohaus/${MY_PN}/archive/${MY_PN}-parent-${PV}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm64 ppc64 x86" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/j2objc-annotations/j2objc-annotations-1.2-r1.ebuild b/dev-java/j2objc-annotations/j2objc-annotations-1.2-r1.ebuild index c4d6059dcd6c..7e7246b8be6f 100644 --- a/dev-java/j2objc-annotations/j2objc-annotations-1.2-r1.ebuild +++ b/dev-java/j2objc-annotations/j2objc-annotations-1.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,7 @@ HOMEPAGE="http://j2objc.org" SRC_URI="https://github.com/google/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm64 ppc64 x86" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/jmh-core/jmh-core-1.21.ebuild b/dev-java/jmh-core/jmh-core-1.21.ebuild index 386bb957ba87..8d9d4c30c7d3 100644 --- a/dev-java/jmh-core/jmh-core-1.21.ebuild +++ b/dev-java/jmh-core/jmh-core-1.21.ebuild @@ -16,7 +16,7 @@ HOMEPAGE="https://openjdk.java.net/projects/code-tools/jmh" SRC_URI="https://hg.openjdk.java.net/code-tools/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc64 x86" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" # jopt *must* be 4.6, see https://mail.openjdk.java.net/pipermail/jmh-dev/2016-October/002395.html CP_DEPEND=" diff --git a/dev-java/joda-convert/joda-convert-2.2.2.ebuild b/dev-java/joda-convert/joda-convert-2.2.2.ebuild index cfbe6aea21f2..0a1cd9f58095 100644 --- a/dev-java/joda-convert/joda-convert-2.2.2.ebuild +++ b/dev-java/joda-convert/joda-convert-2.2.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Skeleton command: @@ -18,7 +18,7 @@ SRC_URI="https://github.com/JodaOrg/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ppc64 x86" # Compile dependencies # POM: pom.xml diff --git a/dev-java/jopt-simple/jopt-simple-4.6-r1.ebuild b/dev-java/jopt-simple/jopt-simple-4.6-r1.ebuild index a2885e33f5ac..ba73eb0fea10 100644 --- a/dev-java/jopt-simple/jopt-simple-4.6-r1.ebuild +++ b/dev-java/jopt-simple/jopt-simple-4.6-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/jopt-simple/jopt-simple/archive/refs/tags/jopt-simpl LICENSE="MIT" SLOT="4.6" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86" RDEPEND=">=virtual/jre-1.8:*" DEPEND=">=virtual/jdk-1.8:*" diff --git a/dev-java/openjdk/openjdk-17.0.2_p8.ebuild b/dev-java/openjdk/openjdk-17.0.2_p8.ebuild index c64d7b3baf67..cf327d5a4be5 100644 --- a/dev-java/openjdk/openjdk-17.0.2_p8.ebuild +++ b/dev-java/openjdk/openjdk-17.0.2_p8.ebuild @@ -151,7 +151,7 @@ pkg_setup() { local xpakvar="${ARCH^^}_XPAK" export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}" else - if [[ ${MERGE_TYPE} == "binary" ]]; then + if [[ ${MERGE_TYPE} != "binary" ]]; then JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT}) [[ -n ${JDK_HOME} ]] || die "Build VM not found!" JDK_HOME=${JDK_HOME#*/} |