1 |
commit: 0cf038536759e588cf2d1e25539fb6d62c169d23 |
2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 21 23:12:34 2017 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 23 22:52:07 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cf03853 |
7 |
|
8 |
dev-java/oracle-jdk-bin: Migrate to java-vm_install-env |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
dev-java/oracle-jdk-bin/files/oracle-jdk-bin.env.sh | 17 +++++++++++++++++ |
13 |
dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild | 2 +- |
14 |
2 files changed, 18 insertions(+), 1 deletion(-) |
15 |
|
16 |
diff --git a/dev-java/oracle-jdk-bin/files/oracle-jdk-bin.env.sh b/dev-java/oracle-jdk-bin/files/oracle-jdk-bin.env.sh |
17 |
new file mode 100644 |
18 |
index 00000000..86e7a6b |
19 |
--- /dev/null |
20 |
+++ b/dev-java/oracle-jdk-bin/files/oracle-jdk-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 JDK ${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}/jre/bin" |
31 |
+ROOTPATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin" |
32 |
+LDPATH="\${JAVA_HOME}/jre/lib/$(get_system_arch)/:\${JAVA_HOME}/jre/lib/$(get_system_arch)/server/" |
33 |
+MANPATH="${EPREFIX}/opt/${P}/man" |
34 |
+PROVIDES_TYPE="JDK JRE" |
35 |
+PROVIDES_VERSION="${SLOT}" |
36 |
+BOOTCLASSPATH="\${JAVA_HOME}/jre/lib/resources.jar:\${JAVA_HOME}/jre/lib/rt.jar:\${JAVA_HOME}/jre/lib/sunrsasign.jar:\${JAVA_HOME}/jre/lib/jsse.jar:\${JAVA_HOME}/jre/lib/jce.jar:\${JAVA_HOME}/jre/lib/charsets.jar:\${JAVA_HOME}/jre/classes" |
37 |
+GENERATION="2" |
38 |
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" |
39 |
|
40 |
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild |
41 |
index ad9f0f7..82fc8b6 100644 |
42 |
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild |
43 |
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild |
44 |
@@ -351,7 +351,7 @@ src_install() { |
45 |
done |
46 |
fi |
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 |
} |