| 1 |
commit: 88206c6e203e1db4f6a71908fc1ef77cc82e49bc |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jun 26 16:13:50 2022 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 4 10:44:28 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88206c6e |
| 7 |
|
| 8 |
dev-java/openjdk-jre-bin: consolidate env files |
| 9 |
|
| 10 |
Resolves pkgcheck warning: duplicate identical files in FILESDIR: |
| 11 |
'files/openjdk-jre-bin-11.env.sh', 'files/openjdk-jre-bin-17.env.sh' |
| 12 |
|
| 13 |
Also drop the pointless copyright notice. |
| 14 |
|
| 15 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 16 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 17 |
|
| 18 |
dev-java/openjdk-jre-bin/files/openjdk-jre-bin-17.env.sh | 14 -------------- |
| 19 |
dev-java/openjdk-jre-bin/files/openjdk-jre-bin-8.env.sh | 3 --- |
| 20 |
.../{openjdk-jre-bin-11.env.sh => openjdk-jre-bin.env.sh} | 3 --- |
| 21 |
.../openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild | 2 +- |
| 22 |
.../openjdk-jre-bin/openjdk-jre-bin-11.0.15_p10.ebuild | 2 +- |
| 23 |
dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.3_p7.ebuild | 2 +- |
| 24 |
6 files changed, 3 insertions(+), 23 deletions(-) |
| 25 |
|
| 26 |
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 |
| 27 |
deleted file mode 100644 |
| 28 |
index 5ccace8029b9..000000000000 |
| 29 |
--- a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-17.env.sh |
| 30 |
+++ /dev/null |
| 31 |
@@ -1,14 +0,0 @@ |
| 32 |
-# Copyright 1999-2022 Gentoo Authors |
| 33 |
-# Distributed under the terms of the GNU General Public License v2 |
| 34 |
- |
| 35 |
-VERSION="Eclipse Temurin JRE ${PV}" |
| 36 |
-JAVA_HOME="${EPREFIX}/opt/${PN}-${SLOT}" |
| 37 |
-PATH="\${JAVA_HOME}/bin" |
| 38 |
-ROOTPATH="\${JAVA_HOME}/bin" |
| 39 |
-LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/" |
| 40 |
-MANPATH="\${JAVA_HOME}/man" |
| 41 |
-PROVIDES_TYPE="JRE" |
| 42 |
-PROVIDES_VERSION="${SLOT}" |
| 43 |
-BOOTCLASSPATH="" |
| 44 |
-GENERATION="2" |
| 45 |
-ENV_VARS="JAVA_HOME PATH ROOTPATH LDPATH MANPATH" |
| 46 |
|
| 47 |
diff --git a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-8.env.sh b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-8.env.sh |
| 48 |
index e3f380e33c60..091a43a4efc9 100644 |
| 49 |
--- a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-8.env.sh |
| 50 |
+++ b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-8.env.sh |
| 51 |
@@ -1,6 +1,3 @@ |
| 52 |
-# Copyright 1999-2019 Gentoo Authors |
| 53 |
-# Distributed under the terms of the GNU General Public License v2 |
| 54 |
- |
| 55 |
VERSION="Eclipse Temurin JRE ${PV}" |
| 56 |
JAVA_HOME="${EPREFIX}/opt/${P}" |
| 57 |
JDK_HOME="${EPREFIX}/opt/${P}" |
| 58 |
|
| 59 |
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.env.sh |
| 60 |
similarity index 76% |
| 61 |
rename from dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh |
| 62 |
rename to dev-java/openjdk-jre-bin/files/openjdk-jre-bin.env.sh |
| 63 |
index 5ccace8029b9..3d5130c67fd2 100644 |
| 64 |
--- a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh |
| 65 |
+++ b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin.env.sh |
| 66 |
@@ -1,6 +1,3 @@ |
| 67 |
-# Copyright 1999-2022 Gentoo Authors |
| 68 |
-# Distributed under the terms of the GNU General Public License v2 |
| 69 |
- |
| 70 |
VERSION="Eclipse Temurin JRE ${PV}" |
| 71 |
JAVA_HOME="${EPREFIX}/opt/${PN}-${SLOT}" |
| 72 |
PATH="\${JAVA_HOME}/bin" |
| 73 |
|
| 74 |
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild |
| 75 |
index d7a2d14be024..ae3ecf2e8fe9 100644 |
| 76 |
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild |
| 77 |
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild |
| 78 |
@@ -72,7 +72,7 @@ src_install() { |
| 79 |
dodir "${dest}" |
| 80 |
cp -pPR * "${ddest}" || die |
| 81 |
|
| 82 |
- java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh |
| 83 |
+ java-vm_install-env "${FILESDIR}"/${PN}.env.sh |
| 84 |
java-vm_set-pax-markings "${ddest}" |
| 85 |
java-vm_revdep-mask |
| 86 |
java-vm_sandbox-predict /dev/random /proc/self/coredump_filter |
| 87 |
|
| 88 |
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.15_p10.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.15_p10.ebuild |
| 89 |
index d7a2d14be024..ae3ecf2e8fe9 100644 |
| 90 |
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.15_p10.ebuild |
| 91 |
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.15_p10.ebuild |
| 92 |
@@ -72,7 +72,7 @@ src_install() { |
| 93 |
dodir "${dest}" |
| 94 |
cp -pPR * "${ddest}" || die |
| 95 |
|
| 96 |
- java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh |
| 97 |
+ java-vm_install-env "${FILESDIR}"/${PN}.env.sh |
| 98 |
java-vm_set-pax-markings "${ddest}" |
| 99 |
java-vm_revdep-mask |
| 100 |
java-vm_sandbox-predict /dev/random /proc/self/coredump_filter |
| 101 |
|
| 102 |
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 |
| 103 |
index d7a2d14be024..ae3ecf2e8fe9 100644 |
| 104 |
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.3_p7.ebuild |
| 105 |
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.3_p7.ebuild |
| 106 |
@@ -72,7 +72,7 @@ src_install() { |
| 107 |
dodir "${dest}" |
| 108 |
cp -pPR * "${ddest}" || die |
| 109 |
|
| 110 |
- java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh |
| 111 |
+ java-vm_install-env "${FILESDIR}"/${PN}.env.sh |
| 112 |
java-vm_set-pax-markings "${ddest}" |
| 113 |
java-vm_revdep-mask |
| 114 |
java-vm_sandbox-predict /dev/random /proc/self/coredump_filter |
Archives