public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-platform/, dev-java/netbeans-java/, dev-java/netbeans-extide/, ...
@ 2016-07-11  7:55 Miroslav Šulc
  0 siblings, 0 replies; only message in thread
From: Miroslav Šulc @ 2016-07-11  7:55 UTC (permalink / raw
  To: gentoo-commits

commit:     0a79834b4eaf699cc84bc258fe1d7684e1a09b08
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 11 06:24:03 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Jul 11 06:24:03 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=0a79834b

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.3.0

 dev-java/netbeans-apisupport/Manifest              |   2 -
 .../netbeans-apisupport-9999_p20160610.ebuild      | 111 ------
 dev-java/netbeans-cnd/Manifest                     |   2 -
 .../netbeans-cnd-9999_p20160610.ebuild             | 127 -------
 dev-java/netbeans-dlight/Manifest                  |   2 -
 .../netbeans-dlight-9999_p20160610.ebuild          | 101 ------
 dev-java/netbeans-enterprise/Manifest              |   2 -
 .../netbeans-enterprise-9999_p20160610.ebuild      | 266 --------------
 dev-java/netbeans-ergonomics/Manifest              |   2 -
 .../netbeans-ergonomics-9999_p20160610.ebuild      | 101 ------
 dev-java/netbeans-extide/Manifest                  |   2 -
 .../netbeans-extide-9999_p20160610.ebuild          | 108 ------
 dev-java/netbeans-groovy/Manifest                  |   2 -
 .../netbeans-groovy-9999_p20160610.ebuild          | 111 ------
 dev-java/netbeans-harness/Manifest                 |   2 -
 .../netbeans-harness-9999_p20160610.ebuild         | 114 ------
 dev-java/netbeans-ide/Manifest                     |   2 -
 .../netbeans-ide-9999_p20160610.ebuild             | 382 ---------------------
 dev-java/netbeans-java/Manifest                    |   2 -
 .../netbeans-java-9999_p20160610.ebuild            | 280 ---------------
 dev-java/netbeans-javacard/Manifest                |   2 -
 .../netbeans-javacard-9999_p20160610.ebuild        | 134 --------
 dev-java/netbeans-javadoc/Manifest                 |   2 -
 .../netbeans-javadoc-9999_p20160610.ebuild         | 168 ---------
 dev-java/netbeans-javafx/Manifest                  |   2 -
 .../netbeans-javafx-9999_p20160610.ebuild          | 124 -------
 dev-java/netbeans-mobility/Manifest                |   2 -
 .../netbeans-mobility-9999_p20160610.ebuild        | 126 -------
 dev-java/netbeans-nb/Manifest                      |   2 -
 .../netbeans-nb/netbeans-nb-9999_p20160610.ebuild  | 128 -------
 dev-java/netbeans-php/Manifest                     |   2 -
 .../netbeans-php-9999_p20160610.ebuild             | 127 -------
 dev-java/netbeans-platform/Manifest                |   2 -
 .../netbeans-platform-9999_p20160610.ebuild        | 167 ---------
 dev-java/netbeans-profiler/Manifest                |   2 -
 .../netbeans-profiler-9999_p20160610.ebuild        | 121 -------
 dev-java/netbeans-webcommon/Manifest               |   2 -
 .../netbeans-webcommon-9999_p20160610.ebuild       | 124 -------
 dev-java/netbeans-websvccommon/Manifest            |   2 -
 .../netbeans-websvccommon-9999_p20160610.ebuild    |  94 -----
 dev-util/netbeans/Manifest                         |   2 -
 dev-util/netbeans/netbeans-9999_p20160610.ebuild   | 254 --------------
 42 files changed, 3310 deletions(-)

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index bcb13b4..9c3c0d8 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606100002-src.zip 215705826 SHA256 dc5bf896c73c9956c9f2d60fc999a041fe9a240daf2248e7a0ea26f3b12045c6 SHA512 bf3872a0ce352291ae2d36bb25fdfbaf5e403002c9ed21292451d6bbb4cddb34c120bba13481311217624b2628d4ef767731fb8c2ee8b54ef915078b647c6388 WHIRLPOOL 62f4833a881cd3f6be65268501981ace9edea20866e38019f26f89d3afdfe625b9934bf0344301c329326bbaebdf02a9c96653c510019768f5074fabb85568cc
 DIST netbeans-trunk-nightly-201606130002-src.zip 215706858 SHA256 1bb9ee5b464b0dae349efe93a2fe5628088015c7bb44f253070cba81d5542fda SHA512 d3e676034a9fa22fa3fed978c49da5d5ec66d1845a95fc2f2f600174f7af0386be87f449df3a99ce60b150fd65c22b7da9c0c588d3d92ffef10ddf05462fe65d WHIRLPOOL 7286ddcb1933236d02205c3cc3044ad5a9c0cec2fae68ae47bf4ddcb33fc801d560d5abb3c1f3b86fffab1c221833fa8f228efcb1c4db6703ea3118664c1b292
 DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
@@ -29,7 +28,6 @@ DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
 EBUILD netbeans-apisupport-8.0.2.ebuild 3314 SHA256 b68fe791f275fe4fcc8b00888688949b8927cb39db2cf9ad7860017c6d20adee SHA512 35c4bbcd34ec0eaef8a2de86c13333d2bf092db61af48558c3e173bb17dbf8fcd15001307bd7c498f4ccdbaa4277e1ee42ff0909af6170039165b547f646c383 WHIRLPOOL 206fe8d5f64e76827d3eb958a629ba087e8a16c2797752f5d9e62dff4166653677587a81be19e0a2c6adcf49292255d532e1f542c02550b1cf6ffd51467bde3c
 EBUILD netbeans-apisupport-8.1.ebuild 3338 SHA256 d249a09cd1a527bfc4f0dc87b1768aad9f05fc7fe7079fad0094c27d416d030c SHA512 47e5db58581625b23157ef7a7b6e340fce1327db85e015369ac32791178a0836af3348397ac6ff4439ab246170d3318c2062994c81019ff361084f00d432c9c8 WHIRLPOOL 8e379c9219b7730a15c10216bed00c3ec104f84b252d32da629f066095897398a4d8818e07cda5afdf94b115b97ead8de6a9529f38c81c1c41144067f119e54e
-EBUILD netbeans-apisupport-9999_p20160610.ebuild 3384 SHA256 202f688a3a87144ffe990d520586c4eddeadb60683634defb0e2576318954bc2 SHA512 38c97af8b81b8d0ca6ec3b81f02f9164bdf9d0532ba7b7708a78eb6f71f4178ddb11f1408ed12eefa4cf9826c615d123b86be29bd2a1eeb22d7f9a45fbf31aa3 WHIRLPOOL f9a907b6e8052b4a142de7225e5dd3f966c8f9266bbe5f137bf7bd1b6d14e6495e9256acef0cdfc70077d795cf10f1be6984cea796bfb7bee3cb082449cfbbf1
 EBUILD netbeans-apisupport-9999_p20160613.ebuild 3384 SHA256 9416630550f93aaae1708f2464dd29f80cad8ca4df03fb96739c4b63d48bf2ac SHA512 0518812e04b2d4bc629d3773c64c6b857948f3dbe3f0de5b31b12fe8f48e84c3ae91925292e2beb077f2a4896e038c5e2b51b89c09d049355f2f74b3bab792c0 WHIRLPOOL 68049ea44a459bfc6a4789df2696f9ca60435ea8b72276a5fbae7fe2532f2617adf12d08c68eebdea3a45d5fb5202f2b6fd9351a66c823420303e2432f59310f
 EBUILD netbeans-apisupport-9999_p20160614.ebuild 3384 SHA256 dbe70b440097697475f0437a79bd2e49084ed5ef06b83942923c9644c77397df SHA512 170f9342d1ac1fb191c99b726f489c18c88c74695fdf2687c9259e86e8ffdae7ec6afb2ab38d4f8ba9460177352f51b2650d52e051a5b136cf389c325b362986 WHIRLPOOL 191e8b000a1f0383d4100e3cb3f0f7f1866550b5a27707174b6b9f676a84927e9515385c98f586a9356ac45646ac06fd580bc487b34688d0c7634351c4a8998c
 EBUILD netbeans-apisupport-9999_p20160615.ebuild 3384 SHA256 de31ccbcdeeba9d8d40a157baa24b6dd6ca5225e548bea0a8cbe266f6d55d2f7 SHA512 22c669ec757606e538630f99d779c2bb36bc72776352a64a53446ab5cbad913851996e72edd770d58e5657a5805ea5a1b49c29bf4b3359c4c7085dbec3d229be WHIRLPOOL 3c9998371f14697acdc37052ab4b2046e2d9b25e2db3860fd4f901bef2c2f44c45ceeb01fc927bd0fe6d0a5f82423c9c713a10bfec73954e09e0d962f1713f9e

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160610.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160610.ebuild
deleted file mode 100644
index b2e9994..0000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160610.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans API Support Cluster"
-HOMEPAGE="http://netbeans.org/projects/apisupport"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-10_00-02-33/zip/netbeans-trunk-nightly-201606100002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.apisupport -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/apisupport >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/apisupport$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/apisupport
-}

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index c29dd84..88f3fab 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -16,7 +16,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606100002-src.zip 215705826 SHA256 dc5bf896c73c9956c9f2d60fc999a041fe9a240daf2248e7a0ea26f3b12045c6 SHA512 bf3872a0ce352291ae2d36bb25fdfbaf5e403002c9ed21292451d6bbb4cddb34c120bba13481311217624b2628d4ef767731fb8c2ee8b54ef915078b647c6388 WHIRLPOOL 62f4833a881cd3f6be65268501981ace9edea20866e38019f26f89d3afdfe625b9934bf0344301c329326bbaebdf02a9c96653c510019768f5074fabb85568cc
 DIST netbeans-trunk-nightly-201606130002-src.zip 215706858 SHA256 1bb9ee5b464b0dae349efe93a2fe5628088015c7bb44f253070cba81d5542fda SHA512 d3e676034a9fa22fa3fed978c49da5d5ec66d1845a95fc2f2f600174f7af0386be87f449df3a99ce60b150fd65c22b7da9c0c588d3d92ffef10ddf05462fe65d WHIRLPOOL 7286ddcb1933236d02205c3cc3044ad5a9c0cec2fae68ae47bf4ddcb33fc801d560d5abb3c1f3b86fffab1c221833fa8f228efcb1c4db6703ea3118664c1b292
 DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
@@ -42,7 +41,6 @@ DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
 EBUILD netbeans-cnd-8.0.2.ebuild 4510 SHA256 0a9a4e58e28f395b5bcb017016b6ddb1b77afe393d0e5bd81cc05e3a32076c71 SHA512 2b1fedfe292fa140920fd11829e77127f9535e08b8307886accfa37e6d11195a1204e6b71b2640937da0711c3ce0bbf80c0eaa3c248a64fd61b6a3d99d5de14e WHIRLPOOL 10b1518360ade5d6f1f27c79a10f630b94a2ec5062e18df11f9828d4b374e6cbdea0b9f770e01c117ca90fa194dff9bd3be6a468075c2d35167fb78a7bb32794
 EBUILD netbeans-cnd-8.1.ebuild 4744 SHA256 e008e92761489558e039a07d4858b5a9745aa38c38c57668cba8b5f6a28dbd9b SHA512 724af3f292851fa1a04ccc95fe0a4f9d0fab5503ce31d2ff11be73779d67bd0f38835b334684f628f8eea2dde44543e6b872611b2bd6c01191ccfe26e69f4ec2 WHIRLPOOL 59ddd65a105dafeb8b783f457ec7a8c67a5a3aceb78ca60ac7c4f45f330b28b429ba6236a643ca0023189a9ebdb1ca0182ec0546943ec2494693859aa8f95515
-EBUILD netbeans-cnd-9999_p20160610.ebuild 4790 SHA256 1e59b0f9a780e82bbf0e4ae2d5fafdcf2fe11fe361ea0abb7f49dcd56de38e16 SHA512 6e96177ddd523927ef7f6abc1088c1ab7c3c9019eeba9c4189ae638fd6bbb8e4b412cc0c83afda9a13c41250d09f5d64ab444bfc32d544d1b48e8ad15f969da1 WHIRLPOOL c117f9ecfe24ae7743d642409e5389afb75c953535a6c01dde9cb113e2cdc95297a62aa3cce3d9605957c57c2b19e425b24eeff3241d2701e31a4271b4815a06
 EBUILD netbeans-cnd-9999_p20160613.ebuild 4790 SHA256 0e11e1c172fba8176220ed0dadf8517c182cb19470740d51d67b6adb65701945 SHA512 a5ef7baa5446ae274ef3e9cc77094422d80e6cd5205cb5152451a304ce350a3ee13a70365b4c8eedef0f9bce5f39949558b9b5c114892c08e9f42e4914c1213d WHIRLPOOL d98fd4ee5875751951c33fa3246f542d4023b583d7e2d5b08e996d3a4a2c1082e5b9571445f6738a566699c53f771d1d03d9ca089053f5b679fa1b40b0ef6831
 EBUILD netbeans-cnd-9999_p20160614.ebuild 4790 SHA256 f910b56ea3f91aa0fb754e8299f13e6631bd18da7fc8e9c3f00831b89a0df2f0 SHA512 7b45e035b786cf35794cbb0c85c86093059a7e2c92b34d9e971ce000e115de24ca4406e251cd0ffff4595db77cded21fafa1b97145cec498e90de36987d3f734 WHIRLPOOL fea295483894adf1bab479af2bab61fd2e3e39178a830f11dbe9344d3f7a3c1824ce6c2d6ef8572864330650cb6bde24f74ad06de9fb9a92a2fe9428c916f189
 EBUILD netbeans-cnd-9999_p20160615.ebuild 4790 SHA256 38f8572e229753c2eabed5ff296b679373810d8e323042e8d49e24085cbd3bb6 SHA512 415b919ee8c2b67260497f46ff2ab743651869cdef9ca572c1560b6a18e8cd5593b96c72c501d235817231e575dcb5c90e6073cf6a645396e334acf39b210779 WHIRLPOOL 65a20532a537e9d5901188a73797c14f554437c113ce0c2e1ea9d20862bc1eb13df54110c395c03d2d003d0acf364cad0e4578ff69da0f7548ad5197475840d8

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160610.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160610.ebuild
deleted file mode 100644
index 8a2f540..0000000
--- a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160610.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans CND Cluster"
-HOMEPAGE="http://netbeans.org/projects/cnd"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-10_00-02-33/zip/netbeans-trunk-nightly-201606100002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar
-	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
-	http://hg.netbeans.org/binaries/85FD13415B0553D6421F4BBA5FE0F587B9748B20-clank_0.3.6.zip
-	http://hg.netbeans.org/binaries/43A82EB3CE61B9B0B1C60586C7D84729BD5BE3E0-cnd-build-trace-1.0.zip
-	http://hg.netbeans.org/binaries/E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip
-	http://hg.netbeans.org/binaries/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-# These files are for remote development and debugging
-QA_PREBUILT="usr/share/netbeans-cnd-${SLOT}/bin/*"
-
-CDEPEND="~dev-java/netbeans-dlight-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	>=dev-java/jna-3.4.0
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.cnd -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar libs.antlr3.devel/external/antlr-3.4.jar || die
-	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
-	ln -s "${DISTDIR}"/85FD13415B0553D6421F4BBA5FE0F587B9748B20-clank_0.3.6.zip libs.clank/external/clank_0.3.6.zip || die
-	ln -s "${DISTDIR}"/43A82EB3CE61B9B0B1C60586C7D84729BD5BE3E0-cnd-build-trace-1.0.zip cnd.discovery/external/cnd-build-trace-1.0.zip || die
-	ln -s "${DISTDIR}"/E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip cnd.remote/external/cnd-rfs-1.0.zip || die
-	ln -s "${DISTDIR}"/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip cnd.modelimpl/external/open-fortran-parser-0.7.1.2.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --build-only --into libs.jna/external jna jna.jar jna-4.2.2.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-dlight-${SLOT} dlight || die
-	cat /usr/share/netbeans-dlight-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.dlight.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/cnd >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/cnd$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	fperms 755 bin/dorun.sh
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/cnd
-}

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index f01ad56..f9f755c 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606100002-src.zip 215705826 SHA256 dc5bf896c73c9956c9f2d60fc999a041fe9a240daf2248e7a0ea26f3b12045c6 SHA512 bf3872a0ce352291ae2d36bb25fdfbaf5e403002c9ed21292451d6bbb4cddb34c120bba13481311217624b2628d4ef767731fb8c2ee8b54ef915078b647c6388 WHIRLPOOL 62f4833a881cd3f6be65268501981ace9edea20866e38019f26f89d3afdfe625b9934bf0344301c329326bbaebdf02a9c96653c510019768f5074fabb85568cc
 DIST netbeans-trunk-nightly-201606130002-src.zip 215706858 SHA256 1bb9ee5b464b0dae349efe93a2fe5628088015c7bb44f253070cba81d5542fda SHA512 d3e676034a9fa22fa3fed978c49da5d5ec66d1845a95fc2f2f600174f7af0386be87f449df3a99ce60b150fd65c22b7da9c0c588d3d92ffef10ddf05462fe65d WHIRLPOOL 7286ddcb1933236d02205c3cc3044ad5a9c0cec2fae68ae47bf4ddcb33fc801d560d5abb3c1f3b86fffab1c221833fa8f228efcb1c4db6703ea3118664c1b292
 DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
 EBUILD netbeans-dlight-8.0.2.ebuild 2898 SHA256 08402481b573b90396431be03bda45904b2dd29f0086e09a111fe362e310c3f7 SHA512 3f6d6c9ea0043382562fbe47ad16e3273032407a74cb44ec7ff26736f96483835af4be8674361e910912a550b9fe592cc5a28c2b93b6b993076553195c35eac5 WHIRLPOOL 9d8706ccbc0d97b0f5d64ebf22c36316b08d8fbccd57408119ca5f5faef08c7f82677bf67488ff611eabeaa730e4c9a730c50966d94d738cfe79330ac147863d
 EBUILD netbeans-dlight-8.1.ebuild 2922 SHA256 f003a099e3f82f5ab53dcc56d86c00a662c98f47480feacac2a77ffea90ccd0f SHA512 94706ac4d8570deb8860236300cfeddfb2c3cbfd385ecb438a039991deeb018f292f6dbb2267d7c701b7f1b5b88d200f2c25696fb3204fcf205c15155b26d1fc WHIRLPOOL 1e44f40c8e2c03b7aa7385ef20a3247ea15a4d4705ce4b5f860bffe236eb578ab3d912f2cc2457e5906158ae747edc3b6b92463336c69af9cd58eca3fccb223d
-EBUILD netbeans-dlight-9999_p20160610.ebuild 2968 SHA256 885a9de9e6b778e11df3467269b9de715f26bfa4751137afe511f05b2a82cccc SHA512 377508b48337346da5ca8038d9a275cfdad09b6253f7cf5a6428ab5ddccd4fcceee9c1067cb4fb4f408a969ed99ea85fe8046a52669600d43f80264230f9e55a WHIRLPOOL d339b41a69a695c716c520dfca3f2e7b9721ff11d7498d28dcf9e46466189aa7ce105ee1ebf45f3c06790d8420a7673b3bd79999863a5b438b4538d0eafafc95
 EBUILD netbeans-dlight-9999_p20160613.ebuild 2968 SHA256 11e6bad1a8fb318d3fc74c3bfbbe3b973e5ccee211a3dd2549acb3873de25d4b SHA512 03575f33edaa1cd4f92e4a24040a4bcf383d1096bcadcd0f9fd334c8d8dbd6568a0d04e650193a9461407dff4bec50c7657bb269921639418292853451221453 WHIRLPOOL 30b9ca136b2a2d28cfbd13edbbdc9961542f91f25a2ef703d4bf78ffb8638e281eabb84dc3d6459b0540effd573c0b33cfd63a660fc23dba03cae05eb4f8ae06
 EBUILD netbeans-dlight-9999_p20160614.ebuild 2968 SHA256 d9fb867992793fee5e3b85f4ddb5cb978e3ac10769c027379bace490e21147e0 SHA512 a9fddb6baadb4a8de720821b224a14181e4e6c22f3a86762715084d350d3fadeffd3af5f1019acb8d0f3b3011985469b1959663203d12a1e520026c1b250761d WHIRLPOOL a97207fbc04bbd0be11bb873dce959dee17efe580ae9b2227c99dc5259d8c3d8679946ea85a047bba0a64720488a21e271410393a84c3f80e422f3a67d8354b7
 EBUILD netbeans-dlight-9999_p20160615.ebuild 2968 SHA256 13d25ae9bbe7ad583f2ce72c81401572196e7c1815e938d7cee740af7b2a9d03 SHA512 e2c9882371a4213af2b9a21c406e8cb2a466fdae19a2d009e21a5d87e1aea4f3acaea75feb0be54c7d4c9ddc0a865c21331385ec0a0cf016b88b234e4e7ec8fb WHIRLPOOL ec3edc855681661988eb21a0a5ef3f1a5eeeb556b63fff360e20f494a8f52a8753e7bb1724a9c45e87a3ec2ea9c3dc347039e7172c0b9361c3b75cc489cb2d10

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160610.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160610.ebuild
deleted file mode 100644
index d3928f1..0000000
--- a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160610.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans D-Light Cluster"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-10_00-02-33/zip/netbeans-trunk-nightly-201606100002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/0F89C62CA701D20BA9A9A526D4D017888C3B5A65-fs_server-1.0.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.dlight -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/0F89C62CA701D20BA9A9A526D4D017888C3B5A65-fs_server-1.0.zip dlight.remote.impl/external/fs_server-1.0.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/dlight >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/dlight$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/dlight
-}

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 741a7a4..7931ec8 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -35,7 +35,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606100002-src.zip 215705826 SHA256 dc5bf896c73c9956c9f2d60fc999a041fe9a240daf2248e7a0ea26f3b12045c6 SHA512 bf3872a0ce352291ae2d36bb25fdfbaf5e403002c9ed21292451d6bbb4cddb34c120bba13481311217624b2628d4ef767731fb8c2ee8b54ef915078b647c6388 WHIRLPOOL 62f4833a881cd3f6be65268501981ace9edea20866e38019f26f89d3afdfe625b9934bf0344301c329326bbaebdf02a9c96653c510019768f5074fabb85568cc
 DIST netbeans-trunk-nightly-201606130002-src.zip 215706858 SHA256 1bb9ee5b464b0dae349efe93a2fe5628088015c7bb44f253070cba81d5542fda SHA512 d3e676034a9fa22fa3fed978c49da5d5ec66d1845a95fc2f2f600174f7af0386be87f449df3a99ce60b150fd65c22b7da9c0c588d3d92ffef10ddf05462fe65d WHIRLPOOL 7286ddcb1933236d02205c3cc3044ad5a9c0cec2fae68ae47bf4ddcb33fc801d560d5abb3c1f3b86fffab1c221833fa8f228efcb1c4db6703ea3118664c1b292
 DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
@@ -61,7 +60,6 @@ DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
 EBUILD netbeans-enterprise-8.0.2-r1.ebuild 15075 SHA256 41d376117ad1d8d59c8194debfd29dc42f5fd4de70aee12a2134ec143a604dda SHA512 4cd9de88e9a401cc0be88e3e2605abc411c47307818376b2bcc00f9ae570b21324f2bf00fd83e819bfa076da0fb07811fa1f0f9362a6cd0ee05b63221a199000 WHIRLPOOL 73f4518c14430fe7aa3614ebf1b11a06ba0e9bce7479af2770db3a114f149d575a16a655218f757ed416b5149228ac56dac700f5a8d5e034cc838bfa4092e636
 EBUILD netbeans-enterprise-8.1-r1.ebuild 15888 SHA256 d4c04ccfee01a46819020cb7cf8fd8297618f3c0431ae2d9dd7eec8131f988ab SHA512 6c7c39c378cb79d3f382cb80d07710a8c5233aaf0df8fb58889ee6aa6bde73624efa6aa49b43f84105685094a7aff89e4b6367ffd1fd113da27b42d50d07e983 WHIRLPOOL e678e2a6957e428c1b6e51469c0e7cc6a08da2c797f1575b6bb660a7f3281c00f071179de459e27c983304915b005baaf94ad4fae0a4c08162f218bf53b7d821
