[gentoo-commits] repo/gentoo:master commit in: dev-java/oracle-jdk-bin/

["James Le Cuirot" <chewi@gentoo.org>]

commit:     8946e2fb40081557aa12b6e39cf2b2852376eea7
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  6 20:58:10 2015 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Sep  6 21:00:26 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8946e2fb

dev-java/oracle-jdk-bin: Delete Oracle's evil usage tracker

Fixes bug #559478. Their site says it's disabled by default but that
doesn't appear to be the case any more.

Package-Manager: portage-2.2.20.1

 ...-jdk-bin-1.8.0.60.ebuild => oracle-jdk-bin-1.8.0.60-r1.ebuild} | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.60.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.60-r1.ebuild
similarity index 97%
rename from dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.60.ebuild
rename to dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.60-r1.ebuild
index 21c8c97..ee9ca0d 100644
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.60.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.60-r1.ebuild
@@ -108,7 +108,8 @@ RDEPEND="!x64-macos? (
 
 # A PaX header isn't created by scanelf so depend on paxctl to avoid
 # fallback marking. See bug #427642.
-DEPEND="jce? ( app-arch/unzip )
+DEPEND="app-arch/zip
+	jce? ( app-arch/unzip )
 	examples? ( x64-macos? ( app-arch/unzip ) )
 	pax_kernel? ( sys-apps/paxctl )"
 
@@ -181,6 +182,11 @@ src_prepare() {
 	if use jce ; then
 		mv "${WORKDIR}"/${JCE_DIR} jre/lib/security/ || die
 	fi
+
+	# Delete Oracle's evil usage tracker. Not just because it's evil but
+	# because it breaks the sandbox during builds and we can't find any
+	# other feasible way to disable it or make it write somewhere else.
+	zip -d jre/lib/rt.jar sun/usagetracker/\* || die
 }
 
 src_install() {