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

[Miroslav Šulc]

commit:     46bdcde7cb422e08281ca10d3d2c40f5bf095949
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 29 07:29:16 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 07:29:16 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=46bdcde7

netbeans: removed obsolete ebuilds

Package-Manager: portage-2.2.28

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 4eac699..553cecd 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -4,7 +4,6 @@ DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r15-build.xml.patch.bz2 2680 SHA256 d686f1e352eae400393577a456042f4475b9c321369101d2f05ec627aa61ef0c SHA512 7428b664749878fd1ead2c821277769a5af9636388515a4786284568ea656734ba2a9e90758385f5b6a0c009469df3dcc005936c8865c93cc9bc29576d2171e4 WHIRLPOOL fea09d3b1e2cc07e090a9618cbdaf6b2e3d4cab9679fdb4321a856922035871e485f492e6298e7e2562d8ecba626f2bdb3130f09840e83878e3c1e6fd6944899
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
 DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
 DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58600be3c4071f913d65b8a73ed4e4610f8890fe0fc7cf5cec7b SHA512 80b6c4987a553f651da90e1d3b690eb0f0892993c52d23d85047cad19fa9fecf107bfdddbb2615ece2ba2c41a157a59f5e0d7c0f79081ae4972b297b1a28547b WHIRLPOOL f9d7bf3d1291b3447221e23d775c6d0236b8f676d39ed1298f30f90d733c079515a1ea9b2abb6c7598d57da26d1698178937bbf54e1dfcca08dce9fa398771b1
@@ -29,7 +28,6 @@ DIST netbeans-trunk-nightly-201604270002-src.zip 213361504 SHA256 7969b4b1058bfd
 DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247baa9620dae7672b3b27c8863c40f6d37ad5e6649fe6cf013752 SHA512 61af7c64fa9f0725752b28f78edc006362dbb9441f9c22d4f290c362ba76b94f34eaa3e0acac026f8e10f385c106dff33af0bc22673fec35f5e70528db001ed7 WHIRLPOOL 4021eee486a6e4fe4df381154d94caefdd74d725103aa3c996d64d159c433f49939a7abcce063ec130087cde2a7609750b98e69a3c3571171865eb6657c09b8d
 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_p20160323.ebuild 3384 SHA256 88eaedaad525293991e3452d337d3f9ccc7f53265450fd6ced94b3c7e4fc10f6 SHA512 6805198573b4ee320ff940bb6b1c0ee141053694593037a05ce6a497f1be71181a098b1bc99c7049297ca6b64bf126ecb427a856fa70e98370e15d2fde788df4 WHIRLPOOL d4811090e31e79712918c7ef184eecb13104eee5d1bd3b6927fdeff67fc28465eb9b8a77f39b3f6d7a911c21009a26ec8969c1fe890c1bae5bdd80a00f749bf7
 EBUILD netbeans-apisupport-9999_p20160324.ebuild 3384 SHA256 2963cc052879394b00589a73cd07f1a7dfd49d889b7200cdc92e79f5c9b5c4d3 SHA512 efe6718073360ee833c449fd64aed116b2ce5da98c548aa6aa5e31c6851a6614706a281fc554cb2da02f000b7facfdfc2fbd5134390778320a88b77834c86470 WHIRLPOOL 5cd254ba84de8043074573625db464e6101d6d1dee051b139c9f7ceabf10971feb87553965efdd38486aaae3834ee4957f8671b1fa71c04554464536dbe4f05c
 EBUILD netbeans-apisupport-9999_p20160329.ebuild 3384 SHA256 258837e6ec254494ddcd21ab0a8326fc4bff27a84e3bd385d04fb7b3f629a3cb SHA512 1a1b48e97574aca19409322cb5d19524505fc5a2a646a2d3535998d723cf8d50bdf045b9dd5decda7f42a69ee6d055cd6c84e1f7efd662da4a4d166553b37a8e WHIRLPOOL b798b996f505b86701421970c257c21e5735673211092b44f22b7797898c6a51d0069ada2927f3c5919ad3cc868a7be16444ed7db70830bb9708b128c915553a
 EBUILD netbeans-apisupport-9999_p20160331.ebuild 3384 SHA256 e06346a1fb3dddd54244b73d0477f749d31b1fb32e63e70778213a56e16fba54 SHA512 60b14698c86c8d5defe6dd25b5ca49940f1dd8f98c1c08d759fe3b69d7f50031e13786055e74c54ffa5bf8c0266a20f34e70a3e2b67f8da05315cc31a37839f6 WHIRLPOOL 742503281001190fc20448a55a283623ef6c5bbe4e0f8475d9d51df7c92faa673a835be7535ac774b271ca078b322b9e5f4e7919d470b86c907d585e1cf7a56f

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160323.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160323.ebuild
deleted file mode 100644
index ff822eb..0000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160323.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-03-23_00-01-48/zip/netbeans-trunk-nightly-201603230001-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r15-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 5ca6de2..9d76f77 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -15,7 +15,6 @@ DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r15-build.xml.patch.bz2 2680 SHA256 d686f1e352eae400393577a456042f4475b9c321369101d2f05ec627aa61ef0c SHA512 7428b664749878fd1ead2c821277769a5af9636388515a4786284568ea656734ba2a9e90758385f5b6a0c009469df3dcc005936c8865c93cc9bc29576d2171e4 WHIRLPOOL fea09d3b1e2cc07e090a9618cbdaf6b2e3d4cab9679fdb4321a856922035871e485f492e6298e7e2562d8ecba626f2bdb3130f09840e83878e3c1e6fd6944899
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
 DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
 DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58600be3c4071f913d65b8a73ed4e4610f8890fe0fc7cf5cec7b SHA512 80b6c4987a553f651da90e1d3b690eb0f0892993c52d23d85047cad19fa9fecf107bfdddbb2615ece2ba2c41a157a59f5e0d7c0f79081ae4972b297b1a28547b WHIRLPOOL f9d7bf3d1291b3447221e23d775c6d0236b8f676d39ed1298f30f90d733c079515a1ea9b2abb6c7598d57da26d1698178937bbf54e1dfcca08dce9fa398771b1
@@ -40,7 +39,6 @@ DIST netbeans-trunk-nightly-201604270002-src.zip 213361504 SHA256 7969b4b1058bfd
 DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247baa9620dae7672b3b27c8863c40f6d37ad5e6649fe6cf013752 SHA512 61af7c64fa9f0725752b28f78edc006362dbb9441f9c22d4f290c362ba76b94f34eaa3e0acac026f8e10f385c106dff33af0bc22673fec35f5e70528db001ed7 WHIRLPOOL 4021eee486a6e4fe4df381154d94caefdd74d725103aa3c996d64d159c433f49939a7abcce063ec130087cde2a7609750b98e69a3c3571171865eb6657c09b8d
 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_p20160323.ebuild 4790 SHA256 b45a5478c2329595bc11fe97e89a02d0732f5c8fd75a299292e29d7d5970a3f1 SHA512 cadb56df12a4544c795f56efe929e944c504d4a851144c0b959d7a8005a861186fbbc6fbb6fd05a7b6950af6a30224e3194bd1933a48baa2e36d785c4db6dd6c WHIRLPOOL 1b0368afa7fe0c42c52cd09eb2bfe698399cc0e749eddec1ad8924dfc1a7113de5e1f5329bb617b12064d232bbb55df232f0ffabe8793cb1f8bac7a83b827c1e
 EBUILD netbeans-cnd-9999_p20160324.ebuild 4790 SHA256 6615b7137dbebabf0cf45a58e945c0ac81ae3ecd6c3bb32235a76835586b60fa SHA512 9d89803cd8510c6fcb0ae87ba9fc1391906cfadc4e775432fb0219bc817083faee54f8dddd1326479eac84ed80e4dfaa501175a3fb1f5c1ded933e4b9cda33e4 WHIRLPOOL 389fee02b5f1975a47fcee54899bd4b4ffaa216f7bb7b09a113d22d1e8cfc73f506a6c030d14397cd5851774d8c89fb0d17e42cffba29160b6673f0068f556ce
 EBUILD netbeans-cnd-9999_p20160329.ebuild 4790 SHA256 4d5333ecbc15f387317dd1a5f18e929cdd5ce598f157d0fdcf77ae3a10be9eb0 SHA512 46cbfa9fa42bab6cbfd38f4e8c651e3a48dbc9c508a843c85e775754d70c87b0312c6146ad6eaa4269c36588e73554e282395c7e96d46d0203975693e9307202 WHIRLPOOL b6b391d7479b9512f1d1e53d19d3b00c9903fd571e6b6e03945355932d51e601fc4c1e59710d5cd592cb15369f30f5b188ce4c91647c5b1c66d3f86d0c2f3a28
 EBUILD netbeans-cnd-9999_p20160331.ebuild 4790 SHA256 921daecbf10817366b6326312464146bb6af7d6e53068211831faf5b0ad644bb SHA512 e25b4805cda9a5f64a15946969d13f269e5454206e63a27420b1894143f9f70da6c992f1557c8a495074c0fed8eee19a09bf89812558290b0b277f52bd3f2818 WHIRLPOOL 6b2f89317b1c4625e19d5d2c78e7ccc01facbc2186a5af5241d652841e05484d1189e16ab923ef72e7223690f54ae19f1cbdccb5da3872ccf9833dd4aa5a599f

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160323.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160323.ebuild
deleted file mode 100644
index 9b85ce8..0000000
--- a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160323.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-03-23_00-01-48/zip/netbeans-trunk-nightly-201603230001-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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/38DAC4EB409E96D3AABD4D3F5807505BB751C043-clank_0.3.6.zip
-	http://hg.netbeans.org/binaries/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-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-r15-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}"/38DAC4EB409E96D3AABD4D3F5807505BB751C043-clank_0.3.6.zip libs.clank/external/clank_0.3.6.zip || die
-	ln -s "${DISTDIR}"/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-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-r15-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.1.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 4824a13..fd6c107 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -7,7 +7,6 @@ DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r15-build.xml.patch.bz2 2680 SHA256 d686f1e352eae400393577a456042f4475b9c321369101d2f05ec627aa61ef0c SHA512 7428b664749878fd1ead2c821277769a5af9636388515a4786284568ea656734ba2a9e90758385f5b6a0c009469df3dcc005936c8865c93cc9bc29576d2171e4 WHIRLPOOL fea09d3b1e2cc07e090a9618cbdaf6b2e3d4cab9679fdb4321a856922035871e485f492e6298e7e2562d8ecba626f2bdb3130f09840e83878e3c1e6fd6944899
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
 DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
 DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58600be3c4071f913d65b8a73ed4e4610f8890fe0fc7cf5cec7b SHA512 80b6c4987a553f651da90e1d3b690eb0f0892993c52d23d85047cad19fa9fecf107bfdddbb2615ece2ba2c41a157a59f5e0d7c0f79081ae4972b297b1a28547b WHIRLPOOL f9d7bf3d1291b3447221e23d775c6d0236b8f676d39ed1298f30f90d733c079515a1ea9b2abb6c7598d57da26d1698178937bbf54e1dfcca08dce9fa398771b1
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201604270002-src.zip 213361504 SHA256 7969b4b1058bfd
 DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247baa9620dae7672b3b27c8863c40f6d37ad5e6649fe6cf013752 SHA512 61af7c64fa9f0725752b28f78edc006362dbb9441f9c22d4f290c362ba76b94f34eaa3e0acac026f8e10f385c106dff33af0bc22673fec35f5e70528db001ed7 WHIRLPOOL 4021eee486a6e4fe4df381154d94caefdd74d725103aa3c996d64d159c433f49939a7abcce063ec130087cde2a7609750b98e69a3c3571171865eb6657c09b8d
 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_p20160323.ebuild 2968 SHA256 91643a3d24626b8209a58899f272f0776f882d7e1330ed76fe83a2a72b985eaa SHA512 aefd98a2a7b88b6a4edca6876be5c83dab37c86312e16a7d7feccaf7ce956a08ff3e8381aa753a6fdef4c35937b69540076d07bf8e0cdc492b738caa7995920e WHIRLPOOL f135a3b61b8d03d2e466089c6d7abe5acde926a1dd60490d69257dc3142da7715bcb4143b59b14dec27fa7bb99ad10a2bae59db2a84f8950283d6a2460ddc111
 EBUILD netbeans-dlight-9999_p20160324.ebuild 2968 SHA256 8fb715281d7de1790f70125e7c28d26d53fd09b315f5edc1f7cd932a1bfb32db SHA512 28f7a7697ad50ef0f4d4911a6e97c7b0cf7f6c8567aceb5cc570ea1ba0851da7bdc406914dc95f72b6085b8d60a05adb229e2d0a84a5e5b4e979ae58990a1fa5 WHIRLPOOL fb50116043f6877ce33c8711f03b7fedb031720df837ee0446ae016b6a9956c87dd0d9a7ff42aabd663a9deeb712c87964a30ab910004c168e0e892d8e33e89b
 EBUILD netbeans-dlight-9999_p20160329.ebuild 2968 SHA256 d408c3c49ef3e8fb3b20fcf752f17e16b848b5cfe7079492ecb13b2c5ceae885 SHA512 6543a4ca09fc73557f5fc5006c3a6e8d56e14cf0ec93e5d434a9ebc5b9aaed976a40e035a0844d8dd7ffca4384cacf0487ef329f9e949f2cb7c5fe15a259d5c4 WHIRLPOOL 5f8a29ffeef2d2a6d755f7b0a114f1031462cb987fa5c444b7a0a82c0c0a5578dace8236530c9dc7cda961406da2c7cb61c55e710704b438a86a4fcfeead459b
 EBUILD netbeans-dlight-9999_p20160331.ebuild 2968 SHA256 7a30d7daacf28a2d141b7246636a98b8e246f9fb6af9cd7ab0465b17200f54ad SHA512 70c11bae051303f177fc697d47a4c1e546886919a699b6923efdf74f0229c5ecc7eb05ee37d9eb8771a3a9a003bf986a694762509a827ea140f4eaba78ddec85 WHIRLPOOL bbd3f060138593ab7990fe1db23f81e7d154a3ff0b8fc79386a9d0f08acc70716ca855daa6eef4c280420b09e459524932caa8bd5319abaf6cf0728077e45062

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160323.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160323.ebuild
deleted file mode 100644
index 3a32828..0000000
--- a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160323.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-03-23_00-01-48/zip/netbeans-trunk-nightly-201603230001-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-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-r15-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 fe2588e..aa29e7a 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -36,7 +36,6 @@ DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r15-build.xml.patch.bz2 2680 SHA256 d686f1e352eae400393577a456042f4475b9c321369101d2f05ec627aa61ef0c SHA512 7428b664749878fd1ead2c821277769a5af9636388515a4786284568ea656734ba2a9e90758385f5b6a0c009469df3dcc005936c8865c93cc9bc29576d2171e4 WHIRLPOOL fea09d3b1e2cc07e090a9618cbdaf6b2e3d4cab9679fdb4321a856922035871e485f492e6298e7e2562d8ecba626f2bdb3130f09840e83878e3c1e6fd6944899
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
 DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
 DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58600be3c4071f913d65b8a73ed4e4610f8890fe0fc7cf5cec7b SHA512 80b6c4987a553f651da90e1d3b690eb0f0892993c52d23d85047cad19fa9fecf107bfdddbb2615ece2ba2c41a157a59f5e0d7c0f79081ae4972b297b1a28547b WHIRLPOOL f9d7bf3d1291b3447221e23d775c6d0236b8f676d39ed1298f30f90d733c079515a1ea9b2abb6c7598d57da26d1698178937bbf54e1dfcca08dce9fa398771b1
