| 1 |
commit: 87aeca88e4df13149b752c496b004d15ee7b32e7 |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 23 22:20:54 2017 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 23 22:52:22 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87aeca88 |
| 7 |
|
| 8 |
dev-java/oracle-jre-bin: Migrate to java-vm_install-env |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
dev-java/oracle-jre-bin/files/oracle-jre-bin.env.sh | 17 +++++++++++++++++ |
| 13 |
dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.121.ebuild | 2 +- |
| 14 |
2 files changed, 18 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/dev-java/oracle-jre-bin/files/oracle-jre-bin.env.sh b/dev-java/oracle-jre-bin/files/oracle-jre-bin.env.sh |
| 17 |
new file mode 100644 |
| 18 |
index 00000000..3803977 |
| 19 |
--- /dev/null |
| 20 |
+++ b/dev-java/oracle-jre-bin/files/oracle-jre-bin.env.sh |
| 21 |
@@ -0,0 +1,17 @@ |
| 22 |
+# Copyright 1999-2017 Gentoo Foundation |
| 23 |
+# Distributed under the terms of the GNU General Public License v2 |
| 24 |
+# $Id$ |
| 25 |
+ |
| 26 |
+VERSION="Oracle JRE ${PV}" |
| 27 |
+JAVA_HOME="${EPREFIX}/opt/${P}" |
| 28 |
+JDK_HOME="${EPREFIX}/opt/${P}" |
| 29 |
+JAVAC="\${JAVA_HOME}/bin/javac" |
| 30 |
+PATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/bin" |
| 31 |
+ROOTPATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/bin" |
| 32 |
+LDPATH="\${JAVA_HOME}/lib/$(get_system_arch)/:\${JAVA_HOME}/lib/$(get_system_arch)/server/" |
| 33 |
+MANPATH="${EPREFIX}/opt/${P}/man" |
| 34 |
+PROVIDES_TYPE="JRE" |
| 35 |
+PROVIDES_VERSION="${SLOT}" |
| 36 |
+BOOTCLASSPATH="\${JAVA_HOME}/lib/resources.jar:\${JAVA_HOME}/lib/rt.jar:\${JAVA_HOME}/lib/sunrsasign.jar:\${JAVA_HOME}/lib/jsse.jar:\${JAVA_HOME}/lib/jce.jar:\${JAVA_HOME}/lib/charsets.jar:\${JAVA_HOME}/classes" |
| 37 |
+GENERATION="2" |
| 38 |
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" |
| 39 |
|
| 40 |
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.121.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.121.ebuild |
| 41 |
index d980bd7..9c546f1 100644 |
| 42 |
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.121.ebuild |
| 43 |
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.121.ebuild |
| 44 |
@@ -234,7 +234,7 @@ src_install() { |
| 45 |
# Remove empty dirs we might have copied. |
| 46 |
find "${D}" -type d -empty -exec rmdir -v {} + || die |
| 47 |
|
| 48 |
- set_java_env |
| 49 |
+ java-vm_install-env "${FILESDIR}"/${PN}.env.sh |
| 50 |
java-vm_revdep-mask |
| 51 |
java-vm_sandbox-predict /dev/random /proc/self/coredump_filter |
| 52 |
} |
Archives