[gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-javafx/, dev-java/netbeans-ergonomics/, ...

[Miroslav Šulc]

commit:     407e3e9bd53a5d0da6533ed7efcb01412e96eef3
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 28 07:16:20 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Jun 28 07:16:20 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=407e3e9b

netbeans: removed obsolete ebuilds

Package-Manager: portage-2.3.0

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 09fa3e3..7b4bc8a 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-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
 DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 DIST netbeans-trunk-nightly-201606010002-src.zip 213564247 SHA256 1298b642375838c792d0334de386924e095024fd2f4ef450d6093de436d37855 SHA512 e5fa2fbdfb7bae2d4053fda427e0367eab20770926dcceb6be6476c5df3a4581ffbcf86be9857456ca3c06e723c96503bb547af7d2842dde1ba6dd6cab062e74 WHIRLPOOL 65976354661f4328a8b86543c8c34c6383d5199a3af692ad9cd1de3401509106f24927943f12bd90d4d621a1af65132581ff0b9bf1ef48c5a8916e0ec462bd9e
 DIST netbeans-trunk-nightly-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
@@ -27,7 +26,6 @@ DIST netbeans-trunk-nightly-201606250002-src.zip 216438825 SHA256 f03d25d6d23b75
 DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 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_p20160530.ebuild 3384 SHA256 914cb3fd6fb081b4854169a8b4ffaa481c4fc48c6fb7f0d0914a4fab479c7b1a SHA512 845fcd99745a16a760747cce6fb3278d4a13be79135521b2a40ec136f71bb72d7c63f6327196d204f0e96baf1081f179563647c562fe9f99d96845d8d5272a5a WHIRLPOOL 93c0d56cfbbab65286e24417665a1c7efadaf03fa40293902d3e963c00ca41635041cef1ceb1f6ad270dc19c839bced955923c584ec372b5b2c702bf3998d5ed
 EBUILD netbeans-apisupport-9999_p20160531.ebuild 3384 SHA256 4ce32af94f3710f3378fc1db750b702a9766abb55ace825be772e9b1ef0f511c SHA512 a66453f69db0ad75c1443ae009a61aafdc3135b527479232eb28c6c5cda2ae0ab998e3905b34ceb6b3275266c501342e9e2f450a5533d41bfa8d971b4b1eb4d2 WHIRLPOOL ae765125a30d7f14251141f571f018139a18e8a30d7b0cfcd18558fa801b33bac97f2e4982477086b8f30a9b29f055ee8132a609d955d061778a8668b656d98a
 EBUILD netbeans-apisupport-9999_p20160601.ebuild 3384 SHA256 917780bc42080342a907c499454e4d1f802563d79d1db2db0d8e308069050e3c SHA512 7a3f3b54f21382aa7a76c63aa7474d802f948c710bf4becf202762a373a3563f81fcf1a1ccffbf821c05f3bd7ab87b60827e9c1ab09863abe41edd2496f750fb WHIRLPOOL 93bb9dcb7da36620d51e279863af996d0d72ebb1a9149f656b1729c873a739bf7870b917057d3464ef6727c09e5ff44a5284eac5796ede58b143230bb0508848
 EBUILD netbeans-apisupport-9999_p20160602.ebuild 3384 SHA256 9f9e0061fd2123bd1d5018466e7a64f3cd376b30d528fff37056e38d18cf89b1 SHA512 099cce38418570263bd2c8d4ec44980e1bcd7a320ebcd00abf511e58d7517964d51086495ac45388cb2e8e0caafa313bd8536c8e7dca5e67d49b43967f4187ab WHIRLPOOL d1ab187f69d55dbbb869f200463b0e82be1bb1964b092b2808a455a04a44e3944d7d1206a0d46e7ab1f14e60f9ec6836c288c8435be268193f4dc4bad5afabb4

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160530.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160530.ebuild
deleted file mode 100644
index 73f99fd..0000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160530.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-05-30_00-02-33/zip/netbeans-trunk-nightly-201605300002-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 d6d5d15..8be9d54 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-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
 DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 DIST netbeans-trunk-nightly-201606010002-src.zip 213564247 SHA256 1298b642375838c792d0334de386924e095024fd2f4ef450d6093de436d37855 SHA512 e5fa2fbdfb7bae2d4053fda427e0367eab20770926dcceb6be6476c5df3a4581ffbcf86be9857456ca3c06e723c96503bb547af7d2842dde1ba6dd6cab062e74 WHIRLPOOL 65976354661f4328a8b86543c8c34c6383d5199a3af692ad9cd1de3401509106f24927943f12bd90d4d621a1af65132581ff0b9bf1ef48c5a8916e0ec462bd9e
 DIST netbeans-trunk-nightly-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
@@ -40,7 +39,6 @@ DIST netbeans-trunk-nightly-201606250002-src.zip 216438825 SHA256 f03d25d6d23b75
 DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 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_p20160530.ebuild 4790 SHA256 7769cf54a5ed50ad522d6be9dd38b301e410e973bcc43ed14b743d531281b80c SHA512 7e0ad8ae0ec2d5f40c401ae196c4c39c0768e8dd27bf716ddd211935753fb11a77031b5a5337ca7ebd7268931eb6462040a567283e339bae34b313bfc6830def WHIRLPOOL 34f1eccec6eaff036e66eb94ca671448a94fef0c8507d447593e04c3371082f7b1fdc3a675c18905a91c9a85aa48185d8aeb7cb78aa9d092e62464d5e0541f83
 EBUILD netbeans-cnd-9999_p20160531.ebuild 4790 SHA256 b0f128cc2702719236a0cae0cba9a9f2674594b12781a25e281f52aac68b0ae7 SHA512 6fefa351b7abd2ebf3ffad1d8c234507b14538097143fa8005048565e1fabcef28068013a0e50457cd5d7827e87ec4b78c66f7d8770b81ece6a6029709831612 WHIRLPOOL 7add3fb0af325d58e6630a025632d441d4c2b7050f5271aedc187b00f69f1a5b389455afd8ff04b8fd8f96b39caac137acae9f2529a1251ac036beb8f50ce6c4
 EBUILD netbeans-cnd-9999_p20160601.ebuild 4790 SHA256 d519d679c1a8527e706fc54cbee9f0679ce5cd4768edb5b6d8124ff5a11ce986 SHA512 b16f75d0534b9966f1c8a0d1ab2b61cab72aa523d800d710e6d479468a0cf72cc44a343e167b0c63db8ba5e78e3bb96ea75200d2f850fea973e778521b52f190 WHIRLPOOL 2492e733e7a16de4f0972d079ff385ef69e553c1f9e3ae8e9e8fc61140aecb270080606bd0b24eb0934f70e98c67b55da7f1700904e6e38dc04fcb98464e8e1f
 EBUILD netbeans-cnd-9999_p20160602.ebuild 4790 SHA256 2459de80a913934d021318558ac0f674d838ac9829bff2a13e3a645948ba6b44 SHA512 6b13ec3c8f2d537f753c62b14935c8dbe9f39d28a36dec434d47ce4c46cf0f8310cd76cc0814530b2b46f31b19c1cc06d076d82ccf5719fd38a6961f863df5d4 WHIRLPOOL 57e8efd404a66954e969aa1b3f54378e5766fe97b077d064c2ae73abdfdd68301e0edab2df4c668f2f5ec992f500cc9710fc68001ed53cfda31332cd23250a32

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160530.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160530.ebuild
deleted file mode 100644
index e994cb2..0000000
--- a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160530.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-05-30_00-02-33/zip/netbeans-trunk-nightly-201605300002-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/2B406087CE1AF289539768BDF36F52E63F69F1CB-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}"/2B406087CE1AF289539768BDF36F52E63F69F1CB-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 98d62db..f76648b 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-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
 DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 DIST netbeans-trunk-nightly-201606010002-src.zip 213564247 SHA256 1298b642375838c792d0334de386924e095024fd2f4ef450d6093de436d37855 SHA512 e5fa2fbdfb7bae2d4053fda427e0367eab20770926dcceb6be6476c5df3a4581ffbcf86be9857456ca3c06e723c96503bb547af7d2842dde1ba6dd6cab062e74 WHIRLPOOL 65976354661f4328a8b86543c8c34c6383d5199a3af692ad9cd1de3401509106f24927943f12bd90d4d621a1af65132581ff0b9bf1ef48c5a8916e0ec462bd9e
 DIST netbeans-trunk-nightly-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
