| 1 |
commit: c070f1fbc1cf036100de3dbe51bca5bcfb99567a |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 5 20:39:01 2016 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 5 20:39:01 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=c070f1fb |
| 7 |
|
| 8 |
dev-java/icedtea: Switch from set_java_env to new java-vm_install-env |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.0 |
| 11 |
|
| 12 |
dev-java/icedtea/files/icedtea.env | 18 ------------------ |
| 13 |
dev-java/icedtea/files/icedtea.env.sh | 18 ++++++++++++++++++ |
| 14 |
dev-java/icedtea/icedtea-3.1.0.ebuild | 2 +- |
| 15 |
dev-java/icedtea/icedtea-6.1.13.11.ebuild | 2 +- |
| 16 |
dev-java/icedtea/icedtea-6.9999.ebuild | 2 +- |
| 17 |
dev-java/icedtea/icedtea-7.2.6.7.ebuild | 2 +- |
| 18 |
dev-java/icedtea/icedtea-7.2.7.0_pre05.ebuild | 2 +- |
| 19 |
7 files changed, 23 insertions(+), 23 deletions(-) |
| 20 |
|
| 21 |
diff --git a/dev-java/icedtea/files/icedtea.env b/dev-java/icedtea/files/icedtea.env |
| 22 |
deleted file mode 100644 |
| 23 |
index 463add6..0000000 |
| 24 |
--- a/dev-java/icedtea/files/icedtea.env |
| 25 |
+++ /dev/null |
| 26 |
@@ -1,18 +0,0 @@ |
| 27 |
-# Copyright 1999-2011 Gentoo Foundation |
| 28 |
-# Distributed under the terms of the GNU General Public License v2 |
| 29 |
-# $Id$ |
| 30 |
- |
| 31 |
-VERSION="IcedTea JDK @PV@" |
| 32 |
-JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/icedtea@SLOT@" |
| 33 |
-JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/icedtea@SLOT@" |
| 34 |
-JAVAC="${JAVA_HOME}/bin/javac" |
| 35 |
-PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin" |
| 36 |
-ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin" |
| 37 |
-LDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/xawt/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/" |
| 38 |
-MANPATH="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/icedtea@SLOT@/man" |
| 39 |
-PROVIDES_TYPE="JDK JRE" |
| 40 |
-PROVIDES_VERSION="1.@SLOT@" |
| 41 |
-# Taken from sun.boot.class.path property |
| 42 |
-BOOTCLASSPATH="${JAVA_HOME}/jre/lib/resources.jar:${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar" |
| 43 |
-GENERATION="2" |
| 44 |
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" |
| 45 |
|
| 46 |
diff --git a/dev-java/icedtea/files/icedtea.env.sh b/dev-java/icedtea/files/icedtea.env.sh |
| 47 |
new file mode 100644 |
| 48 |
index 0000000..d24e1e6 |
| 49 |
--- /dev/null |
| 50 |
+++ b/dev-java/icedtea/files/icedtea.env.sh |
| 51 |
@@ -0,0 +1,18 @@ |
| 52 |
+# Copyright 1999-2016 Gentoo Foundation |
| 53 |
+# Distributed under the terms of the GNU General Public License v2 |
| 54 |
+# $Id$ |
| 55 |
+ |
| 56 |
+VERSION="IcedTea JDK ${PV}" |
| 57 |
+JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" |
| 58 |
+JDK_HOME="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" |
| 59 |
+JAVAC="\${JAVA_HOME}/bin/javac" |
| 60 |
+PATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin" |
| 61 |
+ROOTPATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin" |
| 62 |
+LDPATH="\${JAVA_HOME}/jre/lib/$(get_system_arch)/:\${JAVA_HOME}/jre/lib/$(get_system_arch)/server/$([[ ${SLOT} = [67] ]] && printf :\${JAVA_HOME}/jre/lib/$(get_system_arch)/xawt/)$([[ ${SLOT} = 6 ]] && printf :\${JAVA_HOME}/jre/lib/$(get_system_arch)/native_threads/)" |
| 63 |
+MANPATH="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" |
| 64 |
+PROVIDES_TYPE="JDK JRE" |
| 65 |
+PROVIDES_VERSION="1.${SLOT}" |
| 66 |
+# Taken from sun.boot.class.path property |
| 67 |
+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/lib/jfr.jar" |
| 68 |
+GENERATION="2" |
| 69 |
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" |
| 70 |
|
| 71 |
diff --git a/dev-java/icedtea/icedtea-3.1.0.ebuild b/dev-java/icedtea/icedtea-3.1.0.ebuild |
| 72 |
index 321f773..3aeb583 100644 |
| 73 |
--- a/dev-java/icedtea/icedtea-3.1.0.ebuild |
| 74 |
+++ b/dev-java/icedtea/icedtea-3.1.0.ebuild |
| 75 |
@@ -360,7 +360,7 @@ src_install() { |
| 76 |
cp -vRP cacerts "${ddest}/jre/lib/security/" || die |
| 77 |
chmod 644 "${ddest}/jre/lib/security/cacerts" || die |
| 78 |
|
| 79 |
- set_java_env "${FILESDIR}/icedtea.env" |
| 80 |
+ java-vm_install-env "${FILESDIR}/icedtea.env.sh" |
| 81 |
java-vm_sandbox-predict /proc/self/coredump_filter |
| 82 |
} |
| 83 |
|
| 84 |
|
| 85 |
diff --git a/dev-java/icedtea/icedtea-6.1.13.11.ebuild b/dev-java/icedtea/icedtea-6.1.13.11.ebuild |
| 86 |
index 4e90f1f..f1ef452 100644 |
| 87 |
--- a/dev-java/icedtea/icedtea-6.1.13.11.ebuild |
| 88 |
+++ b/dev-java/icedtea/icedtea-6.1.13.11.ebuild |
| 89 |
@@ -344,7 +344,7 @@ src_install() { |
| 90 |
cp -vRP cacerts "${ddest}/jre/lib/security/" || die |
| 91 |
chmod 644 "${ddest}/jre/lib/security/cacerts" || die |
| 92 |
|
| 93 |
- set_java_env "${FILESDIR}/icedtea.env" |
| 94 |
+ java-vm_install-env "${FILESDIR}/icedtea.env.sh" |
| 95 |
java-vm_sandbox-predict /proc/self/coredump_filter |
| 96 |
} |
| 97 |
|
| 98 |
|
| 99 |
diff --git a/dev-java/icedtea/icedtea-6.9999.ebuild b/dev-java/icedtea/icedtea-6.9999.ebuild |
| 100 |
index 7bd3197..d60452f 100644 |
| 101 |
--- a/dev-java/icedtea/icedtea-6.9999.ebuild |
| 102 |
+++ b/dev-java/icedtea/icedtea-6.9999.ebuild |
| 103 |
@@ -344,7 +344,7 @@ src_install() { |
| 104 |
cp -vRP cacerts "${ddest}/jre/lib/security/" || die |
| 105 |
chmod 644 "${ddest}/jre/lib/security/cacerts" || die |
| 106 |
|
| 107 |
- set_java_env "${FILESDIR}/icedtea.env" |
| 108 |
+ java-vm_install-env "${FILESDIR}/icedtea.env.sh" |
| 109 |
java-vm_sandbox-predict /proc/self/coredump_filter |
| 110 |
} |
| 111 |
|
| 112 |
|
| 113 |
diff --git a/dev-java/icedtea/icedtea-7.2.6.7.ebuild b/dev-java/icedtea/icedtea-7.2.6.7.ebuild |
| 114 |
index 19f400d..fe9ade9 100644 |
| 115 |
--- a/dev-java/icedtea/icedtea-7.2.6.7.ebuild |
| 116 |
+++ b/dev-java/icedtea/icedtea-7.2.6.7.ebuild |
| 117 |
@@ -370,7 +370,7 @@ src_install() { |
| 118 |
cp -vRP cacerts "${ddest}/jre/lib/security/" || die |
| 119 |
chmod 644 "${ddest}/jre/lib/security/cacerts" || die |
| 120 |
|
| 121 |
- set_java_env "${FILESDIR}/icedtea.env" |
| 122 |
+ java-vm_install-env "${FILESDIR}/icedtea.env.sh" |
| 123 |
java-vm_sandbox-predict /proc/self/coredump_filter |
| 124 |
} |
| 125 |
|
| 126 |
|
| 127 |
diff --git a/dev-java/icedtea/icedtea-7.2.7.0_pre05.ebuild b/dev-java/icedtea/icedtea-7.2.7.0_pre05.ebuild |
| 128 |
index 2e80c20..a425040 100644 |
| 129 |
--- a/dev-java/icedtea/icedtea-7.2.7.0_pre05.ebuild |
| 130 |
+++ b/dev-java/icedtea/icedtea-7.2.7.0_pre05.ebuild |
| 131 |
@@ -373,7 +373,7 @@ src_install() { |
| 132 |
cp -vRP cacerts "${ddest}/jre/lib/security/" || die |
| 133 |
chmod 644 "${ddest}/jre/lib/security/cacerts" || die |
| 134 |
|
| 135 |
- set_java_env "${FILESDIR}/icedtea.env" |
| 136 |
+ java-vm_install-env "${FILESDIR}/icedtea.env.sh" |
| 137 |
java-vm_sandbox-predict /proc/self/coredump_filter |
| 138 |
} |
Archives