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

[Miroslav Šulc]

commit:     1a238a673fe05862f978bb33a79fe18a02121768
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  1 08:53:56 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Jun  1 08:53:56 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=1a238a67

netbeans: removed obsolete ebuilds

Package-Manager: portage-2.3.0_rc1

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index ec85c7d..df83e48 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201605010002-src.zip 213455252 SHA256 a7b4106579fbeddedac626ccd40f58b1ddc18259470a5166bde4959c25a346e9 SHA512 a10b319508becdd5af6e11db80443099997276faad942d22f24513d131c4627d38fcfa1facc74ad3d7ebe2625592e1797de1cbc1988e4d5eb75f2fad178f947a WHIRLPOOL 46c57850d95b3329747584e59389560dc678f1124bf5ff438068c1a04116970342fae1aa34e5ccb3607e068f91e7e6e0f45f7749b8c5a67fec0da55e885ab746
 DIST netbeans-trunk-nightly-201605020002-src.zip 213470717 SHA256 8c1cde7797484c52ae985c6530de6c6974c57d161647a32f642477c86801b3b4 SHA512 b0bdaf6d39d979a1b8bb41088ffe3780630daf3eeb7729b705a09a522bf91717ea4bd5e658aa8d144da96f98a0ea52747f15f9f073c22b67f8ddffb2a2bcf474 WHIRLPOOL 20909f886215edac9c8377d3ee7d1270942848eb94a083f0601d6c328e004f6a1bf87c2d153d739a63278274a71cebb2de00d9bf4b05707c60557cb400bfbc06
 DIST netbeans-trunk-nightly-201605030002-src.zip 213470987 SHA256 8b9ab96283609fdfc78049ea636a19a1fb2677e4edcbb35ec7d94e0caf1284f8 SHA512 e79b403d69494721e8e86582886fbb4a5a2c31f98dce774c5a6a0863578dd0539cd86ee4a7fcca1c5ec2ef6c7cfbe7b8f07baefb3edc739f040c994f56ce514b WHIRLPOOL ddedf8c5cfd452f3a2dbd0fa852f9d466d2b94f677856ac811628de771badc2ea7d9c89e9689d32048e19bc3cb97507de4ace8c783560c77d1072bca2f96f829
 DIST netbeans-trunk-nightly-201605040002-src.zip 213470987 SHA256 432c7c5f60ad6fc195670d1f5aa4e901bde3538ea8d39fd0f66adf0a08fb4ecb SHA512 da79460085abe594e24f5b6a38507c3e73d8d94efd864701aba78747e54e5cdb9ed7a8a2e685c1a8ff2083cde142029e23bc36732dcc841128bf367d945ee906 WHIRLPOOL 994721d231ae5258710349c5f463d538ba345a23cfc22da4b15079277a8cf4103dd6a0bcf8f008aa0a47377ebadac7c74271ea10a2274f1f74a85ad4ab0a9e78
@@ -29,7 +28,6 @@ DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec3
 DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 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_p20160501.ebuild 3384 SHA256 68a8f3a6cdb09fa119f1d6ebe29cfb94ce84c132f16b51e16f87639df1520485 SHA512 5a77a93c31edafb59e9032b7496aafe032e93a9eb5fcbf1a33feeb878f409b0dc1681ff481604cf1dd4e0ad4ff53617add481e31f7c9dbce7d3364c5acd64937 WHIRLPOOL 4e1582856bdc4d46fe8bc635d92d7b7a5c62191ac77543d9eb8fe3239e8280f3d8616919d94956c249d894359749552a3ccbf79c2bc82dfa48ef5f1a62192508
 EBUILD netbeans-apisupport-9999_p20160502.ebuild 3384 SHA256 214bebcbf3fd1f73dd51995e6afc1df39c338a64c3153a256213414f684b426e SHA512 fce2da6103e7e2578762a1e13fef9ef438e5505b8d46e87621b7e3b72b45962ec3d86244692613a5f69f1a22beae5815d9a44016db7f454aef1def0b7458c9e5 WHIRLPOOL 12908a5203ce6ddbab9392cc12451588103f553ac0ad83011cab5e8a85ac933c2b13f4ec41ae7ed210c40285b02358fe342f1fe0e6b83bf6291df75cbace7f16
 EBUILD netbeans-apisupport-9999_p20160503.ebuild 3384 SHA256 6b76bfffc6277e2ebe814a8dab0ee45cf880fb59205beea73bbc125f39eff193 SHA512 b6723ba3e41ca74210d50442ba17129b1b7c268ca74406bb5881f5485c71ed331c3d310c7ecf3dae5e0cba2601ce65891625847b6c512f04cfb7b88fbad4e574 WHIRLPOOL 5922913c35d428af6726adf3f228e14ad5bae250bf693bb0947e067ba812e35ba750edbcb28f5f65f65c8e22d331c8faa60571a27febb8a2f256c436f9d073b8
 EBUILD netbeans-apisupport-9999_p20160504.ebuild 3384 SHA256 b538e26b62174ce9bd4ea5ce4cb0b7d9303456db2e80692e8872e428b1c2c23b SHA512 2c5e18afe91dbedf684b349f9529e0595fdda97d0cf9cde80ce7435f1794bd984ac4d8f415a23b37fef1e5acf9ec5c818c854a2f8c5c19dd8ce7807ed220ef72 WHIRLPOOL d31ad9bdd382927e791f42b8c9694a4f56cae2d8eb77bdd19864411c7b628ae18d20537ba95efa793b7072973025a6a83967d186e2738129ccb747a58b5c31f8

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

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index f7f7faf..714f8d9 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -16,7 +16,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201605010002-src.zip 213455252 SHA256 a7b4106579fbeddedac626ccd40f58b1ddc18259470a5166bde4959c25a346e9 SHA512 a10b319508becdd5af6e11db80443099997276faad942d22f24513d131c4627d38fcfa1facc74ad3d7ebe2625592e1797de1cbc1988e4d5eb75f2fad178f947a WHIRLPOOL 46c57850d95b3329747584e59389560dc678f1124bf5ff438068c1a04116970342fae1aa34e5ccb3607e068f91e7e6e0f45f7749b8c5a67fec0da55e885ab746
 DIST netbeans-trunk-nightly-201605020002-src.zip 213470717 SHA256 8c1cde7797484c52ae985c6530de6c6974c57d161647a32f642477c86801b3b4 SHA512 b0bdaf6d39d979a1b8bb41088ffe3780630daf3eeb7729b705a09a522bf91717ea4bd5e658aa8d144da96f98a0ea52747f15f9f073c22b67f8ddffb2a2bcf474 WHIRLPOOL 20909f886215edac9c8377d3ee7d1270942848eb94a083f0601d6c328e004f6a1bf87c2d153d739a63278274a71cebb2de00d9bf4b05707c60557cb400bfbc06
 DIST netbeans-trunk-nightly-201605030002-src.zip 213470987 SHA256 8b9ab96283609fdfc78049ea636a19a1fb2677e4edcbb35ec7d94e0caf1284f8 SHA512 e79b403d69494721e8e86582886fbb4a5a2c31f98dce774c5a6a0863578dd0539cd86ee4a7fcca1c5ec2ef6c7cfbe7b8f07baefb3edc739f040c994f56ce514b WHIRLPOOL ddedf8c5cfd452f3a2dbd0fa852f9d466d2b94f677856ac811628de771badc2ea7d9c89e9689d32048e19bc3cb97507de4ace8c783560c77d1072bca2f96f829
 DIST netbeans-trunk-nightly-201605040002-src.zip 213470987 SHA256 432c7c5f60ad6fc195670d1f5aa4e901bde3538ea8d39fd0f66adf0a08fb4ecb SHA512 da79460085abe594e24f5b6a38507c3e73d8d94efd864701aba78747e54e5cdb9ed7a8a2e685c1a8ff2083cde142029e23bc36732dcc841128bf367d945ee906 WHIRLPOOL 994721d231ae5258710349c5f463d538ba345a23cfc22da4b15079277a8cf4103dd6a0bcf8f008aa0a47377ebadac7c74271ea10a2274f1f74a85ad4ab0a9e78
@@ -42,7 +41,6 @@ DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec3
 DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 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_p20160501.ebuild 4790 SHA256 106e18d8bae472755b6b484dba062791771d9c90023b1de8706c18b25cc2c18d SHA512 57e42c2b267200710a7e0d03944fcf3c117c3cd911c753dd4b8ab944d6c1bd2d0f3e75995839861fb744b9a61c05e1fa62ea4e5f792f3636a99ff0a3cf7bf5db WHIRLPOOL 8850c1511c78ea26076d385e4d5af769ca88b677d8251c99bd730010227ff56165961daa950541c3b1be540d02ab0d1c1bdbca6b6ffc9ef8236dbc37a90db807
 EBUILD netbeans-cnd-9999_p20160502.ebuild 4790 SHA256 50484dbfa4ec3b2fc7611cdd0eb16591a941b9851411341b141aa00864183e5b SHA512 db113f00466e1a6721088ba42af682f60d38c65f332775afba701682a5279f5fb54299374e1046072bda78667b3386924624098549ab77a37a035fa5d3f9a87d WHIRLPOOL 2afdc8cbcc3e49f2a42ef76d490e52fa1f21f992f62fe21a3357e98927d8b135e75b9c52eb8d7b4f2d5f1631b936a528fdcf57c08882f48bdc8e3cd47961836e
 EBUILD netbeans-cnd-9999_p20160503.ebuild 4790 SHA256 5e5631ed381fcdbf1f7aaec7cd327d6da2eef7ce847bd7433da327f6ef1cf5af SHA512 908e2cac98b3d6d36f1212709dc584375791921173238593817fee7190f161c2ac273238403f44aab14f3ee4aea14ac0f0a3ab0c48e57cccf41ba676fc571dd6 WHIRLPOOL 5f1cb1c032377951bb16dcf59525ecaa09d639b62609e4a04acfb715300d57fd86df73abbfab0fec4c9f77e3c2386a672fcc3442c9a6d979d3e5740e2810289d
 EBUILD netbeans-cnd-9999_p20160504.ebuild 4790 SHA256 0534dc35f278f625fad58f0da70325ba219f9339307b844e61908f1b1d6faaf4 SHA512 a44b7f1e4f36e68a58a9b2e0223ea98cf696f9ce21eb7a9ef06f7a399d2f8b145ccdf77fb2a364eadc9dcc0660f5f51094731b20e4c544bb2035fd9d01cc1064 WHIRLPOOL dc38b435de15d5a6c833d20cbf5c1ee71266721701a6da6e2b09578f366cfe7a72c2da191ba896c99c49096549d4aca54e5558f741e44c3c61d169a5e542602a

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160501.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160501.ebuild
deleted file mode 100644
index fc88c96..0000000
--- a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160501.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans CND Cluster"
-HOMEPAGE="http://netbeans.org/projects/cnd"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-05-01_00-02-33/zip/netbeans-trunk-nightly-201605010002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar
-	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
-	http://hg.netbeans.org/binaries/85FD13415B0553D6421F4BBA5FE0F587B9748B20-clank_0.3.6.zip
-	http://hg.netbeans.org/binaries/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-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar libs.antlr3.devel/external/antlr-3.4.jar || die
-	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
-	ln -s "${DISTDIR}"/85FD13415B0553D6421F4BBA5FE0F587B9748B20-clank_0.3.6.zip libs.clank/external/clank_0.3.6.zip || die
-	ln -s "${DISTDIR}"/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-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --build-only --into libs.jna/external jna jna.jar jna-4.2.2.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-dlight-${SLOT} dlight || die
-	cat /usr/share/netbeans-dlight-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.dlight.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/cnd >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/cnd$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	fperms 755 bin/dorun.sh
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/cnd
-}

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 57a88b3..23e11f6 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201605010002-src.zip 213455252 SHA256 a7b4106579fbeddedac626ccd40f58b1ddc18259470a5166bde4959c25a346e9 SHA512 a10b319508becdd5af6e11db80443099997276faad942d22f24513d131c4627d38fcfa1facc74ad3d7ebe2625592e1797de1cbc1988e4d5eb75f2fad178f947a WHIRLPOOL 46c57850d95b3329747584e59389560dc678f1124bf5ff438068c1a04116970342fae1aa34e5ccb3607e068f91e7e6e0f45f7749b8c5a67fec0da55e885ab746
 DIST netbeans-trunk-nightly-201605020002-src.zip 213470717 SHA256 8c1cde7797484c52ae985c6530de6c6974c57d161647a32f642477c86801b3b4 SHA512 b0bdaf6d39d979a1b8bb41088ffe3780630daf3eeb7729b705a09a522bf91717ea4bd5e658aa8d144da96f98a0ea52747f15f9f073c22b67f8ddffb2a2bcf474 WHIRLPOOL 20909f886215edac9c8377d3ee7d1270942848eb94a083f0601d6c328e004f6a1bf87c2d153d739a63278274a71cebb2de00d9bf4b05707c60557cb400bfbc06
 DIST netbeans-trunk-nightly-201605030002-src.zip 213470987 SHA256 8b9ab96283609fdfc78049ea636a19a1fb2677e4edcbb35ec7d94e0caf1284f8 SHA512 e79b403d69494721e8e86582886fbb4a5a2c31f98dce774c5a6a0863578dd0539cd86ee4a7fcca1c5ec2ef6c7cfbe7b8f07baefb3edc739f040c994f56ce514b WHIRLPOOL ddedf8c5cfd452f3a2dbd0fa852f9d466d2b94f677856ac811628de771badc2ea7d9c89e9689d32048e19bc3cb97507de4ace8c783560c77d1072bca2f96f829
 DIST netbeans-trunk-nightly-201605040002-src.zip 213470987 SHA256 432c7c5f60ad6fc195670d1f5aa4e901bde3538ea8d39fd0f66adf0a08fb4ecb SHA512 da79460085abe594e24f5b6a38507c3e73d8d94efd864701aba78747e54e5cdb9ed7a8a2e685c1a8ff2083cde142029e23bc36732dcc841128bf367d945ee906 WHIRLPOOL 994721d231ae5258710349c5f463d538ba345a23cfc22da4b15079277a8cf4103dd6a0bcf8f008aa0a47377ebadac7c74271ea10a2274f1f74a85ad4ab0a9e78
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec3
 DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 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_p20160501.ebuild 2968 SHA256 78ee1b5c317b1288f6e63e0752979c923c55a3d5e355ad52db584d7da816df37 SHA512 c04363b86d6cea9f0fdb33c2db54ecdf85b8826cbbb4959049b184b06ca36fa73cfe0380e8920276a36cfc4dc5def5ac0c780358983f2add9a39f436104110aa WHIRLPOOL b1e6a5396fe257456c51e9d4827d36964a087d949ac07af5e44d981b6318e95cf000d0fc20375a8137e2a1b9fadab455bf7b482221b0915d4b4be5e873c8354a
 EBUILD netbeans-dlight-9999_p20160502.ebuild 2968 SHA256 6b0688c0c02b9397c37f08495552c6091db7e42558de933140dd7df07ff32b7a SHA512 6a3df2e403dc9f4b4eb4ff2ae141174cf1a452beedc45c4d4425ec84c9538ce05ad584be69105c6471695e4adbc5921f440c0178ddab8ddaeffd9560e4224eca WHIRLPOOL 65e37182cdecc4726d9d0afd205247669e551c68c9d11279d186b898af0b62c256427e43646068fff7c78ac1721c45071ddad5220a2ad74ba178631a8925f4a6
 EBUILD netbeans-dlight-9999_p20160503.ebuild 2968 SHA256 9758edb2ba54853ec7f8e52dec2a1d5ffabce06e8157154455c4f2d3ec9bec1a SHA512 c4ca4dd33a6794bde387142b875741732c076f34ae2d5dcaa011d59be89da9280a58f7e8e0c648ace2167a526064dab8aa1b8e4351fff19a4cab56025300def0 WHIRLPOOL 4ab55be885d0ddf8bfed02e01fe2e17608b406fba6c0fc930c362020ac493c248136844a88e5a0335d1512ad5a25f1aa299c783bd9eb427f09a187bdd4cbd127
 EBUILD netbeans-dlight-9999_p20160504.ebuild 2968 SHA256 c31dcca14083b07d621e3a5eba0412aa766ce0ff8010ce91fc820f2679fb7760 SHA512 5b1abe7da9acabef64b3cf44ceb12a8140beb89ec17cde9c9fa2d3646ccd4716e573d544ddd024c49a39dd28ee634e8c8fd2bcd945c53178f0be864135c8b277 WHIRLPOOL d69d37215a78016e8a5af3db3c2a30945bec93c9ce19c46ddf3ce4c545b36b160fa86511d3f1e63144beefd1c789bd95d49c37b31e06b809544569c407a912e3

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

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index d470178..9ad0091 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -35,7 +35,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201605010002-src.zip 213455252 SHA256 a7b4106579fbeddedac626ccd40f58b1ddc18259470a5166bde4959c25a346e9 SHA512 a10b319508becdd5af6e11db80443099997276faad942d22f24513d131c4627d38fcfa1facc74ad3d7ebe2625592e1797de1cbc1988e4d5eb75f2fad178f947a WHIRLPOOL 46c57850d95b3329747584e59389560dc678f1124bf5ff438068c1a04116970342fae1aa34e5ccb3607e068f91e7e6e0f45f7749b8c5a67fec0da55e885ab746
 DIST netbeans-trunk-nightly-201605020002-src.zip 213470717 SHA256 8c1cde7797484c52ae985c6530de6c6974c57d161647a32f642477c86801b3b4 SHA512 b0bdaf6d39d979a1b8bb41088ffe3780630daf3eeb7729b705a09a522bf91717ea4bd5e658aa8d144da96f98a0ea52747f15f9f073c22b67f8ddffb2a2bcf474 WHIRLPOOL 20909f886215edac9c8377d3ee7d1270942848eb94a083f0601d6c328e004f6a1bf87c2d153d739a63278274a71cebb2de00d9bf4b05707c60557cb400bfbc06
 DIST netbeans-trunk-nightly-201605030002-src.zip 213470987 SHA256 8b9ab96283609fdfc78049ea636a19a1fb2677e4edcbb35ec7d94e0caf1284f8 SHA512 e79b403d69494721e8e86582886fbb4a5a2c31f98dce774c5a6a0863578dd0539cd86ee4a7fcca1c5ec2ef6c7cfbe7b8f07baefb3edc739f040c994f56ce514b WHIRLPOOL ddedf8c5cfd452f3a2dbd0fa852f9d466d2b94f677856ac811628de771badc2ea7d9c89e9689d32048e19bc3cb97507de4ace8c783560c77d1072bca2f96f829
 DIST netbeans-trunk-nightly-201605040002-src.zip 213470987 SHA256 432c7c5f60ad6fc195670d1f5aa4e901bde3538ea8d39fd0f66adf0a08fb4ecb SHA512 da79460085abe594e24f5b6a38507c3e73d8d94efd864701aba78747e54e5cdb9ed7a8a2e685c1a8ff2083cde142029e23bc36732dcc841128bf367d945ee906 WHIRLPOOL 994721d231ae5258710349c5f463d538ba345a23cfc22da4b15079277a8cf4103dd6a0bcf8f008aa0a47377ebadac7c74271ea10a2274f1f74a85ad4ab0a9e78
