diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2022-06-28 14:28:56 -0400 |
|---|---|---|
| committer |   Georgy Yakovlev <gyakovlev@gentoo.org> | 2022-07-04 03:44:32 -0700 |
| commit | 47a6b18cec31fafb037c2aa6189cc1c026055e42 (patch) | |
| tree | 084294bd2eb49fde6cd82d993b805344e832961a /dev-java | |
| parent | dev-java/openjdk: replace virtual/jpeg with media-libs/libjpeg-turbo (diff) | |
| download | gentoo-47a6b18cec31fafb037c2aa6189cc1c026055e42.tar.gz gentoo-47a6b18cec31fafb037c2aa6189cc1c026055e42.tar.bz2 gentoo-47a6b18cec31fafb037c2aa6189cc1c026055e42.zip | |
dev-java/openjdk: consolidate env files
Also drop the pointless copyright notice.
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/openjdk/files/openjdk-17.env.sh | 16 | ||||
| -rw-r--r-- | dev-java/openjdk/files/openjdk-8.env.sh | 3 | ||||
| -rw-r--r-- | dev-java/openjdk/files/openjdk.env.sh (renamed from dev-java/openjdk/files/openjdk-11.env.sh) | 3 | ||||
| -rw-r--r-- | dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild | 2 | ||||
| -rw-r--r-- | dev-java/openjdk/openjdk-17.0.3_p7-r1.ebuild | 2 |
5 files changed, 2 insertions, 24 deletions
diff --git a/dev-java/openjdk/files/openjdk-17.env.sh b/dev-java/openjdk/files/openjdk-17.env.sh deleted file mode 100644 index 7db6461bf48f..000000000000 --- a/dev-java/openjdk/files/openjdk-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="OpenJDK ${PV}" -JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}" -JDK_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}" -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/files/openjdk-8.env.sh b/dev-java/openjdk/files/openjdk-8.env.sh index 8f863e4c869a..cc0bc80b474b 100644 --- a/dev-java/openjdk/files/openjdk-8.env.sh +++ b/dev-java/openjdk/files/openjdk-8.env.sh @@ -1,6 +1,3 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - VERSION="OpenJDK ${PV}" JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}" JDK_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}" diff --git a/dev-java/openjdk/files/openjdk-11.env.sh b/dev-java/openjdk/files/openjdk.env.sh index 96c4be79c33f..287c0578b7c2 100644 --- a/dev-java/openjdk/files/openjdk-11.env.sh +++ b/dev-java/openjdk/files/openjdk.env.sh @@ -1,6 +1,3 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - VERSION="OpenJDK ${PV}" JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}" JDK_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}" diff --git a/dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild b/dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild index 8431ae423614..4b7612e1259b 100644 --- a/dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild +++ b/dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild @@ -278,7 +278,7 @@ src_install() { einfo "Creating the Class Data Sharing archives and disabling usage tracking" "${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die - java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh + java-vm_install-env "${FILESDIR}"/${PN}.env.sh java-vm_revdep-mask java-vm_sandbox-predict /dev/random /proc/self/coredump_filter diff --git a/dev-java/openjdk/openjdk-17.0.3_p7-r1.ebuild b/dev-java/openjdk/openjdk-17.0.3_p7-r1.ebuild index 18915c340d94..226b675fbd2f 100644 --- a/dev-java/openjdk/openjdk-17.0.3_p7-r1.ebuild +++ b/dev-java/openjdk/openjdk-17.0.3_p7-r1.ebuild @@ -291,7 +291,7 @@ src_install() { einfo "Creating the Class Data Sharing archives and disabling usage tracking" "${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die - 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_revdep-mask java-vm_sandbox-predict /dev/random /proc/self/coredump_filter |