@@ -30,7 +29,6 @@ DIST netbeans-trunk-nightly-201606250002-src.zip 216438825 SHA256 f03d25d6d23b75
 DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 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_p20160530.ebuild 2968 SHA256 10bd2623faba3cf6d42fb9e5af40344891403ec71d7f191c5e7f12750377c50f SHA512 9be1cd298afa533147aac29313ce8ba75f780a1c40b1cfa7af85a688d5f8afedcc8f9450b7ffd35ffede2755646190f41afaa2e715fa174e2c45b6037cd9ec55 WHIRLPOOL 090d3826a38a8ed6781ad14024fa0ac3d5eaa061368a06403899b02652d8240ff045639a150fdb8c97521df2adafe996844699e71072b5f7696ae85b5082701b
 EBUILD netbeans-dlight-9999_p20160531.ebuild 2968 SHA256 690e1c9bfff7d6073d58ab2866668e7f308c2eb3b962ef5e507ff11af6309d9d SHA512 e02b30bde93a346b85d920e7612ad09b2cb1cd5aecd563a0eef69e274580c67bd77f5e5802634d04ef64ced10c8c16e7b489346fb6c2901b04761f17ed4d285a WHIRLPOOL c67fd009b2aaef051466b88cd56d0877768a208b25876af5f5a338da25b1e33e52f6a87de6ee5fd87b953ac052bec9a060be5b9d9c2465d5914af88f2cbf7157
 EBUILD netbeans-dlight-9999_p20160601.ebuild 2968 SHA256 b8e54d0e7e8461f5f8e1c0ff45a2c6e11d833505b297f0c26e7a5467580cf2e7 SHA512 493f4fb6b46dcb66efe94efba561e17bd5bd60c5ee1a04e1274d1a99aadb5569307aa21445f71479b1c7938625efa785147d322f028747fd1254df08ddaef7f2 WHIRLPOOL c14df90f2d76ed52347ac9ab3d9d5d416821add0d223ce39bf4f9cded5c7757df1c2153fd58424ebd68e553aa0522ce5536858748fc085dfc853a48f7e64b2ed
 EBUILD netbeans-dlight-9999_p20160602.ebuild 2968 SHA256 351088ebb237b03559f3dda345e6e6d6ce56cfe5e64489006f96fb36528891c8 SHA512 5c1f3c5ebb06d5724524766b9ba32ee672e40489170a8300dba367d0ded696eea0db5874f9859c673d8133ccf6a541ec618dae0e822e454280d277113683a327 WHIRLPOOL a41ea5b2ff9f23bff25f7075e9786d224551a1413a3604e14f1a8a23e45185d42e3ed36cc677e41e105c684a41e0aeea365d59b50bd3a6b5cbd5ead6871cb941

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160530.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160530.ebuild
deleted file mode 100644
index 107d4c5..0000000
--- a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160530.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-05-30_00-02-33/zip/netbeans-trunk-nightly-201605300002-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 a7a306f..a516134 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-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
 DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 DIST netbeans-trunk-nightly-201606010002-src.zip 213564247 SHA256 1298b642375838c792d0334de386924e095024fd2f4ef450d6093de436d37855 SHA512 e5fa2fbdfb7bae2d4053fda427e0367eab20770926dcceb6be6476c5df3a4581ffbcf86be9857456ca3c06e723c96503bb547af7d2842dde1ba6dd6cab062e74 WHIRLPOOL 65976354661f4328a8b86543c8c34c6383d5199a3af692ad9cd1de3401509106f24927943f12bd90d4d621a1af65132581ff0b9bf1ef48c5a8916e0ec462bd9e
 DIST netbeans-trunk-nightly-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
@@ -59,7 +58,6 @@ DIST netbeans-trunk-nightly-201606250002-src.zip 216438825 SHA256 f03d25d6d23b75
 DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 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_p20160530.ebuild 15825 SHA256 c2a2164241155e021bcead95e796793f06dfd14bb17d30b31dc521a6f6010440 SHA512 da6e60db8ad6523551250509e2b95a236c5f519ceee3e0c748b6f7d78a07cd83c52cf3499d6b943f73f9693389311aba256de58e6d606afb31b38e3e17a560ce WHIRLPOOL c8736abcd05f81742a152f9430ceb58dc621a28ff872db9fc7c09206e21e06bfc8f91cb199573cdfd1882545e91641c7c5d0da8251828a7573f0efe6c1c2ff57
 EBUILD netbeans-enterprise-9999_p20160531.ebuild 15825 SHA256 8896ee4302604466c12ab67fcfaaab19412001cfdb847354bf82f53ad77d3865 SHA512 e975151fd925aa2cb0f6e581d65e6377f3973bcbef832d6f09f485adf00a7c1a5fcbd0080f5f47e36d1f5d7a4568329d71b3e00ae7c4f2b08adc88264a654748 WHIRLPOOL 69647fc959f74528efb56ee23b47943fe43624be9d338fd2cdf9ac0cda575d29e0db2336a8252105108dbe0dcaf36e48a58712457470f54089ba1dd20bce391d
 EBUILD netbeans-enterprise-9999_p20160601.ebuild 15825 SHA256 ab4b1c6666b1b31dea4521db86f71136fe492d79ac25984084dcc010c4953505 SHA512 d2a0f6f0460e74a6e58438571966953bf7b3d4f9cd0712500b27025e75f6495b7a3fb9923ae0d79d80c921d15078518d3b1a6b148c5f7872dc45617dd172a712 WHIRLPOOL 45208c94005b564269a78856e84781d8628910e48c39c85d65502e2cf3123110f02d062ec7e80027805784b3bb95ae12bc292b8915846155ecda5ccffc422f11
 EBUILD netbeans-enterprise-9999_p20160602.ebuild 15825 SHA256 f0d497d0a62a9fddaee1a27f3b53b430d13fa5a012e78adecc176860dc287174 SHA512 63cdd3fea0813992e4b55f4e5d63c0efd596f4f8c4c96ebfe8ae284814d9aa04db0336e6973801591b17a394f1557df9e19779c64051d89aa37303765b6d466a WHIRLPOOL 8785f4139ecc23a225c1fd0de9478b18de97061097a3529bbc2bd425cabbc6f60fb14ef187e4288cdbea759b7161204139768c65004750dc563f4602627950d0

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160530.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160530.ebuild
deleted file mode 100644
index 6b8a775..0000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160530.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-05-30_00-02-33/zip/netbeans-trunk-nightly-201605300002-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 51adc7a..da5acae 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-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
 DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 DIST netbeans-trunk-nightly-201606010002-src.zip 213564247 SHA256 1298b642375838c792d0334de386924e095024fd2f4ef450d6093de436d37855 SHA512 e5fa2fbdfb7bae2d4053fda427e0367eab20770926dcceb6be6476c5df3a4581ffbcf86be9857456ca3c06e723c96503bb547af7d2842dde1ba6dd6cab062e74 WHIRLPOOL 65976354661f4328a8b86543c8c34c6383d5199a3af692ad9cd1de3401509106f24927943f12bd90d4d621a1af65132581ff0b9bf1ef48c5a8916e0ec462bd9e
 DIST netbeans-trunk-nightly-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
@@ -27,7 +26,6 @@ DIST netbeans-trunk-nightly-201606250002-src.zip 216438825 SHA256 f03d25d6d23b75
 DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 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_p20160530.ebuild 2913 SHA256 fece8416b9de9c9799e0baf8911e4964081a5bd0268cd2b9cb8dd086b45a7cfd SHA512 de4e1004a910a763f4086ab4b57241dc03704a4acb9126dd47c7b5883046898b51af9f838904ebd74e5b11af6a8d650ad85a3f6d0c27939feeb22e557ad04c8d WHIRLPOOL dc65801139c09d51a68f3481478d1aa1b42683ce52e73afc5fa86994535bebd224e752649dde268c6cd8cc61ef2cac949faa9f9577aefdcba8fd902159e6d22b
 EBUILD netbeans-ergonomics-9999_p20160531.ebuild 2913 SHA256 d2a5f6fc547d45a82546c9f7d41b32924f3e9c974c122b00f1a853560581250c SHA512 5e684421b0d5a90eaab360ad674fb2a5ba32c548c8f29a70de5537e33743a3122ae6a7634243d614b8cac09fc307b9461a9acaa42fdbb2c1c5ea46281c5fa1bb WHIRLPOOL a5168ac0341486a43586d3e7af41172623ad574d2933c07903e808ef6fb21d793627b3210a8daa038b8552d4382533438c3ccfa0552865f3e9c74d1a334f6756
 EBUILD netbeans-ergonomics-9999_p20160601.ebuild 2913 SHA256 257c09a1072e694f0508ac5a1995ae3fdca17bf0fb53604bb46f94754ab3b878 SHA512 595d8a6e2391c6fffafe66a66ff9f4f518926bc33e16f63289002ac78e1b77f43310313bcab3f2c8b1dc51a4d60a81a129ec80545ea50c5080d585b0d41e9d9e WHIRLPOOL 86877a5d2de37fe475ac2a5fb73c0d87cb073e581d93a5036f157598a2653f9a8e9f3a5330990ab7c6f0a3bee8ec7bf937ce6ced00c418d6f64b2e32f2d61787
 EBUILD netbeans-ergonomics-9999_p20160602.ebuild 2913 SHA256 8a7812ccff99e623b71ae4996708dc44bd2afec57f32f8f67820dec994db0cce SHA512 5e482ab060145b2ead40c7f338665ca918635445ab9f40d23508785588b96f6b1755271fae96462124382d3388e2b810776c233c39054239112035ff16215da7 WHIRLPOOL 453cdd733a2e346ed12998f1c70f6ac33c0931b5b8be3f8b8dca0cede9561ef5fd995e71eb842d9b509bb559f559612c39a4dff33c6a18bf0e4611dff2033108

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160530.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160530.ebuild
deleted file mode 100644
index e7f028f..0000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160530.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-05-30_00-02-33/zip/netbeans-trunk-nightly-201605300002-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 3c52b5e..c006267 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-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
 DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 DIST netbeans-trunk-nightly-201606010002-src.zip 213564247 SHA256 1298b642375838c792d0334de386924e095024fd2f4ef450d6093de436d37855 SHA512 e5fa2fbdfb7bae2d4053fda427e0367eab20770926dcceb6be6476c5df3a4581ffbcf86be9857456ca3c06e723c96503bb547af7d2842dde1ba6dd6cab062e74 WHIRLPOOL 65976354661f4328a8b86543c8c34c6383d5199a3af692ad9cd1de3401509106f24927943f12bd90d4d621a1af65132581ff0b9bf1ef48c5a8916e0ec462bd9e
 DIST netbeans-trunk-nightly-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