-EBUILD netbeans-enterprise-9999_p20160610.ebuild 15825 SHA256 bb51f58dc003ea825a29378e8597fb974dcc7e77b1e63b1bd68d453649927a9f SHA512 3330212a607a24d0ea8dcce86ead6f398bb602b625f26b1cb36d2b8ba25d0b2d492ccb07122ba21e0700559ed71fd1d931ce9c9d005886e83ac584d2c0fc6f42 WHIRLPOOL e9148020ca43b3298730e29256ac49cbf6f5930c1f30f5fa9e3aa5562bdfe771be351e8372b1e4554a1124c3e463e4e7d88bef78f90ab5529bfabd1b17823096
 EBUILD netbeans-enterprise-9999_p20160613.ebuild 15825 SHA256 db8298c11c3aa38e73e76243a50349f807c07a5e7136b7f1ca283e6935026fa6 SHA512 2537fb7afc4e0e323af2ae82225872460eada3b20ab96544f4fa548961dc388e178be089bcb0f1d983259bb5bd79ecfe34bf8fdcba1c5027db62d93acfb6c6d8 WHIRLPOOL 556ed5ba19c0d7f2a58e484a76a1ef2e537a88ec77e0f2bc40ed86d4e0cbee61465bcc0c9d6b04c436a57a639d6e8b06d83afc7ea289caaf95284ad407c54945
 EBUILD netbeans-enterprise-9999_p20160614.ebuild 15825 SHA256 d45bebf7efdd045025a381bcedca4eda37cecdf22d691de1cd2e7977323ecb9c SHA512 cbd1cbb9c1dcd385ae77c37397b5c7fc5f127341ace488426f07652a480d42b538ce717149c8127de6f40993c45cd9be63b89b1435bff23e40c962e55b255f5d WHIRLPOOL f0f3c2622970c8a6096be2be4191a3fc3844c1ae06e48bb4b1e3de36d0f5576b4022a53cca6328298e5c76af0c8be28d1878ad53656f205c782cd81d0be15e96
 EBUILD netbeans-enterprise-9999_p20160615.ebuild 15825 SHA256 77130d68e119327f47c3e16278b052ac6e00ddc71921fe1908239d257bc08e4c SHA512 e075f331c8fa7e4b571b55a3b0fe38bc6a22936c427e4b021202c2b988636480afefe02a3090b8e674db16e7e2f6977fea8b71298a91d735ec801edf1607129a WHIRLPOOL de35a519d1ce77e7250d09db059f605bf056b43e8826309160f171c03f2c26131fc8cbcd653c20a157a57d993363853461c9dab68b3dad8bc5466d975e267992

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160610.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160610.ebuild
deleted file mode 100644
index d41f112..0000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160610.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Enterprise cluster"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-10_00-02-33/zip/netbeans-trunk-nightly-201606100002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar
-	http://hg.netbeans.org/binaries/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar
-	http://hg.netbeans.org/binaries/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar
-	http://hg.netbeans.org/binaries/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar
-	http://hg.netbeans.org/binaries/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar
-	http://hg.netbeans.org/binaries/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar
-	http://hg.netbeans.org/binaries/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar
-	http://hg.netbeans.org/binaries/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar
-	http://hg.netbeans.org/binaries/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar
-	http://hg.netbeans.org/binaries/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar
-	http://hg.netbeans.org/binaries/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar
-	http://hg.netbeans.org/binaries/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar
-	http://hg.netbeans.org/binaries/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar
-	http://hg.netbeans.org/binaries/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar
-	http://hg.netbeans.org/binaries/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar
-	http://hg.netbeans.org/binaries/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar
-	http://hg.netbeans.org/binaries/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip
-	http://hg.netbeans.org/binaries/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar
-	http://hg.netbeans.org/binaries/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip
-	http://hg.netbeans.org/binaries/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip
-	http://hg.netbeans.org/binaries/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip
-	http://hg.netbeans.org/binaries/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar
-	http://hg.netbeans.org/binaries/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar
-	http://hg.netbeans.org/binaries/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip
-	http://hg.netbeans.org/binaries/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip
-	http://hg.netbeans.org/binaries/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar
-	http://hg.netbeans.org/binaries/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar
-	http://hg.netbeans.org/binaries/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip
-	http://hg.netbeans.org/binaries/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip
-	http://hg.netbeans.org/binaries/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip
-	http://hg.netbeans.org/binaries/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-profiler-${PV}
-	~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-webcommon-${PV}
-	~dev-java/netbeans-websvccommon-${PV}
-	dev-java/commons-codec:0
-	dev-java/commons-fileupload:0
-	dev-java/commons-logging:0
-	dev-java/glassfish-deployment-api:1.2
-	dev-java/jsr181:0"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0
-	>=dev-java/junit-4.4:4
-	dev-java/tomcat-servlet-api:2.3"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}
-	>=dev-java/antlr-2.7.7-r7:0
-	dev-java/bsf:2.3
-	dev-java/cglib:3
-	dev-java/commons-beanutils:1.7
-	dev-java/commons-collections:0
-	dev-java/commons-digester:0
-	dev-java/commons-io:1
-	dev-java/commons-validator:0
-	dev-java/glassfish-persistence:0
-	dev-java/guava:14
-	dev-java/jakarta-oro:2.0
-	dev-java/osgi-core-api:0
-	dev-java/validation-api:1.0"
-#	dev-java/commons-chain:1.1 in overlay
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.enterprise -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar libs.amazon/external/aws-java-sdk-1.2.1.jar || die
-	ln -s "${DISTDIR}"/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar libs.elimpl/external/el-impl.jar || die
-	ln -s "${DISTDIR}"/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar web.jspparser/external/glassfish-jspparser-4.0.jar || die
-	ln -s "${DISTDIR}"/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar libs.glassfish_logging/external/glassfish-logging-2.0.jar || die
-	ln -s "${DISTDIR}"/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar libs.amazon/external/httpclient-4.1.1.jar || die
-	ln -s "${DISTDIR}"/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar libs.amazon/external/httpcore-4.1.jar || die
-	ln -s "${DISTDIR}"/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar javaee.api/external/javaee-api-6.0.jar || die
-	ln -s "${DISTDIR}"/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar javaee7.api/external/javaee-api-7.0.jar || die
-	ln -s "${DISTDIR}"/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar javaee.api/external/javaee-web-api-6.0.jar || die
-	ln -s "${DISTDIR}"/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar javaee7.api/external/javaee-web-api-7.0.jar || die
-	ln -s "${DISTDIR}"/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar j2ee.platform/external/javaee-doc-api.jar || die
-	ln -s "${DISTDIR}"/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar javaee.api/external/javax.annotation.jar || die
-	ln -s "${DISTDIR}"/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar javaee7.api/external/javax.annotation-api.jar || die
-	ln -s "${DISTDIR}"/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar javaee7.api/external/javax.xml.soap-api.jar || die
-	ln -s "${DISTDIR}"/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar javaee.api/external/jaxb-api-osgi.jar || die
-	ln -s "${DISTDIR}"/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar javaee7.api/external/jaxb-api-osgi.jar || die
-	ln -s "${DISTDIR}"/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip websvc.restlib/external/jaxrs-ri-2.5.1.zip || die
-	ln -s "${DISTDIR}"/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar javaee7.api/external/jaxws-api.jar || die
-	ln -s "${DISTDIR}"/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip web.jsf12/external/jsf-1.2.zip || die
-	ln -s "${DISTDIR}"/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip web.jsf20/external/jsf-2.2.zip || die
-	ln -s "${DISTDIR}"/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip web.jsf.editor/external/jsf-api-docs.zip || die
-	ln -s "${DISTDIR}"/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar libs.jstl/external/jstl-api.jar || die
-	ln -s "${DISTDIR}"/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar libs.jstl/external/jstl-impl.jar || die
-	ln -s "${DISTDIR}"/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip websvc.metro.lib/external/metro-1.4-doc.zip || die
-	ln -s "${DISTDIR}"/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip websvc.metro.lib/external/metro-2.0.zip || die
-	ln -s "${DISTDIR}"/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar web.primefaces/external/primefaces-5.0.jar || die
-	ln -s "${DISTDIR}"/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar servletjspapi/external/servlet3.1-jsp2.3-api.jar || die
-	ln -s "${DISTDIR}"/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip web.struts/external/struts-1.3.10-javadoc.zip || die
-	ln -s "${DISTDIR}"/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip web.struts/external/struts-1.3.10-lib.zip || die
-	ln -s "${DISTDIR}"/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip web.core.syntax/external/syntaxref20.zip || die
-	ln -s "${DISTDIR}"/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar javaee.api/external/webservices-api-osgi.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into j2eeapis/external glassfish-deployment-api-1.2 glassfish-deployment-api.jar jsr88javax.jar
-	java-pkg_jar-from --into libs.amazon/external commons-codec commons-codec.jar commons-codec-1.3.jar
-	java-pkg_jar-from --into libs.amazon/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
-	java-pkg_jar-from --into libs.commons_fileupload/external commons-fileupload commons-fileupload.jar commons-fileupload-1.3.jar
-	java-pkg_jar-from --into javaee7.api/external jsr181 jsr181.jar jsr181-api.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
-	java-pkg_jar-from --build-only --into web.monitor/external tomcat-servlet-api-2.3 servlet.jar servlet-2.3.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-profiler-${SLOT} profiler || die
-	cat /usr/share/netbeans-profiler-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.profiler.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-webcommon-${SLOT} webcommon || die
-	cat /usr/share/netbeans-webcommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.webcommon.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/enterprise >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/enterprise$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext
-	pushd "${instdir}" >/dev/null || die
-	rm commons-fileupload-1.3.jar && java-pkg_jar-from --into "${instdir}" commons-fileupload commons-fileupload.jar commons-fileupload-1.3.jar
-	rm jsr88javax.jar && java-pkg_jar-from --into "${instdir}" glassfish-deployment-api-1.2 glassfish-deployment-api.jar jsr88javax.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/aws-sdk
-	pushd "${instdir}" >/dev/null || die
-	rm commons-codec-1.3.jar && java-pkg_jar-from --into "${instdir}" commons-codec commons-codec.jar commons-codec-1.3.jar
-	rm commons-logging-1.1.1.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar commons-logging-1.1.1.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/javaee7-endorsed
-	pushd "${instdir}" >/dev/null || die
-	rm jsr181-api.jar && java-pkg_jar-from --into "${instdir}" jsr181 jsr181.jar jsr181-api.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jersey2/ext
-	pushd "${instdir}" >/dev/null || die
-	rm cglib-2.2.0-b21.jar && java-pkg_jar-from --into "${instdir}" cglib-3 cglib.jar cglib-2.2.0-b21.jar
-	rm guava-14.0.1.jar && java-pkg_jar-from --into "${instdir}" guava-14 guava.jar guava-14.0.1.jar
-	rm org.osgi.core-4.2.0.jar && java-pkg_jar-from --into "${instdir}" osgi-core-api osgi-core-api.jar org.osgi.core-4.2.0.jar
-	rm persistence-api-1.0.jar && java-pkg_jar-from --into "${instdir}" glassfish-persistence glassfish-persistence.jar persistence-api-1.0.jar
-	rm validation-api-1.1.0.Final.jar && java-pkg_jar-from --into "${instdir}" validation-api-1.0 validation-api.jar validation-api-1.1.0.Final.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jsf-1_2
-	pushd "${instdir}" >/dev/null || die
-	rm commons-beanutils.jar && java-pkg_jar-from --into "${instdir}" commons-beanutils-1.7 commons-beanutils.jar
-	rm commons-collections.jar && java-pkg_jar-from --into "${instdir}" commons-collections commons-collections.jar
-	rm commons-digester.jar && java-pkg_jar-from --into "${instdir}" commons-digester commons-digester.jar
-	rm commons-logging.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/struts
-	pushd "${instdir}" >/dev/null || die
-	rm antlr-2.7.2.jar && java-pkg_jar-from --into "${instdir}" antlr antlr.jar antlr-2.7.2.jar
-	rm bsf-2.3.0.jar && java-pkg_jar-from --into "${instdir}" bsf-2.3 bsf.jar bsf-2.3.0.jar
-	rm commons-beanutils-1.8.0.jar && java-pkg_jar-from --into "${instdir}" commons-beanutils-1.7 commons-beanutils.jar commons-beanutils-1.8.0.jar
-	rm commons-digester-1.8.jar && java-pkg_jar-from --into "${instdir}" commons-digester commons-digester.jar commons-digester-1.8.jar
-	rm commons-fileupload-1.1.1.jar && java-pkg_jar-from --into "${instdir}" commons-fileupload commons-fileupload.jar commons-fileupload-1.1.1.jar
-	rm commons-io-1.1.jar && java-pkg_jar-from --into "${instdir}" commons-io-1 commons-io.jar commons-io-1.1.jar
-	rm commons-logging-1.0.4.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar commons-logging-1.0.4.jar
-	rm commons-validator-1.3.1.jar && java-pkg_jar-from --into "${instdir}" commons-validator commons-validator.jar commons-validator-1.3.1.jar
-	rm oro-2.0.8.jar && java-pkg_jar-from --into "${instdir}" jakarta-oro-2.0 jakarta-oro.jar oro-2.0.8.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/enterprise
-}

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 3575226..3658d8a 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606100002-src.zip 215705826 SHA256 dc5bf896c73c9956c9f2d60fc999a041fe9a240daf2248e7a0ea26f3b12045c6 SHA512 bf3872a0ce352291ae2d36bb25fdfbaf5e403002c9ed21292451d6bbb4cddb34c120bba13481311217624b2628d4ef767731fb8c2ee8b54ef915078b647c6388 WHIRLPOOL 62f4833a881cd3f6be65268501981ace9edea20866e38019f26f89d3afdfe625b9934bf0344301c329326bbaebdf02a9c96653c510019768f5074fabb85568cc
 DIST netbeans-trunk-nightly-201606130002-src.zip 215706858 SHA256 1bb9ee5b464b0dae349efe93a2fe5628088015c7bb44f253070cba81d5542fda SHA512 d3e676034a9fa22fa3fed978c49da5d5ec66d1845a95fc2f2f600174f7af0386be87f449df3a99ce60b150fd65c22b7da9c0c588d3d92ffef10ddf05462fe65d WHIRLPOOL 7286ddcb1933236d02205c3cc3044ad5a9c0cec2fae68ae47bf4ddcb33fc801d560d5abb3c1f3b86fffab1c221833fa8f228efcb1c4db6703ea3118664c1b292
 DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
@@ -29,7 +28,6 @@ DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
 EBUILD netbeans-ergonomics-8.0.2.ebuild 2843 SHA256 f9262f6ee7f2aed1fab9bf4cf756f565272e9894afa50b349735e39961e7acc3 SHA512 f158c27640541f7aef31da050e0811c07a251ae4797cc663b95a074a47eaf9d6bb7a9aa11ba38ea55e75c185f7dba74629ba6716a819e8ad68eb3db9ada71451 WHIRLPOOL 4fe9634fb673fb05dbba25996efc3a212ef3bb23ab6e7c732cb75de076feb930735e3901806fd9c801abc7ee8aa8eb800718065325d415371255a886474061d4
 EBUILD netbeans-ergonomics-8.1.ebuild 2867 SHA256 6d2c0b7221d47b64c77b243c8c5232c6d8c24d3199eae5799adafeac609b2e2a SHA512 6302c8c13d43ec51048e8b0439916746a01bb67f14e7cd21be95b4179df6106dcff1d3973b9191f7a36cf6f29d53b1d2308864f5f64d9f87f980ea264b1a97c0 WHIRLPOOL 63ceaad04323d9085dfb90d1e5075ad13f6e14e8991b13aafaf3fc174440152054f32498ac8d03f57917744887db3bc1efdfc30b473b8d1a33b514ec4960ea6f
-EBUILD netbeans-ergonomics-9999_p20160610.ebuild 2913 SHA256 1615825bea26b921f479673ef46c67c257de0d7a63f039ba7f3c2ee0f2a4da41 SHA512 6b40e41cf99199c6a1db78db9abcd03cca8597ceef9517ac3b1109f52d2902401386c7713a602c88a594a0cf72c9c6e20d5cbbe2a89510a27244e2a44feec693 WHIRLPOOL cc2ff71c9ec6ab86ef77e4580d1031e2bc7f25074fa06b72f62523646f10f4695c0808bd9992614dde013d74d4cf9f30d9f70ad9fd888aec2d46fd86af64f2cf
 EBUILD netbeans-ergonomics-9999_p20160613.ebuild 2913 SHA256 c0b9a98b4bb571960ff30db6ce7edeb9f71b180f8f4f5e443e057e29b55aab2d SHA512 1d9029b8bc42ceb7af9fb810cb62d90646cd69034d4eb2f4ceedc810924b5c6e54987bca7cabe522b916672059c78af86b4fdca4d647cf78bf41513037070412 WHIRLPOOL 984514ebfc4992873ac93e70179158c58b97d88b3d5ad3506f39e07c0dc4b6e635f1bd7625399ca73420d98e1be3fac2a53cab88b6498cb004b982709e745302
 EBUILD netbeans-ergonomics-9999_p20160614.ebuild 2913 SHA256 a09074eac38df267941db2bbe9e4257e31c00eb1c11836eddd3385dec43545d5 SHA512 72cb8b2542a77a2f74be708f94da431dac6fbbc44d8b4ad710f5030567650b1b17c6f51382f4d42d12b836b6f516ec6cbd18484ebb66b91a07454dbaead4bf06 WHIRLPOOL fa239076a01850a48e0b8aa3e977aeb604369e13c74daab5750452fcbd8e0684fcde631ecda9d30c49ca2e6bcb844a8c90156625165e127f18004b3545d219ea
 EBUILD netbeans-ergonomics-9999_p20160615.ebuild 2913 SHA256 3c42247c47f213d0c42462475abd5af56ec3f9613cf6644ce22568b14f16bce3 SHA512 a0447f785548e62ff069fb34ad869e9ae6b215a297106bddc92c8fc730e89b1ede3c89aa826f6dc241d055a930b633036f59824a1a625cd5df0f2159fcaaf9ca WHIRLPOOL f69500e7df23bdd63a1de8b8f857ab285ff6c209e07cf0c212cd98758030c375bc23059a782c6ab6d65134007835a47a4f2350567a12890e2ab37c0f7d185f27

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160610.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160610.ebuild
deleted file mode 100644
index fa5990b..0000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160610.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Ergonomics Cluster"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-10_00-02-33/zip/netbeans-trunk-nightly-201606100002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-nb-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ergonomics -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-nb-${SLOT}/nb nb || die
-	cat /usr/share/netbeans-nb-${SLOT}/nb/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.nb.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/ergonomics >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/ergonomics$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ergonomics
-}

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index 7c5788d..bf7ddf5 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -7,7 +7,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606100002-src.zip 215705826 SHA256 dc5bf896c73c9956c9f2d60fc999a041fe9a240daf2248e7a0ea26f3b12045c6 SHA512 bf3872a0ce352291ae2d36bb25fdfbaf5e403002c9ed21292451d6bbb4cddb34c120bba13481311217624b2628d4ef767731fb8c2ee8b54ef915078b647c6388 WHIRLPOOL 62f4833a881cd3f6be65268501981ace9edea20866e38019f26f89d3afdfe625b9934bf0344301c329326bbaebdf02a9c96653c510019768f5074fabb85568cc
 DIST netbeans-trunk-nightly-201606130002-src.zip 215706858 SHA256 1bb9ee5b464b0dae349efe93a2fe5628088015c7bb44f253070cba81d5542fda SHA512 d3e676034a9fa22fa3fed978c49da5d5ec66d1845a95fc2f2f600174f7af0386be87f449df3a99ce60b150fd65c22b7da9c0c588d3d92ffef10ddf05462fe65d WHIRLPOOL 7286ddcb1933236d02205c3cc3044ad5a9c0cec2fae68ae47bf4ddcb33fc801d560d5abb3c1f3b86fffab1c221833fa8f228efcb1c4db6703ea3118664c1b292
 DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
@@ -33,7 +32,6 @@ DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
 EBUILD netbeans-extide-8.0.2.ebuild 3307 SHA256 084e952eae1708b0fab785fd34313985e864dbc74a8531a0d5cdcf906e88f85a SHA512 ade8dc37aa932d7ec20966199e521311716061c23df08d02635f78efd2776f1d7bf040b0f9c9488b947bbbdfb3e33fa764723e3dfffa2214892bc6d685428f6f WHIRLPOOL ad2c26b005675ebca7d902ff1e6caa28552f3fda6795e327cc3584cf109f0ad6efad6516e15af5e70d689be236298b0948003e09a3da4991b3e29a1c85607b2f
 EBUILD netbeans-extide-8.1.ebuild 3331 SHA256 7d81adb3cba102e13678052bfe288e8417753ebceb69f69ce528ede3fedcef04 SHA512 ae445552036799069f31b40c145879ac55cf0964e168f328ac84f2d434171de8c4848e3416ad7425563e8565c09f798c9520bb3cb7511348f5d6a7522b878e40 WHIRLPOOL 44142233d4d3047ebb5c152992b484e5fef1fddd04cf274cc370f00beece5a75a986e5fadedd4bc18a01559c4f6cb58289cefbfc24d8d098d70056707e8b8f57
-EBUILD netbeans-extide-9999_p20160610.ebuild 3377 SHA256 35a57d2943e61bfd56125ac844f83ffd741e4c27020f1ba2929c11a50ec2a25b SHA512 282628f5e9b6cca41c0c78431ab5182b23f845f68a77a446842a5a57796fd312dc13483f6c725b4d7e4e4a78ea408b802274ef796c6918ee3d6b1d6c0a8ab932 WHIRLPOOL 790d5c40e1999aa621da41ee44597419b917c9218d75cd0ff0fa3151c2c4791b0956386fdf64c0919e66465f254fc9dad0e3315298c86d11be4016744489f5df
 EBUILD netbeans-extide-9999_p20160613.ebuild 3377 SHA256 72ebf1a82e030a3401c1051848aaa1b629964a8c15c5891097e4f7e527f91fc1 SHA512 627bb41de96f2534b067fe2ff7c84d0baea120b9da7e3cc6b70f6e96fb6c0fbc3fbbd5c05925b91655eca25ebda8ce0d7a4ceb752e2fbe8c3d7576fc39d60f04 WHIRLPOOL ad47e2bc991af68a48c2db89fc522e0123c93ce9db55a9b9643c876269eff1ecf32db4febf2e2d025295269541d5f0db12fbe71ff2de23ebdd8b48c049bb018e
 EBUILD netbeans-extide-9999_p20160614.ebuild 3377 SHA256 d522cbcac07c2ede87676cc6cec8de2e0ec79ab2cf7a9af63e9037e79dbac8cd SHA512 22e12e42ca768088bafd4de682787ac99c5e25d7263a17a6d94f6c3674175e8524e1dd6f0d474649a68db752c6f4f4cf0bb7860bc7bf2d57ae37f78964224ce0 WHIRLPOOL c1d657889ab53d84bd893e7569a33788ba6aa805d13822784a3809b6446619cd4c51ed464202c4815ba7c1a25739d13065df03207e8c7d2d201957700ba4718d
 EBUILD netbeans-extide-9999_p20160615.ebuild 3377 SHA256 8d94127171b624564fd15690bf330653ab9776df1870ae3bf93ddbe7fd0574a7 SHA512 b76381372c6c69d566550314e9874d31022bcd45cbceb7ba92b9545fcd4a2d33d283d9a49cf96da87ef944f5d986da7e9eede27b65fa01fa283aea3ab592696f WHIRLPOOL 665d893795540a46647b7617287abfdf494e30ab2d0bf17d60dd1b38cbcc3411701ffa0de858f17bf7d18a161e9505531eab6f0366e47b7fd1d0a0040a972cee

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160610.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160610.ebuild
deleted file mode 100644
index 9f07553..0000000
--- a/dev-java/netbeans-extide/netbeans-extide-9999_p20160610.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans ExtIDE Cluster"
-HOMEPAGE="http://netbeans.org/projects/ide"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-10_00-02-33/zip/netbeans-trunk-nightly-201606100002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip
-	http://hg.netbeans.org/binaries/545E2B7AB1BD579CC76E3836055877982C5CD0C6-ant-misc-1.9.7.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	dev-java/javahelp:0
-	${CDEPEND}"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.extide -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip o.apache.tools.ant.module/external/ant-libs-1.9.7.zip || die
-	ln -s "${DISTDIR}"/545E2B7AB1BD579CC76E3836055877982C5CD0C6-ant-misc-1.9.7.zip o.apache.tools.ant.module/external/ant-misc-1.9.7.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	unset DISPLAY
-	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
-}
-
-src_install() {
-	pushd nbbuild/netbeans/extide >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/extide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/extide
-}

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 1888ea6..6d46ffd 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -5,7 +5,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606100002-src.zip 215705826 SHA256 dc5bf896c73c9956c9f2d60fc999a041fe9a240daf2248e7a0ea26f3b12045c6 SHA512 bf3872a0ce352291ae2d36bb25fdfbaf5e403002c9ed21292451d6bbb4cddb34c120bba13481311217624b2628d4ef767731fb8c2ee8b54ef915078b647c6388 WHIRLPOOL 62f4833a881cd3f6be65268501981ace9edea20866e38019f26f89d3afdfe625b9934bf0344301c329326bbaebdf02a9c96653c510019768f5074fabb85568cc
 DIST netbeans-trunk-nightly-201606130002-src.zip 215706858 SHA256 1bb9ee5b464b0dae349efe93a2fe5628088015c7bb44f253070cba81d5542fda SHA512 d3e676034a9fa22fa3fed978c49da5d5ec66d1845a95fc2f2f600174f7af0386be87f449df3a99ce60b150fd65c22b7da9c0c588d3d92ffef10ddf05462fe65d WHIRLPOOL 7286ddcb1933236d02205c3cc3044ad5a9c0cec2fae68ae47bf4ddcb33fc801d560d5abb3c1f3b86fffab1c221833fa8f228efcb1c4db6703ea3118664c1b292
 DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