@@ -61,7 +60,6 @@ DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec3
 DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 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_p20160501.ebuild 15825 SHA256 da6a8bb97d6dcc17d3a30da220b5b38579082570111bbdaac3abe7e57c08a882 SHA512 742531a849d707e64e5f04d560e5b5536a0fff22c82cb96201a40467efc958c46af1c3680e2f79b46727ee2ebe68f45299b66c6ea95a794bf4ea1468bf9fb4b3 WHIRLPOOL fbaac1438eceda2fd45990778182870daabb05c7b2cd057646a2810a5b72401f81bfa343fcd6c0c19328c0a5661ede8f0fbe9ca0638f4d72ca25f39862f577d6
 EBUILD netbeans-enterprise-9999_p20160502.ebuild 15825 SHA256 f7236ab1725ae3ca7ec685e6c5fb620472fad87e7b9dff827c6e650b9916a9c1 SHA512 5b876a8cc1a495f8093d0736459c740abe9c22d44c689eb97ba84879a33197b38954822712d96409efeeaca76a80cc511ddeeb05052d5ff08c12928efbf8a565 WHIRLPOOL 2d8f0e257a613af5fd245a56282138cf418b7dde25d2171a187f337a21f44ea7472ff6711fbf0a0e433bd8baa67acc8cfdd643e477a4a52021c1341ae8f0cd0c
 EBUILD netbeans-enterprise-9999_p20160503.ebuild 15825 SHA256 9e947b3056a704cec33a70ab5660f9392fcea7777cc7e5b9221fb234cea75e22 SHA512 f39092b6d3c4e3e8a8c921d26bdbb0a49e8c38df3139ec6796d7d6944d917cb7a89723daa9e145f9aba7b2392cef216f9afd9f53250173e5dc6b7ecd1bcbea88 WHIRLPOOL 5cd022f0ce7d58fff6b8c92fc587b49ff21b4e5f601a671070a312812d0733658a9d011d81fc6fc4edac7c04beab8fb27e014297cb0678f2a80735ebc099bcc7
 EBUILD netbeans-enterprise-9999_p20160504.ebuild 15825 SHA256 294c324135d41c8ffa76019433da273988ed0c9e0122739c117176adce67334b SHA512 656ac83dabb963be3cb3a8be36a203b70bfc81041bc6ac1b0b112b7427d7f5a6a03ea60b35025fe718fb8d55e2472c7390e36f1abb9842d21e204558e423cba6 WHIRLPOOL d683b7eac0e6b47abd28ae662265fc7c566941f8c9269ac3aeb2039759e221a4881cdb845cc013e7c89cecd6983cd213a24f4c514da1e7445ade9b920a847ee4

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

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 6d447c8..92502dd 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201605010002-src.zip 213455252 SHA256 a7b4106579fbeddedac626ccd40f58b1ddc18259470a5166bde4959c25a346e9 SHA512 a10b319508becdd5af6e11db80443099997276faad942d22f24513d131c4627d38fcfa1facc74ad3d7ebe2625592e1797de1cbc1988e4d5eb75f2fad178f947a WHIRLPOOL 46c57850d95b3329747584e59389560dc678f1124bf5ff438068c1a04116970342fae1aa34e5ccb3607e068f91e7e6e0f45f7749b8c5a67fec0da55e885ab746
 DIST netbeans-trunk-nightly-201605020002-src.zip 213470717 SHA256 8c1cde7797484c52ae985c6530de6c6974c57d161647a32f642477c86801b3b4 SHA512 b0bdaf6d39d979a1b8bb41088ffe3780630daf3eeb7729b705a09a522bf91717ea4bd5e658aa8d144da96f98a0ea52747f15f9f073c22b67f8ddffb2a2bcf474 WHIRLPOOL 20909f886215edac9c8377d3ee7d1270942848eb94a083f0601d6c328e004f6a1bf87c2d153d739a63278274a71cebb2de00d9bf4b05707c60557cb400bfbc06
 DIST netbeans-trunk-nightly-201605030002-src.zip 213470987 SHA256 8b9ab96283609fdfc78049ea636a19a1fb2677e4edcbb35ec7d94e0caf1284f8 SHA512 e79b403d69494721e8e86582886fbb4a5a2c31f98dce774c5a6a0863578dd0539cd86ee4a7fcca1c5ec2ef6c7cfbe7b8f07baefb3edc739f040c994f56ce514b WHIRLPOOL ddedf8c5cfd452f3a2dbd0fa852f9d466d2b94f677856ac811628de771badc2ea7d9c89e9689d32048e19bc3cb97507de4ace8c783560c77d1072bca2f96f829
 DIST netbeans-trunk-nightly-201605040002-src.zip 213470987 SHA256 432c7c5f60ad6fc195670d1f5aa4e901bde3538ea8d39fd0f66adf0a08fb4ecb SHA512 da79460085abe594e24f5b6a38507c3e73d8d94efd864701aba78747e54e5cdb9ed7a8a2e685c1a8ff2083cde142029e23bc36732dcc841128bf367d945ee906 WHIRLPOOL 994721d231ae5258710349c5f463d538ba345a23cfc22da4b15079277a8cf4103dd6a0bcf8f008aa0a47377ebadac7c74271ea10a2274f1f74a85ad4ab0a9e78
@@ -29,7 +28,6 @@ DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec3
 DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 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_p20160501.ebuild 2913 SHA256 ac7710547368074d006c5558ce163d75477b28f85a98415844d61babdc75b791 SHA512 cd0075cbae29c1b1777f84e01e7bbaa84c57cb247802ed7cd626c194b397a57677736744e999285c57017fbb356b27029a05ab6af90d0247686519b7032f6890 WHIRLPOOL 081c837f76a58adfff586ab83d26c99c5f4b1aa568f23e7fbd0016f98298f127418b09c96bfa65aa5feb026f625380a0a928598120b371134f86031b945e95d0
 EBUILD netbeans-ergonomics-9999_p20160502.ebuild 2913 SHA256 4dcb3f09f8ea8392d231fc3c4ecc2db848cad4e988a655549d0e831f96a36c6e SHA512 dc03aba5e2e43e4989c4d44dbb9655d674fdfe7aa742e347c04d1fd44bfac6a56e68942cc9714a2be5e4aaf30c4d643bce2ec0155fa885df110ebd5430a5e0b7 WHIRLPOOL e58c83dbb90d92a22c8c70f40fe28ff041ac9d3d152ee189237a1c31a85689bd0d42e6a545ae4ea3ed9e05f4c8df8a0079ea20f1310243c39703c7f025d09221
 EBUILD netbeans-ergonomics-9999_p20160503.ebuild 2913 SHA256 69290214e30a39963b1263a6cda3849bc6a57e9e75c23deb4fd9353df8440252 SHA512 dd01f010aeddc93fc656a06c3f563244ea4019d46d74e662002924462280f132ae192afee4a4bfb4c61d4c6ffc84d094dc0cf09595bab200352c247f9742334e WHIRLPOOL 019bb2d6ada5af76a3a91f8882392e9c49eb0c1a2a2198fc7c698117820bfe3df211dbc559e8edb1b8ce164b30b6c93a100e787e6cc3f2f4d7748862a54d7956
 EBUILD netbeans-ergonomics-9999_p20160504.ebuild 2913 SHA256 f50cee0830f21b75cf6825ea57b6f3cedd4d28a5e531de8053ba4d28e6a8f8e1 SHA512 e8d15f0cb0fc668a92ae69975d3f9eb15cf8bee1379909e5fa63f9f037c868321a30e6ff81e52c23b75444697ac9f01ea82fd97c46c992c1c58218421d423572 WHIRLPOOL eb2218645f5146707077ee84464a61355c191b11c1849ebc07324859eabad5d53023629f83bfeaabfd63408c7fa05c9b11560a7037ddfcacb41cda65a7ab965e

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

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index 085212a..d0a0a69 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -7,7 +7,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201605010002-src.zip 213455252 SHA256 a7b4106579fbeddedac626ccd40f58b1ddc18259470a5166bde4959c25a346e9 SHA512 a10b319508becdd5af6e11db80443099997276faad942d22f24513d131c4627d38fcfa1facc74ad3d7ebe2625592e1797de1cbc1988e4d5eb75f2fad178f947a WHIRLPOOL 46c57850d95b3329747584e59389560dc678f1124bf5ff438068c1a04116970342fae1aa34e5ccb3607e068f91e7e6e0f45f7749b8c5a67fec0da55e885ab746
 DIST netbeans-trunk-nightly-201605020002-src.zip 213470717 SHA256 8c1cde7797484c52ae985c6530de6c6974c57d161647a32f642477c86801b3b4 SHA512 b0bdaf6d39d979a1b8bb41088ffe3780630daf3eeb7729b705a09a522bf91717ea4bd5e658aa8d144da96f98a0ea52747f15f9f073c22b67f8ddffb2a2bcf474 WHIRLPOOL 20909f886215edac9c8377d3ee7d1270942848eb94a083f0601d6c328e004f6a1bf87c2d153d739a63278274a71cebb2de00d9bf4b05707c60557cb400bfbc06
 DIST netbeans-trunk-nightly-201605030002-src.zip 213470987 SHA256 8b9ab96283609fdfc78049ea636a19a1fb2677e4edcbb35ec7d94e0caf1284f8 SHA512 e79b403d69494721e8e86582886fbb4a5a2c31f98dce774c5a6a0863578dd0539cd86ee4a7fcca1c5ec2ef6c7cfbe7b8f07baefb3edc739f040c994f56ce514b WHIRLPOOL ddedf8c5cfd452f3a2dbd0fa852f9d466d2b94f677856ac811628de771badc2ea7d9c89e9689d32048e19bc3cb97507de4ace8c783560c77d1072bca2f96f829
 DIST netbeans-trunk-nightly-201605040002-src.zip 213470987 SHA256 432c7c5f60ad6fc195670d1f5aa4e901bde3538ea8d39fd0f66adf0a08fb4ecb SHA512 da79460085abe594e24f5b6a38507c3e73d8d94efd864701aba78747e54e5cdb9ed7a8a2e685c1a8ff2083cde142029e23bc36732dcc841128bf367d945ee906 WHIRLPOOL 994721d231ae5258710349c5f463d538ba345a23cfc22da4b15079277a8cf4103dd6a0bcf8f008aa0a47377ebadac7c74271ea10a2274f1f74a85ad4ab0a9e78