@@ -31,7 +30,6 @@ DIST netbeans-trunk-nightly-201606250002-src.zip 216438825 SHA256 f03d25d6d23b75
 DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 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_p20160530.ebuild 3377 SHA256 ca892dd9aad03a6b440aebbaedd80910eaedfeae1ff671c3c5f85b258cd1561d SHA512 01435f91fe82dda69ce7135e867068add4b284fee0bacfa6247f898313dc6bc7215258f80d1fd5c50ee07b5015b625327eea355864d4c94196fa39862605e6c3 WHIRLPOOL 833940e29916f0e24e2ef1039193caf6efd519013476529c55c6527f8940f8eb852e28cf39e3931cb9b243829273522a774f30bdb68db018d04ef38de35658f6
 EBUILD netbeans-extide-9999_p20160531.ebuild 3377 SHA256 8fe07d5a616af6c87fa929aa68745c940bc0b4fec9296a9713e4e081f46de096 SHA512 11f2ab2646e8e3d44475be7c479aa7c710e9fe704802ea14b3613e0da67a5fa25c329d08ab68c31f6fb17a3426f654fb59e89b6ba64f4c587d0a571230307c4a WHIRLPOOL 51111d987e7f08ddbe53af36e0f56b719d87e243d30756a8959e415b0751bbb5219939e6848bf106e1606c37e60106f0d6aaafe8f379db95c01bf819e83ef698
 EBUILD netbeans-extide-9999_p20160601.ebuild 3377 SHA256 f00795a59287fb81ad7171b10d8bafda2b118bd28e08ccc1a0de34dee3e942a5 SHA512 d87a2d902b261b6611fe5ecdcded01b83a317572badb6fa115e2a253af2dc8ff4edeec17cf584eeb2111fdccbe10e7bc7a046ee85e8f74a9e9b7ed953fd4ceb6 WHIRLPOOL e890ab0710f18324733bbec6d64874236fb1981d77aba749e6dcd0e1bec9177b62bd0ec119e2be62480da62af0600ff819233404b1cab078766b217e45c0af87
 EBUILD netbeans-extide-9999_p20160602.ebuild 3377 SHA256 accab66f7708728148d4ac2f50cfa3675debee5b43d10f0a907eb03232ebff7a SHA512 5399f07b2bdb4c7b5d0d65657d360717392d2b9a931f8bed52e052630757de37052e31b256f1864fb2cf1268cc048c49512fb14f9146bd44be90dd1ef32abcc7 WHIRLPOOL 80c3103b8cc790e0202b1519f14c15d704fdd7fb40fe837ca867b05de913fd7e4b4ac301ac62c95d1b9d06eb1aaff76cb309e55812c6cee34ae35d3cfc350fcc

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160530.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160530.ebuild
deleted file mode 100644
index d9f392e..0000000
--- a/dev-java/netbeans-extide/netbeans-extide-9999_p20160530.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-05-30_00-02-33/zip/netbeans-trunk-nightly-201605300002-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 3dc8037..641b652 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-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
 DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 DIST netbeans-trunk-nightly-201606010002-src.zip 213564247 SHA256 1298b642375838c792d0334de386924e095024fd2f4ef450d6093de436d37855 SHA512 e5fa2fbdfb7bae2d4053fda427e0367eab20770926dcceb6be6476c5df3a4581ffbcf86be9857456ca3c06e723c96503bb547af7d2842dde1ba6dd6cab062e74 WHIRLPOOL 65976354661f4328a8b86543c8c34c6383d5199a3af692ad9cd1de3401509106f24927943f12bd90d4d621a1af65132581ff0b9bf1ef48c5a8916e0ec462bd9e
 DIST netbeans-trunk-nightly-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
@@ -29,7 +28,6 @@ DIST netbeans-trunk-nightly-201606250002-src.zip 216438825 SHA256 f03d25d6d23b75
 DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 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_p20160530.ebuild 3416 SHA256 604d361d4be2383ad30473ba61e48f657bc2719a9b8f4d36165bff85a9470002 SHA512 a3a7da055fb9ca2d099767aadb356219f7d05613352dc3ab093d660ffac45d9d1a52d3f3a2fa3e69e59c911eca1ad9f40cb454977611cabeb16b0c005fd88487 WHIRLPOOL a4f6a6b224d4bd4ece3ca0714cd336e1d07e2d9ecebf3841ac2aae05b583251a09acd5424e9e76f2dfe0c8de6a78153a01b90b2c60983d212ae16be0c77b5acd
 EBUILD netbeans-groovy-9999_p20160531.ebuild 3416 SHA256 afba60b1ab66a4189c113e0d504f897d9efad1ed55628c05544eace987a570cb SHA512 dc2b6bacc5cd01d73f3eb64ae059202f65d998a48997c5773d7a03b0c04a350ce538532b07d329f761331ea9ff88ff61ad7eb7b1d064d1ea772802a0ee833d1f WHIRLPOOL 78880b46d8c066462c4897df5a1258eeb6531f6b5e769af157f7b1414ccc3a518f47aed9fc5a8cb2c9e36e77d568f48a4aa5cd66b73c7b198d53f67b071ece64
 EBUILD netbeans-groovy-9999_p20160601.ebuild 3416 SHA256 8702022d7ee560f5aabec6891097902ee2dcad43c9ffba55cb406e79b2edf868 SHA512 16e4862b749ac7c65921c024ec2600dbbdba1c75aa52a364de73ad657862d6f3309d180d2a6ac56ff9d10538046de4013dc6ec76e8884e4e46c05dfd8d3657e8 WHIRLPOOL bd19c6b5b5372261bc7b5bfa862db08b30897a7843e545d06b7be592d8ff17ea6e9a75d2be641999d5285f9e6722767ed68836acf91bb18b9cae03b3655e1d2c
 EBUILD netbeans-groovy-9999_p20160602.ebuild 3416 SHA256 214540d35a040cf91bcfcf173f730ef69e49a2950a2936c42996b4c169fa51b9 SHA512 9dcf127f42f8af264068b876cd094ff570c478105e856759835218f5cc84dbe98b052b11c27962229d4168d39cd32d73638d3a760e0ed96d91de4b15cefa0a07 WHIRLPOOL af0c027f196481280ae8131d511b9318f3d0c1bf1d893bfb08ad7bddc5e92cd1713d747d84f9cc4b4cc6687560ace1f48dc2c99c5bc6e84e29eabc64f6e81408

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160530.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160530.ebuild
deleted file mode 100644
index db61d8b..0000000
--- a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160530.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-05-30_00-02-33/zip/netbeans-trunk-nightly-201605300002-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 cddaa3c..eea25a2 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-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
 DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 DIST netbeans-trunk-nightly-201606010002-src.zip 213564247 SHA256 1298b642375838c792d0334de386924e095024fd2f4ef450d6093de436d37855 SHA512 e5fa2fbdfb7bae2d4053fda427e0367eab20770926dcceb6be6476c5df3a4581ffbcf86be9857456ca3c06e723c96503bb547af7d2842dde1ba6dd6cab062e74 WHIRLPOOL 65976354661f4328a8b86543c8c34c6383d5199a3af692ad9cd1de3401509106f24927943f12bd90d4d621a1af65132581ff0b9bf1ef48c5a8916e0ec462bd9e
 DIST netbeans-trunk-nightly-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201606250002-src.zip 216438825 SHA256 f03d25d6d23b75
 DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 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_p20160530.ebuild 4126 SHA256 c4ca867ae9a0127cb0e3313c92b296d89208d60049a715f6e1f3e52784be1555 SHA512 72bee50ccc7c0fd2e89fba17865f59c23dadce10c354a8c4aaa5f122d54498f536dddb560721a6b853d4bcef9e2319d28e4819d885cb9c209208d9b16a6272cf WHIRLPOOL 562e44586ad6e1116626724bb9607498ca50d1a28fe9af2cd1f71f307c33eb7efeb7a22eb4057fe4e876520f7546e216aabd909b56c5faeff7a945b1e22f0ce8
 EBUILD netbeans-harness-9999_p20160531.ebuild 4126 SHA256 68fe3568590b425f719804a05a92b4c2201544150c0468756e5e761420c8cdc2 SHA512 adf63f4ae0069318f7630786bf8c5eaa73d4fe68d8e67a4297219cbe5affd399daa556cbf5f34ca87d4352f6e69c02a3c39e48d2213a4a390ac5c1badbe2cc94 WHIRLPOOL 92602e7834a99cc320e23cbe455ef94202e3441fa7332c151745207afd375466492cf18282bcf2fafb409de1caa8a3dd128ad28c8d36e0232e926d9cd04b9df5
 EBUILD netbeans-harness-9999_p20160601.ebuild 4126 SHA256 09ce0bc1cbf8d2c8cbc14c02b6e981958cad9b8a7ba7f26a283ea9d9ffcafa27 SHA512 0a0ced1be53478236aca906eb7e40511017e15111d18c696c9679c1b06c1ddf12f5cf00c02d118f6d5ae69ba7bd34d85701fdb3fb2b9514c9b75371f5c326eee WHIRLPOOL 4241c1663e5180d29ef4667078ce7f615c38d39d61546f357f2ed3b71e97efe548580dbe89773959ef921acfa7277f737997121a61fcb2c9d018488280287c19
 EBUILD netbeans-harness-9999_p20160602.ebuild 4126 SHA256 aa6cd18675cff39af819566282a6ca2ba7517022887258c0cca45c1eef0f0472 SHA512 316a736a27c44368af9e6c418b417b0c0495c82eaff9f692f745dabdb68c02361a0910bf13c5710b15c57696a15226ff7fbe9fd85f8b6fa9827dae772039044f WHIRLPOOL d0576ff6178bf7e690808dbd22aa6c8a2534bd1f03ccefe1b311d38c3a9f645ea2df1b969afb9491f68309361ecfb8cbb2ee3563246c90a96d3b587154442d4c

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160530.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160530.ebuild
deleted file mode 100644
index 708f03b..0000000
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20160530.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-05-30_00-02-33/zip/netbeans-trunk-nightly-201605300002-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 958a140..5759e19 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-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
 DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 DIST netbeans-trunk-nightly-201606010002-src.zip 213564247 SHA256 1298b642375838c792d0334de386924e095024fd2f4ef450d6093de436d37855 SHA512 e5fa2fbdfb7bae2d4053fda427e0367eab20770926dcceb6be6476c5df3a4581ffbcf86be9857456ca3c06e723c96503bb547af7d2842dde1ba6dd6cab062e74 WHIRLPOOL 65976354661f4328a8b86543c8c34c6383d5199a3af692ad9cd1de3401509106f24927943f12bd90d4d621a1af65132581ff0b9bf1ef48c5a8916e0ec462bd9e
 DIST netbeans-trunk-nightly-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
