commit: 494a3b913762bdb0640ed409654efaa6ecc5a65d Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Tue Jun 28 18:33:42 2022 +0000 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> CommitDate: Mon Jul 4 10:44:33 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=494a3b91
dev-java/openjdk-bin: consolidate env files Also drop the pointless copyright notice. Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/26081 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> dev-java/openjdk-bin/files/openjdk-bin-17.env.sh | 16 ---------------- dev-java/openjdk-bin/files/openjdk-bin-8.env.sh | 3 --- .../files/{openjdk-bin-11.env.sh => openjdk-bin.env.sh} | 3 --- dev-java/openjdk-bin/openjdk-bin-11.0.15_p10.ebuild | 2 +- dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild | 2 +- 5 files changed, 2 insertions(+), 24 deletions(-) diff --git a/dev-java/openjdk-bin/files/openjdk-bin-17.env.sh b/dev-java/openjdk-bin/files/openjdk-bin-17.env.sh deleted file mode 100644 index f6d25d57c4a1..000000000000 --- a/dev-java/openjdk-bin/files/openjdk-bin-17.env.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -VERSION="Eclipse Temurin JDK ${PV}" -JAVA_HOME="${EPREFIX}/opt/${P}" -JDK_HOME="${EPREFIX}/opt/${P}" -JAVAC="\${JAVA_HOME}/bin/javac" -PATH="\${JAVA_HOME}/bin" -ROOTPATH="\${JAVA_HOME}/bin" -LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/" -MANPATH="" -PROVIDES_TYPE="JDK JRE" -PROVIDES_VERSION="${SLOT}" -BOOTCLASSPATH="" -GENERATION="2" -ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" diff --git a/dev-java/openjdk-bin/files/openjdk-bin-8.env.sh b/dev-java/openjdk-bin/files/openjdk-bin-8.env.sh index fe1b484edfa1..9bb340ba4db4 100644 --- a/dev-java/openjdk-bin/files/openjdk-bin-8.env.sh +++ b/dev-java/openjdk-bin/files/openjdk-bin-8.env.sh @@ -1,6 +1,3 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - VERSION="Eclipse Temurin JDK ${PV}" JAVA_HOME="${EPREFIX}/opt/${P}" JDK_HOME="${EPREFIX}/opt/${P}" diff --git a/dev-java/openjdk-bin/files/openjdk-bin-11.env.sh b/dev-java/openjdk-bin/files/openjdk-bin.env.sh similarity index 79% rename from dev-java/openjdk-bin/files/openjdk-bin-11.env.sh rename to dev-java/openjdk-bin/files/openjdk-bin.env.sh index 073e66f7ee9c..64619f60c7c5 100644 --- a/dev-java/openjdk-bin/files/openjdk-bin-11.env.sh +++ b/dev-java/openjdk-bin/files/openjdk-bin.env.sh @@ -1,6 +1,3 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - VERSION="Eclipse Temurin JDK ${PV}" JAVA_HOME="${EPREFIX}/opt/${P}" JDK_HOME="${EPREFIX}/opt/${P}" 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 index 1bb314be9d5d..eb2458b279a2 100644 --- a/dev-java/openjdk-bin/openjdk-bin-11.0.15_p10.ebuild +++ b/dev-java/openjdk-bin/openjdk-bin-11.0.15_p10.ebuild @@ -124,7 +124,7 @@ src_install() { # provide stable symlink dosym "${P}" "/opt/${PN}-${SLOT}" - java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh + java-vm_install-env "${FILESDIR}"/${PN}.env.sh java-vm_set-pax-markings "${ddest}" java-vm_revdep-mask java-vm_sandbox-predict /dev/random /proc/self/coredump_filter 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 index 1ad02aaacb18..bba49ad388a3 100644 --- a/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild +++ b/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild @@ -125,7 +125,7 @@ src_install() { # provide stable symlink dosym "${P}" "/opt/${PN}-${SLOT}" - use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh + use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}.env.sh java-vm_set-pax-markings "${ddest}" java-vm_revdep-mask java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
