[gentoo-commits] proj/java:master commit in: dev-java/icedtea/

[James Le Cuirot]

commit:     739c3858839039bb2af85a6c30ec63b7ec3019e8
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 17 21:40:52 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 21:40:52 2016 +0000
URL:        https://gitweb.gentoo.org/proj/java.git/commit/?id=739c3858

dev-java/icedtea: Sync changes from 7.2.6.3 to 7.2.7.0_pre00

This removes the old font hack and adds the new CUPS hack.

Package-Manager: portage-2.2.26

 dev-java/icedtea/icedtea-7.2.7.0_pre00-r1.ebuild | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/dev-java/icedtea/icedtea-7.2.7.0_pre00-r1.ebuild 
b/dev-java/icedtea/icedtea-7.2.7.0_pre00-r1.ebuild
index 6916c78..7b9b236 100644
--- a/dev-java/icedtea/icedtea-7.2.7.0_pre00-r1.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.7.0_pre00-r1.ebuild
@@ -193,6 +193,11 @@ src_unpack() {
 }
 
 java_prepare() {
+       if ! use cups; then
+               # CUPS is always needed at build time but you can at least make 
it dlopen.
+               sed -i 's/SYSTEM_CUPS="true"/SYSTEM_CUPS="false"/g' Makefile.in 
|| die
+       fi
+
        # For bootstrap builds as the sandbox control file might not yet exist.
        addpredict /proc/self/coredump_filter
 
@@ -381,13 +386,6 @@ src_install() {
        cp -vRP cacerts "${ddest}/jre/lib/security/" || die
        chmod 644 "${ddest}/jre/lib/security/cacerts" || die
 
-       # OpenJDK7 should be able to use fontconfig instead, but wont hurt to
-       # install it anyway. Bug 390663
-       cp "${FILESDIR}"/fontconfig.Gentoo.properties.src 
"${T}"/fontconfig.Gentoo.properties || die
-       eprefixify "${T}"/fontconfig.Gentoo.properties
-       insinto "${dest}"/jre/lib
-       doins "${T}"/fontconfig.Gentoo.properties
-
        set_java_env "${FILESDIR}/icedtea.env"
        java-vm_sandbox-predict /proc/self/coredump_filter
 }