diff options
author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2016-08-08 15:57:41 +0100 |
---|---|---|
committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2016-08-08 15:57:41 +0100 |
commit | d94b96e1c24fdab42a450fc626187cb661a926c1 (patch) | |
tree | 532826e5b41a8ebdc4b15cb86960f2df2fece10d | |
parent | dev-java/icedtea: Provide first 3.2.0 pre-release. (diff) | |
parent | dev-java/icedtea: Apply earlier Infinality fix to 7, fixes bug #590068 (diff) | |
download | java-d94b96e1c24fdab42a450fc626187cb661a926c1.tar.gz java-d94b96e1c24fdab42a450fc626187cb661a926c1.tar.bz2 java-d94b96e1c24fdab42a450fc626187cb661a926c1.zip |
Merge branch 'master' of git://anongit.gentoo.org/proj/java
-rw-r--r-- | dev-java/icedtea/files/icedtea.env | 18 | ||||
-rw-r--r-- | dev-java/icedtea/files/icedtea.env.sh | 18 | ||||
-rw-r--r-- | dev-java/icedtea/icedtea-3.1.0.ebuild | 2 | ||||
-rw-r--r-- | dev-java/icedtea/icedtea-6.1.13.11.ebuild | 2 | ||||
-rw-r--r-- | dev-java/icedtea/icedtea-6.9999.ebuild | 2 | ||||
-rw-r--r-- | dev-java/icedtea/icedtea-7.2.6.7.ebuild | 5 | ||||
-rw-r--r-- | dev-java/icedtea/icedtea-7.2.7.0_pre05.ebuild | 5 |
7 files changed, 27 insertions, 25 deletions
diff --git a/dev-java/icedtea/files/icedtea.env b/dev-java/icedtea/files/icedtea.env deleted file mode 100644 index 463add6d..00000000 --- a/dev-java/icedtea/files/icedtea.env +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -VERSION="IcedTea JDK @PV@" -JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/icedtea@SLOT@" -JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/icedtea@SLOT@" -JAVAC="${JAVA_HOME}/bin/javac" -PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin" -ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin" -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/" -MANPATH="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/icedtea@SLOT@/man" -PROVIDES_TYPE="JDK JRE" -PROVIDES_VERSION="1.@SLOT@" -# Taken from sun.boot.class.path property -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" -GENERATION="2" -ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" diff --git a/dev-java/icedtea/files/icedtea.env.sh b/dev-java/icedtea/files/icedtea.env.sh new file mode 100644 index 00000000..d24e1e64 --- /dev/null +++ b/dev-java/icedtea/files/icedtea.env.sh @@ -0,0 +1,18 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +VERSION="IcedTea JDK ${PV}" +JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" +JDK_HOME="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" +JAVAC="\${JAVA_HOME}/bin/javac" +PATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin" +ROOTPATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin" +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/)" +MANPATH="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" +PROVIDES_TYPE="JDK JRE" +PROVIDES_VERSION="1.${SLOT}" +# Taken from sun.boot.class.path property +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" +GENERATION="2" +ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" diff --git a/dev-java/icedtea/icedtea-3.1.0.ebuild b/dev-java/icedtea/icedtea-3.1.0.ebuild index 321f7739..3aeb5834 100644 --- a/dev-java/icedtea/icedtea-3.1.0.ebuild +++ b/dev-java/icedtea/icedtea-3.1.0.ebuild @@ -360,7 +360,7 @@ src_install() { cp -vRP cacerts "${ddest}/jre/lib/security/" || die chmod 644 "${ddest}/jre/lib/security/cacerts" || die - set_java_env "${FILESDIR}/icedtea.env" + java-vm_install-env "${FILESDIR}/icedtea.env.sh" java-vm_sandbox-predict /proc/self/coredump_filter } diff --git a/dev-java/icedtea/icedtea-6.1.13.11.ebuild b/dev-java/icedtea/icedtea-6.1.13.11.ebuild index 4e90f1fb..f1ef4529 100644 --- a/dev-java/icedtea/icedtea-6.1.13.11.ebuild +++ b/dev-java/icedtea/icedtea-6.1.13.11.ebuild @@ -344,7 +344,7 @@ src_install() { cp -vRP cacerts "${ddest}/jre/lib/security/" || die chmod 644 "${ddest}/jre/lib/security/cacerts" || die - set_java_env "${FILESDIR}/icedtea.env" + java-vm_install-env "${FILESDIR}/icedtea.env.sh" java-vm_sandbox-predict /proc/self/coredump_filter } diff --git a/dev-java/icedtea/icedtea-6.9999.ebuild b/dev-java/icedtea/icedtea-6.9999.ebuild index 7bd31977..d60452f6 100644 --- a/dev-java/icedtea/icedtea-6.9999.ebuild +++ b/dev-java/icedtea/icedtea-6.9999.ebuild @@ -344,7 +344,7 @@ src_install() { cp -vRP cacerts "${ddest}/jre/lib/security/" || die chmod 644 "${ddest}/jre/lib/security/cacerts" || die - set_java_env "${FILESDIR}/icedtea.env" + java-vm_install-env "${FILESDIR}/icedtea.env.sh" java-vm_sandbox-predict /proc/self/coredump_filter } diff --git a/dev-java/icedtea/icedtea-7.2.6.7.ebuild b/dev-java/icedtea/icedtea-7.2.6.7.ebuild index 19f400d5..b15601f9 100644 --- a/dev-java/icedtea/icedtea-7.2.6.7.ebuild +++ b/dev-java/icedtea/icedtea-7.2.6.7.ebuild @@ -94,7 +94,6 @@ COMMON_DEP=" >=dev-libs/glib-2.26:2 >=dev-util/systemtap-1 media-libs/fontconfig - >=media-libs/freetype-2.5.3:2=[infinality?] >=media-libs/lcms-2.5 >=sys-libs/zlib-1.2.3:= virtual/jpeg:0= @@ -105,6 +104,8 @@ COMMON_DEP=" >=x11-libs/gtk+-2.8:2= >=x11-libs/pango-1.24.5 ) + !infinality? ( >=media-libs/freetype-2.5.3:2= ) + infinality? ( <media-libs/freetype-2.6.4:2=[infinality] ) javascript? ( dev-java/rhino:1.6 ) kerberos? ( virtual/krb5 ) nss? ( >=dev-libs/nss-3.12.5-r1 ) @@ -370,7 +371,7 @@ src_install() { cp -vRP cacerts "${ddest}/jre/lib/security/" || die chmod 644 "${ddest}/jre/lib/security/cacerts" || die - set_java_env "${FILESDIR}/icedtea.env" + java-vm_install-env "${FILESDIR}/icedtea.env.sh" java-vm_sandbox-predict /proc/self/coredump_filter } diff --git a/dev-java/icedtea/icedtea-7.2.7.0_pre05.ebuild b/dev-java/icedtea/icedtea-7.2.7.0_pre05.ebuild index 2e80c20b..d1b397c3 100644 --- a/dev-java/icedtea/icedtea-7.2.7.0_pre05.ebuild +++ b/dev-java/icedtea/icedtea-7.2.7.0_pre05.ebuild @@ -94,7 +94,6 @@ COMMON_DEP=" >=dev-libs/glib-2.26:2 >=dev-util/systemtap-1 media-libs/fontconfig - >=media-libs/freetype-2.5.3:2=[infinality?] >=media-libs/lcms-2.5 >=sys-libs/zlib-1.2.3:= virtual/jpeg:0= @@ -105,6 +104,8 @@ COMMON_DEP=" >=x11-libs/gtk+-2.8:2= >=x11-libs/pango-1.24.5 ) + !infinality? ( >=media-libs/freetype-2.5.3:2= ) + infinality? ( <media-libs/freetype-2.6.4:2=[infinality] ) javascript? ( dev-java/rhino:1.6 ) kerberos? ( virtual/krb5 ) nss? ( >=dev-libs/nss-3.12.5-r1 ) @@ -373,7 +374,7 @@ src_install() { cp -vRP cacerts "${ddest}/jre/lib/security/" || die chmod 644 "${ddest}/jre/lib/security/cacerts" || die - set_java_env "${FILESDIR}/icedtea.env" + java-vm_install-env "${FILESDIR}/icedtea.env.sh" java-vm_sandbox-predict /proc/self/coredump_filter } |