@@ -61,7 +60,6 @@ DIST netbeans-trunk-nightly-201604270002-src.zip 213361504 SHA256 7969b4b1058bfd
 DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247baa9620dae7672b3b27c8863c40f6d37ad5e6649fe6cf013752 SHA512 61af7c64fa9f0725752b28f78edc006362dbb9441f9c22d4f290c362ba76b94f34eaa3e0acac026f8e10f385c106dff33af0bc22673fec35f5e70528db001ed7 WHIRLPOOL 4021eee486a6e4fe4df381154d94caefdd74d725103aa3c996d64d159c433f49939a7abcce063ec130087cde2a7609750b98e69a3c3571171865eb6657c09b8d
 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_p20160323.ebuild 15825 SHA256 ff658282faaf219891dbf9a1c2d95320f26a084fe1b38d123a7154c54eca36e7 SHA512 cf018a3be15ed0a97f6d5c8b1be2155085c57cefb65853013c25e7b94fde6ffc4dbcf016a50a40712b8b41f5f57786a9017f4d1f53ea1ab400775e986c8270bf WHIRLPOOL 0a1e3d705a21e2ab915cdfef89f8f362cd220540130a1019116f7c31d0861c2de2dc0089679243fa5289151fa57208aeb9733e8a906c25cce621695fee0b31a8
 EBUILD netbeans-enterprise-9999_p20160324.ebuild 15825 SHA256 37728049eaa9e52e9b79c1483769163e770f4c2314805dbc83cd6d7d342406a5 SHA512 7d202a74a29f2e1548e7a078a485a8db9cdf007774517cba99defe203379353a229dce42787e6c71fad1fe1cc67ff0e69bfca23e0ceb6334d5f8cf1355396e1d WHIRLPOOL c541d6d79a12d6eecb3c1d0207bac6dda0ab7f8d06b5b80862352104dec0e3f11a4b46b038c297b45a3f40393fc6088630d5c48b8019de9d43711a78839278c5
 EBUILD netbeans-enterprise-9999_p20160329.ebuild 15825 SHA256 2ea849e62c0cbab8245d1bd586ecb01a7bd30643edf79a323fda308e45167912 SHA512 e58893fba0fd96ef6da5eff515b3e9b3cd29b10857f39c8639d089531e8c879460b5c1e9920391b61770f9842bda93553440d22d20b6bb3a9c07ce027d275d9a WHIRLPOOL b51afee9442614ae919bdca9523896be9ac352e8270d5e9ef7950ec13b6da8a7815f8b923c77ae6ad53cc4e79e26d13eb0941c79b58a4774a464417f3a5ae4d6
 EBUILD netbeans-enterprise-9999_p20160331.ebuild 15825 SHA256 664afb5530ce19dbaeaf8fe0ab2dd35708eb9d443655d417ab9f0f6317bc0d37 SHA512 3a08f139e98211dd8c80d99d256bff58694cfd76e45dc88bb05b6f500998782f8044f8c83c171aa643fc8f4226271e4a224df7e655d18fd20bf969e1db736b1f WHIRLPOOL 51d62c98206946c56e21d853261bd8a08556daa5597d817306e9d760894e1f82df78107e8dfdfb89fe6c21f79f9e3996bf5473661e9bf0dc180f580b13ecec41

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160323.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160323.ebuild
deleted file mode 100644
index dc3b6af..0000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160323.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-03-23_00-01-48/zip/netbeans-trunk-nightly-201603230001-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-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-r15-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 62b7fe0..456510d 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -4,7 +4,6 @@ DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r15-build.xml.patch.bz2 2680 SHA256 d686f1e352eae400393577a456042f4475b9c321369101d2f05ec627aa61ef0c SHA512 7428b664749878fd1ead2c821277769a5af9636388515a4786284568ea656734ba2a9e90758385f5b6a0c009469df3dcc005936c8865c93cc9bc29576d2171e4 WHIRLPOOL fea09d3b1e2cc07e090a9618cbdaf6b2e3d4cab9679fdb4321a856922035871e485f492e6298e7e2562d8ecba626f2bdb3130f09840e83878e3c1e6fd6944899
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
 DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
 DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58600be3c4071f913d65b8a73ed4e4610f8890fe0fc7cf5cec7b SHA512 80b6c4987a553f651da90e1d3b690eb0f0892993c52d23d85047cad19fa9fecf107bfdddbb2615ece2ba2c41a157a59f5e0d7c0f79081ae4972b297b1a28547b WHIRLPOOL f9d7bf3d1291b3447221e23d775c6d0236b8f676d39ed1298f30f90d733c079515a1ea9b2abb6c7598d57da26d1698178937bbf54e1dfcca08dce9fa398771b1
@@ -29,7 +28,6 @@ DIST netbeans-trunk-nightly-201604270002-src.zip 213361504 SHA256 7969b4b1058bfd
 DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247baa9620dae7672b3b27c8863c40f6d37ad5e6649fe6cf013752 SHA512 61af7c64fa9f0725752b28f78edc006362dbb9441f9c22d4f290c362ba76b94f34eaa3e0acac026f8e10f385c106dff33af0bc22673fec35f5e70528db001ed7 WHIRLPOOL 4021eee486a6e4fe4df381154d94caefdd74d725103aa3c996d64d159c433f49939a7abcce063ec130087cde2a7609750b98e69a3c3571171865eb6657c09b8d
 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_p20160323.ebuild 2913 SHA256 bed218767277e7c09f35753e37f5d6bc3eb7b6472d0ab86ff0b6a6dcb1bc3b3d SHA512 69840a6b0971ad77db60bfb34b59b3b33d355a1e98c8eac6d887429ae3cff4fa75521055f458cc47c9c35210e28ffafa6712634300ac626d4620939c97dcfa96 WHIRLPOOL d3cc043d84e34937ecb38ff653caeb817d26226b9c972d17d4e7e0723fd48a6e7e288e7dbfd07b42a53e8df4b86aeeb59d302e3d205013842f07b3a9922aabe9
 EBUILD netbeans-ergonomics-9999_p20160324.ebuild 2913 SHA256 e6c98bca21c43a04e9685d78b02deaeff6bff45126103b31618a0df224090830 SHA512 8d0076867f24cb09cea36a9348ff766351472efc39342a16209d43e98f5b400341a28fc753ead534d4f8540a1c025184c473b119973fdd6a00661a777cca4b79 WHIRLPOOL 3a48e023aaab8bca0d88e6d7bb50d1a713035d70e7db7f206e4d87140bafd700b815923e32b553b8cca57a30091ba6064ce121e987e34f5e1167207030b440cb
 EBUILD netbeans-ergonomics-9999_p20160329.ebuild 2913 SHA256 6a9e7506e25ea265e71e86742df6f05847bc47ec2af12448ab087ad236c0d511 SHA512 91e2130fcc32196e365e917126f6eaf3314ef667ab3ec1a840de55d04a199457536c3ed82b9351e0228f24ce2a7ee42b683a8b3a741acccd34433aad7f3a752e WHIRLPOOL abdae709ffc9cfbc4438dd2f5647f2135b5546706231d876fb96a66fa68198c2ae0b347fb93ba1aa1c352adbdfacd743c7f5bfdf29f8ab939eeca4b6bbe7940b
 EBUILD netbeans-ergonomics-9999_p20160331.ebuild 2913 SHA256 c479d5e94d109a7ccedfd8a68bf2ade843e166ba81e3285ea8635e8e2829c2dc SHA512 4dc28283f7b8fa6fe69c248fd5789a378bc8f9e3015f4249bb2c4a681325e4da8a230ff0922368f2c800a963b82f7aedc407af69b1027dfbab378c5a0de59bfb WHIRLPOOL e2046ebf24298c104d91421a82e5bff00503dec9ebcc3350af0a13b4e8c7247f4bf1c21f258d60bd2a5699e856270d52b19415fa2973701e8aa8c42d11a863c6

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160323.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160323.ebuild
deleted file mode 100644
index 77bc013..0000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160323.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-03-23_00-01-48/zip/netbeans-trunk-nightly-201603230001-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r15-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 cb24c2e..e9e6cbf 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r15-build.xml.patch.bz2 2680 SHA256 d686f1e352eae400393577a456042f4475b9c321369101d2f05ec627aa61ef0c SHA512 7428b664749878fd1ead2c821277769a5af9636388515a4786284568ea656734ba2a9e90758385f5b6a0c009469df3dcc005936c8865c93cc9bc29576d2171e4 WHIRLPOOL fea09d3b1e2cc07e090a9618cbdaf6b2e3d4cab9679fdb4321a856922035871e485f492e6298e7e2562d8ecba626f2bdb3130f09840e83878e3c1e6fd6944899
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
 DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
 DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58600be3c4071f913d65b8a73ed4e4610f8890fe0fc7cf5cec7b SHA512 80b6c4987a553f651da90e1d3b690eb0f0892993c52d23d85047cad19fa9fecf107bfdddbb2615ece2ba2c41a157a59f5e0d7c0f79081ae4972b297b1a28547b WHIRLPOOL f9d7bf3d1291b3447221e23d775c6d0236b8f676d39ed1298f30f90d733c079515a1ea9b2abb6c7598d57da26d1698178937bbf54e1dfcca08dce9fa398771b1
