version bump, removed obsolete broken ebuilds

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xCFE47E2F

13 files changed, 146 insertions, 354 deletions

diff --git a/dev-util/visualvm/ChangeLog b/dev-util/visualvm/ChangeLog
index 55b579b5fedb..02d1a2bb899b 100644
--- a/dev-util/visualvm/ChangeLog
+++ b/dev-util/visualvm/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-util/visualvm
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/visualvm/ChangeLog,v 1.6 2014/08/10 21:29:54 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/visualvm/ChangeLog,v 1.7 2015/02/05 18:05:25 fordfrog Exp $
+
+*visualvm-1.3.8 (05 Feb 2015)
+
+  05 Feb 2015; Miroslav Šulc <fordfrog@gentoo.org> -visualvm-1.3.3-r1.ebuild,
+  -visualvm-1.3.3-r2.ebuild, -visualvm-1.3.3-r8.ebuild,
+  -visualvm-1.3.3-r9.ebuild, +visualvm-1.3.8.ebuild,
+  +files/org-netbeans-modules-profiler-kit.xml,
+  +files/org-netbeans-modules-profiler-nbimpl.xml,
+  +files/org-netbeans-modules-profiler-options.xml,
+  +files/org-netbeans-modules-profiler-oql-language.xml, +files/visualvm.conf,
+  +files/visualvm.sh:
+  version bump, removed obsolete broken ebuilds
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> visualvm-1.3.3-r1.ebuild,
   visualvm-1.3.3-r2.ebuild, visualvm-1.3.3-r8.ebuild, visualvm-1.3.3-r9.ebuild:
diff --git a/dev-util/visualvm/Manifest b/dev-util/visualvm/Manifest
index c3afe399ddd4..fae1e9e50bb5 100644
--- a/dev-util/visualvm/Manifest
+++ b/dev-util/visualvm/Manifest
@@ -1,20 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX netbeans-platform-version.patch 435 SHA256 2ab6b242b105952962ad5893cb9249c019912aad8d41b909e8afeadfefa24515 SHA512 57a9de55539bda8312bc64714618719322611589f0ffb98a684dd67e91424e8f2c7100fb60b109c56a63e4727541afdc51a270bc5b19b5b359f462c0c811864d WHIRLPOOL 02e1a9a7a08f636fe681163abc70459e813f9cdd4bf0fd72f6ccb37e7c2cb1376b0ce5325a4a8f84f1e73a1dcf3749e419db9fe882f39f37333982b858706fee
-DIST netbeans-profiler-visualvm_release701.tar.gz 1767450 SHA256 0056c6b7da3fa9499b87319caa6b431b935b48f9579f7c94ec169777ecd2c238 SHA512 7b7c05dca9ccb7ed6d346ce2c02a39e70a7356a0df469f3d6556968dcd1da52bc063e29fe51167a722a4d1f94609b1e3ba4cc0970e12fe5388f60a10a6fa8bd9 WHIRLPOOL 558153776f2e782a4019a0f46166f5b3eaad02ca1fc527486e0fb4ecbb7ddca4d616cc93bdbbc0de52cc9e6132a5cfa50fff9d777b6a46459db94d0566ec7a84
-DIST visualvm_133-src.tar.gz 978434 SHA256 43f4d5c892d3654ada9d07f2a8dc1c1b98db671f558a5c7fa7e9db7e86b7ca81 SHA512 22f408bb5e090dc1f807a18c99d1f91cf440fac0b5fc5b919538563bc0e2b5cf9af45f894a6d4e967fc7445dc93c325919a7cda69667dd0db310112f9ccc9f82 WHIRLPOOL ca7185d4f8141f86554ad4b9d6305e6023555199a7ef942a6d64ab430ab5757741787f311cfac44d1403c72683593f94ff16d244691d474a4d58bb4aa532b68f
-DIST visualvm_harness-1.3.tar.gz 147059 SHA256 e66eb2fe2b4703896d329ca0e0a8f5e89c5a0097dbad72f9211e14d71401f585 SHA512 680f7601d2910da7331330b643f69c46ee84b05379a452046e1c1791f2668ecbb08b492b466b8564ba1f1540c0b88d3c60e671d143e4b0177b738adc35ac26b9 WHIRLPOOL 3268f79f414f91927ebad2fdca7359e628e5546a3ee132268c13980daa7907dff18eafbd25c18f2bd0bb15352b645f304f7cff5d7d002e2c1ac1c96a722d82aa
-EBUILD visualvm-1.3.3-r1.ebuild 2199 SHA256 45de44e720c34b2a381f8e5e43fa599ba43dc08d568fad547365b4608d84ec6e SHA512 5c1c7a5c957b36d5b94b70fa1fe157231867dc038d9e83c3c780abac06bbb11bd37558a19b18da2023611455db206cbbe9e2e3a835b66c7d1622588c26649622 WHIRLPOOL eb89b26e29178872241a04cd53a6c7430c8f4d358c550af30118ea19468b5e464745fb85b42672ca9382cf6ebfc7c5fede63027f28a717ae8c3314ce24b405bc
-EBUILD visualvm-1.3.3-r2.ebuild 2253 SHA256 607c21c8aec701cc704f65fa9db883bf92b360d1702934b5fa0cbfb32feaa0db SHA512 e4dd3672d66b453aa8562c87255d4edc0c3cd69419cfde2e6af036ac68fdcee55b1a07c5f2a2b937c917df22dbb959a4dce3f66be4dac3199b98d6e69c495452 WHIRLPOOL 64334cd3da11a1277f6a73acee132124e8ff76dd3ea0153708c4092b20a6da94dd20bce9bfa5e6bfd329f3d752ae921c9ea4fcd75008617f1f5f9ae0b14092bd
-EBUILD visualvm-1.3.3-r8.ebuild 2199 SHA256 501ae4ab01dec17000307425b137db3c241d991985e4e45be476ae515063da5c SHA512 7cdd5810d4c7780272deafd3b627d3bc61b7182d164c06a70fabc2ff7590268badfde3da8a32d4ca0f02cb26e14daa29c28454fef4ea39dfcb122de4d9f03fe3 WHIRLPOOL 5fd8c8a246d566cdae1f15b7e1d2958286785878ec74335542c1b5d3036e99bafd853237bb84c02372fabe8d183fff66d3c8540be30d519dd8d3720e708ebcaf
-EBUILD visualvm-1.3.3-r9.ebuild 2253 SHA256 2e384019d6f0d487ed269a8afa8ae3af5a0ce76cc733622af71ec2ab6b9eb715 SHA512 7d24c46ba64ba79eeaa9ddcd9860e006f813ade7d10ba2be11b5efe878e8402b7d512acdc5ada505a94a0bc3ffac75ba9965ddd7c420ade3d596927b1a93a677 WHIRLPOOL 853cec277f4906f8caf29d048e5184ad2b49a8880e01b694689e2733869598150977ec4820a53a0961209fcb61377db8fed328aeba80fbf64c62f2fdbdc9f52c
-MISC ChangeLog 1409 SHA256 142ce0e4ace5d23e8f74e6ba88be842a71f5eb5cdbf274427fdcfc03e6f3fc55 SHA512 b13f5800526e7164be7a63e33dfac86a35c1ca4148ba3cadf085e09ac18d45d372e792eab7bf129633cab71cfeb83aeb3cab887652fb43046bc3623bd36d0b8e WHIRLPOOL 29908efdf2bc3cb74a955fc713bd5a5d1195da582efb5bae00f7d3da59aad4df8edcc5fac960aa138c77dd370251e8290d0c445647ebdb3d93454c2fc4c6b583
+AUX org-netbeans-modules-profiler-kit.xml 480 SHA256 f2b7ef384e71241dd91a49825b62a97875231dc5ac539e1ca1919a0edc02b6ca SHA512 43c979dce3996ef49de4cea4e46d1869bcf707cdabd0af04442ea7ba1ecb7e4f0d35e0355114e0382a1b7e105c02a7aedf0846ccab3e0cdc1f82f0a829dc9e40 WHIRLPOOL 1c7d2b7e3ac98850147dde1c17f6de7bf46cada3837b5933777305271b104e0ce8bb0011680f4ce3b48f0b5517cc0b588832b0a868d1992d1085bae1039e1341
+AUX org-netbeans-modules-profiler-nbimpl.xml 486 SHA256 86d7dd0bb435f9fe97a54ab1dff2d6f5a2cc8413add1ac78c9abed9600e0de5f SHA512 608089dfe84c19542ebabf484b4ba4ac0c0fd9be62d0e86f1a46f5b99cc00e702236618037aa5afa9d2f866af8b360fc4cfe9683998616e96964595068e73f4a WHIRLPOOL e8913740280b7a5f73082789d55f48b4d1a970f24074981771e116404a5028ab679e55faa7636502935442be171e0a231cf78f659d28c6bd3473195e83af9be0
+AUX org-netbeans-modules-profiler-options.xml 488 SHA256 fdef7c3e062df1cfddff844c11b0763190a92f863a9d308de240b67a42ea110a SHA512 00012a71334794b5b454f7de1ddecd2dd5ea90f11c8a4fdade520d0128d4cd27af13f5dc707b00231c68bf302189f06eaf2addc9cdfe403773421497ae4f1dcd WHIRLPOOL 028d335379785361e582016f8279914d2baf00c037f15c7e9e3094e19c1c53a6242669cd990c914437fe0447cbd12773fa67047671d704bebce58abdd3ee518a
+AUX org-netbeans-modules-profiler-oql-language.xml 498 SHA256 dec11f45e21b886b98841e058e7dfa2be8d34cec1309e8401d334f7f23471738 SHA512 95962ba87c85c7f0ae9378eab7b29d377e3e4cd5173e65f428f26d0c2e9d35d69f140877d1fbb77dbdca4ca0473d8beeae48674101412c9b41e0be832895f4b2 WHIRLPOOL 445fd2ab096125512f7ab0599cf7b1a3938ddba9bb5570596d1fb9e307e8ad1fbdcd905dea808bf7447c696f0973a5aa239cb6666f73977f62718ac8bd716517
+AUX visualvm.conf 383 SHA256 8ee4e0cb4a69cd0db8f581bef42ae8504ba14323dfe163f7c275e9f821d1a3ae SHA512 a5537c7ff8e3821ea435cb6236eac6d0f8941d16541f14862cf5ad15fc2d3621cd50aa296dd316f54f7137196981163b211fe984d21a38ababfce05d575203ff WHIRLPOOL f53de8d9401fbeb86ffb23825da5d228dee2ff1a6b158a74190a6bc37ec24d36d819d65242d0d7b1e0732baadc98766740b33381bc93eb1a9210051b48a9f849
+AUX visualvm.sh 730 SHA256 3828b835d52d7c3a8d452b4cca0273559318bdd66c8a1e6e3fa27354ec06d6f6 SHA512 5f8ba3cbb1c74c9807c016fff5ce31abeb15275df68c710acfb2d0e5f9ecf7e9c5c6aa85c865350bc8225caa278117cda8d6005e28759cc327baf0d14546b95b WHIRLPOOL 85d6857376ccb4ec84391cc4ae9c259911a60060d23753217f6bb26f8fee53bbdd3324bc014bcd030a558080ebc9949b3c5123b7516cd979c75a73aba2d27e92
+DIST visualvm_138-src.tar.gz 1052176 SHA256 e34cd0425d74055e03394c572735067d3b98095ed5c04268707b52f1dc7c6144 SHA512 f418fcd3316f793c6fc77c6bcdf1e53dc543f7de2ee638f3d500a4de61505246fd07829b25cdf988836f515b72c59c71a2a4fecbb569910e9203e5b490e837a1 WHIRLPOOL c2d83fd92687d07d2f240d4a6c1f150471041e0e0ab1c13f7cd1804a98d3565ed1df29c5124002ced0c403fec98b5464f8ad113cc76ae264d95413c81c4dc129
+EBUILD visualvm-1.3.8.ebuild 1895 SHA256 12253da3ca1ec1a6b8d7c70fe338c129de641fde6deed5050ff66f756c4e5c99 SHA512 ecd00971f2c9d025c41c5f480fad2ea64acc8e9ff913cf8ed8f079a62790e2fab5d1f63ceb31f07573fed20b83f9b662cdb58e11413c1664d3fabec94e8e6c23 WHIRLPOOL d52ef49dcc5de8c869eeca9190879e70b6d9a82b8f345d2210a02c2e61b001141739ea5fb601a14cf291150a089cddf789aed811163361dcc4de74a679f137b6
+MISC ChangeLog 1931 SHA256 be4b57e31a05a40bb01389704104e7ae930f2d139055bfbd0bc58f2e345073fa SHA512 a073b358d2d23432ce767e5c69b3fd8039d7f7d8eb7b7af77b2f00108f5e9e876e35fbed90dbdf4d8820a760eca01a7025b440d2916ec13df035e947521fed1f WHIRLPOOL 526160e0521595b1844b607f042c4d25f818f9af0e5a8fd0c8ef383b141bdf6f19e6fb534b065379f9bd55af291807582f8bc09edcdd2799f22af4869524b3c4
 MISC metadata.xml 272 SHA256 943cf052a7b858e3974b8104b6937c2848782804d50b402de0fd76eff9e6d1fa SHA512 b9b9eb88a38646d1af71061267cae3d7c5f9180ee0d31afe7f93d49e38f1aeabcd4fe15f098e82840ac93c2d45863722f8d7adc2d79e4005c4a27556932e34bc WHIRLPOOL 7fca9572fa16326350fdb23f3beb1b6c454048a55016f8d08c68f34c03f9537514e6dfc532484a294ce4c77d2b83129eb84a461adf59c976189f793e15994743
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlPn5FMACgkQcaHudmEf86r9MgCeN+vEX7+Ho7DtVNXU4Fv1X5XC
-PPYAni7+pJDFEzJxFX/HNDBF6Y2pFEsb
-=fq0o
------END PGP SIGNATURE-----
diff --git a/dev-util/visualvm/files/org-netbeans-modules-profiler-kit.xml b/dev-util/visualvm/files/org-netbeans-modules-profiler-kit.xml
new file mode 100644
index 000000000000..94021f8ef293
--- /dev/null
+++ b/dev-util/visualvm/files/org-netbeans-modules-profiler-kit.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC "-//NetBeans//DTD Module Status 1.0//EN"
+                        "http://www.netbeans.org/dtds/module-status-1_0.dtd">
+<module name="org.netbeans.modules.profiler.kit">
+    <param name="autoload">false</param>
+    <param name="eager">false</param>
+    <param name="enabled">false</param>
+    <param name="jar">modules/org-netbeans-modules-profiler-kit.jar</param>
+    <param name="reloadable">false</param>
+</module>
diff --git a/dev-util/visualvm/files/org-netbeans-modules-profiler-nbimpl.xml b/dev-util/visualvm/files/org-netbeans-modules-profiler-nbimpl.xml
new file mode 100644
index 000000000000..d33e48d5b7f5
--- /dev/null
+++ b/dev-util/visualvm/files/org-netbeans-modules-profiler-nbimpl.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC "-//NetBeans//DTD Module Status 1.0//EN"
+                        "http://www.netbeans.org/dtds/module-status-1_0.dtd">
+<module name="org.netbeans.modules.profiler.nbimpl">
+    <param name="autoload">false</param>
+    <param name="eager">false</param>
+    <param name="enabled">false</param>
+    <param name="jar">modules/org-netbeans-modules-profiler-nbimpl.jar</param>
+    <param name="reloadable">false</param>
+</module>
diff --git a/dev-util/visualvm/files/org-netbeans-modules-profiler-options.xml b/dev-util/visualvm/files/org-netbeans-modules-profiler-options.xml
new file mode 100644
index 000000000000..d56b0c8fe32a
--- /dev/null
+++ b/dev-util/visualvm/files/org-netbeans-modules-profiler-options.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC "-//NetBeans//DTD Module Status 1.0//EN"
+                        "http://www.netbeans.org/dtds/module-status-1_0.dtd">
+<module name="org.netbeans.modules.profiler.options">
+    <param name="autoload">false</param>
+    <param name="eager">false</param>
+    <param name="enabled">false</param>
+    <param name="jar">modules/org-netbeans-modules-profiler-options.jar</param>
+    <param name="reloadable">false</param>
+</module>
diff --git a/dev-util/visualvm/files/org-netbeans-modules-profiler-oql-language.xml b/dev-util/visualvm/files/org-netbeans-modules-profiler-oql-language.xml
new file mode 100644
index 000000000000..0ba0c5aa0660
--- /dev/null
+++ b/dev-util/visualvm/files/org-netbeans-modules-profiler-oql-language.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC "-//NetBeans//DTD Module Status 1.0//EN"
+                        "http://www.netbeans.org/dtds/module-status-1_0.dtd">
+<module name="org.netbeans.modules.profiler.oql.language">
+    <param name="autoload">false</param>
+    <param name="eager">false</param>
+    <param name="enabled">false</param>
+    <param name="jar">modules/org-netbeans-modules-profiler-oql-language.jar</param>
+    <param name="reloadable">false</param>
+</module>
diff --git a/dev-util/visualvm/files/visualvm.conf b/dev-util/visualvm/files/visualvm.conf
new file mode 100644
index 000000000000..117e25436e8d
--- /dev/null
+++ b/dev-util/visualvm/files/visualvm.conf
@@ -0,0 +1,8 @@
+# Default user directory
+visualvm_default_userdir="${HOME}/.visualvm"
+
+# Default runtime options
+visualvm_default_options="-J-Dnetbeans.logger.console=true -J-ea -J-client -J-Xms24m -J-Xmx256m -J-Dnetbeans.accept_license_class=com.sun.tools.visualvm.modules.startup.AcceptLicense -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.d3d=false"
+
+# JDK home
+visualvm_jdkhome="$(java-config -O)"
diff --git a/dev-util/visualvm/files/visualvm.sh b/dev-util/visualvm/files/visualvm.sh
new file mode 100644
index 000000000000..d26306a9ac37
--- /dev/null
+++ b/dev-util/visualvm/files/visualvm.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# source the configuration file
+source /etc/visualvm/visualvm.conf
+
+# if visualvm userdir does not exist, create it and put in the default module configuration
+# so that user does not face warning that some (unneeded) modules were not found
+if [ ! -e "${visualvm_default_userdir}" ] ; then
+	mkdir -p "${visualvm_default_userdir}/config/Modules"
+	cp /usr/share/visualvm/config/* "${visualvm_default_userdir}/config/Modules/"
+fi
+
+# launch visualvm
+/usr/share/netbeans-platform-8.0/lib/nbexec --jdkhome ${visualvm_jdkhome} --userdir ${visualvm_default_userdir} \
+	--branding visualvm --clusters /usr/share/visualvm/cluster:/usr/share/netbeans-platform-8.0:/usr/share/netbeans-profiler-8.0 \
+	${visualvm_default_options}
diff --git a/dev-util/visualvm/visualvm-1.3.3-r1.ebuild b/dev-util/visualvm/visualvm-1.3.3-r1.ebuild
deleted file mode 100644
index 0632da77daa3..000000000000
--- a/dev-util/visualvm/visualvm-1.3.3-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/visualvm/visualvm-1.3.3-r1.ebuild,v 1.3 2014/08/10 21:29:54 slyfox Exp $
-
-EAPI="4"
-
-inherit autotools eutils
-
-VISUALVM_PKG="visualvm_harness-1.3"
-VISUALVM_TARBALL="visualvm_133-src.tar.gz"
-NETBEANS_PROFILER_TARBALL="netbeans-profiler-visualvm_release701.tar.gz"
-
-DESCRIPTION="Integrates commandline JDK tools and profiling capabilites"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_URI="
-	http://icedtea.classpath.org/download/visualvm/${VISUALVM_PKG}.tar.gz
-	http://icedtea.classpath.org/download/visualvm/${VISUALVM_TARBALL}
-	http://icedtea.classpath.org/download/visualvm/${NETBEANS_PROFILER_TARBALL}"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="6"
-KEYWORDS="~amd64"
-IUSE=""
-
-COMMON_DEP="
-	dev-java/icedtea:${SLOT}
-	dev-util/netbeans:7.0"
-RDEPEND="${COMMON_DEP}"
-DEPEND="${COMMON_DEP}
-	dev-java/ant-core
-	dev-java/ant-nodeps"
-
-S="${WORKDIR}/${VISUALVM_PKG}"
-
-src_unpack() {
-	unpack ${VISUALVM_PKG}.tar.gz
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/netbeans-platform-version.patch
-	eautoreconf
-
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
-	export ANT_RESPECT_JAVA_HOME=TRUE
-	export ANT_TASKS=ant-nodeps
-}
-
-src_configure() {
-	local vmhome=`get_vmhome`
-
-	econf NB_PLATFORM=platform \
-		--bindir="${vmhome}"/bin \
-		--libdir="${vmhome}"/lib \
-		--sysconfdir="${vmhome}"/lib/visualvm/etc \
-		--with-netbeans-profiler-zip="${DISTDIR}"/${NETBEANS_PROFILER_TARBALL} \
-		--with-visualvm-zip="${DISTDIR}"/${VISUALVM_TARBALL} \
-		--with-visualvm-version=${PV} \
-		--with-netbeans-home="${EPREFIX}"/usr/share/netbeans-nb-7.0 \
-		--with-jdk-home="${vmhome}"
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	# Don't install default .desktop, file collision.
-	local vmhome=`get_vmhome`
-	rm -rf "${ED}"/usr/share
-	make_desktop_entry "${vmhome}/bin/jvisualvm" "OpenJDK ${SLOT} VisualVM" "java" "Development;Java;"
-}
-
-get_vmhome() {
-	local vmhandle=icedtea-${SLOT}
-	has_version "<=dev-java/icedtea-6.1.10.4:6" && vmhandle=icedtea6
-
-	local vmhome
-	vmhome="$(GENTOO_VM=${vmhandle} java-config -O)" || die
-
-	echo "${vmhome}"
-}
diff --git a/dev-util/visualvm/visualvm-1.3.3-r2.ebuild b/dev-util/visualvm/visualvm-1.3.3-r2.ebuild
deleted file mode 100644
index 15b8ce804990..000000000000
--- a/dev-util/visualvm/visualvm-1.3.3-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/visualvm/visualvm-1.3.3-r2.ebuild,v 1.2 2014/08/10 21:29:54 slyfox Exp $
-
-EAPI="4"
-
-inherit eutils autotools
-
-VISUALVM_PKG="visualvm_harness-1.3"
-VISUALVM_TARBALL="visualvm_133-src.tar.gz"
-NETBEANS_PROFILER_TARBALL="netbeans-profiler-visualvm_release701.tar.gz"
-
-DESCRIPTION="Integrates commandline JDK tools and profiling capabilites"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_URI="
-	http://icedtea.classpath.org/download/visualvm/${VISUALVM_PKG}.tar.gz
-	http://icedtea.classpath.org/download/visualvm/${VISUALVM_TARBALL}
-	http://icedtea.classpath.org/download/visualvm/${NETBEANS_PROFILER_TARBALL}"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="6"
-KEYWORDS="~amd64"
-IUSE=""
-
-COMMON_DEP="
-	dev-java/icedtea:${SLOT}
-	dev-java/netbeans-harness:7.1
-	dev-java/netbeans-platform:7.1"
-RDEPEND="${COMMON_DEP}"
-DEPEND="${COMMON_DEP}
-	dev-java/ant-core
-	dev-java/ant-nodeps"
-
-S="${WORKDIR}/${VISUALVM_PKG}"
-
-src_unpack() {
-	unpack ${VISUALVM_PKG}.tar.gz
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/netbeans-platform-version.patch
-	eautoreconf
-
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
-	export ANT_RESPECT_JAVA_HOME=TRUE
-	export ANT_TASKS=ant-nodeps
-}
-
-src_configure() {
-	local vmhome
-	vmhome=$(get_vmhome) || die
-
-	econf NB_PLATFORM=platform \
-		--bindir="${vmhome}"/bin \
-		--libdir="${vmhome}"/lib \
-		--sysconfdir="${vmhome}"/lib/visualvm/etc \
-		--with-netbeans-profiler-zip="${DISTDIR}"/${NETBEANS_PROFILER_TARBALL} \
-		--with-visualvm-zip="${DISTDIR}"/${VISUALVM_TARBALL} \
-		--with-visualvm-version=${PV} \
-		--with-netbeans-home="${EPREFIX}"/usr/share/netbeans-nb-7.1 \
-		--with-jdk-home="${vmhome}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# Don't install default .desktop, file collision.
-	local vmhome
-	vmhome=$(get_vmhome) || die
-	rm -r "${ED}"/usr/share || die
-	make_desktop_entry "${vmhome}/bin/jvisualvm" "OpenJDK ${SLOT} VisualVM" "java" "Development;Java;"
-}
-
-get_vmhome() {
-	local vmhandle=icedtea-${SLOT}
-	has_version "<=dev-java/icedtea-6.1.10.4:6" && vmhandle=icedtea6
-
-	local vmhome
-	vmhome="$(GENTOO_VM=${vmhandle} java-config -O)" || return 1
-
-	echo "${vmhome}"
-}
diff --git a/dev-util/visualvm/visualvm-1.3.3-r8.ebuild b/dev-util/visualvm/visualvm-1.3.3-r8.ebuild
deleted file mode 100644
index 883a66281078..000000000000
--- a/dev-util/visualvm/visualvm-1.3.3-r8.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/visualvm/visualvm-1.3.3-r8.ebuild,v 1.3 2014/08/10 21:29:54 slyfox Exp $
-
-EAPI="4"
-
-inherit autotools eutils
-
-VISUALVM_PKG="visualvm_harness-1.3"
-VISUALVM_TARBALL="visualvm_133-src.tar.gz"
-NETBEANS_PROFILER_TARBALL="netbeans-profiler-visualvm_release701.tar.gz"
-
-DESCRIPTION="Integrates commandline JDK tools and profiling capabilites"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_URI="
-	http://icedtea.classpath.org/download/visualvm/${VISUALVM_PKG}.tar.gz
-	http://icedtea.classpath.org/download/visualvm/${VISUALVM_TARBALL}
-	http://icedtea.classpath.org/download/visualvm/${NETBEANS_PROFILER_TARBALL}"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="7"
-KEYWORDS="~amd64"
-IUSE=""
-
-COMMON_DEP="
-	dev-java/icedtea:${SLOT}
-	dev-util/netbeans:7.0"
-RDEPEND="${COMMON_DEP}"
-DEPEND="${COMMON_DEP}
-	dev-java/ant-core
-	dev-java/ant-nodeps"
-
-S="${WORKDIR}/${VISUALVM_PKG}"
-
-src_unpack() {
-	unpack ${VISUALVM_PKG}.tar.gz
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/netbeans-platform-version.patch
-	eautoreconf
-
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
-	export ANT_RESPECT_JAVA_HOME=TRUE
-	export ANT_TASKS=ant-nodeps
-}
-
-src_configure() {
-	local vmhome=`get_vmhome`
-
-	econf NB_PLATFORM=platform \
-		--bindir="${vmhome}"/bin \
-		--libdir="${vmhome}"/lib \
-		--sysconfdir="${vmhome}"/lib/visualvm/etc \
-		--with-netbeans-profiler-zip="${DISTDIR}"/${NETBEANS_PROFILER_TARBALL} \
-		--with-visualvm-zip="${DISTDIR}"/${VISUALVM_TARBALL} \
-		--with-visualvm-version=${PV} \
-		--with-netbeans-home="${EPREFIX}"/usr/share/netbeans-nb-7.0 \
-		--with-jdk-home="${vmhome}"
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	# Don't install default .desktop, file collision.
-	local vmhome=`get_vmhome`
-	rm -rf "${ED}"/usr/share
-	make_desktop_entry "${vmhome}/bin/jvisualvm" "OpenJDK ${SLOT} VisualVM" "java" "Development;Java;"
-}
-
-get_vmhome() {
-	local vmhandle=icedtea-${SLOT}
-	has_version "<=dev-java/icedtea-6.1.10.4:6" && vmhandle=icedtea6
-
-	local vmhome
-	vmhome="$(GENTOO_VM=${vmhandle} java-config -O)" || die
-
-	echo "${vmhome}"
-}
diff --git a/dev-util/visualvm/visualvm-1.3.3-r9.ebuild b/dev-util/visualvm/visualvm-1.3.3-r9.ebuild
deleted file mode 100644
index ff2a61df2212..000000000000
--- a/dev-util/visualvm/visualvm-1.3.3-r9.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/visualvm/visualvm-1.3.3-r9.ebuild,v 1.2 2014/08/10 21:29:54 slyfox Exp $
-
-EAPI="4"
-
-inherit eutils autotools
-
-VISUALVM_PKG="visualvm_harness-1.3"
-VISUALVM_TARBALL="visualvm_133-src.tar.gz"
-NETBEANS_PROFILER_TARBALL="netbeans-profiler-visualvm_release701.tar.gz"
-
-DESCRIPTION="Integrates commandline JDK tools and profiling capabilites"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_URI="
-	http://icedtea.classpath.org/download/visualvm/${VISUALVM_PKG}.tar.gz
-	http://icedtea.classpath.org/download/visualvm/${VISUALVM_TARBALL}
-	http://icedtea.classpath.org/download/visualvm/${NETBEANS_PROFILER_TARBALL}"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="7"
-KEYWORDS="~amd64"
-IUSE=""
-
-COMMON_DEP="
-	dev-java/icedtea:${SLOT}
-	dev-java/netbeans-harness:7.1
-	dev-java/netbeans-platform:7.1"
-RDEPEND="${COMMON_DEP}"
-DEPEND="${COMMON_DEP}
-	dev-java/ant-core
-	dev-java/ant-nodeps"
-
-S="${WORKDIR}/${VISUALVM_PKG}"
-
-src_unpack() {
-	unpack ${VISUALVM_PKG}.tar.gz
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/netbeans-platform-version.patch
-	eautoreconf
-
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
-	export ANT_RESPECT_JAVA_HOME=TRUE
-	export ANT_TASKS=ant-nodeps
-}
-
-src_configure() {
-	local vmhome
-	vmhome=$(get_vmhome) || die
-
-	econf NB_PLATFORM=platform \
-		--bindir="${vmhome}"/bin \
-		--libdir="${vmhome}"/lib \
-		--sysconfdir="${vmhome}"/lib/visualvm/etc \
-		--with-netbeans-profiler-zip="${DISTDIR}"/${NETBEANS_PROFILER_TARBALL} \
-		--with-visualvm-zip="${DISTDIR}"/${VISUALVM_TARBALL} \
-		--with-visualvm-version=${PV} \
-		--with-netbeans-home="${EPREFIX}"/usr/share/netbeans-nb-7.1 \
-		--with-jdk-home="${vmhome}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# Don't install default .desktop, file collision.
-	local vmhome
-	vmhome=$(get_vmhome) || die
-	rm -r "${ED}"/usr/share || die
-	make_desktop_entry "${vmhome}/bin/jvisualvm" "OpenJDK ${SLOT} VisualVM" "java" "Development;Java;"
-}
-
-get_vmhome() {
-	local vmhandle=icedtea-${SLOT}
-	has_version "<=dev-java/icedtea-6.1.10.4:6" && vmhandle=icedtea6
-
-	local vmhome
-	vmhome="$(GENTOO_VM=${vmhandle} java-config -O)" || return 1
-
-	echo "${vmhome}"
-}
diff --git a/dev-util/visualvm/visualvm-1.3.8.ebuild b/dev-util/visualvm/visualvm-1.3.8.ebuild
new file mode 100644
index 000000000000..748be84358ca
--- /dev/null
+++ b/dev-util/visualvm/visualvm-1.3.8.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/visualvm/visualvm-1.3.8.ebuild,v 1.1 2015/02/05 18:05:25 fordfrog Exp $
+
+EAPI="5"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Integrates commandline JDK tools and profiling capabilites"
+HOMEPAGE="http://visualvm.java.net/"
+SRC_URI="https://java.net/downloads/visualvm/release138/visualvm_138-src.tar.gz"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="7"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEP="
+	>=virtual/jdk-1.7
+	dev-java/netbeans-platform:8.0
+	dev-java/netbeans-platform:8.0"
+RDEPEND="${COMMON_DEP}"
+DEPEND="${COMMON_DEP}
+	dev-java/netbeans-harness:8.0"
+
+S="${WORKDIR}/visualvm"
+INSTALL_DIR=/usr/share/${PN}
+
+EANT_BUILD_TARGET="build"
+
+src_prepare() {
+	mkdir "${S}/netbeans" || die "Failed to create netbeans directory"
+	ln -s /usr/share/netbeans-harness-8.0 "${S}/netbeans/harness" || die "Failed to symlink harness"
+	ln -s /usr/share/netbeans-platform-8.0 "${S}/netbeans/platform" || die "Failed to symlink platform"
+	ln -s /usr/share/netbeans-profiler-8.0 "${S}/netbeans/profiler" || die "Failed to symlink profiler"
+}
+
+src_install() {
+	# this is the visualvm cluster
+	insinto ${INSTALL_DIR}
+	doins -r "${S}/build/cluster"
+
+	# these are netbeans platform configuration files that prevent display of missing modules during startup
+	insinto ${INSTALL_DIR}/config
+	doins "${FILESDIR}"/org-netbeans-modules-profiler-*.xml
+
+	# configuration file that can be used to tweak visualvm startup parameters
+	insinto /etc/visualvm
+	doins "${FILESDIR}/visualvm.conf"
+
+	# visualvm runtime script
+	into ${INSTALL_DIR}
+	dobin "${FILESDIR}/visualvm.sh"
+	fperms 755 ${INSTALL_DIR}/bin/visualvm.sh
+	dosym ${INSTALL_DIR}/bin/visualvm.sh /usr/bin/visualvm
+
+	# makes visualvm entry
+	make_desktop_entry "/usr/bin/visualvm" "VisualVM" "java" "Development;Java;"
+}