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

[James Le Cuirot]

commit:     b898006ba069427dbe80e01c418bc2f5fc97f53b
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  6 20:59:21 2015 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Sep  6 21:00:28 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b898006b

dev-java/oracle-jre-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

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

diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.60.ebuild 
b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.60-r1.ebuild
similarity index 95%
rename from dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.60.ebuild
rename to dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.60-r1.ebuild
index b6ecede..970db2e 100644
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.60.ebuild
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.60-r1.ebuild
@@ -80,7 +80,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 )
        pax_kernel? ( sys-apps/paxctl )"
 
 S="${WORKDIR}/jre"
@@ -121,6 +122,11 @@ src_prepare() {
        if use jce ; then
                mv "${WORKDIR}"/${JCE_DIR} 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 lib/rt.jar sun/usagetracker/\* || die
 }
 
 src_install() {