dev-java/oracle-jdk-bin: Add visualvm USE flag, fixes bug #609326

Package-Manager: Portage-2.3.5, Repoman-2.3.2

diff --git a/dev-java/oracle-jdk-bin/metadata.xml b/dev-java/oracle-jdk-bin/metadata.xml
index e5ef7922b3215edfabc1d1dbe09d10d8ad22076c..165190f3d7ec7423c768137974c4df706fc3a874 100644 (file)
--- a/dev-java/oracle-jdk-bin/metadata.xml
+++ b/dev-java/oracle-jdk-bin/metadata.xml
@@ -13,5 +13,6 @@
     <flag name="javafx">Install JavaFX libraries</flag>
     <flag name="jce">Install Java Cryptographic Extension Unlimited Strength Jurisdiction Policy Files</flag>
     <flag name="source">Install JVM (and optionally JavaFX) sources</flag>
+    <flag name="visualvm">Install VisualVM debugging tool</flag>
   </use>
 </pkgmetadata>

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 319645de7f4381eee3d5eefab57108aec2bf7857..cd57314695a9a35012ed6eabc1105649546f4b5a 100644 (file)
--- 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}"