@@ -167,7 +166,6 @@ DIST netbeans-trunk-nightly-201606250002-src.zip 216438825 SHA256 f03d25d6d23b75
 DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 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_p20160530.ebuild 30761 SHA256 729d47fa65bda0ffd9e451882d14fb7a046bca4b429a6801243db70fda2993a0 SHA512 1dbd30fc7b3229e3d5e46068a53008d4e364913d03883cfbb38e043eeb2f04873045b3a6ee89945576b4df872e636c4938cc4252618c15a05c8c7a58f2988d20 WHIRLPOOL 70311879716c5927aba8321f9e919ccaaa508bd78f55fa11727d9c24599ce949655bbce7d58463f345ed52909204a0f026763daa1101a29cb9983e3b45ececca
 EBUILD netbeans-ide-9999_p20160531.ebuild 30761 SHA256 7309d48bc6cafdb8e1b7aadb2eb62830ef23d2362b495c26cc5bcb5a32bdb398 SHA512 f3623dee4ca4660af77d812103061b3dcc6469b6f17de17593514e94129eb8fb2762911afdc87ccb3e16f690ce75404ccb1f428ea58e4520ae6d0247851115e8 WHIRLPOOL 96f0cac48e2214606406c58e454e3bd662aa7bd51f11766c5be901c9034a869b55a9dd5c3f7be82236434909459b2aa2254b4bfbc8d8cd52469ef59446c6dec2
 EBUILD netbeans-ide-9999_p20160601.ebuild 30761 SHA256 64254fa95036e095f34e2a408065ed0f9d15d6488413d9d274c3838cb8045ded SHA512 77ad5b4f5df722fef543b567d1e01949e9d96cce38ebf6f3cfa5f72eb2dabadf5b63de313141877805dab06f8c5fe17013ea90b252280b36c44b7e69a8960a4b WHIRLPOOL 4e8e39faf1e8828f0439e00f5815fdfe20043cd56c65146b99b11408474dc9e2f4e37230dac4dac628631a931d0782bbc0569cf6becb463d7108c543931da575
 EBUILD netbeans-ide-9999_p20160602.ebuild 30761 SHA256 25a187d71b98cc313552edef677f1574768cb8ac9001d9357459c97547893bbc SHA512 a34cdce3f7cb3ae23437d433929891349f933d3dd8eaa5792927b8a619a58507e246dbd7ef1b0d1d38e5a01601df1f3bf03b72d0e10c72be481e2872d98ffe76 WHIRLPOOL f795e0395924136cd8cb1b1864059bc0973ac423313e44764de112717bc186d5b4afe3ea625d2d95019a7106286919fb02b2ed7fd991d6e82ad25d57bdd7fdc3

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160530.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160530.ebuild
deleted file mode 100644
index 747d2e5..0000000
--- a/dev-java/netbeans-ide/netbeans-ide-9999_p20160530.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-05-30_00-02-33/zip/netbeans-trunk-nightly-201605300002-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 e3af589..1a40b70 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -44,7 +44,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-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
 DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 DIST netbeans-trunk-nightly-201606010002-src.zip 213564247 SHA256 1298b642375838c792d0334de386924e095024fd2f4ef450d6093de436d37855 SHA512 e5fa2fbdfb7bae2d4053fda427e0367eab20770926dcceb6be6476c5df3a4581ffbcf86be9857456ca3c06e723c96503bb547af7d2842dde1ba6dd6cab062e74 WHIRLPOOL 65976354661f4328a8b86543c8c34c6383d5199a3af692ad9cd1de3401509106f24927943f12bd90d4d621a1af65132581ff0b9bf1ef48c5a8916e0ec462bd9e
 DIST netbeans-trunk-nightly-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
@@ -68,7 +67,6 @@ DIST netbeans-trunk-nightly-201606250002-src.zip 216438825 SHA256 f03d25d6d23b75
 DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 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_p20160530.ebuild 15656 SHA256 1b8eae5cc69ee5c52d22ee4877eaa52e1f472ee530f21815ab48e34ccbbee3b5 SHA512 6a907af9f568ee927df9f10f7564182592fb6cd448fa163294041aa5f5070a197426d954f6676e05f5e0c6c40fa49fda5cb4426c922805ed502d0183db314fbb WHIRLPOOL 8be5a9d7a20549a2d72c3f14fc15ab5db8836459042409a112e2f9de2dc9e21c503cc22d41230597f023b5c3fb97870b3194bab32873fb4ff51ba6f2766dc287
 EBUILD netbeans-java-9999_p20160531.ebuild 15656 SHA256 433143c8196e48d299bd43cdb863e6feb8a6334d0b93d8606f0a26cf2e40c307 SHA512 99d0052cf0503089ea5f6598e99628acfa229ffc611e9febfb8a03f7c245a06d7c96b058d5538715a034e66512cd60cc856c384120f9b41e49b2746e91da6b6b WHIRLPOOL 84eec64a0982a7b3ff423435401584686fa9778bbdc6065306529a220b0fb195badd6fbe524ac5665f17714c8359106509afa684b38c5a5d244efedf19c28c28
 EBUILD netbeans-java-9999_p20160601.ebuild 15656 SHA256 4ce9751a839ac02e05bf349ed6307dd9a81b59467016d6975c1dfcac53b6e8ea SHA512 d86452bc09af3c6e88d585e42ae2ce51791732c77f47a44220bb5f7903d2b68f7252f29b2fd6b9b57b6fba5db8af2d239f94a63521e712b2a83d73e43aa3f357 WHIRLPOOL 1f362ecf39da0be3a20c56a8f1f1a8be0056ab345b02050e013d867084b7bfc87e5bc39d617aec515f0f3e2d832454e5398aa5af2b42cb32cb9121a24e253169
 EBUILD netbeans-java-9999_p20160602.ebuild 15656 SHA256 715f83188a6c730b16e539731b5c2a0d12c34993bde2c708dec8e0949e6c5d15 SHA512 8adcf8e3b54e7ad64f4a24895880dd5d2edf4c8d0190f7225bf45f28ba8d17ff98f2127dc9a8d3aa9bd7859e31f09344707dc3d8d7bb4c9019bc86884a061572 WHIRLPOOL 5d067335f78e519aa35cdc4fe768df198e9ce0958aea849fe74f21e78731dba5d420a68061e343e7d017794a131046b81cb2c5215691b9471bf50291425d7b99

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160530.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160530.ebuild
deleted file mode 100644
index 783e880..0000000
--- a/dev-java/netbeans-java/netbeans-java-9999_p20160530.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-05-30_00-02-33/zip/netbeans-trunk-nightly-201605300002-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/B732870DED6CCA71896B0D8913C7035E396550D9-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}"/B732870DED6CCA71896B0D8913C7035E396550D9-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 b22aba9..3636f23 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-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
 DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 DIST netbeans-trunk-nightly-201606010002-src.zip 213564247 SHA256 1298b642375838c792d0334de386924e095024fd2f4ef450d6093de436d37855 SHA512 e5fa2fbdfb7bae2d4053fda427e0367eab20770926dcceb6be6476c5df3a4581ffbcf86be9857456ca3c06e723c96503bb547af7d2842dde1ba6dd6cab062e74 WHIRLPOOL 65976354661f4328a8b86543c8c34c6383d5199a3af692ad9cd1de3401509106f24927943f12bd90d4d621a1af65132581ff0b9bf1ef48c5a8916e0ec462bd9e
 DIST netbeans-trunk-nightly-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
