gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

dev-java/openjdk-bin: consolidate env files

Browse Source 
Also drop the pointless copyright notice.

Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/26081
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
This commit is contained in:
Mike Gilbert
2022-06-28 14:33:42 -04:00
committed by Georgy Yakovlev
parent 47a6b18cec
commit 494a3b9137
5 changed files with 2 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

3
dev-java/openjdk-bin/files/openjdk-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 JDK ${PV}"
JAVA_HOME="${EPREFIX}/opt/${P}"
JDK_HOME="${EPREFIX}/opt/${P}"

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

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

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

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

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

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