From: James Le Cuirot <chewi@gentoo.org>
Date: Tue, 12 Apr 2016 21:44:40 +0000 (+0100)
Subject: dev-java/icedtea-bin: Disable SunEC for now (#579676), fontconfig fix
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=be677d64fed9b3c7ce8f521859059bd804a52b2f;p=gentoo.git

dev-java/icedtea-bin: Disable SunEC for now (#579676), fontconfig fix

Package-Manager: portage-2.2.28
---

diff --git a/dev-java/icedtea-bin/files/no-sunec.patch b/dev-java/icedtea-bin/files/no-sunec.patch
new file mode 100644
index 000000000000..c1d64bd215d4
--- /dev/null
+++ b/dev-java/icedtea-bin/files/no-sunec.patch
@@ -0,0 +1,27 @@
+--- jre/lib/security/java.security	2016-04-12 22:35:18.390181858 +0100
++++ jre/lib/security/java.security	2016-04-12 22:37:10.000000000 +0100
+@@ -67,17 +67,16 @@
+ #
+ security.provider.1=sun.security.provider.Sun
+ security.provider.2=sun.security.rsa.SunRsaSign
+-security.provider.3=sun.security.ec.SunEC
+-security.provider.4=com.sun.net.ssl.internal.ssl.Provider
+-security.provider.5=com.sun.crypto.provider.SunJCE
+-security.provider.6=sun.security.jgss.SunProvider
+-security.provider.7=com.sun.security.sasl.Provider
+-security.provider.8=org.jcp.xml.dsig.internal.dom.XMLDSigRI
+-security.provider.9=sun.security.smartcardio.SunPCSC
++security.provider.3=com.sun.net.ssl.internal.ssl.Provider
++security.provider.4=com.sun.crypto.provider.SunJCE
++security.provider.5=sun.security.jgss.SunProvider
++security.provider.6=com.sun.security.sasl.Provider
++security.provider.7=org.jcp.xml.dsig.internal.dom.XMLDSigRI
++security.provider.8=sun.security.smartcardio.SunPCSC
+ # the NSS security provider was not enabled for this build; it can be enabled
+ # if NSS (libnss3) is available on the machine. The nss.cfg file may need
+ # editing to reflect the location of the NSS installation.
+-#security.provider.10=sun.security.pkcs11.SunPKCS11 ${java.home}/lib/security/nss.cfg
++#security.provider.9=sun.security.pkcs11.SunPKCS11 ${java.home}/lib/security/nss.cfg
+ 
+ #
+ # Sun Provider SecureRandom seed source.
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.0.0.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.0.0-r1.ebuild
similarity index 91%
rename from dev-java/icedtea-bin/icedtea-bin-3.0.0.ebuild
rename to dev-java/icedtea-bin/icedtea-bin-3.0.0-r1.ebuild
index 7e102c67b0f3..f812c1e103ae 100644
--- a/dev-java/icedtea-bin/icedtea-bin-3.0.0.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-3.0.0-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-inherit java-vm-2 multilib prefix toolchain-funcs
+inherit eutils java-vm-2 multilib toolchain-funcs
 
 dist="https://dev.gentoo.org/~chewi/distfiles"
 TARBALL_VERSION="${PV}"
@@ -90,12 +90,8 @@ src_prepare() {
 		   {,jre/}bin/policytool bin/appletviewer || die
 	fi
 
-	if [[ -n "${EPREFIX}" ]]; then
-		# The binaries are built on a non-prefixed system so the
-		# fontconfig needs to have prefixes inserted.
-		sed -i 's:=/:=@GENTOO_PORTAGE_EPREFIX@/:' jre/lib/fontconfig.Gentoo.properties || die
-		eprefixify jre/lib/fontconfig.Gentoo.properties
-	fi
+	# Disable EC for now, bug #579676.
+	epatch "${FILESDIR}/no-sunec.patch"
 }
 
 src_install() {