[gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk-jre-bin/files/, dev-java/openjdk-jre-bin/
commit: 5f70c82924bd5bdc853f2307d479297829c785c5 Author: Florian Schmaus gentoo org> AuthorDate: Wed May 11 19:29:16 2022 + Commit: Florian Schmaus gentoo org> CommitDate: Wed May 11 19:44:15 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f70c829 dev-java/openjdk-jre-bin: add 17.0.3_p7 Signed-off-by: Florian Schmaus gentoo.org> dev-java/openjdk-jre-bin/Manifest | 1 + .../files/openjdk-jre-bin-17.env.sh| 14 .../openjdk-jre-bin-17.0.3_p7.ebuild | 83 ++ 3 files changed, 98 insertions(+) diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest index b4a91ec7ab10..5520af7efae6 100644 --- a/dev-java/openjdk-jre-bin/Manifest +++ b/dev-java/openjdk-jre-bin/Manifest @@ -1,3 +1,4 @@ DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.14_9.tar.gz 42435138 BLAKE2B 0f972a78221b74be4b8c87845f52d331eb6caf84eef06d291d0cd25ce4357b7072f938fd0390a9c54647d4ddcfe4c0184ddf84583e017e1bf78338b7939437bc SHA512 9ee64498d83d16cefc5a155393d9477bb78338d43a3b4b1699f4358644415a6be5601f7b2a87a82f2a95cafd6485b6db7b30bd0d21096110211b942e95deed64 +DIST OpenJDK17U-jre_x64_linux_hotspot_17.0.3_7.tar.gz 45971131 BLAKE2B dc8a358b10b0d3a6fac60f340ee5224c348aa4b2683e5f7b3396eaca180a12212260d45b8347b472f80671ef86a91f764727897146e4d36bc08b24c7920635fa SHA512 27da884a807c980386b7295f7ea5e253c03b497eff6e21e0cb35ea050552eaf9a3f71060cbd1a2f0cd6069a55ae00b43e46edcf09ab36c142587ea2ab781ad14 DIST OpenJDK8U-jre_x64_linux_hotspot_8u312b07.tar.gz 41286015 BLAKE2B f555fee173b8af98f64cdd08b8141c823033473d8fa0601f8e69899bc6b82234ac33a6de45f87b2cd9457e22d500da9052209c45798d47ec3c4a34496b30d154 SHA512 36d07389e63e49ee16f1329aa7e0bd5b42b397f864f10080038017920fd2b178d5cd9dfaef157080ac020721d0e6e7b26b0277ab1cde69c20500fc34bab0e915 DIST OpenJDK8U-jre_x64_linux_hotspot_8u322b06.tar.gz 41317897 BLAKE2B b96b39d4b3f7fe54f9b04698d4f24879ce617e61ade298b7de1472cb85fbf7d5f297f009c0e881a17bcdaf9baaf3187acef531b0ace97a1f2ab099811995c815 SHA512 4a3acc1330056011f0097aaca77858779e2c89d214598ef66736956984204b8de804549e42c51f8392806753f3d534d34ad93ef6df9f2f45a369e04f6a0694ac diff --git a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-17.env.sh b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-17.env.sh new file mode 100644 index ..5ccace8029b9 --- /dev/null +++ b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-17.env.sh @@ -0,0 +1,14 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +VERSION="Eclipse Temurin JRE ${PV}" +JAVA_HOME="${EPREFIX}/opt/${PN}-${SLOT}" +PATH="\${JAVA_HOME}/bin" +ROOTPATH="\${JAVA_HOME}/bin" +LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/" +MANPATH="\${JAVA_HOME}/man" +PROVIDES_TYPE="JRE" +PROVIDES_VERSION="${SLOT}" +BOOTCLASSPATH="" +GENERATION="2" +ENV_VARS="JAVA_HOME PATH ROOTPATH LDPATH MANPATH" diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.3_p7.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.3_p7.ebuild new file mode 100644 index ..a6f7f3ee248b --- /dev/null +++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.3_p7.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit java-vm-2 + +abi_uri() { + echo "${2-$1}? ( + https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz + )" +} + +MY_PV=${PV/_p/+} +SLOT=${MY_PV%%[.+]*} + +SRC_URI=" + $(abi_uri x64 amd64) +" + +DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin" +HOMEPAGE="https://adoptopenjdk.net"; +LICENSE="GPL-2-with-classpath-exception" +KEYWORDS="~amd64" +IUSE="alsa cups +gentoo-vm headless-awt selinux" + +RDEPEND=" + media-libs/fontconfig:1.0 + media-libs/freetype:2 + >net-libs/libnet-1.1 + >=sys-apps/baselayout-java-0.1.0-r1 + >=sys-libs/glibc-2.2.5:* + sys-libs/zlib + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + selinux? ( sec-policy/selinux-java ) + !headless-awt? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXtst + )" + +RESTRICT="preserve-libs splitdebug" +QA_PREBUILT="*" + +S="${WORKDIR}/jdk-${MY_PV}-jre" + +src_install() { + local dest="/opt/${PN}-${SLOT}" + local ddest="${ED}/${dest#/}" + + # Not sure why they bundle this as it's commonly available and they + # only do so on x86_64. It's needed by libfontmanager.so. IcedTea + # also has an explicit dependency while Oracle seemingly dlopens it. + rm -vf lib/libfreetype.so || die + + # Oracle and IcedTea have libjsoundalsa.so depending on + # libasound.so.2 but AdoptOpenJDK only has libjs
[gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk-jre-bin/files/, dev-java/openjdk-jre-bin/
commit: 3586e009d595162f554b22eee043d8ed73ad57b8 Author: Florian Schmaus gentoo org> AuthorDate: Mon Apr 25 06:50:41 2022 + Commit: Florian Schmaus gentoo org> CommitDate: Mon Apr 25 06:50:41 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3586e009 dev-java/openjdk-jre-bin: fix JAVA_HOME in vm env file Closes: https://bugs.gentoo.org/833796 Signed-off-by: Florian Schmaus gentoo.org> dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh| 6 +++--- ...e-bin-11.0.14_p9.ebuild => openjdk-jre-bin-11.0.14_p9-r1.ebuild} | 0 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh index fced31b2be32..258f0d499fc0 100644 --- a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh +++ b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 VERSION="Eclipse Temurin JRE ${PV}" -JAVA_HOME="${EPREFIX}/opt/${P}" -JDK_HOME="${EPREFIX}/opt/${P}" +JAVA_HOME="${EPREFIX}/opt/${PN}-${SLOT}" +JDK_HOME="${JAVA_HOME}" JAVAC="\${JAVA_HOME}/bin/javac" PATH="\${JAVA_HOME}/bin" ROOTPATH="\${JAVA_HOME}/bin" diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild similarity index 100% rename from dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9.ebuild rename to dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild
[gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk-jre-bin/files/, dev-java/openjdk-jre-bin/
commit: 3586e009d595162f554b22eee043d8ed73ad57b8 Author: Florian Schmaus gentoo org> AuthorDate: Mon Apr 25 06:50:41 2022 + Commit: Florian Schmaus gentoo org> CommitDate: Mon Apr 25 06:50:41 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3586e009 dev-java/openjdk-jre-bin: fix JAVA_HOME in vm env file Closes: https://bugs.gentoo.org/833796 Signed-off-by: Florian Schmaus gentoo.org> dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh| 6 +++--- ...e-bin-11.0.14_p9.ebuild => openjdk-jre-bin-11.0.14_p9-r1.ebuild} | 0 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh index fced31b2be32..258f0d499fc0 100644 --- a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh +++ b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 VERSION="Eclipse Temurin JRE ${PV}" -JAVA_HOME="${EPREFIX}/opt/${P}" -JDK_HOME="${EPREFIX}/opt/${P}" +JAVA_HOME="${EPREFIX}/opt/${PN}-${SLOT}" +JDK_HOME="${JAVA_HOME}" JAVAC="\${JAVA_HOME}/bin/javac" PATH="\${JAVA_HOME}/bin" ROOTPATH="\${JAVA_HOME}/bin" diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild similarity index 100% rename from dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9.ebuild rename to dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild
[gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk-jre-bin/files/, dev-java/openjdk-jre-bin/
commit: 5f70c82924bd5bdc853f2307d479297829c785c5 Author: Florian Schmaus gentoo org> AuthorDate: Wed May 11 19:29:16 2022 + Commit: Florian Schmaus gentoo org> CommitDate: Wed May 11 19:44:15 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f70c829 dev-java/openjdk-jre-bin: add 17.0.3_p7 Signed-off-by: Florian Schmaus gentoo.org> dev-java/openjdk-jre-bin/Manifest | 1 + .../files/openjdk-jre-bin-17.env.sh| 14 .../openjdk-jre-bin-17.0.3_p7.ebuild | 83 ++ 3 files changed, 98 insertions(+) diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest index b4a91ec7ab10..5520af7efae6 100644 --- a/dev-java/openjdk-jre-bin/Manifest +++ b/dev-java/openjdk-jre-bin/Manifest @@ -1,3 +1,4 @@ DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.14_9.tar.gz 42435138 BLAKE2B 0f972a78221b74be4b8c87845f52d331eb6caf84eef06d291d0cd25ce4357b7072f938fd0390a9c54647d4ddcfe4c0184ddf84583e017e1bf78338b7939437bc SHA512 9ee64498d83d16cefc5a155393d9477bb78338d43a3b4b1699f4358644415a6be5601f7b2a87a82f2a95cafd6485b6db7b30bd0d21096110211b942e95deed64 +DIST OpenJDK17U-jre_x64_linux_hotspot_17.0.3_7.tar.gz 45971131 BLAKE2B dc8a358b10b0d3a6fac60f340ee5224c348aa4b2683e5f7b3396eaca180a12212260d45b8347b472f80671ef86a91f764727897146e4d36bc08b24c7920635fa SHA512 27da884a807c980386b7295f7ea5e253c03b497eff6e21e0cb35ea050552eaf9a3f71060cbd1a2f0cd6069a55ae00b43e46edcf09ab36c142587ea2ab781ad14 DIST OpenJDK8U-jre_x64_linux_hotspot_8u312b07.tar.gz 41286015 BLAKE2B f555fee173b8af98f64cdd08b8141c823033473d8fa0601f8e69899bc6b82234ac33a6de45f87b2cd9457e22d500da9052209c45798d47ec3c4a34496b30d154 SHA512 36d07389e63e49ee16f1329aa7e0bd5b42b397f864f10080038017920fd2b178d5cd9dfaef157080ac020721d0e6e7b26b0277ab1cde69c20500fc34bab0e915 DIST OpenJDK8U-jre_x64_linux_hotspot_8u322b06.tar.gz 41317897 BLAKE2B b96b39d4b3f7fe54f9b04698d4f24879ce617e61ade298b7de1472cb85fbf7d5f297f009c0e881a17bcdaf9baaf3187acef531b0ace97a1f2ab099811995c815 SHA512 4a3acc1330056011f0097aaca77858779e2c89d214598ef66736956984204b8de804549e42c51f8392806753f3d534d34ad93ef6df9f2f45a369e04f6a0694ac diff --git a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-17.env.sh b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-17.env.sh new file mode 100644 index ..5ccace8029b9 --- /dev/null +++ b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-17.env.sh @@ -0,0 +1,14 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +VERSION="Eclipse Temurin JRE ${PV}" +JAVA_HOME="${EPREFIX}/opt/${PN}-${SLOT}" +PATH="\${JAVA_HOME}/bin" +ROOTPATH="\${JAVA_HOME}/bin" +LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/" +MANPATH="\${JAVA_HOME}/man" +PROVIDES_TYPE="JRE" +PROVIDES_VERSION="${SLOT}" +BOOTCLASSPATH="" +GENERATION="2" +ENV_VARS="JAVA_HOME PATH ROOTPATH LDPATH MANPATH" diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.3_p7.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.3_p7.ebuild new file mode 100644 index ..a6f7f3ee248b --- /dev/null +++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.3_p7.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit java-vm-2 + +abi_uri() { + echo "${2-$1}? ( + https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz + )" +} + +MY_PV=${PV/_p/+} +SLOT=${MY_PV%%[.+]*} + +SRC_URI=" + $(abi_uri x64 amd64) +" + +DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin" +HOMEPAGE="https://adoptopenjdk.net"; +LICENSE="GPL-2-with-classpath-exception" +KEYWORDS="~amd64" +IUSE="alsa cups +gentoo-vm headless-awt selinux" + +RDEPEND=" + media-libs/fontconfig:1.0 + media-libs/freetype:2 + >net-libs/libnet-1.1 + >=sys-apps/baselayout-java-0.1.0-r1 + >=sys-libs/glibc-2.2.5:* + sys-libs/zlib + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + selinux? ( sec-policy/selinux-java ) + !headless-awt? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXtst + )" + +RESTRICT="preserve-libs splitdebug" +QA_PREBUILT="*" + +S="${WORKDIR}/jdk-${MY_PV}-jre" + +src_install() { + local dest="/opt/${PN}-${SLOT}" + local ddest="${ED}/${dest#/}" + + # Not sure why they bundle this as it's commonly available and they + # only do so on x86_64. It's needed by libfontmanager.so. IcedTea + # also has an explicit dependency while Oracle seemingly dlopens it. + rm -vf lib/libfreetype.so || die + + # Oracle and IcedTea have libjsoundalsa.so depending on + # libasound.so.2 but AdoptOpenJDK only has libjs
[gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk-jre-bin/files/, dev-java/openjdk-jre-bin/
commit: 3586e009d595162f554b22eee043d8ed73ad57b8 Author: Florian Schmaus gentoo org> AuthorDate: Mon Apr 25 06:50:41 2022 + Commit: Florian Schmaus gentoo org> CommitDate: Mon Apr 25 06:50:41 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3586e009 dev-java/openjdk-jre-bin: fix JAVA_HOME in vm env file Closes: https://bugs.gentoo.org/833796 Signed-off-by: Florian Schmaus gentoo.org> dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh| 6 +++--- ...e-bin-11.0.14_p9.ebuild => openjdk-jre-bin-11.0.14_p9-r1.ebuild} | 0 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh index fced31b2be32..258f0d499fc0 100644 --- a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh +++ b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 VERSION="Eclipse Temurin JRE ${PV}" -JAVA_HOME="${EPREFIX}/opt/${P}" -JDK_HOME="${EPREFIX}/opt/${P}" +JAVA_HOME="${EPREFIX}/opt/${PN}-${SLOT}" +JDK_HOME="${JAVA_HOME}" JAVAC="\${JAVA_HOME}/bin/javac" PATH="\${JAVA_HOME}/bin" ROOTPATH="\${JAVA_HOME}/bin" diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild similarity index 100% rename from dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9.ebuild rename to dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild
[gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk-jre-bin/files/, dev-java/openjdk-jre-bin/
commit: 5f70c82924bd5bdc853f2307d479297829c785c5 Author: Florian Schmaus gentoo org> AuthorDate: Wed May 11 19:29:16 2022 + Commit: Florian Schmaus gentoo org> CommitDate: Wed May 11 19:44:15 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f70c829 dev-java/openjdk-jre-bin: add 17.0.3_p7 Signed-off-by: Florian Schmaus gentoo.org> dev-java/openjdk-jre-bin/Manifest | 1 + .../files/openjdk-jre-bin-17.env.sh| 14 .../openjdk-jre-bin-17.0.3_p7.ebuild | 83 ++ 3 files changed, 98 insertions(+) diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest index b4a91ec7ab10..5520af7efae6 100644 --- a/dev-java/openjdk-jre-bin/Manifest +++ b/dev-java/openjdk-jre-bin/Manifest @@ -1,3 +1,4 @@ DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.14_9.tar.gz 42435138 BLAKE2B 0f972a78221b74be4b8c87845f52d331eb6caf84eef06d291d0cd25ce4357b7072f938fd0390a9c54647d4ddcfe4c0184ddf84583e017e1bf78338b7939437bc SHA512 9ee64498d83d16cefc5a155393d9477bb78338d43a3b4b1699f4358644415a6be5601f7b2a87a82f2a95cafd6485b6db7b30bd0d21096110211b942e95deed64 +DIST OpenJDK17U-jre_x64_linux_hotspot_17.0.3_7.tar.gz 45971131 BLAKE2B dc8a358b10b0d3a6fac60f340ee5224c348aa4b2683e5f7b3396eaca180a12212260d45b8347b472f80671ef86a91f764727897146e4d36bc08b24c7920635fa SHA512 27da884a807c980386b7295f7ea5e253c03b497eff6e21e0cb35ea050552eaf9a3f71060cbd1a2f0cd6069a55ae00b43e46edcf09ab36c142587ea2ab781ad14 DIST OpenJDK8U-jre_x64_linux_hotspot_8u312b07.tar.gz 41286015 BLAKE2B f555fee173b8af98f64cdd08b8141c823033473d8fa0601f8e69899bc6b82234ac33a6de45f87b2cd9457e22d500da9052209c45798d47ec3c4a34496b30d154 SHA512 36d07389e63e49ee16f1329aa7e0bd5b42b397f864f10080038017920fd2b178d5cd9dfaef157080ac020721d0e6e7b26b0277ab1cde69c20500fc34bab0e915 DIST OpenJDK8U-jre_x64_linux_hotspot_8u322b06.tar.gz 41317897 BLAKE2B b96b39d4b3f7fe54f9b04698d4f24879ce617e61ade298b7de1472cb85fbf7d5f297f009c0e881a17bcdaf9baaf3187acef531b0ace97a1f2ab099811995c815 SHA512 4a3acc1330056011f0097aaca77858779e2c89d214598ef66736956984204b8de804549e42c51f8392806753f3d534d34ad93ef6df9f2f45a369e04f6a0694ac diff --git a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-17.env.sh b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-17.env.sh new file mode 100644 index ..5ccace8029b9 --- /dev/null +++ b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-17.env.sh @@ -0,0 +1,14 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +VERSION="Eclipse Temurin JRE ${PV}" +JAVA_HOME="${EPREFIX}/opt/${PN}-${SLOT}" +PATH="\${JAVA_HOME}/bin" +ROOTPATH="\${JAVA_HOME}/bin" +LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/" +MANPATH="\${JAVA_HOME}/man" +PROVIDES_TYPE="JRE" +PROVIDES_VERSION="${SLOT}" +BOOTCLASSPATH="" +GENERATION="2" +ENV_VARS="JAVA_HOME PATH ROOTPATH LDPATH MANPATH" diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.3_p7.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.3_p7.ebuild new file mode 100644 index ..a6f7f3ee248b --- /dev/null +++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.3_p7.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit java-vm-2 + +abi_uri() { + echo "${2-$1}? ( + https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz + )" +} + +MY_PV=${PV/_p/+} +SLOT=${MY_PV%%[.+]*} + +SRC_URI=" + $(abi_uri x64 amd64) +" + +DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin" +HOMEPAGE="https://adoptopenjdk.net"; +LICENSE="GPL-2-with-classpath-exception" +KEYWORDS="~amd64" +IUSE="alsa cups +gentoo-vm headless-awt selinux" + +RDEPEND=" + media-libs/fontconfig:1.0 + media-libs/freetype:2 + >net-libs/libnet-1.1 + >=sys-apps/baselayout-java-0.1.0-r1 + >=sys-libs/glibc-2.2.5:* + sys-libs/zlib + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + selinux? ( sec-policy/selinux-java ) + !headless-awt? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXtst + )" + +RESTRICT="preserve-libs splitdebug" +QA_PREBUILT="*" + +S="${WORKDIR}/jdk-${MY_PV}-jre" + +src_install() { + local dest="/opt/${PN}-${SLOT}" + local ddest="${ED}/${dest#/}" + + # Not sure why they bundle this as it's commonly available and they + # only do so on x86_64. It's needed by libfontmanager.so. IcedTea + # also has an explicit dependency while Oracle seemingly dlopens it. + rm -vf lib/libfreetype.so || die + + # Oracle and IcedTea have libjsoundalsa.so depending on + # libasound.so.2 but AdoptOpenJDK only has libjs
[gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk-jre-bin/files/, dev-java/openjdk-jre-bin/
commit: 5f70c82924bd5bdc853f2307d479297829c785c5 Author: Florian Schmaus gentoo org> AuthorDate: Wed May 11 19:29:16 2022 + Commit: Florian Schmaus gentoo org> CommitDate: Wed May 11 19:44:15 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f70c829 dev-java/openjdk-jre-bin: add 17.0.3_p7 Signed-off-by: Florian Schmaus gentoo.org> dev-java/openjdk-jre-bin/Manifest | 1 + .../files/openjdk-jre-bin-17.env.sh| 14 .../openjdk-jre-bin-17.0.3_p7.ebuild | 83 ++ 3 files changed, 98 insertions(+) diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest index b4a91ec7ab10..5520af7efae6 100644 --- a/dev-java/openjdk-jre-bin/Manifest +++ b/dev-java/openjdk-jre-bin/Manifest @@ -1,3 +1,4 @@ DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.14_9.tar.gz 42435138 BLAKE2B 0f972a78221b74be4b8c87845f52d331eb6caf84eef06d291d0cd25ce4357b7072f938fd0390a9c54647d4ddcfe4c0184ddf84583e017e1bf78338b7939437bc SHA512 9ee64498d83d16cefc5a155393d9477bb78338d43a3b4b1699f4358644415a6be5601f7b2a87a82f2a95cafd6485b6db7b30bd0d21096110211b942e95deed64 +DIST OpenJDK17U-jre_x64_linux_hotspot_17.0.3_7.tar.gz 45971131 BLAKE2B dc8a358b10b0d3a6fac60f340ee5224c348aa4b2683e5f7b3396eaca180a12212260d45b8347b472f80671ef86a91f764727897146e4d36bc08b24c7920635fa SHA512 27da884a807c980386b7295f7ea5e253c03b497eff6e21e0cb35ea050552eaf9a3f71060cbd1a2f0cd6069a55ae00b43e46edcf09ab36c142587ea2ab781ad14 DIST OpenJDK8U-jre_x64_linux_hotspot_8u312b07.tar.gz 41286015 BLAKE2B f555fee173b8af98f64cdd08b8141c823033473d8fa0601f8e69899bc6b82234ac33a6de45f87b2cd9457e22d500da9052209c45798d47ec3c4a34496b30d154 SHA512 36d07389e63e49ee16f1329aa7e0bd5b42b397f864f10080038017920fd2b178d5cd9dfaef157080ac020721d0e6e7b26b0277ab1cde69c20500fc34bab0e915 DIST OpenJDK8U-jre_x64_linux_hotspot_8u322b06.tar.gz 41317897 BLAKE2B b96b39d4b3f7fe54f9b04698d4f24879ce617e61ade298b7de1472cb85fbf7d5f297f009c0e881a17bcdaf9baaf3187acef531b0ace97a1f2ab099811995c815 SHA512 4a3acc1330056011f0097aaca77858779e2c89d214598ef66736956984204b8de804549e42c51f8392806753f3d534d34ad93ef6df9f2f45a369e04f6a0694ac diff --git a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-17.env.sh b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-17.env.sh new file mode 100644 index ..5ccace8029b9 --- /dev/null +++ b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-17.env.sh @@ -0,0 +1,14 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +VERSION="Eclipse Temurin JRE ${PV}" +JAVA_HOME="${EPREFIX}/opt/${PN}-${SLOT}" +PATH="\${JAVA_HOME}/bin" +ROOTPATH="\${JAVA_HOME}/bin" +LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/" +MANPATH="\${JAVA_HOME}/man" +PROVIDES_TYPE="JRE" +PROVIDES_VERSION="${SLOT}" +BOOTCLASSPATH="" +GENERATION="2" +ENV_VARS="JAVA_HOME PATH ROOTPATH LDPATH MANPATH" diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.3_p7.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.3_p7.ebuild new file mode 100644 index ..a6f7f3ee248b --- /dev/null +++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.3_p7.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit java-vm-2 + +abi_uri() { + echo "${2-$1}? ( + https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz + )" +} + +MY_PV=${PV/_p/+} +SLOT=${MY_PV%%[.+]*} + +SRC_URI=" + $(abi_uri x64 amd64) +" + +DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin" +HOMEPAGE="https://adoptopenjdk.net"; +LICENSE="GPL-2-with-classpath-exception" +KEYWORDS="~amd64" +IUSE="alsa cups +gentoo-vm headless-awt selinux" + +RDEPEND=" + media-libs/fontconfig:1.0 + media-libs/freetype:2 + >net-libs/libnet-1.1 + >=sys-apps/baselayout-java-0.1.0-r1 + >=sys-libs/glibc-2.2.5:* + sys-libs/zlib + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + selinux? ( sec-policy/selinux-java ) + !headless-awt? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXtst + )" + +RESTRICT="preserve-libs splitdebug" +QA_PREBUILT="*" + +S="${WORKDIR}/jdk-${MY_PV}-jre" + +src_install() { + local dest="/opt/${PN}-${SLOT}" + local ddest="${ED}/${dest#/}" + + # Not sure why they bundle this as it's commonly available and they + # only do so on x86_64. It's needed by libfontmanager.so. IcedTea + # also has an explicit dependency while Oracle seemingly dlopens it. + rm -vf lib/libfreetype.so || die + + # Oracle and IcedTea have libjsoundalsa.so depending on + # libasound.so.2 but AdoptOpenJDK only has libjs
[gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk-jre-bin/files/, dev-java/openjdk-jre-bin/
commit: 3586e009d595162f554b22eee043d8ed73ad57b8 Author: Florian Schmaus gentoo org> AuthorDate: Mon Apr 25 06:50:41 2022 + Commit: Florian Schmaus gentoo org> CommitDate: Mon Apr 25 06:50:41 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3586e009 dev-java/openjdk-jre-bin: fix JAVA_HOME in vm env file Closes: https://bugs.gentoo.org/833796 Signed-off-by: Florian Schmaus gentoo.org> dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh| 6 +++--- ...e-bin-11.0.14_p9.ebuild => openjdk-jre-bin-11.0.14_p9-r1.ebuild} | 0 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh index fced31b2be32..258f0d499fc0 100644 --- a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh +++ b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 VERSION="Eclipse Temurin JRE ${PV}" -JAVA_HOME="${EPREFIX}/opt/${P}" -JDK_HOME="${EPREFIX}/opt/${P}" +JAVA_HOME="${EPREFIX}/opt/${PN}-${SLOT}" +JDK_HOME="${JAVA_HOME}" JAVAC="\${JAVA_HOME}/bin/javac" PATH="\${JAVA_HOME}/bin" ROOTPATH="\${JAVA_HOME}/bin" diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild similarity index 100% rename from dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9.ebuild rename to dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild
[gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk-jre-bin/files/, dev-java/openjdk-jre-bin/
commit: 5f70c82924bd5bdc853f2307d479297829c785c5 Author: Florian Schmaus gentoo org> AuthorDate: Wed May 11 19:29:16 2022 + Commit: Florian Schmaus gentoo org> CommitDate: Wed May 11 19:44:15 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f70c829 dev-java/openjdk-jre-bin: add 17.0.3_p7 Signed-off-by: Florian Schmaus gentoo.org> dev-java/openjdk-jre-bin/Manifest | 1 + .../files/openjdk-jre-bin-17.env.sh| 14 .../openjdk-jre-bin-17.0.3_p7.ebuild | 83 ++ 3 files changed, 98 insertions(+) diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest index b4a91ec7ab10..5520af7efae6 100644 --- a/dev-java/openjdk-jre-bin/Manifest +++ b/dev-java/openjdk-jre-bin/Manifest @@ -1,3 +1,4 @@ DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.14_9.tar.gz 42435138 BLAKE2B 0f972a78221b74be4b8c87845f52d331eb6caf84eef06d291d0cd25ce4357b7072f938fd0390a9c54647d4ddcfe4c0184ddf84583e017e1bf78338b7939437bc SHA512 9ee64498d83d16cefc5a155393d9477bb78338d43a3b4b1699f4358644415a6be5601f7b2a87a82f2a95cafd6485b6db7b30bd0d21096110211b942e95deed64 +DIST OpenJDK17U-jre_x64_linux_hotspot_17.0.3_7.tar.gz 45971131 BLAKE2B dc8a358b10b0d3a6fac60f340ee5224c348aa4b2683e5f7b3396eaca180a12212260d45b8347b472f80671ef86a91f764727897146e4d36bc08b24c7920635fa SHA512 27da884a807c980386b7295f7ea5e253c03b497eff6e21e0cb35ea050552eaf9a3f71060cbd1a2f0cd6069a55ae00b43e46edcf09ab36c142587ea2ab781ad14 DIST OpenJDK8U-jre_x64_linux_hotspot_8u312b07.tar.gz 41286015 BLAKE2B f555fee173b8af98f64cdd08b8141c823033473d8fa0601f8e69899bc6b82234ac33a6de45f87b2cd9457e22d500da9052209c45798d47ec3c4a34496b30d154 SHA512 36d07389e63e49ee16f1329aa7e0bd5b42b397f864f10080038017920fd2b178d5cd9dfaef157080ac020721d0e6e7b26b0277ab1cde69c20500fc34bab0e915 DIST OpenJDK8U-jre_x64_linux_hotspot_8u322b06.tar.gz 41317897 BLAKE2B b96b39d4b3f7fe54f9b04698d4f24879ce617e61ade298b7de1472cb85fbf7d5f297f009c0e881a17bcdaf9baaf3187acef531b0ace97a1f2ab099811995c815 SHA512 4a3acc1330056011f0097aaca77858779e2c89d214598ef66736956984204b8de804549e42c51f8392806753f3d534d34ad93ef6df9f2f45a369e04f6a0694ac diff --git a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-17.env.sh b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-17.env.sh new file mode 100644 index ..5ccace8029b9 --- /dev/null +++ b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-17.env.sh @@ -0,0 +1,14 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +VERSION="Eclipse Temurin JRE ${PV}" +JAVA_HOME="${EPREFIX}/opt/${PN}-${SLOT}" +PATH="\${JAVA_HOME}/bin" +ROOTPATH="\${JAVA_HOME}/bin" +LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/" +MANPATH="\${JAVA_HOME}/man" +PROVIDES_TYPE="JRE" +PROVIDES_VERSION="${SLOT}" +BOOTCLASSPATH="" +GENERATION="2" +ENV_VARS="JAVA_HOME PATH ROOTPATH LDPATH MANPATH" diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.3_p7.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.3_p7.ebuild new file mode 100644 index ..a6f7f3ee248b --- /dev/null +++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.3_p7.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit java-vm-2 + +abi_uri() { + echo "${2-$1}? ( + https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz + )" +} + +MY_PV=${PV/_p/+} +SLOT=${MY_PV%%[.+]*} + +SRC_URI=" + $(abi_uri x64 amd64) +" + +DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin" +HOMEPAGE="https://adoptopenjdk.net"; +LICENSE="GPL-2-with-classpath-exception" +KEYWORDS="~amd64" +IUSE="alsa cups +gentoo-vm headless-awt selinux" + +RDEPEND=" + media-libs/fontconfig:1.0 + media-libs/freetype:2 + >net-libs/libnet-1.1 + >=sys-apps/baselayout-java-0.1.0-r1 + >=sys-libs/glibc-2.2.5:* + sys-libs/zlib + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + selinux? ( sec-policy/selinux-java ) + !headless-awt? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXtst + )" + +RESTRICT="preserve-libs splitdebug" +QA_PREBUILT="*" + +S="${WORKDIR}/jdk-${MY_PV}-jre" + +src_install() { + local dest="/opt/${PN}-${SLOT}" + local ddest="${ED}/${dest#/}" + + # Not sure why they bundle this as it's commonly available and they + # only do so on x86_64. It's needed by libfontmanager.so. IcedTea + # also has an explicit dependency while Oracle seemingly dlopens it. + rm -vf lib/libfreetype.so || die + + # Oracle and IcedTea have libjsoundalsa.so depending on + # libasound.so.2 but AdoptOpenJDK only has libjs
[gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk-jre-bin/files/, dev-java/openjdk-jre-bin/
commit: 3586e009d595162f554b22eee043d8ed73ad57b8 Author: Florian Schmaus gentoo org> AuthorDate: Mon Apr 25 06:50:41 2022 + Commit: Florian Schmaus gentoo org> CommitDate: Mon Apr 25 06:50:41 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3586e009 dev-java/openjdk-jre-bin: fix JAVA_HOME in vm env file Closes: https://bugs.gentoo.org/833796 Signed-off-by: Florian Schmaus gentoo.org> dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh| 6 +++--- ...e-bin-11.0.14_p9.ebuild => openjdk-jre-bin-11.0.14_p9-r1.ebuild} | 0 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh index fced31b2be32..258f0d499fc0 100644 --- a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh +++ b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 VERSION="Eclipse Temurin JRE ${PV}" -JAVA_HOME="${EPREFIX}/opt/${P}" -JDK_HOME="${EPREFIX}/opt/${P}" +JAVA_HOME="${EPREFIX}/opt/${PN}-${SLOT}" +JDK_HOME="${JAVA_HOME}" JAVAC="\${JAVA_HOME}/bin/javac" PATH="\${JAVA_HOME}/bin" ROOTPATH="\${JAVA_HOME}/bin" diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild similarity index 100% rename from dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9.ebuild rename to dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild
[gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk-jre-bin/files/, dev-java/openjdk-jre-bin/
commit: 3586e009d595162f554b22eee043d8ed73ad57b8 Author: Florian Schmaus gentoo org> AuthorDate: Mon Apr 25 06:50:41 2022 + Commit: Florian Schmaus gentoo org> CommitDate: Mon Apr 25 06:50:41 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3586e009 dev-java/openjdk-jre-bin: fix JAVA_HOME in vm env file Closes: https://bugs.gentoo.org/833796 Signed-off-by: Florian Schmaus gentoo.org> dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh| 6 +++--- ...e-bin-11.0.14_p9.ebuild => openjdk-jre-bin-11.0.14_p9-r1.ebuild} | 0 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh index fced31b2be32..258f0d499fc0 100644 --- a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh +++ b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 VERSION="Eclipse Temurin JRE ${PV}" -JAVA_HOME="${EPREFIX}/opt/${P}" -JDK_HOME="${EPREFIX}/opt/${P}" +JAVA_HOME="${EPREFIX}/opt/${PN}-${SLOT}" +JDK_HOME="${JAVA_HOME}" JAVAC="\${JAVA_HOME}/bin/javac" PATH="\${JAVA_HOME}/bin" ROOTPATH="\${JAVA_HOME}/bin" diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild similarity index 100% rename from dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9.ebuild rename to dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild
[gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk-jre-bin/files/, dev-java/openjdk-jre-bin/
commit: 5f70c82924bd5bdc853f2307d479297829c785c5 Author: Florian Schmaus gentoo org> AuthorDate: Wed May 11 19:29:16 2022 + Commit: Florian Schmaus gentoo org> CommitDate: Wed May 11 19:44:15 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f70c829 dev-java/openjdk-jre-bin: add 17.0.3_p7 Signed-off-by: Florian Schmaus gentoo.org> dev-java/openjdk-jre-bin/Manifest | 1 + .../files/openjdk-jre-bin-17.env.sh| 14 .../openjdk-jre-bin-17.0.3_p7.ebuild | 83 ++ 3 files changed, 98 insertions(+) diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest index b4a91ec7ab10..5520af7efae6 100644 --- a/dev-java/openjdk-jre-bin/Manifest +++ b/dev-java/openjdk-jre-bin/Manifest @@ -1,3 +1,4 @@ DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.14_9.tar.gz 42435138 BLAKE2B 0f972a78221b74be4b8c87845f52d331eb6caf84eef06d291d0cd25ce4357b7072f938fd0390a9c54647d4ddcfe4c0184ddf84583e017e1bf78338b7939437bc SHA512 9ee64498d83d16cefc5a155393d9477bb78338d43a3b4b1699f4358644415a6be5601f7b2a87a82f2a95cafd6485b6db7b30bd0d21096110211b942e95deed64 +DIST OpenJDK17U-jre_x64_linux_hotspot_17.0.3_7.tar.gz 45971131 BLAKE2B dc8a358b10b0d3a6fac60f340ee5224c348aa4b2683e5f7b3396eaca180a12212260d45b8347b472f80671ef86a91f764727897146e4d36bc08b24c7920635fa SHA512 27da884a807c980386b7295f7ea5e253c03b497eff6e21e0cb35ea050552eaf9a3f71060cbd1a2f0cd6069a55ae00b43e46edcf09ab36c142587ea2ab781ad14 DIST OpenJDK8U-jre_x64_linux_hotspot_8u312b07.tar.gz 41286015 BLAKE2B f555fee173b8af98f64cdd08b8141c823033473d8fa0601f8e69899bc6b82234ac33a6de45f87b2cd9457e22d500da9052209c45798d47ec3c4a34496b30d154 SHA512 36d07389e63e49ee16f1329aa7e0bd5b42b397f864f10080038017920fd2b178d5cd9dfaef157080ac020721d0e6e7b26b0277ab1cde69c20500fc34bab0e915 DIST OpenJDK8U-jre_x64_linux_hotspot_8u322b06.tar.gz 41317897 BLAKE2B b96b39d4b3f7fe54f9b04698d4f24879ce617e61ade298b7de1472cb85fbf7d5f297f009c0e881a17bcdaf9baaf3187acef531b0ace97a1f2ab099811995c815 SHA512 4a3acc1330056011f0097aaca77858779e2c89d214598ef66736956984204b8de804549e42c51f8392806753f3d534d34ad93ef6df9f2f45a369e04f6a0694ac diff --git a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-17.env.sh b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-17.env.sh new file mode 100644 index ..5ccace8029b9 --- /dev/null +++ b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-17.env.sh @@ -0,0 +1,14 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +VERSION="Eclipse Temurin JRE ${PV}" +JAVA_HOME="${EPREFIX}/opt/${PN}-${SLOT}" +PATH="\${JAVA_HOME}/bin" +ROOTPATH="\${JAVA_HOME}/bin" +LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/" +MANPATH="\${JAVA_HOME}/man" +PROVIDES_TYPE="JRE" +PROVIDES_VERSION="${SLOT}" +BOOTCLASSPATH="" +GENERATION="2" +ENV_VARS="JAVA_HOME PATH ROOTPATH LDPATH MANPATH" diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.3_p7.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.3_p7.ebuild new file mode 100644 index ..a6f7f3ee248b --- /dev/null +++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.3_p7.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit java-vm-2 + +abi_uri() { + echo "${2-$1}? ( + https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz + )" +} + +MY_PV=${PV/_p/+} +SLOT=${MY_PV%%[.+]*} + +SRC_URI=" + $(abi_uri x64 amd64) +" + +DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin" +HOMEPAGE="https://adoptopenjdk.net"; +LICENSE="GPL-2-with-classpath-exception" +KEYWORDS="~amd64" +IUSE="alsa cups +gentoo-vm headless-awt selinux" + +RDEPEND=" + media-libs/fontconfig:1.0 + media-libs/freetype:2 + >net-libs/libnet-1.1 + >=sys-apps/baselayout-java-0.1.0-r1 + >=sys-libs/glibc-2.2.5:* + sys-libs/zlib + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + selinux? ( sec-policy/selinux-java ) + !headless-awt? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXtst + )" + +RESTRICT="preserve-libs splitdebug" +QA_PREBUILT="*" + +S="${WORKDIR}/jdk-${MY_PV}-jre" + +src_install() { + local dest="/opt/${PN}-${SLOT}" + local ddest="${ED}/${dest#/}" + + # Not sure why they bundle this as it's commonly available and they + # only do so on x86_64. It's needed by libfontmanager.so. IcedTea + # also has an explicit dependency while Oracle seemingly dlopens it. + rm -vf lib/libfreetype.so || die + + # Oracle and IcedTea have libjsoundalsa.so depending on + # libasound.so.2 but AdoptOpenJDK only has libjs
[gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk-jre-bin/files/, dev-java/openjdk-jre-bin/
commit: 5f70c82924bd5bdc853f2307d479297829c785c5 Author: Florian Schmaus gentoo org> AuthorDate: Wed May 11 19:29:16 2022 + Commit: Florian Schmaus gentoo org> CommitDate: Wed May 11 19:44:15 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f70c829 dev-java/openjdk-jre-bin: add 17.0.3_p7 Signed-off-by: Florian Schmaus gentoo.org> dev-java/openjdk-jre-bin/Manifest | 1 + .../files/openjdk-jre-bin-17.env.sh| 14 .../openjdk-jre-bin-17.0.3_p7.ebuild | 83 ++ 3 files changed, 98 insertions(+) diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest index b4a91ec7ab10..5520af7efae6 100644 --- a/dev-java/openjdk-jre-bin/Manifest +++ b/dev-java/openjdk-jre-bin/Manifest @@ -1,3 +1,4 @@ DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.14_9.tar.gz 42435138 BLAKE2B 0f972a78221b74be4b8c87845f52d331eb6caf84eef06d291d0cd25ce4357b7072f938fd0390a9c54647d4ddcfe4c0184ddf84583e017e1bf78338b7939437bc SHA512 9ee64498d83d16cefc5a155393d9477bb78338d43a3b4b1699f4358644415a6be5601f7b2a87a82f2a95cafd6485b6db7b30bd0d21096110211b942e95deed64 +DIST OpenJDK17U-jre_x64_linux_hotspot_17.0.3_7.tar.gz 45971131 BLAKE2B dc8a358b10b0d3a6fac60f340ee5224c348aa4b2683e5f7b3396eaca180a12212260d45b8347b472f80671ef86a91f764727897146e4d36bc08b24c7920635fa SHA512 27da884a807c980386b7295f7ea5e253c03b497eff6e21e0cb35ea050552eaf9a3f71060cbd1a2f0cd6069a55ae00b43e46edcf09ab36c142587ea2ab781ad14 DIST OpenJDK8U-jre_x64_linux_hotspot_8u312b07.tar.gz 41286015 BLAKE2B f555fee173b8af98f64cdd08b8141c823033473d8fa0601f8e69899bc6b82234ac33a6de45f87b2cd9457e22d500da9052209c45798d47ec3c4a34496b30d154 SHA512 36d07389e63e49ee16f1329aa7e0bd5b42b397f864f10080038017920fd2b178d5cd9dfaef157080ac020721d0e6e7b26b0277ab1cde69c20500fc34bab0e915 DIST OpenJDK8U-jre_x64_linux_hotspot_8u322b06.tar.gz 41317897 BLAKE2B b96b39d4b3f7fe54f9b04698d4f24879ce617e61ade298b7de1472cb85fbf7d5f297f009c0e881a17bcdaf9baaf3187acef531b0ace97a1f2ab099811995c815 SHA512 4a3acc1330056011f0097aaca77858779e2c89d214598ef66736956984204b8de804549e42c51f8392806753f3d534d34ad93ef6df9f2f45a369e04f6a0694ac diff --git a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-17.env.sh b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-17.env.sh new file mode 100644 index ..5ccace8029b9 --- /dev/null +++ b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-17.env.sh @@ -0,0 +1,14 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +VERSION="Eclipse Temurin JRE ${PV}" +JAVA_HOME="${EPREFIX}/opt/${PN}-${SLOT}" +PATH="\${JAVA_HOME}/bin" +ROOTPATH="\${JAVA_HOME}/bin" +LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/" +MANPATH="\${JAVA_HOME}/man" +PROVIDES_TYPE="JRE" +PROVIDES_VERSION="${SLOT}" +BOOTCLASSPATH="" +GENERATION="2" +ENV_VARS="JAVA_HOME PATH ROOTPATH LDPATH MANPATH" diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.3_p7.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.3_p7.ebuild new file mode 100644 index ..a6f7f3ee248b --- /dev/null +++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.3_p7.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit java-vm-2 + +abi_uri() { + echo "${2-$1}? ( + https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz + )" +} + +MY_PV=${PV/_p/+} +SLOT=${MY_PV%%[.+]*} + +SRC_URI=" + $(abi_uri x64 amd64) +" + +DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin" +HOMEPAGE="https://adoptopenjdk.net"; +LICENSE="GPL-2-with-classpath-exception" +KEYWORDS="~amd64" +IUSE="alsa cups +gentoo-vm headless-awt selinux" + +RDEPEND=" + media-libs/fontconfig:1.0 + media-libs/freetype:2 + >net-libs/libnet-1.1 + >=sys-apps/baselayout-java-0.1.0-r1 + >=sys-libs/glibc-2.2.5:* + sys-libs/zlib + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + selinux? ( sec-policy/selinux-java ) + !headless-awt? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXtst + )" + +RESTRICT="preserve-libs splitdebug" +QA_PREBUILT="*" + +S="${WORKDIR}/jdk-${MY_PV}-jre" + +src_install() { + local dest="/opt/${PN}-${SLOT}" + local ddest="${ED}/${dest#/}" + + # Not sure why they bundle this as it's commonly available and they + # only do so on x86_64. It's needed by libfontmanager.so. IcedTea + # also has an explicit dependency while Oracle seemingly dlopens it. + rm -vf lib/libfreetype.so || die + + # Oracle and IcedTea have libjsoundalsa.so depending on + # libasound.so.2 but AdoptOpenJDK only has libjs
[gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk-jre-bin/files/, dev-java/openjdk-jre-bin/
commit: 3586e009d595162f554b22eee043d8ed73ad57b8 Author: Florian Schmaus gentoo org> AuthorDate: Mon Apr 25 06:50:41 2022 + Commit: Florian Schmaus gentoo org> CommitDate: Mon Apr 25 06:50:41 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3586e009 dev-java/openjdk-jre-bin: fix JAVA_HOME in vm env file Closes: https://bugs.gentoo.org/833796 Signed-off-by: Florian Schmaus gentoo.org> dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh| 6 +++--- ...e-bin-11.0.14_p9.ebuild => openjdk-jre-bin-11.0.14_p9-r1.ebuild} | 0 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh index fced31b2be32..258f0d499fc0 100644 --- a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh +++ b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 VERSION="Eclipse Temurin JRE ${PV}" -JAVA_HOME="${EPREFIX}/opt/${P}" -JDK_HOME="${EPREFIX}/opt/${P}" +JAVA_HOME="${EPREFIX}/opt/${PN}-${SLOT}" +JDK_HOME="${JAVA_HOME}" JAVAC="\${JAVA_HOME}/bin/javac" PATH="\${JAVA_HOME}/bin" ROOTPATH="\${JAVA_HOME}/bin" diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild similarity index 100% rename from dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9.ebuild rename to dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild
[gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk-jre-bin/files/, dev-java/openjdk-jre-bin/
commit: 5f70c82924bd5bdc853f2307d479297829c785c5 Author: Florian Schmaus gentoo org> AuthorDate: Wed May 11 19:29:16 2022 + Commit: Florian Schmaus gentoo org> CommitDate: Wed May 11 19:44:15 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f70c829 dev-java/openjdk-jre-bin: add 17.0.3_p7 Signed-off-by: Florian Schmaus gentoo.org> dev-java/openjdk-jre-bin/Manifest | 1 + .../files/openjdk-jre-bin-17.env.sh| 14 .../openjdk-jre-bin-17.0.3_p7.ebuild | 83 ++ 3 files changed, 98 insertions(+) diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest index b4a91ec7ab10..5520af7efae6 100644 --- a/dev-java/openjdk-jre-bin/Manifest +++ b/dev-java/openjdk-jre-bin/Manifest @@ -1,3 +1,4 @@ DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.14_9.tar.gz 42435138 BLAKE2B 0f972a78221b74be4b8c87845f52d331eb6caf84eef06d291d0cd25ce4357b7072f938fd0390a9c54647d4ddcfe4c0184ddf84583e017e1bf78338b7939437bc SHA512 9ee64498d83d16cefc5a155393d9477bb78338d43a3b4b1699f4358644415a6be5601f7b2a87a82f2a95cafd6485b6db7b30bd0d21096110211b942e95deed64 +DIST OpenJDK17U-jre_x64_linux_hotspot_17.0.3_7.tar.gz 45971131 BLAKE2B dc8a358b10b0d3a6fac60f340ee5224c348aa4b2683e5f7b3396eaca180a12212260d45b8347b472f80671ef86a91f764727897146e4d36bc08b24c7920635fa SHA512 27da884a807c980386b7295f7ea5e253c03b497eff6e21e0cb35ea050552eaf9a3f71060cbd1a2f0cd6069a55ae00b43e46edcf09ab36c142587ea2ab781ad14 DIST OpenJDK8U-jre_x64_linux_hotspot_8u312b07.tar.gz 41286015 BLAKE2B f555fee173b8af98f64cdd08b8141c823033473d8fa0601f8e69899bc6b82234ac33a6de45f87b2cd9457e22d500da9052209c45798d47ec3c4a34496b30d154 SHA512 36d07389e63e49ee16f1329aa7e0bd5b42b397f864f10080038017920fd2b178d5cd9dfaef157080ac020721d0e6e7b26b0277ab1cde69c20500fc34bab0e915 DIST OpenJDK8U-jre_x64_linux_hotspot_8u322b06.tar.gz 41317897 BLAKE2B b96b39d4b3f7fe54f9b04698d4f24879ce617e61ade298b7de1472cb85fbf7d5f297f009c0e881a17bcdaf9baaf3187acef531b0ace97a1f2ab099811995c815 SHA512 4a3acc1330056011f0097aaca77858779e2c89d214598ef66736956984204b8de804549e42c51f8392806753f3d534d34ad93ef6df9f2f45a369e04f6a0694ac diff --git a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-17.env.sh b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-17.env.sh new file mode 100644 index ..5ccace8029b9 --- /dev/null +++ b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-17.env.sh @@ -0,0 +1,14 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +VERSION="Eclipse Temurin JRE ${PV}" +JAVA_HOME="${EPREFIX}/opt/${PN}-${SLOT}" +PATH="\${JAVA_HOME}/bin" +ROOTPATH="\${JAVA_HOME}/bin" +LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/" +MANPATH="\${JAVA_HOME}/man" +PROVIDES_TYPE="JRE" +PROVIDES_VERSION="${SLOT}" +BOOTCLASSPATH="" +GENERATION="2" +ENV_VARS="JAVA_HOME PATH ROOTPATH LDPATH MANPATH" diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.3_p7.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.3_p7.ebuild new file mode 100644 index ..a6f7f3ee248b --- /dev/null +++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.3_p7.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit java-vm-2 + +abi_uri() { + echo "${2-$1}? ( + https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz + )" +} + +MY_PV=${PV/_p/+} +SLOT=${MY_PV%%[.+]*} + +SRC_URI=" + $(abi_uri x64 amd64) +" + +DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin" +HOMEPAGE="https://adoptopenjdk.net"; +LICENSE="GPL-2-with-classpath-exception" +KEYWORDS="~amd64" +IUSE="alsa cups +gentoo-vm headless-awt selinux" + +RDEPEND=" + media-libs/fontconfig:1.0 + media-libs/freetype:2 + >net-libs/libnet-1.1 + >=sys-apps/baselayout-java-0.1.0-r1 + >=sys-libs/glibc-2.2.5:* + sys-libs/zlib + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + selinux? ( sec-policy/selinux-java ) + !headless-awt? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXtst + )" + +RESTRICT="preserve-libs splitdebug" +QA_PREBUILT="*" + +S="${WORKDIR}/jdk-${MY_PV}-jre" + +src_install() { + local dest="/opt/${PN}-${SLOT}" + local ddest="${ED}/${dest#/}" + + # Not sure why they bundle this as it's commonly available and they + # only do so on x86_64. It's needed by libfontmanager.so. IcedTea + # also has an explicit dependency while Oracle seemingly dlopens it. + rm -vf lib/libfreetype.so || die + + # Oracle and IcedTea have libjsoundalsa.so depending on + # libasound.so.2 but AdoptOpenJDK only has libjs
[gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk-jre-bin/files/, dev-java/openjdk-jre-bin/
commit: 3586e009d595162f554b22eee043d8ed73ad57b8 Author: Florian Schmaus gentoo org> AuthorDate: Mon Apr 25 06:50:41 2022 + Commit: Florian Schmaus gentoo org> CommitDate: Mon Apr 25 06:50:41 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3586e009 dev-java/openjdk-jre-bin: fix JAVA_HOME in vm env file Closes: https://bugs.gentoo.org/833796 Signed-off-by: Florian Schmaus gentoo.org> dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh| 6 +++--- ...e-bin-11.0.14_p9.ebuild => openjdk-jre-bin-11.0.14_p9-r1.ebuild} | 0 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh index fced31b2be32..258f0d499fc0 100644 --- a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh +++ b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 VERSION="Eclipse Temurin JRE ${PV}" -JAVA_HOME="${EPREFIX}/opt/${P}" -JDK_HOME="${EPREFIX}/opt/${P}" +JAVA_HOME="${EPREFIX}/opt/${PN}-${SLOT}" +JDK_HOME="${JAVA_HOME}" JAVAC="\${JAVA_HOME}/bin/javac" PATH="\${JAVA_HOME}/bin" ROOTPATH="\${JAVA_HOME}/bin" diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild similarity index 100% rename from dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9.ebuild rename to dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild