From fffca6fc27e3bad3c0c1d80fa884f16754920ab3 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Tue, 25 Apr 2017 22:07:57 +0100 Subject: [PATCH] dev-java/oracle-jdk-bin: Add visualvm USE flag, fixes bug #609326 Package-Manager: Portage-2.3.5, Repoman-2.3.2 --- dev-java/oracle-jdk-bin/metadata.xml | 1 + dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.131.ebuild | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dev-java/oracle-jdk-bin/metadata.xml b/dev-java/oracle-jdk-bin/metadata.xml index e5ef7922b321..165190f3d7ec 100644 --- a/dev-java/oracle-jdk-bin/metadata.xml +++ b/dev-java/oracle-jdk-bin/metadata.xml @@ -13,5 +13,6 @@ Install JavaFX libraries Install Java Cryptographic Extension Unlimited Strength Jurisdiction Policy Files Install JVM (and optionally JavaFX) sources + Install VisualVM debugging tool diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.131.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.131.ebuild index 319645de7f43..cd57314695a9 100644 --- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.131.ebuild +++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.131.ebuild @@ -60,7 +60,7 @@ SRC_URI+=" jce? ( ${JCE_FILE} )" LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )" SLOT="1.8" KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris" -IUSE="alsa commercial cups derby doc examples +fontconfig headless-awt javafx jce nsplugin selinux source" +IUSE="alsa commercial cups derby doc examples +fontconfig headless-awt javafx jce nsplugin selinux source visualvm" REQUIRED_USE="javafx? ( alsa fontconfig )" RESTRICT="fetch preserve-libs strip" @@ -236,8 +236,8 @@ src_install() { # provided, they generally lag behind what Gentoo has available. rm -vf jre/lib/*/libavplugin* || die - # We package this as dev-util/visualvm. - rm -vfr lib/visualvm || die + # Packaged as dev-util/visualvm but some users prefer this version. + use visualvm || find -name "*visualvm*" -exec rm -vfr {} + || die dodoc COPYRIGHT dodir "${dest}" -- 2.26.2