diff options
author | Mike Gilbert <floppym@gentoo.org> | 2022-06-26 12:13:50 -0400 |
---|---|---|
committer | Georgy Yakovlev <gyakovlev@gentoo.org> | 2022-07-04 03:44:28 -0700 |
commit | 88206c6e203e1db4f6a71908fc1ef77cc82e49bc (patch) | |
tree | a59b0a934034972c4205da628011aedd94c9f645 | |
parent | dev-python/autobahn: arm64 stable wrt bug #856316 (diff) | |
download | gentoo-88206c6e203e1db4f6a71908fc1ef77cc82e49bc.tar.gz gentoo-88206c6e203e1db4f6a71908fc1ef77cc82e49bc.tar.bz2 gentoo-88206c6e203e1db4f6a71908fc1ef77cc82e49bc.zip |
dev-java/openjdk-jre-bin: consolidate env files
Resolves pkgcheck warning: duplicate identical files in FILESDIR:
'files/openjdk-jre-bin-11.env.sh', 'files/openjdk-jre-bin-17.env.sh'
Also drop the pointless copyright notice.
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
-rw-r--r-- | dev-java/openjdk-jre-bin/files/openjdk-jre-bin-17.env.sh | 14 | ||||
-rw-r--r-- | dev-java/openjdk-jre-bin/files/openjdk-jre-bin-8.env.sh | 3 | ||||
-rw-r--r-- | dev-java/openjdk-jre-bin/files/openjdk-jre-bin.env.sh (renamed from dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh) | 3 | ||||
-rw-r--r-- | dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild | 2 | ||||
-rw-r--r-- | dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.15_p10.ebuild | 2 | ||||
-rw-r--r-- | dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.3_p7.ebuild | 2 |
6 files changed, 3 insertions, 23 deletions
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 deleted file mode 100644 index 5ccace8029b9..000000000000 --- a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-17.env.sh +++ /dev/null @@ -1,14 +0,0 @@ -# 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/files/openjdk-jre-bin-8.env.sh b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-8.env.sh index e3f380e33c60..091a43a4efc9 100644 --- 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 @@ -1,6 +1,3 @@ -# Copyright 1999-2019 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}" 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 index 5ccace8029b9..3d5130c67fd2 100644 --- 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 @@ -1,6 +1,3 @@ -# 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" 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 index d7a2d14be024..ae3ecf2e8fe9 100644 --- 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 @@ -72,7 +72,7 @@ src_install() { dodir "${dest}" cp -pPR * "${ddest}" || die - 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-jre-bin/openjdk-jre-bin-11.0.15_p10.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.15_p10.ebuild index d7a2d14be024..ae3ecf2e8fe9 100644 --- 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 @@ -72,7 +72,7 @@ src_install() { dodir "${dest}" cp -pPR * "${ddest}" || die - 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-jre-bin/openjdk-jre-bin-17.0.3_p7.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.3_p7.ebuild index d7a2d14be024..ae3ecf2e8fe9 100644 --- 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 @@ -72,7 +72,7 @@ src_install() { dodir "${dest}" cp -pPR * "${ddest}" || die - 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 |