@@ -31,7 +30,6 @@ DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
 EBUILD netbeans-groovy-8.0.2.ebuild 3346 SHA256 907e6cd11c222f15c826494b44929483803f0e4249de0d54db51e6855b574148 SHA512 8bb37121e7e32621959318d109b1d982e2c705a9deb7171f5fef1dcaed55fc5718b0bc9e6bbb2592cdaa5e96d874bb6e6bfa96d06fe09f14d5250c1485eb1da5 WHIRLPOOL d5e09fa1e975835f05c6132c091fee4ae9fc9dd671af9f5f88a9195d5cd4a93804f96687ed3f2bd741117fa65773f2c464b3cfd6697425039cc51a940efa2a31
 EBUILD netbeans-groovy-8.1.ebuild 3370 SHA256 ca32569d438060704e4d5d5e46be2ebf20bffdb0ae2471d8718ada8676f32082 SHA512 40555d2ffa0ddab1e55ca514eddbd98c6e721caa230cd174050fb56f144def46f389b0ac018068c9f509936c83235b2d3423cae8676db7c96e8782b0da73e4ad WHIRLPOOL 7b2b021581db21aa8ff90ea188ddeea0974ec84fdb064cf367a56a6fa53487affe89edb1880a83934a2cf0c586060a9192838687ffebf33b55e79d9ddc7ac986
-EBUILD netbeans-groovy-9999_p20160610.ebuild 3416 SHA256 9548d1201363de0cf625bc225dd0ad2073f01a3b76d76da92e96c40037033fed SHA512 c8efe10bcce32277d41597b0caa031f9d585d278d907504565738baf79a76cdc25e59aeb9cdb26b6b265a8e810d17fa11a4baa18d4b30e04c1e5ee5cc59da307 WHIRLPOOL bce3b5ea54a6fd34ff546cf259f03b3461dfbf2250d8f82d266b9b69999ae6e349c4bb9977f4242288511e83c82c4817b3ecbab3c446eb6358cb63030fe29775
 EBUILD netbeans-groovy-9999_p20160613.ebuild 3416 SHA256 92e9be489c1b2a7ddaca7153a5ad0f84253e726b202afc3b10308849786a5448 SHA512 0e1410ca2227457f992fb6fe20a5b0544eda85a566b764bc51fb06ecfed3299ef10c311df91150166ff7f779333023297c2d81582018f586ba94e75ccac1e346 WHIRLPOOL 4bc2f4828f083340ee71100693248c13e9ba922833780a6b99b1d20ec2ac30c4ba049d99a920afa44eb08e7441e92edd9593c00c9a7b9db93874cbef9f4c13c8
 EBUILD netbeans-groovy-9999_p20160614.ebuild 3416 SHA256 bb3506928773eff23710b353e022829d16908261b90296859d14195a074e23ed SHA512 a62ded04dfe943cdc45b6ba665667e6af3c69d79bc4f79131fb494b6c8103b6e27ea0a61da5e6120bc2e20af899bf98650f856884bc4955fe672d457ff6eb3f2 WHIRLPOOL 5261a809c997890f47f4cf1d284052236396c3c44a038cecdf3621cccea71b212e60c61c3cd011909231666a8919b5da5339e28e6d8929fc0bf530008aba12a3
 EBUILD netbeans-groovy-9999_p20160615.ebuild 3416 SHA256 9ad41132854e17cae83f0c6cc0ec2604bb4d368ed9b195efa27ccc5b7b961b27 SHA512 de54af5750d40b878cff37bd4348be7f3cc28d7eb5bb0893cc337e42e0a53aff96f74b7890e49dab89e848f3ce2f1bd59d634732c9765361b022d85530942a23 WHIRLPOOL 2a8be1c11da9c54ce93d646a7a4bb51470c04f4fe708ec07196fa25d81691bbe1d09466b611021b876804af1acc57bd51caab06d81ae6de37736ed200ed2d4fa

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160610.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160610.ebuild
deleted file mode 100644
index 6e3891d..0000000
--- a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160610.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Groovy Cluster"
-HOMEPAGE="http://netbeans.org/projects/groovy"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-10_00-02-33/zip/netbeans-trunk-nightly-201606100002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/01730F61E9C9E59FD1B814371265334D7BE0B8D2-groovy-all-2.4.5.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.groovy -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/01730F61E9C9E59FD1B814371265334D7BE0B8D2-groovy-all-2.4.5.jar libs.groovy/external/groovy-all-2.4.5.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/groovy >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/groovy$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/groovy
-}

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 3dc56c4..cf05e9e 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -8,7 +8,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606100002-src.zip 215705826 SHA256 dc5bf896c73c9956c9f2d60fc999a041fe9a240daf2248e7a0ea26f3b12045c6 SHA512 bf3872a0ce352291ae2d36bb25fdfbaf5e403002c9ed21292451d6bbb4cddb34c120bba13481311217624b2628d4ef767731fb8c2ee8b54ef915078b647c6388 WHIRLPOOL 62f4833a881cd3f6be65268501981ace9edea20866e38019f26f89d3afdfe625b9934bf0344301c329326bbaebdf02a9c96653c510019768f5074fabb85568cc
 DIST netbeans-trunk-nightly-201606130002-src.zip 215706858 SHA256 1bb9ee5b464b0dae349efe93a2fe5628088015c7bb44f253070cba81d5542fda SHA512 d3e676034a9fa22fa3fed978c49da5d5ec66d1845a95fc2f2f600174f7af0386be87f449df3a99ce60b150fd65c22b7da9c0c588d3d92ffef10ddf05462fe65d WHIRLPOOL 7286ddcb1933236d02205c3cc3044ad5a9c0cec2fae68ae47bf4ddcb33fc801d560d5abb3c1f3b86fffab1c221833fa8f228efcb1c4db6703ea3118664c1b292
 DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
 EBUILD netbeans-harness-8.0.2.ebuild 4055 SHA256 2674d562adc57648c82cac9f714f74f9d29dd7b7ff7fa7f0ef37c43ef0975489 SHA512 7d72bed5b955b2365a4c11fcd97a2d6f2372ab939fb9a03b3ff7915053f24d695373c1aa154f6e6916d37ef3ace7b38864d575419460382760500576dae52e49 WHIRLPOOL 72f54a6cb83f282a75f0abb073109414a7b8bcd4e9263466281e68ff34148a7343ed3bd78ebdc8afd109b6b9f5b9f15bfd0e250f418fcaa4986a7c886b57b9f6
 EBUILD netbeans-harness-8.1.ebuild 4079 SHA256 116b90d6e6fd1b1ad8ce99c81104262a416a485b3a3110beed70e9381333cec2 SHA512 77ca4bbaf078adf6e13c0fea0a8e673262aaed60dd799ec161584589fb4c791d9bd758c87f4272297d863d3992b54a66b77b7bf05135cada530d111e1c428e68 WHIRLPOOL d385cd6292f31a5817a2c096f960330186a68242b51ed26e4272f33a690a98175e0b622a5d5309e1e6a72ff824662964785b7d235cf3a73ba4d715cd19e89dbb
-EBUILD netbeans-harness-9999_p20160610.ebuild 4126 SHA256 c62f4c674694caac9c44c3e959c2a9a0c5954aaa218c809dfb0c43a491de350c SHA512 29e33e97ad4fd07a85eef2c69d0c21159d571587bbc3e908c449470f1f286d3b8b1fc303a01c25ea0640d2d0a9f475d40a3c1d093930e986d43da0aa9f867850 WHIRLPOOL 44a2727ce8e59485c85f3d14f8500526efc929e037e8e6c36d5ccb4656f11dfdd906d21bb9c0aa53398762dd5945118dd0bfd609d3f0e81dc9dfc0225eed5078
 EBUILD netbeans-harness-9999_p20160613.ebuild 4126 SHA256 066ec33bede8251f94d066951188b03ebef32e2de7694f5437d20c4e66c01552 SHA512 7b25367afff6de9d64ee9acdb75bc0cfa49266de7259920ec887ca5db085a85e483f81d909f8ee7ca22f42d397db9722a5dbfe57d8a48ef7e5c43ba467cc5daa WHIRLPOOL 701825047efb935378e9ddeddb52dbe0962ec1a674a895dcca41fc86494fdd28e829b40edbb644e6505d0dcb60a192a796650b745ab3996f7e101ea4c335f989
 EBUILD netbeans-harness-9999_p20160614.ebuild 4126 SHA256 c7e7e97ed46d14108eeea2887caf99c3fcee44b1964ad7ad2b76c052c5b820c2 SHA512 4603e234af04f12ced14c9f918e0433de9d6c1a0fb6c20b75b30c7ae27565995e5b20674ff4b9a30cbbbca6a2939dd0b4d17fc02a8c82f7a4ba9aa58bb7edd9f WHIRLPOOL 9bf9e2d84ac48c7cbe85cda87bd3147ad1903f391cac071dbb6391d3e79b2f3b1654077e3eb5b93aedd2304ac1b511eb94cf89c9989c0efcdf103f7ae1388757
 EBUILD netbeans-harness-9999_p20160615.ebuild 4126 SHA256 45d0d3cd6ef47cbe49111aa6cb0d58b0514fa0c13e0a2225b25153042a52b1fc SHA512 bc058ad6920b0e7eaaa4e55fe0174a450b6eb92e5b1602ed18bddedf5a90f62d231bf8d9651296fe92d97c6a4565a47130ac139d54fceed2f6ba4ff71328ec1a WHIRLPOOL f0c579b1403ad36e660b6f7759b231067163a3cd268b927457b2903daadb33c2c38801cc9775a750d6d39662b7afe2c56acd590a072138787fd4ab1dda023438

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160610.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160610.ebuild
deleted file mode 100644
index d43ab2e..0000000
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20160610.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Harness"
-HOMEPAGE="http://netbeans.org/features/platform/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-10_00-02-33/zip/netbeans-trunk-nightly-201606100002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
-	http://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar
-	http://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip
-	http://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip
-	http://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-platform-${PV}
-	dev-java/javahelp:0"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	>=dev-java/junit-4.4:4"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.harness -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar apisupport.harness/external/bindex-2.2.jar || die
-	ln -s "${DISTDIR}"/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar apisupport.harness/external/jnlp-servlet.jar || die
-	ln -s "${DISTDIR}"/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar jemmy/external/jemmy-2.3.1.1.jar || die
-	ln -s "${DISTDIR}"/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip jemmy/external/jemmy-2.3.1.1-doc.zip || die
-	ln -s "${DISTDIR}"/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip jemmy/external/jemmy-2.3.1.1-src.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into apisupport.harness/external javahelp jsearch.jar jsearch-2.0_05.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/harness >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/harness$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	fperms 755 launchers/app.sh
-	find "${D}" -name "*.exe" -type f -delete
-
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/antlib
-	pushd "${instdir}" >/dev/null || die
-	rm jsearch-2.0_05.jar && java-pkg_jar-from --into "${instdir}" javahelp jsearch.jar jsearch-2.0_05.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/harness
-}

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 0aa67d5..ac48fde 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -143,7 +143,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606100002-src.zip 215705826 SHA256 dc5bf896c73c9956c9f2d60fc999a041fe9a240daf2248e7a0ea26f3b12045c6 SHA512 bf3872a0ce352291ae2d36bb25fdfbaf5e403002c9ed21292451d6bbb4cddb34c120bba13481311217624b2628d4ef767731fb8c2ee8b54ef915078b647c6388 WHIRLPOOL 62f4833a881cd3f6be65268501981ace9edea20866e38019f26f89d3afdfe625b9934bf0344301c329326bbaebdf02a9c96653c510019768f5074fabb85568cc
 DIST netbeans-trunk-nightly-201606130002-src.zip 215706858 SHA256 1bb9ee5b464b0dae349efe93a2fe5628088015c7bb44f253070cba81d5542fda SHA512 d3e676034a9fa22fa3fed978c49da5d5ec66d1845a95fc2f2f600174f7af0386be87f449df3a99ce60b150fd65c22b7da9c0c588d3d92ffef10ddf05462fe65d WHIRLPOOL 7286ddcb1933236d02205c3cc3044ad5a9c0cec2fae68ae47bf4ddcb33fc801d560d5abb3c1f3b86fffab1c221833fa8f228efcb1c4db6703ea3118664c1b292
 DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
@@ -169,7 +168,6 @@ DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
 EBUILD netbeans-ide-8.0.2-r2.ebuild 29330 SHA256 4822cbe26fc19685164c35d69e75bc20578ca8a5ce3394fe97bde6acc721fd2d SHA512 552f35cb1aa5429beb70c72a0cd2a3aa3a006f5870ec4084e88632a39e2ccdc05d0b2b15a87f26c72cdffb3c9a6fa0a124a8d501edeef9aa9580396922071e8d WHIRLPOOL 4c9bce3ca21d5ae61ef9392b9282c2dff9de7f82f2e83d2944a2906ca2180ef0ffab59489bdbb6afc7ba88d5143d77b47a0cf6b219a5a4d385b68afcacd3fe6d
 EBUILD netbeans-ide-8.1-r2.ebuild 30301 SHA256 892f20531352d85b5b72b1c85352eefa444917b515b0b564f04c4f91d1e654f9 SHA512 50af4873fd3ea7755b0d33b086be7e07766b6c009a46ec3954a67a1da9930378bcf9da6d18b7e60078b31af4b36ccf060f22378a8ef26b3829ccf30a529dd023 WHIRLPOOL 1024af16e7cae7f4728dd37f88031be33253b7c62548a095d3e827abeccb6c183d34ce312bd1a0f808f0d107aff217e4b81b7a17eecc6842e1d914d7061df2c9