@@ -30,7 +29,6 @@ DIST netbeans-trunk-nightly-201606250002-src.zip 216438825 SHA256 f03d25d6d23b75
 DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 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_p20160530.ebuild 4971 SHA256 8aed47e3d3a4d151cad6366d8a8ab02c52464cc372ad2aab9023f9f646eeea45 SHA512 e813fa58fbd5ca2dcf0b62bf5b7f26b5ace2c954cc673f99f23b4ca2a5bb96420c9bf0f985c40943096cc539d5064165facf25528c130476d8026f7807653613 WHIRLPOOL 21af88b8f80b9d13fb1b5603a5b8a8d5d22a443887e6fe5394cfd5956bc8b0e4e4f848cd147afc0fd1d0ac964874f91f9474dd74eaf626fbec682c6f0b3ddf3f
 EBUILD netbeans-javacard-9999_p20160531.ebuild 4971 SHA256 d70657ee63537c718193070179a5a0e2c84622eec1a51d4a1d44ee660088ff95 SHA512 85d5954111ba408fd2edbc8aaf58d11a66a43ef48bc0600325e26553dd8897dea49a5941cc780f22728a824fef7672df5fabe8a81e0e2b4106de515251f7afaf WHIRLPOOL 4081d9d7c5e5f56ca829c64709c4d9f0c994c3feb80982a65b20858af171ca1e61358042b1338d95c08c016ac89b3e1f4b0175df61ab5e302a788e82bba425cc
 EBUILD netbeans-javacard-9999_p20160601.ebuild 4971 SHA256 5a0abd0209890bb66c7cc8b8cd7d6e56cc97228cc653cae26ec484f83a1aa1da SHA512 a5a75a6238df091c0262074fa8c95de3a6665e4e57a3476488938c87eeaaf622d31f609577591fd946778bb6ca8808a7fe49b59295cd4dd99e3f7e5e1864d198 WHIRLPOOL 1dd3acf737833b9fe7d7202a65d8b58827247c7d1ff4b156cdc22c740b8e3218069dc327866fd24651322d943ba7a500afce75250f4ca9fe8b9ba3b3b913ec68
 EBUILD netbeans-javacard-9999_p20160602.ebuild 4971 SHA256 67b31d9bb98c525975409e54c96f560b6bd92e42fc6d4148ac42ab2e901fdad2 SHA512 68dee96fdaa012292287767287de8c4747a943090218bc8ce300368811cd8e776140643c958da14d6b0e4aab85c6fbc9034e696583317b51ca5062f42bed5233 WHIRLPOOL 001ac8bed54aec01902838857505e350a2da67ca190c88232c0b58ca03a10dd7fc6559a7776bf0ee06470e6158f6f8ac827623b1aeb11f797ed6ab2f71045353

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160530.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160530.ebuild
deleted file mode 100644
index a12c415..0000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160530.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-05-30_00-02-33/zip/netbeans-trunk-nightly-201605300002-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 df50e71..5d54b89 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-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
 DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 DIST netbeans-trunk-nightly-201606010002-src.zip 213564247 SHA256 1298b642375838c792d0334de386924e095024fd2f4ef450d6093de436d37855 SHA512 e5fa2fbdfb7bae2d4053fda427e0367eab20770926dcceb6be6476c5df3a4581ffbcf86be9857456ca3c06e723c96503bb547af7d2842dde1ba6dd6cab062e74 WHIRLPOOL 65976354661f4328a8b86543c8c34c6383d5199a3af692ad9cd1de3401509106f24927943f12bd90d4d621a1af65132581ff0b9bf1ef48c5a8916e0ec462bd9e
 DIST netbeans-trunk-nightly-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
@@ -29,7 +28,6 @@ DIST netbeans-trunk-nightly-201606250002-src.zip 216438825 SHA256 f03d25d6d23b75
 DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 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_p20160530.ebuild 6293 SHA256 4a30ffd321e2cf9d48884e5558cf10f59b851dcd8dd0ad611752b4945fad6507 SHA512 c639dd17eaecd5a6fed55eb537306ce388e020be4aed9ffec572d1a928d80a880ee7834b13012f3a65b1d88a058a64c3958f2f24795f9e4a0f5ed21e8f518b1a WHIRLPOOL 079267b3edb4803f49151012b8e48b4a8e50a69357143ee5c721a8d39f9dd04cdfdca81120ee9df871ebca1017353d8264eba13fb5f6499f606fd5e3a49844ce
 EBUILD netbeans-javadoc-9999_p20160531.ebuild 6293 SHA256 813a015748a35f8f8b19039880c93991752990378478f4919ab769be01b7f958 SHA512 7487278344df7ad43f801c9c15732526d49e6985aebb2a5d947f37856fd7c250563db8a9f0326d72b3dc6f7ea3e4cf3e9f9f58120828be53dcc64385bc79eadb WHIRLPOOL 6deefd30f9c64f670c0bb207c325d0810923d9a61e0877830f348a01c499db2bc65ea89caf11332d6740e5aa01241555dd0101ba6670b6002fe11d8f8981f4a5
 EBUILD netbeans-javadoc-9999_p20160601.ebuild 6293 SHA256 393d1a4c80cfc24a774cff006128b94d102036b6b6f79a52bb1ed5eeaae2e12d SHA512 e997b8ad6090084e2aa8f2a098a7e6bd3d334df18a5180812e05ad438feb88913c47d5c98188b332719932072ed468da38df82aec25d7f56683215392bb35c76 WHIRLPOOL e9c0f32106f431f418b30756a1d118ac2140df69c17c6f1a79d2cbd65bb60bcd3216fd53acc1e651d6e12f2dad18153f31923e2f95f621a8bf87b8342c1452c3
 EBUILD netbeans-javadoc-9999_p20160602.ebuild 6293 SHA256 d05f5bab2b691dcbb6b8da3d4fbda78564cb88864d9c118c8b6173d7635313f0 SHA512 b9f4424343e5a867e066499439e7291fd2e0b7495a60a0dbfa161367a166c950ed6e49d9ff30cd5e693bd8e4afc78393ff95f6d897ca2a275310e86e67f2c7e7 WHIRLPOOL 20a6430a8809bfa43b6635d913bdb3b31a0ed8530c3fb2806b4d497fb74592e96526e4f8ca02cfa501b1d63ad1f7492741b9fbf4dc87b5120afbe57abb222243

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160530.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160530.ebuild
deleted file mode 100644
index 342b663..0000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160530.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-05-30_00-02-33/zip/netbeans-trunk-nightly-201605300002-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 8c6ab9b..a0ef7ae 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-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
 DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 DIST netbeans-trunk-nightly-201606010002-src.zip 213564247 SHA256 1298b642375838c792d0334de386924e095024fd2f4ef450d6093de436d37855 SHA512 e5fa2fbdfb7bae2d4053fda427e0367eab20770926dcceb6be6476c5df3a4581ffbcf86be9857456ca3c06e723c96503bb547af7d2842dde1ba6dd6cab062e74 WHIRLPOOL 65976354661f4328a8b86543c8c34c6383d5199a3af692ad9cd1de3401509106f24927943f12bd90d4d621a1af65132581ff0b9bf1ef48c5a8916e0ec462bd9e
 DIST netbeans-trunk-nightly-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
@@ -35,7 +34,6 @@ DIST netbeans-trunk-nightly-201606250002-src.zip 216438825 SHA256 f03d25d6d23b75
 DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 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_p20160530.ebuild 4717 SHA256 8d47c484169039f422ab26243e9759920de989254eb8d36d229f03a9e846072c SHA512 7706da460389b59cbe9932b4927901168af67be0d4eeb690c261c66bcae9c765cfcf319310849ffa8aee62a20867cfa6dd676733a5536303364cc627959ca8bd WHIRLPOOL 990455ca21ef0e5b9ddd2ca76d1960b7a2eb3088193ca12d732ed4dfa8dcbdf1d5c9ebe33de58ddfe814f9ec922aace5a18f1281097aa95061ef210ec80e5251
 EBUILD netbeans-javafx-9999_p20160531.ebuild 4717 SHA256 15385908c5ed07bab07ffff59ead705b1b647f8c35689fbef1a470f382812992 SHA512 c4bcbabb3c31d484dff8dc71b37c4c86860a374f66abc317c60a993d3d87a8f30385cf142b9b64d848bbb5b48879f751351f609939ffed65e13f94cfda113b6a WHIRLPOOL 926ebb4cc0d24fe0aa4fbbf486b306b713257deb7594a02bde66d2a740890604e810f9b1b97b24d41d80b56e36024c3dd19bfcf7ccd204722bd29918a9907ca3
 EBUILD netbeans-javafx-9999_p20160601.ebuild 4717 SHA256 f07d8fa724dba872143bd7879e079e6899b148162e15103b37a9b348076a1ae8 SHA512 e112a6b5e41631452abfec970c86111c9b41df538f1ffce733eadaecc316137b900c62ad9c414bba62361a9349ce68e69fe1234305b9f70567dc67de6dd39ebd WHIRLPOOL c74f5f24b99420c1756e352536b7673e6f1836df61e06c64e35d41ba9ff7bc293271f17ea1ef7aae49aa591c3edb5bbd46e4b5c5493091524069fe2269a6c262
 EBUILD netbeans-javafx-9999_p20160602.ebuild 4717 SHA256 7df344cc9d7a9b5b3f1d8322a4c8d5fc126858c4d27a5e09421b9d80b2dda9e3 SHA512 21ec266d8c4b5cd1d397363504ef3e7ba96a5a724e1167dea35f2c861f5328cd4998ba26f7f487a1933d0a90f9225a4fb88a39836d5a6dfd5df2c8077901ef52 WHIRLPOOL 926805c7df2f92351b2f179489b2ed12e78543800d962d4117a1cc038fd1a0240b10c03a8474d51912d41d81cbffd5bd8671821f4ca1193a12e16ea0a4eaf408

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160530.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160530.ebuild
deleted file mode 100644
index d539345..0000000
--- a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160530.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-05-30_00-02-33/zip/netbeans-trunk-nightly-201605300002-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 988e7b9..993518f 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-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
 DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 DIST netbeans-trunk-nightly-201606010002-src.zip 213564247 SHA256 1298b642375838c792d0334de386924e095024fd2f4ef450d6093de436d37855 SHA512 e5fa2fbdfb7bae2d4053fda427e0367eab20770926dcceb6be6476c5df3a4581ffbcf86be9857456ca3c06e723c96503bb547af7d2842dde1ba6dd6cab062e74 WHIRLPOOL 65976354661f4328a8b86543c8c34c6383d5199a3af692ad9cd1de3401509106f24927943f12bd90d4d621a1af65132581ff0b9bf1ef48c5a8916e0ec462bd9e
 DIST netbeans-trunk-nightly-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