@@ -33,7 +32,6 @@ DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec3
 DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 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_p20160501.ebuild 3377 SHA256 54096e2821e78144d5ccb7b2a32097002c51681f508d030f71e54c92f62f42a5 SHA512 989d2116603d36c65e171a5e552c1168e745fea8fdf5cdcbef46f440a4ce16c98912e8fee19953fb47014399182361853c1a277ce93ef81c09fbd9f779615328 WHIRLPOOL 82ee705f172002f145c9dda634177fd6fb39b59e7a5f3efa793afb7ba3d8233a47ea00992a81ff2f12930f8c0892a15fc1561aae5a90f58885de76e062b4ddff
 EBUILD netbeans-extide-9999_p20160502.ebuild 3377 SHA256 824a3444608ebcd9334e2fc674e7f83d5d1bd445cc9100eb5f259e4b8f7fd29b SHA512 9a75c4eaba16f1faa69fe6cb55ef3c52c78162c2ec7dc5f86c74a3880b64e2e9f5c5051f83d999e5a578c22cbb13ed789c12e6e4a40a931c03c80e7381511c44 WHIRLPOOL f7e4670adc48cccb4cf57fdc45698a805b854600d9b12400fab912fd381df2af078d8035c611afe15032cc7628b890aab531833491e0da009c1ad08fa86c8f04
 EBUILD netbeans-extide-9999_p20160503.ebuild 3377 SHA256 30985f7b9499a01b8156ba1bbeafef2ddfa6950c8220e1dc97791f2d42c3e2df SHA512 a4296f055b51a22d4feb0c98510fc9e569d258f7f4bc7c492613c8c365c1577d09d7cd5c27fbfb13cce509a59854bd8d6b69fd2a1b80ea5654c30d3291cdc201 WHIRLPOOL 6ce07a893b9aa14f3f6ce7671639f4214ce9ef34a9419f45a755bb1a529e3cd12d879a355c9f0ec4ad6814eb6445ae27fae1c99d353099c2a0bc82a5e1a83a81
 EBUILD netbeans-extide-9999_p20160504.ebuild 3377 SHA256 edc6470cecbbde6d464589d6381dd3a54645ad91b42cdbdc8294238c222dbe3d SHA512 6fb9c657a8678b8a1925496af5cdafa7d32603fcc5293edc902e14cbca29eb866bc62620f29d37deb6ae8ce43cbb3200f8bed04a2233641f2752db9289bd1a6a WHIRLPOOL d0416bb308650f184436b3e66a46b67a18f73b5c158395d269eeffec2c0d4d94a1bc810e33d485673356dc920ea010a2a3780b8990925a919f8b7513add81fb2

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

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 17f5a9b..954ac95 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -5,7 +5,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201605010002-src.zip 213455252 SHA256 a7b4106579fbeddedac626ccd40f58b1ddc18259470a5166bde4959c25a346e9 SHA512 a10b319508becdd5af6e11db80443099997276faad942d22f24513d131c4627d38fcfa1facc74ad3d7ebe2625592e1797de1cbc1988e4d5eb75f2fad178f947a WHIRLPOOL 46c57850d95b3329747584e59389560dc678f1124bf5ff438068c1a04116970342fae1aa34e5ccb3607e068f91e7e6e0f45f7749b8c5a67fec0da55e885ab746
 DIST netbeans-trunk-nightly-201605020002-src.zip 213470717 SHA256 8c1cde7797484c52ae985c6530de6c6974c57d161647a32f642477c86801b3b4 SHA512 b0bdaf6d39d979a1b8bb41088ffe3780630daf3eeb7729b705a09a522bf91717ea4bd5e658aa8d144da96f98a0ea52747f15f9f073c22b67f8ddffb2a2bcf474 WHIRLPOOL 20909f886215edac9c8377d3ee7d1270942848eb94a083f0601d6c328e004f6a1bf87c2d153d739a63278274a71cebb2de00d9bf4b05707c60557cb400bfbc06
 DIST netbeans-trunk-nightly-201605030002-src.zip 213470987 SHA256 8b9ab96283609fdfc78049ea636a19a1fb2677e4edcbb35ec7d94e0caf1284f8 SHA512 e79b403d69494721e8e86582886fbb4a5a2c31f98dce774c5a6a0863578dd0539cd86ee4a7fcca1c5ec2ef6c7cfbe7b8f07baefb3edc739f040c994f56ce514b WHIRLPOOL ddedf8c5cfd452f3a2dbd0fa852f9d466d2b94f677856ac811628de771badc2ea7d9c89e9689d32048e19bc3cb97507de4ace8c783560c77d1072bca2f96f829
 DIST netbeans-trunk-nightly-201605040002-src.zip 213470987 SHA256 432c7c5f60ad6fc195670d1f5aa4e901bde3538ea8d39fd0f66adf0a08fb4ecb SHA512 da79460085abe594e24f5b6a38507c3e73d8d94efd864701aba78747e54e5cdb9ed7a8a2e685c1a8ff2083cde142029e23bc36732dcc841128bf367d945ee906 WHIRLPOOL 994721d231ae5258710349c5f463d538ba345a23cfc22da4b15079277a8cf4103dd6a0bcf8f008aa0a47377ebadac7c74271ea10a2274f1f74a85ad4ab0a9e78
@@ -31,7 +30,6 @@ DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec3
 DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 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_p20160501.ebuild 3416 SHA256 e16cff40a4e8cfaf026dc9ec4b60785b3527bcf5a6e3bf4bb8c60a762a69217a SHA512 1082e3cd464ec748ae2f6fb4420ee15be6f6b8ccdc29386054bb65dea4952aeca7d1c90869d121c266ab4d20404dba155aeff67fe14799ffa81ed7491cb34a22 WHIRLPOOL 287e39c154ca8d8cb7272df94cbd231a89dd3e84edbb4653b304ee2bc324f57fde45625d2136843a7264961b8d0e349907d10b6cb5f188052de90ea313f96d26
 EBUILD netbeans-groovy-9999_p20160502.ebuild 3416 SHA256 8e02a0a76c89245aa3b97661eb199279b714901b7d9ea4d6265160470d3365af SHA512 208ed92226c68fbf8521fa30ca60adcbf80c8823ed585667423d93a8d0ebcb7882907487a743363e64999ad7ef6fb59af0e90d086397f9577da78b7134308e95 WHIRLPOOL 8138a1b03ad6eb5567f36d7fa5e799fbc434277e5bc6ab2be0b1d0d0ac4ec160f727c59fe0217b63495f38b2d29b499d45dab32a04d01d906e022642fa3d9150
 EBUILD netbeans-groovy-9999_p20160503.ebuild 3416 SHA256 fbfc03ccef3cc3d57a5a857d1bd2f12a3c5fbe67734cbfd7c418c50693a1414c SHA512 e37d9a92e3930246c71f74dd591b3d5363d7964623999d7bbf027e8af0389f9de67000e9e1f187551f3b12f7cf338cc3de4fcb95fdf5284a132912759e23a441 WHIRLPOOL a0a6fa615ca3ddb2f3343dcdff3f90c198a86f55032ebe90b1c9929b2528b3902f7df8825430cf7352fe45b1efe25b08620be2b2dc60b283277434144366d15e
 EBUILD netbeans-groovy-9999_p20160504.ebuild 3416 SHA256 b67581ce3ecd67505cd4a92eef79a6c21f4270228af03fa9da428b4eda43eaa6 SHA512 f1d7499541006f431e8053b9021794d3bc502c0b2fd09b6d91f6187253c4597abc529a3eee0dc5ec98ba80a14acc8ed083fff2022d205a8896fbd0dcd8fa5dc3 WHIRLPOOL 48196e6fa39302eff0e8c8ee561b85efd701e25e28e504f1630451a322f9fec634ac3c321dc751c6b8abad7f4c15b851d8dbb24eccf22d94dec608fb499db221

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

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 14c163b..cda8cc6 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -8,7 +8,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201605010002-src.zip 213455252 SHA256 a7b4106579fbeddedac626ccd40f58b1ddc18259470a5166bde4959c25a346e9 SHA512 a10b319508becdd5af6e11db80443099997276faad942d22f24513d131c4627d38fcfa1facc74ad3d7ebe2625592e1797de1cbc1988e4d5eb75f2fad178f947a WHIRLPOOL 46c57850d95b3329747584e59389560dc678f1124bf5ff438068c1a04116970342fae1aa34e5ccb3607e068f91e7e6e0f45f7749b8c5a67fec0da55e885ab746
 DIST netbeans-trunk-nightly-201605020002-src.zip 213470717 SHA256 8c1cde7797484c52ae985c6530de6c6974c57d161647a32f642477c86801b3b4 SHA512 b0bdaf6d39d979a1b8bb41088ffe3780630daf3eeb7729b705a09a522bf91717ea4bd5e658aa8d144da96f98a0ea52747f15f9f073c22b67f8ddffb2a2bcf474 WHIRLPOOL 20909f886215edac9c8377d3ee7d1270942848eb94a083f0601d6c328e004f6a1bf87c2d153d739a63278274a71cebb2de00d9bf4b05707c60557cb400bfbc06
 DIST netbeans-trunk-nightly-201605030002-src.zip 213470987 SHA256 8b9ab96283609fdfc78049ea636a19a1fb2677e4edcbb35ec7d94e0caf1284f8 SHA512 e79b403d69494721e8e86582886fbb4a5a2c31f98dce774c5a6a0863578dd0539cd86ee4a7fcca1c5ec2ef6c7cfbe7b8f07baefb3edc739f040c994f56ce514b WHIRLPOOL ddedf8c5cfd452f3a2dbd0fa852f9d466d2b94f677856ac811628de771badc2ea7d9c89e9689d32048e19bc3cb97507de4ace8c783560c77d1072bca2f96f829
 DIST netbeans-trunk-nightly-201605040002-src.zip 213470987 SHA256 432c7c5f60ad6fc195670d1f5aa4e901bde3538ea8d39fd0f66adf0a08fb4ecb SHA512 da79460085abe594e24f5b6a38507c3e73d8d94efd864701aba78747e54e5cdb9ed7a8a2e685c1a8ff2083cde142029e23bc36732dcc841128bf367d945ee906 WHIRLPOOL 994721d231ae5258710349c5f463d538ba345a23cfc22da4b15079277a8cf4103dd6a0bcf8f008aa0a47377ebadac7c74271ea10a2274f1f74a85ad4ab0a9e78
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec3
 DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 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_p20160501.ebuild 4126 SHA256 96e9b8bbef35ea075a2e363a0f46aa0bd52441dbe5ab95868ff537732d6bc2a7 SHA512 f402b5c1f86f2591dc0098ead7c5a44d305fd4c4e3f1463fcd7aa9a766b5915110d281c8756c792aaec5b5edeeaef740660e9c583b75e714c239093299909002 WHIRLPOOL 4a750dc8472779a49d49c510a7c96a45973462b6c299df6a1dfecb6c77ff907b624cb1ff9c56a3b3d1d0a86b5388c8d14aafd93a00e50672a5d6f77a563a3880
 EBUILD netbeans-harness-9999_p20160502.ebuild 4126 SHA256 7a8289b781c50aae8effb6dfeff1b2bea2e251243bde6eb3a48c47ec2b49cda5 SHA512 d7852472f6ac16f2535b48d735883ce59c566074b5ed0a27095b8444740fa11bdfb9e874fc357a2d958c14875c4b3f3d94b4e66f70a134b233f38b72849c6c5a WHIRLPOOL 361e97f07907d5c86a161b24e21aaacd92151db684c0f369feeb8df4e5f736c90251b5542bc87af14c08be788d976b35a317172ce810f9b0958035b592b366dd
 EBUILD netbeans-harness-9999_p20160503.ebuild 4126 SHA256 75b892c6486ae549d11ea63e5da08366b1a72eb81219f0c055e9c98efaceabed SHA512 21dcbe5ef4e298c41df8f4b832b29e8d800a3e8aebc623fb0cc32e7e322621e1a279fc50064203e2f815de52660e8e5fea1d74252ab4b6278c0504694d01637a WHIRLPOOL 6028736186483f3386cda4219829c18c123aa3f72a040f2847a517c7be4b25fae5fac9e92ba93ce46d5354fa960eb8e29508ca0a18fed637a9d7f7a99e9a2914
 EBUILD netbeans-harness-9999_p20160504.ebuild 4126 SHA256 f2d05ecbc1a506855bbbabd16956e88410ce07ece2c50cee7501ea6df44400e4 SHA512 b7ce335eb0c4eab6863238135fdd347aea931c871cc99c681fa4405000c177e2234844dded10cad8f855ef2c9e3c992f7212ff6031542a9518df10e1aa577f27 WHIRLPOOL 0580ee1ee3126c7a2d5428a1729f1c4af30041740ce378a01f12f98c58764cdc242bfaf18d5dcc4232b8293fef5db6bacbce48fcdd9cdedeb103a2950c3595a2

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

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index c5020cb..0ef455f 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -142,7 +142,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201605010002-src.zip 213455252 SHA256 a7b4106579fbeddedac626ccd40f58b1ddc18259470a5166bde4959c25a346e9 SHA512 a10b319508becdd5af6e11db80443099997276faad942d22f24513d131c4627d38fcfa1facc74ad3d7ebe2625592e1797de1cbc1988e4d5eb75f2fad178f947a WHIRLPOOL 46c57850d95b3329747584e59389560dc678f1124bf5ff438068c1a04116970342fae1aa34e5ccb3607e068f91e7e6e0f45f7749b8c5a67fec0da55e885ab746
 DIST netbeans-trunk-nightly-201605020002-src.zip 213470717 SHA256 8c1cde7797484c52ae985c6530de6c6974c57d161647a32f642477c86801b3b4 SHA512 b0bdaf6d39d979a1b8bb41088ffe3780630daf3eeb7729b705a09a522bf91717ea4bd5e658aa8d144da96f98a0ea52747f15f9f073c22b67f8ddffb2a2bcf474 WHIRLPOOL 20909f886215edac9c8377d3ee7d1270942848eb94a083f0601d6c328e004f6a1bf87c2d153d739a63278274a71cebb2de00d9bf4b05707c60557cb400bfbc06
 DIST netbeans-trunk-nightly-201605030002-src.zip 213470987 SHA256 8b9ab96283609fdfc78049ea636a19a1fb2677e4edcbb35ec7d94e0caf1284f8 SHA512 e79b403d69494721e8e86582886fbb4a5a2c31f98dce774c5a6a0863578dd0539cd86ee4a7fcca1c5ec2ef6c7cfbe7b8f07baefb3edc739f040c994f56ce514b WHIRLPOOL ddedf8c5cfd452f3a2dbd0fa852f9d466d2b94f677856ac811628de771badc2ea7d9c89e9689d32048e19bc3cb97507de4ace8c783560c77d1072bca2f96f829
 DIST netbeans-trunk-nightly-201605040002-src.zip 213470987 SHA256 432c7c5f60ad6fc195670d1f5aa4e901bde3538ea8d39fd0f66adf0a08fb4ecb SHA512 da79460085abe594e24f5b6a38507c3e73d8d94efd864701aba78747e54e5cdb9ed7a8a2e685c1a8ff2083cde142029e23bc36732dcc841128bf367d945ee906 WHIRLPOOL 994721d231ae5258710349c5f463d538ba345a23cfc22da4b15079277a8cf4103dd6a0bcf8f008aa0a47377ebadac7c74271ea10a2274f1f74a85ad4ab0a9e78