@@ -31,7 +30,6 @@ DIST netbeans-trunk-nightly-201604270002-src.zip 213361504 SHA256 7969b4b1058bfd
 DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247baa9620dae7672b3b27c8863c40f6d37ad5e6649fe6cf013752 SHA512 61af7c64fa9f0725752b28f78edc006362dbb9441f9c22d4f290c362ba76b94f34eaa3e0acac026f8e10f385c106dff33af0bc22673fec35f5e70528db001ed7 WHIRLPOOL 4021eee486a6e4fe4df381154d94caefdd74d725103aa3c996d64d159c433f49939a7abcce063ec130087cde2a7609750b98e69a3c3571171865eb6657c09b8d
 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_p20160323.ebuild 3377 SHA256 c583f98fb3dddfe84291425cc2475a5799f010089c83c7da06391d114fd87f58 SHA512 7ba61d1c8cf405daaf3da17d5a1f28c922c904852482e54c320281b78dc10f4c6531f0335d548fb563353aac976ca165b1603ceec24a54b773bb8d5408e3f513 WHIRLPOOL 95cfb50e92e1f654f70445a46b139385e716b2d170f6ddd1eb4e8f6aa724f1c9740dcac9d0f581165d41b8fe37e7f21366afb33b69386daeca4848721b41826c
 EBUILD netbeans-extide-9999_p20160324.ebuild 3377 SHA256 8148eecf86a1840a72a286808d9ad14afb1d0849666fdf0e496049824d6e2a97 SHA512 3ba646c52fb178d757d712f2734f2a3b706ca5cb90b96f5ae5434b11221d8ad7634b8525213f03a3deb751d165896dd59d71ae28bbd26b7bdc305be06ed11df2 WHIRLPOOL 2cd08fa3cf305bf6ef60a662a9dda4b4e2b6da471573ee8ecb3d78b08ad23ce29916e2757cfea5aa79c8e7dfe1800ac88064c4098d855d5c1c15f3c98b8452e0
 EBUILD netbeans-extide-9999_p20160329.ebuild 3377 SHA256 707875c5589aac9391e819c9cc4b3fa53e06231c64efbcd6e2c02b9db23a07db SHA512 dddd8959468d71dd3c68b7c3a992d667b579ada303fc950a47b03d7e31e9c07453ce1f4a8aea8883e73904c6809171f76723f61370ab3e41abb36ab91114c6ba WHIRLPOOL 564347e65a44b44dc5bcfdf21ec9ec4a82f7d7a8caeb769e7e8e26826563c1ac0e09ba4f0a0b87cae777e20bffc59de4c61b985292215be86e033e74e83cba81
 EBUILD netbeans-extide-9999_p20160331.ebuild 3377 SHA256 bb28509aea9cce9ac99156387388d0cd669f7961685e68fbad5b991e5a8d1a0c SHA512 89819c6b94c51a81e90933677bf73850bbab40c15b6e98dffa6427c3a420d1ffa5470158a7bf30b1cb17268f6604294c5a7eae764b1b480ace7a96209c449de6 WHIRLPOOL 80372be45a273006f12ac2181a69404fd60522e5b585585a600062ba6534e005baa56ed163328142d0a8d7c5775e3b232db2e9b286e8d7ebaf1dc28b24fbce7b

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160323.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160323.ebuild
deleted file mode 100644
index d0e0195..0000000
--- a/dev-java/netbeans-extide/netbeans-extide-9999_p20160323.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-03-23_00-01-48/zip/netbeans-trunk-nightly-201603230001-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip
-	http://hg.netbeans.org/binaries/95CCE237B1E9390FBED0440B601822813DB220E6-ant-misc-1.9.4.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-r15-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip o.apache.tools.ant.module/external/ant-libs-1.9.4.zip || die
-	ln -s "${DISTDIR}"/95CCE237B1E9390FBED0440B601822813DB220E6-ant-misc-1.9.4.zip o.apache.tools.ant.module/external/ant-misc-1.9.4.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r15-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 3ebf4b6..d877f34 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r15-build.xml.patch.bz2 2680 SHA256 d686f1e352eae400393577a456042f4475b9c321369101d2f05ec627aa61ef0c SHA512 7428b664749878fd1ead2c821277769a5af9636388515a4786284568ea656734ba2a9e90758385f5b6a0c009469df3dcc005936c8865c93cc9bc29576d2171e4 WHIRLPOOL fea09d3b1e2cc07e090a9618cbdaf6b2e3d4cab9679fdb4321a856922035871e485f492e6298e7e2562d8ecba626f2bdb3130f09840e83878e3c1e6fd6944899
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
 DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
 DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58600be3c4071f913d65b8a73ed4e4610f8890fe0fc7cf5cec7b SHA512 80b6c4987a553f651da90e1d3b690eb0f0892993c52d23d85047cad19fa9fecf107bfdddbb2615ece2ba2c41a157a59f5e0d7c0f79081ae4972b297b1a28547b WHIRLPOOL f9d7bf3d1291b3447221e23d775c6d0236b8f676d39ed1298f30f90d733c079515a1ea9b2abb6c7598d57da26d1698178937bbf54e1dfcca08dce9fa398771b1
@@ -31,7 +30,6 @@ DIST netbeans-trunk-nightly-201604270002-src.zip 213361504 SHA256 7969b4b1058bfd
 DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247baa9620dae7672b3b27c8863c40f6d37ad5e6649fe6cf013752 SHA512 61af7c64fa9f0725752b28f78edc006362dbb9441f9c22d4f290c362ba76b94f34eaa3e0acac026f8e10f385c106dff33af0bc22673fec35f5e70528db001ed7 WHIRLPOOL 4021eee486a6e4fe4df381154d94caefdd74d725103aa3c996d64d159c433f49939a7abcce063ec130087cde2a7609750b98e69a3c3571171865eb6657c09b8d
 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_p20160323.ebuild 3416 SHA256 cae40b6dee59adc072b92f47ca65705df610e33f52c4a5419b3f4a588d7092e6 SHA512 061b3da802905ec04e2162e3802957df73d2b753be7f0c8abd5db73a16e9b5a150589792e30d7b017c23b522774f424cb2b5d6f12ec7ffebceea8bebd5d6bbee WHIRLPOOL d2a7c2648c7bfa42e4d79caaf38bcc6afac696b7d35af4407925d61b13c72941ccd2f832a65802590655eb86ccad014584227695419cdcb529b3c868e218d161
 EBUILD netbeans-groovy-9999_p20160324.ebuild 3416 SHA256 d1b0eb9dae7d7c44940c1c75f1b912dab879aee4ab606d09f1f447c87f981d07 SHA512 67ad98d92f2580f51c88416b6ec452151f498ff466dd5330eb8a1336d56eaf6c82b2def4bb2b11a76591d94fe56fcff83c3cc5de58bccf9667707ff5aa9c9d8f WHIRLPOOL 8f1674becbb39da6a11341120d1880234e74b7f4f4fcf0b0d18f701d4fa57ecc3c826d23b0434290964f6621cb630349d903a44db76085bba221a978e7e7bda7
 EBUILD netbeans-groovy-9999_p20160329.ebuild 3416 SHA256 5b438c070b98dc3eedc28545213cd082974849344a0cc767158938ab2d7f75ac SHA512 848e80f70976a647cabdcf9addea2a4c083a220b6d942e3d8aad9d02c1f836fae80e2ce9574b5b5802c83dc591d194892863f9655b2cfffb3b12c7107d616760 WHIRLPOOL d3acbadda3a41be9aa4460f5d905a8e9102f7924b9ebc6b63283738f5d43712bbec5988a5e475f8e6dc8a26685d034f7c1c9bda893e24119ba9933dafb2e2736
 EBUILD netbeans-groovy-9999_p20160331.ebuild 3416 SHA256 98fd46f7cf8f374604d70a9c305475beeab177e9ddad38e1c2c1cd09856be0e0 SHA512 a17e75421aec81484b69286dc60a56bf0d2dd8223d1313385bbf8535ab4334eb8c93f8ac462d310d1802cdaee78569e4a7b0b06950bf4e344c1ab36c060a479a WHIRLPOOL 3bd0fa497efcd2e249d8241aff6be169a0e23f508ce4e50e15b0ade464bd70f1f08890642ad8be8cf244835e9ff8b29255f01d7d6f4069aa62f6dd298dd285e9

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160323.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160323.ebuild
deleted file mode 100644
index ad1add0..0000000
--- a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160323.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-03-23_00-01-48/zip/netbeans-trunk-nightly-201603230001-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-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-r15-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 e49ef3d..fdce3c1 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -9,7 +9,6 @@ DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r15-build.xml.patch.bz2 2680 SHA256 d686f1e352eae400393577a456042f4475b9c321369101d2f05ec627aa61ef0c SHA512 7428b664749878fd1ead2c821277769a5af9636388515a4786284568ea656734ba2a9e90758385f5b6a0c009469df3dcc005936c8865c93cc9bc29576d2171e4 WHIRLPOOL fea09d3b1e2cc07e090a9618cbdaf6b2e3d4cab9679fdb4321a856922035871e485f492e6298e7e2562d8ecba626f2bdb3130f09840e83878e3c1e6fd6944899
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
 DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
 DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58600be3c4071f913d65b8a73ed4e4610f8890fe0fc7cf5cec7b SHA512 80b6c4987a553f651da90e1d3b690eb0f0892993c52d23d85047cad19fa9fecf107bfdddbb2615ece2ba2c41a157a59f5e0d7c0f79081ae4972b297b1a28547b WHIRLPOOL f9d7bf3d1291b3447221e23d775c6d0236b8f676d39ed1298f30f90d733c079515a1ea9b2abb6c7598d57da26d1698178937bbf54e1dfcca08dce9fa398771b1
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201604270002-src.zip 213361504 SHA256 7969b4b1058bfd
 DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247baa9620dae7672b3b27c8863c40f6d37ad5e6649fe6cf013752 SHA512 61af7c64fa9f0725752b28f78edc006362dbb9441f9c22d4f290c362ba76b94f34eaa3e0acac026f8e10f385c106dff33af0bc22673fec35f5e70528db001ed7 WHIRLPOOL 4021eee486a6e4fe4df381154d94caefdd74d725103aa3c996d64d159c433f49939a7abcce063ec130087cde2a7609750b98e69a3c3571171865eb6657c09b8d
 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_p20160323.ebuild 4126 SHA256 64a3e3eee2f5b7a30ced6a751742f0018eb14556d27af01342869f4acc59d179 SHA512 217c9adf60a041d2e8924b4a76a54e6454e7d1e0577d7a3329b16bda8741026fbed47af84627b606178d8b6c9ae287e8ab05b79640a875568febf1ad5afae8b3 WHIRLPOOL 2b05a70fe465352ed4a785aa8c4e654fdead5c8a8ffca2822aa068f6cc096f5404769abd87920e14e59f8999384c611cb64702f9a6a8b6c2a7aeb1ed8c8c52bc
 EBUILD netbeans-harness-9999_p20160324.ebuild 4126 SHA256 7b33730ce7e775358592b3fd4a75f5508efcf5180ed3b619cdc7f46197a24b2d SHA512 c89f6b8e2a6e1db0537292fa8388821c00587e8c1f324a0a292fd0b07a52570ad3ef612d372527f215fdda8c181662be44cd7b50d095fb7fa1d77a227fd70363 WHIRLPOOL 31d32dbd1a313a478641a89ef289f82ab86bd33226ceec3035ec366de71d68c2fb546e95f2766d837fa0e892345632c3aa8e76fa2abb0a8c2e21ad71e3ad8289
 EBUILD netbeans-harness-9999_p20160329.ebuild 4126 SHA256 554e05f0c33d64d1e2e90fd8469828e6c2ff9c687244d280f30148bea2e7ba25 SHA512 9253104aff0393e09e80f98a4f2617561ebd34ed28cfadfc72d7ed342dcaef0ede7d0fa386301903f7e2a889745e1da3d1f6d41519d33744d4a0a4d59c899d92 WHIRLPOOL 5cb5b8defea45d709867274d6ea105ced205c89f1ad7dea54ddb7655b745cc3fb983ceb2a9efa13ce86da1c91a1cf137e3db9d86d2509a5669093fd88b94a5a8
 EBUILD netbeans-harness-9999_p20160331.ebuild 4126 SHA256 033231abaedbfc186f2256e717d200232cd78ee33d37e111a18076b643684217 SHA512 38e9323b896d093d77bb0f09f1329691edc120da8a455977742942abc2c8cc3d79fc2d1e9f8616da86efb0976a051807107af2b9e7657bb1633c158acde7157b WHIRLPOOL a50c2b4f2d05361457a4e2d3da08de0b74ac94639c5d449c81712fa05a74e1ed02903d0f5d4a8abca9dc390a85abd412a04a4d2b3488ab12503143a6c4657910

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160323.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160323.ebuild
deleted file mode 100644
index 42794ec..0000000
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20160323.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-03-23_00-01-48/zip/netbeans-trunk-nightly-201603230001-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-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-r15-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 023915f..7c08452 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -143,7 +143,6 @@ DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r15-build.xml.patch.bz2 2680 SHA256 d686f1e352eae400393577a456042f4475b9c321369101d2f05ec627aa61ef0c SHA512 7428b664749878fd1ead2c821277769a5af9636388515a4786284568ea656734ba2a9e90758385f5b6a0c009469df3dcc005936c8865c93cc9bc29576d2171e4 WHIRLPOOL fea09d3b1e2cc07e090a9618cbdaf6b2e3d4cab9679fdb4321a856922035871e485f492e6298e7e2562d8ecba626f2bdb3130f09840e83878e3c1e6fd6944899
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
 DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
 DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58600be3c4071f913d65b8a73ed4e4610f8890fe0fc7cf5cec7b SHA512 80b6c4987a553f651da90e1d3b690eb0f0892993c52d23d85047cad19fa9fecf107bfdddbb2615ece2ba2c41a157a59f5e0d7c0f79081ae4972b297b1a28547b WHIRLPOOL f9d7bf3d1291b3447221e23d775c6d0236b8f676d39ed1298f30f90d733c079515a1ea9b2abb6c7598d57da26d1698178937bbf54e1dfcca08dce9fa398771b1
@@ -168,7 +167,6 @@ DIST netbeans-trunk-nightly-201604270002-src.zip 213361504 SHA256 7969b4b1058bfd
 DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247baa9620dae7672b3b27c8863c40f6d37ad5e6649fe6cf013752 SHA512 61af7c64fa9f0725752b28f78edc006362dbb9441f9c22d4f290c362ba76b94f34eaa3e0acac026f8e10f385c106dff33af0bc22673fec35f5e70528db001ed7 WHIRLPOOL 4021eee486a6e4fe4df381154d94caefdd74d725103aa3c996d64d159c433f49939a7abcce063ec130087cde2a7609750b98e69a3c3571171865eb6657c09b8d
 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_p20160323.ebuild 30250 SHA256 2bda5de8b196a6ffed491baea0330ab492b40d95510c336705ee8738255365bd SHA512 dbc858271d0823a30357b958abd0ed1b8374a2b31f946d6902e5d520006d5d3f37903f6d058082af71c226fb4034cfe41f40d7f336d7cb5df2097aaca9a672f0 WHIRLPOOL 10b0beb0952f480a5e22e7e1ad09d266e7952f399458132e2e41693ef606df64f5743caadb7a1bb6053a4bf47f336479b6ea732f7104c1bb465215ca18d5f86b
 EBUILD netbeans-ide-9999_p20160324.ebuild 30250 SHA256 04d607de1b06ae0204605a9efdb571c3ce8cbf03bbff115f348b63312d905855 SHA512 5f7cad19077abe7a4ee7c379a94c28b876f8afa3f97118d4103593a3ad5c05d3f347f64819cce11028a5ccf5e0859de42fd8908c09cc99d74b06a33860665d4a WHIRLPOOL 191534270b75b92f56a8907aa25b3de604cfb18923f2b186c12eb80e0e3727e3aaa3d262279e65e7b79e55808223dd7f21a5d6eb7f4f4f0a2d710042f2c51a14
 EBUILD netbeans-ide-9999_p20160329.ebuild 30250 SHA256 6d14e82007f2246082db0d0e01bb93e578b0ff3f1b2a9aa68b83a4f8a18eb1a4 SHA512 08351979dd42e6f6d5d4ac383661eb0fb5d8b6716a32346270681fc58091b32115075c6ad4c1c6af153f5f2c55d4c3a4046af824fd21bba8b62537953880f5fa WHIRLPOOL fd35a92dd12cdff6145f19447d7666a2df19f8c206ef5bbda455d7019682b35bbce6bc3f90df9f426719d98f93492c1f513e22f1fb758dccdf60126596a46791
 EBUILD netbeans-ide-9999_p20160331.ebuild 30349 SHA256 9f7fe0cb8fd58d7b36ad257e754e3482ffe3549de82f076e834a83e6994240ff SHA512 4ef3b5ece6758b02719069e6adb1048dc24d0c483992429fdfea6dda852f34c4ed26b0aa616f7809bc16076cc0d2373bf1d6e20234b8b18614a08b62b3686f7f WHIRLPOOL d818eeefa3ea16a5263c362976d7baee3e41a6e542cce7c937a5d3076b6c5f61543aa12dd0f47f6ec21942e5156d2d5228b77d4007ff60da08627774d951014c

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

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 52004cc..917e924 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -40,7 +40,6 @@ DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r15-build.xml.patch.bz2 2680 SHA256 d686f1e352eae400393577a456042f4475b9c321369101d2f05ec627aa61ef0c SHA512 7428b664749878fd1ead2c821277769a5af9636388515a4786284568ea656734ba2a9e90758385f5b6a0c009469df3dcc005936c8865c93cc9bc29576d2171e4 WHIRLPOOL fea09d3b1e2cc07e090a9618cbdaf6b2e3d4cab9679fdb4321a856922035871e485f492e6298e7e2562d8ecba626f2bdb3130f09840e83878e3c1e6fd6944899
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
 DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
 DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58600be3c4071f913d65b8a73ed4e4610f8890fe0fc7cf5cec7b SHA512 80b6c4987a553f651da90e1d3b690eb0f0892993c52d23d85047cad19fa9fecf107bfdddbb2615ece2ba2c41a157a59f5e0d7c0f79081ae4972b297b1a28547b WHIRLPOOL f9d7bf3d1291b3447221e23d775c6d0236b8f676d39ed1298f30f90d733c079515a1ea9b2abb6c7598d57da26d1698178937bbf54e1dfcca08dce9fa398771b1
@@ -65,7 +64,6 @@ DIST netbeans-trunk-nightly-201604270002-src.zip 213361504 SHA256 7969b4b1058bfd
 DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247baa9620dae7672b3b27c8863c40f6d37ad5e6649fe6cf013752 SHA512 61af7c64fa9f0725752b28f78edc006362dbb9441f9c22d4f290c362ba76b94f34eaa3e0acac026f8e10f385c106dff33af0bc22673fec35f5e70528db001ed7 WHIRLPOOL 4021eee486a6e4fe4df381154d94caefdd74d725103aa3c996d64d159c433f49939a7abcce063ec130087cde2a7609750b98e69a3c3571171865eb6657c09b8d
 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_p20160323.ebuild 14930 SHA256 c6ce42878879b67b80dde5580208c87c15391646f3df1866e8e1c73a2213b1c7 SHA512 3fcba554c4d3f22c093082393974885a329bb2d7ac3c3b9559e3307946a9a67f6c44b45b321448fe68a0b1e47d0db2262b6c8c3dac7f2c1df6e63b2e7a8b2201 WHIRLPOOL 32802eb70b582d546ca3a955146f007e9c6ed0919bf965693ca0da2b4de98cf6dce16fc4964ed6c893e0356994744a35ecf19507026850490895c2af58764562
 EBUILD netbeans-java-9999_p20160324.ebuild 14930 SHA256 6d2d83b1a29b2b515be25315319dd88c8f2d549c9f3207ded042d87144add95e SHA512 b9c0abb6265b022ef28197ed0ec826ae2428d00e4f4a747178f8fa6f8c6232c5164cb621e338abe3ddca85822306a97a55a4189d16eb2c4315a134732d6a3f7b WHIRLPOOL 52bfc7c68a7aa73f62367b43c9ffd02714a3f12ec059239b8e2db9558e6107fddfa0bf52677bbc07614daa10036dc33f38daa4d53747cf56c80034c91032186c
 EBUILD netbeans-java-9999_p20160329.ebuild 14930 SHA256 b5130c99937fa3eace6917bf544981290651cd55749f5f60af944e50bc9822fe SHA512 3fb99d19f29835e9eebc58227a7e5d8bc4b3f078885f43f294bc00ce33f86c395e50ea72ea072bb103d1ac7e72487d6c347640a8cec0b6e44dc86cdfbb573453 WHIRLPOOL 78445a2941bc4e890ddf7888602ef4f81616d8c57f8b5f23e515e11347e6d6e90c3b73f278cb49a69b1f782f34901500c4a08e0a64627ff510e89145c020af43
 EBUILD netbeans-java-9999_p20160331.ebuild 14930 SHA256 3c03cb6543559f3d8160ef4c96f1216c18af1166c24cc2523761ec3a5fd6cca8 SHA512 5ea278df458500f0caf9b15ef739edd55941e87ca972e45a3a8aefe761fe6610c748a1eaccb59e5b0921ac2090e5012c98f2fd9b1cb579a9f1c7dee7e898b9fc WHIRLPOOL 771c6c67ee87d52fdd09375755624f5928313c1b9226ed28f9d3d4faf4ed82e9760b00bedcdaff25e7d2523368e7a0c2df559e5c325e080640e208d2566356a6

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160323.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160323.ebuild
deleted file mode 100644
index e83b25d..0000000
--- a/dev-java/netbeans-java/netbeans-java-9999_p20160323.ebuild
+++ /dev/null
@@ -1,274 +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-03-23_00-01-48/zip/netbeans-trunk-nightly-201603230001-src.zip"
-# jarjar-1.4 contains also asm libraries
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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/A53B309173366CAECC47E78F2B4B17121A9798CE-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/B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.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-r15-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}"/A53B309173366CAECC47E78F2B4B17121A9798CE-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}"/B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.jar maven.embedder/external/wagon-http-2.8-shaded.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r15-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 e0e051b..68a9754 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -7,7 +7,6 @@ DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r15-build.xml.patch.bz2 2680 SHA256 d686f1e352eae400393577a456042f4475b9c321369101d2f05ec627aa61ef0c SHA512 7428b664749878fd1ead2c821277769a5af9636388515a4786284568ea656734ba2a9e90758385f5b6a0c009469df3dcc005936c8865c93cc9bc29576d2171e4 WHIRLPOOL fea09d3b1e2cc07e090a9618cbdaf6b2e3d4cab9679fdb4321a856922035871e485f492e6298e7e2562d8ecba626f2bdb3130f09840e83878e3c1e6fd6944899
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
 DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
 DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58600be3c4071f913d65b8a73ed4e4610f8890fe0fc7cf5cec7b SHA512 80b6c4987a553f651da90e1d3b690eb0f0892993c52d23d85047cad19fa9fecf107bfdddbb2615ece2ba2c41a157a59f5e0d7c0f79081ae4972b297b1a28547b WHIRLPOOL f9d7bf3d1291b3447221e23d775c6d0236b8f676d39ed1298f30f90d733c079515a1ea9b2abb6c7598d57da26d1698178937bbf54e1dfcca08dce9fa398771b1
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201604270002-src.zip 213361504 SHA256 7969b4b1058bfd
 DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247baa9620dae7672b3b27c8863c40f6d37ad5e6649fe6cf013752 SHA512 61af7c64fa9f0725752b28f78edc006362dbb9441f9c22d4f290c362ba76b94f34eaa3e0acac026f8e10f385c106dff33af0bc22673fec35f5e70528db001ed7 WHIRLPOOL 4021eee486a6e4fe4df381154d94caefdd74d725103aa3c996d64d159c433f49939a7abcce063ec130087cde2a7609750b98e69a3c3571171865eb6657c09b8d
 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_p20160323.ebuild 4971 SHA256 304241fa6209ff3e1cf3bfc82965b593e706860bdc9fdbf898428725b602b014 SHA512 cb95ddafcda3a2f94f4535e9d106f2ccf3a23e027cea3f510aafb508c13e899132bec1f89512805515fbec872a917b197425c9e5db80cb4f5637a16b7ba731ea WHIRLPOOL 001a3357ef99f759d08eba878eeb9d1f829338ab21e5a0806d02477419081663708c98a9f7c2d56d5b97b67d1a9cf457f5917f0e247764910114d4b2e34cdeb8
 EBUILD netbeans-javacard-9999_p20160324.ebuild 4971 SHA256 fa4b9ae984e18ce3dbe111254d82bd64fd5465ce8d9bc8db8a59ce3d5f3ab940 SHA512 7063b2c576bbc77aa98284b0929aaa4e17ce8317d22087c858503dd1ac55d743c8e337488469da6d76b6055b088f279105cbcbac7cda136f54ef13fb587078d5 WHIRLPOOL a38a74b0cdf930f2313ac2746d91120855090d2e2f4aca96049dae5a492a2e29c93aa25e5de1d7d3cd1e5cd6432467336d822ee35bdb23333eba3589aef27268
 EBUILD netbeans-javacard-9999_p20160329.ebuild 4971 SHA256 05e935166a8e1155d8fbc78b06f19cc45b4425bab40cf2de1f73e76e69094cc0 SHA512 4f98bad550427586b746e58c76f8511433831c3566a25820fe0b028515feeda881c2647b03c28f02df2b7e170dcdd3b68022b8598240b4748a5cc87b875d4c34 WHIRLPOOL 61ec4cceb7ce93510f4827a87ac404d16f375ec7e1c621191057aed27681ae6390934b8c9831729efbb94f58073f914dcb7c6d630e9cb101d6f0595de6f67098
 EBUILD netbeans-javacard-9999_p20160331.ebuild 4971 SHA256 0f6aef9d90ac8cdcb28274f19eab7a662a2dcdfd6fb36e0d89679b66bbb9fdfc SHA512 da2388a9a002393762529bd0a1e0ffb4a85718e5d95a83a577ba29199edfc988c95b78f79868f97b373fefe8838acd8a72f54889700a771c117dadad26b5114b WHIRLPOOL cf633108473231a7b63e6a01507ee27708f00f314649b6558c9912996e24a5d7acc1c1dd13a372b170443d12f6a9966d03bb0b6a9a7866168cf21526df2cdd94

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160323.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160323.ebuild
deleted file mode 100644
index 254b7ff..0000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160323.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-03-23_00-01-48/zip/netbeans-trunk-nightly-201603230001-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-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-r15-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 27a5d36..ce400f6 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -5,7 +5,6 @@ DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r15-build.xml.patch.bz2 2680 SHA256 d686f1e352eae400393577a456042f4475b9c321369101d2f05ec627aa61ef0c SHA512 7428b664749878fd1ead2c821277769a5af9636388515a4786284568ea656734ba2a9e90758385f5b6a0c009469df3dcc005936c8865c93cc9bc29576d2171e4 WHIRLPOOL fea09d3b1e2cc07e090a9618cbdaf6b2e3d4cab9679fdb4321a856922035871e485f492e6298e7e2562d8ecba626f2bdb3130f09840e83878e3c1e6fd6944899
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
 DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
 DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58600be3c4071f913d65b8a73ed4e4610f8890fe0fc7cf5cec7b SHA512 80b6c4987a553f651da90e1d3b690eb0f0892993c52d23d85047cad19fa9fecf107bfdddbb2615ece2ba2c41a157a59f5e0d7c0f79081ae4972b297b1a28547b WHIRLPOOL f9d7bf3d1291b3447221e23d775c6d0236b8f676d39ed1298f30f90d733c079515a1ea9b2abb6c7598d57da26d1698178937bbf54e1dfcca08dce9fa398771b1
@@ -30,7 +29,6 @@ DIST netbeans-trunk-nightly-201604270002-src.zip 213361504 SHA256 7969b4b1058bfd
 DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247baa9620dae7672b3b27c8863c40f6d37ad5e6649fe6cf013752 SHA512 61af7c64fa9f0725752b28f78edc006362dbb9441f9c22d4f290c362ba76b94f34eaa3e0acac026f8e10f385c106dff33af0bc22673fec35f5e70528db001ed7 WHIRLPOOL 4021eee486a6e4fe4df381154d94caefdd74d725103aa3c996d64d159c433f49939a7abcce063ec130087cde2a7609750b98e69a3c3571171865eb6657c09b8d
 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_p20160323.ebuild 6293 SHA256 a0d7dfbb1f4ad34d6cfe54c149cdad842345449c3c640917bdbf96fa9b2e16e9 SHA512 09a676ab446a5b13157ca1290f034c8d85fc185f2fed5e62bbf2d47a005d5edad7fbe1df2c11e85e1267132d511ffef5237fa6dadc980f3688d108e199358406 WHIRLPOOL 4428da9319652f8000a3a83fefaf5eef6bb77364817c287c5565008962592074fb06e69f40b9d147ecfa7887f945d397a417e9e365fcc6c2bbefe08b6683652a
 EBUILD netbeans-javadoc-9999_p20160324.ebuild 6293 SHA256 8ad366e2a582d6278e1368fc110f6099445272bbcf88476f5296ec4149b4960d SHA512 a4f7fc8b05756d122a792ce2b6a8e2471185711b4c612d3434cd464dad9c8ddcf481fdeeb21645b607c4a4f002b0b444a6713b02b437d90f24fc3c199a98d9f6 WHIRLPOOL aba5fb3f4c6787673772306a653aeb979adfcdeeba1065bc41e3409f0006e5e35ac31e002684bfefa1b798bce29260e94a2ea5c8c3974dd17f29e00ff74de69f
 EBUILD netbeans-javadoc-9999_p20160329.ebuild 6293 SHA256 c2aa61de03070ede75a2b55ebc9227dea09dee2382762d87557a5d84a63ac8af SHA512 87b4db3bb2cf60834a9a59436ebb90a42ee1f62d700916d78ab4c8dc5d6b00f623efba0b8b32a574ee6aa22f622b0f004a9f3e8d2b911ac3644f833a18cf86eb WHIRLPOOL 0ddb5511d52baa63550345a2bbf4af0bca40533d2958bb07e8ae8e6a1733af77d1ce7b749fd3afc3bcf2e735eec7041adcab86daea0c2087f4ec50b5ad6920d0
 EBUILD netbeans-javadoc-9999_p20160331.ebuild 6293 SHA256 5dff3f1000550164027319085ba56d7fd9b8941e85c438470b2eb31c56007906 SHA512 af253885840701f8195c34d253bc580db31136c08299d494e4c17856df1410ba0a8baae732d385860b52de9dbba3266b6f0c8ecd657882a6adf843860ea38e69 WHIRLPOOL 991f887b5f04bb4f7047160c2dec7669f9a1a5d160bfda34ae232e84c57c89abee34719bab44161a0c983bc14b2de92c359473869b2a117261cbf4ed95bd2868

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160323.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160323.ebuild
deleted file mode 100644
index eed11f0..0000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160323.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-03-23_00-01-48/zip/netbeans-trunk-nightly-201603230001-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.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-r15-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip o.apache.tools.ant.module/external/ant-libs-1.9.4.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r15-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 93caab0..6361573 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -12,7 +12,6 @@ DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r15-build.xml.patch.bz2 2680 SHA256 d686f1e352eae400393577a456042f4475b9c321369101d2f05ec627aa61ef0c SHA512 7428b664749878fd1ead2c821277769a5af9636388515a4786284568ea656734ba2a9e90758385f5b6a0c009469df3dcc005936c8865c93cc9bc29576d2171e4 WHIRLPOOL fea09d3b1e2cc07e090a9618cbdaf6b2e3d4cab9679fdb4321a856922035871e485f492e6298e7e2562d8ecba626f2bdb3130f09840e83878e3c1e6fd6944899
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
 DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
 DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58600be3c4071f913d65b8a73ed4e4610f8890fe0fc7cf5cec7b SHA512 80b6c4987a553f651da90e1d3b690eb0f0892993c52d23d85047cad19fa9fecf107bfdddbb2615ece2ba2c41a157a59f5e0d7c0f79081ae4972b297b1a28547b WHIRLPOOL f9d7bf3d1291b3447221e23d775c6d0236b8f676d39ed1298f30f90d733c079515a1ea9b2abb6c7598d57da26d1698178937bbf54e1dfcca08dce9fa398771b1
@@ -37,7 +36,6 @@ DIST netbeans-trunk-nightly-201604270002-src.zip 213361504 SHA256 7969b4b1058bfd
 DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247baa9620dae7672b3b27c8863c40f6d37ad5e6649fe6cf013752 SHA512 61af7c64fa9f0725752b28f78edc006362dbb9441f9c22d4f290c362ba76b94f34eaa3e0acac026f8e10f385c106dff33af0bc22673fec35f5e70528db001ed7 WHIRLPOOL 4021eee486a6e4fe4df381154d94caefdd74d725103aa3c996d64d159c433f49939a7abcce063ec130087cde2a7609750b98e69a3c3571171865eb6657c09b8d
 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_p20160323.ebuild 4717 SHA256 acee79578d7f2ddc855790643f5c3cab5c04789a55609ee1748f112a28539bca SHA512 6ebf45a1e5db61d201d9131a1ce5b38105a2863b71b2ce8b8c6220d75505e874809f4a2f87ae7c0065458c896210b279d326cae108288797c0c23c84bda11c72 WHIRLPOOL f9a674934de5f0dc52a785884b0e7b746d9176f3d387ea3097e74ba8f8e093960ce5d5f7d2751caa05899e4d48773712283f68f5753b7a8bd300d984b04e135d
 EBUILD netbeans-javafx-9999_p20160324.ebuild 4717 SHA256 7aa6eaaef143638e949bb428afa2c01fe8b0a0df4e917bf58354c62dcea99582 SHA512 05c4d99f3cbe68fc9308a0289efad3ead6943de08d9ee2a632510491a4355452783daf2c5ae94b8f59a96c4e7d6541d95a377fcb820ec9c9de630cd460c5db9b WHIRLPOOL 3f7e4149b0c6eb55ec7d57f0b7f3b6698170b83778c8b3e81749fb1c5e7e66316b2f3406aa8cd5326063e762809d1839cea800522793e9f05d1323d9cf4c843c
 EBUILD netbeans-javafx-9999_p20160329.ebuild 4717 SHA256 4d939865949ce42fc60478a9795efdf59b3ff8b8022a03ada209029cc7b5b179 SHA512 8b74ef8017987be3ef086dd7dd03190b328f9f3c794d24641a7ed4b605cb301f9da6679d1848e0f1fd9707ba3cdf5cb67ef899280ee3b38c64e8435156b12550 WHIRLPOOL 265e288ee9608ab69fa1b749ebf513f4f6f7d2e3b416e670ffd4232e39acda5b76c71eedf7cc8d041fc8a508c65f00a2ccb96fa9ebed833a108bf7c01ae8f1a5
 EBUILD netbeans-javafx-9999_p20160331.ebuild 4717 SHA256 2dd090b16911c99b59dac9941202fff7415013d6d453b1ad27fc91353d4ba21d SHA512 a8c76f096cc668908149ce59c73126f567e02b631fb930f1733c424828cedf433f1f52e26fd4ff9918530cc0e90c573d97cfa7278035ad6e60325bcc8084ebf1 WHIRLPOOL 869022dd7bcefbf48c7c75a829249c07c819fd0014cc680b7198d55f50d6f56746f6b4c172e92e890cf08a6968252895480a7723dcab0d85d230ec24932b3f1a

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160323.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160323.ebuild
deleted file mode 100644
index 6eb09fc..0000000
--- a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160323.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-03-23_00-01-48/zip/netbeans-trunk-nightly-201603230001-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-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-r15-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 f831876..6892327 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -4,7 +4,6 @@ DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r15-build.xml.patch.bz2 2680 SHA256 d686f1e352eae400393577a456042f4475b9c321369101d2f05ec627aa61ef0c SHA512 7428b664749878fd1ead2c821277769a5af9636388515a4786284568ea656734ba2a9e90758385f5b6a0c009469df3dcc005936c8865c93cc9bc29576d2171e4 WHIRLPOOL fea09d3b1e2cc07e090a9618cbdaf6b2e3d4cab9679fdb4321a856922035871e485f492e6298e7e2562d8ecba626f2bdb3130f09840e83878e3c1e6fd6944899
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
 DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
 DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58600be3c4071f913d65b8a73ed4e4610f8890fe0fc7cf5cec7b SHA512 80b6c4987a553f651da90e1d3b690eb0f0892993c52d23d85047cad19fa9fecf107bfdddbb2615ece2ba2c41a157a59f5e0d7c0f79081ae4972b297b1a28547b WHIRLPOOL f9d7bf3d1291b3447221e23d775c6d0236b8f676d39ed1298f30f90d733c079515a1ea9b2abb6c7598d57da26d1698178937bbf54e1dfcca08dce9fa398771b1
