From f4e348e30fddb21d08e39569b6ea249ad845e61a Mon Sep 17 00:00:00 2001 From: "Alex Xu (Hello71)" Date: Sat, 19 Sep 2020 08:21:48 -0400 Subject: virtual/jdk: sync --- virtual/jdk/jdk-11-r1.ebuild | 15 --------------- virtual/jdk/jdk-11-r2.ebuild | 15 +++++++++++++++ virtual/jdk/jdk-14.ebuild | 4 ++-- virtual/jdk/jdk-15.ebuild | 6 +++--- 4 files changed, 20 insertions(+), 20 deletions(-) delete mode 100644 virtual/jdk/jdk-11-r1.ebuild create mode 100644 virtual/jdk/jdk-11-r2.ebuild diff --git a/virtual/jdk/jdk-11-r1.ebuild b/virtual/jdk/jdk-11-r1.ebuild deleted file mode 100644 index e0888ee..0000000 --- a/virtual/jdk/jdk-11-r1.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Virtual for Java Development Kit (JDK)" -SLOT="${PV}" -KEYWORDS="~amd64 ~arm64 ~ppc64" - -RDEPEND="|| ( - dev-java/openjdk-bin:${SLOT}[gentoo-vm(+)] - dev-java/openjdk:${SLOT}[gentoo-vm(+)] - dev-java/openj9-openjdk-bin:${SLOT}[gentoo-vm(+)] - dev-java/openj9-openjdk:${SLOT}[gentoo-vm(+)] - )" diff --git a/virtual/jdk/jdk-11-r2.ebuild b/virtual/jdk/jdk-11-r2.ebuild new file mode 100644 index 0000000..a18c1a8 --- /dev/null +++ b/virtual/jdk/jdk-11-r2.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Virtual for Java Development Kit (JDK)" +SLOT="${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" + +RDEPEND="|| ( + dev-java/openjdk-bin:${SLOT}[gentoo-vm(+)] + dev-java/openjdk:${SLOT}[gentoo-vm(+)] + dev-java/openj9-openjdk-bin:${SLOT}[gentoo-vm(+)] + dev-java/openj9-openjdk:${SLOT}[gentoo-vm(+)] +)" diff --git a/virtual/jdk/jdk-14.ebuild b/virtual/jdk/jdk-14.ebuild index b659716..a18c1a8 100644 --- a/virtual/jdk/jdk-14.ebuild +++ b/virtual/jdk/jdk-14.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,4 +12,4 @@ RDEPEND="|| ( dev-java/openjdk:${SLOT}[gentoo-vm(+)] dev-java/openj9-openjdk-bin:${SLOT}[gentoo-vm(+)] dev-java/openj9-openjdk:${SLOT}[gentoo-vm(+)] - )" +)" diff --git a/virtual/jdk/jdk-15.ebuild b/virtual/jdk/jdk-15.ebuild index e0888ee..a18c1a8 100644 --- a/virtual/jdk/jdk-15.ebuild +++ b/virtual/jdk/jdk-15.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="Virtual for Java Development Kit (JDK)" SLOT="${PV}" -KEYWORDS="~amd64 ~arm64 ~ppc64" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" RDEPEND="|| ( dev-java/openjdk-bin:${SLOT}[gentoo-vm(+)] dev-java/openjdk:${SLOT}[gentoo-vm(+)] dev-java/openj9-openjdk-bin:${SLOT}[gentoo-vm(+)] dev-java/openj9-openjdk:${SLOT}[gentoo-vm(+)] - )" +)" -- cgit v1.2.3-70-g09d2