@@ -168,7 +167,6 @@ DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec3
 DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 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_p20160501.ebuild 30761 SHA256 387b3567dd88289998240cc82c47ca3585118914f01b36299c41dad8653f4199 SHA512 e28a3e8a7fed74b1ddeff8b1703e52b1a3bcf9e4ddd15b4f7b1a5343596af97c604dcb1f62d7c15ecbfad5330f6d8b6557d16075695c9dc61c2411ad9a63182b WHIRLPOOL 351e707de107ed9d6681c6ab5d9d8e8886a7aa8aaac44875dbafa29ecb5e1b516360c576f195ff55e29d8600268a919d4ea71935fdc828a986de40fc5cb321ab
 EBUILD netbeans-ide-9999_p20160502.ebuild 30761 SHA256 f64670c6c87c7a53f309c7cd818235923301a460da60d03e2c75eb28004172c9 SHA512 ffc0a8b6ff8ab2f986cfc989b01654ae9e99c3ddbdc98ae765f32196f5dbf6ef55e29f92bb208dc9c956370a2512f3ca6fdf34ca1ef36927c47f34bcebc8bd65 WHIRLPOOL a8534e14c92440b3a0fdcbf3ac5c3641c1bc589011d939c4f4053dc2a95fb9515f39bbaa7de686469f1719272d9a2186566627b5c1b93487f881162758eaf7e0
 EBUILD netbeans-ide-9999_p20160503.ebuild 30761 SHA256 21fa636c0499aad36370165661ff67d4f4f69e3f26ada5683f7ce184fec974a0 SHA512 451347dee5faebcee3c58063403be1af4e113a427b7453f10d0b40e7299329498e1676b0ed6da8158609c5850311992a0cf84da464d56bd11afd49df1a9ef9f0 WHIRLPOOL e19c428a060233051fb22a8f46687fc828401fb4f7243d26e869560632175dad8d7cd3cfb71d23e4b66218180fd7cca957bb5a86df9a392430cc712df9a5fa38
 EBUILD netbeans-ide-9999_p20160504.ebuild 30761 SHA256 289783fb0f91bf72c6ed454502c83b3d873c84ee30233511424b51f728c27815 SHA512 1c3069b700f250180cdd28c81eeabe8a6cf2a5212770f8bdd09ce51152a05d02c61f158b443948f98da9b5f97baf1ab6a303a101ae05527ee0902017fbb2bb53 WHIRLPOOL 1af62258953ac0521bc4fb6edb0fb88d863abe8e79b9a3b1140a1cb1686c9de611fe162c9b2488a29f0133859ec0deb6865d2d60642853c3b364747d2190c944

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

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 421abcc..1aae7e5 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -38,7 +38,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201605010002-src.zip 213455252 SHA256 a7b4106579fbeddedac626ccd40f58b1ddc18259470a5166bde4959c25a346e9 SHA512 a10b319508becdd5af6e11db80443099997276faad942d22f24513d131c4627d38fcfa1facc74ad3d7ebe2625592e1797de1cbc1988e4d5eb75f2fad178f947a WHIRLPOOL 46c57850d95b3329747584e59389560dc678f1124bf5ff438068c1a04116970342fae1aa34e5ccb3607e068f91e7e6e0f45f7749b8c5a67fec0da55e885ab746
 DIST netbeans-trunk-nightly-201605020002-src.zip 213470717 SHA256 8c1cde7797484c52ae985c6530de6c6974c57d161647a32f642477c86801b3b4 SHA512 b0bdaf6d39d979a1b8bb41088ffe3780630daf3eeb7729b705a09a522bf91717ea4bd5e658aa8d144da96f98a0ea52747f15f9f073c22b67f8ddffb2a2bcf474 WHIRLPOOL 20909f886215edac9c8377d3ee7d1270942848eb94a083f0601d6c328e004f6a1bf87c2d153d739a63278274a71cebb2de00d9bf4b05707c60557cb400bfbc06
 DIST netbeans-trunk-nightly-201605030002-src.zip 213470987 SHA256 8b9ab96283609fdfc78049ea636a19a1fb2677e4edcbb35ec7d94e0caf1284f8 SHA512 e79b403d69494721e8e86582886fbb4a5a2c31f98dce774c5a6a0863578dd0539cd86ee4a7fcca1c5ec2ef6c7cfbe7b8f07baefb3edc739f040c994f56ce514b WHIRLPOOL ddedf8c5cfd452f3a2dbd0fa852f9d466d2b94f677856ac811628de771badc2ea7d9c89e9689d32048e19bc3cb97507de4ace8c783560c77d1072bca2f96f829
 DIST netbeans-trunk-nightly-201605040002-src.zip 213470987 SHA256 432c7c5f60ad6fc195670d1f5aa4e901bde3538ea8d39fd0f66adf0a08fb4ecb SHA512 da79460085abe594e24f5b6a38507c3e73d8d94efd864701aba78747e54e5cdb9ed7a8a2e685c1a8ff2083cde142029e23bc36732dcc841128bf367d945ee906 WHIRLPOOL 994721d231ae5258710349c5f463d538ba345a23cfc22da4b15079277a8cf4103dd6a0bcf8f008aa0a47377ebadac7c74271ea10a2274f1f74a85ad4ab0a9e78
@@ -64,7 +63,6 @@ DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec3
 DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 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_p20160501.ebuild 15656 SHA256 45141da1515612357276a060d43b1ac5c4b0aa01b202d5f71e241af562e4eba0 SHA512 fba12750ea2567c34568ff2743003afcf12a1e0f536b48ae6273087848072befb00a63caf734d111a568a30578add8f8b2f065bdbdce77c471b857085882ed1a WHIRLPOOL f6d0f280d5124438be05a9ba3ababc59e293c5fcb765d133009ba18cbb98cf0e13d4e179b3e0c577e0227f5ca7cf3de59fb4057128fd45a45a6e9ed01693c7c9
 EBUILD netbeans-java-9999_p20160502.ebuild 15656 SHA256 3ef21fbc7acea311b72f58ee2aa7cbda5af4827118d1c1ce384c214878deb651 SHA512 586f3d93d53a6420ef3745ad4778bbf596599bd7f248864a11bcc8f6776e2de52a18510867acd4ecdd1e9335bdc5c3c60bb3b0ea2f9107816fce111768b14b1b WHIRLPOOL 627642892a4f2a16f5ff23405f57cc83b1ec6ec5d191eb9ad5ac977f9445a230637d74105f5e8800ade110097eebbf3f6fe65e1be1b39bbe9a5f254ac7d30dc6
 EBUILD netbeans-java-9999_p20160503.ebuild 15656 SHA256 6f01ff849afc9b4f7816e7e7c29c819fd4435d1dc0576ffa9e8276a194782f62 SHA512 22b3f3c4f98b6210d90c7fcf438c27c33e6f9d1a6fbae7f8a929c9a8891bb57b1e69b97198d680024ca83db75cc2b2575022f887c1e218bfe13a1baa7761d499 WHIRLPOOL ca53870137c725f602eebccf65d04deb2aa8cad0ea96dd817749bbbfffc989ae5a6ead94f43793d76e4ac4c3c6fe5da5b59d7f3bcf5dec3b6ef150519ecf8cbe
 EBUILD netbeans-java-9999_p20160504.ebuild 15656 SHA256 3a8bd1c525bac4af14417dc38211fd01cb5b52df8b6945de3d5b906ed170bbd6 SHA512 e8bc680ce33f01f1949abdb0805d204d44e24d7f364ebfb7c1eeb0e7b1de7f6b0bb34542cefada2edec9d6e2f835cd8fa8f3ae346a8ae478f8b133e098b8b487 WHIRLPOOL 505ae90dc7579010d431e9e40e70e4eb548d57882f82381ba31ea34fcb8b27e80fd61be128fb1270084f63f4db6d518459d60a84f1e5edbe8f377f7800f21fef

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

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 175e9d9..290decd 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201605010002-src.zip 213455252 SHA256 a7b4106579fbeddedac626ccd40f58b1ddc18259470a5166bde4959c25a346e9 SHA512 a10b319508becdd5af6e11db80443099997276faad942d22f24513d131c4627d38fcfa1facc74ad3d7ebe2625592e1797de1cbc1988e4d5eb75f2fad178f947a WHIRLPOOL 46c57850d95b3329747584e59389560dc678f1124bf5ff438068c1a04116970342fae1aa34e5ccb3607e068f91e7e6e0f45f7749b8c5a67fec0da55e885ab746
 DIST netbeans-trunk-nightly-201605020002-src.zip 213470717 SHA256 8c1cde7797484c52ae985c6530de6c6974c57d161647a32f642477c86801b3b4 SHA512 b0bdaf6d39d979a1b8bb41088ffe3780630daf3eeb7729b705a09a522bf91717ea4bd5e658aa8d144da96f98a0ea52747f15f9f073c22b67f8ddffb2a2bcf474 WHIRLPOOL 20909f886215edac9c8377d3ee7d1270942848eb94a083f0601d6c328e004f6a1bf87c2d153d739a63278274a71cebb2de00d9bf4b05707c60557cb400bfbc06
 DIST netbeans-trunk-nightly-201605030002-src.zip 213470987 SHA256 8b9ab96283609fdfc78049ea636a19a1fb2677e4edcbb35ec7d94e0caf1284f8 SHA512 e79b403d69494721e8e86582886fbb4a5a2c31f98dce774c5a6a0863578dd0539cd86ee4a7fcca1c5ec2ef6c7cfbe7b8f07baefb3edc739f040c994f56ce514b WHIRLPOOL ddedf8c5cfd452f3a2dbd0fa852f9d466d2b94f677856ac811628de771badc2ea7d9c89e9689d32048e19bc3cb97507de4ace8c783560c77d1072bca2f96f829
 DIST netbeans-trunk-nightly-201605040002-src.zip 213470987 SHA256 432c7c5f60ad6fc195670d1f5aa4e901bde3538ea8d39fd0f66adf0a08fb4ecb SHA512 da79460085abe594e24f5b6a38507c3e73d8d94efd864701aba78747e54e5cdb9ed7a8a2e685c1a8ff2083cde142029e23bc36732dcc841128bf367d945ee906 WHIRLPOOL 994721d231ae5258710349c5f463d538ba345a23cfc22da4b15079277a8cf4103dd6a0bcf8f008aa0a47377ebadac7c74271ea10a2274f1f74a85ad4ab0a9e78
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec3
 DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 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_p20160501.ebuild 4971 SHA256 5722deb49657c676c3040740712276c1fede746cbe0fb0e44b8912529bd67773 SHA512 7d4d4b53f3b31a02a84fea8ce24ac6f2176ebd15cf9244003a26e79f43b5b33c7301c33a0fcce4c9440429aa8f7273794c66545cf9b3eb1fba1d9e6ee34bc52e WHIRLPOOL a3ba0163bd0006728a42398e083024681fed9dd54462cb17bbf99387df1be63e6d82b84cc65afa9292cca5b3bab7a4f1b81a935ecedeaacb6c92e75d5d0510d2
 EBUILD netbeans-javacard-9999_p20160502.ebuild 4971 SHA256 d4c54a7e87cde2af0fd17108e8cfc4f933aa15d5e7b1f34adc671c3f4f7ec478 SHA512 1aa7adc347a44202db854badd85b130de772b1522cb7a73cc7a94b00116f981fc96e42eb8514eb7ff9abe5c9c4ff5e29aeaaf7962e654a9867c78bc8d0eca10a WHIRLPOOL de2590ca0950e87fdfab77866c0dab7b4a7b3513aef59c10fce23a69bdad1a417347fd6afc695d7bbc4be561c9ce7f799aa22af171d066deeb3c3475786251ca
 EBUILD netbeans-javacard-9999_p20160503.ebuild 4971 SHA256 f3bc609cb166322b8b586eed1d7010a257c94551d31cc7fb14f7ad98db8bcf52 SHA512 1e1e595a038a97219c35994845b4f9831200a1102085f07619dc86419dee31c4c1fd592677e5002afd9a614546ee58c0cf67f6dba4b582222550db56a70c28db WHIRLPOOL 3729a64a54290c31b326a25606cdfbdf654e3e8a61e188ca46d6b59643973190ee467c73946dec94c85d4f2fbfc800fc69707c4f3e0d8adc697e24dd4a4516c9
 EBUILD netbeans-javacard-9999_p20160504.ebuild 4971 SHA256 98273508f1245cbc3ff5f62168907ef1c19a44dc02dac2ee02ead909b80da237 SHA512 fa8e305896ffb5fcc4d85a0af45ada636160a0c98222699a1696a25757bc278817180002817f8efa35fabff4871d6339f890ffb60438f66f3cac14a2f7d6fe6b WHIRLPOOL e2ec096db9bfe78dd28bd52bd87d187587d01845457885585f4f9f6b05720e160d1b3d3162a9e0511b4a680f3cb1b373eaa5400e224e32ae0d56d5dee1d40583

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

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index c120899..0098dba 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -5,7 +5,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201605010002-src.zip 213455252 SHA256 a7b4106579fbeddedac626ccd40f58b1ddc18259470a5166bde4959c25a346e9 SHA512 a10b319508becdd5af6e11db80443099997276faad942d22f24513d131c4627d38fcfa1facc74ad3d7ebe2625592e1797de1cbc1988e4d5eb75f2fad178f947a WHIRLPOOL 46c57850d95b3329747584e59389560dc678f1124bf5ff438068c1a04116970342fae1aa34e5ccb3607e068f91e7e6e0f45f7749b8c5a67fec0da55e885ab746
 DIST netbeans-trunk-nightly-201605020002-src.zip 213470717 SHA256 8c1cde7797484c52ae985c6530de6c6974c57d161647a32f642477c86801b3b4 SHA512 b0bdaf6d39d979a1b8bb41088ffe3780630daf3eeb7729b705a09a522bf91717ea4bd5e658aa8d144da96f98a0ea52747f15f9f073c22b67f8ddffb2a2bcf474 WHIRLPOOL 20909f886215edac9c8377d3ee7d1270942848eb94a083f0601d6c328e004f6a1bf87c2d153d739a63278274a71cebb2de00d9bf4b05707c60557cb400bfbc06
 DIST netbeans-trunk-nightly-201605030002-src.zip 213470987 SHA256 8b9ab96283609fdfc78049ea636a19a1fb2677e4edcbb35ec7d94e0caf1284f8 SHA512 e79b403d69494721e8e86582886fbb4a5a2c31f98dce774c5a6a0863578dd0539cd86ee4a7fcca1c5ec2ef6c7cfbe7b8f07baefb3edc739f040c994f56ce514b WHIRLPOOL ddedf8c5cfd452f3a2dbd0fa852f9d466d2b94f677856ac811628de771badc2ea7d9c89e9689d32048e19bc3cb97507de4ace8c783560c77d1072bca2f96f829
 DIST netbeans-trunk-nightly-201605040002-src.zip 213470987 SHA256 432c7c5f60ad6fc195670d1f5aa4e901bde3538ea8d39fd0f66adf0a08fb4ecb SHA512 da79460085abe594e24f5b6a38507c3e73d8d94efd864701aba78747e54e5cdb9ed7a8a2e685c1a8ff2083cde142029e23bc36732dcc841128bf367d945ee906 WHIRLPOOL 994721d231ae5258710349c5f463d538ba345a23cfc22da4b15079277a8cf4103dd6a0bcf8f008aa0a47377ebadac7c74271ea10a2274f1f74a85ad4ab0a9e78