@@ -29,7 +28,6 @@ DIST netbeans-trunk-nightly-201604270002-src.zip 213361504 SHA256 7969b4b1058bfd
 DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247baa9620dae7672b3b27c8863c40f6d37ad5e6649fe6cf013752 SHA512 61af7c64fa9f0725752b28f78edc006362dbb9441f9c22d4f290c362ba76b94f34eaa3e0acac026f8e10f385c106dff33af0bc22673fec35f5e70528db001ed7 WHIRLPOOL 4021eee486a6e4fe4df381154d94caefdd74d725103aa3c996d64d159c433f49939a7abcce063ec130087cde2a7609750b98e69a3c3571171865eb6657c09b8d
 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_p20160323.ebuild 4412 SHA256 2c08c29b61f44d19335f0bf220f7ec820b0192d0ca47d769c711a2d72ead05d0 SHA512 4b398ca24c711f2f1bcf1afc481ed4a280afd96cb80a12f110b0e0413fe9b16d2d256675a10d40b7e53b70715487af45717513300268b97cc15d76228300e212 WHIRLPOOL 8c18bd51f1b207fc4e50bc627cb4486eb214cac313445bebabb1219a77df8c9f373a4be08b8653fa42a17c7f271ba29d0adf305adba642f9ec7726e351bcc5d8
 EBUILD netbeans-mobility-9999_p20160324.ebuild 4412 SHA256 7fe3799569385c9d5b492d941cd6e1291be71122c1d041fa3e85cd3f21a67efb SHA512 98c7cfbb2591f306d7e1c5f5f5be0dcbfecb24dc2f6686450088e2613bb64ff8edb3f259fb84246f526dbd4bfdbd3004d3074578485add9b0c10d304cd18c951 WHIRLPOOL 8289df14147a5e400f3ce83c471413ee1d6e1e2890045c35680b3096203eb51e705d4ffa34c7a94c67ac8ffb65b5b82c548efd93df0b93729fea28077d738ac0
 EBUILD netbeans-mobility-9999_p20160329.ebuild 4412 SHA256 ada2e09f2e3bbb228882c05f85344ac4cb0bb57e16db30b9b13790db58ddaa64 SHA512 6c11ee026c449c23d36b36f120e5150e1e8758440489c80c8b253bd1e91ce36fe649bbced71ec20e9aafde7d0400df93e3550c43b1f5849f9475400b82f48a26 WHIRLPOOL 9e4aff71b105d8cdb7f0aa665963bc4226a84cbe419733b396aaa6b328a64c8e3a6209471ddcaa179eb7ec16a4af822fde9253f528c6759ce9e645ca92189441
 EBUILD netbeans-mobility-9999_p20160331.ebuild 4412 SHA256 1f21b389bbba1d8148c10c5117528c37be23b3d1c7dcb44a0e88e6200343ff5f SHA512 518c68779f2dafe526506b93be671db0ec5f419e24c2928db8e65b3ed960dbad328c8ecf6f7726e5ed8597b329bc8d0d05e30425dbc5cdd3fcc1764c820ff541 WHIRLPOOL 24a3917feb56d0672cb77394fb3334120a74ae3d8249e4062b610970a3b623002fdc9f7634c13aa5f987899e194e3e202c710bd0d2a705793f96b511c8d6b649

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160323.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160323.ebuild
deleted file mode 100644
index 9c0eef7..0000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160323.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-03-23_00-01-48/zip/netbeans-trunk-nightly-201603230001-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r15-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 94d19b8..1e0f142 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -7,7 +7,6 @@ DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r15-build.xml.patch.bz2 2680 SHA256 d686f1e352eae400393577a456042f4475b9c321369101d2f05ec627aa61ef0c SHA512 7428b664749878fd1ead2c821277769a5af9636388515a4786284568ea656734ba2a9e90758385f5b6a0c009469df3dcc005936c8865c93cc9bc29576d2171e4 WHIRLPOOL fea09d3b1e2cc07e090a9618cbdaf6b2e3d4cab9679fdb4321a856922035871e485f492e6298e7e2562d8ecba626f2bdb3130f09840e83878e3c1e6fd6944899
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
 DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
 DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58600be3c4071f913d65b8a73ed4e4610f8890fe0fc7cf5cec7b SHA512 80b6c4987a553f651da90e1d3b690eb0f0892993c52d23d85047cad19fa9fecf107bfdddbb2615ece2ba2c41a157a59f5e0d7c0f79081ae4972b297b1a28547b WHIRLPOOL f9d7bf3d1291b3447221e23d775c6d0236b8f676d39ed1298f30f90d733c079515a1ea9b2abb6c7598d57da26d1698178937bbf54e1dfcca08dce9fa398771b1
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201604270002-src.zip 213361504 SHA256 7969b4b1058bfd
 DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247baa9620dae7672b3b27c8863c40f6d37ad5e6649fe6cf013752 SHA512 61af7c64fa9f0725752b28f78edc006362dbb9441f9c22d4f290c362ba76b94f34eaa3e0acac026f8e10f385c106dff33af0bc22673fec35f5e70528db001ed7 WHIRLPOOL 4021eee486a6e4fe4df381154d94caefdd74d725103aa3c996d64d159c433f49939a7abcce063ec130087cde2a7609750b98e69a3c3571171865eb6657c09b8d
 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_p20160323.ebuild 4111 SHA256 0623097b6d76f3290926cb3660f7d32c333894a546bd0cf0d6c48a9ec7f8cc3c SHA512 f00bea390fbc4ef045609a3bbe6475aa5ceea8ec257d63b349cb37f8075eaa3ff991f49e5814a11e18f2f7c92bdebda6faa62cc2f05f98abf7264bb0a41532b8 WHIRLPOOL 62132505d1da38d702ea426d82940b85b0229529995e5352b6a67868a9a29d1aae88846aff1257f524e63fc2a8e7fc32b47ba1e601c5d09148d82a22fe80bf4c
 EBUILD netbeans-nb-9999_p20160324.ebuild 4111 SHA256 10e8e442718b389956aee352fb5d6a4a86c90037738e42d27e57b06e4dcc2193 SHA512 169f92c78c7b5cc03454c33d4d1872895b4d4f30bec8b90180b197a4af50862554226dd898708db5fb7c8ed507fc904b1f25aaadbacb2cf883f7d750c9c65abb WHIRLPOOL 3dd6231a22792d864b50fcb3271e2ebf65a460c88bf2548f689e57ca3dbad4cdd9248f40a9885694dcc69bcbea8139ec8d5e1c1c9a483f9465b6396d93ab7102
 EBUILD netbeans-nb-9999_p20160329.ebuild 4111 SHA256 76772682b35507ad629b6dce0d4f8565dd152de333a26921b30cd0a649aba7c1 SHA512 4243543e0f3f79cce79805602bcf9149a9d3310a8c9709e872c58b984ab56fb581827e7b6c656c3d6453f2185b97c390308d7b7b027d9b0cde43b0ce0605d844 WHIRLPOOL 89fa502a5bb2127f87264fa4e96012b8a8cc86666ba7e977c5a595af1d11d2dd16244288d9f1f1714859b932f616c0874c869b2367b4a5b1656840e16479858f
 EBUILD netbeans-nb-9999_p20160331.ebuild 4111 SHA256 499ea0dcc9529f0a80be56d8b83bfe5127c2389cf98725d64f16367046d8e378 SHA512 f717349fced9a89d4d649f9cd2d6be30023aae53657ae792a1400ef790cdcea8da0176d98910b227b4eb3b283a5cbf6cd244b52315d54e4b7b196ed4ecdcc9f1 WHIRLPOOL 287db5715e0b9259197f83dc5692b27bff7974816f0b673249e63ed2edd07a2fcfcd03c54123484dc0ad4c3c9b887aaa3d4eb879408f0d588fe82b608e8ad658

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160323.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160323.ebuild
deleted file mode 100644
index e98be0d..0000000
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20160323.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-03-23_00-01-48/zip/netbeans-trunk-nightly-201603230001-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r15-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 0d25370..a77d0be 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -8,7 +8,6 @@ DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r15-build.xml.patch.bz2 2680 SHA256 d686f1e352eae400393577a456042f4475b9c321369101d2f05ec627aa61ef0c SHA512 7428b664749878fd1ead2c821277769a5af9636388515a4786284568ea656734ba2a9e90758385f5b6a0c009469df3dcc005936c8865c93cc9bc29576d2171e4 WHIRLPOOL fea09d3b1e2cc07e090a9618cbdaf6b2e3d4cab9679fdb4321a856922035871e485f492e6298e7e2562d8ecba626f2bdb3130f09840e83878e3c1e6fd6944899
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
 DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
 DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58600be3c4071f913d65b8a73ed4e4610f8890fe0fc7cf5cec7b SHA512 80b6c4987a553f651da90e1d3b690eb0f0892993c52d23d85047cad19fa9fecf107bfdddbb2615ece2ba2c41a157a59f5e0d7c0f79081ae4972b297b1a28547b WHIRLPOOL f9d7bf3d1291b3447221e23d775c6d0236b8f676d39ed1298f30f90d733c079515a1ea9b2abb6c7598d57da26d1698178937bbf54e1dfcca08dce9fa398771b1
@@ -33,7 +32,6 @@ DIST netbeans-trunk-nightly-201604270002-src.zip 213361504 SHA256 7969b4b1058bfd
 DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247baa9620dae7672b3b27c8863c40f6d37ad5e6649fe6cf013752 SHA512 61af7c64fa9f0725752b28f78edc006362dbb9441f9c22d4f290c362ba76b94f34eaa3e0acac026f8e10f385c106dff33af0bc22673fec35f5e70528db001ed7 WHIRLPOOL 4021eee486a6e4fe4df381154d94caefdd74d725103aa3c996d64d159c433f49939a7abcce063ec130087cde2a7609750b98e69a3c3571171865eb6657c09b8d
 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_p20160323.ebuild 4418 SHA256 78af17d8ab7754bb43a899f0893624177e1e1c011d2c64868deeb3402f9ba9ee SHA512 8e88d0fb5b89a9b5546e3eeb22d78fa57a84ea9bac357b75e8add3e0a5367613e6af623df66e7eaf675018f21473264677adcdc0f73612d2f9754a7f35c5f8f5 WHIRLPOOL 635ba9612c20bf71236eb8481e1a69c835dfd24fc2d7f4331420f54c23a07a32361635512b25cd283b32cc54c7978555f59e25a42408827f8603623e3acc65d9
 EBUILD netbeans-php-9999_p20160324.ebuild 4418 SHA256 b0f98414bb7eca922a90d6881eea9c036bfd88db3bfbb272180a63104c1b0705 SHA512 b13d3e9b45aa5118350d15870edd543faea79bad4dc6e980ac951f9bad2b97a088130a750560969ddeafc01bfd4cb32a34659ea704c0a1e1c87d42d9421f05e5 WHIRLPOOL 61d2033daf1c4a34f6a2a9bb5bdc50ac6fbfab1ab2bde8022c87130dee0a81d55760b1cc2789c9f6ea0a1a076ee7bb4fb7e72098305b8383a07887e1e3ae2a12
 EBUILD netbeans-php-9999_p20160329.ebuild 4418 SHA256 819373c0d5d791ba49c87ed8164e8472788c20dc6fb4000d274b044dc0c8c40d SHA512 1dd59632f68ebacb49b6685c9767cd94d8760ebbcdb8aba9aa94a8ee0bf95578b56b9db7f2080d415bed7c2518d58de80ac7f7ad271d026a9feccbb37e5cdd9e WHIRLPOOL b5d380fe8cd2de24a73376e8d96dbdbf7b66ecba19fbb5c0055bb6d628e44ad7c5b0310ef325ec9f43beb729adc6be3464cc42559e960270ecc4a70abfbee345
 EBUILD netbeans-php-9999_p20160331.ebuild 4418 SHA256 225f8be498d1200e86f68bf8645dae9b7cdafa7ce93a989aac0aa0662488caa7 SHA512 053748fd70268bc260f6ae2257cbd993dc88598cb481f2e7034cecd355f533952366cc4b81d9e7167ed5fc668088e8bac3a8eea81c6eb3a57281c277513d2d7b WHIRLPOOL 01f7f2dc9b5858fbef362853d4a16fcb57af291e934a1a768f7e0c3998a88a1f634cb03f4ee3807672a1101ed8ce56a8d91ded50ca01c4dd8635dc1325fe7e36

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160323.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160323.ebuild
deleted file mode 100644
index 9448ef3..0000000
--- a/dev-java/netbeans-php/netbeans-php-9999_p20160323.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-03-23_00-01-48/zip/netbeans-trunk-nightly-201603230001-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip
-	http://hg.netbeans.org/binaries/73E9BC8A7AF36E0C95210F61A85AFEF212AEE1A9-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-r15-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}"/73E9BC8A7AF36E0C95210F61A85AFEF212AEE1A9-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-r15-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 5fb0260..904cf11 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -31,7 +31,6 @@ DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r15-build.xml.patch.bz2 2680 SHA256 d686f1e352eae400393577a456042f4475b9c321369101d2f05ec627aa61ef0c SHA512 7428b664749878fd1ead2c821277769a5af9636388515a4786284568ea656734ba2a9e90758385f5b6a0c009469df3dcc005936c8865c93cc9bc29576d2171e4 WHIRLPOOL fea09d3b1e2cc07e090a9618cbdaf6b2e3d4cab9679fdb4321a856922035871e485f492e6298e7e2562d8ecba626f2bdb3130f09840e83878e3c1e6fd6944899
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
 DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
 DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58600be3c4071f913d65b8a73ed4e4610f8890fe0fc7cf5cec7b SHA512 80b6c4987a553f651da90e1d3b690eb0f0892993c52d23d85047cad19fa9fecf107bfdddbb2615ece2ba2c41a157a59f5e0d7c0f79081ae4972b297b1a28547b WHIRLPOOL f9d7bf3d1291b3447221e23d775c6d0236b8f676d39ed1298f30f90d733c079515a1ea9b2abb6c7598d57da26d1698178937bbf54e1dfcca08dce9fa398771b1