-EBUILD netbeans-ide-9999_p20160610.ebuild 30761 SHA256 9ec3567a0c03603b4383d7282382b56158555be8a95fcd873e87852dded49ab5 SHA512 246b8955d22edec8a1c33700dd8c6d6433fec2699063b8c4a50d2c90b48bf70a65de6027f8996871a34f3e3508e0076e2811aeb68c396668f9a8ced07b07f5ed WHIRLPOOL b089ee9c4487d4724ab61bfa15f6f8fe8a8e1fd58fe3f49f9394b837fde6e9cacccb687d15e54d6a4834374c95af3337af76f90b618a95a62b52e2acd7be809b
 EBUILD netbeans-ide-9999_p20160613.ebuild 30761 SHA256 050aad9267fa2571aa93c3d8272049096507cda7af4c0d99ed7a48924c5cabfa SHA512 fe4a440f41504abd9b9b60a2beb4e9cfc362a3058a388d0d101b0d6cc37a9180ed41bedb490c0623b5e776f49bcaecf65f8c52248e6e823c5f64bf9185b34cfe WHIRLPOOL d5092b43ffebe2b6d1d57f8727b1c8b09fde72ab52a5265326ceb36eb490a8d6f071a0292b2e158261682e662b72a9d7c81e1a8e9b3a8f00cf1c6109b996fa3a
 EBUILD netbeans-ide-9999_p20160614.ebuild 30761 SHA256 30b50c2919bada65db42cf59d9aec1f5504b737328841f732a6303409588e5e5 SHA512 d17a89889482a47a4adc1ba4591326b0d636003e9072e10cfd44cd2db3ca9776a75a60f1e05f885112a2b455747305221e6294ee8f0c7c0913990ae7d341dcb6 WHIRLPOOL 5f22361aa02682952e56470cd7b25002d8df215b496d5f88cd6bc822f3f1b50980efc98dfeeab1b9695c3804313ebae8351457c5f78065fcfb4355ae6e5be88a
 EBUILD netbeans-ide-9999_p20160615.ebuild 29867 SHA256 deefa732a92c591d90b9f66e4fe8b45d5271fe7bfded15548739333d1e38dfef SHA512 37585bd9ab2835d224d7bc29dcb94f507ade86bce65252e392fce238a43e9f599c8f0cb5b20d417cdc472b52454b7beee2c8787eacc265d83ff9640860c36b94 WHIRLPOOL 629899b8ad623ea8f2106e4cfe35dd8c1b29c8ca0e302bf71f7193eeeb6030a4bc3ab3ad224f0334478ddd02adb16419075f818d8e67f3a42261462bf6650b09

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160610.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160610.ebuild
deleted file mode 100644
index 485eb03..0000000
--- a/dev-java/netbeans-ide/netbeans-ide-9999_p20160610.ebuild
+++ /dev/null
@@ -1,382 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans IDE Cluster"
-HOMEPAGE="http://netbeans.org/projects/ide"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-10_00-02-33/zip/netbeans-trunk-nightly-201606100002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
-	http://hg.netbeans.org/binaries/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar
-	http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
-	http://hg.netbeans.org/binaries/DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar
-	http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar
-	http://hg.netbeans.org/binaries/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar
-	http://hg.netbeans.org/binaries/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar
-	http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip
-	http://hg.netbeans.org/binaries/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip
-	http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
-	http://hg.netbeans.org/binaries/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip
-	http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar
-	http://hg.netbeans.org/binaries/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar
-	http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
-	http://hg.netbeans.org/binaries/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip
-	http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar
-	http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar
-	http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar
-	http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip
-	http://hg.netbeans.org/binaries/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar
-	http://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar
-	http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
-	http://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar
-	http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar
-	http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar
-	http://hg.netbeans.org/binaries/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar
-	http://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar
-	http://hg.netbeans.org/binaries/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip
-	http://hg.netbeans.org/binaries/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip
-	http://hg.netbeans.org/binaries/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip
-	http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar
-	http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar
-	http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar
-	http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar
-	http://hg.netbeans.org/binaries/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar
-	http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
-	http://hg.netbeans.org/binaries/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar
-	http://hg.netbeans.org/binaries/AA2671239EBB762FEEE8B908E9F35473A72AFE1B-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar
-	http://hg.netbeans.org/binaries/1605B38BB28EAE32C11EAB8F9E238A497754A5B8-org.eclipse.core.jobs-3.5.101_nosignature.jar
-	http://hg.netbeans.org/binaries/20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar
-	http://hg.netbeans.org/binaries/D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-org.eclipse.core.runtime-3.7.0_nosignature.jar
-	http://hg.netbeans.org/binaries/16507EAFDC2B95121AA718895BDB54D616EE4B0F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar
-	http://hg.netbeans.org/binaries/BD55836AABD558DC643A7844B78866AD990544BC-org.eclipse.equinox.app-1.3.100_nosignature.jar
-	http://hg.netbeans.org/binaries/4EE275AE73A140A403903D7E4DBA68C8FBB07001-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar
-	http://hg.netbeans.org/binaries/B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-org.eclipse.equinox.preferences-3.4.2_nosignature.jar
-	http://hg.netbeans.org/binaries/C647079E36A4EB7A24AED2C545E4F0F94194C4D1-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar
-	http://hg.netbeans.org/binaries/9267CF311F979078211A70C1B19AF8A8EE71DC8E-org.eclipse.equinox.security-1.1.1_nosignature.jar
-	http://hg.netbeans.org/binaries/B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar
-	http://hg.netbeans.org/binaries/244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar
-	http://hg.netbeans.org/binaries/8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar
-	http://hg.netbeans.org/binaries/D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar
-	http://hg.netbeans.org/binaries/4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar
-	http://hg.netbeans.org/binaries/8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar
-	http://hg.netbeans.org/binaries/50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar
-	http://hg.netbeans.org/binaries/4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar
-	http://hg.netbeans.org/binaries/11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar
-	http://hg.netbeans.org/binaries/A3FEF6144ED1622E4CDD506B9D745527CC675D8D-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar
-	http://hg.netbeans.org/binaries/825DC870D1D423E347F4F8229A211A2C297BB15D-org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar
-	http://hg.netbeans.org/binaries/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar
-	http://hg.netbeans.org/binaries/17C0C8D6DEBF5EBE734881C131888D8088BD9E7D-org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar
-	http://hg.netbeans.org/binaries/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar
-	http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar
-	http://hg.netbeans.org/binaries/DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8-svnClientAdapter-javahl-1.10.12.jar
-	http://hg.netbeans.org/binaries/C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8-svnClientAdapter-main-1.10.12.jar
-	http://hg.netbeans.org/binaries/AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8-svnClientAdapter-svnkit-1.10.12.jar
-	http://hg.netbeans.org/binaries/5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.jar
-	http://hg.netbeans.org/binaries/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar
-	http://hg.netbeans.org/binaries/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar
-	http://hg.netbeans.org/binaries/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar
-	http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar
-	http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar
-	http://hg.netbeans.org/binaries/5C322A10E13FADE0451263035B7AA26B63AAFA47-validator.jar
-	http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar
-	http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar
-	http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar
-	http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-platform-${PV}
-	dev-java/commons-compress:0
-	dev-java/commons-httpclient:3
-	dev-java/commons-logging:0
-	dev-java/icu4j:55
-	dev-java/iso-relax:0
-	dev-java/jdbc-mysql:0
-	dev-java/jdbc-postgresql:0
-	>=dev-java/jsch-0.1.46:0
-	>=dev-java/json-simple-1.1:0
-	dev-java/jsr173:0
-	dev-java/jvyamlb:0
-	dev-java/log4j:0
-	dev-java/lucene:3.5
-	dev-java/rhino:1.6
-	dev-java/saxon:9
-	dev-java/smack:2.2
-	dev-java/sun-jaf:0
-	dev-java/tomcat-servlet-api:2.2
-	dev-java/ws-commons-util:0
-	dev-java/xerces:2"
-#	dev-vcs/subversion>=1.8.4:0[java] missing from the tree
-#	app-text/jing:0 our version is probably too old
-#	dev-java/commons-io:1 fails with "Missing manifest tag OpenIDE-Module"
-#	dev-java/commons-lang:2.1 fails with "Missing manifest tag OpenIDE-Module"
-#	dev-java/freemarker:2.3
-#	dev-java/guava:15 fails with "Missing manifest tag OpenIDE-Module"
-#	dev-java/ini4j:0 our version is too old
-#	dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours
-#	dev-java/jzlib:0 fails with "Missing manifest tag OpenIDE-Module"
-#	dev-java/trilead-ssh2:0 in overlay
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	dev-java/commons-codec:0
-	${CDEPEND}
-	dev-java/javacc:0
-	dev-java/javahelp:0
-	dev-java/jna:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ide -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-JAVA_PKG_WANT_SOURCE="1.7"
-JAVA_PKG_WANT_TARGET="1.7"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
-	ln -s "${DISTDIR}"/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar libs.nashorn/external/asm-all-4.0.jar || die
-	ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
-	ln -s "${DISTDIR}"/DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar || die
-	ln -s "${DISTDIR}"/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar o.apache.commons.io/external/commons-io-1.4.jar || die
-	ln -s "${DISTDIR}"/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar o.apache.commons.lang/external/commons-lang-2.6.jar || die
-	ln -s "${DISTDIR}"/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar libs.commons_net/external/commons-net-3.3.jar || die
-	ln -s "${DISTDIR}"/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip css.editor/external/css21-spec.zip || die
-	ln -s "${DISTDIR}"/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip css.editor/external/css3-spec.zip || die
-	ln -s "${DISTDIR}"/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip derby/external/derbysampledb.zip || die
-	ln -s "${DISTDIR}"/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip dlight.nativeexecution/external/exechlp-1.0.zip || die
-	ln -s "${DISTDIR}"/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar libs.freemarker/external/freemarker-2.3.19.jar || die
-	ln -s "${DISTDIR}"/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar c.google.guava/external/guava-15.0.jar || die
-	ln -s "${DISTDIR}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
-	ln -s "${DISTDIR}"/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip html.parser/external/html5doc.zip || die
-	ln -s "${DISTDIR}"/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar html.parser/external/htmlparser-1.2.1.jar || die
-	ln -s "${DISTDIR}"/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar libs.ini4j/external/ini4j-0.5.1.jar || die
-	ln -s "${DISTDIR}"/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar html.validation/external/iri.jar || die
-	ln -s "${DISTDIR}"/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip spellchecker.dictionary_en/external/ispell-enwl-3.1.20.zip || die
-	ln -s "${DISTDIR}"/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar c.googlecode.javaewah.JavaEWAH/external/JavaEWAH-0.7.9.jar || die
-	ln -s "${DISTDIR}"/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar xml.jaxb.api/external/jaxb-api.jar || die
-	ln -s "${DISTDIR}"/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip libs.jaxb/external/jaxb-api-doc.zip || die
-	ln -s "${DISTDIR}"/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar libs.jaxb/external/jaxb-impl.jar || die
-	ln -s "${DISTDIR}"/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar libs.jaxb/external/jaxb-xjc.jar || die
-	ln -s "${DISTDIR}"/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar libs.jaxb/external/jaxb1-impl.jar || die
-	ln -s "${DISTDIR}"/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar libs.javafx/external/jfxrt.jar || die
-	ln -s "${DISTDIR}"/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar html.validation/external/jing.jar || die
-	ln -s "${DISTDIR}"/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip javascript2.editor/external/js-corestubs.zip || die
-	ln -s "${DISTDIR}"/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip javascript2.editor/external/js-domstubs.zip || die
-	ln -s "${DISTDIR}"/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip javascript2.editor/external/js-reststubs.zip || die
-	ln -s "${DISTDIR}"/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.core-0.0.7.jar || die
-	ln -s "${DISTDIR}"/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.sshagent-0.0.7.jar || die
-	ln -s "${DISTDIR}"/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.pageant-0.0.7.jar || die
-	ln -s "${DISTDIR}"/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.usocket-jna-0.0.7.jar || die
-	ln -s "${DISTDIR}"/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar c.jcraft.jzlib/external/jzlib-1.0.7.jar || die
-	ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.process/external/libpam4j-1.1.jar || die
-	ln -s "${DISTDIR}"/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar libs.nashorn/external/nashorn-02f810c26ff9-patched.jar || die
-	ln -s "${DISTDIR}"/AA2671239EBB762FEEE8B908E9F35473A72AFE1B-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar o.eclipse.core.contenttype/external/org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar || die
-	ln -s "${DISTDIR}"/1605B38BB28EAE32C11EAB8F9E238A497754A5B8-org.eclipse.core.jobs-3.5.101_nosignature.jar o.eclipse.core.jobs/external/org.eclipse.core.jobs-3.5.101_nosignature.jar || die
-	ln -s "${DISTDIR}"/20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar o.eclipse.core.net/external/org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar || die
-	ln -s "${DISTDIR}"/D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-org.eclipse.core.runtime-3.7.0_nosignature.jar o.eclipse.core.runtime/external/org.eclipse.core.runtime-3.7.0_nosignature.jar || die
-	ln -s "${DISTDIR}"/16507EAFDC2B95121AA718895BDB54D616EE4B0F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar o.eclipse.core.runtime.compatibility.auth/external/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar || die
-	ln -s "${DISTDIR}"/BD55836AABD558DC643A7844B78866AD990544BC-org.eclipse.equinox.app-1.3.100_nosignature.jar o.eclipse.equinox.app/external/org.eclipse.equinox.app-1.3.100_nosignature.jar || die
-	ln -s "${DISTDIR}"/4EE275AE73A140A403903D7E4DBA68C8FBB07001-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar o.eclipse.equinox.common/external/org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar || die
-	ln -s "${DISTDIR}"/B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-org.eclipse.equinox.preferences-3.4.2_nosignature.jar o.eclipse.equinox.preferences/external/org.eclipse.equinox.preferences-3.4.2_nosignature.jar || die
-	ln -s "${DISTDIR}"/C647079E36A4EB7A24AED2C545E4F0F94194C4D1-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar o.eclipse.equinox.registry/external/org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar || die
-	ln -s "${DISTDIR}"/9267CF311F979078211A70C1B19AF8A8EE71DC8E-org.eclipse.equinox.security-1.1.1_nosignature.jar o.eclipse.equinox.security/external/org.eclipse.equinox.security-1.1.1_nosignature.jar || die
-	ln -s "${DISTDIR}"/B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit/external/org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar || die
-	ln -s "${DISTDIR}"/244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit.java7/external/org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar || die
-	ln -s "${DISTDIR}"/8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar || die
-	ln -s "${DISTDIR}"/D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar || die
-	ln -s "${DISTDIR}"/4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar || die
-	ln -s "${DISTDIR}"/8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar || die
-	ln -s "${DISTDIR}"/50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar || die
-	ln -s "${DISTDIR}"/4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar || die
-	ln -s "${DISTDIR}"/11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar || die
-	ln -s "${DISTDIR}"/A3FEF6144ED1622E4CDD506B9D745527CC675D8D-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar || die
-	ln -s "${DISTDIR}"/825DC870D1D423E347F4F8229A211A2C297BB15D-org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.markdown.core/external/org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar || die
-	ln -s "${DISTDIR}"/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar || die
-	ln -s "${DISTDIR}"/17C0C8D6DEBF5EBE734881C131888D8088BD9E7D-org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar || die
-	ln -s "${DISTDIR}"/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar extexecution.process/external/processtreekiller-1.0.7.jar || die
-	ln -s "${DISTDIR}"/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar libs.svnClientAdapter.svnkit/external/svnkit_1.7.8.r9538_v20130107_2001.jar || die
-	ln -s "${DISTDIR}"/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar o.apache.xml.resolver/external/resolver-1.2.jar || die
-	ln -s "${DISTDIR}"/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar libs.svnClientAdapter.svnkit/external/sqljet-1.1.10.jar || die
-	ln -s "${DISTDIR}"/DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8-svnClientAdapter-javahl-1.10.12.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.10.12.jar || die
-	ln -s "${DISTDIR}"/C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8-svnClientAdapter-main-1.10.12.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.10.12.jar || die
-	ln -s "${DISTDIR}"/AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8-svnClientAdapter-svnkit-1.10.12.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.10.12.jar || die
-	ln -s "${DISTDIR}"/5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.jar libs.svnClientAdapter.javahl/external/svnjavahl-1.9.3.jar || die
-	ln -s "${DISTDIR}"/3B91269E9055504778F57744D24F505856698602-svnkit-1.7.0-beta4-20120316.233307-1.jar libs.svnClientAdapter.svnkit/external/svnkit-1.7.0-beta4-20120316.233307-1.jar || die
-	ln -s "${DISTDIR}"/015525209A02BD74254930FF844C7C13498B7FB9-svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar libs.svnClientAdapter.svnkit/external/svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar || die
-	ln -s "${DISTDIR}"/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar libs.swingx/external/swingx-all-1.6.4.jar || die
-	ln -s "${DISTDIR}"/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar httpserver/external/tomcat-webserver-3.2.jar || die
-	ln -s "${DISTDIR}"/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar swing.validation/external/ValidationAPI.jar || die
-	ln -s "${DISTDIR}"/5C322A10E13FADE0451263035B7AA26B63AAFA47-validator.jar html.validation/external/validator.jar || die
-	ln -s "${DISTDIR}"/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar extexecution.process/external/winp-1.14-patched.jar || die
-	ln -s "${DISTDIR}"/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar o.apache.xmlrpc/external/xmlrpc-client-3.0.jar || die
-	ln -s "${DISTDIR}"/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar o.apache.xmlrpc/external/xmlrpc-common-3.0.jar || die
-	ln -s "${DISTDIR}"/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar o.apache.xmlrpc/external/xmlrpc-server-3.0.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	popd >/dev/null || die
-
-	java-pkg_jar-from --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.53.jar
-	java-pkg_jar-from --into db.drivers/external jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
-	java-pkg_jar-from --into db.drivers/external jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
-	java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar
-	java-pkg_jar-from --into html.parser/external icu4j-55 icu4j.jar icu4j-4_4_2.jar
-	java-pkg_jar-from --into html.validation/external iso-relax iso-relax.jar isorelax.jar
-	java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
-	java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
-	java-pkg_jar-from --into libs.commons_compress/external commons-compress commons-compress.jar commons-compress-1.8.1.jar
-	# java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.19.jar
-	java-pkg_jar-from --build-only --into libs.jna/external jna jna.jar jna-4.2.2.jar
-	java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
-	java-pkg_jar-from --into libs.lucene/external lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
-	java-pkg_jar-from --into libs.smack/external smack-2.2 smack.jar smack.jar
-	java-pkg_jar-from --into libs.smack/external smack-2.2 smackx.jar smackx.jar
-	# java-pkg_jar-from --into libs.svnClientAdapter.javahl/external subversion svn-javahl.jar svnjavahl-1.8.4.jar
-	java-pkg_jar-from --into libs.xerces/external xerces-2 xercesImpl.jar xerces-2.8.0.jar
-	java-pkg_jar-from --build-only --into o.apache.commons.codec/external commons-codec commons-codec.jar apache-commons-codec-1.3.jar
-	java-pkg_jar-from --into o.apache.commons.httpclient/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.1.jar
-	java-pkg_jar-from --into o.apache.commons.logging/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
-	java-pkg_jar-from --into o.apache.ws.commons.util/external ws-commons-util ws-commons-util.jar ws-commons-util-1.0.1.jar
-	java-pkg_jar-from --into servletapi/external tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
-	java-pkg_jar-from --into xml.jaxb.api/external sun-jaf activation.jar activation.jar
-	java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_1.0_api.jar
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	unset DISPLAY
-	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
-}
-
-src_install() {
-	pushd nbbuild/netbeans/ide >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/ide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	rm -fr "${D}"/${INSTALL_DIR}/bin/nativeexecution || die
-	rm -fr "${D}"/${INSTALL_DIR}/modules/lib || die
-
-	insinto ${INSTALL_DIR}/bin/nativeexecution
-	doins bin/nativeexecution/*
-
-	pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution >/dev/null || die
-	for file in *.sh ; do
-		fperms 755 ${file}
-	done
-	popd >/dev/null || die
-
-	if use x86 ; then
-		doins -r bin/nativeexecution/Linux-x86
-		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86 >/dev/null || die
-		for file in * ; do
-			fperms 755 ${file}
-		done
-		popd >/dev/null || die
-	elif use amd64 ; then
-		doins -r bin/nativeexecution/Linux-x86_64
-		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86_64 >/dev/null || die
-		for file in * ; do
-			fperms 755 ${file}
-		done
-		popd >/dev/null || die
-	fi
-
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules
-	pushd "${instdir}" >/dev/null || die
-	rm com-jcraft-jsch.jar && java-pkg_jar-from --into "${instdir}" jsch jsch.jar com-jcraft-jsch.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext
-	pushd "${instdir}" >/dev/null || die
-	rm commons-compress-1.8.1.jar && java-pkg_jar-from --into "${instdir}" commons-compress commons-compress.jar commons-compress-1.8.1.jar
-	# rm freemarker-2.3.19.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.19.jar || die
-	rm icu4j-4_4_2.jar && java-pkg_jar-from --into "${instdir}" icu4j-55 icu4j.jar icu4j-4_4_2.jar
-	rm isorelax.jar && java-pkg_jar-from --into "${instdir}" iso-relax iso-relax.jar isorelax.jar
-	rm json-simple-1.1.1.jar && java-pkg_jar-from --into "${instdir}" json-simple json-simple.jar json-simple-1.1.1.jar
-	rm jvyamlb-0.2.7.jar && java-pkg_jar-from --into "${instdir}" jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
-	rm log4j-1.2.15.jar && java-pkg_jar-from --into "${instdir}" log4j log4j.jar log4j-1.2.15.jar
-	rm lucene-core-3.5.0.jar && java-pkg_jar-from --into "${instdir}" lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
-	rm mysql-connector-java-5.1.23-bin.jar && java-pkg_jar-from --into "${instdir}" jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
-	rm postgresql-9.2-1002.jdbc4.jar && java-pkg_jar-from --into "${instdir}" jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
-	rm saxon9B.jar && java-pkg_jar-from --into "${instdir}" saxon-9 saxon.jar saxon9B.jar
-	rm servlet-2.2.jar && java-pkg_jar-from --into "${instdir}" tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
-	rm smack.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smack.jar
-	rm smackx.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smackx.jar
-	# rm svnjavahl.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl.jar || die
-	rm xerces-2.8.0.jar && java-pkg_jar-from --into "${instdir}" xerces-2 xercesImpl.jar xerces-2.8.0.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb
-	pushd "${instdir}" >/dev/null || die
-	rm activation.jar && java-pkg_jar-from --into "${instdir}" sun-jaf activation.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb/api
-	pushd "${instdir}" >/dev/null || die
-	rm jsr173_1.0_api.jar && java-pkg_jar-from --into "${instdir}" jsr173 jsr173.jar jsr173_1.0_api.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ide
-}

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 380e544..25e9f2a 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -41,7 +41,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606100002-src.zip 215705826 SHA256 dc5bf896c73c9956c9f2d60fc999a041fe9a240daf2248e7a0ea26f3b12045c6 SHA512 bf3872a0ce352291ae2d36bb25fdfbaf5e403002c9ed21292451d6bbb4cddb34c120bba13481311217624b2628d4ef767731fb8c2ee8b54ef915078b647c6388 WHIRLPOOL 62f4833a881cd3f6be65268501981ace9edea20866e38019f26f89d3afdfe625b9934bf0344301c329326bbaebdf02a9c96653c510019768f5074fabb85568cc
 DIST netbeans-trunk-nightly-201606130002-src.zip 215706858 SHA256 1bb9ee5b464b0dae349efe93a2fe5628088015c7bb44f253070cba81d5542fda SHA512 d3e676034a9fa22fa3fed978c49da5d5ec66d1845a95fc2f2f600174f7af0386be87f449df3a99ce60b150fd65c22b7da9c0c588d3d92ffef10ddf05462fe65d WHIRLPOOL 7286ddcb1933236d02205c3cc3044ad5a9c0cec2fae68ae47bf4ddcb33fc801d560d5abb3c1f3b86fffab1c221833fa8f228efcb1c4db6703ea3118664c1b292
 DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
@@ -67,7 +66,6 @@ DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
 EBUILD netbeans-java-8.0.2-r4.ebuild 13298 SHA256 d4172dfdec5afecb1cd099e18a21aa872c7822bff40b192b5f4ec4d35e6e0ef8 SHA512 48ae6f7141117fbf58123ded750d76f2e7311211a6be3b62bd491349817460da11f781ec5694da91584315547c32008f568fac3bfb406dbdb5ed7fd825ff694e WHIRLPOOL 73fb68aec003707c14b2b390c2de80f24e1e5413cf7e16cf7e661af47c908e2d559214580379e45e21d316767987ac906b5a119a61ae39f03c3d01dafad49b7c
 EBUILD netbeans-java-8.1-r2.ebuild 14814 SHA256 1f49212c90fcaa9a6483f19bb60c963520f20aa08c2a509aa19cc7fda12e4564 SHA512 2d6b225f5d32f0ce1801124808b0cc2101f16a703540877c4818be06694742cfa262c3a2e7018761254f9244a7992eb7fe9bc15cdb20f6f4cb83958789c0ef42 WHIRLPOOL 8557163a46ea91a47efec3c272b8a8a0f2acbf9eaa8f6c280d0ddaac6dd8b2185f06716ab12ebf76fb87fe6c05ab1a14bfd281875ebef586f1304d2162e5f2dc
-EBUILD netbeans-java-9999_p20160610.ebuild 15656 SHA256 42a74eade4b6ff73d694f7b883398467c576188c8e8f216c77573a4eb76d55d4 SHA512 6126ff4936a30ea763041e644587ce59edf4efe1c90935773cbd21eb752005048555f75fd93bb34c1aa7dbbcaa65801cacb55fb24fb12211b0abbc016af78d69 WHIRLPOOL 49aedb633a129982f050a8a344009b5bcc3697ecc6d2b8a2e4a512d615611928e6a11474058dc09f57f19524168eb0e9ec31a07e7ccb4c8d7453548d7ae466fa
 EBUILD netbeans-java-9999_p20160613.ebuild 15656 SHA256 8e14cffceab0b957ddd700f8e7c714a1f3287542f6a4ca961ee50e337c9509c6 SHA512 674fc2125ad9c99fa0063bd9bae2af65a8b0cd808e72fb97b5f0f6509f25ef803f18119224dcd03cc0f87df8fb1a3bb30fda1982ca757120c948cc84eb7dc5bf WHIRLPOOL d3ef526c1809d0dddd37e96c752ea4c9bef530f745a13a399432cec3e327726eddb5b964aa4f6f5286734e97349c6cc529a423fbb0d36098a8423a8e6eaaac56
 EBUILD netbeans-java-9999_p20160614.ebuild 15656 SHA256 1ba3f88c10129a6a5281b5f86325b61db5b1e7442ce489646ad58fbee45304c6 SHA512 df6debc471a80eb2072d8ea47c202fb7b252337ac35430d7129ce677d3784a7b40f60dbf4f4dd51245681a19b42015a61d381051aa13ceae314441aeb6634a08 WHIRLPOOL f7292f71a19506b6c07770284fafa3847b9c838ca7637e10c5a2f3cb16eae1de5ef87d12b0c2fa037e24b6e495d8bbd0cb8b2204777d243c088610cd3b9fc080
 EBUILD netbeans-java-9999_p20160615.ebuild 15656 SHA256 a0ea8d9fc4cf1291523171539a231d4cbd07648322e17581a7d791c6445b2f0d SHA512 ff9e71cd78220f7bdb3d4e440df486ab9ed9098d0fc9b0fabfc16e72d7ccc8c854220f8f5a398d7b0bf72bdeba3217371159e5b8341be7b8cdddee2efd0bbff2 WHIRLPOOL 8c466b554976cfc879fa45bfa2c2b92e60351fae6956d1b6ed3937d1899cb5c36b2c6d00e50adca89c3b69a97f4fe361b3c2f6de3e9aed14b8706442b56d95a8

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160610.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160610.ebuild
deleted file mode 100644
index ae701b9..0000000
--- a/dev-java/netbeans-java/netbeans-java-9999_p20160610.ebuild
+++ /dev/null
@@ -1,280 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-# Maven cannot be unbundled because it depends on exact maven version and exact content of maven directory
-
-DESCRIPTION="Netbeans Java Cluster"
-HOMEPAGE="http://netbeans.org/projects/java"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-10_00-02-33/zip/netbeans-trunk-nightly-201606100002-src.zip"
-# jarjar-1.4 contains also asm libraries
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar
-	http://hg.netbeans.org/binaries/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip
-	http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
-	http://hg.netbeans.org/binaries/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar
-	http://hg.netbeans.org/binaries/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip
-	http://hg.netbeans.org/binaries/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar
-	http://hg.netbeans.org/binaries/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar
-	http://hg.netbeans.org/binaries/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar
-	http://hg.netbeans.org/binaries/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar
-	http://hg.netbeans.org/binaries/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip
-	http://hg.netbeans.org/binaries/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip
-	http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip
-	http://hg.netbeans.org/binaries/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip
-	http://hg.netbeans.org/binaries/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar
-	http://hg.netbeans.org/binaries/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar
-	http://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar
-	http://hg.netbeans.org/binaries/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar
-	http://hg.netbeans.org/binaries/CAA3DA01AA82FCD617CD3247DFA82D619273B450-nb-javac-impl.jar
-	http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
-	http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar
-	http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip
-	http://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip
-	http://hg.netbeans.org/binaries/BFCC4C322190D6E3DD2FA9F191C0359D380D87C5-wagon-file-2.10.jar
-	http://hg.netbeans.org/binaries/4EF309C09ABB5F8B2D0C6A4010205DB185729CDC-wagon-http-2.10-shaded.jar
-	http://hg.netbeans.org/binaries/3B96251214DF697E902C849EB0B4A0EFA2CD1A53-wagon-http-shared-2.10.jar
-	http://hg.netbeans.org/binaries/0CD9CDDE3F56BB5250D87C54592F04CBC24F03BF-wagon-provider-api-2.10.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-websvccommon-${PV}
-	dev-java/beansbinding:0
-	dev-java/cglib:3
-	dev-java/jdom:0"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0
-	dev-java/json-simple:0
-	dev-java/junit:4"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}
-	dev-java/absolutelayout:0
-	>=dev-java/antlr-2.7.7-r7:0
-	dev-java/c3p0:0
-	dev-java/commons-cli:1
-	dev-java/commons-collections:0
-	dev-java/dom4j:1
-	dev-java/fastinfoset:0
-	dev-java/glassfish-transaction-api:0
-	dev-java/javassist:3
-	dev-java/jboss-logging:0
-	dev-java/jsr67:0
-	dev-java/jsr181:0
-	>=dev-java/jtidy-1:0
-	dev-java/log4j:0
-	dev-java/mimepull:0
-	dev-java/oracle-javamail:0
-	dev-java/saaj:0
-	dev-java/slf4j-api:0
-	dev-java/slf4j-log4j12:0
-	dev-java/slf4j-simple:0
-	dev-java/stax-ex:0
-	dev-java/stax2-api:0
-	dev-java/xmlstreambuffer:0"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.java -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-pkg_pretend() {
-	local die_now=""
-
-	if [ -d /usr/share/netbeans-java-${SLOT}/ant ]; then
-		if [ -n "$(find /usr/share/netbeans-java-${SLOT}/ant -type l)" ]; then
-			eerror "Please remove following symlinks and run emerge again:"
-			find /usr/share/netbeans-java-${SLOT}/ant -type l
-			die_now="1"
-		fi
-	fi
-
-	if [ -L /usr/share/netbeans-java-${SLOT}/maven ]; then
-		if [ -z "${die_now}" ]; then
-			eerror "Please remove following symlinks and run emerge again:"
-		fi
-
-		echo "/usr/share/netbeans-java-${SLOT}/maven"
-		die_now="1"
-	fi
-
-	if [ -n "${die_now}" ]; then
-		die "Symlinks exist"
-	fi
-}
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar maven/external/aether-api-1.0.2.v20150114.jar || die
-	ln -s "${DISTDIR}"/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip maven.embedder/external/apache-maven-3.0.5-bin.zip || die
-	ln -s "${DISTDIR}"/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip o.jdesktop.beansbinding/external/beansbinding-1.2.1-doc.zip || die
-	ln -s "${DISTDIR}"/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar j2ee.eclipselink/external/eclipselink.jar || die
-	ln -s "${DISTDIR}"/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip hibernate4lib/external/hibernate-release-4.3.1-lib.zip || die
-	ln -s "${DISTDIR}"/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar maven.indexer/external/indexer-artifact-5.1.1.jar || die
-	ln -s "${DISTDIR}"/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar maven.indexer/external/indexer-core-5.1.1-patched.jar || die
-	ln -s "${DISTDIR}"/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar maven/external/jarjar-1.4.jar || die
-	ln -s "${DISTDIR}"/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar j2ee.eclipselink/external/javax.persistence_2.1.0.v201304241213.jar || die
-	ln -s "${DISTDIR}"/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip websvc.jaxws21/external/jaxws-2.2.6.zip || die
-	ln -s "${DISTDIR}"/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip websvc.jaxws21api/external/jaxws-2.2.6-api.zip || die
-	ln -s "${DISTDIR}"/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip websvc.jaxws21/external/jaxws-api-doc.zip || die
-	ln -s "${DISTDIR}"/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip j2ee.eclipselink/external/JPAjavadocs04032013.zip || die
-	ln -s "${DISTDIR}"/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar maven.indexer/external/lucene-core-3.6.2.jar || die
-	ln -s "${DISTDIR}"/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar maven.indexer/external/lucene-highlighter-3.6.2.jar || die
-	ln -s "${DISTDIR}"/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar maven.embedder/external/maven-dependency-tree-2.0.jar || die
-	ln -s "${DISTDIR}"/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
-	ln -s "${DISTDIR}"/CAA3DA01AA82FCD617CD3247DFA82D619273B450-nb-javac-impl.jar libs.javacimpl/external/nb-javac-impl.jar || die
-	ln -s "${DISTDIR}"/CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.jar maven/external/netbeans-cos.jar || die
-	ln -s "${DISTDIR}"/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar || die
-	ln -s "${DISTDIR}"/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselinkmodelgen/external/org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar || die
-	ln -s "${DISTDIR}"/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip libs.springframework/external/spring-framework-3.2.7.RELEASE.zip || die
-	ln -s "${DISTDIR}"/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip libs.springframework/external/spring-framework-4.0.1.RELEASE.zip || die
-	ln -s "${DISTDIR}"/BFCC4C322190D6E3DD2FA9F191C0359D380D87C5-wagon-file-2.10.jar maven.embedder/external/wagon-file-2.10.jar || die
-	ln -s "${DISTDIR}"/4EF309C09ABB5F8B2D0C6A4010205DB185729CDC-wagon-http-2.10-shaded.jar maven.embedder/external/wagon-http-2.10-shaded.jar || die
-	ln -s "${DISTDIR}"/3B96251214DF697E902C849EB0B4A0EFA2CD1A53-wagon-http-shared-2.10.jar maven.embedder/external/wagon-http-shared-2.10.jar || die
-	ln -s "${DISTDIR}"/0CD9CDDE3F56BB5250D87C54592F04CBC24F03BF-wagon-provider-api-2.10.jar maven.embedder/external/wagon-provider-api-2.10.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into libs.cglib/external cglib-3 cglib.jar cglib-2.2.jar
-	java-pkg_jar-from --build-only --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
-	java-pkg_jar-from --into maven.embedder/external jdom jdom.jar jdom-1.0.jar
-	java-pkg_jar-from --into o.jdesktop.beansbinding/external beansbinding beansbinding.jar beansbinding-1.2.1.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/java >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-	grep -E "/java$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	chmod 755 "${D}"/${INSTALL_DIR}/maven/bin/mvn* || die
-	rm -fr "${D}"/${INSTALL_DIR}/maven/bin/*.bat || die
-
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/maven/lib
-	pushd "${instdir}" >/dev/null || die
-	rm commons-cli-1.2.jar && java-pkg_jar-from --into "${instdir}" commons-cli-1 commons-cli.jar commons-cli-1.2.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext
-	pushd "${instdir}" >/dev/null || die
-	rm AbsoluteLayout.jar  && java-pkg_jar-from --into "${instdir}" absolutelayout absolutelayout.jar AbsoluteLayout.jar
-	rm beansbinding-1.2.1.jar && java-pkg_jar-from --into "${instdir}" beansbinding beansbinding.jar beansbinding-1.2.1.jar
-	rm cglib-2.2.jar && java-pkg_jar-from --into "${instdir}" cglib-3 cglib.jar cglib-2.2.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/hibernate4
-	pushd "${instdir}" >/dev/null || die
-	rm antlr-2.7.7.jar && java-pkg_jar-from --into "${instdir}" antlr antlr.jar antlr-2.7.7.jar
-	rm c3p0-0.9.2.1.jar && java-pkg_jar-from --into "${instdir}" c3p0 c3p0.jar c3p0-0.9.2.1.jar
-	rm cglib-2.2.jar && java-pkg_jar-from --into "${instdir}" cglib-3 cglib.jar cglib-2.2.jar
-	rm commons-collections-3.2.1.jar && java-pkg_jar-from --into "${instdir}" commons-collections commons-collections.jar commons-collections-3.2.1.jar
-	rm dom4j-1.6.1.jar && java-pkg_jar-from --into "${instdir}" dom4j-1 dom4j.jar dom4j-1.6.1.jar
-	rm javassist-3.18.1-GA.jar && java-pkg_jar-from --into "${instdir}" javassist-3 javassist.jar javassist-3.18.1-GA.jar
-	rm jboss-logging-3.1.3.GA.jar && java-pkg_jar-from --into "${instdir}" jboss-logging jboss-logging.jar jboss-logging-3.1.3.GA.jar
-	rm jboss-transaction-api_1.2_spec-1.0.0.Final.jar && java-pkg_jar-from --into "${instdir}" glassfish-transaction-api jta.jar jboss-transaction-api_1.2_spec-1.0.0.Final.jar
-	rm jtidy-r8-20060801.jar && java-pkg_jar-from --into "${instdir}" jtidy jtidy.jar jtidy-r8-20060801.jar
-	rm log4j-1.2.12.jar && java-pkg_jar-from --into "${instdir}" log4j log4j.jar log4j-1.2.12.jar
-	rm slf4j-api-1.6.1.jar && java-pkg_jar-from --into "${instdir}" slf4j-api slf4j-api.jar slf4j-api-1.6.1.jar
-	rm slf4j-log4j12-1.6.1.jar && java-pkg_jar-from --into "${instdir}" slf4j-log4j12 slf4j-log4j12.jar slf4j-log4j12-1.6.1.jar
-	rm slf4j-simple-1.6.1.jar && java-pkg_jar-from --into "${instdir}" slf4j-simple slf4j-simple.jar slf4j-simple-1.6.1.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxws22
-	pushd "${instdir}" >/dev/null || die
-	rm FastInfoset.jar && java-pkg_jar-from --into "${instdir}" fastinfoset fastinfoset.jar FastInfoset.jar
-	rm javax.mail_1.4.jar && java-pkg_jar-from --into "${instdir}" oracle-javamail mail.jar javax.mail_1.4.jar
-	rm mimepull.jar && java-pkg_jar-from --into "${instdir}" mimepull mimepull.jar
-	rm saaj-impl.jar && java-pkg_jar-from --into "${instdir}" saaj saaj.jar saaj-impl.jar
-	rm stax-ex.jar && java-pkg_jar-from --into "${instdir}" stax-ex stax-ex.jar
-	rm stax2-api.jar && java-pkg_jar-from --into "${instdir}" stax2-api stax2-api.jar
-	rm streambuffer.jar && java-pkg_jar-from --into "${instdir}" xmlstreambuffer xmlstreambuffer.jar streambuffer.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxws22/api
-	pushd "${instdir}" >/dev/null || die
-	rm jsr181-api.jar && java-pkg_jar-from --into "${instdir}" jsr181 jsr181.jar jsr181-api.jar
-	rm saaj-api.jar && java-pkg_jar-from --into "${instdir}" jsr67 jsr67.jar saaj-api.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/maven
-	pushd "${instdir}" >/dev/null || die
-	rm jdom-1.0.jar && java-pkg_jar-from --into "${instdir}" jdom jdom.jar jdom-1.0.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java
-}

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index a85c1dd..4d3dc87 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606100002-src.zip 215705826 SHA256 dc5bf896c73c9956c9f2d60fc999a041fe9a240daf2248e7a0ea26f3b12045c6 SHA512 bf3872a0ce352291ae2d36bb25fdfbaf5e403002c9ed21292451d6bbb4cddb34c120bba13481311217624b2628d4ef767731fb8c2ee8b54ef915078b647c6388 WHIRLPOOL 62f4833a881cd3f6be65268501981ace9edea20866e38019f26f89d3afdfe625b9934bf0344301c329326bbaebdf02a9c96653c510019768f5074fabb85568cc
 DIST netbeans-trunk-nightly-201606130002-src.zip 215706858 SHA256 1bb9ee5b464b0dae349efe93a2fe5628088015c7bb44f253070cba81d5542fda SHA512 d3e676034a9fa22fa3fed978c49da5d5ec66d1845a95fc2f2f600174f7af0386be87f449df3a99ce60b150fd65c22b7da9c0c588d3d92ffef10ddf05462fe65d WHIRLPOOL 7286ddcb1933236d02205c3cc3044ad5a9c0cec2fae68ae47bf4ddcb33fc801d560d5abb3c1f3b86fffab1c221833fa8f228efcb1c4db6703ea3118664c1b292
 DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
 EBUILD netbeans-javacard-8.0.2.ebuild 4906 SHA256 944fee40d693c2c287e748f70ba565f3cd84bb7c19110f8be716134ec20694a7 SHA512 1f66cd2756effbfde7d43f9da7d8d93cb6252c58a02ee3d821f6faeaf63bf3c63e28f80c6eb44689e3aa954452a2f3893c65e75de84158dff1da0d94cafea14a WHIRLPOOL 88197e03008b8acb1ce62f72783bb096d9a3fc2a289b83367841a8adbee2bf822031f9bd6051831515ee44b1d5d2a109c5646f98ca723506f27c874301fb4189
 EBUILD netbeans-javacard-8.1.ebuild 4930 SHA256 5342d0d3f4207da3d36eb19f0fa78015f33b4a6e6435fcf43b7f568afabb9d02 SHA512 5275ae0fd617e26cd8580f6256a766bdd9cc0299f5a488be5a97744ec6abddf262e5fb1db358b9ac00203bbedfe7ac152828b174856d9cf6fa06e1e2128e219b WHIRLPOOL 427bfed5b61a421340acf7ec0cfb5e88a8b4a68cb546b9d0546b7c69ab0e29700d03e2bf58641bde63a2a43579b0521c028cf57dbf25af280fb0732565a30617
-EBUILD netbeans-javacard-9999_p20160610.ebuild 4971 SHA256 d30ccf3bbe400edcfbf4d1a63441b5088387b0fc4c5ca361f98689bc34aa53dc SHA512 b21f9e3b49ed630ffe3e4f5e43c921f6b5f999bd6be279b735be562af96406558998df8dfad77e8b6db97973ae487bfb7cb783d915b3d00d2a464c9ff62d0728 WHIRLPOOL c9a60e755ef715dea69c1fb6decac600da5b5ab700e19ad63c0eeeaefb9a44088f09815499b1b957c34838a59835d84d92ad5494dc3d9549d8f77cc7a4662df7
 EBUILD netbeans-javacard-9999_p20160613.ebuild 4971 SHA256 5483e0c2de8069a5e708485fdbfe4c53d99dc17adcde9eb3ba06db80c1f05578 SHA512 fa0fd53c2017e0771652878c50ae9034963ae946fba7f8da33dd41671fe81a4a0761887a0ddbe8c592f7ab4e20716a554e15017129792ae853a4b92deef972d8 WHIRLPOOL 5ecd471ed031cc471b64e85a2bf578fff757a49a95ba0340676e0951881e6424f628a95dee88afe6a053d22a50a04da0eba2ed1605c8e776d28da3d7bd9cc036
 EBUILD netbeans-javacard-9999_p20160614.ebuild 4971 SHA256 a5f78b5059b09a0f38537ac49de89254f02395395513f1bac38b95bbb2151694 SHA512 80f779b18a7590db2aa2eead52a365a156c0cf18eeb678241cfa9ec1be54f63e8e76a1b95fb090a9c5bc15fbb1ce7272eba84665199d84fe910269ae135af253 WHIRLPOOL dfb6c912706f4df2e57f01f92e0e0bcc93f175455863987ed86144d12b8c60605ce98c35c8ea0dfbba1d0ab1d61eda22fdd147a93ea2cb923ae14ccd7475643a
 EBUILD netbeans-javacard-9999_p20160615.ebuild 4971 SHA256 ec2ef842558671cca4b85256ba7691093d68be09be62cb83961a6916c3ea64a9 SHA512 29f73d3b8f17bb7aedd4a53aa835c32f9a9cb121b421b770bd120bfba565bf27a2f056ce774ca49a6304943cff4f5bc3c4f59fae2208aa1d16fb7f89537a858a WHIRLPOOL ef4f09d20f2578209cf02d5409b04a70a3c6a9b60ce41c63c409e0cc13cccddd52f792e70329ae1daa44eb32c53e45472fdb8260e88cb5a748deec33c269e1a0

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160610.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160610.ebuild
deleted file mode 100644
index 3b1cafc..0000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160610.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans JavaCard Cluster"
-HOMEPAGE="http://netbeans.org/projects/javacard"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-10_00-02-33/zip/netbeans-trunk-nightly-201606100002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar
-	http://hg.netbeans.org/binaries/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar
-	http://hg.netbeans.org/binaries/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}
-	dev-java/ant-contrib:0
-	dev-java/asm:3
-	dev-java/bcel:0
-	dev-java/commons-cli:1
-	dev-java/commons-codec:0
-	dev-java/commons-httpclient:3
-	dev-java/commons-logging:0"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.javacard -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar javacard.ri.platform/external/anttasks.jar || die
-	ln -s "${DISTDIR}"/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar javacard.apdu.io/external/apduio.jar || die
-	ln -s "${DISTDIR}"/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip javacard.ri.bundle/external/javacard_ri.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/javacard >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/javacard$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	rm -fr "${D}"/${INSTALL_DIR}/bin || die
-
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/JCDK3.0.2_ConnectedEdition/lib
-	pushd "${instdir}" >/dev/null || die
-	rm ant-contrib-1.0b3.jar && java-pkg_jar-from --into "${instdir}" ant-contrib ant-contrib.jar ant-contrib-1.0b3.jar
-	rm asm-all-3.1.jar && java-pkg_jar-from --into "${instdir}" asm-3 asm.jar asm-all-3.1.jar
-	rm bcel-5.2.jar && java-pkg_jar-from --into "${instdir}" bcel bcel.jar bcel-5.2.jar
-	rm commons-cli-1.0.jar && java-pkg_jar-from --into "${instdir}" commons-cli-1 commons-cli.jar commons-cli-1.0.jar
-	rm commons-codec-1.3.jar && java-pkg_jar-from --into "${instdir}" commons-codec commons-codec.jar commons-codec-1.3.jar
-	rm commons-httpclient-3.0.jar && java-pkg_jar-from --into "${instdir}" commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.0.jar
-	rm commons-logging-1.1.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar commons-logging-1.1.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/javacard
-}

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index 3c5d347..630163c 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -5,7 +5,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606100002-src.zip 215705826 SHA256 dc5bf896c73c9956c9f2d60fc999a041fe9a240daf2248e7a0ea26f3b12045c6 SHA512 bf3872a0ce352291ae2d36bb25fdfbaf5e403002c9ed21292451d6bbb4cddb34c120bba13481311217624b2628d4ef767731fb8c2ee8b54ef915078b647c6388 WHIRLPOOL 62f4833a881cd3f6be65268501981ace9edea20866e38019f26f89d3afdfe625b9934bf0344301c329326bbaebdf02a9c96653c510019768f5074fabb85568cc
 DIST netbeans-trunk-nightly-201606130002-src.zip 215706858 SHA256 1bb9ee5b464b0dae349efe93a2fe5628088015c7bb44f253070cba81d5542fda SHA512 d3e676034a9fa22fa3fed978c49da5d5ec66d1845a95fc2f2f600174f7af0386be87f449df3a99ce60b150fd65c22b7da9c0c588d3d92ffef10ddf05462fe65d WHIRLPOOL 7286ddcb1933236d02205c3cc3044ad5a9c0cec2fae68ae47bf4ddcb33fc801d560d5abb3c1f3b86fffab1c221833fa8f228efcb1c4db6703ea3118664c1b292
 DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
@@ -31,7 +30,6 @@ DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
 EBUILD netbeans-javadoc-8.0.2.ebuild 5993 SHA256 baf9da38d87b86eb8ed10ef46017361f36ca8583dd90885c9d1667a51851bc52 SHA512 892bc25b30dc26e3ee7c8be9aaf8542c00a7fa1d1d8f883d82bebb816edfa93e1ee9abeac1b0c47ecc8b4169bcaded56c5c71f18151fdc22fe241fcee0fd4521 WHIRLPOOL 2012f28f3ba5074b4d262b20e9a1c8ddf590ce444339ec1a404c890867c1271e38f9f9e09717d0648fae061553f5c8da3d97a70c35c8e853fe4894fb6fd4ec96
 EBUILD netbeans-javadoc-8.1.ebuild 6247 SHA256 5f0ab01cbea85353ac471a46e341750785f4889732c9da111d77b87bbd1bcc2d SHA512 4a4636f4f58a9baba9d9f5bac4ee7d4f57c0e07d6790902d34974383660f2926c4c4b16a27bacc2a3a7a0a6d5b7699caae90bb2ac513ac8e0535e46d11ec345e WHIRLPOOL 9cbac0234b9f1a8122df116512d5154b7e85561fd9541e0a77dc5c2b5863cf3238400ac17d05499e950705309faa97caace6da00c912ea07d6a74b0076f683ed
-EBUILD netbeans-javadoc-9999_p20160610.ebuild 6293 SHA256 facb83557f4a7c21d0e4ea6dc5b9c6fc33258bd1b459dc3b1ec28402fe328662 SHA512 f4f60a7be3feeb66d80cb68194489e6e7583dbf649b6defbbc821cd0683a04dbff8dcc03c69f985f08a3e46f20db308b3009fb9e70c040637226f89026ab70b8 WHIRLPOOL e47f1c6d1540cb8040355a2569f7296f8054b5c3bc7dfadac568707f77c648f1f1f0fa5ba168c91e183bdf270b59669824cd0e5613c484ea19db290943bbd201
 EBUILD netbeans-javadoc-9999_p20160613.ebuild 6293 SHA256 7350990790e9615b04686d7229412f233d47a0bb453d8c481ab670f17ab29c81 SHA512 50d67d5e134c3e1c1be32abf685e72afa6e789d314083a8071afd5c4b08daf19e66281d3316a82a3564f3fe7851c5e51ff33cdf240710ce00159a9d683d9eca8 WHIRLPOOL d79fb8727ce2ba9bce59c269ac5dcb6043f80bdcfaa8ef6a5956b1f710f1af1f0a534bd68a47513626a0ab963a892b39ae66a4a07a4e7675e0e2053198f0c2dc
 EBUILD netbeans-javadoc-9999_p20160614.ebuild 6293 SHA256 fb96bef4686e43ad7801343e059ba7f214662c0ed37a0afece60c0214be66afe SHA512 0255b3ec42bf7deb1e44b50b1eb9982214979112c844b635be23fdc2bd0a72f2baa4ea5819620deddf42f9f828f846e8c232df91def62b2a3512a4a9596ad176 WHIRLPOOL c1341eb9644a5606e8dada9b702a112c9fdb71d7b8df80b22530a6917d7661cb55291838cebe8aed28028634b7fb71aa6c7bc18fb278ca63bc8929425954a609
 EBUILD netbeans-javadoc-9999_p20160615.ebuild 6293 SHA256 e663d34186e5722da7122ab2e9f9c663e79c3852c279722f87e824fc5d83ddf0 SHA512 0bc4681fe0e5a4235123854ca7cffb8ae4b61293efe4a91037ac070db05b6c457daffe525db4e0b3a92ecb11afc430057e9b9fde24ec4ad15e113928286dc6a4 WHIRLPOOL 3fd1e201f5b55b95156f1fbdc109320547fb7fc6973ecf935d274d456fea07deb54a2d894d5e7116a4e21c4f2353bdcdf59fb4e64fdf43fd9b7e0ced39696877

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160610.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160610.ebuild
deleted file mode 100644
index c472806..0000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160610.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans JavaDocs"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-10_00-02-33/zip/netbeans-trunk-nightly-201606100002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-# oracle-jdk-bin is needed because of javafx which is not currently packaged separately
-DEPEND="dev-java/oracle-jdk-bin:1.8[javafx]
-	app-arch/unzip
-	dev-java/javahelp:0
-	dev-java/junit:4
-	~dev-java/netbeans-apisupport-${PV}
-	~dev-java/netbeans-cnd-${PV}
-	~dev-java/netbeans-dlight-${PV}
-	~dev-java/netbeans-enterprise-${PV}
-	~dev-java/netbeans-ergonomics-${PV}
-	~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-groovy-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-javacard-${PV}
-	~dev-java/netbeans-mobility-${PV}
-	~dev-java/netbeans-nb-${PV}
-	~dev-java/netbeans-php-${PV}
-	~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-profiler-${PV}
-	~dev-java/netbeans-websvccommon-${PV}"
-RDEPEND=""
-
-JAVA_PKG_BSFIX="off"
-JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.8"
-JAVA_PKG_WANT_SOURCE="1.7"
-JAVA_PKG_WANT_TARGET="1.7"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip o.apache.tools.ant.module/external/ant-libs-1.9.7.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-apisupport-${SLOT} apisupport || die
-	cat /usr/share/netbeans-apisupport-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.apisupport.built
-
-	ln -s /usr/share/netbeans-cnd-${SLOT} cnd || die
-	cat /usr/share/netbeans-cnd-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.cnd.built
-
-	ln -s /usr/share/netbeans-dlight-${SLOT} dlight || die
-	cat /usr/share/netbeans-dlight-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.dlight.built
-
-	ln -s /usr/share/netbeans-enterprise-${SLOT} enterprise || die
-	cat /usr/share/netbeans-enterprise-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.enterprise.built
-
-	ln -s /usr/share/netbeans-ergonomics-${SLOT} ergonomics || die
-	cat /usr/share/netbeans-ergonomics-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ergonomics.built
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-groovy-${SLOT} groovy || die
-	cat /usr/share/netbeans-groovy-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.groovy.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-javacard-${SLOT} javacard || die
-	cat /usr/share/netbeans-javacard-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.javacard.built
-
-	ln -s /usr/share/netbeans-mobility-${SLOT} mobility || die
-	cat /usr/share/netbeans-mobility-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.mobility.built
-
-	ln -s /usr/share/netbeans-nb-${SLOT}/nb nb || die
-	cat /usr/share/netbeans-nb-${SLOT}/nb/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.nb.built
-
-	ln -s /usr/share/netbeans-php-${SLOT} php || die
-	cat /usr/share/netbeans-php-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.php.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-profiler-${SLOT} profiler || die
-	cat /usr/share/netbeans-profiler-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.profiler.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	eant -Dpermit.jdk8.builds=true -f nbbuild/build.xml bootstrap || die
-	ANT_OPTS="-Xmx1536m" eant -Dpermit.jdk8.builds=true -f nbbuild/javadoctools/build.xml build-javadoc
-}
-
-src_install() {
-	rm nbbuild/build/javadoc/*.zip
-	java-pkg_dojavadoc nbbuild/build/javadoc
-}

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 569ff80..1a1e6ca 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -11,7 +11,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606100002-src.zip 215705826 SHA256 dc5bf896c73c9956c9f2d60fc999a041fe9a240daf2248e7a0ea26f3b12045c6 SHA512 bf3872a0ce352291ae2d36bb25fdfbaf5e403002c9ed21292451d6bbb4cddb34c120bba13481311217624b2628d4ef767731fb8c2ee8b54ef915078b647c6388 WHIRLPOOL 62f4833a881cd3f6be65268501981ace9edea20866e38019f26f89d3afdfe625b9934bf0344301c329326bbaebdf02a9c96653c510019768f5074fabb85568cc
 DIST netbeans-trunk-nightly-201606130002-src.zip 215706858 SHA256 1bb9ee5b464b0dae349efe93a2fe5628088015c7bb44f253070cba81d5542fda SHA512 d3e676034a9fa22fa3fed978c49da5d5ec66d1845a95fc2f2f600174f7af0386be87f449df3a99ce60b150fd65c22b7da9c0c588d3d92ffef10ddf05462fe65d WHIRLPOOL 7286ddcb1933236d02205c3cc3044ad5a9c0cec2fae68ae47bf4ddcb33fc801d560d5abb3c1f3b86fffab1c221833fa8f228efcb1c4db6703ea3118664c1b292
 DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
@@ -37,7 +36,6 @@ DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
 EBUILD netbeans-javafx-8.0.2.ebuild 4647 SHA256 15e5e0b1c4729852dd55e5bfb2dcb520ba7c959bd9927d315c0abcb3f94e4ecc SHA512 520c60264fee67b0ccfd50ced0cc8586d5653d5186fa75c6b7cd8b400aae834de446b7e6145ad38df7e68207391fb360ef4834140e096d48add568fed387ac98 WHIRLPOOL 416a56ceb2ba85e3923ada0c8ef485cdd6fa16b3423b8fd0de523fa54dd082cbaedee5da4f1a92b50e440195f9256376f50e99a850d70ccdcb8c0ff370007f7c
 EBUILD netbeans-javafx-8.1.ebuild 4671 SHA256 2a12bebaca0ddbb03b84c33de7f5933f76a8381db3c40013fc4014687ded6cd4 SHA512 ff410f96e808c414e3e9485461866239080098e46e843ee771a78a0afffddc1c776697dccb276daf7f87dadf915a212bfe9c2a07b3a8a9057cb3ea19b77163fb WHIRLPOOL 51729142255a16d4cd949d4bf5f3b681d36bc83f30dad39aad9d1dd56f7dcec0dae4377817350e7947d518129a74eec7f227c3cb1600ac168ea90d056b87d195
-EBUILD netbeans-javafx-9999_p20160610.ebuild 4717 SHA256 fc04fdf3929a393b8c97edcb4217b455c2b0a456307743da42a7c3ae1984fc4e SHA512 6544788ea55fc71609bb70cecfe817344d799a1f8b3987127b3e008811ecc40980a9b526c6b691c47d9b469f014c43fabab70927936b0692e2f69cd64e165357 WHIRLPOOL a4771073dbd29e23c504d8760bfa18112e4940688c17eb3fb38ab33dda15fc928032bf5c1061d3283ca3e0411c026153f52fef961be4f16d0fb2cf7424481a1a
 EBUILD netbeans-javafx-9999_p20160613.ebuild 4717 SHA256 a6e4bb5e4cf5be13abf3a40def21b9e7c74b673766a1ed678e268dcd1e962911 SHA512 d6f074a1965d8f9e5a759412e3651deb3e7d2cbe208ffac530843588508c9ee25018b7b011f3150af1264c4c25637973e52389eb1672bdfe67d9bab9569f70b6 WHIRLPOOL 4791dce6ec4f17c57eab3ac19ae5eb50cb8f1eadcb1ca1fe519dc169d4dca19671b57757575ce50621b5147074e3c8bf893c1f8c2228a6eeba17b104fa04c21a
 EBUILD netbeans-javafx-9999_p20160614.ebuild 4717 SHA256 2cd838ed81c37b4fc5d18f884908c7edbbbe4302fd0fb54d665f49b5552f3c70 SHA512 67027e9d8a697355c9cfe54f7177f47bfd81fd19c4e78f1176c0cb3edaa1b0858dfb741e532aed0c0b4010eef026e41c0b65407e2f7384328d4b7e1e1c385e0a WHIRLPOOL 44d6f03da201d4716bfda59086ec9514525f42c7978356d331e0d01222ec217944f375ed57eb0fb1d5ee479b8fe9626b3284273c56d087e538e500d693fbf8db
 EBUILD netbeans-javafx-9999_p20160615.ebuild 4717 SHA256 7c25503a4f1a7cfeed68365182858e64c56d3a0d637edd767d014d29479ba363 SHA512 a162349dc2231c53afe41b0423d9a43234546e85a4b65197d3dd10dd21e802d3fb82bb125dac7bd09855e87ba016eb0b5b34fc27f546e631ab19257434fc5700 WHIRLPOOL 4df48ff0bf2c2b4c6abd11a92e42b32542cebb8aa3eb3bea9ced715f8226917bc5e97b5be5e23b5ee70b586ad1465e96840b123388a1804d83dd458748a41fb3

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160610.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160610.ebuild
deleted file mode 100644
index b873431..0000000
--- a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160610.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans JavaFX Cluster"
-HOMEPAGE="http://netbeans.org/projects/javafx"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-10_00-02-33/zip/netbeans-trunk-nightly-201606100002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
-	http://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar
-	http://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip
-	http://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip
-	http://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar
-	http://hg.netbeans.org/binaries/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0
-	dev-java/junit:4"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.javafx -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar apisupport.harness/external/bindex-2.2.jar || die
-	ln -s "${DISTDIR}"/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar apisupport.harness/external/jnlp-servlet.jar || die
-	ln -s "${DISTDIR}"/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar jemmy/external/jemmy-2.3.1.1.jar || die
-	ln -s "${DISTDIR}"/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip jemmy/external/jemmy-2.3.1.1-doc.zip || die
-	ln -s "${DISTDIR}"/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip jemmy/external/jemmy-2.3.1.1-src.zip || die
-	ln -s "${DISTDIR}"/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into apisupport.harness/external javahelp jsearch.jar jsearch-2.0_05.jar
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/javafx >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/javafx$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/javafx
-}

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 121a951..101f087 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606100002-src.zip 215705826 SHA256 dc5bf896c73c9956c9f2d60fc999a041fe9a240daf2248e7a0ea26f3b12045c6 SHA512 bf3872a0ce352291ae2d36bb25fdfbaf5e403002c9ed21292451d6bbb4cddb34c120bba13481311217624b2628d4ef767731fb8c2ee8b54ef915078b647c6388 WHIRLPOOL 62f4833a881cd3f6be65268501981ace9edea20866e38019f26f89d3afdfe625b9934bf0344301c329326bbaebdf02a9c96653c510019768f5074fabb85568cc
 DIST netbeans-trunk-nightly-201606130002-src.zip 215706858 SHA256 1bb9ee5b464b0dae349efe93a2fe5628088015c7bb44f253070cba81d5542fda SHA512 d3e676034a9fa22fa3fed978c49da5d5ec66d1845a95fc2f2f600174f7af0386be87f449df3a99ce60b150fd65c22b7da9c0c588d3d92ffef10ddf05462fe65d WHIRLPOOL 7286ddcb1933236d02205c3cc3044ad5a9c0cec2fae68ae47bf4ddcb33fc801d560d5abb3c1f3b86fffab1c221833fa8f228efcb1c4db6703ea3118664c1b292
 DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
@@ -29,7 +28,6 @@ DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
 EBUILD netbeans-mobility-8.0.2.ebuild 4342 SHA256 e9b4ff8fe38904346bc21a82219696e97322bf9df4e9d4cad2259b6f08bbe7f9 SHA512 338711fe61c469cee80e499ddf8c3ad70a3a38e6658311afcd1d24edd1a99b87566fafcbd392bb958b589796e0913d2574b07570870c8d3382a91a324227082f WHIRLPOOL 855b2817c36bea67c8fb368a0740be18b71dbebb2b98a154552f002a56eaff34f54eee2698379d7200a6042c1de699df23e7717b5b6c532776852d8757b74cb0
 EBUILD netbeans-mobility-8.1.ebuild 4366 SHA256 fe10d103a284b8f82b67179ea52d51d57b43cfc4a4084b97e3f9650526621497 SHA512 36bdf0948b41bfe4f9c66fe093030d5f27b90f5a89be94dfbd176e3887b249d5aa3eb9b0924df142291f0d693f274eef840ed3a7f658106847327befd0374710 WHIRLPOOL f9dd44e6401367b2df73c5f1428bff53547ac012068297667666d0241c29310aed4413a368e5350a996af37ad026e875325467b1a165cba6953d99a5da3a0d76
-EBUILD netbeans-mobility-9999_p20160610.ebuild 4412 SHA256 0a5ef9a95527bd4b00c6e5ab1354e2b33571dac38ed772b671df19494cda9601 SHA512 f4801ed135b525e33909b06325794451a2da6c65fb232695e34ec1bbc427851241966f37a072fc57d2117da1526ca984f7c76c3d54d1993cc56e291ba711bd14 WHIRLPOOL b1f29286a279cca3ee9b538e2ae6f1f7c196b5f9e89b20065fe12eb32ab459972306c3cbfa6c4a3510a939ab1d54c67c69574e72d52e351f3fa64b49914ca005
 EBUILD netbeans-mobility-9999_p20160613.ebuild 4412 SHA256 6ccd4115395214411217851c1521a076789f673cba27af69f8899174f63c330a SHA512 b961254aa0421798d83eaf012142429f97a4761df80a9539f4ac157af76c58f8ec282839f2ea1160db70295a57665b5a07841e2059edb452d5788922675b0e47 WHIRLPOOL 3388b48379db701623f44830f11003b2e5b8285604998e4088e77c71623af92acbe0b2c0773fcf6656749cf2df34f82ac96f4f38337d44c6b911f50a3c97853e
 EBUILD netbeans-mobility-9999_p20160614.ebuild 4412 SHA256 05399dedeac13996dd0aa1666e129cedf066d7f785438005cf7aff67e78bd966 SHA512 f9695296f0d06105faf5ca02cbe9884373ea585fec0a6f6eb3d1727ae608c84c83b5abaef7f4a5b742ebf358e9e43860b9400d08af529c71b74453337648e271 WHIRLPOOL 8a8f9950d746d6382e1f3af3f8650de708c376307245c7dad88c06976e02e33d2c009b15ebb38095711ad9a7013682794f000871c7c4a34acc139d9f2171e3a4
 EBUILD netbeans-mobility-9999_p20160615.ebuild 4412 SHA256 2b9b9dfcb8549b1d1d8032067c58c92638f1a7213b79c19a134bf0ccb519beab SHA512 06499a42dcdccc30faf8c54bbd76571c25002cf604471098cde9895c6a910d0fa78a2ca685280de1df9c50731c5798acf25e536651bad72a354c7387f9e5740b WHIRLPOOL 2c60b0549f413c6336ad5f05c13e0dc69111f0e0f68eac72c8e87f99b184e53d429ae7afabbf106086fab21e116d9a550ae14786089bbce3d8b423b194a5fb5b

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160610.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160610.ebuild
deleted file mode 100644
index f200f44..0000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160610.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Mobility Cluster"
-HOMEPAGE="http://netbeans.org/features/platform/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-10_00-02-33/zip/netbeans-trunk-nightly-201606100002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-apisupport-${PV}
-	~dev-java/netbeans-enterprise-${PV}
-	~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-websvccommon-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.mobility -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f | grep -vE "mobility.databindingme/lib/netbeans_databindingme.*\.jar" \
-		| grep -v "vmd.components.midp/netbeans_midp_components_basic/dist/netbeans_midp_components_basic.jar" \
-		| grep -v "vmd.components.midp.pda/netbeans_midp_components_pda/dist/netbeans_midp_components_pda.jar" \
-		| grep -v "vmd.components.midp.wma/netbeans_midp_components_wma/dist/netbeans_midp_components_wma.jar" \
-		| grep -v "vmd.components.svg/nb_svg_midp_components/dist/nb_svg_midp_components.jar" | xargs rm
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-apisupport-${SLOT} apisupport || die
-	cat /usr/share/netbeans-apisupport-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.apisupport.built
-
-	ln -s /usr/share/netbeans-enterprise-${SLOT} enterprise || die
-	cat /usr/share/netbeans-enterprise-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.enterprise.built
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/mobility >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/mobility$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	rm -rf "${D}"/${INSTALL_DIR}/modules/lib || die
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/mobility
-}

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index e525e89..ec89fc1 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606100002-src.zip 215705826 SHA256 dc5bf896c73c9956c9f2d60fc999a041fe9a240daf2248e7a0ea26f3b12045c6 SHA512 bf3872a0ce352291ae2d36bb25fdfbaf5e403002c9ed21292451d6bbb4cddb34c120bba13481311217624b2628d4ef767731fb8c2ee8b54ef915078b647c6388 WHIRLPOOL 62f4833a881cd3f6be65268501981ace9edea20866e38019f26f89d3afdfe625b9934bf0344301c329326bbaebdf02a9c96653c510019768f5074fabb85568cc
 DIST netbeans-trunk-nightly-201606130002-src.zip 215706858 SHA256 1bb9ee5b464b0dae349efe93a2fe5628088015c7bb44f253070cba81d5542fda SHA512 d3e676034a9fa22fa3fed978c49da5d5ec66d1845a95fc2f2f600174f7af0386be87f449df3a99ce60b150fd65c22b7da9c0c588d3d92ffef10ddf05462fe65d WHIRLPOOL 7286ddcb1933236d02205c3cc3044ad5a9c0cec2fae68ae47bf4ddcb33fc801d560d5abb3c1f3b86fffab1c221833fa8f228efcb1c4db6703ea3118664c1b292
 DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
 EBUILD netbeans-nb-8.0.2.ebuild 4927 SHA256 7531e50c4d76608bf925efdba4f54f522de3a8ceeef4d48807fb4ee48bfabdf6 SHA512 925734f331cf228066c5c9e614f48b756af31cac8b559cfe756347b6a2cb0ce362c7c41489a25084f2ed3f2e415baefd148a54f39fc00269fb14179efe056cb9 WHIRLPOOL e3224c5f22bb8e4792a5f98bbe819e071ff18c99533ce05a3fc1c5898ddcca1e3ce34487ba78159bb4d60155acdf15ae4fe81189ff2d5b1bc77ffd9ee4e20aca
 EBUILD netbeans-nb-8.1.ebuild 4065 SHA256 c1bfd704ecaa1fd62b149114b7391b4633a90a8a1d87645b833731920aa6efbb SHA512 56bda99c3d05522d5becb032177e4b4411d862d18a069e2d4343ddc8b08d05ed6c3199588e28aece7e583ccc9f95517621780a246bdd65c7d3edf072a61ef1cb WHIRLPOOL b9a43e6b4ada929bcf2aaed0bffe9cdfe0b9dbbf001e8ee4f2ab3cf8a08e27d318ea435d0580c80fd23cf921d261ca9b54d54a2b2e7a53173f955bde03aa0a12
-EBUILD netbeans-nb-9999_p20160610.ebuild 4111 SHA256 552b4c886590de49ec1d96f0ab91102ff64d4844a99d245dbb2b09599dc5259f SHA512 bc3be49d3aa70c1f1f86fdc5b606d6a002b9c76d8bd0e55a4a3aaf390eb1c5febc006cc6cc93c0aa1f5e31da4aa0c44a0de56dc4da061efc8ee75039e746f890 WHIRLPOOL 3267528c488eed278ec464bd305fa9505476eb74649e47fe40cf9476a0c79eeaafd592c052f601aa06015b5b36a8bd4221e510e388f54356d577805946192006
 EBUILD netbeans-nb-9999_p20160613.ebuild 4111 SHA256 88f1338cfbd639272d59683e42e2cba4a58dc7aaca0b67515d0ea9147c544429 SHA512 41a86de8ac48e71121caa41073f2fa05a0244577f8c85cde6759fdaf252396bb5af326f9d2c9b1d10ab23ed84119bab9de311f3b162aad42f8e74b5e636b961d WHIRLPOOL 68ba4411a2b8d62bfefc22ab2609d8bcbc6f1e9fd7be4b3981f8891cd585b8d89209ab98524f14973978705b1db689dcec841d2d9b1d9552b731b6c2dfd96f8c
 EBUILD netbeans-nb-9999_p20160614.ebuild 4111 SHA256 168a3c8ffa6c109af93f44dd247c652e7156cd763c3019553593d972a8e7498f SHA512 4d244ab7198d01106cabd4fa91729b93560b88a1430e11fff80507963e8cfebcf5a97ea42bd3486646f885634956eeb65440a045b9bc31fe817c29cd9e12382f WHIRLPOOL 71092e3fee7de0b4f2c99959d6e8b3967441913322de20a69216020d5c718850dcd95bf7b17b30b99f031b2752c7619720b909751674ed7a020cccca20138782
 EBUILD netbeans-nb-9999_p20160615.ebuild 4111 SHA256 cbd3ccf2f982bd007679f72177c71708d3e4affff56b5caf182d230678a39268 SHA512 617801fe4c79ca5b04f1c3c789006cc7abcf60bc941a89aab9199ef6c748659f671facea943daccdadef98e60b5bd9fffb924370388e4ec249c5857c5a29074d WHIRLPOOL 0bb78210d9985dc2381c61d247db93ee31af441f7a6dd835efbb787836673ae3492f8447ed4a8ea6f52786cf38c83b9a19198de405698aeda7054fc1344339a3

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160610.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160610.ebuild
deleted file mode 100644
index e36dc49..0000000
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20160610.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans IDE Branding"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-10_00-02-33/zip/netbeans-trunk-nightly-201606100002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster create-netbeans-import finish-build"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.nb -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans >/dev/null || die
-
-	insinto ${INSTALL_DIR}/nb
-
-	grep -E "/nb$" moduleCluster.properties > "${D}"/${INSTALL_DIR}/nb/moduleCluster.properties || die
-
-	insinto ${INSTALL_DIR}
-	doins -r nb
-	dodoc *.txt
-	dohtml *.html *.css
-
-	insinto ${INSTALL_DIR}/bin
-	doins bin/netbeans
-	dosym ${INSTALL_DIR}/bin/netbeans /usr/bin/netbeans-${SLOT}
-	fperms 755 ${INSTALL_DIR}/bin/netbeans
-
-	insinto /etc/netbeans-${SLOT}
-	doins etc/*
-	dosym /etc/netbeans-${SLOT} ${INSTALL_DIR}/etc
-
-	# fix paths per bug# 163483
-	if [[ -e "${D}"/${INSTALL_DIR}/bin/netbeans ]]; then
-		sed -i -e "s:\"\$progdir\"/../etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans
-		sed -i -e "s:\"\${userdir}\"/etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans
-	fi
-
-	dodir /usr/share/icons/hicolor/32x32/apps
-	dosym ${INSTALL_DIR}/nb/netbeans.png /usr/share/icons/hicolor/32x32/apps/netbeans-${SLOT}.png
-	dodir /usr/share/icons/hicolor/128x128/apps
-	cp "${DISTDIR}"/netbeans-7.0.png "${D}"/usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png || die
-	dosym /usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png /usr/share/pixmaps/netbeans-${SLOT}.png
-
-	popd >/dev/null || die
-
-	make_desktop_entry netbeans-${SLOT} "Netbeans ${PV}" netbeans-${SLOT} Development
-
-	mkdir -p  "${D}"/${INSTALL_DIR}/nb/config || die
-	echo "NBGNT" > "${D}"/${INSTALL_DIR}/nb/config/productid || die
-}

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index ee8c889..b314a5e 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -8,7 +8,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606100002-src.zip 215705826 SHA256 dc5bf896c73c9956c9f2d60fc999a041fe9a240daf2248e7a0ea26f3b12045c6 SHA512 bf3872a0ce352291ae2d36bb25fdfbaf5e403002c9ed21292451d6bbb4cddb34c120bba13481311217624b2628d4ef767731fb8c2ee8b54ef915078b647c6388 WHIRLPOOL 62f4833a881cd3f6be65268501981ace9edea20866e38019f26f89d3afdfe625b9934bf0344301c329326bbaebdf02a9c96653c510019768f5074fabb85568cc
 DIST netbeans-trunk-nightly-201606130002-src.zip 215706858 SHA256 1bb9ee5b464b0dae349efe93a2fe5628088015c7bb44f253070cba81d5542fda SHA512 d3e676034a9fa22fa3fed978c49da5d5ec66d1845a95fc2f2f600174f7af0386be87f449df3a99ce60b150fd65c22b7da9c0c588d3d92ffef10ddf05462fe65d WHIRLPOOL 7286ddcb1933236d02205c3cc3044ad5a9c0cec2fae68ae47bf4ddcb33fc801d560d5abb3c1f3b86fffab1c221833fa8f228efcb1c4db6703ea3118664c1b292
 DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
 EBUILD netbeans-php-8.0.2.ebuild 4347 SHA256 585b2488d748f3d0f87c17c951870e167aac7bf10847428add786e4a8a446583 SHA512 1431305d4f340cb0a2c7c896c54d45f6f02ef82a4201f82053278b98511a5a4a68210317530e9cdf5cf1f495996d3a3f9c4b2c3c479aa407abd375072ab3182f WHIRLPOOL af8476f2ff2d119f2657e6be03cfea1160f86e41bd791f40609f1bc8a8aada46ba1081e4f2417b0fddde931fa4e43d20956c0fe1d4fdf3617b78d01afd23f9b4
 EBUILD netbeans-php-8.1.ebuild 4371 SHA256 a9e7565a8cbcc5dfca4d9449f43b959911c47ad8da59648e383ecce55c4b0064 SHA512 67d43532ea43abf007adce73e7da2345d9cc42229189ba90d254d7764e19e3fd3c86b990ea2fe08cf52e49422def481046fe6e0e447fdc1de1680ac59f51d9d3 WHIRLPOOL 433275570fd81db477180e58909ebd50b83cde03bd5df807cc9ee213e2f3a44f65f3ec4877851aa6322e7752969aa72313ee7b35b8ee07446e8c22be4321d536
-EBUILD netbeans-php-9999_p20160610.ebuild 4418 SHA256 aeefce987189e7044fdc44ce41318e406f72e764881a09013417fddfb1ae943d SHA512 ab28d6a39c4e4829b173d4251135592e50c7fd8259a5185bcaa6ceb4e99b62eccbcfbeea05e9bcd9c7eb552da179c024d52833d120deac5098d96bdd9850eaec WHIRLPOOL 75583536f813360042d96335f3595c2ccd184dd87128e84c6da7c16e362eecc969e21c17ba8a22bc9995c8f6dda3f0157d9b0d4ce28a0ef2aa4b1a82b4fec46e
 EBUILD netbeans-php-9999_p20160613.ebuild 4418 SHA256 0576a98b6ec0dde28ac3299fc2daf2cbe94faa5b3ce0ea0f5a07149e50046bd0 SHA512 bee626cf8ae056bd3f6532d28de2c12256e94fff302dd7cb898722da5d262e6a3d250a2c1bce1b4a6a0b153f65c23ca932b5cff60d7fee0d271e0313aa27743d WHIRLPOOL 6a46163485d06d46c05150e964d4b33a7acfc07327997c63cfd0e7d374a3486dc1d500a8deba5ab3b1fdf2809c05e61283bb95b84b6551c603acdbabfa3cbd1f
 EBUILD netbeans-php-9999_p20160614.ebuild 4418 SHA256 e7ef557d65dcde17857e167cc87bf0b35ee7d093964b2b4d663d4f70a8b30ea1 SHA512 77177aad36984e7bd6122386a03c73744364dd133b9f802a04dcf86352852f3ad6babb95c821b500bee80468edb069cf7fcbc465012bc6fff264e5b326bac693 WHIRLPOOL e37568e6e866c28d778a5ee9b391155706f57351d45d84104a8522035d7da01c12e9d7e8f63a7df4dff86123fd8159bc408ff17a6c4877a670dd15b78becc8e6
 EBUILD netbeans-php-9999_p20160615.ebuild 4418 SHA256 51ea0af18c35dfdc1290c76c2445def40a5922a7190c6a227ed9551e848815b8 SHA512 74e8867810f6e532ee878a89084093945300be7be7017f59ef12e117bb78c9b95a8b0a87094b9336e655553e8343d907228aefcb54984c79f3168463c339637f WHIRLPOOL 7d649f3a2c96d096debd7d5d388d48b3c69e599d4ae6e391e0beff2aef6d548780335975b976a9a6f50c4f64a8297f1951f62547bc0a9c2df23952cd17bb19c5

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160610.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160610.ebuild
deleted file mode 100644
index 187b26f..0000000
--- a/dev-java/netbeans-php/netbeans-php-9999_p20160610.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans PHP Cluster"
-HOMEPAGE="http://netbeans.org/projects/php"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-10_00-02-33/zip/netbeans-trunk-nightly-201606100002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip
-	http://hg.netbeans.org/binaries/472A52636BE09823B4E5F707071B31FB990A7375-phpsigfiles.zip
-	http://hg.netbeans.org/binaries/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-webcommon-${PV}
-	~dev-java/netbeans-websvccommon-${PV}
-	dev-java/javacup:0"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.php -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip php.phpdoc.documentation/external/phpdocdesc.zip || die
-	ln -s "${DISTDIR}"/472A52636BE09823B4E5F707071B31FB990A7375-phpsigfiles.zip php.project/external/phpsigfiles.zip || die
-	ln -s "${DISTDIR}"/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip php.editor/external/predefined_vars.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into libs.javacup/external javacup javacup.jar java-cup-11a.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-webcommon-${SLOT} webcommon || die
-	cat /usr/share/netbeans-webcommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.webcommon.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/php >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/php$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext
-	pushd "${instdir}" >/dev/null || die
-	rm java-cup-11a.jar && java-pkg_jar-from --into "${instdir}" javacup javacup.jar java-cup-11a.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/php
-}

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index d1131e9..694eca5 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -29,7 +29,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606100002-src.zip 215705826 SHA256 dc5bf896c73c9956c9f2d60fc999a041fe9a240daf2248e7a0ea26f3b12045c6 SHA512 bf3872a0ce352291ae2d36bb25fdfbaf5e403002c9ed21292451d6bbb4cddb34c120bba13481311217624b2628d4ef767731fb8c2ee8b54ef915078b647c6388 WHIRLPOOL 62f4833a881cd3f6be65268501981ace9edea20866e38019f26f89d3afdfe625b9934bf0344301c329326bbaebdf02a9c96653c510019768f5074fabb85568cc
 DIST netbeans-trunk-nightly-201606130002-src.zip 215706858 SHA256 1bb9ee5b464b0dae349efe93a2fe5628088015c7bb44f253070cba81d5542fda SHA512 d3e676034a9fa22fa3fed978c49da5d5ec66d1845a95fc2f2f600174f7af0386be87f449df3a99ce60b150fd65c22b7da9c0c588d3d92ffef10ddf05462fe65d WHIRLPOOL 7286ddcb1933236d02205c3cc3044ad5a9c0cec2fae68ae47bf4ddcb33fc801d560d5abb3c1f3b86fffab1c221833fa8f228efcb1c4db6703ea3118664c1b292
 DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
@@ -55,7 +54,6 @@ DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
 EBUILD netbeans-platform-8.0.2.ebuild 5406 SHA256 98e9861da45ead0d2d975a0527315df5282870b2d7e71a089724d91c18852e81 SHA512 cadbe66132d3ad81f6d149e20731b558c11c529e2ec15b1fe47ff97d99a3f4b4612fa5c98c435c4ff979eaefab6702721db009a03162202c96b4b411cf9f872a WHIRLPOOL 9552948e8bbad308f4379eaae69d8c214da9fbfab87d75226949b69ddca3e68c2d36c4d05738196073e5b959ab0b764064c9186d421198937122aa4bdc4988dc
 EBUILD netbeans-platform-8.1.ebuild 9320 SHA256 4a03fc6a399aaab949edb3df7c629da5bc7ce6288d44dbc848097352c2b4ae3a SHA512 7015cb042dd4e371cdcad49838eb2e4109d1ec505ac618f3a6f98d4dce328ab34be90a3cb0820896bd75337a180a1bd9c91c842a143fdffdf033696d5f496402 WHIRLPOOL 8c5311df396a374bf9d8c994b37c5c9fe6aa3c82a9e9e0824a5caefb0006fd9b44f4fdddd387ee12da48592929d5c4dd7e7fb2d866c9ddaf76acf5b3adbe310e
-EBUILD netbeans-platform-9999_p20160610.ebuild 9520 SHA256 54ca029900b0dda62865907d23485a0006bf9b44cfc605708f89ecc44c192f26 SHA512 bccb637854962b4ab23ce5336a341de040921f927013bb8e7cdeb81a8197bf85b9b086a5f9292aa3ec12cd5b4fee8548f894cf5d2a04b25c6b040d0c485064cc WHIRLPOOL 4b3cf002ae73e7bc4f94aba82054a92fc45cd2200a57cff5ee9469883171f922788175c02d60040bcf4df28233a9b997902b87c849a025a4a0ca77e34c19a27d
 EBUILD netbeans-platform-9999_p20160613.ebuild 9520 SHA256 fbdbf00bead6c9e4fbe65bf4d61ca333368fa36ce8374b4161dc8a095047f418 SHA512 3fc24ed23180297ae97c26b957434caa6aa3640a42e752faf45c84dc9822faa051c2b038f69e1fef4cc6a25132a06ce28d9c3edcf18e961e82e3cd26cb18a3e8 WHIRLPOOL cca2527c4a4d9ea8d8151ba8ffc03897cd1c7a56060fd950cacdfe3f1bcf87bf61d7f7c3da6c65343d0a582e5dfa647eb3207934fcaf63ad6e17c0723a41d253
 EBUILD netbeans-platform-9999_p20160614.ebuild 9520 SHA256 34c12f5c7aa190b190167e66abd35129889b96aeb20bac129d928376fd779d52 SHA512 beb785b098ee1d071e04100149652b597035da0ed399d42221e9a1c3cd9685b2235d2e981bc483b7adb436fefdbab0c5ba82440ce5afdad5d2f6e5551c1b1547 WHIRLPOOL b070f13d5e28fdb2efccbfbc38910ddb210a63e029cb746e6e3e0832157bcec51d12f2a7ddcfee0479c9f8dc35ee2c6edd86c5f2f911cd58cb0fad170628578c
 EBUILD netbeans-platform-9999_p20160615.ebuild 9520 SHA256 1d1ed4c8dce312810a9e608d5ab1b7f77e69f34a74a65baa6d85e39a50ba46ee SHA512 49874508e382242f2a795978cf9f53eb1f727bf57e3d7d8f1a9cf30bbc4664b62fc50126c95a8ebc92a006b3319be04631ba98d3d51073d817542efb2baa0c5a WHIRLPOOL 22c4f8f6910c84eff5e90740429f249af9d71d5353dfedadffeb18e2c71e6c1739192bd301b36bbb5677e0ed3d10a5671056715aa15bde6955a21ab920944fb2

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160610.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160610.ebuild
deleted file mode 100644
index 182489a..0000000
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20160610.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Platform"
-HOMEPAGE="http://netbeans.org/features/platform/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-10_00-02-33/zip/netbeans-trunk-nightly-201606100002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar
-	http://hg.netbeans.org/binaries/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar
-	http://hg.netbeans.org/binaries/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar
-	http://hg.netbeans.org/binaries/771CDCA0A3F2F3CE818E20CC2D707A3592422485-ko4j-1.3.jar
-	http://hg.netbeans.org/binaries/A3085BAA78C8EE7F55081E70C79ABE04CA38CE93-net.java.html-1.3.jar
-	http://hg.netbeans.org/binaries/7FC91530F4395FA0D58F9539F3B40858E766BFA3-net.java.html.boot-1.3.jar
-	http://hg.netbeans.org/binaries/5C992BAEC0111EE293BD44173140A9D8EC860765-net.java.html.boot.fx-1.3.jar
-	http://hg.netbeans.org/binaries/BF6C9BB0FFB78A6B846ECAEB880C460D883B4F72-net.java.html.boot.script-1.3.jar
-	http://hg.netbeans.org/binaries/10E4214A89082C70FCF9F721953001C0932037BA-net.java.html.geo-1.3.jar
-	http://hg.netbeans.org/binaries/D97314CE1869DD3B8B8942256A70673E2991C9DD-net.java.html.json-1.3.jar
-	http://hg.netbeans.org/binaries/6BDCE8349F83CD02F2942D4FBFA86A81A129F42A-net.java.html.sound-1.3.jar
-	http://hg.netbeans.org/binaries/E5DDC5E827D3D62E7BE9F7E32927CA01F2839971-org.eclipse.osgi_3.9.1.v20140110-1610.jar
-	http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip
-	http://hg.netbeans.org/binaries/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip
-	http://hg.netbeans.org/binaries/CEC2829EC391CB404AD32EB2D08F879C418B745B-xhr4j-1.3.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-# oracle-jdk-bin is needed for now because of javafx which is not packaged separately yet
-# [parseprojectxml] Distilling /var/tmp/portage/dev-java/netbeans-platform-9999_p20151108/work/nbbuild/build/public-package-jars/org-netbeans-libs-javafx.jar from [/var/tmp/portage/dev-java/netbeans-platform-9999_p20151108/work/nbbuild/netbeans/platform/modules/org-netbeans-libs-javafx.jar, /usr/lib64/icedtea8/jre/lib/ext/jfxrt.jar]
-# [parseprojectxml] Classpath entry /usr/lib64/icedtea8/jre/lib/ext/jfxrt.jar does not exist; skipping
-#  [nbmerge] Failed to build target: all-api.htmlui
-
-CDEPEND="dev-java/hamcrest-core:1.3
-	dev-java/javahelp:0
-	>=dev-java/jna-3.4:0
-	dev-java/junit:4[source]
-	>=dev-java/osgi-core-api-5:0
-	dev-java/osgi-compendium:0
-	dev-java/swing-layout:1[source]
-	dev-java/testng:0"
-DEPEND="dev-java/oracle-jdk-bin:1.8[javafx]
-	app-arch/unzip
-	${CDEPEND}"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.platform -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.8"
-JAVA_PKG_WANT_SOURCE="1.7"
-JAVA_PKG_WANT_TARGET="1.7"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar libs.asm/external/asm-all-5.0.1.jar || die
-	ln -s "${DISTDIR}"/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar libs.felix/external/felix-4.2.1.jar || die
-	ln -s "${DISTDIR}"/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar junitlib/external/junit-4.12-javadoc.jar || die
-	ln -s "${DISTDIR}"/771CDCA0A3F2F3CE818E20CC2D707A3592422485-ko4j-1.3.jar o.n.html.ko4j/external/ko4j-1.3.jar || die
-	ln -s "${DISTDIR}"/A3085BAA78C8EE7F55081E70C79ABE04CA38CE93-net.java.html-1.3.jar net.java.html/external/net.java.html-1.3.jar || die
-	ln -s "${DISTDIR}"/7FC91530F4395FA0D58F9539F3B40858E766BFA3-net.java.html.boot-1.3.jar net.java.html.boot/external/net.java.html.boot-1.3.jar || die
-	ln -s "${DISTDIR}"/5C992BAEC0111EE293BD44173140A9D8EC860765-net.java.html.boot.fx-1.3.jar net.java.html.boot.fx/external/net.java.html.boot.fx-1.3.jar || die
-	ln -s "${DISTDIR}"/BF6C9BB0FFB78A6B846ECAEB880C460D883B4F72-net.java.html.boot.script-1.3.jar net.java.html.boot.script/external/net.java.html.boot.script-1.3.jar || die
-	ln -s "${DISTDIR}"/10E4214A89082C70FCF9F721953001C0932037BA-net.java.html.geo-1.3.jar net.java.html.geo/external/net.java.html.geo-1.3.jar || die
-	ln -s "${DISTDIR}"/D97314CE1869DD3B8B8942256A70673E2991C9DD-net.java.html.json-1.3.jar net.java.html.json/external/net.java.html.json-1.3.jar || die
-	ln -s "${DISTDIR}"/6BDCE8349F83CD02F2942D4FBFA86A81A129F42A-net.java.html.sound-1.3.jar net.java.html.sound/external/net.java.html.sound-1.3.jar || die
-	ln -s "${DISTDIR}"/E5DDC5E827D3D62E7BE9F7E32927CA01F2839971-org.eclipse.osgi_3.9.1.v20140110-1610.jar netbinox/external/org.eclipse.osgi_3.9.1.v20140110-1610.jar || die
-	ln -s "${DISTDIR}"/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip o.jdesktop.layout/external/swing-layout-1.0.4-doc.zip || die
-	ln -s "${DISTDIR}"/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip libs.testng/external/testng-6.8.1-javadoc.zip || die
-	ln -s "${DISTDIR}"/CEC2829EC391CB404AD32EB2D08F879C418B745B-xhr4j-1.3.jar o.n.html.xhr4j/external/xhr4j-1.3.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	# upstream jna jar contains bundled binary libraries so we disable that feature
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --into libs.junit4/external hamcrest-core-1.3 hamcrest-core.jar hamcrest-core-1.3.jar
-	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into libs.jna/external jna jna.jar jna-4.2.2.jar
-	java-pkg_jar-from --into libs.jna.platform/external jna platform.jar jna-platform-4.2.2.jar
-	java-pkg_jar-from --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
-	ln -s /usr/share/junit-4/sources/junit-src.zip junitlib/external/junit-4.12-sources.jar || die
-	java-pkg_jar-from --into libs.osgi/external osgi-core-api osgi-core-api.jar osgi.core-5.0.0.jar
-	java-pkg_jar-from --into libs.osgi/external osgi-compendium osgi-compendium.jar osgi.cmpn-4.2.jar
-	java-pkg_jar-from --into o.jdesktop.layout/external swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
-	ln -s /usr/share/swing-layout-1/sources/swing-layout-src.zip o.jdesktop.layout/external/swing-layout-1.0.4-src.zip || die
-	java-pkg_jar-from --into libs.testng/external testng testng.jar testng-6.8.1-dist.jar
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	unset DISPLAY
-	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
-}
-
-src_install() {
-	pushd nbbuild/netbeans/platform >/dev/null || die
-
-	java-pkg_dojar lib/*.jar
-	grep -E "/platform$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	insinto ${INSTALL_DIR}
-	doins -r *
-	rm "${D}"/${INSTALL_DIR}/docs/junit-4.12-sources.jar || die
-	dosym /usr/share/junit-4/sources/junit-src.zip ${INSTALL_DIR}/docs/junit-4.12-sources.jar
-	rm "${D}"/${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip || die
-	dosym /usr/share/swing-layout-1/sources/swing-layout-src.zip ${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip
-	find "${D}"/${INSTALL_DIR} -name "*.exe" -delete
-	find "${D}"/${INSTALL_DIR} -name "*.dll" -delete
-	rm -fr "${D}"/modules/lib || die
-
-	popd >/dev/null || die
-
-	fperms 775 ${INSTALL_DIR}/lib/nbexec
-	dosym ${INSTALL_DIR}/lib/nbexec /usr/bin/nbexec-${SLOT}
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext
-	pushd "${instdir}" >/dev/null || die
-	rm hamcrest-core-1.3.jar && java-pkg_jar-from --into "${instdir}" hamcrest-core-1.3 hamcrest-core.jar hamcrest-core-1.3.jar
-	rm jhall-2.0_05.jar && java-pkg_jar-from --into "${instdir}" javahelp jhall.jar jhall-2.0_05.jar
-	rm jna-4.2.2.jar && java-pkg_jar-from --into "${instdir}" jna jna.jar jna-4.2.2.jar
-	rm jna-platform-4.2.2.jar && java-pkg_jar-from --into "${instdir}" jna platform.jar jna-platform-4.2.2.jar
-	rm junit-4.12.jar && java-pkg_jar-from --into "${instdir}" junit-4 junit.jar junit-4.12.jar
-	rm osgi.cmpn-4.2.jar && java-pkg_jar-from --into "${instdir}" osgi-compendium osgi-compendium.jar osgi.cmpn-4.2.jar
-	rm osgi.core-5.0.0.jar && java-pkg_jar-from --into "${instdir}" osgi-core-api osgi-core-api.jar osgi.core-5.0.0.jar
-	rm swing-layout-1.0.4.jar && java-pkg_jar-from --into "${instdir}" swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
-	rm testng-6.8.1-dist.jar && java-pkg_jar-from --into "${instdir}" testng testng.jar testng-6.8.1-dist.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/platform
-}

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index c4ac1af..fb4012e 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606100002-src.zip 215705826 SHA256 dc5bf896c73c9956c9f2d60fc999a041fe9a240daf2248e7a0ea26f3b12045c6 SHA512 bf3872a0ce352291ae2d36bb25fdfbaf5e403002c9ed21292451d6bbb4cddb34c120bba13481311217624b2628d4ef767731fb8c2ee8b54ef915078b647c6388 WHIRLPOOL 62f4833a881cd3f6be65268501981ace9edea20866e38019f26f89d3afdfe625b9934bf0344301c329326bbaebdf02a9c96653c510019768f5074fabb85568cc
 DIST netbeans-trunk-nightly-201606130002-src.zip 215706858 SHA256 1bb9ee5b464b0dae349efe93a2fe5628088015c7bb44f253070cba81d5542fda SHA512 d3e676034a9fa22fa3fed978c49da5d5ec66d1845a95fc2f2f600174f7af0386be87f449df3a99ce60b150fd65c22b7da9c0c588d3d92ffef10ddf05462fe65d WHIRLPOOL 7286ddcb1933236d02205c3cc3044ad5a9c0cec2fae68ae47bf4ddcb33fc801d560d5abb3c1f3b86fffab1c221833fa8f228efcb1c4db6703ea3118664c1b292
 DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
@@ -29,7 +28,6 @@ DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
 EBUILD netbeans-profiler-8.0.2.ebuild 3402 SHA256 8021dea620d1bc26214ff0ec285f8061c24693dd28a62a97a48ac3223707e920 SHA512 2660390337a973256b1aac3a02b14e16782c230fa2714ae695213b0cabc0eb60621c6a1ae234f9e57259a19de22a87447f9a89ab846bd59bcedd2be313c35072 WHIRLPOOL 5d1053ded03143b2de05b64cfbe59b515cb786d60bfa65566be795567bfaf5feb88a2f8e7161a05da512fafd523f871778d5ddeb3c6b89fc95885096e379f65d
 EBUILD netbeans-profiler-8.1.ebuild 3426 SHA256 81f8b3b135f021a2dbe7b5ccb53fc7fcf79908ab83ef14ca0e912732b7fb4b53 SHA512 210bc0c5214aa8f79f559cccf69f1ed885dd2d14dc55cd17bd89c8a7f04f1a76de5b414426337b2ba6e99576850f0753f13e41e0f424b3f0adc58001dffc217a WHIRLPOOL 293d12a03294532dc9ce10503b030282cb636f08af6300ea796885eb6a3fe36c9d37c2a07138d03e9c4d45b31352ce160901a96f659f26d50a0fe5caee3bf0fa
-EBUILD netbeans-profiler-9999_p20160610.ebuild 3472 SHA256 3172f5c5b6cb0634773ea53563cbbe97679e3aeec12092f1f296a8f50f82aa81 SHA512 63c9ced833e2d03c1d7ee325fe0ed334f17757100fe910b186a27910b75b17755c637d00af0b748e17bb109e0a37f10069506c1efef8259f8fa57805134c1cf4 WHIRLPOOL 056a89b771cdebc3a827c0d5a4ce1b560b41a50b9f8233a7939d81106a03f4998afd9328944f7f00f137b9966fee7a992ab326f6d1b2f368b4c73a7a819ee391
 EBUILD netbeans-profiler-9999_p20160613.ebuild 3472 SHA256 60400b046e007007ee02d6c1a5c389d58822e2a1e985429c8d7a1fee5c14186c SHA512 2a670740357b5c16acab6c23257dc117d1b61e049114aca88caa036a2396f701bb38e19cb12ab36d902563d20033cb033c4a214562b2a954799de57b248c6f49 WHIRLPOOL 11cebe513f023c51c36582a690c4ca606f0e463a4f3567a10e8d31439ec808d932ed1302ca2ca8d74fef73d938d10f7aa105172317efe945eb2d04d587c19602
 EBUILD netbeans-profiler-9999_p20160614.ebuild 3472 SHA256 65c683a2ef961b65bfc2599f294282b07fe90feb73e51683b91f789c673f1cec SHA512 8f50dbed2ee3ac960959dfd3c60a2bdcb850df700106ff217300f1b69bd228b1cdaa7d1f2d3f4c4c6105b77baf94e103838aa14886a444df755a92498ee884ba WHIRLPOOL 87092590a879d7d7b85b3d50a01683446f6be47e4c9ebfb5e3bb61ae5d5de9787464be90ba0f5f3941dc8544e2a83bf8cc1f87d63de89394def145d3751f6940
 EBUILD netbeans-profiler-9999_p20160615.ebuild 3472 SHA256 b62578b82c4f0349d88f66fbc2b80aa3e63fbaddb6df027ece9faaa5ecf4d8de SHA512 b2aa116ca625e88af4d40480c58279d9a95db1b59429ecf77b51bef4e77bcef90ea9e61caa5e914f7fcfdec2d95305009aa465c1229ace5013340bc2a505b62a WHIRLPOOL 87778ff56273c20f89e8823bd9af1f73937dac33f2f1d8c36d9ed0f8f63a676059b87940893604e0c2c523b73f17e6812a40c66552b3b626651b1c82c0ab6a32

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160610.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160610.ebuild
deleted file mode 100644
index 35512ec..0000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160610.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Profiler Cluster"
-HOMEPAGE="http://netbeans.org/projects/profiler"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-10_00-02-33/zip/netbeans-trunk-nightly-201606100002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-# Binary files needed for remote profiling
-QA_PREBUILT="usr/share/netbeans-profiler-${SLOT}/lib/deployed/*"
-
-CDEPEND="~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.profiler -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/profiler >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/profiler$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	for file in lib/deployed/cvm/linux/*.so ; do
-		fperms 755 ${file}
-	done
-
-	for file in lib/deployed/jdk*/linux*/*.so ; do
-		fperms 755 ${file}
-	done
-
-	for file in remote-pack-defs/*.sh ; do
-		fperms 755 ${file}
-	done
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/profiler
-}

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index 7220c45..c6719bb 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -27,7 +27,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606100002-src.zip 215705826 SHA256 dc5bf896c73c9956c9f2d60fc999a041fe9a240daf2248e7a0ea26f3b12045c6 SHA512 bf3872a0ce352291ae2d36bb25fdfbaf5e403002c9ed21292451d6bbb4cddb34c120bba13481311217624b2628d4ef767731fb8c2ee8b54ef915078b647c6388 WHIRLPOOL 62f4833a881cd3f6be65268501981ace9edea20866e38019f26f89d3afdfe625b9934bf0344301c329326bbaebdf02a9c96653c510019768f5074fabb85568cc
 DIST netbeans-trunk-nightly-201606130002-src.zip 215706858 SHA256 1bb9ee5b464b0dae349efe93a2fe5628088015c7bb44f253070cba81d5542fda SHA512 d3e676034a9fa22fa3fed978c49da5d5ec66d1845a95fc2f2f600174f7af0386be87f449df3a99ce60b150fd65c22b7da9c0c588d3d92ffef10ddf05462fe65d WHIRLPOOL 7286ddcb1933236d02205c3cc3044ad5a9c0cec2fae68ae47bf4ddcb33fc801d560d5abb3c1f3b86fffab1c221833fa8f228efcb1c4db6703ea3118664c1b292
 DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
@@ -53,7 +52,6 @@ DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
 EBUILD netbeans-webcommon-8.0.2.ebuild 4723 SHA256 e2ba39cb6f22c990acf9a492eac5707f130382d56f9bc1e3636e82cbe4d61938 SHA512 61955d38f829b3ed54bc5cb9a71da07f05676a2bf7219fa8073aeee0f0e2d0e73f7aa6ec1636be39fb071d3d2b9de7ceb813a247a61961874f4cc78697d4e568 WHIRLPOOL 1a272650fc2394716a790b79cb85a9322929c7cc96ea4776cc639fb869c5b536140dbdc632b1a8aa9cb1fc8e740050125c2ebe9390de7a8f4207e88e24924206
 EBUILD netbeans-webcommon-8.1.ebuild 4945 SHA256 55c57b638481134d659763154a7820467a9866707112cba0e60dbd9ba8cd2840 SHA512 a98987535f60b533bf0df701f83693a58584dfa9a10d5c8646186165d884fb7e8a3348ec77cbf25d1a8cc8cfd947bf54cdb30d251ae1a3fffb74947070d76579 WHIRLPOOL 36fe1b7b9b34a02fcda227aaeebed8a33562e6fe4a014c78e9a464d709bf5120322a35bd54a0ffa15c4dd4f3ae605cf6fc2d35c5652f7162ae646c61ad69210a
-EBUILD netbeans-webcommon-9999_p20160610.ebuild 5343 SHA256 648125083dff203dde4e65541aac9358184d4bd2ee58fe7531eab6d0f7ac8485 SHA512 ab50f3b1142a310e1ac7701c0a07dc0bfd2f62940437c55cde43c3ca9d8d967f0408a3fc801caf7765d1f00b10703893c644e5b2e58ba3a9e4da02a78687ed97 WHIRLPOOL a6c0c0f5a2a1cdc8ee3e45356b7736aed1bbd706dcfab1f49fd0ed0dbe933af79171be809babb8c48396948aa57fd4df1139f6b96965c20f65f45cf5a425f9aa
 EBUILD netbeans-webcommon-9999_p20160613.ebuild 5343 SHA256 a2caf56e2a7a519a9e3c7262f8d237e5808be8928bc8ad8bb9ef7545ffe4be47 SHA512 0b99517b06e22e4a1b7ca7bea719d30428c52ebce85c80cf3e560e78cecaa8af8ed90a4e98f69efeb007634437a3b718084e1e005ca945d6f942eaf7b61fc687 WHIRLPOOL 33c1a786fc7cb490e23596a931a5dec3f791c92b799c3fa1daeccd1cbdd72e93d947c088f74852c198892f0666e13994f43e62a321b657a3dc4b757256837cd3
 EBUILD netbeans-webcommon-9999_p20160614.ebuild 5343 SHA256 fa14ab0bdff82d49cdc43b56e9be63884e409653e63863a09643683f92728e69 SHA512 70eac3c9ada4f71141995b3bd9d45406f501209f78e3122d9a28945f58d1d6c94596799859773c14d2330b99b80d2ae00162fed2b1d97eb75a9d37bbdd571160 WHIRLPOOL 54c802c71a488301d00830f372314b8cd856110d5bf9be28c83ff5fddf1c92e9c23cbe936777cf5b50ba0e566e12b3abfa5a63a53b0dc993c5bbfeabf16389ae
 EBUILD netbeans-webcommon-9999_p20160615.ebuild 6242 SHA256 4029ad34c29e02d5318199b04385bdc4b7422dc64be5be72ce201ec564b24b84 SHA512 a66ed0318446484412dae4f8e68fa09e68ce88d5a5c2ca61947922db72c17374f15298466642eceb519ba57cbdde32763554c0f75b0561105146e46f98dea8cc WHIRLPOOL 9c1a7ea661c1fed670b08ca4366f2b7f7204a78964b9fc7429aabad70b4c08784190ce17caa9fd74ce447bc0d606a74182af16aad1fb443d59cef855aed4fb93

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160610.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160610.ebuild
deleted file mode 100644
index efd1e86..0000000
--- a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160610.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Web Services Cluster"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-10_00-02-33/zip/netbeans-trunk-nightly-201606100002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar
-	http://hg.netbeans.org/binaries/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim
-	http://hg.netbeans.org/binaries/0929AC5F40B5A8667021408748D64F30F77B3165-libiDeviceNativeBinding.dylib
-	http://hg.netbeans.org/binaries/2A38DA3DB5D36DBBDC0B03990B46810F72430D5E-libimobiledevice.4.dylib
-	http://hg.netbeans.org/binaries/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib
-	http://hg.netbeans.org/binaries/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar
-	http://hg.netbeans.org/binaries/C1BB9FF4232248B0054E5A26A33474A251EA19CB-libusbmuxd.2.dylib
-	http://hg.netbeans.org/binaries/D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip
-	http://hg.netbeans.org/binaries/1EFED55F8C442E4DB1C2338A5C35D494364F9ECD-ojetdocs-1_1_2.zip
-	http://hg.netbeans.org/binaries/CA8F6968FED0BE20E786C70CF9B603F4D7B66C68-ojetdocs-2_0_0.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-ide-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0
-	dev-java/jna:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.webcommon -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar libs.plist/external/dd-plist.jar || die
-	ln -s "${DISTDIR}"/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim cordova.platforms.ios/external/ios-sim || die
-	ln -s "${DISTDIR}"/0929AC5F40B5A8667021408748D64F30F77B3165-libiDeviceNativeBinding.dylib cordova.platforms.ios/external/libiDeviceNativeBinding.dylib || die
-	ln -s "${DISTDIR}"/2A38DA3DB5D36DBBDC0B03990B46810F72430D5E-libimobiledevice.4.dylib cordova.platforms.ios/external/libimobiledevice.4.dylib || die
-	ln -s "${DISTDIR}"/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib cordova.platforms.ios/external/libplist.1.dylib || die
-	ln -s "${DISTDIR}"/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar libs.jstestdriver/external/libs.jstestdriver-ext.jar || die
-	ln -s "${DISTDIR}"/C1BB9FF4232248B0054E5A26A33474A251EA19CB-libusbmuxd.2.dylib cordova.platforms.ios/external/libusbmuxd.2.dylib || die
-	ln -s "${DISTDIR}"/D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip html.ojet/external/ojetdocs-1_0_0.zip || die
-	ln -s "${DISTDIR}"/1EFED55F8C442E4DB1C2338A5C35D494364F9ECD-ojetdocs-1_1_2.zip html.ojet/external/ojetdocs-1_1_2.zip || die
-	ln -s "${DISTDIR}"/CA8F6968FED0BE20E786C70CF9B603F4D7B66C68-ojetdocs-2_0_0.zip html.ojet/external/ojetdocs-2_0_0.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --build-only --into libs.jna/external jna jna.jar jna-4.2.2.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/webcommon >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-	grep -E "/webcommon$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/webcommon
-}

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 6597461..e8791c6 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606100002-src.zip 215705826 SHA256 dc5bf896c73c9956c9f2d60fc999a041fe9a240daf2248e7a0ea26f3b12045c6 SHA512 bf3872a0ce352291ae2d36bb25fdfbaf5e403002c9ed21292451d6bbb4cddb34c120bba13481311217624b2628d4ef767731fb8c2ee8b54ef915078b647c6388 WHIRLPOOL 62f4833a881cd3f6be65268501981ace9edea20866e38019f26f89d3afdfe625b9934bf0344301c329326bbaebdf02a9c96653c510019768f5074fabb85568cc
 DIST netbeans-trunk-nightly-201606130002-src.zip 215706858 SHA256 1bb9ee5b464b0dae349efe93a2fe5628088015c7bb44f253070cba81d5542fda SHA512 d3e676034a9fa22fa3fed978c49da5d5ec66d1845a95fc2f2f600174f7af0386be87f449df3a99ce60b150fd65c22b7da9c0c588d3d92ffef10ddf05462fe65d WHIRLPOOL 7286ddcb1933236d02205c3cc3044ad5a9c0cec2fae68ae47bf4ddcb33fc801d560d5abb3c1f3b86fffab1c221833fa8f228efcb1c4db6703ea3118664c1b292
 DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
@@ -29,7 +28,6 @@ DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
 EBUILD netbeans-websvccommon-8.0.2.ebuild 2651 SHA256 a195b307847c466dbb5f46eb04240358ce3c92cadeecb8fda1562304de46820f SHA512 933626bd2073f58e3508180c042e237b9e61ba6f3c992cf37ea43978ac2fc972d2dcc3ef0b5c390b3867296e197ed2605c43452c98e36acf0982e7338b6d1eb7 WHIRLPOOL c3db8f0b50116d0129f50778e1961166e76601d8c165e20e73d75c91b02c8a095067e0f13e18178d849dd29adcedaeee7d3e0e62f99be592d7ce159fd6af632e
 EBUILD netbeans-websvccommon-8.1.ebuild 2675 SHA256 c9ff3d598c5f76c2b69dd5488a80c63025acc3cd0cc99321a0e84a493502df36 SHA512 89daec44b860aa8011d9e5533230f89dad7bcc50a119664122d2718db3e53501d1319ae4b27eac1d71596671e9a7c21315a641346e6cbab22edb3c7232bf5ce3 WHIRLPOOL 521521094b396c98687e2054742e4c019023045f19b01a6cc3a5f826f4cabe9448254db8b834448f3b33368c76dd667942554e1bae459c55de2c571bb5cfb4f5
-EBUILD netbeans-websvccommon-9999_p20160610.ebuild 2721 SHA256 8394e16c7de3fea9d976a8655bd17348b5b4a010d01c41751eaa4aaf6dfdc2fa SHA512 10a330e1048474cca5cea1b519890adee6d1277b3f9a52d50eaa94abd9ed697e12499fef7b54b37e25107ca64ca9bc9eaec8545bdc19f7e01bae9a0321a2b382 WHIRLPOOL 1868ee22fc1ac9742ca5f2c8cb4e083fbc81bf743c2838f114a3dd51e71f1c80a6fa3504c45530d2d389296bdc4f8a95d939e101928539a47e00bd8cef4762bb
 EBUILD netbeans-websvccommon-9999_p20160613.ebuild 2721 SHA256 7b193c5a1db4eda9677163d40c4821d35fb65539db27a630cc8c32075559f47f SHA512 b96dec8bfde839a6056dcd14df1fbdd6a35702f71b902d28a0a401c64e3ee343283a954cbbc9bbb6cec590326a82ac3ceee4a29124fed5ea7e12eec416e94751 WHIRLPOOL d2ec04634d9b6e67681997d45a7b9a8f574ca5e949a95311fcd49540ed4090941297ac696ac10453a00973f30a5455ffdb267d9c304da741becb3fffac8e859e
 EBUILD netbeans-websvccommon-9999_p20160614.ebuild 2721 SHA256 43c6c3327630f57e63eb4f8467ffd7471564c361db7efd919880eabfa4c36c55 SHA512 9f7a1df1b4db9a3bb9a596f4b39271d8f67d0946daf66c2202c2eb2c938ad75522aacb22f0fc4e7e663187c76d7fe8e104abb573234543f9ef6d742ff775f40f WHIRLPOOL 697a9ae0f0bd427cb98d7df3f59c896f42fde5c8bfaa0fc1202a0a0aaffa8baf8ca2dbc1eb9bd8dc49085233c0c2408b922cbfc9e776cd1e5293416dcaa3c6ef
 EBUILD netbeans-websvccommon-9999_p20160615.ebuild 2721 SHA256 21d8538d3d06d7b2ace4ec26f90c713af219f8deedf537c553d08093e540c140 SHA512 0c457d3d4894878dc046c1b0f1d463189749397370fbbe82d1f117d7b8cbb5467f4648c792f0b3165e57df40c43beead1e1e408a897ea69b4b98e67a7e1b4b85 WHIRLPOOL 0f9d06a4122427fa3674b2c43d7078adc57580ab1bca2011a3053402ab8aa39bd2e2c788c05bb90a3005f490ed7a2da59016218d0fe4e9ef73b645b669bf503f

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160610.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160610.ebuild
deleted file mode 100644
index fdeaa2b..0000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160610.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Web Services Common Cluster"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-10_00-02-33/zip/netbeans-trunk-nightly-201606100002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-ide-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.websvccommon -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/websvccommon >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-	grep -E "/websvccommon$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/websvccommon
-}

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 9514aa2..fe106bd 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99e
 DIST netbeans-l10n-8.0.1-20141110.tar.bz2 12065358 SHA256 542d325cbc6e0e617f6076e964e37803ec322b6d0ee4724a6d2127f2f480fb24 SHA512 28242dcbe7bcbc6a9abce15dfe6fd6140a275a417d96ff28228315bdc0ce8110ede899a1815e2fdf9115b48221d50cd3ff5b71a15d36316d04d81f66e9c0cac4 WHIRLPOOL 0318caea3463d3f7bb8876774b1cc9467dadd9bc36497a9304ed12900e2fabdc4dcdfec0b9eaee27bb36c39e9caff3743c5a42ad4c3a432205a716832688c4d6
 DIST netbeans-l10n-8.1-20151105.tar.bz2 11945028 SHA256 33e86aa7315021d28fdb64790233327d7599c98bcf3ab9d936b6fe924884325a SHA512 eb3163eaa8add417a0e8ac3ed4923a6e4992a80eaac00a01eed24e0e1ceb8a5cbd308659bcf0e5e1192ac8e84a79ea36744ad6b2589d60891b03b37102e9435d WHIRLPOOL f214a865bfd8c54341fb9d538da6db4d9b24906b0d94b3ee6cbf4a525e8842d28e852febb2f34c4c31f989d1b6baf750480bc2f04d94bcd7a8bdb8c9553ef590
 DIST netbeans-l10n-9999-20131010.tar.bz2 12440242 SHA256 64c48605820ec1f35e38c34b48cc16cd40c053d085d50819d4b4e9a80453dfa9 SHA512 7d4d61fa61710186fefd90721598ec635db7c6249ce6fc484fd5813636220f163b60230349c984c398c87e083d2d629c531fe5b4cea3752ebbcaa9823b701a02 WHIRLPOOL 10506e3a3004d6c0ab17b05507f72db2c25d2713c3233a7f5478da27d3b1261b5fb6d5f71cbf369858668ca2d1219dad1900c6c42d3f250adcc935e846e56b09
-DIST netbeans-trunk-nightly-201606100002-src.zip 215705826 SHA256 dc5bf896c73c9956c9f2d60fc999a041fe9a240daf2248e7a0ea26f3b12045c6 SHA512 bf3872a0ce352291ae2d36bb25fdfbaf5e403002c9ed21292451d6bbb4cddb34c120bba13481311217624b2628d4ef767731fb8c2ee8b54ef915078b647c6388 WHIRLPOOL 62f4833a881cd3f6be65268501981ace9edea20866e38019f26f89d3afdfe625b9934bf0344301c329326bbaebdf02a9c96653c510019768f5074fabb85568cc
 DIST netbeans-trunk-nightly-201606130002-src.zip 215706858 SHA256 1bb9ee5b464b0dae349efe93a2fe5628088015c7bb44f253070cba81d5542fda SHA512 d3e676034a9fa22fa3fed978c49da5d5ec66d1845a95fc2f2f600174f7af0386be87f449df3a99ce60b150fd65c22b7da9c0c588d3d92ffef10ddf05462fe65d WHIRLPOOL 7286ddcb1933236d02205c3cc3044ad5a9c0cec2fae68ae47bf4ddcb33fc801d560d5abb3c1f3b86fffab1c221833fa8f228efcb1c4db6703ea3118664c1b292
 DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
 EBUILD netbeans-8.0.2.ebuild 7167 SHA256 80e31382a0ceb680c2a055dc5c78c1dce8edf32c50bbae6a1c14a2c568492519 SHA512 0ab466ca247ec953896ef0ab3b01b43ffea3a9f37e9bcdacecfc0476226d45cef35e4ddf27f2b85628d9512ed304e6cc6cfe963a5e547217d08cad400eefc4b9 WHIRLPOOL d09668e669f4f8d7987ab02cf26104fc6e54ba29b8b497fe0013cc8816a2d7560c99e6e1b02db77ead872d5240b84c09e3fabbc3465587d1d1ca7d6fcae114c1
 EBUILD netbeans-8.1.ebuild 6891 SHA256 22a19f05bdcea85475c0451df867367b69363bfbc6280f78b087248d9f8e9513 SHA512 812b6cdae3e5feaf37db5ca8b5efa1b374d5492f11cfa1df2adbd3617986cdca6a79d2d4dffd024c8c48492fc8a21704190242f5741c5699b12070620cea2c87 WHIRLPOOL baf5f750574c01effa0d02c72194139fb2757be932054f4900ceb0534607064af10f2b5b38063ff2cca34e75ab5be23d00c7e5d90d1c724339666d20f1bb10d3
-EBUILD netbeans-9999_p20160610.ebuild 6939 SHA256 9af145061cdeb215f09f250c3ee6fdae2e383c6a87b04e7b901ca1246a2dd57e SHA512 ae1bd5910b0c165b13ef91f22243b17c2d76377f7cbc64df643ddd908b4594a81fd649b26a9bd3cacd6f8623414e576e3825b0785a18e8c12b100dc790b1a721 WHIRLPOOL d562d6ad4f699dba6911f9f223d9665778504b173ecfe6b1370e0104a131ba65558f89c4674b9ea241729eba53c96f45e1aa53c96f91da5123b20716ce94f249
 EBUILD netbeans-9999_p20160613.ebuild 6939 SHA256 b21acedb1e3f8a7386609c006bb20146ab78c1d4dee0b4e5bb5098990b776ed7 SHA512 4ec46cca07c1a6c56cd9719b5d96efa5090bc6e64e1dbc2ad23c729240d1d63a832582258dbd37664c8b8df06e98fc748b97dd1816f98808005421debf795e26 WHIRLPOOL f8f5b56e96f3189bdb45865eb50dde9e75884a022a8efdd274ccaefc7a3f5647c7645f44de760c343bb36094fb91e12c6c0d0f5522b32ae7d3b78ee10b7e961d
 EBUILD netbeans-9999_p20160614.ebuild 6939 SHA256 cb99d4d210d9182f615ea6efccfa8d1f554819868d90546b2cb6b63943d18f07 SHA512 750df96437c696707693d497459d78be7a17612a9ce6a05101c89c1fc22e1c0f10e9873365927752d4c176c6afbee3bf23831c4fd2d9756d7e7b16e2a7b1ad34 WHIRLPOOL 2988a435623d33ad4556ba94fc0d20f2c0b58d07209527e8f7a19cc803d5d564bac16377046f2232e712ffe514b26467ffbb3a9a0998176dfedeee05cfb9e33a
 EBUILD netbeans-9999_p20160615.ebuild 6939 SHA256 4e9b67afb9bedbbdeaeb62ddd37ec86c7835b355ce8d4bd5c6b83168ad579a66 SHA512 ee04262337546be1262b1681c06b0b3a6bd3e14cca8a1302e9c893692cbaa89fba8aa987e1b2b486c975c3bafa752ba058d3778859a66549706fba3c13e17972 WHIRLPOOL 08104a8ee13a828a46627c9b65d2d73fa7ad4c75d86d9e88594dfd8c14ca8296c00d3c69832aa703d92949039f8e1283aae71c5ef5b87208a5382d121f8d0866

diff --git a/dev-util/netbeans/netbeans-9999_p20160610.ebuild b/dev-util/netbeans/netbeans-9999_p20160610.ebuild
deleted file mode 100644
index 912b84e..0000000
--- a/dev-util/netbeans/netbeans-9999_p20160610.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans IDE"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-10_00-02-33/zip/netbeans-trunk-nightly-201606100002-src.zip"
-PATCHES_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2"
-L10N_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-9999-20131010.tar.bz2"
-ALL_URLS="${SOURCE_URL} ${PATCHES_URL} ${L10N_URL}"
-SRC_URI="linguas_af? ( ${ALL_URLS} )
-	linguas_ar? ( ${ALL_URLS} )
-	linguas_ar_SA? ( ${ALL_URLS} )
-	linguas_bg? ( ${ALL_URLS} )
-	linguas_ca? ( ${ALL_URLS} )
-	linguas_cs? ( ${ALL_URLS} )
-	linguas_de? ( ${ALL_URLS} )
-	linguas_el? ( ${ALL_URLS} )
-	linguas_es? ( ${ALL_URLS} )
-	linguas_es_CO? ( ${ALL_URLS} )
-	linguas_fil? ( ${ALL_URLS} )
-	linguas_fr? ( ${ALL_URLS} )
-	linguas_gl? ( ${ALL_URLS} )
-	linguas_hi_IN? ( ${ALL_URLS} )
-	linguas_id_ID? ( ${ALL_URLS} )
-	linguas_it? ( ${ALL_URLS} )
-	linguas_ja? ( ${ALL_URLS} )
-	linguas_ko? ( ${ALL_URLS} )
-	linguas_lt? ( ${ALL_URLS} )
-	linguas_nl_BE? ( ${ALL_URLS} )
-	linguas_nl_NL? ( ${ALL_URLS} )
-	linguas_pl? ( ${ALL_URLS} )
-	linguas_pt_BR? ( ${ALL_URLS} )
-	linguas_pt_PT? ( ${ALL_URLS} )
-	linguas_ro? ( ${ALL_URLS} )
-	linguas_ru? ( ${ALL_URLS} )
-	linguas_si? ( ${ALL_URLS} )
-	linguas_sq? ( ${ALL_URLS} )
-	linguas_sr? ( ${ALL_URLS} )
-	linguas_sv? ( ${ALL_URLS} )
-	linguas_ta_IN? ( ${ALL_URLS} )
-	linguas_tr? ( ${ALL_URLS} )
-	linguas_vi? ( ${ALL_URLS} )
-	linguas_zh_CN? ( ${ALL_URLS} )
-	linguas_zh_TW? ( ${ALL_URLS} )
-"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE_NETBEANS_MODULES="
-	+netbeans_modules_apisupport
-	netbeans_modules_cnd
-	netbeans_modules_dlight
-	netbeans_modules_enterprise
-	netbeans_modules_ergonomics
-	netbeans_modules_extide
-	netbeans_modules_groovy
-	+netbeans_modules_java
-	netbeans_modules_javacard
-	+netbeans_modules_javafx
-	netbeans_modules_mobility
-	netbeans_modules_php
-	+netbeans_modules_profiler
-	netbeans_modules_webcommon
-	+netbeans_modules_websvccommon"
-IUSE_LINGUAS="
-	linguas_af
-	linguas_ar
-	linguas_ar_SA
-	linguas_bg
-	linguas_ca
-	linguas_cs
-	linguas_de
-	linguas_el
-	linguas_es
-	linguas_es_CO
-	linguas_fil
-	linguas_fr
-	linguas_gl
-	linguas_hi_IN
-	linguas_id_ID
-	linguas_it
-	linguas_ja
-	linguas_ko
-	linguas_lt
-	linguas_nl_BE
-	linguas_nl_NL
-	linguas_pl
-	linguas_pt_BR
-	linguas_pt_PT
-	linguas_ro
-	linguas_ru
-	linguas_si
-	linguas_sq
-	linguas_sr
-	linguas_sv
-	linguas_ta_IN
-	linguas_tr
-	linguas_vi
-	linguas_zh_CN
-	linguas_zh_TW"
-IUSE="doc ${IUSE_NETBEANS_MODULES} ${IUSE_LINGUAS}"
-S="${WORKDIR}"
-
-DEPEND=">=virtual/jdk-1.7
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-nb-${PV}
-	~dev-java/netbeans-platform-${PV}
-	netbeans_modules_apisupport? ( ~dev-java/netbeans-apisupport-${PV} )
-	netbeans_modules_cnd? ( ~dev-java/netbeans-cnd-${PV} )
-	netbeans_modules_dlight? ( ~dev-java/netbeans-dlight-${PV} )
-	netbeans_modules_enterprise? ( ~dev-java/netbeans-enterprise-${PV} )
-	netbeans_modules_ergonomics? ( ~dev-java/netbeans-ergonomics-${PV} )
-	netbeans_modules_extide? ( ~dev-java/netbeans-extide-${PV} )
-	netbeans_modules_groovy? ( ~dev-java/netbeans-groovy-${PV} )
-	netbeans_modules_java? ( ~dev-java/netbeans-java-${PV} )
-	netbeans_modules_javacard? ( ~dev-java/netbeans-javacard-${PV} )
-	netbeans_modules_javafx? ( ~dev-java/netbeans-javafx-${PV} )
-	netbeans_modules_mobility? ( ~dev-java/netbeans-mobility-${PV} )
-	netbeans_modules_php? ( ~dev-java/netbeans-php-${PV} )
-	netbeans_modules_profiler? ( ~dev-java/netbeans-profiler-${PV} )
-	netbeans_modules_webcommon? ( ~dev-java/netbeans-webcommon-${PV} )
-	netbeans_modules_websvccommon? ( ~dev-java/netbeans-websvccommon-${PV} )
-	doc? ( ~dev-java/netbeans-javadoc-${PV} )"
-
-JAVA_PKG_BSFIX="off"
-NBLOCALES=""
-
-pkg_setup() {
-	for lingua in ${IUSE_LINGUAS} ; do
-		local lang=${lingua/linguas_/}
-
-		if [[ "${lang}" = "ar" ]] ; then
-			lang="ar_EG,ar_SA"
-		elif [[ "${lang}" = "es" ]] ; then
-			lang="es,es_CO"
-		elif [[ "${lang}" = "fil" ]] ; then
-			lang="fil_PH"
-		elif [[ "${lang}" = "gl" ]] ; then
-			lang="gl_ES"
-		elif [[ "${lang}" = "id_ID" ]] ; then
-			lang="in_ID"
-		fi
-
-		if use ${lingua} ; then
-			if [ -z "${NBLOCALES}" ] ; then
-				NBLOCALES="${lang}"
-			else
-				NBLOCALES="${NBLOCALES},${lang}"
-			fi
-		fi
-	done
-
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	if [ -n "${NBLOCALES}" ] ; then
-		unpack $(basename ${SOURCE_URL})
-		unpack $(basename ${L10N_URL})
-
-		einfo "Deleting bundled jars..."
-		find -name "*.jar" -type f -delete
-
-		unpack netbeans-9999-r16-build.xml.patch.bz2
-	fi
-}
-
-src_prepare() {
-	if [ -n "${NBLOCALES}" ] ; then
-		einfo "Deleting bundled class files..."
-		find -name "*.class" -type f | xargs rm -vf
-
-		epatch netbeans-9999-r16-build.xml.patch
-
-		# Support for custom patches
-		if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-			local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-			if [ -n "${files}" ] ; then
-				einfo "Applying custom patches:"
-
-				for file in ${files} ; do
-					epatch "${file}"
-				done
-			fi
-		fi
-
-		einfo "Symlinking external libraries..."
-		java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	fi
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	if [ -n "${NBLOCALES}" ] ; then
-		einfo "Compiling support for locales: ${NBLOCALES}"
-		eant -f nbbuild/build.xml bootstrap || die
-		eant -Dlocales=${NBLOCALES} -Ddist.dir=../nbbuild/netbeans -Dnbms.dir="" -Dnbms.dist.dir="" \
-			-Dpermit.jdk7.builds=true -f l10n/build.xml build || die
-	fi
-}
-
-src_install() {
-	if [ -n "${NBLOCALES}" ] ; then
-		pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-		for cluster in apisupport cnd dlight enterprise ergonomics groovy harness ide java javacard javafx mobility php platform profiler webcommon websvccommon ; do
-			if [ -d "${cluster}" ] ; then
-				insinto /usr/share/netbeans-${cluster}-${SLOT}
-				doins -r ${cluster}/*
-			fi
-		done
-
-		if [ -d nb ] ; then
-			insinto /usr/share/netbeans-nb-${SLOT}/nb
-			doins -r nb/*
-		fi
-
-		popd >/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	if [ -n "${NBLOCALES}" ] ; then
-		einfo "Netbeans automatically starts with the locale you have set in your user profile, if"
-		einfo "the locale is built for Netbeans."
-		einfo "If you want to force specific locale, use --locale argument, for example:"
-		einfo "${PN}-${SLOT} --locale de"
-		einfo "${PN}-${SLOT} --locale pt:BR"
-	fi
-
-	if use linguas_ar ; then
-		einfo
-		einfo "You selected Arabic locale so you can choose either ar:EG or ar:SA variant."
-	fi
-
-	if use linguas_es ; then
-		einfo
-		einfo "You selected Spanish locale so you can choose either es or es:CO variant."
-	fi
-
-	if use linguas_id_ID ; then
-		einfo
-		einfo "You selected Indonesian locale which has locale code in:ID in Netbeans."
-	fi
-}


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2016-07-11  7:56 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-11  7:55 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-platform/, dev-java/netbeans-java/, dev-java/netbeans-extide/, Miroslav Šulc

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox