[gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-platform/, dev-java/netbeans-nb/, dev-java/netbeans-mobility/, ...

[Miroslav Šulc]

commit:     fbebbaf51554b3d5816c26917cb7c724a7002e56
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 28 07:00:39 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Jul 28 07:00:39 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=fbebbaf5

netbeans: removed obsolete ebuilds

Package-Manager: portage-2.3.0

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index eef23b5..0f15df0 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-201606250002-src.zip 216438825 SHA256 f03d25d6d23b7548774067a664220990366da49ea1e15e1d33ec31d1ab934d06 SHA512 6cac9c55e060ddfe901a0fd361b629ff19666ffc3ebf7e5f1184135b8ca6e5b3056bcfa506e0bcc973405dd7dcae83b0bfd08f81c8c6ade1f2dbd13d60de38a7 WHIRLPOOL 7ee0b8add0f67ed4800d5c41b7967488119d7e865ce0d4bc8b15496a8bfcfebbfae08eb55d69d7de4d7bedb32fc7850c2cb76e46ae3ad5bf465a96f28b1392b2
 DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844efa871baadaea93f02572d7c43164130d7e7dea58e5a1d421232 SHA512 d7e869bd42a00a40030c012fb895ae358eafb5039bca76ae626eb5b0dd2ed7516cbedfd6d0336190e72d7a0ddfa4c6d4ce759085cbe05d38dbf66b52806b3e16 WHIRLPOOL e5430b55c5685d1a1126d60cdeffb535d673200d7da1638f8085969b81ddf42e619ba2d8b92ce01c59edf990f6c56721406a9f04a5dab6e8d81fd135235f8648
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
@@ -33,7 +32,6 @@ DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0b
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 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_p20160625.ebuild 3384 SHA256 51ce3b3d573c3fce716da0cbfd14aa731fee36d4b6caea1d4d3bc557297d4c85 SHA512 acf4cfbfdf441e61784c1b16cb6cdd20f15b390d4cd1b035ff0d11544ab06555308134f746fce198c2e13707aca8cbd9add3490df1420e74280f2b8e9c57e257 WHIRLPOOL 2eb20e3096daad3e8a451606cb96beb1591ec59d08bed40ea816e0dab4fa865b6db203d04c83ffbaf1110c311b1fee122ee517637a0a39ed649c7ca493ef0072
 EBUILD netbeans-apisupport-9999_p20160627.ebuild 3384 SHA256 cafb20753781552fa43f0b09ba11712fdfc6cfd76c1a2b4179f588c3572258dd SHA512 85b7e2a07cf82d1abba314f8ab19e3add7fb913d98dd0a3b26a0bf7fa10c82c6dd5104e437078c9e1b07d9f7e6a1c7c0ff6082abfd27f270f3221f2cc551453e WHIRLPOOL abd3451b3d769f6c6ab0bec5395674c32a199be5c5d03c33a3ddf586351e137c1ad4015f133b0ff2de32057d6bc9af192b96480b356011f88c19b03a63221085
 EBUILD netbeans-apisupport-9999_p20160628.ebuild 3384 SHA256 d093e9cf6916a4096cb2736b9709177296fc91de4f2cd4e1d0e8ec3c984724e5 SHA512 84e76376aef57d84b499d6e0c85b7807c1699bbd8f32bb1fc259cba7f00b966ded6d543d82e5acb675044a2b9ad23654b444c38c14f5ec19f763328248653493 WHIRLPOOL 82e1c75564815e929eabc5ce9fb25d149c3d1f3084ca00ffb733148a8d0081df82f9ed0daa1ef36c69fa5e8f58c6ca69dc4475b5f1f957091503f8d12f661ef0
 EBUILD netbeans-apisupport-9999_p20160629.ebuild 3384 SHA256 3fdfcf8f51c94feebff30161abaf8596121dff51ae4a5094dc34f3024daaaf08 SHA512 7428e5a53211d40fea6c9d9d586d463b24ef903b91f4b72da6b82952341ae635932797a68cc95f3cd1bd6af246be2896fc94a1bf8092385b35429db7c005d84d WHIRLPOOL c6b26d3994d587f3f4d8e67a51810e8e8060110b806725d726117197f5966b6006fc31be3eebe63db6ba3887a21f8a2e59289e1f11451cad497d233aae06e50b

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160625.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160625.ebuild
deleted file mode 100644
index 7fb323f..0000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160625.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans API Support Cluster"
-HOMEPAGE="http://netbeans.org/projects/apisupport"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-25_00-02-33/zip/netbeans-trunk-nightly-201606250002-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 42d918e..e426f6c 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-201606250002-src.zip 216438825 SHA256 f03d25d6d23b7548774067a664220990366da49ea1e15e1d33ec31d1ab934d06 SHA512 6cac9c55e060ddfe901a0fd361b629ff19666ffc3ebf7e5f1184135b8ca6e5b3056bcfa506e0bcc973405dd7dcae83b0bfd08f81c8c6ade1f2dbd13d60de38a7 WHIRLPOOL 7ee0b8add0f67ed4800d5c41b7967488119d7e865ce0d4bc8b15496a8bfcfebbfae08eb55d69d7de4d7bedb32fc7850c2cb76e46ae3ad5bf465a96f28b1392b2
 DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844efa871baadaea93f02572d7c43164130d7e7dea58e5a1d421232 SHA512 d7e869bd42a00a40030c012fb895ae358eafb5039bca76ae626eb5b0dd2ed7516cbedfd6d0336190e72d7a0ddfa4c6d4ce759085cbe05d38dbf66b52806b3e16 WHIRLPOOL e5430b55c5685d1a1126d60cdeffb535d673200d7da1638f8085969b81ddf42e619ba2d8b92ce01c59edf990f6c56721406a9f04a5dab6e8d81fd135235f8648
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
@@ -46,7 +45,6 @@ DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0b
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 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_p20160625.ebuild 4790 SHA256 6b65f2374c3a7f94729ec349ccbab0fe2df4f7b80831c547c0a84fc711c94756 SHA512 60fad1715bce209924cba14a15984a6d3ab072b5fcb541afb33e26149299bc165e30d532c3b47cfb9f7699f1ba7ba65376ee1029817eaaf1bf2c0f3731ee9a4b WHIRLPOOL e1b310a717b5b2f1e0814ad15349e3e7d3c99512f2ab82f41b734492dd7ab3375c95b2a341112cbd24011a9e74b035ef606def95f75061ab2d8f419bd3d41f6d
 EBUILD netbeans-cnd-9999_p20160627.ebuild 4790 SHA256 f05d34b4cdfdd349f7ba75085688be31364eb73ca0ff759457289a3aa67da52b SHA512 8385f2ea862f5a4800995844e413e24be3a22a25a15b5d3e9315a3f538622b6bbc6551cb36902cf84e93b19a7ebf2e675801ca81c8b5808351d0fa879017f390 WHIRLPOOL a5512e971dc695387f0eab7248eeff5130bd437e6b960b054e92fd684138b6f5f06faa88671005a8782fe028444fe049d9bc0d5fc703d4cc27182b8b307714f8
 EBUILD netbeans-cnd-9999_p20160628.ebuild 4790 SHA256 3469d0cf8dc53cc5d9d6fb077c45c8a56505dd4a8a90725f04890dcbb71c1b33 SHA512 6b21672564922bc14808a24dbd39f9bbfec94b7465b021be768f59eca4787fd999cb60db3e44f27fa23cc398424cfceefdb7df3ebf13a8754fd9684411f766b2 WHIRLPOOL 047fbac6a4c7c0f983807ff63a760ebe85de3641ef0aaff5811a385866884934fa53236dc3d71b12fbe6c6cfa142f341292c1956d76a4c22152ee5ae0b69e768
 EBUILD netbeans-cnd-9999_p20160629.ebuild 4790 SHA256 3947dba3a41d59419448c102176ec03d42a202cfe2581c69c2e43b55665f1230 SHA512 726f246e63511149d5745dbb8e69e3d7627692c2dad034b890afd5e947c12b8aedfe0bbf1f349a4b234f01ccb0357771f11fb8e40c78026e29493fa583894731 WHIRLPOOL c681e4673b980acb05a3eb7a1cb1dfdefdb63e7bc8b31964fd2d07b3f3fe82b38509a4ef88b5a0e9b11807c0adae1702761f525944b68b311a5be1965f883a1c

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

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index a212a69..f4006d6 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-201606250002-src.zip 216438825 SHA256 f03d25d6d23b7548774067a664220990366da49ea1e15e1d33ec31d1ab934d06 SHA512 6cac9c55e060ddfe901a0fd361b629ff19666ffc3ebf7e5f1184135b8ca6e5b3056bcfa506e0bcc973405dd7dcae83b0bfd08f81c8c6ade1f2dbd13d60de38a7 WHIRLPOOL 7ee0b8add0f67ed4800d5c41b7967488119d7e865ce0d4bc8b15496a8bfcfebbfae08eb55d69d7de4d7bedb32fc7850c2cb76e46ae3ad5bf465a96f28b1392b2
 DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844efa871baadaea93f02572d7c43164130d7e7dea58e5a1d421232 SHA512 d7e869bd42a00a40030c012fb895ae358eafb5039bca76ae626eb5b0dd2ed7516cbedfd6d0336190e72d7a0ddfa4c6d4ce759085cbe05d38dbf66b52806b3e16 WHIRLPOOL e5430b55c5685d1a1126d60cdeffb535d673200d7da1638f8085969b81ddf42e619ba2d8b92ce01c59edf990f6c56721406a9f04a5dab6e8d81fd135235f8648
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
@@ -36,7 +35,6 @@ DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0b
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 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_p20160625.ebuild 2968 SHA256 4c622d1cf3e1c78824b2a3fb8b2a0e38d77d7ceb07cec858e5aa7f4badedbe77 SHA512 53ad3b1e63ca1ab82aab7a835178bbc22159d8407d895b8fe86cb34c68bdea64d1b8d821d1ac07c947e020e02603d182285b8b606b5559196cac13c536048ade WHIRLPOOL 21e60e1f365f6c8a648b8eee76f6a41d0fd4e9d2bcadb941bdef313ec759d13afbcb1167fd379ba487653afc90c85fa985a1d7df1c994b4396def70bfe9bf8ae
 EBUILD netbeans-dlight-9999_p20160627.ebuild 2968 SHA256 7fd9685273d8d68ae9cec2f93e2419f3ac65ac9990e1b9a7a63fe0811897a8a3 SHA512 9e4f6d9cac819b49af0f2fdfdde5dfe645efbf2320970319ffb20ed1efcf2de7c05aeffa8e37475b3d8e650a6ba23eeda90468f3fbb45a9674e56ded22167af1 WHIRLPOOL 08e8f72a67bd7f0d728c1178c79a830a0d4091f486ec935f34e18502abf4d7286b1371c2e84f2a48d0a998134cb84215e8beaafe56fbfefc7e0280b02345c9ac
 EBUILD netbeans-dlight-9999_p20160628.ebuild 2968 SHA256 61b97b5463c8df3ff13b78fd9e166ffa850f69534e7c2d1f77d85fb2a0682d72 SHA512 a63c45792893595ad97b09b8133d3c42e7ef87f0c6f44ffd73e81b0c5572ba6cc02eb882fe187c574cbae4c0e0a5de6aadef27c424b6d203ed655ea86d6ee390 WHIRLPOOL 319eceb445044ed09af28ad85a552c9e983bfa4772885f2e767a21a2ffce2544971157cd96770c6e2b190d59c8956ed44d8666e2501dcb0b111ffb284a1cf4c1
 EBUILD netbeans-dlight-9999_p20160629.ebuild 2968 SHA256 9c6a5702731dd8d67223462b16d07c889cd18318f4738fce2cbca0a52fa40afa SHA512 530f7d5d9089173f25d1dd19681903e396b80db9d46b17202615e1e3f4cecf0040124d247ad442de1eeacf8205dce08bb4f18749ff7d8efd09a11690fdfdfcd3 WHIRLPOOL 18fea7b2e26ef4ef2457ce88d26e35298373f50ccabdbbd118d3a054f8695aa6343e6e26db392053791e516e32aa1e92b211d8d91d27137b09a7b7e5856f4897

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160625.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160625.ebuild
deleted file mode 100644
index 2cf3e73..0000000
--- a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160625.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans D-Light Cluster"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-25_00-02-33/zip/netbeans-trunk-nightly-201606250002-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 b50364b..7ae3af0 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-201606250002-src.zip 216438825 SHA256 f03d25d6d23b7548774067a664220990366da49ea1e15e1d33ec31d1ab934d06 SHA512 6cac9c55e060ddfe901a0fd361b629ff19666ffc3ebf7e5f1184135b8ca6e5b3056bcfa506e0bcc973405dd7dcae83b0bfd08f81c8c6ade1f2dbd13d60de38a7 WHIRLPOOL 7ee0b8add0f67ed4800d5c41b7967488119d7e865ce0d4bc8b15496a8bfcfebbfae08eb55d69d7de4d7bedb32fc7850c2cb76e46ae3ad5bf465a96f28b1392b2
 DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844efa871baadaea93f02572d7c43164130d7e7dea58e5a1d421232 SHA512 d7e869bd42a00a40030c012fb895ae358eafb5039bca76ae626eb5b0dd2ed7516cbedfd6d0336190e72d7a0ddfa4c6d4ce759085cbe05d38dbf66b52806b3e16 WHIRLPOOL e5430b55c5685d1a1126d60cdeffb535d673200d7da1638f8085969b81ddf42e619ba2d8b92ce01c59edf990f6c56721406a9f04a5dab6e8d81fd135235f8648
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
@@ -65,7 +64,6 @@ DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0b
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 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_p20160625.ebuild 15825 SHA256 049dbeb88a797176e232af5143a06bebcf1b8b81cf9d7026c2df6ad5add2d848 SHA512 3759c4faec1b3f721649e2accdb14680e7d8864d2a0a56e564794b73bc1db933d8f9ec884c111e3c1bacbd7ce986e8b550d92073475cf9a4c0e92ca01fc7c1ab WHIRLPOOL 13073347d637d76bab8d718e0bdf22bd1f75e254a1cfd2d64706ff92a43eb907ac93dc497217b14ab71e5225c870f9f02c5dcf44257608f64d4194fddaaa0d5f
 EBUILD netbeans-enterprise-9999_p20160627.ebuild 15825 SHA256 4bbec74b5aa599919e345d9b2021417e00560165648b9c030dedf482a48cdf84 SHA512 895d045cb5c28b36323f83cd23435faea56dbb31da0cebc8f2f02bf50a6b614e2033d374023ae9641d1aa3db00891a48e40091f13060567fec98fbd02bae3f90 WHIRLPOOL f55cb1e1a7ce262144be804649f721c29d2f5f7fb28851dcd5e1d4f87d2881443639acca2ac0afea411811684244920badb72ab6e197668d13e58a131dd9cacd
 EBUILD netbeans-enterprise-9999_p20160628.ebuild 15825 SHA256 c51d5097dd3efce0350470fd0dce927c182e8106ba37e00a64ca38aa47297ae3 SHA512 d039f812d5835222de6f08ba0e021c9d650de1ae1b4be05952c0c5c76930c40636c773278c4e372c6e7d69a3c0b884a42f46fe5db1100eb32706011e773ae4cf WHIRLPOOL d9238220c6f80480c6605b6e175f147a5baeb1d0d322daed5f6fd2927ebd8cdda6b6931939fed5b29cae0998cc82a2ec51645b257d0bd8e391406c3950c4072e
 EBUILD netbeans-enterprise-9999_p20160629.ebuild 15825 SHA256 11f57bfcb0e6c75c5b6db35bc5287fb9ef0962faee72895d733e02182bbfcd04 SHA512 89e2c89a917a48198a2642e83e3f9e84b07c19bc9b6e4ba4ae96f831fd210a55bcb101614664828ee1df3167fe84a0372d326b13b248c5b5c09b7f41b732a99f WHIRLPOOL 9206c61df238922a70e4647cb8cd15971a9962ce70f4692d3e47b841d9fb4a89c54ce21307a50fcfc71bb4c1472ab3413575e7c935df6d8102b89abce1e53eb6

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160625.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160625.ebuild
deleted file mode 100644
index 1d08044..0000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160625.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Enterprise cluster"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-25_00-02-33/zip/netbeans-trunk-nightly-201606250002-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 7d3a097..d43320e 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-201606250002-src.zip 216438825 SHA256 f03d25d6d23b7548774067a664220990366da49ea1e15e1d33ec31d1ab934d06 SHA512 6cac9c55e060ddfe901a0fd361b629ff19666ffc3ebf7e5f1184135b8ca6e5b3056bcfa506e0bcc973405dd7dcae83b0bfd08f81c8c6ade1f2dbd13d60de38a7 WHIRLPOOL 7ee0b8add0f67ed4800d5c41b7967488119d7e865ce0d4bc8b15496a8bfcfebbfae08eb55d69d7de4d7bedb32fc7850c2cb76e46ae3ad5bf465a96f28b1392b2
 DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844efa871baadaea93f02572d7c43164130d7e7dea58e5a1d421232 SHA512 d7e869bd42a00a40030c012fb895ae358eafb5039bca76ae626eb5b0dd2ed7516cbedfd6d0336190e72d7a0ddfa4c6d4ce759085cbe05d38dbf66b52806b3e16 WHIRLPOOL e5430b55c5685d1a1126d60cdeffb535d673200d7da1638f8085969b81ddf42e619ba2d8b92ce01c59edf990f6c56721406a9f04a5dab6e8d81fd135235f8648
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
@@ -33,7 +32,6 @@ DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0b
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 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_p20160625.ebuild 2913 SHA256 f8a9e471ea6ce247dc8cb623dc46ad3c9a40e21e920414364e8f736dcdf2f7a3 SHA512 d1eda936093a8d717c9ed32038ecd5bf553045b7a9d38eacdadb8afcdfb2c701dd15f8d3dc93bc2e36539902e77378810159c42d49fbf63207f4d6dffde9ce3a WHIRLPOOL 731be56254ad68882aae7f2599800af4054d5f463be6ca3cf0f2a3cb378380d28d9e336ba9a4c749d16e98fc8617122126541507e2f92890272183f6f2c3382e
 EBUILD netbeans-ergonomics-9999_p20160627.ebuild 2913 SHA256 6d60db206ce50a1eee95d3da37089c61e17775eeba08c15b5f0c3bb5ac282ddb SHA512 75a922b8c6a5268a52abd5f32d4e430aa60c40c906e0ddf5681b49edbf947a029bd661e56ad6eb19d3c82fd276cfcbe69487f079f477b431410dd4cd14597295 WHIRLPOOL 1933b4d6792bee6a8a1f10745867b83a0632ecebefdf45221d29da4397fe5dddae1c7ebfc8911d22d8ac48392b95618563c16c1632796650670e3c975a110d2c
 EBUILD netbeans-ergonomics-9999_p20160628.ebuild 2913 SHA256 083a2230fb97cdc75ebe1f25441f1a04efa503c344db897ae379cafa7ac043ea SHA512 6ed53a9808e6ee0158fb1caadfbe1e25c5f141b0e52689b3f8b71cb1932d41a953c63a7c1c1701ded90f7195c9c2a20088661b8481a280709e3fcb942a3c285e WHIRLPOOL 030e01dc0409bde7c4e1e0d5aac9542c4d5eb715a2a69bedb737a3304f3604fa7e7c020173121c2053ff060e327024208788aff8c1c84e1d8ef83475eb66741c
 EBUILD netbeans-ergonomics-9999_p20160629.ebuild 2913 SHA256 13940f982e267ed269408cad3fbc8dc90ebb9159f2edc60633c7742b24da5ce7 SHA512 db512c205ed6539b19ea670783b268630a7fafd4f755c999e3e5e17a8fa0bb336f6d9842183a1cf9d3f046a46e4a649174437c99e78ae0b840d3acd31a8f12f3 WHIRLPOOL 42be192d17e6f9977d68c5b85052cbc4fc6c62c548e007fea8cdafa322e725c83ceaf3172c1335b4e21d1caab1ad2bb55583bd276eb539aa58cc0cefd3deeaa0

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160625.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160625.ebuild
deleted file mode 100644
index a8a8847..0000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160625.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Ergonomics Cluster"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-25_00-02-33/zip/netbeans-trunk-nightly-201606250002-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 5f88e6e..c334aae 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-201606250002-src.zip 216438825 SHA256 f03d25d6d23b7548774067a664220990366da49ea1e15e1d33ec31d1ab934d06 SHA512 6cac9c55e060ddfe901a0fd361b629ff19666ffc3ebf7e5f1184135b8ca6e5b3056bcfa506e0bcc973405dd7dcae83b0bfd08f81c8c6ade1f2dbd13d60de38a7 WHIRLPOOL 7ee0b8add0f67ed4800d5c41b7967488119d7e865ce0d4bc8b15496a8bfcfebbfae08eb55d69d7de4d7bedb32fc7850c2cb76e46ae3ad5bf465a96f28b1392b2
 DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844efa871baadaea93f02572d7c43164130d7e7dea58e5a1d421232 SHA512 d7e869bd42a00a40030c012fb895ae358eafb5039bca76ae626eb5b0dd2ed7516cbedfd6d0336190e72d7a0ddfa4c6d4ce759085cbe05d38dbf66b52806b3e16 WHIRLPOOL e5430b55c5685d1a1126d60cdeffb535d673200d7da1638f8085969b81ddf42e619ba2d8b92ce01c59edf990f6c56721406a9f04a5dab6e8d81fd135235f8648
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
@@ -37,7 +36,6 @@ DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0b
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 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_p20160625.ebuild 3377 SHA256 4468396a27d22ee76d14d6cab0766f84b5731d339aa28f23ec2583a88a76cf45 SHA512 b91e3cccf6d1fd4e7ec1752e4cb4f1c437a268f7a221aeb4e3793d41ed45f57e00f6204fd9040016200eccb55255e9488013533cadd98a1995a1e1faf9365e00 WHIRLPOOL e4fe5f78466d5d7dac071ef837916919afc5a42c58734c5f2636aea8b3bcd5f3c7a0c7a5755ce0c071f4019945fa0a4dfc09ee5fc72a9ccb7b46e9a95940b89f
 EBUILD netbeans-extide-9999_p20160627.ebuild 3377 SHA256 a1f35439d93238fe2e8f80b6e95e17aab6e1b6048a20980279673d55d804edd4 SHA512 459e52e6e76879087ab2b3c5d80f153bc45e3489a77330d4026555bcf659d1e90952fb8affcab40f0b13a5f6069947a310e2977187ed69316f8a79aa7b40ba9b WHIRLPOOL 5aa65d0ca5659cf37bf4cac1b548a2ca53613303cf80f8ece263bac536bbac549aa448e761ed5e426cc705e493e98719156eae3306d7ec367e1449f53047527b
 EBUILD netbeans-extide-9999_p20160628.ebuild 3377 SHA256 9a3f1a9d41a6f420dc7e581dc55ba4cd7ec71b9393311990a8b784df0e6d996e SHA512 45bdbe586af233661530cb3d8da3528ad8d1602cbaae6166713e378ce5cd8229a704b29f0e1356e0a9eea192604668437a89f3371fc29675f4415a9ac6a9fb42 WHIRLPOOL 7e3267f706be77336d46a1fbabdcd931cce91af7e19d7aa2a35372648d214f1bc3e0e2447b29ae18f81624b6904989cb3e031a3cf4861332708c43b5aa072519
 EBUILD netbeans-extide-9999_p20160629.ebuild 3377 SHA256 3170816d19c52c4655d6659fc0e5c3d1b3213051f8b57af1aeffcbbcfd9d860a SHA512 8dd8d4fda80dc6f215ebe4b2b2cdd25bdb7c4258f1452bf6715375d9f1f17561f914c0d7f9285c288bcf9673ba34c34b51a4e0f0660b9d68198f49fd4ca72696 WHIRLPOOL 26cced4c04ca73c74d87db2a864957845405ddc57ff540584b867c21bac3ab36e74667803218c0bf5962eb998caeba1820e73de54624b5e021c50bc692c8a2f6

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160625.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160625.ebuild
deleted file mode 100644
index c98c60e..0000000
--- a/dev-java/netbeans-extide/netbeans-extide-9999_p20160625.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans ExtIDE Cluster"
-HOMEPAGE="http://netbeans.org/projects/ide"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-25_00-02-33/zip/netbeans-trunk-nightly-201606250002-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 b490f6f..68d11df 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-201606250002-src.zip 216438825 SHA256 f03d25d6d23b7548774067a664220990366da49ea1e15e1d33ec31d1ab934d06 SHA512 6cac9c55e060ddfe901a0fd361b629ff19666ffc3ebf7e5f1184135b8ca6e5b3056bcfa506e0bcc973405dd7dcae83b0bfd08f81c8c6ade1f2dbd13d60de38a7 WHIRLPOOL 7ee0b8add0f67ed4800d5c41b7967488119d7e865ce0d4bc8b15496a8bfcfebbfae08eb55d69d7de4d7bedb32fc7850c2cb76e46ae3ad5bf465a96f28b1392b2
 DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844efa871baadaea93f02572d7c43164130d7e7dea58e5a1d421232 SHA512 d7e869bd42a00a40030c012fb895ae358eafb5039bca76ae626eb5b0dd2ed7516cbedfd6d0336190e72d7a0ddfa4c6d4ce759085cbe05d38dbf66b52806b3e16 WHIRLPOOL e5430b55c5685d1a1126d60cdeffb535d673200d7da1638f8085969b81ddf42e619ba2d8b92ce01c59edf990f6c56721406a9f04a5dab6e8d81fd135235f8648
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
@@ -35,7 +34,6 @@ DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0b
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 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_p20160625.ebuild 3416 SHA256 4ca6698f53846b3f8db04c36f706d606968247db4b56c5ed1d1fd91aaf1437a3 SHA512 da3059c5cce3bd2bc4ff7154f423938abbdc53e28f1c2fc5ee1b7424853a76f5a432b300b8da704ac09846deb40df5dc45fd0b22ede4e3227297e9a16f73bd56 WHIRLPOOL fc379718167b8f467a41920d8172d3dbe79eafc4f5a47cc96b80fef9faf7c9b5549aad8acb475e6d7177bc5c00d64f792ea27f036b5b04cce51a982ce790aa2c
 EBUILD netbeans-groovy-9999_p20160627.ebuild 3416 SHA256 627ace0d9803f4ad6bbe0fbdf1a8145a1d826d7175944cb35b22634b131dc7f9 SHA512 41ac61b8f0ca65fa04500882235ebf056b441822a29d5e8e397e43d34904de1cbd862f77537ef99d652b1ab52537d3d96f8512f9017da3006531b5d6fa100170 WHIRLPOOL 75be63b355ba9ad881cf9235c70f89b97a2920608ac66a34d7133d1747bda30c448cc6eb5edea3a3aa95af77d7a517024678bdf68d7d6871a390bcda2e9f541e
 EBUILD netbeans-groovy-9999_p20160628.ebuild 3416 SHA256 227f993a830d5b655d17b6bc0411b592656a6380a3b178cfcd96da943d8bdf20 SHA512 ceae6009ddafa42162dc5e9f3b02fe4bd98348d9c354c8439b25e685f5480712d753085e588fb230fe15bf270e7ed843d930ff4926685ca35da0913b3d197d02 WHIRLPOOL 3c2b6af26dcb4a159febfe4c1e2d3c0c320a863f5f99c10bc66e7803380677c8af0844797eda815fdd12725214d3ea97dc15dfc50c39f3df4560846b2c9b7957
 EBUILD netbeans-groovy-9999_p20160629.ebuild 3416 SHA256 b9a83d04dd6f79e5ad9aa01c9519da1e2087d2365b14a07dc98ff5f13a8a20ff SHA512 c8d2ea2b8fd411aff0dfb534e1742f91ee9fedf133636fb8a128cc066b0924466b910e13ef5d616dffd045e383a30cfe4fd7ceb73d5997d665660d99ce25bd7b WHIRLPOOL 7c9bae88294805c2bb98fe6de1675a533a009c4bd1537fc986c2ff63c4b606e1a2386f55ddb3ec5298b84edecdc0e69c809582b752ceab1df4b06d3d58f2c8d6

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160625.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160625.ebuild
deleted file mode 100644
index b3fd8f8..0000000
--- a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160625.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Groovy Cluster"
-HOMEPAGE="http://netbeans.org/projects/groovy"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-25_00-02-33/zip/netbeans-trunk-nightly-201606250002-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 7d5e9ee..90fc33f 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-201606250002-src.zip 216438825 SHA256 f03d25d6d23b7548774067a664220990366da49ea1e15e1d33ec31d1ab934d06 SHA512 6cac9c55e060ddfe901a0fd361b629ff19666ffc3ebf7e5f1184135b8ca6e5b3056bcfa506e0bcc973405dd7dcae83b0bfd08f81c8c6ade1f2dbd13d60de38a7 WHIRLPOOL 7ee0b8add0f67ed4800d5c41b7967488119d7e865ce0d4bc8b15496a8bfcfebbfae08eb55d69d7de4d7bedb32fc7850c2cb76e46ae3ad5bf465a96f28b1392b2
 DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844efa871baadaea93f02572d7c43164130d7e7dea58e5a1d421232 SHA512 d7e869bd42a00a40030c012fb895ae358eafb5039bca76ae626eb5b0dd2ed7516cbedfd6d0336190e72d7a0ddfa4c6d4ce759085cbe05d38dbf66b52806b3e16 WHIRLPOOL e5430b55c5685d1a1126d60cdeffb535d673200d7da1638f8085969b81ddf42e619ba2d8b92ce01c59edf990f6c56721406a9f04a5dab6e8d81fd135235f8648
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
@@ -38,7 +37,6 @@ DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0b
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 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_p20160625.ebuild 4126 SHA256 9df76abdeb35072b525a4b426cbba277c9eea58f3bdf0c23dc367f2b669c4926 SHA512 65c2deae84801bf1d968c976f521bb8065662b263f5f982ede1892a31b08390b2813d9a29f5ad98f54757456af94fe76c344e4c68fa52768761a7ecc61a46690 WHIRLPOOL 80c25c7fce5296ded0029832d27a12ee9deb05b2ea82e5ef9deac1906547b81116fb37bd9561cb8f68edbe41d5aad9842cb7fe8de94c9ddf3ead8617f598b6f0
 EBUILD netbeans-harness-9999_p20160627.ebuild 4126 SHA256 38bf8dcd9133256f5d299cf86e47b5fe5b5a16025b733cd8897288ba03afdbe0 SHA512 f921fc694b28e3b9ad7c385af23c733d89a814deeb03335cae2a9bed6cfcde3ba27b01c9b55f9651bb8ae0e34108448a2914f47e8887f6d85f552c11ec8cb8c5 WHIRLPOOL 8d285a12a9c91b8a6767bd0a826bdd6028a6dd0df69d3797e72b671690983f0bd0e8fcae823bfd91b6827d3d10230bdf03cfe43c49c25e5dfd02a0e9fc86b9d8
 EBUILD netbeans-harness-9999_p20160628.ebuild 4126 SHA256 349e123741fbf8e943b011356320801f538fe1e2e933020d066a87ece2c787e6 SHA512 b11c14c1ab2494ad8ae2375bcdb799c569b0e322ab03b962ebeb9c6d18cc9441f73ad9b42cd543945094030c4efc38e372bac84ed1640fa3646aa765fb53b89b WHIRLPOOL 5103bed540597b045e618b55050aef8ecdfdc850f42bdf71a13ef3de25d0cbf06ab8ccb3fe18317bcd0c8fa5e6dbdb3a4d6c9bbe17f9c676260771ea72d2ec19
 EBUILD netbeans-harness-9999_p20160629.ebuild 4126 SHA256 34ca6fef3595b72a03737a92c6b15f8875c2820b32cca229f19ef8e3d1be88d7 SHA512 4e49f975d8db981e1e55eb67e92bc5145e972cabcfb8dff452ffb1459ee26f0befe64b739a0b5938a25cd84aa36d687dd235d85623cba4e94b333e08f48fdeec WHIRLPOOL 743e3b95b6221223ffb18df4b93d29935b7e1bae4855cd0c7f3e0440f6bae666814c94554559985c92454d467c4c219044b1bee8a26705edb120efecc6739550

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160625.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160625.ebuild
deleted file mode 100644
index 93f69af..0000000
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20160625.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Harness"
-HOMEPAGE="http://netbeans.org/features/platform/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-25_00-02-33/zip/netbeans-trunk-nightly-201606250002-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 5af570b..8ac3283 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -142,7 +142,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-201606250002-src.zip 216438825 SHA256 f03d25d6d23b7548774067a664220990366da49ea1e15e1d33ec31d1ab934d06 SHA512 6cac9c55e060ddfe901a0fd361b629ff19666ffc3ebf7e5f1184135b8ca6e5b3056bcfa506e0bcc973405dd7dcae83b0bfd08f81c8c6ade1f2dbd13d60de38a7 WHIRLPOOL 7ee0b8add0f67ed4800d5c41b7967488119d7e865ce0d4bc8b15496a8bfcfebbfae08eb55d69d7de4d7bedb32fc7850c2cb76e46ae3ad5bf465a96f28b1392b2
 DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844efa871baadaea93f02572d7c43164130d7e7dea58e5a1d421232 SHA512 d7e869bd42a00a40030c012fb895ae358eafb5039bca76ae626eb5b0dd2ed7516cbedfd6d0336190e72d7a0ddfa4c6d4ce759085cbe05d38dbf66b52806b3e16 WHIRLPOOL e5430b55c5685d1a1126d60cdeffb535d673200d7da1638f8085969b81ddf42e619ba2d8b92ce01c59edf990f6c56721406a9f04a5dab6e8d81fd135235f8648
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
@@ -172,7 +171,6 @@ DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0b
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 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_p20160625.ebuild 29867 SHA256 11771b2e7343b9d6627660c5c1171a55e1044fcc9f5598ec38addb398a79976e SHA512 7e801880c8953a7e000d21acacf4dd2b1d217af664b7443922ca4119f827e8fb1684f0ace9ca766b4bcba8d73377814c16a64a9262f151913e393012e2acde69 WHIRLPOOL 864a4ccf23682c7af7ff61e7d8e2a5c05ad07d094d8c53929298635497b248ed7e9e241c3bb1034fb5bb672d54d2d7d0a9b34cad12bdd88886b17fc73979c64c
 EBUILD netbeans-ide-9999_p20160627.ebuild 29867 SHA256 b08d643a6b73f16d73d4d0cd7148ec71e333a1199b01a03f637043a5dc71e432 SHA512 f60c4e606c1d7efbee98356f5e39fa2bc0eea4a676342e244e362efa91ddc4b66df90645846244580dd58a994f95d4aa55499ebd50210ac0e7aa7142196625df WHIRLPOOL 6b134d56033b9654b2cd4df48ece779a65feada24da904a14b7bd3b15e158902de1085ed9d4174695b538c44b99383c0883e738e99b6d82c1f2669d0bcaa7f70
 EBUILD netbeans-ide-9999_p20160628.ebuild 29867 SHA256 9db76b0033ab96966ed4aa50fe8cb36976fd6fc4a9d1375900e834ad2cde1168 SHA512 0679950086c5eeda841cd4d06e3584730a417a78575057dee9708f34372ad9eae2bc6cf6f69a3d17933b9283356959d0fe7cf383d504c572ab1cda7eeee34770 WHIRLPOOL d2c9079ffc49c9038d5bd5c4ab5dd941bf4afa35108ee64a10549838c83b2b4ec31e43a4a28e409826d48243c26fa0e686a6ca5c085eba9aeeb020ecc640de21
 EBUILD netbeans-ide-9999_p20160629.ebuild 29867 SHA256 760997dd43b5afbea24aeb5132459f93f607110bb15155b010c2626dd65568f8 SHA512 474343f31eca8eab0b6bd9bf029519e1e904909ff45925cc867f9e96e6a39bce2abc82a1af63729cfa2ccb0340dc8ea85994500629629e11a194acc2b6718604 WHIRLPOOL 9c0fc771f3cc4ccec359307d9e5c9a20d5666b82e05b3deb8c85e511b099601f840fe0280dcb583959d95e1514469bde45442591a09e336855ecc03020dc7a3e

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160625.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160625.ebuild
deleted file mode 100644
index 6caf4a4..0000000
--- a/dev-java/netbeans-ide/netbeans-ide-9999_p20160625.ebuild
+++ /dev/null
@@ -1,374 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans IDE Cluster"
-HOMEPAGE="http://netbeans.org/projects/ide"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-25_00-02-33/zip/netbeans-trunk-nightly-201606250002-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/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/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/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/15ACB06E2E3A70FC188782BA51369CA81ACFE860-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/antlr:4
-	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}"/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}"/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}"/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}"/15ACB06E2E3A70FC188782BA51369CA81ACFE860-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 --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 --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into libs.antlr4.runtime/external antlr-4 antlr-runtime.jar antlr-runtime-4.5.3.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.json_simple/external json-simple json-simple.jar json-simple-1.1.1.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
-
-	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-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 antlr-runtime-4.5.3.jar && java-pkg_jar-from --into "${instdir}" antlr-4 antlr-runtime.jar antlr-runtime-4.5.3.jar
-	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 862d13e..70ffeb3 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -38,7 +38,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-201606250002-src.zip 216438825 SHA256 f03d25d6d23b7548774067a664220990366da49ea1e15e1d33ec31d1ab934d06 SHA512 6cac9c55e060ddfe901a0fd361b629ff19666ffc3ebf7e5f1184135b8ca6e5b3056bcfa506e0bcc973405dd7dcae83b0bfd08f81c8c6ade1f2dbd13d60de38a7 WHIRLPOOL 7ee0b8add0f67ed4800d5c41b7967488119d7e865ce0d4bc8b15496a8bfcfebbfae08eb55d69d7de4d7bedb32fc7850c2cb76e46ae3ad5bf465a96f28b1392b2
 DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844efa871baadaea93f02572d7c43164130d7e7dea58e5a1d421232 SHA512 d7e869bd42a00a40030c012fb895ae358eafb5039bca76ae626eb5b0dd2ed7516cbedfd6d0336190e72d7a0ddfa4c6d4ce759085cbe05d38dbf66b52806b3e16 WHIRLPOOL e5430b55c5685d1a1126d60cdeffb535d673200d7da1638f8085969b81ddf42e619ba2d8b92ce01c59edf990f6c56721406a9f04a5dab6e8d81fd135235f8648
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
@@ -68,7 +67,6 @@ DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0b
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 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_p20160625.ebuild 15656 SHA256 f65d83458111053f19648224f7f4f6d6ba92d985bbe52793805011f59d84ae20 SHA512 64742595e5b04a502d7513d063269b914d558af0fed73e21432aec8abb2120673b89fad95ea090e27f603e8405ced3165300ee922829812a0e1429177a0dc7b3 WHIRLPOOL 670b6dbb67f140d83c7ba0fc7ae9ea2af27d3c7e9f15dadac35f37f12326968c0ebea131fc195e3d0d1e5cf1e99536baecadf36cef9d3d7ae7d2a994d450be61
 EBUILD netbeans-java-9999_p20160627.ebuild 15656 SHA256 d5bd2ef557d74bfc8f582355ba0df1540233c73793c67e7f54554bcba5f13b1a SHA512 7c84ccd089ba94492aa9d680c105040c12d16ddbc4a29ea7058f34e359983be0c24a280c6a1a312499f47ba3a58a764de849337ddc539696592b6a9ea8f79790 WHIRLPOOL b1d98073bd89da4508012ad7d3aadecf02c1d523cb461e46628c0db762fe2f6b3098dc02c990fcbe3cfd58f4594e3ae80da8997203164da6d6123ed511bc54aa
 EBUILD netbeans-java-9999_p20160628.ebuild 15656 SHA256 597866aec6dc88cf3b93d35386cfee0cce825cd4bebf01629bf6cbfd75815fde SHA512 b54ed315fe027bb57fe6ce549a22b3799eec8bc67d3890465d9becbedae0cda868245d035a4816f3571a2dab786daa0d929ce13eef625c412468b1c7560ed6f5 WHIRLPOOL 2ab3026586338969876a9cf4395744b6bc2ad732c9c27189ba099f4c010b717a207be4095dfe6f1d81d03d69c1760020334f2ab25c0a05a2bafd26f4aa7d432e
 EBUILD netbeans-java-9999_p20160629.ebuild 15656 SHA256 94b39fc264595d8874ad8ac4e32be9ef9ed3772dd39cee46913a061c2c7e4c06 SHA512 09d3f1a6a959a2a39a4fdedfb3a5a0e37bb4f065b1654d0f7a6247c88463b51dcca65ca8e24b7c99dbe8a6c756520068d895331a3c2066321847c669f39fae1b WHIRLPOOL 75f086471489a3503f1f000966bb0017d11ed5c26b68e525c4d58566d7162456d4d6f0f2a10127fc3b623ee0853a619ead15f50c3d39368c9d89bbeace295c6c

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160625.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160625.ebuild
deleted file mode 100644
index b3b06a4..0000000
--- a/dev-java/netbeans-java/netbeans-java-9999_p20160625.ebuild
+++ /dev/null
@@ -1,280 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-# Maven cannot be unbundled because it depends on exact maven version and exact content of maven directory
-
-DESCRIPTION="Netbeans Java Cluster"
-HOMEPAGE="http://netbeans.org/projects/java"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-25_00-02-33/zip/netbeans-trunk-nightly-201606250002-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/47E8B11BBA8D4796ADC351499A07197ADF03383B-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}"/47E8B11BBA8D4796ADC351499A07197ADF03383B-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 9eb2f06..2427936 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-201606250002-src.zip 216438825 SHA256 f03d25d6d23b7548774067a664220990366da49ea1e15e1d33ec31d1ab934d06 SHA512 6cac9c55e060ddfe901a0fd361b629ff19666ffc3ebf7e5f1184135b8ca6e5b3056bcfa506e0bcc973405dd7dcae83b0bfd08f81c8c6ade1f2dbd13d60de38a7 WHIRLPOOL 7ee0b8add0f67ed4800d5c41b7967488119d7e865ce0d4bc8b15496a8bfcfebbfae08eb55d69d7de4d7bedb32fc7850c2cb76e46ae3ad5bf465a96f28b1392b2
 DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844efa871baadaea93f02572d7c43164130d7e7dea58e5a1d421232 SHA512 d7e869bd42a00a40030c012fb895ae358eafb5039bca76ae626eb5b0dd2ed7516cbedfd6d0336190e72d7a0ddfa4c6d4ce759085cbe05d38dbf66b52806b3e16 WHIRLPOOL e5430b55c5685d1a1126d60cdeffb535d673200d7da1638f8085969b81ddf42e619ba2d8b92ce01c59edf990f6c56721406a9f04a5dab6e8d81fd135235f8648
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
@@ -36,7 +35,6 @@ DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0b
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 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_p20160625.ebuild 4971 SHA256 31b5392bf084f3c31b4c4ec098ed3d4ce65569b43f64d6bfec3e0b6794a98b4e SHA512 9d05a779825e88cbed9c2865c5800f56771a076e8f51a2afd79c93b9f057c5b20a22ab5fbbbc45874243916b15546cc2c3a0098cd925410b8bd157a050519d88 WHIRLPOOL 0d47083df719f27c865505ace9d59107d90f3c71b8011a8415757756e73f82d3e01cd93d38c54a37792316798ac4453512a536b30cbd670501dbd45107873a1f
 EBUILD netbeans-javacard-9999_p20160627.ebuild 4971 SHA256 96d1bd0392bf4ca09dabd5cb0cc3ad6638cb14126808142389ad12888cd736e4 SHA512 28eb14a17ff58829aa6f34caf75d1dfd592dfc1588956a289f8cb973e624f6ee9af4cb25fb4b1073b0ecc54084202fb28326e032d1ba00e184086410dea73a5e WHIRLPOOL 9d9f52fd79d853f1ed034b1778d6dc0a479fab7c120625eabfa1f20abcc1317bc01b9d32980f75636754c8a58b42143006312aab9cc574e037a0a69b897bc0eb
 EBUILD netbeans-javacard-9999_p20160628.ebuild 4971 SHA256 e77426b654419ca7d1c19a79903ac728e62e63fe31a44a62ee49f2e3df7e1c70 SHA512 6f823b78a1a21e95cdcb86e1acb3403566e7b2e43e19d43c6853cc9feb0885c5d9697f09aa2786875cbe4de15201b0043d0711e215a9f4cce06d80af4420aaa9 WHIRLPOOL e763c491756a74e78fe3513e91a1c25bf1ccf6baca9813d442b92fe58375dee52a7aeab399c6f93025df922dea84a5e5cd5b91db12f053d8a9a243686c3b69ba
 EBUILD netbeans-javacard-9999_p20160629.ebuild 4971 SHA256 4dd26a24283478bb99d31c49c03a548d6817a005fbfbec6069c13febebdb7aad SHA512 0eabb5dfd298cf60c7d766c85146d592efd2df0f948d6de28ae70fc9fda41cdf6a8568bf2838aca4f4b58a210fcaca3df7b320f56e4fc60987490c5599bd9662 WHIRLPOOL ce7a60d2461b148ce333f10835fa447dddf2cfe9ec83ef7f4e91d66854499bea1541c6fbd7899a7150a9f1c3fc1199b3856407f4273a037e32ff2555138326e0

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160625.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160625.ebuild
deleted file mode 100644
index 991f5a5..0000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160625.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans JavaCard Cluster"
-HOMEPAGE="http://netbeans.org/projects/javacard"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-25_00-02-33/zip/netbeans-trunk-nightly-201606250002-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 868315a..8f05ad3 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-201606250002-src.zip 216438825 SHA256 f03d25d6d23b7548774067a664220990366da49ea1e15e1d33ec31d1ab934d06 SHA512 6cac9c55e060ddfe901a0fd361b629ff19666ffc3ebf7e5f1184135b8ca6e5b3056bcfa506e0bcc973405dd7dcae83b0bfd08f81c8c6ade1f2dbd13d60de38a7 WHIRLPOOL 7ee0b8add0f67ed4800d5c41b7967488119d7e865ce0d4bc8b15496a8bfcfebbfae08eb55d69d7de4d7bedb32fc7850c2cb76e46ae3ad5bf465a96f28b1392b2
 DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844efa871baadaea93f02572d7c43164130d7e7dea58e5a1d421232 SHA512 d7e869bd42a00a40030c012fb895ae358eafb5039bca76ae626eb5b0dd2ed7516cbedfd6d0336190e72d7a0ddfa4c6d4ce759085cbe05d38dbf66b52806b3e16 WHIRLPOOL e5430b55c5685d1a1126d60cdeffb535d673200d7da1638f8085969b81ddf42e619ba2d8b92ce01c59edf990f6c56721406a9f04a5dab6e8d81fd135235f8648
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
@@ -35,7 +34,6 @@ DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0b
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 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_p20160625.ebuild 6293 SHA256 2a5df0681b5e74c128a214308caeb6dde759fd64de6c696fb2d773dcc59246fa SHA512 7f24d28ed49e2a76da66a011c2ef870104db6a7cc891b66e7afeaecc3ce433cd519f01079bcd6aed9852285a9241af3473efecb486e636e218ce1877705ac196 WHIRLPOOL a155440b43fed321d32d60717ee2caf7a61738a8f917ca406e2dbd575d38c8a85fc80049217a7f6b5c9b9382bb63b78cd6c9aef01ed79a390918f82e7ce0cd59
 EBUILD netbeans-javadoc-9999_p20160627.ebuild 6293 SHA256 04f6e4b2679577d84d112ab5b21cc43ae226d2490f811fc2e1283286b45c124a SHA512 abb63987bad569987dcd893da2e97ccb6c30c028858a65d0848da08336495f55f5aeaff1b89e16e2d88aaab35126e3aecf59077ac9ac02b7a7fbe414a0130b93 WHIRLPOOL 0ed5554a6bc82e09ebdc116d25fa6a4b01e6cf5f15122ca3000a285520bf566ef958cf01f43ea080b7eb5b6722ffffab0fc331e845ddb0b6edff2cb5d6d79994
 EBUILD netbeans-javadoc-9999_p20160628.ebuild 6293 SHA256 511ffdadf987250383b39686077d0fb1ee9dc91894f56a3a00124dd23c9676f0 SHA512 9e326140cf9db6958705d8628c735548946db945caa65514acc5d7ec233221ec0d16a584fae3284bba4714ecf212b71a7017000bc8d0b6675fe9ffacd4c6c5bc WHIRLPOOL ee4c9b3ddf779d778920622b8b034e46922798099bb9bf5cd8a7e6af0d4f387eb6b84899b289edb5852b92a0a7ebdaaf571243eab9045b4f26241bc501af2c97
 EBUILD netbeans-javadoc-9999_p20160629.ebuild 6293 SHA256 9e8876f9264bc95d99ac059b4eb580c81ea6ecf52b238c3b607ffc6ea6bd2a2e SHA512 6bb65358523a64d814d451e4953faaea5fba5a9abe24582d03732e2a3122ae18f315076414420a38425252976a9ed5a39e69b1efaa72a2a21a3017cf17d7b9dc WHIRLPOOL 097a0f24eb060a2d85d47042705e4dc28c88a0797405745334a72a09683731a417829e3e62de170b4afc8fa9df6fbe0541078c8dc6b582a914f0ae2e84fe37c5

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160625.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160625.ebuild
deleted file mode 100644
index 98d7d58..0000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160625.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans JavaDocs"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-25_00-02-33/zip/netbeans-trunk-nightly-201606250002-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 cc7415e..f9dbbd9 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-201606250002-src.zip 216438825 SHA256 f03d25d6d23b7548774067a664220990366da49ea1e15e1d33ec31d1ab934d06 SHA512 6cac9c55e060ddfe901a0fd361b629ff19666ffc3ebf7e5f1184135b8ca6e5b3056bcfa506e0bcc973405dd7dcae83b0bfd08f81c8c6ade1f2dbd13d60de38a7 WHIRLPOOL 7ee0b8add0f67ed4800d5c41b7967488119d7e865ce0d4bc8b15496a8bfcfebbfae08eb55d69d7de4d7bedb32fc7850c2cb76e46ae3ad5bf465a96f28b1392b2
 DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844efa871baadaea93f02572d7c43164130d7e7dea58e5a1d421232 SHA512 d7e869bd42a00a40030c012fb895ae358eafb5039bca76ae626eb5b0dd2ed7516cbedfd6d0336190e72d7a0ddfa4c6d4ce759085cbe05d38dbf66b52806b3e16 WHIRLPOOL e5430b55c5685d1a1126d60cdeffb535d673200d7da1638f8085969b81ddf42e619ba2d8b92ce01c59edf990f6c56721406a9f04a5dab6e8d81fd135235f8648
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
@@ -41,7 +40,6 @@ DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0b
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 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_p20160625.ebuild 4717 SHA256 27e60e1ba82de4d0b801ef367390e996145e0c15275b8749285aa3997900bbe5 SHA512 5cc934ff9bfc93d02c303689b73ae0d664c7a68c43dda5bb50582047e851a4bf7e632f6cd1f97dc93bd54dfe56b2ae04c2c27e959a33b5a31edc4667f0d23918 WHIRLPOOL f2a4c0228132bc1a3536f2ecaca6e3688b6b7ec923d0e5032dbe22e8f2d8bb52d305c86ac37cdb489f7e7933e7990071a98de8e8bde7b327c2d08e88026cd6db
 EBUILD netbeans-javafx-9999_p20160627.ebuild 4717 SHA256 a331a00f06cf750c742ceccdf4a68ec2600bba52cd0a4a6a1a4768d9d7a0acf8 SHA512 c426d98f28a139388ee3a6dc1705019af46bd9b15f6a5271008955eb28ba2be6aedc5368ba043792ebfe3b3a4151d8b542e370708dd39ed53dbf3ed35e96dde1 WHIRLPOOL 25a46e2d76067a2e1cac860ee3cf61f39fb3707739302fb88aaa4c6c4219824ad9131d05b02cb9556c60a9bd3508f5516fabb2e86a8412c987e708fe575558d6
 EBUILD netbeans-javafx-9999_p20160628.ebuild 4717 SHA256 0f133776e6cc6b3279127ea903b4182f2cc2f30bf625628652e7146f7e58f230 SHA512 863f3f32b4bf0947dcf51ac02bd0b8b3b94dc332302542d23d44aca10f71d11f9c4dd739753408eee1b7e1a2f326c96e0dd1abbe610399abdbe6431e0f013ae5 WHIRLPOOL 1133120c823bb11ddeba22b177fe02cce5fffc4fe5f10cceba01cdb0f24d308b608f513022ded98c6cfebedc9639602d1e389a45f8992d33600983ba2efb244e
 EBUILD netbeans-javafx-9999_p20160629.ebuild 4717 SHA256 bc5e4d8cdeefc3dfae713e53e12787e0d6066dfdc7dfefefc5897b90580f6781 SHA512 7c71831c87f2fb55704f5c6286420ed55a1dcc61b8a1db7d38f5ce07a329a5edb45fe17813bbce063dcd446ed6c63f2afa50f8fe8b5d0681e9e21fe36749972a WHIRLPOOL 5195604559ea7dc003739f155053bc7afd5205c5b26ab06a06ce2fce4e60887497290c97fb6f5b4d5b3a4baf9b188d2b1fb9a8ace25005a1a1e29880d234861b

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160625.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160625.ebuild
deleted file mode 100644
index e455183..0000000
--- a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160625.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans JavaFX Cluster"
-HOMEPAGE="http://netbeans.org/projects/javafx"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-25_00-02-33/zip/netbeans-trunk-nightly-201606250002-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 21a6a88..8996d95 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-201606250002-src.zip 216438825 SHA256 f03d25d6d23b7548774067a664220990366da49ea1e15e1d33ec31d1ab934d06 SHA512 6cac9c55e060ddfe901a0fd361b629ff19666ffc3ebf7e5f1184135b8ca6e5b3056bcfa506e0bcc973405dd7dcae83b0bfd08f81c8c6ade1f2dbd13d60de38a7 WHIRLPOOL 7ee0b8add0f67ed4800d5c41b7967488119d7e865ce0d4bc8b15496a8bfcfebbfae08eb55d69d7de4d7bedb32fc7850c2cb76e46ae3ad5bf465a96f28b1392b2
 DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844efa871baadaea93f02572d7c43164130d7e7dea58e5a1d421232 SHA512 d7e869bd42a00a40030c012fb895ae358eafb5039bca76ae626eb5b0dd2ed7516cbedfd6d0336190e72d7a0ddfa4c6d4ce759085cbe05d38dbf66b52806b3e16 WHIRLPOOL e5430b55c5685d1a1126d60cdeffb535d673200d7da1638f8085969b81ddf42e619ba2d8b92ce01c59edf990f6c56721406a9f04a5dab6e8d81fd135235f8648
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
@@ -33,7 +32,6 @@ DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0b
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 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_p20160625.ebuild 4412 SHA256 20649f1c5359cf8a77f5f94762597b7cd663824774c56c58631be7a50fd68a18 SHA512 1f170168127db325b32d536bc7deb3457e29cfa62283ef24ea6686fde393127b8a9692cf31e3eee0edf12fbeccef559eb9e930cd3bb40ec5f80369e3107d6482 WHIRLPOOL 20f0c2290d641b7db3d1616182def2d5cc5dd61cb3a817b9b24902cca1194430c6f71ce4bdde3e850db8236458c18d39edbf4a7a6e1b3bc0f636da451e2b8024
 EBUILD netbeans-mobility-9999_p20160627.ebuild 4412 SHA256 43e79ccd0235c324319902441d5be38ee69e0b77ad9d644f7febdc00cdbe9ed1 SHA512 9b8fba2be34720a95d5f45f31a5174da1d3fc09c9a486acadb3ae39aa61395567ba1bebf9bc3e4e1b6f89e7ddf414edbf0b8bfeda7d7f6e2d619aa74f90e26ea WHIRLPOOL b6a6fa4c2c261e77254e46117f7c4c1a75fc316595f5c37b1d7656a926fc70caf6fd59e8b881fa77ac8f05904757b37f3c471b6de3447408117e3fb3a5b476e0
 EBUILD netbeans-mobility-9999_p20160628.ebuild 4412 SHA256 1ba265dbea4fe8ef002d01b74b606050faae23c5c44f14100ef4d36a43b02832 SHA512 8d4a071e81db74866acbcf1cf3d1dc74632a5075fb74ca241c18a30b9568bfee00dce1d8b5af83071e3cb55f56ae50d92e2337e90b4065515fa42a6b2312a0f5 WHIRLPOOL 4fb35551e38154be62585efa5dce2f99b1e018e8bb188e787043dff8798a015cacafae0a3f5f0a456e7011e3546885f43b8e081e2e6acad705179c40d5d6b71a
 EBUILD netbeans-mobility-9999_p20160629.ebuild 4412 SHA256 648e2262c5bbb91513d395f2f86f056e10f4a77f60970131987da3e13f454233 SHA512 2c74f3b4e3ff7079fb47e62d57f4107b082752a3c17456f62b86022763e875fa3597a78b3816fbe244af0a44fd7df74cff8630c52b42f1f1a2c7c15cb53d1c8c WHIRLPOOL c596a045e493fedcb96ec368890a7d14f28f24d564ba82321fa34ea0cbf730abe6361bf43675dddfa94b1c022adfc31e5b82347faf7c843e3205cbbfca0144a0

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160625.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160625.ebuild
deleted file mode 100644
index b533dd3..0000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160625.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Mobility Cluster"
-HOMEPAGE="http://netbeans.org/features/platform/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-25_00-02-33/zip/netbeans-trunk-nightly-201606250002-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 c1a5564..f3cabb8 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-201606250002-src.zip 216438825 SHA256 f03d25d6d23b7548774067a664220990366da49ea1e15e1d33ec31d1ab934d06 SHA512 6cac9c55e060ddfe901a0fd361b629ff19666ffc3ebf7e5f1184135b8ca6e5b3056bcfa506e0bcc973405dd7dcae83b0bfd08f81c8c6ade1f2dbd13d60de38a7 WHIRLPOOL 7ee0b8add0f67ed4800d5c41b7967488119d7e865ce0d4bc8b15496a8bfcfebbfae08eb55d69d7de4d7bedb32fc7850c2cb76e46ae3ad5bf465a96f28b1392b2
 DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844efa871baadaea93f02572d7c43164130d7e7dea58e5a1d421232 SHA512 d7e869bd42a00a40030c012fb895ae358eafb5039bca76ae626eb5b0dd2ed7516cbedfd6d0336190e72d7a0ddfa4c6d4ce759085cbe05d38dbf66b52806b3e16 WHIRLPOOL e5430b55c5685d1a1126d60cdeffb535d673200d7da1638f8085969b81ddf42e619ba2d8b92ce01c59edf990f6c56721406a9f04a5dab6e8d81fd135235f8648
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
@@ -36,7 +35,6 @@ DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0b
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 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_p20160625.ebuild 4111 SHA256 f6aa69a1d5abb5e2579823433fc185acd4e40b98aa04bde77ff4a556b17f5bbb SHA512 a09603da7adee5028fc8f7de2fdc576b1194fc1a404ed04b9ad0c3dee222b1d0004c345c9276088b045af1f8c91a4f61dd6ed23e772746aea63fe4cd69c9ed4a WHIRLPOOL 92746a684a42f0343cc07c9bf764665a401d96ccd53fdd03bcde74415cf8cac729e76e0fb04294048141e5151449513d96e8be4a98d15fd6af0fc15f934873fd
 EBUILD netbeans-nb-9999_p20160627.ebuild 4111 SHA256 69eac502e7b633b2e09d936726e1cc01410e1b1e1d2473a1e1bd35ab2e7fea7f SHA512 6f2905abc0348f0d20ba0971b57b63f2a89bac30591663fb0d4d9c0afda2f02fd036ed97910f56d7f950a4b1c361ed63631a864b0152a2f47c7d67a7fd104e03 WHIRLPOOL 1d8b5078b89de223c20381ad2beeae903f86ee6c7908bca86d59610a30fcbf036426ff0d524c6bc2cce1604e92dca528ffcb4001809313b71707df46042f9a42
 EBUILD netbeans-nb-9999_p20160628.ebuild 4111 SHA256 18d95e390dffaed3fe0175b8c2051ea1f31ebc30287e0997d122e7a7fa8221fe SHA512 47993ec8c1cb99a9ead508cf6fefd33cb4da988f3edf49bb2b80e9e2c1bca4780ed4cd410cf015624cfb66460afd4f16a9be740ed5828657dc36883b889e0985 WHIRLPOOL 4c32a52bcd28da56d09d311e311e3cb6cfb0836029d3e81ee7ca4fa3cbaf541761cc819a7f3d3de0941a72923d9c980151c53392dbb3570b11b8bbfc482ccccf
 EBUILD netbeans-nb-9999_p20160629.ebuild 4111 SHA256 44b08b44dc2978d1df916fb039640a8fae17d81a4486108df922b250d97d7af3 SHA512 8d31ff0d73f1c107a595daa66486a4622a654d4bf5def914ce096c9348f43ffa0e07ba796b8daec2ac46114175a9bcc212954819f8e1fd524695fff8f0f0bbd2 WHIRLPOOL 41be443ca44390dfe17b270b7ff6a0d84c3a9aca0d98c124a41d4ecc8062984ddebb39f793a92f9ee9d67914a1f81388d9baecd83e38e6e04f6927a384adecd5

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160625.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160625.ebuild
deleted file mode 100644
index 3240bc3..0000000
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20160625.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans IDE Branding"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-25_00-02-33/zip/netbeans-trunk-nightly-201606250002-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 fcd9931..a890224 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-201606250002-src.zip 216438825 SHA256 f03d25d6d23b7548774067a664220990366da49ea1e15e1d33ec31d1ab934d06 SHA512 6cac9c55e060ddfe901a0fd361b629ff19666ffc3ebf7e5f1184135b8ca6e5b3056bcfa506e0bcc973405dd7dcae83b0bfd08f81c8c6ade1f2dbd13d60de38a7 WHIRLPOOL 7ee0b8add0f67ed4800d5c41b7967488119d7e865ce0d4bc8b15496a8bfcfebbfae08eb55d69d7de4d7bedb32fc7850c2cb76e46ae3ad5bf465a96f28b1392b2
 DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844efa871baadaea93f02572d7c43164130d7e7dea58e5a1d421232 SHA512 d7e869bd42a00a40030c012fb895ae358eafb5039bca76ae626eb5b0dd2ed7516cbedfd6d0336190e72d7a0ddfa4c6d4ce759085cbe05d38dbf66b52806b3e16 WHIRLPOOL e5430b55c5685d1a1126d60cdeffb535d673200d7da1638f8085969b81ddf42e619ba2d8b92ce01c59edf990f6c56721406a9f04a5dab6e8d81fd135235f8648
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
@@ -38,7 +37,6 @@ DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0b
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 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_p20160625.ebuild 4418 SHA256 b3f2aa0367f5d90ee472b05ca055f30bcaeef1fe2faa8d9989db9aae673a1734 SHA512 bed3cd9a49032ca9c3a5532534126146e13210c0156ec7dca4d517a0c53ead397a84af674eb1c41204811ce1fe2ece7d5002fdaf64ccca38f16da434a050a15c WHIRLPOOL 4ddeb8734a2b4e49656e3ee92774718105686f63889e7b295472e5b95ce3ea15eb031bc5647e59ebf7b991a9db4fb95fe72a168e77633d62e9a0e9f6f6da734e
 EBUILD netbeans-php-9999_p20160627.ebuild 4418 SHA256 678ba4d3aa31423d93ebbacc46d1e27f6aa7a09b705114a93addcb338d003214 SHA512 d30bc908455185d3f647840b8fdb5051af8a4accaea320266a377d0ca8962f2ad8cc781aa212814bf30c4d0e3c3c303bf331ae23cac5636520bfc91eee898342 WHIRLPOOL 7ec6c21d66e0a37bd986b1bec3bc31154297b3575811f705a3207b671482af88b242654e873700057e9fc0c9e8116269e04eee89bec24aec41828864898c06ff
 EBUILD netbeans-php-9999_p20160628.ebuild 4418 SHA256 fd1055888559f33745240af3bb155d99abd80f669946e74312d83d6b082aa514 SHA512 9178a2bcb89a4bf2d26e950869ac418bfab773c3393da31a7da85fcfed83774b69363335c5ef116f78f7f4c25b24b310447afa4a5ea7648eda6c13bbf84f1260 WHIRLPOOL 8e0444f86e8a3030046e406b07eaa3584a98c992c5967a9184dfa54bedaccb4eacb67160dcc43862de15938ca7a36f0045d89332db7df0c33c7755b3466fcd11
 EBUILD netbeans-php-9999_p20160629.ebuild 4418 SHA256 11d47be338b1ca237c468a5fe3185f818fda7f46f8927e4023dcf5af02303c8e SHA512 81526613c6fbe4059453be97ce75d1fc121bcaa248c318cdead82a29bcde2ee16100c7afce783f051900fdbf745fbd99ae7319d1117b71fdc948b2d45e85e50b WHIRLPOOL bd11c27e91385a7527d0fd8fe2084873f3fa4b287b1e13ec4ec53c59bcc77c4f8e8a5b831a9e07d3dc221c6f5a9111c76589753cd93957ace920c808aa65c1fd

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160625.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160625.ebuild
deleted file mode 100644
index 4159f64..0000000
--- a/dev-java/netbeans-php/netbeans-php-9999_p20160625.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans PHP Cluster"
-HOMEPAGE="http://netbeans.org/projects/php"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-25_00-02-33/zip/netbeans-trunk-nightly-201606250002-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 96737ff..0122ce8 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-201606250002-src.zip 216438825 SHA256 f03d25d6d23b7548774067a664220990366da49ea1e15e1d33ec31d1ab934d06 SHA512 6cac9c55e060ddfe901a0fd361b629ff19666ffc3ebf7e5f1184135b8ca6e5b3056bcfa506e0bcc973405dd7dcae83b0bfd08f81c8c6ade1f2dbd13d60de38a7 WHIRLPOOL 7ee0b8add0f67ed4800d5c41b7967488119d7e865ce0d4bc8b15496a8bfcfebbfae08eb55d69d7de4d7bedb32fc7850c2cb76e46ae3ad5bf465a96f28b1392b2
 DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844efa871baadaea93f02572d7c43164130d7e7dea58e5a1d421232 SHA512 d7e869bd42a00a40030c012fb895ae358eafb5039bca76ae626eb5b0dd2ed7516cbedfd6d0336190e72d7a0ddfa4c6d4ce759085cbe05d38dbf66b52806b3e16 WHIRLPOOL e5430b55c5685d1a1126d60cdeffb535d673200d7da1638f8085969b81ddf42e619ba2d8b92ce01c59edf990f6c56721406a9f04a5dab6e8d81fd135235f8648
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
@@ -59,7 +58,6 @@ DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0b
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 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_p20160625.ebuild 9520 SHA256 901e19837a35a2471e8059fd4d313e2c7e72b68d891913fed84025184999e418 SHA512 10b57560c27a7792bdcece79a597c34d1afe0b2069f53fdf5e5c4e63a59cd165111bfbf4a34858c8fdb95190590ac797e77f24a84b9e3ef101d561ac2023ba4e WHIRLPOOL 7307bded9a50e4571558b74320e12117abc93cec7192334c5bacaeac2acb66f4520a6bc4a78a34669841fc0d91235f7632a50f7b6f0dd871ca0eccf0bb5921c4
 EBUILD netbeans-platform-9999_p20160627.ebuild 9520 SHA256 c292b6fe79fd036789bbb7525897b5eba90a2d7252f81cc7eb0e245c015a0bd8 SHA512 cf48c7b08e817c33914686acd3cbf431c22a390688d8686f5bd571e7cd9cb958ba106f0247e34afe244d66ec4202412e69f105ed752698315d4cac90972b8c9a WHIRLPOOL 7c53da4a387c7c89008bb86e67dfcf87a71512c74bfb654db89e35e2dea387af48c2e41bbc94248c629c3c8bc9374a0faa4203ce7336c49bc370a4612da7c715
 EBUILD netbeans-platform-9999_p20160628.ebuild 9520 SHA256 e5c185ec19e1555a1331b4f92820d363178da11a2e40e685305b6c28ee10b0b1 SHA512 441108d2e5984770beec7f7e205315a54e19f934aedeeb4b084324dd633de9f38421e5812217f1fe3042c65de2c75eb6a6588287c2218d723f31bc73e1d02404 WHIRLPOOL 1012b8490fb0784fc18edc887afce92c662a6f4a1616679c74bf8fa9b9c75c7229233a6b75b75bdfc46c46c91d4fa88248003c754ea7c35f75550d478b40ee4a
 EBUILD netbeans-platform-9999_p20160629.ebuild 9520 SHA256 0bf3526d550909a3f9395d5982093199a23ccd632d07a65f06a1eec59745287c SHA512 19cedab72e8ca9a692557fdfa8d669f06d270b3ab9fcbbfca24d6d7ebf92ab0588f008d114d40185d3d070c2523f51374ece866af29d4197194f8680bac50892 WHIRLPOOL 6b35d62ea994764e82492bf169c7e590d6a6a21fda5d220d35e1188d1b673c0405b2bb7ecbc3e1070b95e13c919609d1f30551135acb78ff0624c904b9ab1af6

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160625.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160625.ebuild
deleted file mode 100644
index 83d9787..0000000
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20160625.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Platform"
-HOMEPAGE="http://netbeans.org/features/platform/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-25_00-02-33/zip/netbeans-trunk-nightly-201606250002-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 63d65db..db5a687 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-201606250002-src.zip 216438825 SHA256 f03d25d6d23b7548774067a664220990366da49ea1e15e1d33ec31d1ab934d06 SHA512 6cac9c55e060ddfe901a0fd361b629ff19666ffc3ebf7e5f1184135b8ca6e5b3056bcfa506e0bcc973405dd7dcae83b0bfd08f81c8c6ade1f2dbd13d60de38a7 WHIRLPOOL 7ee0b8add0f67ed4800d5c41b7967488119d7e865ce0d4bc8b15496a8bfcfebbfae08eb55d69d7de4d7bedb32fc7850c2cb76e46ae3ad5bf465a96f28b1392b2
 DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844efa871baadaea93f02572d7c43164130d7e7dea58e5a1d421232 SHA512 d7e869bd42a00a40030c012fb895ae358eafb5039bca76ae626eb5b0dd2ed7516cbedfd6d0336190e72d7a0ddfa4c6d4ce759085cbe05d38dbf66b52806b3e16 WHIRLPOOL e5430b55c5685d1a1126d60cdeffb535d673200d7da1638f8085969b81ddf42e619ba2d8b92ce01c59edf990f6c56721406a9f04a5dab6e8d81fd135235f8648
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
@@ -33,7 +32,6 @@ DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0b
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 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_p20160625.ebuild 3472 SHA256 b020cb8acc07dc569b6add3c24713c6ccf26aaa7324b8b53a564442df0ed4ee1 SHA512 9fff80a132ad34d3912825ef96dfbb3ceac62d0f1f3a4edbcd649e545b606281dc7925ad930d398433fffb94cd55a48dd83d211983057e38b8c325e09650ba15 WHIRLPOOL d5e4d6da03555141284a2eadea731a291904fe7bbde66526859b3091a046fa4e42126cb61513c1c6416fb5b00c198b2fc2af4a41144fbbf351cbea17d2bd9ce3
 EBUILD netbeans-profiler-9999_p20160627.ebuild 3472 SHA256 795845575a1ca8fc3ecc03ff839995fdfb50261a24b37d0fa9dfb6215d223983 SHA512 9d3983705b31dac9f54bf7030b2e3a1de1a62a4697f7c41549418a3478ad1db46bb600e121035e5e2e65e1eec43175e998d9b9c6896ab45cb299da88af37bca4 WHIRLPOOL 92fecd4ec1162852dbce53ba021d652ade8dcbe3e6d2f23bdfae63884801f555f468a32e38580f1d55ec43f584bfdce6cbf721bb1173b95dbaa0383129d142c7
 EBUILD netbeans-profiler-9999_p20160628.ebuild 3472 SHA256 a76fd7e4668ca54313fc3885f96e6fdf4cc74b73c8ed26a9292b384065650046 SHA512 0cd7d9049d356066c4483e2430ebed00c30783a02bffe6594108d75065fa9895da16269f60fd2385b6e7ca2b30b6ee1a54f3ccc785e5b9c7a02cab9e8d09e28e WHIRLPOOL b131491b052ac388765818793c7493b548faa624ed62958cc99f97336a8ac0e238db53fdf9834105147780d53ba06e5725f78de4c92462dde3d19abdbbb559b5
 EBUILD netbeans-profiler-9999_p20160629.ebuild 3472 SHA256 400f9c8fd8d2ac203576d74f7f2124b0eb0c0b8c3195d7631f07def1ef16901c SHA512 540230b9d19253d3268fd0219a677c586efd9232526c75e8cea53d19c05e8c0a1d9619fc8f49708ff0b086c7b0d2aef3b6e845db7ab3d64100b86b8746082903 WHIRLPOOL c1bf20139867706bcafa86bc1978f1ea379c6699532f40b3da644736d0eaccc9bd5066509301cd4a192d40e14c78247ecf6ebd63d8c9401f8e1917e79474f570

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160625.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160625.ebuild
deleted file mode 100644
index 22e9c95..0000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160625.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Profiler Cluster"
-HOMEPAGE="http://netbeans.org/projects/profiler"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-25_00-02-33/zip/netbeans-trunk-nightly-201606250002-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 b5951f8..58d63cc 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -27,7 +27,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606250002-src.zip 216438825 SHA256 f03d25d6d23b7548774067a664220990366da49ea1e15e1d33ec31d1ab934d06 SHA512 6cac9c55e060ddfe901a0fd361b629ff19666ffc3ebf7e5f1184135b8ca6e5b3056bcfa506e0bcc973405dd7dcae83b0bfd08f81c8c6ade1f2dbd13d60de38a7 WHIRLPOOL 7ee0b8add0f67ed4800d5c41b7967488119d7e865ce0d4bc8b15496a8bfcfebbfae08eb55d69d7de4d7bedb32fc7850c2cb76e46ae3ad5bf465a96f28b1392b2
 DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844efa871baadaea93f02572d7c43164130d7e7dea58e5a1d421232 SHA512 d7e869bd42a00a40030c012fb895ae358eafb5039bca76ae626eb5b0dd2ed7516cbedfd6d0336190e72d7a0ddfa4c6d4ce759085cbe05d38dbf66b52806b3e16 WHIRLPOOL e5430b55c5685d1a1126d60cdeffb535d673200d7da1638f8085969b81ddf42e619ba2d8b92ce01c59edf990f6c56721406a9f04a5dab6e8d81fd135235f8648
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
@@ -57,7 +56,6 @@ DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0b
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 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_p20160625.ebuild 6242 SHA256 a03dfcfbcacd7d1edb11799785eb8812b2bd034d2e57f7aabc4626225ceae962 SHA512 67ebed8440ba6c5979d6e70334ce749799eae2603c7fc67f8959e9514ceb3f053233c447f0a3ee0d90506697653a3de0e8ba12d99e0b8fd26a15f5809eddedbd WHIRLPOOL 8574d3c380261617fe10fae0f40a9a3c1a679a965565768df8226219f92ffe8bfbcf95540bc891fcd742958f03d769e0eff715f37575ac849820eebf3dc070fe
 EBUILD netbeans-webcommon-9999_p20160627.ebuild 6242 SHA256 a3851e9c84a81b1148eddb0ca6ae6a69a02a1fcf7024a344f78b93be4e053bb5 SHA512 85ffe56646202790b6af847d1d0b404aeb8085e0caa6ab18d5c4dc7e8023d53308a755cb288715f1ed38ed70abe72ca626a76d189ac751735cca7e4d36f6d1ef WHIRLPOOL fc8e3be758ce15726f50063c9f6ba6f147db3b3a66422df8623ac909ead127106f433267e1facc03a30882580cb8dd29c9fe6b6e6174b9f5c352e299aae9bcd3
 EBUILD netbeans-webcommon-9999_p20160628.ebuild 6242 SHA256 ae90066637168b6647b664aa0122addfeff595f681feb56c08ae4282721e9d19 SHA512 6f552c4a2f25091223d80bc16a5c9b227ec5f808ead6f9de347300868a5f0d7a19f73b9c6135b481c99297d5703d944f8ac95ea88d67ec4a9993465441aa2d80 WHIRLPOOL 4e8b74fb04d04f2d6edd31c7bac918f04e7ed10754d9532b1416876042e32d603cb98ec92d3207e844acb2bed74a07c6579b5dea51ed64e2dc69108b5494bc1c
 EBUILD netbeans-webcommon-9999_p20160629.ebuild 6242 SHA256 26fa0c9759e3ecca05171327d4b5f6f6f19c4c211b13bf6f5d2a4aab0a2a9161 SHA512 52c38e186e47668946cf14f0bd0898e7dad972f52473365d7911a0a5f58635fb43fc0183afead37ef7b7ac91872fff0fbdd3c74cc43bc3f4e8676094802b6434 WHIRLPOOL f0c7761e48852a8621d2cc155dabf8c6190f4376a803407d328aca00859860dac14521d4e03b4724b8af7589a64335f1d239a1cba3b0d4ff95973df3c8ca3e59

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160625.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160625.ebuild
deleted file mode 100644
index 31d1822..0000000
--- a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160625.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Web Services Cluster"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-25_00-02-33/zip/netbeans-trunk-nightly-201606250002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/C926927CC9D32F80BF93D2F9623E5C1C8425A75E-com.oracle.js.parser.jar
-	http://hg.netbeans.org/binaries/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar
-	http://hg.netbeans.org/binaries/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim
-	http://hg.netbeans.org/binaries/913947D60B9AE208A20A4CEAD4D033F141ABF9F4-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/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}"/C926927CC9D32F80BF93D2F9623E5C1C8425A75E-com.oracle.js.parser.jar libs.nashorn/external/com.oracle.js.parser.jar || 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}"/913947D60B9AE208A20A4CEAD4D033F141ABF9F4-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}"/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 518ec92..bd480bf 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-201606250002-src.zip 216438825 SHA256 f03d25d6d23b7548774067a664220990366da49ea1e15e1d33ec31d1ab934d06 SHA512 6cac9c55e060ddfe901a0fd361b629ff19666ffc3ebf7e5f1184135b8ca6e5b3056bcfa506e0bcc973405dd7dcae83b0bfd08f81c8c6ade1f2dbd13d60de38a7 WHIRLPOOL 7ee0b8add0f67ed4800d5c41b7967488119d7e865ce0d4bc8b15496a8bfcfebbfae08eb55d69d7de4d7bedb32fc7850c2cb76e46ae3ad5bf465a96f28b1392b2
 DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844efa871baadaea93f02572d7c43164130d7e7dea58e5a1d421232 SHA512 d7e869bd42a00a40030c012fb895ae358eafb5039bca76ae626eb5b0dd2ed7516cbedfd6d0336190e72d7a0ddfa4c6d4ce759085cbe05d38dbf66b52806b3e16 WHIRLPOOL e5430b55c5685d1a1126d60cdeffb535d673200d7da1638f8085969b81ddf42e619ba2d8b92ce01c59edf990f6c56721406a9f04a5dab6e8d81fd135235f8648
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
@@ -33,7 +32,6 @@ DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0b
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 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_p20160625.ebuild 2721 SHA256 784c0aa20e19485d05b23cdcf7c71eb8e2d872b974ac89327ed92f034c30dc04 SHA512 1102648576d12de790d2417ae353cc8851e8c3ff59bf5120a5dc4dd91321be51aa89ce20be42a85e8c42ff2d7ce306c478f1b443036673ca12766331080bdd7d WHIRLPOOL 2b558e07bf5161267af40e92a1c676f262bdf56450586ff5417b7ae2e5c5b11e915d73ffda772ee63c9055b7eb26aa73030660c1cb9a60eb1b4b7b1b67e0cdb0
 EBUILD netbeans-websvccommon-9999_p20160627.ebuild 2721 SHA256 10bf8804a84f868341f2c6c26d03be4c69d18b35cf990bbb0d9201362f005b7c SHA512 885089bc475df0851a6a64b49029c9551143887925f445e8516b6e702be407df35e031d11ff0ae5e7e8039ab0c7859a8e41f3e8dd1dd704c08f21f8d0070e1a0 WHIRLPOOL e1f49293f6da7f2ce870ec71722d0954005627e096da547f082b0b0e047fb9675d8eadc2709025d28b4ef55a81b7ca0194a99510b08a4e8afcdb8354cc18ed3b
 EBUILD netbeans-websvccommon-9999_p20160628.ebuild 2721 SHA256 bd3779b28f96ac28d9cb135cebb82d39d6b820d39a755334797a267943d19fb0 SHA512 1bf7e9801ab82ef335ba8054f3017f9e2cd01080b8b048f5201a2d49378cfa63366732a8047ded49fe407c7271179444308c37bf1eea1d7996b3e5bca975a7a4 WHIRLPOOL 66d0c5e4f64a2ed3d6356da4efa8fc1377cb40ba209eac2037ed17cb654b0373e302aa004ae0f72b1b54c9c98a44b065bdfa0fe02a9f010817caf88eddf9f173
 EBUILD netbeans-websvccommon-9999_p20160629.ebuild 2721 SHA256 31b16740d9c5b5f0dba53536a474ab9ef34841f5414f125cfe1ba0a182affc34 SHA512 1f23b25d36ad6e959f5cad16357bceaba8bd7cb4da62c876b6a13ddb76f069eef18290835896a167c2190d928add56d61a976ec4ac866db26201488237665678 WHIRLPOOL 134ad03608f379efbea024ace5c653519510d3c2e54d8ab2cfc88045c86b737980b2a4fd7a9a7b9d87a5a23f0a354e073c046a9b1681bc9084128618c06c3630

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160625.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160625.ebuild
deleted file mode 100644
index 3203024..0000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160625.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Web Services Common Cluster"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-25_00-02-33/zip/netbeans-trunk-nightly-201606250002-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 9b74a6d..f5cf944 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-201606250002-src.zip 216438825 SHA256 f03d25d6d23b7548774067a664220990366da49ea1e15e1d33ec31d1ab934d06 SHA512 6cac9c55e060ddfe901a0fd361b629ff19666ffc3ebf7e5f1184135b8ca6e5b3056bcfa506e0bcc973405dd7dcae83b0bfd08f81c8c6ade1f2dbd13d60de38a7 WHIRLPOOL 7ee0b8add0f67ed4800d5c41b7967488119d7e865ce0d4bc8b15496a8bfcfebbfae08eb55d69d7de4d7bedb32fc7850c2cb76e46ae3ad5bf465a96f28b1392b2
 DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844efa871baadaea93f02572d7c43164130d7e7dea58e5a1d421232 SHA512 d7e869bd42a00a40030c012fb895ae358eafb5039bca76ae626eb5b0dd2ed7516cbedfd6d0336190e72d7a0ddfa4c6d4ce759085cbe05d38dbf66b52806b3e16 WHIRLPOOL e5430b55c5685d1a1126d60cdeffb535d673200d7da1638f8085969b81ddf42e619ba2d8b92ce01c59edf990f6c56721406a9f04a5dab6e8d81fd135235f8648
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
@@ -36,7 +35,6 @@ DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0b
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 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_p20160625.ebuild 6939 SHA256 44da859ec3ffa59e85b7a155556c046218e00d236af6ba450a2f68728193b57f SHA512 0f1394d88b2369683f9d15805642a82bbfad6aeffd4a6538e64f3824b20cd9c6254b76d7a3a3359626a7e2de430ede220f89d38079a190564e79355193ddb464 WHIRLPOOL 50aa0f440ca53e7bb8600c5e438815a3dbe51c1447deb2b345aaa2f01f07ffab09ec7c1ecc7c2ac0c02eeb8f4ef0fcdaae6cc39a503798d08104ed4b6c93b226
 EBUILD netbeans-9999_p20160627.ebuild 6939 SHA256 1e4e47f4099b520155e9d6e52034ebf6a5a3575a9f368b2ed0afaabdb02b7d58 SHA512 b95cbce3ddf4d19e50e2a04b5e3eb1c3734c82eb139371cdbc78fcc6703dd0c3c7f4e9ecebc7367652f92afd0de045292d450919f7001817f75059564b22fddf WHIRLPOOL 9f1112d03d996f5035b4eb06f22a096d6213692d31e99c47cea032030baa97982cd61920cd233ef22b8e582e8fe9ff9454bc823c4fce00aae28eec964f899114
 EBUILD netbeans-9999_p20160628.ebuild 6939 SHA256 6a537f5bfa1913170097e03db470bf1e0032ca441d81cd807b6a072cf1e049fa SHA512 076a2861f8c0a853d687c7e3d0ae2a53e78cf2b536d27e6c80a1e3d28a38e050ade2bedb8411fe4e623c78ac623e3b39037f7c81fd3aae64d676643e8ad59919 WHIRLPOOL 20f2ae7829dcbd1a9c0c9ed8b169ebd7e1cce5f77d98a70e83241c9cfd2d98288a34e482163da644bcc1c854a277fa6e8d3db2a795c9487d7402ea851477b179
 EBUILD netbeans-9999_p20160629.ebuild 6939 SHA256 7d7a99cae16080f9451ebfa095406a24ab4b84ff20e7840835992affcbc13602 SHA512 ad291eea5ffa6e139f2ea7284174e7c65df5bc59b741a463cc2d3b07f6678897d2d8debd92e957d284ef071261f3ca04064f55a6a58f0fd1a23f88e3134820bc WHIRLPOOL 9c8f78e356e76cc25e2dcb60fc030f2f499e77e9802e4a28bffed4fbde0f73ab1fc8cb56073aeef820f0cd534ccec41723b1d117ae7fbe265de202c506a5281a

diff --git a/dev-util/netbeans/netbeans-9999_p20160625.ebuild b/dev-util/netbeans/netbeans-9999_p20160625.ebuild
deleted file mode 100644
index 916f26a..0000000
--- a/dev-util/netbeans/netbeans-9999_p20160625.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans IDE"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-25_00-02-33/zip/netbeans-trunk-nightly-201606250002-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
-}