@@ -27,7 +26,6 @@ DIST netbeans-trunk-nightly-201606250002-src.zip 216438825 SHA256 f03d25d6d23b75
 DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 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_p20160530.ebuild 4412 SHA256 d28b10e50afe7913493d1418b41f70c956226228a2c4914ffc4b9b8ca312d1b6 SHA512 d5d44e26ce875490dd1da9f6dda261e42383b33ab411b56cf91f464ca5356136e27b13be182b78a19d67b4b387b003b78cf496e16f05d2bdba0de80b44dcd353 WHIRLPOOL 9e488789123eaefa971aba6e285ee128119306babd06e3c763c989c4e4f61f7d54fdf4ce89a6b247666bcac2f3ac64048824b1f67c01d79b73a7da21e5c10073
 EBUILD netbeans-mobility-9999_p20160531.ebuild 4412 SHA256 bfd9208382ec77f0fb140cb5aade385e9e8fe51e5f84cf374d6c1164f4f22bce SHA512 a58dcad9c20645150fe8862fabc02d1d7f68439406def14f57fa971f6cfb7249e6b21e1f7c45018324051428c6314cad21d6ab072517df4a10c926fe7c3049af WHIRLPOOL 71e47ae0aa9887f0bdb8a66deefd2e75fbb241204d11c85e5efdb345f38464c74ecc62441445f73d2806c1431b168c60434c9e4d21668cf9b7c7812c2eb28171
 EBUILD netbeans-mobility-9999_p20160601.ebuild 4412 SHA256 de087d7ef025d5ffd19b95a0b4a06d03d0d14a917b97a1dbc5d60f4d9924f5f4 SHA512 51812e2a822cdbf81d74d5264afb6b8ce8486d44f2e66ffb9cd2708d4599b8939cf77e6a7acdb81580af908cf9d1532fad92d01acfd3b79cdf41d80787e1fd53 WHIRLPOOL 3c7d7c14dd92f4062881fe0933393c4602c313e0f85a26c9bde77e6ef276aaab76080465eeb1457653e436773aef9c2a531a567dbe64052036d700d97701f94a
 EBUILD netbeans-mobility-9999_p20160602.ebuild 4412 SHA256 9cab13f457b62c8879c3af8b6b261fabcc78fb5352ad23e876f17d16becc6b0c SHA512 18af0983b9ca44ce014225becc8e2ed4e986c6497517033eea29616bc3ae398a83ef0c76415ffb74cc8d08cb3b30e7047a5959ac1b5ef39b682c1654dd949006 WHIRLPOOL 16dac895c75d51d5b3c0e711d55eebcedb09c852f1670b297081ca81d311a38455ef5eabc5c4c90e0ad05c4a13ce93cc32e5825d8855bfc26279f78c3645fad4

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160530.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160530.ebuild
deleted file mode 100644
index dbe03e4..0000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160530.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-05-30_00-02-33/zip/netbeans-trunk-nightly-201605300002-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 f219532..a986238 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-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
 DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 DIST netbeans-trunk-nightly-201606010002-src.zip 213564247 SHA256 1298b642375838c792d0334de386924e095024fd2f4ef450d6093de436d37855 SHA512 e5fa2fbdfb7bae2d4053fda427e0367eab20770926dcceb6be6476c5df3a4581ffbcf86be9857456ca3c06e723c96503bb547af7d2842dde1ba6dd6cab062e74 WHIRLPOOL 65976354661f4328a8b86543c8c34c6383d5199a3af692ad9cd1de3401509106f24927943f12bd90d4d621a1af65132581ff0b9bf1ef48c5a8916e0ec462bd9e
 DIST netbeans-trunk-nightly-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
@@ -30,7 +29,6 @@ DIST netbeans-trunk-nightly-201606250002-src.zip 216438825 SHA256 f03d25d6d23b75
 DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 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_p20160530.ebuild 4111 SHA256 894ad7d26fed0945f1a472f8812f3509ac426844ad7bad373d1ffcd35eb41218 SHA512 c71b4268dbf84a3e9313ae4d5a1df700e5266675cdcf00c533985dc0abf6d5160087a43c176c48eeac3d69e689835ce686ef9f35f495f9793096560b6b8aad79 WHIRLPOOL cf7b1672061157a1c600b75f638131c4bf7e69305759e25033590dfb14736e28c8c60dd163997fa2794aab0c7061b911a73c84538ae588393ee2ae7c13905900
 EBUILD netbeans-nb-9999_p20160531.ebuild 4111 SHA256 9454e1ae9962e35c30a385e7122acdeede6635b69ddc51771ca64a7501022881 SHA512 e8e6cc8d454cb2e7cad0c613258bbe1110104fda4e01b95662496082d04d692273676e13ccb19227cf8858bed13fa0434d84431625eb266e9f10df8b059af4a8 WHIRLPOOL 2491d248c0de3e7ae2379c20d3184980482490a0409231ac1b1b1c5a60636258cfd0d99f4b2a7691b7f2f117889c996265a3b1c210c504be8c7e397b5366e940
 EBUILD netbeans-nb-9999_p20160601.ebuild 4111 SHA256 a5c19f24bdbd819a742487647bebb88d1dd16218c2b2c699a33eeff16e26edd7 SHA512 c851d47b0400c0e49535f32f978117e03be90d539caa6bc47e7c24c95d7c94631728ce89218e55d39bfa4a69f41b472cd0638aa539e29ab2a05c1dc05c0b11f7 WHIRLPOOL 73ce719f741a26938e6b1fa7651b5a2cc64a6cdaeaf1d3d43f7af70a48819189b9c2a8ab97e1c394246d401a0e5019d608fe01418af2297469f3c9485ffe88e9
 EBUILD netbeans-nb-9999_p20160602.ebuild 4111 SHA256 7f4ce60bf8856117c7540eb74b3cec16e9b9895908e545192ed2dff7172e5b00 SHA512 43561ecdade3bc16fcbcbd7368721841014e3928823f6ebac6e3a36ef0bd21ff8fc083cdc22cd7745ad470a30fa41624146cd015f80ff172eeb91fe2097237f2 WHIRLPOOL d505738ec13725696e6e7ed1136ff5d5e7dd7dcb7857d42e9fd989489d476d04552474318f1b7b497d9ae7038fc6c2dba22d888d88fe83596585f5fb0671a394

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160530.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160530.ebuild
deleted file mode 100644
index daf8a00..0000000
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20160530.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-05-30_00-02-33/zip/netbeans-trunk-nightly-201605300002-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 266f8df..df93ffe 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-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
 DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 DIST netbeans-trunk-nightly-201606010002-src.zip 213564247 SHA256 1298b642375838c792d0334de386924e095024fd2f4ef450d6093de436d37855 SHA512 e5fa2fbdfb7bae2d4053fda427e0367eab20770926dcceb6be6476c5df3a4581ffbcf86be9857456ca3c06e723c96503bb547af7d2842dde1ba6dd6cab062e74 WHIRLPOOL 65976354661f4328a8b86543c8c34c6383d5199a3af692ad9cd1de3401509106f24927943f12bd90d4d621a1af65132581ff0b9bf1ef48c5a8916e0ec462bd9e
 DIST netbeans-trunk-nightly-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201606250002-src.zip 216438825 SHA256 f03d25d6d23b75
 DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 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_p20160530.ebuild 4418 SHA256 81d6ff1ace4684c8e091e318c5ad27739b204e8138be984cb62fe11e547ff2bf SHA512 60aadfda9de85fc255803fdbfafb9c3bc19bd1be035adb0cd4d135005bb6e5b3c70ad658d2d1c462e7dbc759459fce57dae0a05cd2b2bf85062e7c9fb4b7914c WHIRLPOOL 3036c97558de84352415e08b90b4a233995ee449e8cc2c4ec18bbb849ef1c9b10d2958c01b4d41abe9fe4685e7621ef91e45a30181176793bd5a039cd5cd349d
 EBUILD netbeans-php-9999_p20160531.ebuild 4418 SHA256 156207d35036cfa9b1c0e00d845d09817c2d3967352fb7e356d3d508c6fe0c0a SHA512 d18f6f011e86269f51c3d53b23793aa6e8ba1d3f936a77d0325344f43c5c068bcdf5d1c22751d21553903efcf05039a97a622f9128e4874f72ef440bab63d715 WHIRLPOOL 89f240bd119853d93be72d7ba9c4a63208bf328a04177b8b141726af0bf7d3934b6d60ac79f135389f03e0533c346ff8131abc890170d070e369f3ec5c11c2f2
 EBUILD netbeans-php-9999_p20160601.ebuild 4418 SHA256 2d9d4657a09b64c390257565e5dce1274d28304f1099b886d946b9329c6ba52f SHA512 41b55730648af35f24cba97bed75c62368644491567186333042bc86c39cd14b5f1e6e136ce3db0c063b4074e3d2f552e65a5747f9f569dfb7242fa572c7756c WHIRLPOOL 7ca3535df7d8adc3ca9704846d16595d2a05eac24560b19013c709d4fec3fffcf8b2ce21e43247242017e1727e9a9a38bf33ef72ad19480231149425d9ae3af5
 EBUILD netbeans-php-9999_p20160602.ebuild 4418 SHA256 c651c0408d6fa0b9cee0fde33975d4b94ee24cba36ec0dd1e03221d962185c8c SHA512 5afab0cd329177c51dde78ba2eb6e90a15df8759add25a1b19bed90f9ed6dea30e0c3a62474ecbce67f1199c8ee0f4c1ce028b5ca13097a52b7afaab666f96df WHIRLPOOL 6f1f4b1578531338867502381aa6dc898cabfebf4cad40f0ee0e103ed80780f0cde7ce4da3ccb49a52ac48235deefdef73a1dd6a7ce7f728963a71dd52bb0f97

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160530.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160530.ebuild
deleted file mode 100644
index 0be3878..0000000
--- a/dev-java/netbeans-php/netbeans-php-9999_p20160530.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-05-30_00-02-33/zip/netbeans-trunk-nightly-201605300002-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 6a0b074..af3f75b 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-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
 DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 DIST netbeans-trunk-nightly-201606010002-src.zip 213564247 SHA256 1298b642375838c792d0334de386924e095024fd2f4ef450d6093de436d37855 SHA512 e5fa2fbdfb7bae2d4053fda427e0367eab20770926dcceb6be6476c5df3a4581ffbcf86be9857456ca3c06e723c96503bb547af7d2842dde1ba6dd6cab062e74 WHIRLPOOL 65976354661f4328a8b86543c8c34c6383d5199a3af692ad9cd1de3401509106f24927943f12bd90d4d621a1af65132581ff0b9bf1ef48c5a8916e0ec462bd9e
 DIST netbeans-trunk-nightly-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