@@ -31,7 +30,6 @@ DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec3
 DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 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_p20160501.ebuild 6293 SHA256 14a2b8104c6610ccfe87e304b13c2cdfedc0930fe86859785f068d39f2fe6a59 SHA512 8bd214c082b67f02d54685afcfe14b9866ec97b73a32a33491b5a578a7e29fbb1f7f920c0f7256fec423d73877185a344a439fc1b71a104ff2232337b5d30177 WHIRLPOOL 1568e72c7205e3c5d21f65039dee6f279fb00c930844b4a49dc2ef73efd2944bbd63e5c82e070d5521ee171f5eea5a1e852b5e802575f5d841d812b7ad80f5fa
 EBUILD netbeans-javadoc-9999_p20160502.ebuild 6293 SHA256 321fa1be64ee5a4c557a387b8d010ce48d45c0c468866fc353c5c42a5f54aaec SHA512 40afac19230235d3cca267cb50be701b252d05410088904873973cf876a643087317252736b169e806000ef374f0d44dc3758571a1781f8b9ce745f5b91fe3a8 WHIRLPOOL 746ca31c1475cd802ee70fc03748d0e90c6c6d71e3687a2ddc4f79a268e6775a7cb06f4e80a176f715a902729d612b843b875ccc1d5ad7793146398cc50794a6
 EBUILD netbeans-javadoc-9999_p20160503.ebuild 6293 SHA256 c8dbe927c4ef271466c10f65ff77a111aa2b1b0df52c9d5081e781b61af64059 SHA512 6b5ec94157bfbf34f41f84389c97f494a941ca066a3805bae9290fa8d43842baa577fbc51c17ac838bfe444206b236a595c6c87a9816126e6f9e13ab64f2fd62 WHIRLPOOL 7b9b68900440bc794bae91ee6953b80a55ae9926781c6aba83120cd362e73a8e8252a1681223b9a4580b0a86d79c7777a8de1f04e571eda2800cf7289990e9d2
 EBUILD netbeans-javadoc-9999_p20160504.ebuild 6293 SHA256 770899b7b69f99b7788378b46aaf348a1ee11165e321163df3914fbfddd40e07 SHA512 9103411121d8578aeaf55f4e6bd2e42c9085091ee50cf8746206e992c74b1dde18ce6a2180481aa701dede757c6a729b1ec95f53ef65fcb21372075d492f02d6 WHIRLPOOL 9efed21e05bcedc9f1111776278ec86b7fec14660056fd6730f67620d405a2de73dece8be2b4291cf908ef6613fba3fd548b33ba8fa2fed90fd76c6a9ec4e55a

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

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 5477086..3eb504e 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -11,7 +11,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201605010002-src.zip 213455252 SHA256 a7b4106579fbeddedac626ccd40f58b1ddc18259470a5166bde4959c25a346e9 SHA512 a10b319508becdd5af6e11db80443099997276faad942d22f24513d131c4627d38fcfa1facc74ad3d7ebe2625592e1797de1cbc1988e4d5eb75f2fad178f947a WHIRLPOOL 46c57850d95b3329747584e59389560dc678f1124bf5ff438068c1a04116970342fae1aa34e5ccb3607e068f91e7e6e0f45f7749b8c5a67fec0da55e885ab746
 DIST netbeans-trunk-nightly-201605020002-src.zip 213470717 SHA256 8c1cde7797484c52ae985c6530de6c6974c57d161647a32f642477c86801b3b4 SHA512 b0bdaf6d39d979a1b8bb41088ffe3780630daf3eeb7729b705a09a522bf91717ea4bd5e658aa8d144da96f98a0ea52747f15f9f073c22b67f8ddffb2a2bcf474 WHIRLPOOL 20909f886215edac9c8377d3ee7d1270942848eb94a083f0601d6c328e004f6a1bf87c2d153d739a63278274a71cebb2de00d9bf4b05707c60557cb400bfbc06
 DIST netbeans-trunk-nightly-201605030002-src.zip 213470987 SHA256 8b9ab96283609fdfc78049ea636a19a1fb2677e4edcbb35ec7d94e0caf1284f8 SHA512 e79b403d69494721e8e86582886fbb4a5a2c31f98dce774c5a6a0863578dd0539cd86ee4a7fcca1c5ec2ef6c7cfbe7b8f07baefb3edc739f040c994f56ce514b WHIRLPOOL ddedf8c5cfd452f3a2dbd0fa852f9d466d2b94f677856ac811628de771badc2ea7d9c89e9689d32048e19bc3cb97507de4ace8c783560c77d1072bca2f96f829
 DIST netbeans-trunk-nightly-201605040002-src.zip 213470987 SHA256 432c7c5f60ad6fc195670d1f5aa4e901bde3538ea8d39fd0f66adf0a08fb4ecb SHA512 da79460085abe594e24f5b6a38507c3e73d8d94efd864701aba78747e54e5cdb9ed7a8a2e685c1a8ff2083cde142029e23bc36732dcc841128bf367d945ee906 WHIRLPOOL 994721d231ae5258710349c5f463d538ba345a23cfc22da4b15079277a8cf4103dd6a0bcf8f008aa0a47377ebadac7c74271ea10a2274f1f74a85ad4ab0a9e78
@@ -37,7 +36,6 @@ DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec3
 DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 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_p20160501.ebuild 4717 SHA256 f0ecd168349409c2dd21a4a45fa112ad5b83d5b7cd3561675e6869d4eca7ce64 SHA512 c8d52fa78e6ffdda9405f23d294b266fa2da681ffdc8e87b069d9ec0821b35bf7c5ed6b3a35ac07306c04360d6a15a258e42d3287a78c582c71aec70527f9331 WHIRLPOOL db49db9187b1ea76a565c537571a0c724b0eebe2cd001e7df0277f779ccf5b7601339a33b47224371fb7fa2f96144a6dc77a7a481b4a8befb8373d68eb930d9d
 EBUILD netbeans-javafx-9999_p20160502.ebuild 4717 SHA256 99cba31b312ffcbdd073b3ebc0d85cd4e770e1e30975b595aae575d24773659a SHA512 79138d2667d91ae4420874a215aa43c0d9792ce6486a680517f452ac4a89fbec8365fbe5cfde95bb76aa734fd8097578f2c1b988b2854688eb601075f935687f WHIRLPOOL 8e70e46837ac60433e87eefba59bc211fc9a731037c5b2882d39ed9df3f38a439d4143e5758dfd3ac55c427a662d054fef3fb6f85b5fe712d03466e8d37afb5a
 EBUILD netbeans-javafx-9999_p20160503.ebuild 4717 SHA256 1497caa7198e289752e62e546bb4a54758bc0b3597cc6797aa4fa3a7187a6d50 SHA512 687399208c40ebfa438cd6348c3b2815fe4d06c52ccb5f9302e5adcbdf7ebd1ddcce9e571e6ff7d28501fce2044a571e52ed523dfadb6c86bf5e6e7b07930551 WHIRLPOOL 70b93e33ec9cdf3b23e4506a349e1f88f872bfd33ff2e8f96b13e500fbf56e55affa6c7d9d828464530e2ed18ca54da0cbbe924cd9f2cdbff1b4881a26d7805b
 EBUILD netbeans-javafx-9999_p20160504.ebuild 4717 SHA256 3894459832bf08e92e080547141bcb2da3644d9974b253893010098c1652b359 SHA512 64c6ae542d2f2666b6ddc574f0629e6e9c6926d03dd123ca29af0c8564947f87f3590f067245ea11912cb821312968cbcf174fa05c832914f80465bd3303b6c0 WHIRLPOOL 021ac25942d4c82aab28a24914f8e4b0ce24476675dcea19f54b2328a421df05815beec354461f6faca99828c3ccb8e0808cd9aa12f2fbf8a7d4d8bb2335dcd4

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

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 92ec4ab..7fb7ae7 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201605010002-src.zip 213455252 SHA256 a7b4106579fbeddedac626ccd40f58b1ddc18259470a5166bde4959c25a346e9 SHA512 a10b319508becdd5af6e11db80443099997276faad942d22f24513d131c4627d38fcfa1facc74ad3d7ebe2625592e1797de1cbc1988e4d5eb75f2fad178f947a WHIRLPOOL 46c57850d95b3329747584e59389560dc678f1124bf5ff438068c1a04116970342fae1aa34e5ccb3607e068f91e7e6e0f45f7749b8c5a67fec0da55e885ab746
 DIST netbeans-trunk-nightly-201605020002-src.zip 213470717 SHA256 8c1cde7797484c52ae985c6530de6c6974c57d161647a32f642477c86801b3b4 SHA512 b0bdaf6d39d979a1b8bb41088ffe3780630daf3eeb7729b705a09a522bf91717ea4bd5e658aa8d144da96f98a0ea52747f15f9f073c22b67f8ddffb2a2bcf474 WHIRLPOOL 20909f886215edac9c8377d3ee7d1270942848eb94a083f0601d6c328e004f6a1bf87c2d153d739a63278274a71cebb2de00d9bf4b05707c60557cb400bfbc06
 DIST netbeans-trunk-nightly-201605030002-src.zip 213470987 SHA256 8b9ab96283609fdfc78049ea636a19a1fb2677e4edcbb35ec7d94e0caf1284f8 SHA512 e79b403d69494721e8e86582886fbb4a5a2c31f98dce774c5a6a0863578dd0539cd86ee4a7fcca1c5ec2ef6c7cfbe7b8f07baefb3edc739f040c994f56ce514b WHIRLPOOL ddedf8c5cfd452f3a2dbd0fa852f9d466d2b94f677856ac811628de771badc2ea7d9c89e9689d32048e19bc3cb97507de4ace8c783560c77d1072bca2f96f829
 DIST netbeans-trunk-nightly-201605040002-src.zip 213470987 SHA256 432c7c5f60ad6fc195670d1f5aa4e901bde3538ea8d39fd0f66adf0a08fb4ecb SHA512 da79460085abe594e24f5b6a38507c3e73d8d94efd864701aba78747e54e5cdb9ed7a8a2e685c1a8ff2083cde142029e23bc36732dcc841128bf367d945ee906 WHIRLPOOL 994721d231ae5258710349c5f463d538ba345a23cfc22da4b15079277a8cf4103dd6a0bcf8f008aa0a47377ebadac7c74271ea10a2274f1f74a85ad4ab0a9e78
@@ -29,7 +28,6 @@ DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec3
 DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 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_p20160501.ebuild 4412 SHA256 61dc15ad1cd7fe38074f69ce55dabbe21c9411b0b0b6c7ecf66cdd0a010c5b60 SHA512 3d2680d61f56b9b68199753404f44a963d422160afdda7506b0870b86779a111c752e813ccc5268424065873912dee94b888afc68a1f7da1e5b041a41f3d7b1d WHIRLPOOL 042a22ced9beea19b7b69c467e82af1204460a609d711c4eee9a23bb9739cb9e895d9a5a4fc298ee4dfc0fba8bfd67210272fabfbf95114371d7651a45de1e01
 EBUILD netbeans-mobility-9999_p20160502.ebuild 4412 SHA256 ec1973a0bf6c6ae42c6ad3b37676d2b359a614f7060b8d46cd66ace048b8d4fe SHA512 d71101f52819dd13cf5d8d5ee98a0c8b51dbcacb2c5ff9e080fc6c125945e82f3ffb1f798286123085ae32785f180ac2edd04a096d15ce88162669a48a8c2d6e WHIRLPOOL cd2bb026d60172cbbb40f20e36965b45db61ee4441e7dac57b1042f5f29eb0b7be32d5f94b3a19ad0dd0782fa9aed3dedf3342c177265b0b3eb5f91020589283
 EBUILD netbeans-mobility-9999_p20160503.ebuild 4412 SHA256 db16b9cafbbe1ea448c41cf21fb32d2f596c44776b4bb55f3320dba1be5acb51 SHA512 760ac72d6df8b83a6409c8e616289e2b84ce713569969f49b1a55d803bca57449fdf66ab0a372428d06313a2419f80d03402e83d4db94366ea7fc73d835c0fd8 WHIRLPOOL abbda021986b9cbc45d2328dca66cf4057650121773e0a35f6e020f0cff81d6e4fbdff1ff20d09a4d844ed7c49f09a8ae5a99113ed1ac267287a9d49bd4d370f
 EBUILD netbeans-mobility-9999_p20160504.ebuild 4412 SHA256 f7988d1e68fe142d6f5cdc907d482dcb99c01476a09be0300c595b5bd3182077 SHA512 746da96d0b6eefc0f1edb31c90f35afd746b0e58d931c55f0dcd927b2c40a10233f401995413163d38665efe091648b1ef0b6811cddec50ca92206e4ef7ef8cc WHIRLPOOL 223bb579a3c350bce903419abe394c8222d6db2bf6559ee116a8fcda295c079d2a73bc541b1e813ec1b48e6e43b61f330e64c38a71941a41d1d6488a365e6243

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

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 101cac1..abb2f9c 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201605010002-src.zip 213455252 SHA256 a7b4106579fbeddedac626ccd40f58b1ddc18259470a5166bde4959c25a346e9 SHA512 a10b319508becdd5af6e11db80443099997276faad942d22f24513d131c4627d38fcfa1facc74ad3d7ebe2625592e1797de1cbc1988e4d5eb75f2fad178f947a WHIRLPOOL 46c57850d95b3329747584e59389560dc678f1124bf5ff438068c1a04116970342fae1aa34e5ccb3607e068f91e7e6e0f45f7749b8c5a67fec0da55e885ab746
 DIST netbeans-trunk-nightly-201605020002-src.zip 213470717 SHA256 8c1cde7797484c52ae985c6530de6c6974c57d161647a32f642477c86801b3b4 SHA512 b0bdaf6d39d979a1b8bb41088ffe3780630daf3eeb7729b705a09a522bf91717ea4bd5e658aa8d144da96f98a0ea52747f15f9f073c22b67f8ddffb2a2bcf474 WHIRLPOOL 20909f886215edac9c8377d3ee7d1270942848eb94a083f0601d6c328e004f6a1bf87c2d153d739a63278274a71cebb2de00d9bf4b05707c60557cb400bfbc06
 DIST netbeans-trunk-nightly-201605030002-src.zip 213470987 SHA256 8b9ab96283609fdfc78049ea636a19a1fb2677e4edcbb35ec7d94e0caf1284f8 SHA512 e79b403d69494721e8e86582886fbb4a5a2c31f98dce774c5a6a0863578dd0539cd86ee4a7fcca1c5ec2ef6c7cfbe7b8f07baefb3edc739f040c994f56ce514b WHIRLPOOL ddedf8c5cfd452f3a2dbd0fa852f9d466d2b94f677856ac811628de771badc2ea7d9c89e9689d32048e19bc3cb97507de4ace8c783560c77d1072bca2f96f829
 DIST netbeans-trunk-nightly-201605040002-src.zip 213470987 SHA256 432c7c5f60ad6fc195670d1f5aa4e901bde3538ea8d39fd0f66adf0a08fb4ecb SHA512 da79460085abe594e24f5b6a38507c3e73d8d94efd864701aba78747e54e5cdb9ed7a8a2e685c1a8ff2083cde142029e23bc36732dcc841128bf367d945ee906 WHIRLPOOL 994721d231ae5258710349c5f463d538ba345a23cfc22da4b15079277a8cf4103dd6a0bcf8f008aa0a47377ebadac7c74271ea10a2274f1f74a85ad4ab0a9e78
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec3
 DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 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_p20160501.ebuild 4111 SHA256 c1614bfd761c708c87b954056fa11b5c2b6bac87ce8968726083c85e69f6e4f5 SHA512 d226c25458c4c4f39e91cf096d6a359f7e98d94ec7e7c62c9d5f4476de1376e7a8d1b2161e7a82d1bfda8517ec56161a6795ec0bd306ca07f30223bc1609477f WHIRLPOOL bb89de7317da7399c0cb5a61605b4f0c27f7b88408280e76ece221188ab56a3cfe7cb5666e29177797c98f307511fba312b955b2ce55215e812da8f7cb0a1053
 EBUILD netbeans-nb-9999_p20160502.ebuild 4111 SHA256 d8fd57a5a3dd88f2094a9907d366860628b7fdefbac46f963646904fdcb0525a SHA512 ab61d3d17e69af1022a790d29bab39ca7e09f397cc9865490dd3695612b5ebf5e247e4ccd8896b7ff20b90267835c0a97d388a50337e53787f782c8cab3f7281 WHIRLPOOL 4fb9a0859e77a96d1da9ad9095355f345a3874cc67a3e319abdab82f1c67f82f513ed308b079ca208d220b03466ce9f5e0ca370e6bf7d799f5bfc78948c1bd10
 EBUILD netbeans-nb-9999_p20160503.ebuild 4111 SHA256 488f1d22725b25ce6a25eabfc76b5f6480a95c88ce4b630136ac003eabc03c6c SHA512 8ed2fac63cbd2767ef86d2a6c48e80e00941774399d801fe90cafb4662d7277c8ad2a571a11f46a8f9d054059226bde0a4043cfca2ed0d4ac7b96811295b78fc WHIRLPOOL 72e64e3e14000ac7338f02949ad4c0bcb4ebae72eca81284627e2f3b6a5ad778883857ce20c273dd04cb935f6ba1a3ea281432fe5a5b07cadbf9ecef78281500
 EBUILD netbeans-nb-9999_p20160504.ebuild 4111 SHA256 d63657e534e89717ce6210fc9ed515fa14d7bf9111aea2ed5527be63cb371960 SHA512 f0d127a55947f276d51d7ded38a4c7408ecc7ddfdb500f1c1a910060ea1eaff92a43aaa9fa0ef6c67458b4cb7581288ddb0dc688affd5a20629afae7c1415fb3 WHIRLPOOL 49caa2aae9a378d6dc206bbf46d04284c3e42cde501ec1af5af860c755bd434b687da20b398b174af517713e9692d3c843a2b94e05d7dff9008478203a1a8315

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

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index 0d6f562..e35f202 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -8,7 +8,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201605010002-src.zip 213455252 SHA256 a7b4106579fbeddedac626ccd40f58b1ddc18259470a5166bde4959c25a346e9 SHA512 a10b319508becdd5af6e11db80443099997276faad942d22f24513d131c4627d38fcfa1facc74ad3d7ebe2625592e1797de1cbc1988e4d5eb75f2fad178f947a WHIRLPOOL 46c57850d95b3329747584e59389560dc678f1124bf5ff438068c1a04116970342fae1aa34e5ccb3607e068f91e7e6e0f45f7749b8c5a67fec0da55e885ab746
 DIST netbeans-trunk-nightly-201605020002-src.zip 213470717 SHA256 8c1cde7797484c52ae985c6530de6c6974c57d161647a32f642477c86801b3b4 SHA512 b0bdaf6d39d979a1b8bb41088ffe3780630daf3eeb7729b705a09a522bf91717ea4bd5e658aa8d144da96f98a0ea52747f15f9f073c22b67f8ddffb2a2bcf474 WHIRLPOOL 20909f886215edac9c8377d3ee7d1270942848eb94a083f0601d6c328e004f6a1bf87c2d153d739a63278274a71cebb2de00d9bf4b05707c60557cb400bfbc06
 DIST netbeans-trunk-nightly-201605030002-src.zip 213470987 SHA256 8b9ab96283609fdfc78049ea636a19a1fb2677e4edcbb35ec7d94e0caf1284f8 SHA512 e79b403d69494721e8e86582886fbb4a5a2c31f98dce774c5a6a0863578dd0539cd86ee4a7fcca1c5ec2ef6c7cfbe7b8f07baefb3edc739f040c994f56ce514b WHIRLPOOL ddedf8c5cfd452f3a2dbd0fa852f9d466d2b94f677856ac811628de771badc2ea7d9c89e9689d32048e19bc3cb97507de4ace8c783560c77d1072bca2f96f829
 DIST netbeans-trunk-nightly-201605040002-src.zip 213470987 SHA256 432c7c5f60ad6fc195670d1f5aa4e901bde3538ea8d39fd0f66adf0a08fb4ecb SHA512 da79460085abe594e24f5b6a38507c3e73d8d94efd864701aba78747e54e5cdb9ed7a8a2e685c1a8ff2083cde142029e23bc36732dcc841128bf367d945ee906 WHIRLPOOL 994721d231ae5258710349c5f463d538ba345a23cfc22da4b15079277a8cf4103dd6a0bcf8f008aa0a47377ebadac7c74271ea10a2274f1f74a85ad4ab0a9e78
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec3
 DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 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_p20160501.ebuild 4418 SHA256 ad569b03a531d0e4eaccd190d7a2dcd9f8b434985d15a2bc99ffe64cc979ea7d SHA512 97c89219d690002189730eac296bce7d6311562fbfef7e001bd5ce4db7ab33a22bfc221878333a6578bff0807871b8f91072c0c5583e24693d22064baa42b20b WHIRLPOOL 8064da38ce3b23eec056056d88db7a24b4af20798913b57c8c1b6c7af2c1c12a3a1ca8d88dcdae751bf211fd2488f66cf99cbfd401ef99d38a946c02b63b16ea
 EBUILD netbeans-php-9999_p20160502.ebuild 4418 SHA256 70762ccc0f5198382ab91dfcf9990dce6a258b307287b0a745d3b68581fdbb95 SHA512 bc25db57ba7a2b6abadc1f857522a3e1f87f8a429f4d9f673f64357ccc063b75bbbcb2db4474112dc9926a73485ab9bc27b3fb4de59550156c5ea683e759c647 WHIRLPOOL 18faef17cf35b46ecab383dd703f2fa5aca559546ab0090d1bc157b1517e6a578ad0a255bfaf12d275efa2c0444fa9abf28a6c68e157b63f26f6dc3edbbbf6dc
 EBUILD netbeans-php-9999_p20160503.ebuild 4418 SHA256 ad09c924f69bad6800d9c3a7282ad056d902821d57736f5ca24e02d1d782effc SHA512 1833dcbf7a20ba94f1e1425ebaa408c3a82dd47f9ca3efb0ee689e3e20bb6e18d067888328eb957531532a74cf55f34f4a42048886a67b3fac64537914c53023 WHIRLPOOL f80c990f0eeb230bfb6438264044ff5cfccc295356137178b98a0c2ed0df006b2512dc8406baa0f67194c476426b7cd48d9dcd591ac7e2664265fa737efeb6a9
 EBUILD netbeans-php-9999_p20160504.ebuild 4418 SHA256 b094c476e852d45c2dd8cbc2d18073efc5eed074739012b7a491b097b76a6b6f SHA512 f0c8c072b965db70ee275224c9b079ebc8fde531b0924c40e981f0461bb2d77902c81817420e885610d73c80d48683bd7ac9e14170eae66c18f7f0a2011ad9c3 WHIRLPOOL 27e8d60216c3d27716fd095288040e389207a0da7ee006a031312195a870e82024ccca26181d0470f7e450d1a980e860cbc159bab1ef3f4c66bed8a894bf61da

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160501.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160501.ebuild
deleted file mode 100644
index fadc3d7..0000000
--- a/dev-java/netbeans-php/netbeans-php-9999_p20160501.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans PHP Cluster"
-HOMEPAGE="http://netbeans.org/projects/php"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-05-01_00-02-33/zip/netbeans-trunk-nightly-201605010002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip
-	http://hg.netbeans.org/binaries/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-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip php.phpdoc.documentation/external/phpdocdesc.zip || die
-	ln -s "${DISTDIR}"/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-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into libs.javacup/external javacup javacup.jar java-cup-11a.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-webcommon-${SLOT} webcommon || die
-	cat /usr/share/netbeans-webcommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.webcommon.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/php >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/php$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext
-	pushd "${instdir}" >/dev/null || die
-	rm java-cup-11a.jar && java-pkg_jar-from --into "${instdir}" javacup javacup.jar java-cup-11a.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/php
-}

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index ec3f936..26ed55e 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -29,7 +29,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201605010002-src.zip 213455252 SHA256 a7b4106579fbeddedac626ccd40f58b1ddc18259470a5166bde4959c25a346e9 SHA512 a10b319508becdd5af6e11db80443099997276faad942d22f24513d131c4627d38fcfa1facc74ad3d7ebe2625592e1797de1cbc1988e4d5eb75f2fad178f947a WHIRLPOOL 46c57850d95b3329747584e59389560dc678f1124bf5ff438068c1a04116970342fae1aa34e5ccb3607e068f91e7e6e0f45f7749b8c5a67fec0da55e885ab746
 DIST netbeans-trunk-nightly-201605020002-src.zip 213470717 SHA256 8c1cde7797484c52ae985c6530de6c6974c57d161647a32f642477c86801b3b4 SHA512 b0bdaf6d39d979a1b8bb41088ffe3780630daf3eeb7729b705a09a522bf91717ea4bd5e658aa8d144da96f98a0ea52747f15f9f073c22b67f8ddffb2a2bcf474 WHIRLPOOL 20909f886215edac9c8377d3ee7d1270942848eb94a083f0601d6c328e004f6a1bf87c2d153d739a63278274a71cebb2de00d9bf4b05707c60557cb400bfbc06
 DIST netbeans-trunk-nightly-201605030002-src.zip 213470987 SHA256 8b9ab96283609fdfc78049ea636a19a1fb2677e4edcbb35ec7d94e0caf1284f8 SHA512 e79b403d69494721e8e86582886fbb4a5a2c31f98dce774c5a6a0863578dd0539cd86ee4a7fcca1c5ec2ef6c7cfbe7b8f07baefb3edc739f040c994f56ce514b WHIRLPOOL ddedf8c5cfd452f3a2dbd0fa852f9d466d2b94f677856ac811628de771badc2ea7d9c89e9689d32048e19bc3cb97507de4ace8c783560c77d1072bca2f96f829
 DIST netbeans-trunk-nightly-201605040002-src.zip 213470987 SHA256 432c7c5f60ad6fc195670d1f5aa4e901bde3538ea8d39fd0f66adf0a08fb4ecb SHA512 da79460085abe594e24f5b6a38507c3e73d8d94efd864701aba78747e54e5cdb9ed7a8a2e685c1a8ff2083cde142029e23bc36732dcc841128bf367d945ee906 WHIRLPOOL 994721d231ae5258710349c5f463d538ba345a23cfc22da4b15079277a8cf4103dd6a0bcf8f008aa0a47377ebadac7c74271ea10a2274f1f74a85ad4ab0a9e78
