From e050e57bc73b42f73ead76ea1517c77eea17ab45 Mon Sep 17 00:00:00 2001
From: "Alex Xu (Hello71)" <alex_y_xu@yahoo.ca>
Date: Wed, 28 Apr 2021 10:38:39 -0400
Subject: dev-java/*openjdk*: various fixes

- merge SLOT envs into one, less work when bumping (we don't support 8
  anyways)

- sync ::gentoo
---
 .../files/openj9-openjdk-bin-11.env.sh                   | 16 ----------------
 .../files/openj9-openjdk-bin-16.env.sh                   | 16 ----------------
 .../openj9-openjdk-bin/files/openj9-openjdk-bin.env.sh   | 16 ++++++++++++++++
 3 files changed, 16 insertions(+), 32 deletions(-)
 delete mode 100644 dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin-11.env.sh
 delete mode 100644 dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin-16.env.sh
 create mode 100644 dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin.env.sh

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

diff --git a/dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin-11.env.sh b/dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin-11.env.sh
deleted file mode 100644
index 2e200d9..0000000
--- a/dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin-11.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
deleted file mode 100644
index 2e200d9..0000000
--- a/dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin-16.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.env.sh b/dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin.env.sh
new file mode 100644
index 0000000..2e200d9
--- /dev/null
+++ b/dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin.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"
-- 
cgit v1.2.3-70-g09d2