@@ -53,7 +52,6 @@ DIST netbeans-trunk-nightly-201606250002-src.zip 216438825 SHA256 f03d25d6d23b75
 DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 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_p20160530.ebuild 9520 SHA256 76304dc6ed4405b46126d2b081d0a3dcc187825b92651b26ac6ccb0379e81876 SHA512 a9e4db74a54d19837dcdc52c1d04a2ed51d561ba8380da9a2c31e09ad489548f4d114e9958d552cbf9b8c276fa6bdda735f7bda237fde63e5229b7cb9a6e89ce WHIRLPOOL 9adc5f9dcb52ac33d08019b694d245bac8a397d8b16a9752b241435bda041b6b110d160817fcf846e056cb7037307450c0016e9d5b6b2a80aeb1d3d79f6b3e5c
 EBUILD netbeans-platform-9999_p20160531.ebuild 9520 SHA256 de67b49b3884b84c135bdb1cd5f1fdc2dd4ac860789b8d626720d2831053f5dc SHA512 d9e4346029c2a7a03da0ac1e30bf46a8da252549076c57df9e829889987cdcdf54b918b246f220ac740c1ddd92109f0784aa3b030ab7113bf8de99581dc2f5d6 WHIRLPOOL 32a12d3710c15b02d8469bcde1280857e309ed091c9dfaa0488049e68ecb75c55f7b6c2ed62686020642487ce69611a58a130cbae966a1d4dc97b1d9ffc3d449
 EBUILD netbeans-platform-9999_p20160601.ebuild 9520 SHA256 5223d635370db664a276876deeed41dc3fddc112e061c64f0ed8fb4c9b412e6c SHA512 858275dc34af4d2951d4f5c1da27bbaeb77e4f47e9cbe2a02b4fcae2aa7c21a9bf25b560f2d22056c4a16e052f21332e21ce74402d32b22fda6e31b53cb8cb18 WHIRLPOOL 7f58bf005bbf87ba79fa583d06ca7164a7308c82201b24f374627d6f598e9ca2fdfbc86d31c911cec8ea8d26cd571ad48c9b73317c52e696db15fdadf702f8f0
 EBUILD netbeans-platform-9999_p20160602.ebuild 9520 SHA256 04e640511e43fafd79faf71c2603422e283da09e715d6b70658d157b2ea65352 SHA512 3903d54f86fa9c692468e0ed33a5120932abb2ba6a3b9ef7ba1c7a730226f11304d2139d780c9b35b8a1258fd108ca4caad9c04b166586eabbcb542ee15981a2 WHIRLPOOL c866345f84cef66a97a31262f286fb59f228e948f752d013c1747b20ee2e7c5d054486c0b18a1bc435c311d107b54fd3bd976f48a8194be373b820d00cec8d85

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160530.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160530.ebuild
deleted file mode 100644
index b420e70..0000000
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20160530.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-05-30_00-02-33/zip/netbeans-trunk-nightly-201605300002-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 8eef38f..83930cc 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-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
 DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 DIST netbeans-trunk-nightly-201606010002-src.zip 213564247 SHA256 1298b642375838c792d0334de386924e095024fd2f4ef450d6093de436d37855 SHA512 e5fa2fbdfb7bae2d4053fda427e0367eab20770926dcceb6be6476c5df3a4581ffbcf86be9857456ca3c06e723c96503bb547af7d2842dde1ba6dd6cab062e74 WHIRLPOOL 65976354661f4328a8b86543c8c34c6383d5199a3af692ad9cd1de3401509106f24927943f12bd90d4d621a1af65132581ff0b9bf1ef48c5a8916e0ec462bd9e
 DIST netbeans-trunk-nightly-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
@@ -27,7 +26,6 @@ DIST netbeans-trunk-nightly-201606250002-src.zip 216438825 SHA256 f03d25d6d23b75
 DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 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_p20160530.ebuild 3472 SHA256 f4891cae7bc0778360ade4015dd259f7f3f1fbf034c907bcd238a59c4f5da8e2 SHA512 bfad3027bb756de537d9d50a4195ae021914323e75ae5ca8c41a5af3b42f2e04d7835ed15786030a3fa0e2169d9d4215485bd73917d7121aa8397c10218012c0 WHIRLPOOL d785e33a7b45710ecb9a0b5d50151ac37f60a2878461995b5e53e5557efce758deff13711d3f41e0fa73ffbbca266d311adfc184db10d016e900897c69fa2520
 EBUILD netbeans-profiler-9999_p20160531.ebuild 3472 SHA256 9e2c7054767d9e66b88875d475df39b647e59cc2425f9595f7d4a7729bd90668 SHA512 e4e287730eaacb68857c14709158b1c1599788b2f0ce618a5590132c03284db4a7d9516825b5ccd8a73892cbc0b8a4e37ba19c4d26697dc8184907a77fe81685 WHIRLPOOL 0db65c1fb83c23d28690ab591096e9768fe2e4952d7cd836307fee1b1f7896bfa673cf9383fae70718fcf43abf7e1bc2f4b0867746af027c3cb77f7d9d58ef09
 EBUILD netbeans-profiler-9999_p20160601.ebuild 3472 SHA256 37317cb96a6c56cfe9527057b08b926da46e95a3a5bf95b011a0dda633073ebb SHA512 9997245c34fc4c15c0e073b1a98c1c2ee578a67604a4b0ec9faa9837f37413f76ac8d6df03676718aa562b0f1665305e56f37e8f71e636d264fb32e6405cf77c WHIRLPOOL 72ab0acbb7ca0d405584a88d88f294ebdf5a63ab0b6117e5fe63dbcb04b2fb2fca5698f08998903166d514daaa3b81f3f545284a121249ddc499076d1565cf71
 EBUILD netbeans-profiler-9999_p20160602.ebuild 3472 SHA256 b246204a0d12311afb9c026fd7e541c25a95fcf468a73a14702afa4a214c21da SHA512 24ec9f99d1543d907b49041b0b5d8fa193c49e9c7cb31d08b35fdf2688f6d6c670f073045bde18e313b67ef41188cafea0a050fb25b2bf0a844d62992866255b WHIRLPOOL 28881dc2f67f104704ef73536d5c76794a0e32a9660188b61aa7edd2be7ced51fd10f2e866c59f57b434379bbd6bf0b901cbf2dca6a8116bf45e5fad496baf2b

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160530.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160530.ebuild
deleted file mode 100644
index 64ef13a..0000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160530.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-05-30_00-02-33/zip/netbeans-trunk-nightly-201605300002-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 3dd107f..f350686 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -24,7 +24,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-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
 DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 DIST netbeans-trunk-nightly-201606010002-src.zip 213564247 SHA256 1298b642375838c792d0334de386924e095024fd2f4ef450d6093de436d37855 SHA512 e5fa2fbdfb7bae2d4053fda427e0367eab20770926dcceb6be6476c5df3a4581ffbcf86be9857456ca3c06e723c96503bb547af7d2842dde1ba6dd6cab062e74 WHIRLPOOL 65976354661f4328a8b86543c8c34c6383d5199a3af692ad9cd1de3401509106f24927943f12bd90d4d621a1af65132581ff0b9bf1ef48c5a8916e0ec462bd9e
 DIST netbeans-trunk-nightly-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
