From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 2B28D58973 for ; Sun, 17 Jan 2016 21:41:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1DBEE21C006; Sun, 17 Jan 2016 21:41:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BFB3221C006 for ; Sun, 17 Jan 2016 21:41:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8026F34087E for ; Sun, 17 Jan 2016 21:41:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0DE5C99A for ; Sun, 17 Jan 2016 21:41:27 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1453066852.739c3858839039bb2af85a6c30ec63b7ec3019e8.chewi@gentoo> Subject: [gentoo-commits] proj/java:master commit in: dev-java/icedtea/ X-VCS-Repository: proj/java X-VCS-Files: dev-java/icedtea/icedtea-7.2.7.0_pre00-r1.ebuild X-VCS-Directories: dev-java/icedtea/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 739c3858839039bb2af85a6c30ec63b7ec3019e8 X-VCS-Branch: master Date: Sun, 17 Jan 2016 21:41:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: cce7c8aa-8ed5-46c2-aef2-d346ad8068a3 X-Archives-Hash: b7729472228802eafef36950bc477daa commit: 739c3858839039bb2af85a6c30ec63b7ec3019e8 Author: James Le Cuirot gentoo org> AuthorDate: Sun Jan 17 21:40:52 2016 +0000 Commit: James Le Cuirot gentoo 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 }