From 752d6256e5204b958b0ef7905675a940b5e9172f Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Thu, 12 May 2022 16:42:50 +0300
Subject: gentoo resync : 12.05.2022

---
 dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh |  8 +++-----
 dev-java/openjdk-jre-bin/files/openjdk-jre-bin-17.env.sh | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100644 dev-java/openjdk-jre-bin/files/openjdk-jre-bin-17.env.sh

(limited to 'dev-java/openjdk-jre-bin/files')

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-11.env.sh
index fced31b2be32..5ccace8029b9 100644
--- a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh
+++ b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh
@@ -1,10 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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/${P}"
-JDK_HOME="${EPREFIX}/opt/${P}"
-JAVAC="\${JAVA_HOME}/bin/javac"
+JAVA_HOME="${EPREFIX}/opt/${PN}-${SLOT}"
 PATH="\${JAVA_HOME}/bin"
 ROOTPATH="\${JAVA_HOME}/bin"
 LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/"
@@ -13,4 +11,4 @@ PROVIDES_TYPE="JRE"
 PROVIDES_VERSION="${SLOT}"
 BOOTCLASSPATH=""
 GENERATION="2"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
+ENV_VARS="JAVA_HOME PATH ROOTPATH LDPATH MANPATH"
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
new file mode 100644
index 000000000000..5ccace8029b9
--- /dev/null
+++ b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-17.env.sh
@@ -0,0 +1,14 @@
+# 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"
-- 
cgit v1.2.3