@@ -55,7 +54,6 @@ DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec3
 DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 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_p20160501.ebuild 9520 SHA256 912f5c47542f2ba7bd1346560e45a1ca3907cc170f7e1cae4b52fbdd6718b0d4 SHA512 eadb5d0993bcb3d967ed896be1ec6ed4027b3e4c5f58c8b5ed16c904f935c7d96ce0d8c9c2020fa59ed6930f9d51c79fc02ed5cf83ccd695cc9a1462f26738f7 WHIRLPOOL f4db4d1809e6864dbcb998146e76f960af1194a86fe7980a957aa74f6fa9d9ef5fa0f2e0e2bbcafe07eaa34b1463dc0ff801ff5f021adb3f741c08ecf43479da
 EBUILD netbeans-platform-9999_p20160502.ebuild 9520 SHA256 120ce8ceb2ea1911763bdeb73e92a2457162758eb96a2c86ebcbee33e0de22e7 SHA512 3ced85584823ec88387296c00218d059f3ff0e85c6ccf4c2ec52961b97de2df33aee86e93e65001fbb5acd1f716dc4125bb4995327b945e77e94c7a73a173aef WHIRLPOOL b34bab9a4495e3af2e94f00b29c64dcd77d0d9be093ce81173badd33e158eeffd4a482e89bf9272570193415b12600946fd27eba36cc297a2cceecf48a60cc47
 EBUILD netbeans-platform-9999_p20160503.ebuild 9520 SHA256 903c426a635c7ddd29a796db966b93baa97953ccf8585e3316979e13dffb86e9 SHA512 de823aee3bf8842bec043ba4f3a061a8f02c60879ecd1498ed3b0d8158a891eda9ee2198896cab7ff144eaf7bc963aea013bd14c7b644dc237d2eb28d287136e WHIRLPOOL 9f4f6106b2c9cb1cfc45cbe786b62efc424d4ced78a42fcb4b1fceddecaccd23a4a9c26bedbcfde8c8e22255aef23391deed2ab9cae21968dc76faf30eaf1996
 EBUILD netbeans-platform-9999_p20160504.ebuild 9520 SHA256 320af491ea11228284b5b0136022cf38410e21896161e954890346a6e7e84b80 SHA512 c51e39c09a321535d67d7d02ac8c8f137f195a684a43707addd56122cccf4c5417c2d1f5019c720a96509d8d1d422cb81816c4efc51aa141f4a6d17ffa96dca4 WHIRLPOOL ddccabae29674a78d9980693dc6706c447216fdb53952288f890f58c4424a1e6f37852880b75405dad60f40c05a5f756fa3e8a16953d4d3ac99bf67ba5b3341f

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

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 7bf3e03..c9b4b5b 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201605010002-src.zip 213455252 SHA256 a7b4106579fbeddedac626ccd40f58b1ddc18259470a5166bde4959c25a346e9 SHA512 a10b319508becdd5af6e11db80443099997276faad942d22f24513d131c4627d38fcfa1facc74ad3d7ebe2625592e1797de1cbc1988e4d5eb75f2fad178f947a WHIRLPOOL 46c57850d95b3329747584e59389560dc678f1124bf5ff438068c1a04116970342fae1aa34e5ccb3607e068f91e7e6e0f45f7749b8c5a67fec0da55e885ab746
 DIST netbeans-trunk-nightly-201605020002-src.zip 213470717 SHA256 8c1cde7797484c52ae985c6530de6c6974c57d161647a32f642477c86801b3b4 SHA512 b0bdaf6d39d979a1b8bb41088ffe3780630daf3eeb7729b705a09a522bf91717ea4bd5e658aa8d144da96f98a0ea52747f15f9f073c22b67f8ddffb2a2bcf474 WHIRLPOOL 20909f886215edac9c8377d3ee7d1270942848eb94a083f0601d6c328e004f6a1bf87c2d153d739a63278274a71cebb2de00d9bf4b05707c60557cb400bfbc06
 DIST netbeans-trunk-nightly-201605030002-src.zip 213470987 SHA256 8b9ab96283609fdfc78049ea636a19a1fb2677e4edcbb35ec7d94e0caf1284f8 SHA512 e79b403d69494721e8e86582886fbb4a5a2c31f98dce774c5a6a0863578dd0539cd86ee4a7fcca1c5ec2ef6c7cfbe7b8f07baefb3edc739f040c994f56ce514b WHIRLPOOL ddedf8c5cfd452f3a2dbd0fa852f9d466d2b94f677856ac811628de771badc2ea7d9c89e9689d32048e19bc3cb97507de4ace8c783560c77d1072bca2f96f829
 DIST netbeans-trunk-nightly-201605040002-src.zip 213470987 SHA256 432c7c5f60ad6fc195670d1f5aa4e901bde3538ea8d39fd0f66adf0a08fb4ecb SHA512 da79460085abe594e24f5b6a38507c3e73d8d94efd864701aba78747e54e5cdb9ed7a8a2e685c1a8ff2083cde142029e23bc36732dcc841128bf367d945ee906 WHIRLPOOL 994721d231ae5258710349c5f463d538ba345a23cfc22da4b15079277a8cf4103dd6a0bcf8f008aa0a47377ebadac7c74271ea10a2274f1f74a85ad4ab0a9e78
@@ -29,7 +28,6 @@ DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec3
 DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 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_p20160501.ebuild 3472 SHA256 794b895163a115d66300b5244d187bb69561c68a70f897c343543fe71a4388a1 SHA512 1ae2b824b9bdea9144ede93766731e14fa6da3a0ab31564a7cd804131d91e057a28f8c7c17bb6a1d2c8e28a9aa07c32178ac2371ec8a17f59eab7eab593f369a WHIRLPOOL e279409b9f9524718c2f5f054e8eb4e11d6684bf8aabe1bcfa69fffe48afa3d57490a2c29e898c5db7037707274707905485200c0805f1fcec509df1f5e05c11
 EBUILD netbeans-profiler-9999_p20160502.ebuild 3472 SHA256 81bcae6670d7e2aeecf9c201b2575f0c00541e55ecc13e50ebbc94cd9510edd4 SHA512 bc2c582baa2520f4564efb2ffbb772a088a4c9f1868dec6f87d8bc04a249325dcad1d4de896bed48d4dd52ad32776e7b7cd1d3b45e06f3e710ea33e4b8a37465 WHIRLPOOL 5e301f57535532fb52a19642a74454b288caa3a2e4a40e04d3133665e5849217ed65f12095c47fe3cbf9dd239774adb7f8e47085df73c76ab74ab6b8cf319ee0
 EBUILD netbeans-profiler-9999_p20160503.ebuild 3472 SHA256 45d6b2f6df23c0ca47594939d357cc9908d8ce38746fdc09c41989822790d058 SHA512 faeb5fcda08c79f4b0b97ab55d6174b099b16971064d013f1d8f6b8a43afe8fc294241f0435e7f7467410ce117127a840f7a69142ac411771c2ff262e27ae316 WHIRLPOOL 1da4f015db6a0a6b75d773bbad12c9892da935b2030e2bd9085264a72e6873cf9a6308706b5cac207509f76dbe340833a4f1c7c4f1749428bd0d06f553a63d1a
 EBUILD netbeans-profiler-9999_p20160504.ebuild 3472 SHA256 4697a61068993189cb57243e3b58064ff2dadcafa4f837d183796ca3ecda725b SHA512 062fc04edeebbfe6a15609f3a5e35b69d1a38476ba970f8f502188e8e6e581cf6cf3bdb06026290a13c781a4c0ee75b88e081f308c3e191c5ee3c3409304e347 WHIRLPOOL 0dc2c8f418946e3c94b6f7b07c3bcbd571495f60a30475a13f11d7a77452a876b38b79012fbe558f9f67e28d9ae9af74e898c405619d6f04747a9451b35cb6fe

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

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index 824d576..d7ea0be 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -18,7 +18,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201605010002-src.zip 213455252 SHA256 a7b4106579fbeddedac626ccd40f58b1ddc18259470a5166bde4959c25a346e9 SHA512 a10b319508becdd5af6e11db80443099997276faad942d22f24513d131c4627d38fcfa1facc74ad3d7ebe2625592e1797de1cbc1988e4d5eb75f2fad178f947a WHIRLPOOL 46c57850d95b3329747584e59389560dc678f1124bf5ff438068c1a04116970342fae1aa34e5ccb3607e068f91e7e6e0f45f7749b8c5a67fec0da55e885ab746
 DIST netbeans-trunk-nightly-201605020002-src.zip 213470717 SHA256 8c1cde7797484c52ae985c6530de6c6974c57d161647a32f642477c86801b3b4 SHA512 b0bdaf6d39d979a1b8bb41088ffe3780630daf3eeb7729b705a09a522bf91717ea4bd5e658aa8d144da96f98a0ea52747f15f9f073c22b67f8ddffb2a2bcf474 WHIRLPOOL 20909f886215edac9c8377d3ee7d1270942848eb94a083f0601d6c328e004f6a1bf87c2d153d739a63278274a71cebb2de00d9bf4b05707c60557cb400bfbc06
 DIST netbeans-trunk-nightly-201605030002-src.zip 213470987 SHA256 8b9ab96283609fdfc78049ea636a19a1fb2677e4edcbb35ec7d94e0caf1284f8 SHA512 e79b403d69494721e8e86582886fbb4a5a2c31f98dce774c5a6a0863578dd0539cd86ee4a7fcca1c5ec2ef6c7cfbe7b8f07baefb3edc739f040c994f56ce514b WHIRLPOOL ddedf8c5cfd452f3a2dbd0fa852f9d466d2b94f677856ac811628de771badc2ea7d9c89e9689d32048e19bc3cb97507de4ace8c783560c77d1072bca2f96f829
 DIST netbeans-trunk-nightly-201605040002-src.zip 213470987 SHA256 432c7c5f60ad6fc195670d1f5aa4e901bde3538ea8d39fd0f66adf0a08fb4ecb SHA512 da79460085abe594e24f5b6a38507c3e73d8d94efd864701aba78747e54e5cdb9ed7a8a2e685c1a8ff2083cde142029e23bc36732dcc841128bf367d945ee906 WHIRLPOOL 994721d231ae5258710349c5f463d538ba345a23cfc22da4b15079277a8cf4103dd6a0bcf8f008aa0a47377ebadac7c74271ea10a2274f1f74a85ad4ab0a9e78