@@ -56,7 +55,6 @@ DIST netbeans-trunk-nightly-201604270002-src.zip 213361504 SHA256 7969b4b1058bfd
 DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247baa9620dae7672b3b27c8863c40f6d37ad5e6649fe6cf013752 SHA512 61af7c64fa9f0725752b28f78edc006362dbb9441f9c22d4f290c362ba76b94f34eaa3e0acac026f8e10f385c106dff33af0bc22673fec35f5e70528db001ed7 WHIRLPOOL 4021eee486a6e4fe4df381154d94caefdd74d725103aa3c996d64d159c433f49939a7abcce063ec130087cde2a7609750b98e69a3c3571171865eb6657c09b8d
 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_p20160323.ebuild 9581 SHA256 730095d721f39328d68495a7f502926a74e84fa380fb77601a3262e6d92ea941 SHA512 8513599e2a2a702d1587f5e3d1029db274a097b5ee494864b99ecf77be56a178e7831a0d36220cd44f7403c705da59bc318d84687f5f137829bc9769d406655b WHIRLPOOL 7c4799c8bac08a30f1760e900a5fa11858481e240af05063f3af8c51ce7b23dbfaf5bfac74ee3a1ef6f5bbe9ef75e39f5553c66a7570ef877abc1739b70767ec
 EBUILD netbeans-platform-9999_p20160324.ebuild 9581 SHA256 79e91e77a24f99f831ff797b7ff20042e796d9f3757fc675acb07809a43e9473 SHA512 ffb2cd293239f5031979b96161f75b394fe48481e17f5dd4868b59b4381182f5434c6d9df33a7359a54fb9a2384f4a1a99f36638e2f195836917c0ef72c992a4 WHIRLPOOL f0b2434b81bb9d0197c2a88c72df03fdc1ac96bb59974314cbd954e95f3a2f1e3c1261a80b1341f13f0a452f9c3e9098ba6c7128e4077522e804dbe9e2d6f32a
 EBUILD netbeans-platform-9999_p20160329.ebuild 9581 SHA256 408ddbf6b99d3f4e6b25ee751a25c88d16bfd01f968152d8a428900099fd44fb SHA512 6f7492e0fc4b2c6085ee1d5ca602796d04b901beba99334f0e549e3bd429ba4403ba520cf9660be6f5cc0b98c46ce1aae742ce8d6c5de1cc7eda2df812635bd8 WHIRLPOOL ecad3d56c5520af9fc8aeb1bf20ec82dbac721a4e337a702cecc009252d0a7985207b5e41d4fa2de492346324e6dfeeaf59a0af1fc52a1e3bac3a422179cb25d
 EBUILD netbeans-platform-9999_p20160331.ebuild 9511 SHA256 479be994ae2dc8424d59e87c846d5ec52d39f016975499f14bbc0d3739d0ea97 SHA512 206e463a967b014575a03fc5aa9c1aa9696bcc7f96cd20dc6459da20113d249977e4db3675cf642b2a254bb12eaddad818e987350008a12414a08d6bf938eaf9 WHIRLPOOL 190334c1c89b943c807ba36a9be2385d9cea733a05224048bdd311516d963ff6dab256fe70dff422da0d26ed40e65769a8d13e9e41718ba438bbf90b06342d21

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160323.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160323.ebuild
deleted file mode 100644
index 1da7fff..0000000
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20160323.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-03-23_00-01-48/zip/netbeans-trunk-nightly-201603230001-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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/0388CADD903570B9FE30140C0EC39DC573389B33-jna-platform-4.2.1-patched.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-r15-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}"/0388CADD903570B9FE30140C0EC39DC573389B33-jna-platform-4.2.1-patched.jar libs.jna.platform/external/jna-platform-4.2.1-patched.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-r15-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.1.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.1.0.jar && java-pkg_jar-from --into "${instdir}" jna jna.jar jna-4.1.0.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 a7b28a3..639fdfe 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -4,7 +4,6 @@ DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r15-build.xml.patch.bz2 2680 SHA256 d686f1e352eae400393577a456042f4475b9c321369101d2f05ec627aa61ef0c SHA512 7428b664749878fd1ead2c821277769a5af9636388515a4786284568ea656734ba2a9e90758385f5b6a0c009469df3dcc005936c8865c93cc9bc29576d2171e4 WHIRLPOOL fea09d3b1e2cc07e090a9618cbdaf6b2e3d4cab9679fdb4321a856922035871e485f492e6298e7e2562d8ecba626f2bdb3130f09840e83878e3c1e6fd6944899
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
 DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
 DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58600be3c4071f913d65b8a73ed4e4610f8890fe0fc7cf5cec7b SHA512 80b6c4987a553f651da90e1d3b690eb0f0892993c52d23d85047cad19fa9fecf107bfdddbb2615ece2ba2c41a157a59f5e0d7c0f79081ae4972b297b1a28547b WHIRLPOOL f9d7bf3d1291b3447221e23d775c6d0236b8f676d39ed1298f30f90d733c079515a1ea9b2abb6c7598d57da26d1698178937bbf54e1dfcca08dce9fa398771b1
@@ -29,7 +28,6 @@ DIST netbeans-trunk-nightly-201604270002-src.zip 213361504 SHA256 7969b4b1058bfd
 DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247baa9620dae7672b3b27c8863c40f6d37ad5e6649fe6cf013752 SHA512 61af7c64fa9f0725752b28f78edc006362dbb9441f9c22d4f290c362ba76b94f34eaa3e0acac026f8e10f385c106dff33af0bc22673fec35f5e70528db001ed7 WHIRLPOOL 4021eee486a6e4fe4df381154d94caefdd74d725103aa3c996d64d159c433f49939a7abcce063ec130087cde2a7609750b98e69a3c3571171865eb6657c09b8d
 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_p20160323.ebuild 3472 SHA256 c2de8a0f149e8d1a7c99e4b8e637ead8f11b71c54687e5ae8e9f572507e6c627 SHA512 f998d4f56921170e937ad9b888e891e87c182db5a726644ea382aa219e069b515f10c429d79e7cd358cfb69a937c416bee10c635372074b5e7cfe01e6da1faaa WHIRLPOOL e6c48f5a04bef7b83c99060c104c799397de85461539f8d158a78cbffee114950d498d7d412d47d1ccf493945b3d6691a0721e64c742312d45c1ae6a75202245
 EBUILD netbeans-profiler-9999_p20160324.ebuild 3472 SHA256 168d3a2897c5239e5b89f7affa406260cd49bcf6ccee9d65ed21f89b885af6d0 SHA512 13e3fedf60c79689c8c73660dea081944a0fbe7c762a096579d097e17e6f6a315eed339d53e0a192e850a41b56830e3c6f1314d83601ef850239f3e9ea4372b9 WHIRLPOOL 441a214ba22467ac680643d1e3a8814662ab9001348a482912020fa768a657bc2025ab8c5d68193c34213217b4d4375a71ae1e2cb7a427980ba37939f0254c74
 EBUILD netbeans-profiler-9999_p20160329.ebuild 3472 SHA256 0e308bc5777440e00b2e6292a3eb23090c525799027c5bcf85df7aed10f3f24a SHA512 a1ec22a982ffca8075ebce0f3b54cbb2807a677ad77d2fd27eb32089ce5e9e61c7ef097d19423f4fc5494865fce471801ce15ee10d86c47f0c6b451f4630b02c WHIRLPOOL 9d50d36784cca80bb3d4fd24d41475395d68707fd4743a2af4d58ac890ad610a052c58a5d2a4c961f9bf21ebb183d1c367bafb6db9f30787579ae19909e15502
 EBUILD netbeans-profiler-9999_p20160331.ebuild 3472 SHA256 e90ec5c86ec4bde0b20c2234ee3df4c7ea1d4ef5bc34b4335f4f90ec886c4980 SHA512 1addd359d5c945d76a0237817139cd6eb3bf5b95617e9af27110b8417a4080650e152c8005b0e6fb5152387ecfb701f63e6f9aa10d4dcecb6a1e82324e4f63ce WHIRLPOOL 0a6bbe35065763f781de5c15ae22381d35c11d6dc6a4c962b164cbedbedaa6c4ca5d2d27f7235942e06a5a8673939344950ac6d5ed9c33aa9c30842d1177fc75

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160323.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160323.ebuild
deleted file mode 100644
index c7440da..0000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160323.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-03-23_00-01-48/zip/netbeans-trunk-nightly-201603230001-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r15-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 cea34e3..f932b00 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -19,7 +19,6 @@ DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r15-build.xml.patch.bz2 2680 SHA256 d686f1e352eae400393577a456042f4475b9c321369101d2f05ec627aa61ef0c SHA512 7428b664749878fd1ead2c821277769a5af9636388515a4786284568ea656734ba2a9e90758385f5b6a0c009469df3dcc005936c8865c93cc9bc29576d2171e4 WHIRLPOOL fea09d3b1e2cc07e090a9618cbdaf6b2e3d4cab9679fdb4321a856922035871e485f492e6298e7e2562d8ecba626f2bdb3130f09840e83878e3c1e6fd6944899
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
 DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
 DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58600be3c4071f913d65b8a73ed4e4610f8890fe0fc7cf5cec7b SHA512 80b6c4987a553f651da90e1d3b690eb0f0892993c52d23d85047cad19fa9fecf107bfdddbb2615ece2ba2c41a157a59f5e0d7c0f79081ae4972b297b1a28547b WHIRLPOOL f9d7bf3d1291b3447221e23d775c6d0236b8f676d39ed1298f30f90d733c079515a1ea9b2abb6c7598d57da26d1698178937bbf54e1dfcca08dce9fa398771b1
