From 603740f35649729c37bd746498cdf238bb4965eb Mon Sep 17 00:00:00 2001
From: "Alex Xu (Hello71)" <alex_y_xu@yahoo.ca>
Date: Tue, 27 Apr 2021 18:20:03 -0400
Subject: dev-java/*openjdk*: fix env.sh

---
 .../files/openj9-openjdk-bin-14.env.sh                   | 16 ----------------
 .../files/openj9-openjdk-bin-16.env.sh                   | 16 ++++++++++++++++
 .../files/openj9-openjdk-jre-bin-15.env.sh               | 16 ----------------
 .../files/openj9-openjdk-jre-bin-16.env.sh               | 16 ++++++++++++++++
 dev-java/openjdk-bin/files/openjdk-bin-15.env.sh         | 16 ----------------
 dev-java/openjdk-bin/files/openjdk-bin-16.env.sh         | 16 ++++++++++++++++
 dev-java/openjdk-jre-bin/files/openjdk-jre-bin-15.env.sh | 16 ----------------
 dev-java/openjdk-jre-bin/files/openjdk-jre-bin-16.env.sh | 16 ++++++++++++++++
 dev-java/openjdk/files/openjdk-15.env.sh                 | 16 ----------------
 dev-java/openjdk/files/openjdk-16.env.sh                 | 16 ++++++++++++++++
 10 files changed, 80 insertions(+), 80 deletions(-)
 delete mode 100644 dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin-14.env.sh
 create mode 100644 dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin-16.env.sh
 delete mode 100644 dev-java/openj9-openjdk-jre-bin/files/openj9-openjdk-jre-bin-15.env.sh
 create mode 100644 dev-java/openj9-openjdk-jre-bin/files/openj9-openjdk-jre-bin-16.env.sh
 delete mode 100644 dev-java/openjdk-bin/files/openjdk-bin-15.env.sh
 create mode 100644 dev-java/openjdk-bin/files/openjdk-bin-16.env.sh
 delete mode 100644 dev-java/openjdk-jre-bin/files/openjdk-jre-bin-15.env.sh
 create mode 100644 dev-java/openjdk-jre-bin/files/openjdk-jre-bin-16.env.sh
 delete mode 100644 dev-java/openjdk/files/openjdk-15.env.sh
 create mode 100644 dev-java/openjdk/files/openjdk-16.env.sh

diff --git a/dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin-14.env.sh b/dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin-14.env.sh
deleted file mode 100644
index 2e200d9..0000000
--- a/dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin-14.env.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-VERSION="AdoptOpenJDK ${DL_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"
diff --git a/dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin-16.env.sh b/dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin-16.env.sh
new file mode 100644
index 0000000..2e200d9
--- /dev/null
+++ b/dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin-16.env.sh
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+VERSION="AdoptOpenJDK ${DL_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"
diff --git a/dev-java/openj9-openjdk-jre-bin/files/openj9-openjdk-jre-bin-15.env.sh b/dev-java/openj9-openjdk-jre-bin/files/openj9-openjdk-jre-bin-15.env.sh
deleted file mode 100644
index 1ad9132..0000000
--- a/dev-java/openj9-openjdk-jre-bin/files/openj9-openjdk-jre-bin-15.env.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-VERSION="AdoptOpenJDK JRE ${DL_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="\${JAVA_HOME}/man"
-PROVIDES_TYPE="JRE"
-PROVIDES_VERSION="${SLOT}"
-BOOTCLASSPATH=""
-GENERATION="2"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/openj9-openjdk-jre-bin/files/openj9-openjdk-jre-bin-16.env.sh b/dev-java/openj9-openjdk-jre-bin/files/openj9-openjdk-jre-bin-16.env.sh
new file mode 100644
index 0000000..1ad9132
--- /dev/null
+++ b/dev-java/openj9-openjdk-jre-bin/files/openj9-openjdk-jre-bin-16.env.sh
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+VERSION="AdoptOpenJDK JRE ${DL_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="\${JAVA_HOME}/man"
+PROVIDES_TYPE="JRE"
+PROVIDES_VERSION="${SLOT}"
+BOOTCLASSPATH=""
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/openjdk-bin/files/openjdk-bin-15.env.sh b/dev-java/openjdk-bin/files/openjdk-bin-15.env.sh
deleted file mode 100644
index 9e9c5ec..0000000
--- a/dev-java/openjdk-bin/files/openjdk-bin-15.env.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-VERSION="AdoptOpenJDK ${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"
diff --git a/dev-java/openjdk-bin/files/openjdk-bin-16.env.sh b/dev-java/openjdk-bin/files/openjdk-bin-16.env.sh
new file mode 100644
index 0000000..9e9c5ec
--- /dev/null
+++ b/dev-java/openjdk-bin/files/openjdk-bin-16.env.sh
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+VERSION="AdoptOpenJDK ${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"
diff --git a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-15.env.sh b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-15.env.sh
deleted file mode 100644
index ec0dca4..0000000
--- a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-15.env.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-VERSION="AdoptOpenJDK JRE ${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="\${JAVA_HOME}/man"
-PROVIDES_TYPE="JRE"
-PROVIDES_VERSION="${SLOT}"
-BOOTCLASSPATH=""
-GENERATION="2"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-16.env.sh b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-16.env.sh
new file mode 100644
index 0000000..ec0dca4
--- /dev/null
+++ b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-16.env.sh
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+VERSION="AdoptOpenJDK JRE ${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="\${JAVA_HOME}/man"
+PROVIDES_TYPE="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-15.env.sh b/dev-java/openjdk/files/openjdk-15.env.sh
deleted file mode 100644
index 96c4be7..0000000
--- a/dev-java/openjdk/files/openjdk-15.env.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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}"
-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-16.env.sh b/dev-java/openjdk/files/openjdk-16.env.sh
new file mode 100644
index 0000000..96c4be7
--- /dev/null
+++ b/dev-java/openjdk/files/openjdk-16.env.sh
@@ -0,0 +1,16 @@
+# 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}"
+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"
-- 
cgit v1.2.3