diff options
| author |   James Le Cuirot <chewi@gentoo.org> | 2017-01-23 22:20:54 +0000 |
|---|---|---|
| committer | James Le Cuirot <chewi@gentoo.org> | 2017-01-23 22:52:22 +0000 |
| commit | 87aeca88e4df13149b752c496b004d15ee7b32e7 (patch) | |
| tree | cef5ade74812d012aee80d80227d0018ccf3833c | |
| parent | dev-java/oracle-jre-bin: Bump to 1.8.0.121 wrt security bug #606118 (diff) | |
| download | gentoo-87aeca88e4df13149b752c496b004d15ee7b32e7.tar.gz gentoo-87aeca88e4df13149b752c496b004d15ee7b32e7.tar.bz2 gentoo-87aeca88e4df13149b752c496b004d15ee7b32e7.zip | |
dev-java/oracle-jre-bin: Migrate to java-vm_install-env
Package-Manager: Portage-2.3.3, Repoman-2.3.1
| -rw-r--r-- | dev-java/oracle-jre-bin/files/oracle-jre-bin.env.sh | 17 | ||||
| -rw-r--r-- | dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.121.ebuild | 2 |
2 files changed, 18 insertions, 1 deletions
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 new file mode 100644 index 000000000000..3803977c0dbe --- /dev/null +++ b/dev-java/oracle-jre-bin/files/oracle-jre-bin.env.sh @@ -0,0 +1,17 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +VERSION="Oracle JRE ${PV}" +JAVA_HOME="${EPREFIX}/opt/${P}" +JDK_HOME="${EPREFIX}/opt/${P}" +JAVAC="\${JAVA_HOME}/bin/javac" +PATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/bin" +ROOTPATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/bin" +LDPATH="\${JAVA_HOME}/lib/$(get_system_arch)/:\${JAVA_HOME}/lib/$(get_system_arch)/server/" +MANPATH="${EPREFIX}/opt/${P}/man" +PROVIDES_TYPE="JRE" +PROVIDES_VERSION="${SLOT}" +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" +GENERATION="2" +ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" 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 index d980bd7746a7..9c546f14f6ae 100644 --- 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 @@ -234,7 +234,7 @@ src_install() { # Remove empty dirs we might have copied. find "${D}" -type d -empty -exec rmdir -v {} + || die - set_java_env + java-vm_install-env "${FILESDIR}"/${PN}.env.sh java-vm_revdep-mask java-vm_sandbox-predict /dev/random /proc/self/coredump_filter } |