@@ -44,7 +43,6 @@ DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec3
 DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 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_p20160501.ebuild 5343 SHA256 bef5fcc213310d5b1df7c0a0d2af6a28cc3035944d00843247ecec53d41e9dcb SHA512 ed0de8ae761c24b315048af1e6c72f566fa5313da7c869d869ff135f24f74bcc954a70ca67bb2661352bb71dbb825ffc593f77d5fa01b9d382639e2a64c972e4 WHIRLPOOL 39ddca6c2fc8ba1af6ea708d383dfee193da6c65c8f1a769755e98776b19b29ae38be100ea082cc224a9f6c977e5b2a7901aa4dcc49b125a8b8a20072341a334
 EBUILD netbeans-webcommon-9999_p20160502.ebuild 5343 SHA256 a863a5358e781c3e039804720a2268b41b39e286b0fd86dc6aa0338c5d4f8c10 SHA512 cbc21112d353fc78a14420a9946ec8dedf011a891d54af666a47b1d49c90d47c0023c075dd1cda3f686364a3828c2a31595ca088bc870b78e81a2914db7e054a WHIRLPOOL 7592c0b2074343a4a769258265c7a4bf461449b0fa193447b72af0d2135ee59602584361873f6f25bf91d4be87bf63367d290622008f7f35da9a6235f970fceb
 EBUILD netbeans-webcommon-9999_p20160503.ebuild 5343 SHA256 b66720c2d5d69bd45597651577772acdb782a51b7e3766d4dd05671da15429d2 SHA512 e9f2e26ec32e0847ccd1341349b91b1a37f3055c715e36ae67211382ad9348e211a28e448a27177c315bb2ed56ed5332a7887b916d767ba3740a123597ab1654 WHIRLPOOL 8a9e07744f900ae91a69a85efec6f4fc4a0d3a97409cbb6bd48a3c85f7e5a0378916eabbc412e9abcf3c8e6529d21994269db7183035a2e540697efa9c12afbe
 EBUILD netbeans-webcommon-9999_p20160504.ebuild 5343 SHA256 2d468847b7d3f115b58a6e563a8d29e95d5ef7fcf41481ceef85399efa65efc3 SHA512 9c25c38711702eee5ffdc102368960a9316b50f96d351e4ffa6ca90527a41e1e292c02f88e0f3c57840598c2f3828e24fe00436b745aa5b47ba26f5149dd0e09 WHIRLPOOL 71bfcd16afa5a5a9f9bb28847f00ee51acdae1788aeb70f5f3eeee7d8067d677e1d25950359735c8c401a5956d5494da4cd714e7e28eaab07d6839851ced93a1

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

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index db44216..6e3c280 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201605010002-src.zip 213455252 SHA256 a7b4106579fbeddedac626ccd40f58b1ddc18259470a5166bde4959c25a346e9 SHA512 a10b319508becdd5af6e11db80443099997276faad942d22f24513d131c4627d38fcfa1facc74ad3d7ebe2625592e1797de1cbc1988e4d5eb75f2fad178f947a WHIRLPOOL 46c57850d95b3329747584e59389560dc678f1124bf5ff438068c1a04116970342fae1aa34e5ccb3607e068f91e7e6e0f45f7749b8c5a67fec0da55e885ab746
 DIST netbeans-trunk-nightly-201605020002-src.zip 213470717 SHA256 8c1cde7797484c52ae985c6530de6c6974c57d161647a32f642477c86801b3b4 SHA512 b0bdaf6d39d979a1b8bb41088ffe3780630daf3eeb7729b705a09a522bf91717ea4bd5e658aa8d144da96f98a0ea52747f15f9f073c22b67f8ddffb2a2bcf474 WHIRLPOOL 20909f886215edac9c8377d3ee7d1270942848eb94a083f0601d6c328e004f6a1bf87c2d153d739a63278274a71cebb2de00d9bf4b05707c60557cb400bfbc06
 DIST netbeans-trunk-nightly-201605030002-src.zip 213470987 SHA256 8b9ab96283609fdfc78049ea636a19a1fb2677e4edcbb35ec7d94e0caf1284f8 SHA512 e79b403d69494721e8e86582886fbb4a5a2c31f98dce774c5a6a0863578dd0539cd86ee4a7fcca1c5ec2ef6c7cfbe7b8f07baefb3edc739f040c994f56ce514b WHIRLPOOL ddedf8c5cfd452f3a2dbd0fa852f9d466d2b94f677856ac811628de771badc2ea7d9c89e9689d32048e19bc3cb97507de4ace8c783560c77d1072bca2f96f829
 DIST netbeans-trunk-nightly-201605040002-src.zip 213470987 SHA256 432c7c5f60ad6fc195670d1f5aa4e901bde3538ea8d39fd0f66adf0a08fb4ecb SHA512 da79460085abe594e24f5b6a38507c3e73d8d94efd864701aba78747e54e5cdb9ed7a8a2e685c1a8ff2083cde142029e23bc36732dcc841128bf367d945ee906 WHIRLPOOL 994721d231ae5258710349c5f463d538ba345a23cfc22da4b15079277a8cf4103dd6a0bcf8f008aa0a47377ebadac7c74271ea10a2274f1f74a85ad4ab0a9e78
@@ -29,7 +28,6 @@ DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec3
 DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 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_p20160501.ebuild 2721 SHA256 501e07a6c138fd4e9715930b8d2956e13546e0258fa110a9159adad86826a562 SHA512 6ff1d7136df2e779f98365cabb6a7238bef9b7a23ff6d18d867eebd2e7166fc3622128b8238f1efe736ac053d498379230e9c366bd8d1cf9026abb93d2a54b58 WHIRLPOOL 3ceb05b176db00e27c98020c5a21b45d804063bc59b8af46a68582a841ab32e0856aa95b67ad07b48339556bd95b2365dfbc36c32972d2958631d647bcefa843
 EBUILD netbeans-websvccommon-9999_p20160502.ebuild 2721 SHA256 6e6c12f345d828034981c7c6e064c924d9d213370be49fccb2e30071e5078764 SHA512 c215041638073f32f57303f8ee474afa3c01402b9471d1e4248a0f3354aaa684e2944762b5c2427cc24cfb40d1ca41878b0d744df9d630ed7477c00faec37a69 WHIRLPOOL e2f5f0e90ec30ea6f6b7fcaa4c505653794286b19699cdf880d235a4f0a55abb7b7a6911d171bcb79042bce3fd366ecb6a3da39b2ec9cc150e97c503ea3de6dd
 EBUILD netbeans-websvccommon-9999_p20160503.ebuild 2721 SHA256 39777018dc783385280185f49573b042622a64ae778620e0b29f5056470af076 SHA512 7642d488ab1a95c0734f34609c15bc11eba7e2efcb91cce1c704e457c669f678ba9d48e8c539dd151e3c90575937f441d3e9afe75cf6c5355649cbb3aa8997aa WHIRLPOOL 6dd6057f26799dd7cf0915148660da6d569840573878078a680580d15a01f2777166ce38b8e2c4ab8acb90dfcced3a5b7b25026419a5df13fe0097ece72a3187
 EBUILD netbeans-websvccommon-9999_p20160504.ebuild 2721 SHA256 d58def77d55ba6634020de8c5e911d345f57be1158751c1ae4fff48af779b80d SHA512 331b1da4785b102ce530f46d92a4639d1ef8e80cfa9cdd8c9a9d16bd577858617c0ee13d45f1754e84930a979bacaf8234a181f8657b32ee50e4db01894f1065 WHIRLPOOL 8ae70e56197a4ea5f8b967d230db11d7b817589b750e92814eb8fbe9915cb31c050f2e16e8b3a74638fb06f962166d435014892a84471bd1150bf3bed3503601

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

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 788620e..2a5f07c 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99e
 DIST netbeans-l10n-8.0.1-20141110.tar.bz2 12065358 SHA256 542d325cbc6e0e617f6076e964e37803ec322b6d0ee4724a6d2127f2f480fb24 SHA512 28242dcbe7bcbc6a9abce15dfe6fd6140a275a417d96ff28228315bdc0ce8110ede899a1815e2fdf9115b48221d50cd3ff5b71a15d36316d04d81f66e9c0cac4 WHIRLPOOL 0318caea3463d3f7bb8876774b1cc9467dadd9bc36497a9304ed12900e2fabdc4dcdfec0b9eaee27bb36c39e9caff3743c5a42ad4c3a432205a716832688c4d6
 DIST netbeans-l10n-8.1-20151105.tar.bz2 11945028 SHA256 33e86aa7315021d28fdb64790233327d7599c98bcf3ab9d936b6fe924884325a SHA512 eb3163eaa8add417a0e8ac3ed4923a6e4992a80eaac00a01eed24e0e1ceb8a5cbd308659bcf0e5e1192ac8e84a79ea36744ad6b2589d60891b03b37102e9435d WHIRLPOOL f214a865bfd8c54341fb9d538da6db4d9b24906b0d94b3ee6cbf4a525e8842d28e852febb2f34c4c31f989d1b6baf750480bc2f04d94bcd7a8bdb8c9553ef590
 DIST netbeans-l10n-9999-20131010.tar.bz2 12440242 SHA256 64c48605820ec1f35e38c34b48cc16cd40c053d085d50819d4b4e9a80453dfa9 SHA512 7d4d61fa61710186fefd90721598ec635db7c6249ce6fc484fd5813636220f163b60230349c984c398c87e083d2d629c531fe5b4cea3752ebbcaa9823b701a02 WHIRLPOOL 10506e3a3004d6c0ab17b05507f72db2c25d2713c3233a7f5478da27d3b1261b5fb6d5f71cbf369858668ca2d1219dad1900c6c42d3f250adcc935e846e56b09
-DIST netbeans-trunk-nightly-201605010002-src.zip 213455252 SHA256 a7b4106579fbeddedac626ccd40f58b1ddc18259470a5166bde4959c25a346e9 SHA512 a10b319508becdd5af6e11db80443099997276faad942d22f24513d131c4627d38fcfa1facc74ad3d7ebe2625592e1797de1cbc1988e4d5eb75f2fad178f947a WHIRLPOOL 46c57850d95b3329747584e59389560dc678f1124bf5ff438068c1a04116970342fae1aa34e5ccb3607e068f91e7e6e0f45f7749b8c5a67fec0da55e885ab746
 DIST netbeans-trunk-nightly-201605020002-src.zip 213470717 SHA256 8c1cde7797484c52ae985c6530de6c6974c57d161647a32f642477c86801b3b4 SHA512 b0bdaf6d39d979a1b8bb41088ffe3780630daf3eeb7729b705a09a522bf91717ea4bd5e658aa8d144da96f98a0ea52747f15f9f073c22b67f8ddffb2a2bcf474 WHIRLPOOL 20909f886215edac9c8377d3ee7d1270942848eb94a083f0601d6c328e004f6a1bf87c2d153d739a63278274a71cebb2de00d9bf4b05707c60557cb400bfbc06
 DIST netbeans-trunk-nightly-201605030002-src.zip 213470987 SHA256 8b9ab96283609fdfc78049ea636a19a1fb2677e4edcbb35ec7d94e0caf1284f8 SHA512 e79b403d69494721e8e86582886fbb4a5a2c31f98dce774c5a6a0863578dd0539cd86ee4a7fcca1c5ec2ef6c7cfbe7b8f07baefb3edc739f040c994f56ce514b WHIRLPOOL ddedf8c5cfd452f3a2dbd0fa852f9d466d2b94f677856ac811628de771badc2ea7d9c89e9689d32048e19bc3cb97507de4ace8c783560c77d1072bca2f96f829
 DIST netbeans-trunk-nightly-201605040002-src.zip 213470987 SHA256 432c7c5f60ad6fc195670d1f5aa4e901bde3538ea8d39fd0f66adf0a08fb4ecb SHA512 da79460085abe594e24f5b6a38507c3e73d8d94efd864701aba78747e54e5cdb9ed7a8a2e685c1a8ff2083cde142029e23bc36732dcc841128bf367d945ee906 WHIRLPOOL 994721d231ae5258710349c5f463d538ba345a23cfc22da4b15079277a8cf4103dd6a0bcf8f008aa0a47377ebadac7c74271ea10a2274f1f74a85ad4ab0a9e78
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec3
 DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 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_p20160501.ebuild 6939 SHA256 1bdd1f5c7b30de8b6f63cbd53511be3d582e6f2fffc633a2d4c2705a418cc346 SHA512 8d3eb1c918965ada9e9616b02702ff99720924d90efb54ee18c6fa2bb607ddc5c0b6ec1b6901a86899f0c7f5a7a01b57c626a056c5478ae8d4c316c9912b78c3 WHIRLPOOL 06046d1514f4506cd4e21497828b50954d50b2090f8be7b881b814e454d2fc1e00bd6666afef7d1157cc90e256fa93f5c87d4088b694a32b186d74ee3d7d1b02
 EBUILD netbeans-9999_p20160502.ebuild 6939 SHA256 46d0e665741d74a91a5e0bbef743895431a32f3cd1d4feffbbaf3199594f55eb SHA512 983e1fd8bfd97f66250a76d1eb403d15ff05bc9bbdabc3282c013b1f61aaac818d60b43706aafa73f3ce6087a489fc312ab93e942d33434335c81431f72c9ae7 WHIRLPOOL 04db2f46ec42d8b60085b34ab2970b443890c9bb46dd7e7d6fd2b5834d0ca8517cb53541315414eef8e63788287ec361a5e8ae5e350621a622002f20d12fbf27
 EBUILD netbeans-9999_p20160503.ebuild 6939 SHA256 a8b4b8aac0ea7f87d2cc2dda3c9d8db634c12dae128ba1fa37ce95f915e579eb SHA512 a1d2d7eb5b0e58709c443ccb7b9248da16b8f0a7b7d31468d434e599bd4c82532d055ddbae3428af73e75e44d42f330e807643abca6987da7fd2314ad4b89904 WHIRLPOOL 55580bcd31b09a0642742334b8561f263a06d3881e7a0e8ea58274841d8a6b0533c864c110b592f1e10d9771b7f5a65968e07181b7aeab1c5ba3ff5b862a633d
 EBUILD netbeans-9999_p20160504.ebuild 6939 SHA256 fb4ecf8ad8f283ba5f1e6f50d92ed5ff13af9a8ddb8585a1991d0494146e3a32 SHA512 b87ee9e8cca27e61cc565807d286b944883c9fb87cd093418dc39e8d0c1d10c91d503a651e863a277208f6bdae878f9d5e1b2463bf0612119e4f29ce899f06aa WHIRLPOOL 1d75ac0ebe89c386fb1a714b8dded9e3a36bded586f76f2559eebb332419f291267bd25289e11eb3ab61bb7baae1ceb5849877bf6847783eb6dd848b8b6dd95b

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