@@ -48,7 +47,6 @@ DIST netbeans-trunk-nightly-201606250002-src.zip 216438825 SHA256 f03d25d6d23b75
 DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 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_p20160530.ebuild 5343 SHA256 0cfced87a671a4fe5762de3a4b4dcd0f24e45cfe0181c167207db1ea1b6c52c6 SHA512 76399150baf348ae63358e9e265009bdd8286179168ff874fbe1ee04c5d8ba2f1163ae4604a9ed648fda3cffa02a764d71e7e8b863a308b3caea410da8dddee5 WHIRLPOOL 05539e87b9eeafcfa3e33986d5a104e3c4c644da540aad987766ba4b5556e1a0594e3fa81e057b36a595581fb41383fcb775c33326c3dc5b4442d0086966b443
 EBUILD netbeans-webcommon-9999_p20160531.ebuild 5343 SHA256 fb5426142742b8f2ab6e60afe1dd603bf952dce30dd0b9600943abd52bdd1f77 SHA512 5a55e8a188f39241fee28140be305208f52a644f363b1a74b8acdff54b3bffdc7ff336c9c91ca58b28c746c00ed3614b04a847714d31b9256bf5a5c57faad4fa WHIRLPOOL 231a9ee5f09fd9ae61994e01854194701e88ac17749e4f16f8654dfa0b53182a132fe918e44fc54be2c9326e6300c044bf23dd15039ed8cdd5049655776fa48d
 EBUILD netbeans-webcommon-9999_p20160601.ebuild 5343 SHA256 4a420ff47b4bfebf7b023327ce9da61f9b9abe25a372db5ca7dab99a3631672e SHA512 5bac7117495136ae382c996b626626d116a2024e2fd76da11cbb1613ec3e8424cd9bf96269feb641b5b8856703daeed8b652213e3fa775e6177f3f72faa05d69 WHIRLPOOL c9cfb02903f39e381ef628326ad0efcb87c374d391b2e3bd61e9d54f29aa8abdab537c834d357ffd9dec7f4e0ed0a053f70533e5af21ec078c7244c4f240e9a1
 EBUILD netbeans-webcommon-9999_p20160602.ebuild 5343 SHA256 9c1c1ac6b16eaaf3b856278abd1d37da33d43526f16845594b6d38b87e4bc6fb SHA512 afc034ab72d4874c1794136e1b868692d327940984ee8e0a1020be63982049e6780054e1aaa54e22b8824c79187b37123594737ac6dfa26e72e604665ab1150e WHIRLPOOL 87dd5858be45af4cf3c87255c7640f47eaf727b40223d0b15e3994d5fac6f15be74e3ec390f06fde23f94f79abe77993df9a748b4de08ea5837754b0bf36e28d

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160530.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160530.ebuild
deleted file mode 100644
index aa4accd..0000000
--- a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160530.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-05-30_00-02-33/zip/netbeans-trunk-nightly-201605300002-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 b29bc92..f6f1544 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-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
 DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 DIST netbeans-trunk-nightly-201606010002-src.zip 213564247 SHA256 1298b642375838c792d0334de386924e095024fd2f4ef450d6093de436d37855 SHA512 e5fa2fbdfb7bae2d4053fda427e0367eab20770926dcceb6be6476c5df3a4581ffbcf86be9857456ca3c06e723c96503bb547af7d2842dde1ba6dd6cab062e74 WHIRLPOOL 65976354661f4328a8b86543c8c34c6383d5199a3af692ad9cd1de3401509106f24927943f12bd90d4d621a1af65132581ff0b9bf1ef48c5a8916e0ec462bd9e
 DIST netbeans-trunk-nightly-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
@@ -27,7 +26,6 @@ DIST netbeans-trunk-nightly-201606250002-src.zip 216438825 SHA256 f03d25d6d23b75
 DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 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_p20160530.ebuild 2721 SHA256 1247a0423aecd4a5fa8e9d360367e09cd747bcc03375430a9cd9e13c1f0d33d9 SHA512 387048f5f2c6e095852b2470e793659a7bd17b2ce8441b17fa247fe4e770ffaa279313df8e8233444f9f02f6791e389a973fc22ede481a33edd4d4eca212a285 WHIRLPOOL 58056552b07e285af6d95e667b85cfff55ae61119358f565dfe96c3858d03109aca3ab2f55dbd7b622d661298cda8608c763bf5030948c70bafbb0e8fc6711b3
 EBUILD netbeans-websvccommon-9999_p20160531.ebuild 2721 SHA256 bce228fa299def74deaa68fde87ebac25528749e5d19b07a9259a50f491647e7 SHA512 c0bf3f772623303e24bbce20c911741d18a8e04a756ec676aa5ac0a0ee0f12de56bfe9b8ddd8970c907e5fb8e7beeeaf9fa8dd339e17a30532162a31e04fca7f WHIRLPOOL d9c76dcf0f669068ed68fc7ba066993b95083620980682f4f752b61fa5fb556b55a4c195187421e6fcf1362bcaaf6f7b3a8b33956c7f51b9479581ccf61702fe
 EBUILD netbeans-websvccommon-9999_p20160601.ebuild 2721 SHA256 7d236f87b4c3dd1e1652f62e6d5580d0b0d5f824c2490a8f41b23ae99041d6c9 SHA512 debb6379152ae2ad627231e954995298e6ed4b767778687dc2fd09b9859cd528655176d8749f8ffe0a99c6747efc00715044075f026c44055d2828e35b5b39f2 WHIRLPOOL 61e2e77c8aaeee23ab76e213168c5f0e6262326039727179a6fe1449b2f9ef58fcf12dd5696305604789a7f0a49d18d2e0e045981c3ec4da8058cf64a3b31964
 EBUILD netbeans-websvccommon-9999_p20160602.ebuild 2721 SHA256 58e30da932c32e95754f0450b4afee41836ea8551411ea54205906b663263243 SHA512 dbfa90ffac9fc2bf28f1d9ae32f0699c3d5d56560766c2438fbd477d2a45bfb0774e690ddc9609d43f686c1faf26e8fffc660522478b2bc5afdac886243d2887 WHIRLPOOL 1ba0796772b3f1a22a1160d51a7c1f2b38f0d36b70cbef12e1c2cbe547236e5b15314edbfd4650d67614b44ec5c86f69bfef22ad04100705dfd2d64d068b3fa7

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160530.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160530.ebuild
deleted file mode 100644
index 22878fd..0000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160530.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-05-30_00-02-33/zip/netbeans-trunk-nightly-201605300002-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 e193e1a..8934f9c 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-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
 DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 DIST netbeans-trunk-nightly-201606010002-src.zip 213564247 SHA256 1298b642375838c792d0334de386924e095024fd2f4ef450d6093de436d37855 SHA512 e5fa2fbdfb7bae2d4053fda427e0367eab20770926dcceb6be6476c5df3a4581ffbcf86be9857456ca3c06e723c96503bb547af7d2842dde1ba6dd6cab062e74 WHIRLPOOL 65976354661f4328a8b86543c8c34c6383d5199a3af692ad9cd1de3401509106f24927943f12bd90d4d621a1af65132581ff0b9bf1ef48c5a8916e0ec462bd9e
 DIST netbeans-trunk-nightly-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
@@ -30,7 +29,6 @@ DIST netbeans-trunk-nightly-201606250002-src.zip 216438825 SHA256 f03d25d6d23b75
 DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 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_p20160530.ebuild 6939 SHA256 5dd3440de60fcd4bee802a332f06a0110e66e8530cf89a59c7342171e47df863 SHA512 fca992d656ec13a8278fd760660a278ae76e499c5355ecf9d2bfd0914d5ba02a585766d524c4e069dbb2280cdc587ea158caf927bb1ee206bd2039c7064d1d2c WHIRLPOOL 808326ef2e03695c52064a263afb50f79a3aa34b197405d10d4e0a567602903eefd6961a7221740f84fe78d923f1858360be49751c42c18d8e87a4b8e7e868d9
 EBUILD netbeans-9999_p20160531.ebuild 6939 SHA256 9ff20e44634946a91118a61d579c323b10f08655c9f79fcd97022f5eed34cadd SHA512 142b74b1da34d30508f8880265c7265c87493cfd2c782a1bdd87a863e3ca7ae934813196203ce795597c7d5d1db5a9a999574eff527420285aea60407d50c31c WHIRLPOOL 964c211970defd744751eb646f0aafbfa7316d6fdbff77e614ca639c15862c830c95e85e8c7b29d68259d48023c29c2e21867803a3021834cd41bb2dfc39e709
 EBUILD netbeans-9999_p20160601.ebuild 6939 SHA256 ddbf87ffafacf1aa4824e477995b6cc1672d8790abb3c4392a4cee0a3f751f58 SHA512 a76797dbd0cad22f6d90c3d65f7cec0371f9528e6d71e4aa17a1ca17ff6b4e746c8a40ecf0c128bb621da6064b1e5bc4f441832adbe29c64b6107c9bc6564187 WHIRLPOOL 0938460ae9c74e29b67e210ba70089509828766359fa1b7d1dc13ef913327693d2dfefed5a47f205e5812b6121b540c21eb2450e769002d4af3fb53443e5b183
 EBUILD netbeans-9999_p20160602.ebuild 6939 SHA256 f815fb67bbefbcbad1a172661cae04b9548af39ce47890de00e04b0305357776 SHA512 4431c6fc931d5ec013eb8a8dbcbd2b084cd8e33974a79d0c1c6d2de58353f90476ec1f26c25ce3aa1e60f0bcf48a0f072e8d98d4c0b28034017430214a84b598 WHIRLPOOL ad33acabac5768259067b75f1236d580b5bbeb036de6cbc9c921a9ff2ed1fdf3d2893c7be6b593ebd9d73596a5a5bc6fcc9649fa26cbb0c350c4b85792c2b6bb

diff --git a/dev-util/netbeans/netbeans-9999_p20160530.ebuild b/dev-util/netbeans/netbeans-9999_p20160530.ebuild
deleted file mode 100644
index a370584..0000000
--- a/dev-util/netbeans/netbeans-9999_p20160530.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-05-30_00-02-33/zip/netbeans-trunk-nightly-201605300002-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
-}