| 1 |
commit: 47a6b18cec31fafb037c2aa6189cc1c026055e42 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jun 28 18:28:56 2022 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 4 10:44:32 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47a6b18c |
| 7 |
|
| 8 |
dev-java/openjdk: consolidate env files |
| 9 |
|
| 10 |
Also drop the pointless copyright notice. |
| 11 |
|
| 12 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 13 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-java/openjdk/files/openjdk-17.env.sh | 16 ---------------- |
| 16 |
dev-java/openjdk/files/openjdk-8.env.sh | 3 --- |
| 17 |
.../openjdk/files/{openjdk-11.env.sh => openjdk.env.sh} | 3 --- |
| 18 |
dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild | 2 +- |
| 19 |
dev-java/openjdk/openjdk-17.0.3_p7-r1.ebuild | 2 +- |
| 20 |
5 files changed, 2 insertions(+), 24 deletions(-) |
| 21 |
|
| 22 |
diff --git a/dev-java/openjdk/files/openjdk-17.env.sh b/dev-java/openjdk/files/openjdk-17.env.sh |
| 23 |
deleted file mode 100644 |
| 24 |
index 7db6461bf48f..000000000000 |
| 25 |
--- a/dev-java/openjdk/files/openjdk-17.env.sh |
| 26 |
+++ /dev/null |
| 27 |
@@ -1,16 +0,0 @@ |
| 28 |
-# Copyright 1999-2021 Gentoo Authors |
| 29 |
-# Distributed under the terms of the GNU General Public License v2 |
| 30 |
- |
| 31 |
-VERSION="OpenJDK ${PV}" |
| 32 |
-JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}" |
| 33 |
-JDK_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}" |
| 34 |
-JAVAC="\${JAVA_HOME}/bin/javac" |
| 35 |
-PATH="\${JAVA_HOME}/bin" |
| 36 |
-ROOTPATH="\${JAVA_HOME}/bin" |
| 37 |
-LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/" |
| 38 |
-MANPATH="" |
| 39 |
-PROVIDES_TYPE="JDK JRE" |
| 40 |
-PROVIDES_VERSION="${SLOT}" |
| 41 |
-BOOTCLASSPATH="" |
| 42 |
-GENERATION="2" |
| 43 |
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" |
| 44 |
|
| 45 |
diff --git a/dev-java/openjdk/files/openjdk-8.env.sh b/dev-java/openjdk/files/openjdk-8.env.sh |
| 46 |
index 8f863e4c869a..cc0bc80b474b 100644 |
| 47 |
--- a/dev-java/openjdk/files/openjdk-8.env.sh |
| 48 |
+++ b/dev-java/openjdk/files/openjdk-8.env.sh |
| 49 |
@@ -1,6 +1,3 @@ |
| 50 |
-# Copyright 1999-2019 Gentoo Authors |
| 51 |
-# Distributed under the terms of the GNU General Public License v2 |
| 52 |
- |
| 53 |
VERSION="OpenJDK ${PV}" |
| 54 |
JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}" |
| 55 |
JDK_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}" |
| 56 |
|
| 57 |
diff --git a/dev-java/openjdk/files/openjdk-11.env.sh b/dev-java/openjdk/files/openjdk.env.sh |
| 58 |
similarity index 80% |
| 59 |
rename from dev-java/openjdk/files/openjdk-11.env.sh |
| 60 |
rename to dev-java/openjdk/files/openjdk.env.sh |
| 61 |
index 96c4be79c33f..287c0578b7c2 100644 |
| 62 |
--- a/dev-java/openjdk/files/openjdk-11.env.sh |
| 63 |
+++ b/dev-java/openjdk/files/openjdk.env.sh |
| 64 |
@@ -1,6 +1,3 @@ |
| 65 |
-# Copyright 1999-2018 Gentoo Authors |
| 66 |
-# Distributed under the terms of the GNU General Public License v2 |
| 67 |
- |
| 68 |
VERSION="OpenJDK ${PV}" |
| 69 |
JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}" |
| 70 |
JDK_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}" |
| 71 |
|
| 72 |
diff --git a/dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild b/dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild |
| 73 |
index 8431ae423614..4b7612e1259b 100644 |
| 74 |
--- a/dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild |
| 75 |
+++ b/dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild |
| 76 |
@@ -278,7 +278,7 @@ src_install() { |
| 77 |
einfo "Creating the Class Data Sharing archives and disabling usage tracking" |
| 78 |
"${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die |
| 79 |
|
| 80 |
- java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh |
| 81 |
+ java-vm_install-env "${FILESDIR}"/${PN}.env.sh |
| 82 |
java-vm_revdep-mask |
| 83 |
java-vm_sandbox-predict /dev/random /proc/self/coredump_filter |
| 84 |
|
| 85 |
|
| 86 |
diff --git a/dev-java/openjdk/openjdk-17.0.3_p7-r1.ebuild b/dev-java/openjdk/openjdk-17.0.3_p7-r1.ebuild |
| 87 |
index 18915c340d94..226b675fbd2f 100644 |
| 88 |
--- a/dev-java/openjdk/openjdk-17.0.3_p7-r1.ebuild |
| 89 |
+++ b/dev-java/openjdk/openjdk-17.0.3_p7-r1.ebuild |
| 90 |
@@ -291,7 +291,7 @@ src_install() { |
| 91 |
einfo "Creating the Class Data Sharing archives and disabling usage tracking" |
| 92 |
"${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die |
| 93 |
|
| 94 |
- use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh |
| 95 |
+ use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}.env.sh |
| 96 |
java-vm_revdep-mask |
| 97 |
java-vm_sandbox-predict /dev/random /proc/self/coredump_filter |
Archives