1 |
commit: 494a3b913762bdb0640ed409654efaa6ecc5a65d |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jun 28 18:33:42 2022 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jul 4 10:44:33 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=494a3b91 |
7 |
|
8 |
dev-java/openjdk-bin: consolidate env files |
9 |
|
10 |
Also drop the pointless copyright notice. |
11 |
|
12 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
13 |
Closes: https://github.com/gentoo/gentoo/pull/26081 |
14 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
15 |
|
16 |
dev-java/openjdk-bin/files/openjdk-bin-17.env.sh | 16 ---------------- |
17 |
dev-java/openjdk-bin/files/openjdk-bin-8.env.sh | 3 --- |
18 |
.../files/{openjdk-bin-11.env.sh => openjdk-bin.env.sh} | 3 --- |
19 |
dev-java/openjdk-bin/openjdk-bin-11.0.15_p10.ebuild | 2 +- |
20 |
dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild | 2 +- |
21 |
5 files changed, 2 insertions(+), 24 deletions(-) |
22 |
|
23 |
diff --git a/dev-java/openjdk-bin/files/openjdk-bin-17.env.sh b/dev-java/openjdk-bin/files/openjdk-bin-17.env.sh |
24 |
deleted file mode 100644 |
25 |
index f6d25d57c4a1..000000000000 |
26 |
--- a/dev-java/openjdk-bin/files/openjdk-bin-17.env.sh |
27 |
+++ /dev/null |
28 |
@@ -1,16 +0,0 @@ |
29 |
-# Copyright 1999-2021 Gentoo Authors |
30 |
-# Distributed under the terms of the GNU General Public License v2 |
31 |
- |
32 |
-VERSION="Eclipse Temurin JDK ${PV}" |
33 |
-JAVA_HOME="${EPREFIX}/opt/${P}" |
34 |
-JDK_HOME="${EPREFIX}/opt/${P}" |
35 |
-JAVAC="\${JAVA_HOME}/bin/javac" |
36 |
-PATH="\${JAVA_HOME}/bin" |
37 |
-ROOTPATH="\${JAVA_HOME}/bin" |
38 |
-LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/" |
39 |
-MANPATH="" |
40 |
-PROVIDES_TYPE="JDK JRE" |
41 |
-PROVIDES_VERSION="${SLOT}" |
42 |
-BOOTCLASSPATH="" |
43 |
-GENERATION="2" |
44 |
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" |
45 |
|
46 |
diff --git a/dev-java/openjdk-bin/files/openjdk-bin-8.env.sh b/dev-java/openjdk-bin/files/openjdk-bin-8.env.sh |
47 |
index fe1b484edfa1..9bb340ba4db4 100644 |
48 |
--- a/dev-java/openjdk-bin/files/openjdk-bin-8.env.sh |
49 |
+++ b/dev-java/openjdk-bin/files/openjdk-bin-8.env.sh |
50 |
@@ -1,6 +1,3 @@ |
51 |
-# Copyright 1999-2019 Gentoo Authors |
52 |
-# Distributed under the terms of the GNU General Public License v2 |
53 |
- |
54 |
VERSION="Eclipse Temurin JDK ${PV}" |
55 |
JAVA_HOME="${EPREFIX}/opt/${P}" |
56 |
JDK_HOME="${EPREFIX}/opt/${P}" |
57 |
|
58 |
diff --git a/dev-java/openjdk-bin/files/openjdk-bin-11.env.sh b/dev-java/openjdk-bin/files/openjdk-bin.env.sh |
59 |
similarity index 79% |
60 |
rename from dev-java/openjdk-bin/files/openjdk-bin-11.env.sh |
61 |
rename to dev-java/openjdk-bin/files/openjdk-bin.env.sh |
62 |
index 073e66f7ee9c..64619f60c7c5 100644 |
63 |
--- a/dev-java/openjdk-bin/files/openjdk-bin-11.env.sh |
64 |
+++ b/dev-java/openjdk-bin/files/openjdk-bin.env.sh |
65 |
@@ -1,6 +1,3 @@ |
66 |
-# Copyright 1999-2018 Gentoo Authors |
67 |
-# Distributed under the terms of the GNU General Public License v2 |
68 |
- |
69 |
VERSION="Eclipse Temurin JDK ${PV}" |
70 |
JAVA_HOME="${EPREFIX}/opt/${P}" |
71 |
JDK_HOME="${EPREFIX}/opt/${P}" |
72 |
|
73 |
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.15_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.15_p10.ebuild |
74 |
index 1bb314be9d5d..eb2458b279a2 100644 |
75 |
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.15_p10.ebuild |
76 |
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.15_p10.ebuild |
77 |
@@ -124,7 +124,7 @@ src_install() { |
78 |
# provide stable symlink |
79 |
dosym "${P}" "/opt/${PN}-${SLOT}" |
80 |
|
81 |
- java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh |
82 |
+ java-vm_install-env "${FILESDIR}"/${PN}.env.sh |
83 |
java-vm_set-pax-markings "${ddest}" |
84 |
java-vm_revdep-mask |
85 |
java-vm_sandbox-predict /dev/random /proc/self/coredump_filter |
86 |
|
87 |
diff --git a/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild b/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild |
88 |
index 1ad02aaacb18..bba49ad388a3 100644 |
89 |
--- a/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild |
90 |
+++ b/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild |
91 |
@@ -125,7 +125,7 @@ src_install() { |
92 |
# provide stable symlink |
93 |
dosym "${P}" "/opt/${PN}-${SLOT}" |
94 |
|
95 |
- use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh |
96 |
+ use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}.env.sh |
97 |
java-vm_set-pax-markings "${ddest}" |
98 |
java-vm_revdep-mask |
99 |
java-vm_sandbox-predict /dev/random /proc/self/coredump_filter |