@@ -44,7 +43,6 @@ DIST netbeans-trunk-nightly-201604270002-src.zip 213361504 SHA256 7969b4b1058bfd
 DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247baa9620dae7672b3b27c8863c40f6d37ad5e6649fe6cf013752 SHA512 61af7c64fa9f0725752b28f78edc006362dbb9441f9c22d4f290c362ba76b94f34eaa3e0acac026f8e10f385c106dff33af0bc22673fec35f5e70528db001ed7 WHIRLPOOL 4021eee486a6e4fe4df381154d94caefdd74d725103aa3c996d64d159c433f49939a7abcce063ec130087cde2a7609750b98e69a3c3571171865eb6657c09b8d
 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_p20160323.ebuild 5244 SHA256 f5303885a1987ffaae129cc10e43eaefd6c7e70ff139282a9eb9e86e24b28985 SHA512 aa5b7b80a499943507d6c415b505c9b02881dbabe45947d84f5400c6d9330d9fa43e15bd135055339349e5a84d93f105335ce8e7a380f7b0bd794bd7f09ddda5 WHIRLPOOL 75a4ffd50ae4cf02d298b04f05d1a1726639e9591f1a3ba16e1ebef187373dd792795b1ab69fbe5c62679f0e3f2fda1a92c79f0a9bfb8988c496a61afa6de026
 EBUILD netbeans-webcommon-9999_p20160324.ebuild 5244 SHA256 68e47a383d63da8f7db9efb8ec10ef6d049b081a422ef7eec679ef8a03cdf7a6 SHA512 6edcf74c4ac94f73ccb999bbcef8039688e04aef9516e881db89cee7fb682ab3381563a19a26992f7539a57d7757e97c09a5e2fabcc41b89018cc1fd89d36001 WHIRLPOOL a01a4440d32f5271f8e1635f23763f4f5fa1a71c0904f2a78e61bbd88e2666bc45b5aeb514478e319ea57a100726525d6680b11d8fcedebdcae01587b6608050
 EBUILD netbeans-webcommon-9999_p20160329.ebuild 5244 SHA256 9574bd4be256af06ef0b45f848889458280dee5bb35e8ba5ba0355dee994978a SHA512 65c4c0bed434072db1450fde2a424df522a4ad15eadb1de47ac0af740b6609e2491f3a679a2960f845390f205c431bee994fd776a4ed1cad3aa394dfab24296a WHIRLPOOL 5776a1a76517782efcd4fd7fc817e0bf541fea1c5565351c7c4516e6f78a90f90c5b77a2a57e8f1d81f51a6703a81a38351ee9bbfab01aea3f991934b11696a8
 EBUILD netbeans-webcommon-9999_p20160331.ebuild 5343 SHA256 7974e89d7efbc401e5b1e073ac3d02edb1aa34ad634115883c96e670f48eee87 SHA512 63b5443a83be95b11890c7af0eeca21fb5ab064fc264d5c26d674ab2ea59353706ae4778ed43f90984c6699f2b98ff5777c8dd685d81f4a47fbf22092e4c6c2e WHIRLPOOL 037d3eec820e9496134bb508cb1ed8321e83723a8ab166f9abb5f759d142a7acd0bec1f443d54a54d9211838dd7e7be41a33d1b3ffcc6751e05649217ba2ad3e

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160323.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160323.ebuild
deleted file mode 100644
index 5bf6c73..0000000
--- a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160323.ebuild
+++ /dev/null
@@ -1,122 +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-03-23_00-01-48/zip/netbeans-trunk-nightly-201603230001-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar
-	http://hg.netbeans.org/binaries/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim
-	http://hg.netbeans.org/binaries/0929AC5F40B5A8667021408748D64F30F77B3165-libiDeviceNativeBinding.dylib
-	http://hg.netbeans.org/binaries/2A38DA3DB5D36DBBDC0B03990B46810F72430D5E-libimobiledevice.4.dylib
-	http://hg.netbeans.org/binaries/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib
-	http://hg.netbeans.org/binaries/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar
-	http://hg.netbeans.org/binaries/C1BB9FF4232248B0054E5A26A33474A251EA19CB-libusbmuxd.2.dylib
-	http://hg.netbeans.org/binaries/D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip
-	http://hg.netbeans.org/binaries/1EFED55F8C442E4DB1C2338A5C35D494364F9ECD-ojetdocs-1_1_2.zip
-	http://hg.netbeans.org/binaries/CA8F6968FED0BE20E786C70CF9B603F4D7B66C68-ojetdocs-2_0_0.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-ide-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-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-r15-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar libs.plist/external/dd-plist.jar || die
-	ln -s "${DISTDIR}"/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim cordova.platforms.ios/external/ios-sim || die
-	ln -s "${DISTDIR}"/0929AC5F40B5A8667021408748D64F30F77B3165-libiDeviceNativeBinding.dylib cordova.platforms.ios/external/libiDeviceNativeBinding.dylib || die
-	ln -s "${DISTDIR}"/2A38DA3DB5D36DBBDC0B03990B46810F72430D5E-libimobiledevice.4.dylib cordova.platforms.ios/external/libimobiledevice.4.dylib || die
-	ln -s "${DISTDIR}"/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib cordova.platforms.ios/external/libplist.1.dylib || die
-	ln -s "${DISTDIR}"/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar libs.jstestdriver/external/libs.jstestdriver-ext.jar || die
-	ln -s "${DISTDIR}"/C1BB9FF4232248B0054E5A26A33474A251EA19CB-libusbmuxd.2.dylib cordova.platforms.ios/external/libusbmuxd.2.dylib || die
-	ln -s "${DISTDIR}"/D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip html.ojet/external/ojetdocs-1_0_0.zip || die
-	ln -s "${DISTDIR}"/1EFED55F8C442E4DB1C2338A5C35D494364F9ECD-ojetdocs-1_1_2.zip html.ojet/external/ojetdocs-1_1_2.zip || die
-	ln -s "${DISTDIR}"/CA8F6968FED0BE20E786C70CF9B603F4D7B66C68-ojetdocs-2_0_0.zip html.ojet/external/ojetdocs-2_0_0.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r15-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-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 3556bdd..047b860 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -4,7 +4,6 @@ DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r15-build.xml.patch.bz2 2680 SHA256 d686f1e352eae400393577a456042f4475b9c321369101d2f05ec627aa61ef0c SHA512 7428b664749878fd1ead2c821277769a5af9636388515a4786284568ea656734ba2a9e90758385f5b6a0c009469df3dcc005936c8865c93cc9bc29576d2171e4 WHIRLPOOL fea09d3b1e2cc07e090a9618cbdaf6b2e3d4cab9679fdb4321a856922035871e485f492e6298e7e2562d8ecba626f2bdb3130f09840e83878e3c1e6fd6944899
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
 DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
 DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58600be3c4071f913d65b8a73ed4e4610f8890fe0fc7cf5cec7b SHA512 80b6c4987a553f651da90e1d3b690eb0f0892993c52d23d85047cad19fa9fecf107bfdddbb2615ece2ba2c41a157a59f5e0d7c0f79081ae4972b297b1a28547b WHIRLPOOL f9d7bf3d1291b3447221e23d775c6d0236b8f676d39ed1298f30f90d733c079515a1ea9b2abb6c7598d57da26d1698178937bbf54e1dfcca08dce9fa398771b1
@@ -29,7 +28,6 @@ DIST netbeans-trunk-nightly-201604270002-src.zip 213361504 SHA256 7969b4b1058bfd
 DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247baa9620dae7672b3b27c8863c40f6d37ad5e6649fe6cf013752 SHA512 61af7c64fa9f0725752b28f78edc006362dbb9441f9c22d4f290c362ba76b94f34eaa3e0acac026f8e10f385c106dff33af0bc22673fec35f5e70528db001ed7 WHIRLPOOL 4021eee486a6e4fe4df381154d94caefdd74d725103aa3c996d64d159c433f49939a7abcce063ec130087cde2a7609750b98e69a3c3571171865eb6657c09b8d
 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_p20160323.ebuild 2721 SHA256 711867c40a107ccc31f760f1bb5cd3957463dacf73941f56a6b1f0ae6f51dc63 SHA512 4928f51238e92f1ef03b72e91b5af73712c6afe2e10482bfe201d5d66a10d3602b12f4ebbf573a24c6bb3fbb4cf1d07c008b54c86b53738267d7f75070d83843 WHIRLPOOL 06ebddd26c8cfb1ae6bee59553c2e5e9d122a2df58b61e9380eb4dc982cd0661a24d27dd96decf56efe5f0d0c71d072f9fb912902471129b49a40bf3025b38d0
 EBUILD netbeans-websvccommon-9999_p20160324.ebuild 2721 SHA256 6f92ed2c034b804b696299c9ddd0aa4b979a3b25c6dd823691e3b954be5b7d39 SHA512 d00031236e9b41eee02b1d7a341dae013f2703ed92da99c0da1c0aa3c9a457e3a81192c07be1a0de7c85a39b9742250154a54f5d00a0b6099ad3e681d7e3f1d1 WHIRLPOOL a49ca571afd94a384bc44c0acc13e8ebe6323cd6dc10263c665b2fd67652918d5f55767e291c6c31ef24bf654792219ea7efb8b94a5cd903c24705aa79490911
 EBUILD netbeans-websvccommon-9999_p20160329.ebuild 2721 SHA256 fb51b0a08b8465241559bfebf5095a411373358181eeac146ec70a4c3f33320f SHA512 f7e9e77887499aa7c7b50daeb9e7268149bd10c795271cd21604c55334c2b8d2fa998e577ba6405442dcb29310a319ab20957cab84434308ec74d607a0f03f1f WHIRLPOOL 438e98bd55965923bf88fba5d4f21a4399e556596c70056289d1ec176811e15a8016e5d33eb83f37ab07bfc80f7ac8198211244fae6bd2f78927283862d53589
 EBUILD netbeans-websvccommon-9999_p20160331.ebuild 2721 SHA256 c3612d88add231f068655d872dd3a1ea8c1019804965887eb78a958bb16458e7 SHA512 a8bb3c1f6690854ca7013bb1dd6d8d8c4a141be6eb4144f44de3b661a71049c90339a391f4c306f49eb18b78168bcdd27edff18ec539758ad52546001b255800 WHIRLPOOL 27f72fe8bc0bbeaa8dc00e8db51f46b2a7fcb393ea757c55230ea42005d5a66f812d1385fbfe7f549672c557cd9edeb75c3533abc0017fba48cad87cbf083bfb

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160323.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160323.ebuild
deleted file mode 100644
index 6abb716..0000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160323.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-03-23_00-01-48/zip/netbeans-trunk-nightly-201603230001-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r15-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 e3dbe25..c262281 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -7,7 +7,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-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
 DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
 DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58600be3c4071f913d65b8a73ed4e4610f8890fe0fc7cf5cec7b SHA512 80b6c4987a553f651da90e1d3b690eb0f0892993c52d23d85047cad19fa9fecf107bfdddbb2615ece2ba2c41a157a59f5e0d7c0f79081ae4972b297b1a28547b WHIRLPOOL f9d7bf3d1291b3447221e23d775c6d0236b8f676d39ed1298f30f90d733c079515a1ea9b2abb6c7598d57da26d1698178937bbf54e1dfcca08dce9fa398771b1
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201604270002-src.zip 213361504 SHA256 7969b4b1058bfd
 DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247baa9620dae7672b3b27c8863c40f6d37ad5e6649fe6cf013752 SHA512 61af7c64fa9f0725752b28f78edc006362dbb9441f9c22d4f290c362ba76b94f34eaa3e0acac026f8e10f385c106dff33af0bc22673fec35f5e70528db001ed7 WHIRLPOOL 4021eee486a6e4fe4df381154d94caefdd74d725103aa3c996d64d159c433f49939a7abcce063ec130087cde2a7609750b98e69a3c3571171865eb6657c09b8d
 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_p20160323.ebuild 6939 SHA256 2058f071a7fc4ac7bcaaad80217741227698a3567c1f16221d44841e91ef6c95 SHA512 aeb4f33680687e96fceccc9d720d473f987b952a331e311bbd088bb1810bd4d3a2498f2ca1722ac0e3ec900faa7b8add4aaa68ea4fe803e61be8deb4d6692e36 WHIRLPOOL 880154f5145d6a7d6d0c8ca1b6071e14c038101b37fa9c7ed785c3afc0c9edde2cf1496181b3424035d1bb957dfe8598435d8cf1a41e6dcba4bb63d933f24a9f
 EBUILD netbeans-9999_p20160324.ebuild 6939 SHA256 6b17d7a80c248d7a2c3ce8e393b1aa57fcec9b09a246ca45e08e4ba1b9443b3b SHA512 e336f58f4dda5631c1461c15e8955e4c59e8f026446db1c44ab5da7089eb462d87cd45428d1f26bf0cf474f2c1c256de29716561b451f85ed63d2a0654b2e017 WHIRLPOOL fa88ec5604daf7f59a3295be11f49617dd36c79ca4bb1edeaea385baedd0eee87d763a2fee5080a02edec03679f60ee5d019ce308c0e52af19d5146429c4fe4b
 EBUILD netbeans-9999_p20160329.ebuild 6939 SHA256 a95ba6f56fa964c2d5f1cd023c56b1d2ce7b7b5fc25854998fef25706f762ca3 SHA512 4db2b9cee4fa4f1e0e5dfee7958b47e445448db4b926f15af92708d3f1a8c1f5e98cd76a2e29503e4636a2d0e55b25ffecadef7a0dbf652870e50ebe96d2f64c WHIRLPOOL 934fb6887354027586c36233ae42d1fcf455b27730026585d5538da3d6bdabe0e4e32700a764ef0588e9f588cc763a495c41a19e5ab0fb01a5d2e5f4e8322fe8
 EBUILD netbeans-9999_p20160331.ebuild 6939 SHA256 4b7a7964372c76649a31bee97a072fc041adf666f9782bdd93e9047a5a4add17 SHA512 a5d93431ec61d541047bf6a542f77ec4f1bdd1c1c802b41da6c4fa7af893c676e6ec97c937e75275a6c34df8e53df676ec27e81a71b2b5b0bc05aebe423ed0ab WHIRLPOOL b13ac860c7308d94c1fcc485502754cf71f6d8730d06d902c0076679b1bfd463bfead2adffe7fdaf0aa84bcaca17417e5275a85ff51a496d34f84273002d0916

diff --git a/dev-util/netbeans/netbeans-9999_p20160323.ebuild b/dev-util/netbeans/netbeans-9999_p20160323.ebuild
deleted file mode 100644
index 90974ce..0000000
--- a/dev-util/netbeans/netbeans-9999_p20160323.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-03-23_00-01-48/zip/netbeans-trunk-nightly-201603230001-src.zip"
-PATCHES_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-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-r15-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
-}