gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-24 18:58:08 -07:00
Code Issues Projects Releases Wiki Activity

dev-java/openjdk-jre-bin: consolidate env files

Browse Source 
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>
This commit is contained in:
Mike Gilbert
2022-06-26 12:13:50 -04:00
committed by Georgy Yakovlev
parent db0200739a
commit 88206c6e20
6 changed files with 3 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dev-java/openjdk-jre-bin/files/openjdk-jre-bin-17.env.sh
View File

@@ -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"

3
dev-java/openjdk-jre-bin/files/openjdk-jre-bin-8.env.sh
View File

@@ -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}"

3
dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh → dev-java/openjdk-jre-bin/files/openjdk-jre-bin.env.sh
View File

@@ -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"

2
dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild
View File

@@ -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

2
dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.15_p10.ebuild
View File

@@ -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

2
dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.3_p7.ebuild
View File

@@ -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