public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-ergonomics/, dev-java/netbeans-java/, ...
@ 2016-03-31  9:48 Miroslav Šulc
  0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2016-03-31  9:48 UTC (permalink / raw
  To: gentoo-commits

commit:     de98bf075a397fb807bda44a1532ce0e4784855b
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 31 08:25:48 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Mar 31 08:25:48 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=de98bf07

netbeans: removed obsolete ebuilds

Package-Manager: portage-2.2.28

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 1b320d7..5c2b917 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -4,8 +4,6 @@ DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r15-build.xml.patch.bz2 2680 SHA256 d686f1e352eae400393577a456042f4475b9c321369101d2f05ec627aa61ef0c SHA512 7428b664749878fd1ead2c821277769a5af9636388515a4786284568ea656734ba2a9e90758385f5b6a0c009469df3dcc005936c8865c93cc9bc29576d2171e4 WHIRLPOOL fea09d3b1e2cc07e090a9618cbdaf6b2e3d4cab9679fdb4321a856922035871e485f492e6298e7e2562d8ecba626f2bdb3130f09840e83878e3c1e6fd6944899
-DIST netbeans-trunk-nightly-201602260002-src.zip 209828915 SHA256 79e707455e36ff5602efab93c10a4d1a2548e51b8ce9799f9793fe24eb029302 SHA512 f506d2ec8b3ffd8ece1f08ced77579e816df11afa8e85246eaa04c166c67e306ee20b3afe5dd856ac1d47ce2a97f9bce69ffdffc5ee38df633a7abc441a2a25c WHIRLPOOL 88f6627dc291e47e487359d7bda443a228ff258269a715d561faa4af4c4e57ac98a3179f3e9fb7150504f1a6dedaddec3d21f38f88eb7f3e99eae4fd2e51cd54
-DIST netbeans-trunk-nightly-201602270002-src.zip 209831963 SHA256 20b41ce3e47c43d3e255e9833fa3f2c3bcd48876ff620c40ed93c878c7abd883 SHA512 980ab79ed39cea631f45d7609b5d3bd8e8310737d7934dbe6a3f93f9c31031d5b38c40370ef6d35898bb7f39eb7a72a00ea1715a77b12678eb5d3a2e2f12a76a WHIRLPOOL f4a058519c51572208225a141a6745583c6ce1019e4d4b2ae994e0b6dd000034e330113decdfc2a6589025e61d11583852e64e121dd42fd833552d35f9ba748a
 DIST netbeans-trunk-nightly-201602280002-src.zip 209832078 SHA256 9db7e895e76748c876558471306afbb5a6af856a8cb391248be4f8d700cb0fc0 SHA512 41bfbb29f4e9760e11336d13908703b13276dac95dd070945963a213969dbdfa844e96340a0ec7e32d721cda3bd11a7f940855a3b1ddccd3d3349b32efcf4c36 WHIRLPOOL e2ca8afcc4a6a1b5a8f19958df6015709542f0d896bd7f9b35fbb7671571732fb1931a5de6e1e0deb21ee86fdecdf2a013ff319d76e1569f8c0ba2b252e959d6
 DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf77015ad8c9ca15c1a54953eec0492be748fde20af0b464700c80f SHA512 56d79deda1cb4624b7136c0028d8786ee5f560aef52f305548654b873232a968b0bd25322c53caa44c61dd0557d177c5725eaed4b6b6e554920e9f5e8b8dcf85 WHIRLPOOL e0bd59c30e04b4a67b7924890f0e377bbb120564a155815b1aa64a28da7f835362e583333240672aeb2b39d63c5c37e2739d4a9e9f25488ce2cfb5ee1e475569
 DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
@@ -26,8 +24,6 @@ DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a5747
 DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 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_p20160226.ebuild 3384 SHA256 18676f86e44d877da64e956673a5b86fcd9665e69204457d44edce3c259c2090 SHA512 3993374523b2f7f4c4bd3a2632590bf995018fa6d45e379be0b6a58081eca543f355671302a5a35f0c74ac1a42776cf9cefe438159e0debcaebe9b11d8040cd6 WHIRLPOOL c6392ed9c67796607dc259cefd70456ed84e94139b63242477c687e4960798df5eb126999d0a073056186300843fd89540579c81abc1aaa84bc8f8d48cb9e56d
-EBUILD netbeans-apisupport-9999_p20160227.ebuild 3384 SHA256 2efccee0bd25f948ac65bda4752252dc59151d766968af7bb531bcaaf85483d1 SHA512 edec51a8c7b7d8ebedd69d32f90579a155dd144ef018e8d054b248fbb2f645d42b25b4829afed7b163e46ee46eca827f7ebd837a4c4a9129867e3bd8a5c7eb76 WHIRLPOOL 3570112194a7004dfefe0aa03225435ddafb43e3569e6f975d75a6ccd786d2253a7cfd8c80699ae0b13203a91befb863c2a889ff8b0f9e39d7f8236b5ce300fd
 EBUILD netbeans-apisupport-9999_p20160228.ebuild 3384 SHA256 4adc3912092c462be45c4fb7c2829bbe73ef96e8ebbaeb3d375416f46328a921 SHA512 a7f7bc4e3634e9a756b131557cf05d8514f59cefcb0a1a512dafce78443f7779fefd20c3231a6eaaf01616969555ce455871f94703ef196103770d0b2ed46d10 WHIRLPOOL b601297fb3e10c289b746ff2ff00381283c13416b8a9b838a8fbb8c795651956cb69d93e26205ce7ed31cec1f39f2e9d98fe59cf9922e391f15305b2bee5dbb2
 EBUILD netbeans-apisupport-9999_p20160229.ebuild 3384 SHA256 e4b8c6afc031afef4828e9a4773371fe40445b7409492fd53542b88e151c9b7c SHA512 d1f1eaa96a59e5aac0555191d2db5f4e924c31519f369e0d85b6aa7455800921721e9d558973b03e6bd9f13c5e0b620b61be426dc66d36f5b34e6888ff1c5b2e WHIRLPOOL 22d56c488a09149d69068bb776e1a90196583468307f522eb4b759f13a32905da9e9ec904b1dec82a53fd3855b88ad02cc541bfa072f588edb7e92bfc8d54173
 EBUILD netbeans-apisupport-9999_p20160301.ebuild 3384 SHA256 bc496d7d5faaa39aca9ad51b65c1c8c71d02d4b57a7ff6264db502aae696d776 SHA512 f04f8e72750c0f768a1647d649d3165389dfb9703f15b0693a2f71953e394fe7e3ee0f5cbecb9f49906020475b50e303f8f99afa54226d82dd506c10be54bfcd WHIRLPOOL dc92d3f9f6ecf88294c19fb822f5122896f137bb7085a72484cfee0af3e40946b8d2988cf01dc6e493655c89f16baed2e0517e0cdf8c623a0bcbc5105eaa594d

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160226.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160226.ebuild
deleted file mode 100644
index 2ef134f..0000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160226.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-02-26_00-02-15/zip/netbeans-trunk-nightly-201602260002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r14-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-apisupport/netbeans-apisupport-9999_p20160227.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160227.ebuild
deleted file mode 100644
index 32441af..0000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160227.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-02-27_00-02-15/zip/netbeans-trunk-nightly-201602270002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r14-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 73455ff..7e952b5 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -3,7 +3,6 @@ DIST 2BCF2047382FB68A2F275677745C80E79B4046AB-cnd-rfs-1.0.zip 152701 SHA256 ee45
 DIST 38DAC4EB409E96D3AABD4D3F5807505BB751C043-clank_0.3.6.zip 7448420 SHA256 a3bd876e500feb3f90b760e625f0be9a4962133758708ccacc4844b9add86aa3 SHA512 c220f6c592d29d2a9c5946de84d6bd8c76d2b9f6aa01405c13e5af44bf6c574a3ca221cd1f18d757f0501e91794128ed3681e783e7b997385a71bcd20c53ca6d WHIRLPOOL 7754189e7fef3578e8b6b56f8642db94d7e25ad6635abb25ad87e88dc2470279b21b53b72fb11de6ae1d6f6dfd813a68042e093b22a99235f10cefbf03129e4d
 DIST 4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar 164365 SHA256 8633aa79a2566f51a089195e09a4581af3ee71bfc13eb234af5e0cf6383078b4 SHA512 f1300e2d1e47659f6113a0a3dcc953766b5a8ab32f13bedf4d6ac652ffcf828c17474d47edec08d7ad9039d7abb8570770b48fa53b8ff6b47a028836490777bc WHIRLPOOL 765c87803d9cf622ae7936cb922ad9bff8823a09baf01a6c8b4a81df8ba5fd7cd17b513b36da9910b75349de45185f4641680f35be8335e08b9c30283b6d3345
 DIST 5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar 2388361 SHA256 9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7 SHA512 04be4dfba3a21f3ab9d9e439a64958bd8e844a9f151b798383bd9e0dd6ebc416783ae7cb1d1dbb27fb7288ab9756b13b8338cdb8ceb41a10949c852ad45ab1f2 WHIRLPOOL 488b7b9af1d1d06cca163d43e7be190730e2f0421796c21a26ace11196ee37a16b1bdeea78a1e2e64f8ca0e87f67a2aecd066af21505f3dd92dd76de40a94fa0
-DIST 688488BF9E65AC39749AF959A5653F536EDABACD-clank_0.3.6.zip 7548154 SHA256 a73d7132dd4975afde7deb961d686ba0e1db132537847883d640da218bc79ff1 SHA512 c49e4cdb65b050a682bdca47e4ccaedd68e2b37768f024ed6162e49821b7c98e94ebc533d59f3dcdc18f918de237aa261753d319cd274dd3b3c405f5e42b69bd WHIRLPOOL af9b669227ae611116b2d93740eac429be16b8ff78c312f848aeab4fca31a8b2e9ed5b96e976a81591f702e6636fc753ccc35118dbd1fb36cccc988fa076bf5e
 DIST 83DB4623F3B6A93E0B36BC341C3C1B926749ED67-clank_0.3.6.zip 7377394 SHA256 3564dd4787f2716bf01accddb360ff25144cf0f43873291df94e0b677871f5bf SHA512 ff176f6df346f0ec63305ffead6f55d5c74a8fd13ab79caf481c9e571d1abad5a121123ad3ccd05d4757d609eae2bc5c8812c042c3531afc3a1f82e1ade22927 WHIRLPOOL 75af0bcf265071aacb69656d9e90119c8b39800f09d5a6fe953001384cc6e9bb92bcd88e98dd676ffae1225b56710d134e8a80d47314efb835cd1933b221887d
 DIST 99529DC0E1426A102A98EF5494B6F6AA6E497F62-clank_0.3.6.zip 7930942 SHA256 ad9a64303fc4db833d2789a7d5b0be537ea7db55090189411e5778efff54a8a6 SHA512 46d91f0cbe86af186b87e6b972ecc9391f5b2a670eaf7238b60bb5399c0da40382c729338d1e2cf8ab94eb4ac64bfe9253da1cfad2ec900a87d56df4d299d707 WHIRLPOOL 52ab6b35eaa04d0e375bc4aaad43c4390021309da1956e81db6ba4fc8730da147f35eeceb8a02fa7e42e315296e8be3eb03d88d7d8987fdce30ec433ac5c407b
 DIST BB83D4F8047D608858154CB041054F5CAE35B903-cnd-rfs-1.0.zip 177647 SHA256 c92c3d3311b8f75883f4f9280fe8d6932b154c67c9dd1bd65a49beb45e578cd1 SHA512 c42e4f0c1b7efb24a45dc375180bfc8b0e02e74e01233665d3e74bf83a182c2b0bbe8b572a8eeb993d77312f6d118777d0576adfca4ea8f4c2cfe08892155345 WHIRLPOOL 41b573c7ca4b926333f28a9329a2423955055ff716e7be03b7a6f4714e7261e57574b16a0e89b96ae744dc0a36f9a4a72f8d948b11a6b8052159d42cbd40876a
@@ -18,8 +17,6 @@ DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r15-build.xml.patch.bz2 2680 SHA256 d686f1e352eae400393577a456042f4475b9c321369101d2f05ec627aa61ef0c SHA512 7428b664749878fd1ead2c821277769a5af9636388515a4786284568ea656734ba2a9e90758385f5b6a0c009469df3dcc005936c8865c93cc9bc29576d2171e4 WHIRLPOOL fea09d3b1e2cc07e090a9618cbdaf6b2e3d4cab9679fdb4321a856922035871e485f492e6298e7e2562d8ecba626f2bdb3130f09840e83878e3c1e6fd6944899
-DIST netbeans-trunk-nightly-201602260002-src.zip 209828915 SHA256 79e707455e36ff5602efab93c10a4d1a2548e51b8ce9799f9793fe24eb029302 SHA512 f506d2ec8b3ffd8ece1f08ced77579e816df11afa8e85246eaa04c166c67e306ee20b3afe5dd856ac1d47ce2a97f9bce69ffdffc5ee38df633a7abc441a2a25c WHIRLPOOL 88f6627dc291e47e487359d7bda443a228ff258269a715d561faa4af4c4e57ac98a3179f3e9fb7150504f1a6dedaddec3d21f38f88eb7f3e99eae4fd2e51cd54
-DIST netbeans-trunk-nightly-201602270002-src.zip 209831963 SHA256 20b41ce3e47c43d3e255e9833fa3f2c3bcd48876ff620c40ed93c878c7abd883 SHA512 980ab79ed39cea631f45d7609b5d3bd8e8310737d7934dbe6a3f93f9c31031d5b38c40370ef6d35898bb7f39eb7a72a00ea1715a77b12678eb5d3a2e2f12a76a WHIRLPOOL f4a058519c51572208225a141a6745583c6ce1019e4d4b2ae994e0b6dd000034e330113decdfc2a6589025e61d11583852e64e121dd42fd833552d35f9ba748a
 DIST netbeans-trunk-nightly-201602280002-src.zip 209832078 SHA256 9db7e895e76748c876558471306afbb5a6af856a8cb391248be4f8d700cb0fc0 SHA512 41bfbb29f4e9760e11336d13908703b13276dac95dd070945963a213969dbdfa844e96340a0ec7e32d721cda3bd11a7f940855a3b1ddccd3d3349b32efcf4c36 WHIRLPOOL e2ca8afcc4a6a1b5a8f19958df6015709542f0d896bd7f9b35fbb7671571732fb1931a5de6e1e0deb21ee86fdecdf2a013ff319d76e1569f8c0ba2b252e959d6
 DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf77015ad8c9ca15c1a54953eec0492be748fde20af0b464700c80f SHA512 56d79deda1cb4624b7136c0028d8786ee5f560aef52f305548654b873232a968b0bd25322c53caa44c61dd0557d177c5725eaed4b6b6e554920e9f5e8b8dcf85 WHIRLPOOL e0bd59c30e04b4a67b7924890f0e377bbb120564a155815b1aa64a28da7f835362e583333240672aeb2b39d63c5c37e2739d4a9e9f25488ce2cfb5ee1e475569
 DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
@@ -40,8 +37,6 @@ DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a5747
 DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 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_p20160226.ebuild 4790 SHA256 3bf157310b9648255834e8329ea52e7313483edc9a019600d7454d040c25a957 SHA512 ddec7543bf7b250d53bf5e2375d927bdaafe8387cd34f4e90686163a9943e41fe86f1427a34b6b47c43f71d58be11bbceefc3904bba95c352138ff2051a53c2a WHIRLPOOL c129fb90dc65276a1035e9a8edbb1df541945d68c709e2e9d8e30da46402e647d52f923f984317ab6794f43b04e12f4869e1be69cc21e65ef866c304ca6d2042
-EBUILD netbeans-cnd-9999_p20160227.ebuild 4790 SHA256 ef9657d75aa49cf78a681fb9659c0c2d1b7615e1b9b243055003a2a7ff57bbd7 SHA512 b79df91c064773512df2844a998776879ad5d546e3a3e40fb6a47203ef93d01980020f8ee02953ac3c69f1179a26f6aa5de2b053d13075302d01f5aac853f637 WHIRLPOOL 9092f73997e94df54b0af6233e82a8918ff94f73e73bb55e7f85f53807768450acd19891d1d5d324a448d521b760bcdc94f3c1486f850f569afeef1e16347b30
 EBUILD netbeans-cnd-9999_p20160228.ebuild 4790 SHA256 c11294caa490fabcd55224143363eb4715b9fec9f84637e3cc4995a17309c592 SHA512 f08c6dcd72b749486fd11371e41593c36fe7e8752f2094f4fe5f488ca6c082b8111fc33abb26066602475d701fcba5e3e357fb434dc146372a59898f5997c104 WHIRLPOOL c85b2014b20dd5aec2920dfbbd056ca9b6fbd6e9e92ca7e4f3279c91fa5c8dfc68e937a8f43543a6eea84be9f4f578fc90f2d0e599ede388099395105e9b3358
 EBUILD netbeans-cnd-9999_p20160229.ebuild 4790 SHA256 74b2157db3713934fab04ddde204329dae8247bbbb96c463da916439b274ee5e SHA512 d8bbf0f669e846f4d92e6acd540f239b677c697d9917a97d165205c4ef93d6e05f9dccf6bbaa162a833a49071dd81d66e8f7a1f67ef922d84935d338c0c465ce WHIRLPOOL 8e6f2c9e2f988e67e653ffdf22d0fcebd513c7703bbc3f3b2ef095a574e4b2cedb8f601cf73f978cade6b77a9e1b7141f73cc92ba39a3cb8ebcb6a8208a1cac0
 EBUILD netbeans-cnd-9999_p20160301.ebuild 4790 SHA256 c4ff4c63830e905be2de9225034efed5b779d9965419a772b2f8fb9dce52a28e SHA512 6ba447e36b0ae8cf00c52a9e499a38f0efdd15f18bc00636ac74052056c2a4bf9931a85213789037e91387108e9142bd3a7deb3e93018edaec1e73a2ca22f973 WHIRLPOOL 25545f3c8932f03c3a18ae359812009d3c28bd6afd94f34cd1e115c845dfafc219bfa99a65ad27a81b375a9cac3fa7aa022b688f993d404112930956ef2851a1

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160226.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160226.ebuild
deleted file mode 100644
index 62bca02..0000000
--- a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160226.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-02-26_00-02-15/zip/netbeans-trunk-nightly-201602260002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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/688488BF9E65AC39749AF959A5653F536EDABACD-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-r14-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}"/688488BF9E65AC39749AF959A5653F536EDABACD-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-r14-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.1.0.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-cnd/netbeans-cnd-9999_p20160227.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160227.ebuild
deleted file mode 100644
index ca70332..0000000
--- a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160227.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-02-27_00-02-15/zip/netbeans-trunk-nightly-201602270002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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/DD5ECBE848DDC19E34F4ABB74A7C1950C0F587CA-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-r14-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}"/DD5ECBE848DDC19E34F4ABB74A7C1950C0F587CA-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-r14-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.1.0.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 54b035d..f685118 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -7,8 +7,6 @@ DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r15-build.xml.patch.bz2 2680 SHA256 d686f1e352eae400393577a456042f4475b9c321369101d2f05ec627aa61ef0c SHA512 7428b664749878fd1ead2c821277769a5af9636388515a4786284568ea656734ba2a9e90758385f5b6a0c009469df3dcc005936c8865c93cc9bc29576d2171e4 WHIRLPOOL fea09d3b1e2cc07e090a9618cbdaf6b2e3d4cab9679fdb4321a856922035871e485f492e6298e7e2562d8ecba626f2bdb3130f09840e83878e3c1e6fd6944899
-DIST netbeans-trunk-nightly-201602260002-src.zip 209828915 SHA256 79e707455e36ff5602efab93c10a4d1a2548e51b8ce9799f9793fe24eb029302 SHA512 f506d2ec8b3ffd8ece1f08ced77579e816df11afa8e85246eaa04c166c67e306ee20b3afe5dd856ac1d47ce2a97f9bce69ffdffc5ee38df633a7abc441a2a25c WHIRLPOOL 88f6627dc291e47e487359d7bda443a228ff258269a715d561faa4af4c4e57ac98a3179f3e9fb7150504f1a6dedaddec3d21f38f88eb7f3e99eae4fd2e51cd54
-DIST netbeans-trunk-nightly-201602270002-src.zip 209831963 SHA256 20b41ce3e47c43d3e255e9833fa3f2c3bcd48876ff620c40ed93c878c7abd883 SHA512 980ab79ed39cea631f45d7609b5d3bd8e8310737d7934dbe6a3f93f9c31031d5b38c40370ef6d35898bb7f39eb7a72a00ea1715a77b12678eb5d3a2e2f12a76a WHIRLPOOL f4a058519c51572208225a141a6745583c6ce1019e4d4b2ae994e0b6dd000034e330113decdfc2a6589025e61d11583852e64e121dd42fd833552d35f9ba748a
 DIST netbeans-trunk-nightly-201602280002-src.zip 209832078 SHA256 9db7e895e76748c876558471306afbb5a6af856a8cb391248be4f8d700cb0fc0 SHA512 41bfbb29f4e9760e11336d13908703b13276dac95dd070945963a213969dbdfa844e96340a0ec7e32d721cda3bd11a7f940855a3b1ddccd3d3349b32efcf4c36 WHIRLPOOL e2ca8afcc4a6a1b5a8f19958df6015709542f0d896bd7f9b35fbb7671571732fb1931a5de6e1e0deb21ee86fdecdf2a013ff319d76e1569f8c0ba2b252e959d6
 DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf77015ad8c9ca15c1a54953eec0492be748fde20af0b464700c80f SHA512 56d79deda1cb4624b7136c0028d8786ee5f560aef52f305548654b873232a968b0bd25322c53caa44c61dd0557d177c5725eaed4b6b6e554920e9f5e8b8dcf85 WHIRLPOOL e0bd59c30e04b4a67b7924890f0e377bbb120564a155815b1aa64a28da7f835362e583333240672aeb2b39d63c5c37e2739d4a9e9f25488ce2cfb5ee1e475569
 DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
@@ -29,8 +27,6 @@ DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a5747
 DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 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_p20160226.ebuild 2968 SHA256 4b6fb15fa3f63b94f65b14f049c54f3f2dadbb677f5f7d48d57a157a226e9163 SHA512 c92e9235c6225d58e87f64d581b2b0b6de951e794c863f2a54fd0965b9d25540465ffb06ffa3ffac12098fa17d9ac1497ac34755c1162b3f43990373df527e2e WHIRLPOOL af62f009adff8f896bf803c4e9b3dd014198fa3c40bb127e9adcb18efab16fb3fefc94e84a2eff096142b520eab30ecdcfb18269ec93ac9a67e6c684292744da
-EBUILD netbeans-dlight-9999_p20160227.ebuild 2968 SHA256 4d99e8510350e13b6c99f530d22d3c0a550682442a1488c6ef110f0c2fb043f5 SHA512 e9923afb997f4882628f3ff18bd62f1db3f5ff6952acd35b96475db07db359d49553ed8b3f63c5b16e67dc2ed1c49f16dbb7599b03b5b6111f7f43417dda93e7 WHIRLPOOL 172c4aa4c7807d834bb0ff5bc8ac739d0d43d18f13f6747d2f328459a0ec9d0a2d8e03673f672579a607c2cde3be932cce098880e2026e31ed4074de655b4e0f
 EBUILD netbeans-dlight-9999_p20160228.ebuild 2968 SHA256 7555125dde1124332a3c4cf423bbbeba04027e5c333116d27b8db0b1aa1ab33b SHA512 a415f56a5c5b7e2e1c85508cb8b8d464b4205e49aefc927ce648c094f5958ba7583ac3dffdddce64f9534523199798c7ca6a58c7bb1789fae037fdee307c16d9 WHIRLPOOL 0438dd5b7944528a8f8378ba75fd294a158096545a0a82a558d1c7aac7047f08c8ff28db79bb4d5922282d2e5720c2a62f08369a5b0b36d33207fbd030d7b9ea
 EBUILD netbeans-dlight-9999_p20160229.ebuild 2968 SHA256 d04df2ff784e14a7fb4d457d8b16170dee91d7b4eb55643ba3836e903bec2658 SHA512 3778557ed7751451b36218bf0a3d7c2c8d6083810a4b3f3d7fafcd34dc5f842da244bd028822e30d1ff2a1f51cd951a4ac354b75ad2b411556f4aee74cd3aa78 WHIRLPOOL e9a5d58c99d6647eeb8b018eaa76013cb4a2b753b1d92529143968fe6d19965802e41ffe5b1b71c67641fdc14d5bd7e5d630395746d1b8481cb1cb487789d3ed
 EBUILD netbeans-dlight-9999_p20160301.ebuild 2968 SHA256 09e3e5cbe876bb60c8261fd2fd6ff0e022982b4bfb8e96406fb08ace2d70ea6c SHA512 5c1b28f7cf971b955b4d382445c1d1dce529130a285db1a6742ea1807042e731f4c2b7bab8f1c16f284f2427f44aeefa9bca42d663d9bb49f6ad09724e1378ea WHIRLPOOL d8f2b7d66e101475a07cfdd377b44ba21b535a982d1721621d1e4bea15e74f1222f4f79d4e77a77bf36d3312c051a9bdb62908bf142b9a9d1ac64f37797d33e6

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160226.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160226.ebuild
deleted file mode 100644
index b7de0bc..0000000
--- a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160226.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-02-26_00-02-15/zip/netbeans-trunk-nightly-201602260002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-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-r14-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-dlight/netbeans-dlight-9999_p20160227.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160227.ebuild
deleted file mode 100644
index 0fcac4e..0000000
--- a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160227.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-02-27_00-02-15/zip/netbeans-trunk-nightly-201602270002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-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-r14-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 e872f48..a72706c 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -36,8 +36,6 @@ DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r15-build.xml.patch.bz2 2680 SHA256 d686f1e352eae400393577a456042f4475b9c321369101d2f05ec627aa61ef0c SHA512 7428b664749878fd1ead2c821277769a5af9636388515a4786284568ea656734ba2a9e90758385f5b6a0c009469df3dcc005936c8865c93cc9bc29576d2171e4 WHIRLPOOL fea09d3b1e2cc07e090a9618cbdaf6b2e3d4cab9679fdb4321a856922035871e485f492e6298e7e2562d8ecba626f2bdb3130f09840e83878e3c1e6fd6944899
-DIST netbeans-trunk-nightly-201602260002-src.zip 209828915 SHA256 79e707455e36ff5602efab93c10a4d1a2548e51b8ce9799f9793fe24eb029302 SHA512 f506d2ec8b3ffd8ece1f08ced77579e816df11afa8e85246eaa04c166c67e306ee20b3afe5dd856ac1d47ce2a97f9bce69ffdffc5ee38df633a7abc441a2a25c WHIRLPOOL 88f6627dc291e47e487359d7bda443a228ff258269a715d561faa4af4c4e57ac98a3179f3e9fb7150504f1a6dedaddec3d21f38f88eb7f3e99eae4fd2e51cd54
-DIST netbeans-trunk-nightly-201602270002-src.zip 209831963 SHA256 20b41ce3e47c43d3e255e9833fa3f2c3bcd48876ff620c40ed93c878c7abd883 SHA512 980ab79ed39cea631f45d7609b5d3bd8e8310737d7934dbe6a3f93f9c31031d5b38c40370ef6d35898bb7f39eb7a72a00ea1715a77b12678eb5d3a2e2f12a76a WHIRLPOOL f4a058519c51572208225a141a6745583c6ce1019e4d4b2ae994e0b6dd000034e330113decdfc2a6589025e61d11583852e64e121dd42fd833552d35f9ba748a
 DIST netbeans-trunk-nightly-201602280002-src.zip 209832078 SHA256 9db7e895e76748c876558471306afbb5a6af856a8cb391248be4f8d700cb0fc0 SHA512 41bfbb29f4e9760e11336d13908703b13276dac95dd070945963a213969dbdfa844e96340a0ec7e32d721cda3bd11a7f940855a3b1ddccd3d3349b32efcf4c36 WHIRLPOOL e2ca8afcc4a6a1b5a8f19958df6015709542f0d896bd7f9b35fbb7671571732fb1931a5de6e1e0deb21ee86fdecdf2a013ff319d76e1569f8c0ba2b252e959d6
 DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf77015ad8c9ca15c1a54953eec0492be748fde20af0b464700c80f SHA512 56d79deda1cb4624b7136c0028d8786ee5f560aef52f305548654b873232a968b0bd25322c53caa44c61dd0557d177c5725eaed4b6b6e554920e9f5e8b8dcf85 WHIRLPOOL e0bd59c30e04b4a67b7924890f0e377bbb120564a155815b1aa64a28da7f835362e583333240672aeb2b39d63c5c37e2739d4a9e9f25488ce2cfb5ee1e475569
 DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
@@ -58,8 +56,6 @@ DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a5747
 DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 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_p20160226.ebuild 15825 SHA256 a6010d4c7134d830756c12c80f0bc478e2bb852e10879e3c51b47d1e666133bb SHA512 b87762419a3a7518024f1a909fd2d8865258ada275941b20d3d7b87bf136779a8315d9e0bf0ad765ff3f017f8eb8494fb2d73be375b71b547d245a0e108f7d4d WHIRLPOOL dbc6211c6a3f992e5cba1f040a1592224d1a61d83ad2f08da301a18be6676cf53c66fdf027e69e711fa3ad3e0d72328a8b2386884ea6e96d55f06aa8ed712db4
-EBUILD netbeans-enterprise-9999_p20160227.ebuild 15825 SHA256 a6978ba6760a4aa18696ba7ffc8db8a20cbf0d54c15461f618ba6ccd7c3945d8 SHA512 40bec434839368a7a841b0d618d9290b02f7e8d2b6ab8c44a986108ec63b75c4bba267ad58c19bcc475a8c13d22ef654c0ab57caa8c54e5b1cc127532633d185 WHIRLPOOL 7018584507806d021bccdafd11c87ffea60ba83926c0c1ea4eefe5f508da03f72dc2979f2c54539c00df2070a7e56d4b9710b8c3946e2d6fc19f16da3c46c674
 EBUILD netbeans-enterprise-9999_p20160228.ebuild 15825 SHA256 f36fa7423164bc3022c1598d9ec2cc97964586a6c73452e85a11d0fda19c357a SHA512 3edbe82b1ebcdfe7552e3f47031a10e608954c8c73dfc76383bf31be965b9a5aba935be5c1ffd1d3a298e3a510e58b8ff330857cd03eee6b4195a7d52ba499f0 WHIRLPOOL 56bcdef46148014718aadb02b86a90e49f574221fae082451d2a061b2b1b0891073f2cffee2ea7de93afd469d7378964a73a774f0c398c645321615b661f0da1
 EBUILD netbeans-enterprise-9999_p20160229.ebuild 15825 SHA256 e997eb76ab7b4b7e4ef88d67b72fc89553fadd27daf35c4c926a962371cd696d SHA512 6d185e0b5782013b9aa454d36b328da8c45be11de179b45762aaf46e29510c270bf3f490f01431b67889da1239b941186c1e2e9e1b6135d7754f0fd940963b99 WHIRLPOOL 96551ce5f5c1ce4ff6fd45c3612f0310fcb2f88073876c7707a2528a7b188277d10730d8eb931d9b58506f8ba8b64d6cbac73c73224acc4bcd8a3a6f935229e9
 EBUILD netbeans-enterprise-9999_p20160301.ebuild 15825 SHA256 9dcb22dd0e27b645e88cdca8645b0c145e20264b133cd31a397790fb45d028ad SHA512 ea8c729dc776ccca76ed44a8d0d10edcf0a8c1de06e1fe93779407f96f7a471526fbaceaf9f1cdfce6f9ddffbb42b184567487894d81d40268ae322c4227a3af WHIRLPOOL e285b41def59f48fb043b863e2cd4d19f4bee57d6f66591c841137483bf49942f1936556aca646fd23a815930af6796f7a596b0a491f9b9be68c7bd57817cab0

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160226.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160226.ebuild
deleted file mode 100644
index 01ab222..0000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160226.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-02-26_00-02-15/zip/netbeans-trunk-nightly-201602260002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-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-r14-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-enterprise/netbeans-enterprise-9999_p20160227.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160227.ebuild
deleted file mode 100644
index 64f76b8..0000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160227.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-02-27_00-02-15/zip/netbeans-trunk-nightly-201602270002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-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-r14-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 2fa4234..ee2aa5e 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -4,8 +4,6 @@ DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r15-build.xml.patch.bz2 2680 SHA256 d686f1e352eae400393577a456042f4475b9c321369101d2f05ec627aa61ef0c SHA512 7428b664749878fd1ead2c821277769a5af9636388515a4786284568ea656734ba2a9e90758385f5b6a0c009469df3dcc005936c8865c93cc9bc29576d2171e4 WHIRLPOOL fea09d3b1e2cc07e090a9618cbdaf6b2e3d4cab9679fdb4321a856922035871e485f492e6298e7e2562d8ecba626f2bdb3130f09840e83878e3c1e6fd6944899
-DIST netbeans-trunk-nightly-201602260002-src.zip 209828915 SHA256 79e707455e36ff5602efab93c10a4d1a2548e51b8ce9799f9793fe24eb029302 SHA512 f506d2ec8b3ffd8ece1f08ced77579e816df11afa8e85246eaa04c166c67e306ee20b3afe5dd856ac1d47ce2a97f9bce69ffdffc5ee38df633a7abc441a2a25c WHIRLPOOL 88f6627dc291e47e487359d7bda443a228ff258269a715d561faa4af4c4e57ac98a3179f3e9fb7150504f1a6dedaddec3d21f38f88eb7f3e99eae4fd2e51cd54
-DIST netbeans-trunk-nightly-201602270002-src.zip 209831963 SHA256 20b41ce3e47c43d3e255e9833fa3f2c3bcd48876ff620c40ed93c878c7abd883 SHA512 980ab79ed39cea631f45d7609b5d3bd8e8310737d7934dbe6a3f93f9c31031d5b38c40370ef6d35898bb7f39eb7a72a00ea1715a77b12678eb5d3a2e2f12a76a WHIRLPOOL f4a058519c51572208225a141a6745583c6ce1019e4d4b2ae994e0b6dd000034e330113decdfc2a6589025e61d11583852e64e121dd42fd833552d35f9ba748a
 DIST netbeans-trunk-nightly-201602280002-src.zip 209832078 SHA256 9db7e895e76748c876558471306afbb5a6af856a8cb391248be4f8d700cb0fc0 SHA512 41bfbb29f4e9760e11336d13908703b13276dac95dd070945963a213969dbdfa844e96340a0ec7e32d721cda3bd11a7f940855a3b1ddccd3d3349b32efcf4c36 WHIRLPOOL e2ca8afcc4a6a1b5a8f19958df6015709542f0d896bd7f9b35fbb7671571732fb1931a5de6e1e0deb21ee86fdecdf2a013ff319d76e1569f8c0ba2b252e959d6
 DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf77015ad8c9ca15c1a54953eec0492be748fde20af0b464700c80f SHA512 56d79deda1cb4624b7136c0028d8786ee5f560aef52f305548654b873232a968b0bd25322c53caa44c61dd0557d177c5725eaed4b6b6e554920e9f5e8b8dcf85 WHIRLPOOL e0bd59c30e04b4a67b7924890f0e377bbb120564a155815b1aa64a28da7f835362e583333240672aeb2b39d63c5c37e2739d4a9e9f25488ce2cfb5ee1e475569
 DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
@@ -26,8 +24,6 @@ DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a5747
 DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 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_p20160226.ebuild 2913 SHA256 c18d3872c9c5e33c071814b58f05b5550608fe70a10fd7871c20f4918695ec82 SHA512 a47cb04204e8edc7623c511439e9c47213286463daee2b7c5200dd4de77567ad534266618dd603eb73056270746c52365493b4dfc3bf38777330d46ccb2d9125 WHIRLPOOL a040bc1ad2f7f650609ea979eaa8d88cbf6d35162cd27df3fa91950b28a8221ba3ad2b163b4582b9519965325054f31ed6c602b9ce268c669e47521ffe3f9c35
-EBUILD netbeans-ergonomics-9999_p20160227.ebuild 2913 SHA256 9dbaea5ab7fde77a21156561ead70a16da1c5385a64b241b888a342947cf881d SHA512 3cd03e2495e8e8f6ada21df9282c0bb3977e9979f398383712fbe1ffc162eae46b3e3a61644c1a5c694d80d562868b04dcb980c5376049c31f9a69a782fb8a39 WHIRLPOOL dcc2dc70e49408b5f1c9c351f109b050232ca966d4e0aa90a315faf68823c71c97f212d27b00d1f51f1adc09c3058409bb60354e05b6bf9480254c813b3be884
 EBUILD netbeans-ergonomics-9999_p20160228.ebuild 2913 SHA256 dbcf923511d8393e14134c805c4a47c5dedc693579c05b3242e05c4c099a380c SHA512 bf2c2446f39578a60c46ebb5bf0f4722551508bffeecb3270607d8dcfeed1389a9eb35660b203cfd0c447a08b7f86d54d010998d5711fcfeed2ac33723596937 WHIRLPOOL e6cca6d9087f1658e7b9caf204a999d4e1b42c37cce55cac5b7a7e6b0f40ee468ccbb20235f8a0b24757e850ae79477d4ac69a8ec1f82f22eeecc653dec6ddd3
 EBUILD netbeans-ergonomics-9999_p20160229.ebuild 2913 SHA256 035bc0839e8dea2ec2abaf94ef90ce9d3ea4eed01c505cfe665a5d79632e13c3 SHA512 d8080a42718a5598a2e26be9bf7f4dff4908d1630d3f6658ec7eeb37c0b28959df5e29a5dbe8375080d5b2b1969bd61bc1667a15f85a5183f737584ca5c0fd78 WHIRLPOOL 03fb169cc65147c4bf7e28b9ee10c69428425ef33ab1c30255a11b3e31b248f509f107d7cdc6c0b93862780e5b8b96aa4580e6c025729a1126a7086ca744cb1e
 EBUILD netbeans-ergonomics-9999_p20160301.ebuild 2913 SHA256 fcd33fd0b2bd4224e1d6565807c975008df9acfa52c2b712e3f0a91b2ba6f856 SHA512 9826b31f5a817a958dd528df88e29f1bbe551c621b8b5f224bb9d8605ddbf9f44040e1e97c1b75e2c69dad4c2cc1682bcc1d7c44e3265cff1aeaf570293b2731 WHIRLPOOL 71d9f1c3c2d7066e601cdcea5ca26c862e83fd36ac1c8256ce4c2c196fce673e503733595266b62262a9dac658d68cfbbb68b438e017b2a9cae2004dffdb933d

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160226.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160226.ebuild
deleted file mode 100644
index 44be229..0000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160226.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-02-26_00-02-15/zip/netbeans-trunk-nightly-201602260002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r14-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-ergonomics/netbeans-ergonomics-9999_p20160227.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160227.ebuild
deleted file mode 100644
index 7c7c0f5..0000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160227.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-02-27_00-02-15/zip/netbeans-trunk-nightly-201602270002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r14-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 1f270eb..7ec6a70 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -6,8 +6,6 @@ DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r15-build.xml.patch.bz2 2680 SHA256 d686f1e352eae400393577a456042f4475b9c321369101d2f05ec627aa61ef0c SHA512 7428b664749878fd1ead2c821277769a5af9636388515a4786284568ea656734ba2a9e90758385f5b6a0c009469df3dcc005936c8865c93cc9bc29576d2171e4 WHIRLPOOL fea09d3b1e2cc07e090a9618cbdaf6b2e3d4cab9679fdb4321a856922035871e485f492e6298e7e2562d8ecba626f2bdb3130f09840e83878e3c1e6fd6944899
-DIST netbeans-trunk-nightly-201602260002-src.zip 209828915 SHA256 79e707455e36ff5602efab93c10a4d1a2548e51b8ce9799f9793fe24eb029302 SHA512 f506d2ec8b3ffd8ece1f08ced77579e816df11afa8e85246eaa04c166c67e306ee20b3afe5dd856ac1d47ce2a97f9bce69ffdffc5ee38df633a7abc441a2a25c WHIRLPOOL 88f6627dc291e47e487359d7bda443a228ff258269a715d561faa4af4c4e57ac98a3179f3e9fb7150504f1a6dedaddec3d21f38f88eb7f3e99eae4fd2e51cd54
-DIST netbeans-trunk-nightly-201602270002-src.zip 209831963 SHA256 20b41ce3e47c43d3e255e9833fa3f2c3bcd48876ff620c40ed93c878c7abd883 SHA512 980ab79ed39cea631f45d7609b5d3bd8e8310737d7934dbe6a3f93f9c31031d5b38c40370ef6d35898bb7f39eb7a72a00ea1715a77b12678eb5d3a2e2f12a76a WHIRLPOOL f4a058519c51572208225a141a6745583c6ce1019e4d4b2ae994e0b6dd000034e330113decdfc2a6589025e61d11583852e64e121dd42fd833552d35f9ba748a
 DIST netbeans-trunk-nightly-201602280002-src.zip 209832078 SHA256 9db7e895e76748c876558471306afbb5a6af856a8cb391248be4f8d700cb0fc0 SHA512 41bfbb29f4e9760e11336d13908703b13276dac95dd070945963a213969dbdfa844e96340a0ec7e32d721cda3bd11a7f940855a3b1ddccd3d3349b32efcf4c36 WHIRLPOOL e2ca8afcc4a6a1b5a8f19958df6015709542f0d896bd7f9b35fbb7671571732fb1931a5de6e1e0deb21ee86fdecdf2a013ff319d76e1569f8c0ba2b252e959d6
 DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf77015ad8c9ca15c1a54953eec0492be748fde20af0b464700c80f SHA512 56d79deda1cb4624b7136c0028d8786ee5f560aef52f305548654b873232a968b0bd25322c53caa44c61dd0557d177c5725eaed4b6b6e554920e9f5e8b8dcf85 WHIRLPOOL e0bd59c30e04b4a67b7924890f0e377bbb120564a155815b1aa64a28da7f835362e583333240672aeb2b39d63c5c37e2739d4a9e9f25488ce2cfb5ee1e475569
 DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
@@ -28,8 +26,6 @@ DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a5747
 DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 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_p20160226.ebuild 3377 SHA256 34af177610d5d508c3442dc37c7e7d0241f00e016751d380daa4184f07285c7a SHA512 388590e881372070bda554ef20c73ab62a21018fc933ed0439e8d7ca3ef13dc09bd72393496ac02e4cface814b3ed49cc566b7d14a3898095cc0d6529f01baeb WHIRLPOOL 19d77544f7cce0b7d9a765dab7ad204d8ced3621af10fde8cf5be85c1b12144088a41a3b92d1e23becd8b8c66d9e4777d7ebe2d57c6c385f9b6a87c9c7828089
-EBUILD netbeans-extide-9999_p20160227.ebuild 3377 SHA256 444041a43b09c707a927c9e063e823207ddaa14e84abcf9684ac11f4fe6fb7e2 SHA512 523910f8d52dc62b5dd13c4eebd398dcd44e9fe648f5bc128e480ae8d1766f07faea7bdc581773a418409c1b18a789f6a09289e50c81dc43a21ab39801dfda1c WHIRLPOOL aa2429af6fa16ecd254e5de2e44ad51c796e9b7e579d0b31b7e89ae20f1ae8cc3a58a2ad7f40f33361d487f9e7880eea6cd344c91a97425b667e7e9901d2abb5
 EBUILD netbeans-extide-9999_p20160228.ebuild 3377 SHA256 181ec286dafad3c9f7542d238246a26f42b0a9932960c77d8d9c5df240751ac8 SHA512 d7d5b554dead77da59ab596b480934f851603ac0cfb61e8a56b33f274193c3d636bbf781e030d251e98fd010e9f1505606689cf71d85c21add21899127cc7fbf WHIRLPOOL 03eea17e5d0c0fa11bc5ecbee20f816dca991ba108b7e21de9b168c28f720e7c60c1989cb8a09eba616d1449adacda0d28d38d1a429e1a42d671cf177f41188a
 EBUILD netbeans-extide-9999_p20160229.ebuild 3377 SHA256 7c2cd59afc634141e05d70fe405b71d9d54773b1c20a533c3d75618881998bd3 SHA512 fba891194a0edb6b3f10b04811e3ffa531036e72404bd4eb799418814ff067b3edc7d7d39c2e599870ef53509879431e1c3194f5f7efcb93a478ee04bbe07d26 WHIRLPOOL 4f1319396615be09e607d174dbc270d9b08a0ec09b456703233d28731797539b2e8d690a7acb762af25ecd0ea77523250d149e958096831f0e5ff5a33a466133
 EBUILD netbeans-extide-9999_p20160301.ebuild 3377 SHA256 ec3927367ed2925d2980813be2a08a425c134d75387f42f9d573d234aa999774 SHA512 d82bd490ed27fe3f720d42faf93a9668d811d3f39b935e28c7462b9f35df1379ebd2df0112ba635fc38fd270b77ac4a0c570ede0cce987d86715b34e18756806 WHIRLPOOL 47612025db95886f3948cb5eff5e22d2110ae5ccbf192460cccd13bebae2612ea56fe620a1fa7779fa0a701adfc0d41ce4c9fb60d913c2c7a0978e00fa70eefa

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160226.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160226.ebuild
deleted file mode 100644
index aa00a9b..0000000
--- a/dev-java/netbeans-extide/netbeans-extide-9999_p20160226.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-02-26_00-02-15/zip/netbeans-trunk-nightly-201602260002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip
-	http://hg.netbeans.org/binaries/95CCE237B1E9390FBED0440B601822813DB220E6-ant-misc-1.9.4.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	dev-java/javahelp:0
-	${CDEPEND}"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.extide -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r14-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip o.apache.tools.ant.module/external/ant-libs-1.9.4.zip || die
-	ln -s "${DISTDIR}"/95CCE237B1E9390FBED0440B601822813DB220E6-ant-misc-1.9.4.zip o.apache.tools.ant.module/external/ant-misc-1.9.4.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r14-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-extide/netbeans-extide-9999_p20160227.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160227.ebuild
deleted file mode 100644
index 72f4a3c..0000000
--- a/dev-java/netbeans-extide/netbeans-extide-9999_p20160227.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-02-27_00-02-15/zip/netbeans-trunk-nightly-201602270002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip
-	http://hg.netbeans.org/binaries/95CCE237B1E9390FBED0440B601822813DB220E6-ant-misc-1.9.4.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	dev-java/javahelp:0
-	${CDEPEND}"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.extide -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r14-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip o.apache.tools.ant.module/external/ant-libs-1.9.4.zip || die
-	ln -s "${DISTDIR}"/95CCE237B1E9390FBED0440B601822813DB220E6-ant-misc-1.9.4.zip o.apache.tools.ant.module/external/ant-misc-1.9.4.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r14-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 2169dae..182117b 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -6,8 +6,6 @@ DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r15-build.xml.patch.bz2 2680 SHA256 d686f1e352eae400393577a456042f4475b9c321369101d2f05ec627aa61ef0c SHA512 7428b664749878fd1ead2c821277769a5af9636388515a4786284568ea656734ba2a9e90758385f5b6a0c009469df3dcc005936c8865c93cc9bc29576d2171e4 WHIRLPOOL fea09d3b1e2cc07e090a9618cbdaf6b2e3d4cab9679fdb4321a856922035871e485f492e6298e7e2562d8ecba626f2bdb3130f09840e83878e3c1e6fd6944899
-DIST netbeans-trunk-nightly-201602260002-src.zip 209828915 SHA256 79e707455e36ff5602efab93c10a4d1a2548e51b8ce9799f9793fe24eb029302 SHA512 f506d2ec8b3ffd8ece1f08ced77579e816df11afa8e85246eaa04c166c67e306ee20b3afe5dd856ac1d47ce2a97f9bce69ffdffc5ee38df633a7abc441a2a25c WHIRLPOOL 88f6627dc291e47e487359d7bda443a228ff258269a715d561faa4af4c4e57ac98a3179f3e9fb7150504f1a6dedaddec3d21f38f88eb7f3e99eae4fd2e51cd54
-DIST netbeans-trunk-nightly-201602270002-src.zip 209831963 SHA256 20b41ce3e47c43d3e255e9833fa3f2c3bcd48876ff620c40ed93c878c7abd883 SHA512 980ab79ed39cea631f45d7609b5d3bd8e8310737d7934dbe6a3f93f9c31031d5b38c40370ef6d35898bb7f39eb7a72a00ea1715a77b12678eb5d3a2e2f12a76a WHIRLPOOL f4a058519c51572208225a141a6745583c6ce1019e4d4b2ae994e0b6dd000034e330113decdfc2a6589025e61d11583852e64e121dd42fd833552d35f9ba748a
 DIST netbeans-trunk-nightly-201602280002-src.zip 209832078 SHA256 9db7e895e76748c876558471306afbb5a6af856a8cb391248be4f8d700cb0fc0 SHA512 41bfbb29f4e9760e11336d13908703b13276dac95dd070945963a213969dbdfa844e96340a0ec7e32d721cda3bd11a7f940855a3b1ddccd3d3349b32efcf4c36 WHIRLPOOL e2ca8afcc4a6a1b5a8f19958df6015709542f0d896bd7f9b35fbb7671571732fb1931a5de6e1e0deb21ee86fdecdf2a013ff319d76e1569f8c0ba2b252e959d6
 DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf77015ad8c9ca15c1a54953eec0492be748fde20af0b464700c80f SHA512 56d79deda1cb4624b7136c0028d8786ee5f560aef52f305548654b873232a968b0bd25322c53caa44c61dd0557d177c5725eaed4b6b6e554920e9f5e8b8dcf85 WHIRLPOOL e0bd59c30e04b4a67b7924890f0e377bbb120564a155815b1aa64a28da7f835362e583333240672aeb2b39d63c5c37e2739d4a9e9f25488ce2cfb5ee1e475569
 DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
@@ -28,8 +26,6 @@ DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a5747
 DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 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_p20160226.ebuild 3416 SHA256 d148b14ff8d19271fd2b7f89d6473951c78407a521a894d030d7fa2c1cbf4210 SHA512 d3a89ad6543d9f80fec79e48c4452297b9705ef86d3fe68c04d37d183209761309ce48941548604de12fa59c015185fc257b33151d85cdc37c4382686a675321 WHIRLPOOL 1176ff945d81ffa62e80d12b73c2bf28accad2015cbd680ee08db05a838fba112f9e1a69bf4e7cf94fd4480d041dbbc63805987eefa94cc0f8eee4f9800af011
-EBUILD netbeans-groovy-9999_p20160227.ebuild 3416 SHA256 6ed026e82fb6db50c51773c547990f22ef77f52e6b3f03b64ef928d9b155ba34 SHA512 c0f84c51e8b93ba4966b66ac60dd93e92863ab485e1e7060c7ab2d48d684389983e67f54a244698952620a2b21d0e4962ead206d6c53ff66323a0353d17a4a25 WHIRLPOOL 48bdc1e918196c58d6f5a6fdf16b460a6aa13529109c4a4325289a16daef976e14e9fa6a1974fb51b53f24c21ef35fbcf72eea006738506c4d34cce064600403
 EBUILD netbeans-groovy-9999_p20160228.ebuild 3416 SHA256 9fec0bf0771de9dac16225e14edfdd4bb8e5ad6761859238e6acd7eb25e474e8 SHA512 559e5e91e4ea91cecd4dff58f551d72f9bd3673fe36f5346952ac587f859c6df2780ecb3d30a981ffd7f53c236307fe7eb19d869064a19a5e6c2db608123dc10 WHIRLPOOL 5539cfc816b5963a1ff656c8e9dcbe965d199826f30d76655f243c557c7adb6c8fb57ffd1994162d2a17483534ec6eca7b5a3cf7cefcf3a5818673fb734cb67c
 EBUILD netbeans-groovy-9999_p20160229.ebuild 3416 SHA256 82fec876a7973eccc1b30a39fa923812322326fbbb0cc218f68893f0212f0301 SHA512 7e0f1ead1b68f282094b7ae42b2b0e7299c19add6a6ad883dd7479fd1bc37d7654cf308401f6c922473c3591c15e0ee4897439aa5902775450773f146f2f0d09 WHIRLPOOL 268639858c3137efecccfd2269b6a83fe007e2cf9999d4dd13312c7d6d152c7123166146c45c54e386dd16ea4d4302e2d431d0248ff355c177b6be0a99e4d652
 EBUILD netbeans-groovy-9999_p20160301.ebuild 3416 SHA256 222201d0b0f2f22e234799d26f304ca696f3a9ba17e37f06e1ff901ddeda5dc5 SHA512 9bdb9dbdcc0f2903cffab2936ca7f8aaf206af0e6056734cadd5e4389785401eb8ef68cd629e4736047f2437e3a1ec70c614669e779185d87b5182c247e66e4c WHIRLPOOL 9ec6e2aed159cf0b2344a726e6578abfeb8c2cedb83c48f834e8f8804fc6777d4d945ef13f215cb1dd64c596e81a7449854138d42806e82544cf9a391c1c4a4f

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160226.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160226.ebuild
deleted file mode 100644
index dfeba61..0000000
--- a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160226.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-02-26_00-02-15/zip/netbeans-trunk-nightly-201602260002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-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-r14-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-groovy/netbeans-groovy-9999_p20160227.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160227.ebuild
deleted file mode 100644
index 57ad012..0000000
--- a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160227.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-02-27_00-02-15/zip/netbeans-trunk-nightly-201602270002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-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-r14-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 a03a97c..5c07ea6 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -9,8 +9,6 @@ DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r15-build.xml.patch.bz2 2680 SHA256 d686f1e352eae400393577a456042f4475b9c321369101d2f05ec627aa61ef0c SHA512 7428b664749878fd1ead2c821277769a5af9636388515a4786284568ea656734ba2a9e90758385f5b6a0c009469df3dcc005936c8865c93cc9bc29576d2171e4 WHIRLPOOL fea09d3b1e2cc07e090a9618cbdaf6b2e3d4cab9679fdb4321a856922035871e485f492e6298e7e2562d8ecba626f2bdb3130f09840e83878e3c1e6fd6944899
-DIST netbeans-trunk-nightly-201602260002-src.zip 209828915 SHA256 79e707455e36ff5602efab93c10a4d1a2548e51b8ce9799f9793fe24eb029302 SHA512 f506d2ec8b3ffd8ece1f08ced77579e816df11afa8e85246eaa04c166c67e306ee20b3afe5dd856ac1d47ce2a97f9bce69ffdffc5ee38df633a7abc441a2a25c WHIRLPOOL 88f6627dc291e47e487359d7bda443a228ff258269a715d561faa4af4c4e57ac98a3179f3e9fb7150504f1a6dedaddec3d21f38f88eb7f3e99eae4fd2e51cd54
-DIST netbeans-trunk-nightly-201602270002-src.zip 209831963 SHA256 20b41ce3e47c43d3e255e9833fa3f2c3bcd48876ff620c40ed93c878c7abd883 SHA512 980ab79ed39cea631f45d7609b5d3bd8e8310737d7934dbe6a3f93f9c31031d5b38c40370ef6d35898bb7f39eb7a72a00ea1715a77b12678eb5d3a2e2f12a76a WHIRLPOOL f4a058519c51572208225a141a6745583c6ce1019e4d4b2ae994e0b6dd000034e330113decdfc2a6589025e61d11583852e64e121dd42fd833552d35f9ba748a
 DIST netbeans-trunk-nightly-201602280002-src.zip 209832078 SHA256 9db7e895e76748c876558471306afbb5a6af856a8cb391248be4f8d700cb0fc0 SHA512 41bfbb29f4e9760e11336d13908703b13276dac95dd070945963a213969dbdfa844e96340a0ec7e32d721cda3bd11a7f940855a3b1ddccd3d3349b32efcf4c36 WHIRLPOOL e2ca8afcc4a6a1b5a8f19958df6015709542f0d896bd7f9b35fbb7671571732fb1931a5de6e1e0deb21ee86fdecdf2a013ff319d76e1569f8c0ba2b252e959d6
 DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf77015ad8c9ca15c1a54953eec0492be748fde20af0b464700c80f SHA512 56d79deda1cb4624b7136c0028d8786ee5f560aef52f305548654b873232a968b0bd25322c53caa44c61dd0557d177c5725eaed4b6b6e554920e9f5e8b8dcf85 WHIRLPOOL e0bd59c30e04b4a67b7924890f0e377bbb120564a155815b1aa64a28da7f835362e583333240672aeb2b39d63c5c37e2739d4a9e9f25488ce2cfb5ee1e475569
 DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
@@ -31,8 +29,6 @@ DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a5747
 DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 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_p20160226.ebuild 4126 SHA256 393417e9a8f381c0abf6ee340ef41628afb27418119d4c37529df0a7c91043be SHA512 73998b964bb5c12e20475ea8343f7a45e28a71905327bdac21103a697a93db24d42bb948cf4c7047cbce57be7d62617174fea9b605d503db972ff6e191429e08 WHIRLPOOL fe83e39f47becea6cfccc49ed33cc07d8d4e89afc2eeca91998db156898bf5ccb4911b9202af2d9097720f8a924c2b27f69c0bb21ab4afa1ff6167a9cda3f1b2
-EBUILD netbeans-harness-9999_p20160227.ebuild 4126 SHA256 8be58a3da5b91098408b2b6a3dc1359e7f7abdf8a907e659c103c7dc2480d1e4 SHA512 c2e1d3acd09ca7be12793daf16449777fd9d4e1e9cc71422b09eaab3fd3f8258d60cf01fe72f83d170253e810a9db274ed1f2c782dd8ebca55477a96eba33747 WHIRLPOOL d15584dcc84c39bfb2ad4ca7bfe88aa003e9b3da58691c313d46c326ff1808b6c8fdcd11f5f05472bb8d75479854e2a5b6afb0fb7a8f92836c2be61dd1de4bad
 EBUILD netbeans-harness-9999_p20160228.ebuild 4126 SHA256 ca80498874b6a43098dc1afcaae22a18448629b3c594e8bcf1a47f1f094cac5e SHA512 2bccebc537715fc4631da707f572efadc4e3837440f2346e58416cc528223a8ff95fb4adc4e9598260d5f3a0fdc0d98887c79d6d6378989705f5363ada496829 WHIRLPOOL 29d9760af9e421cb8f58b2c130d93c060efde1c5c7b8d07f91f4b04476ed86d9a5b3292cddbdaec4ff2b43bbaaaae0a9c066512f3ff4174349b508a59924d1b0
 EBUILD netbeans-harness-9999_p20160229.ebuild 4126 SHA256 ffe0b263afa15c034c8ab62c1714e3f19f3e0ae925f7e4722310402ff60b035e SHA512 719d7d89419c1bffde092b34f68e6f72972a399c7facdd720a4bb0665b0b74294eab91e302c7000422d9792122b5a8e55f109e98e922a219eddc47dd80bcd1da WHIRLPOOL 5f2ba33e86eb5578ee14fab6566d930b9396fec8d036733c110f2a19a36c977abbddd7e87656cc3b794f7657a1b608f2bfb991df853a2bdb13cfdeed7b7cb19e
 EBUILD netbeans-harness-9999_p20160301.ebuild 4126 SHA256 adbe68f7788578e49407bd5b154da110beabdcd82f582afde00400bab2689ed9 SHA512 174c5c867275168745a0a8f1c7ffed46eb497ff47ce94879a6b7531a49fceff18d86c53b14d92b7389595a159d4aa74a1e5b1fc336465a86d67afa871f618005 WHIRLPOOL dea01495640b785d503ccb79dfecec5b72b82437599133a0ae88494bb40a3b232a0752bef9aa3e402dcb0799b6ffbbc110f016b84211fbb79f786c7bd91ac985

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160226.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160226.ebuild
deleted file mode 100644
index 9b9172a..0000000
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20160226.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-02-26_00-02-15/zip/netbeans-trunk-nightly-201602260002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-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-r14-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-harness/netbeans-harness-9999_p20160227.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160227.ebuild
deleted file mode 100644
index 5dd1adf..0000000
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20160227.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-02-27_00-02-15/zip/netbeans-trunk-nightly-201602270002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-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-r14-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 4a80c3d..f8cd087 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -136,8 +136,6 @@ DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r15-build.xml.patch.bz2 2680 SHA256 d686f1e352eae400393577a456042f4475b9c321369101d2f05ec627aa61ef0c SHA512 7428b664749878fd1ead2c821277769a5af9636388515a4786284568ea656734ba2a9e90758385f5b6a0c009469df3dcc005936c8865c93cc9bc29576d2171e4 WHIRLPOOL fea09d3b1e2cc07e090a9618cbdaf6b2e3d4cab9679fdb4321a856922035871e485f492e6298e7e2562d8ecba626f2bdb3130f09840e83878e3c1e6fd6944899
-DIST netbeans-trunk-nightly-201602260002-src.zip 209828915 SHA256 79e707455e36ff5602efab93c10a4d1a2548e51b8ce9799f9793fe24eb029302 SHA512 f506d2ec8b3ffd8ece1f08ced77579e816df11afa8e85246eaa04c166c67e306ee20b3afe5dd856ac1d47ce2a97f9bce69ffdffc5ee38df633a7abc441a2a25c WHIRLPOOL 88f6627dc291e47e487359d7bda443a228ff258269a715d561faa4af4c4e57ac98a3179f3e9fb7150504f1a6dedaddec3d21f38f88eb7f3e99eae4fd2e51cd54
-DIST netbeans-trunk-nightly-201602270002-src.zip 209831963 SHA256 20b41ce3e47c43d3e255e9833fa3f2c3bcd48876ff620c40ed93c878c7abd883 SHA512 980ab79ed39cea631f45d7609b5d3bd8e8310737d7934dbe6a3f93f9c31031d5b38c40370ef6d35898bb7f39eb7a72a00ea1715a77b12678eb5d3a2e2f12a76a WHIRLPOOL f4a058519c51572208225a141a6745583c6ce1019e4d4b2ae994e0b6dd000034e330113decdfc2a6589025e61d11583852e64e121dd42fd833552d35f9ba748a
 DIST netbeans-trunk-nightly-201602280002-src.zip 209832078 SHA256 9db7e895e76748c876558471306afbb5a6af856a8cb391248be4f8d700cb0fc0 SHA512 41bfbb29f4e9760e11336d13908703b13276dac95dd070945963a213969dbdfa844e96340a0ec7e32d721cda3bd11a7f940855a3b1ddccd3d3349b32efcf4c36 WHIRLPOOL e2ca8afcc4a6a1b5a8f19958df6015709542f0d896bd7f9b35fbb7671571732fb1931a5de6e1e0deb21ee86fdecdf2a013ff319d76e1569f8c0ba2b252e959d6
 DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf77015ad8c9ca15c1a54953eec0492be748fde20af0b464700c80f SHA512 56d79deda1cb4624b7136c0028d8786ee5f560aef52f305548654b873232a968b0bd25322c53caa44c61dd0557d177c5725eaed4b6b6e554920e9f5e8b8dcf85 WHIRLPOOL e0bd59c30e04b4a67b7924890f0e377bbb120564a155815b1aa64a28da7f835362e583333240672aeb2b39d63c5c37e2739d4a9e9f25488ce2cfb5ee1e475569
 DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
@@ -158,8 +156,6 @@ DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a5747
 DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 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_p20160226.ebuild 30235 SHA256 0836616c278109eb1b3212474011bce707085786f31552abb1a421ebf054e692 SHA512 779483e1b664e077765f2e70213848ec9283b935003ab790e75dc82467249eac07da6e9aafadeaa45460dbde7b9d4ef2dd59c7290819d6edae46c0eb6c63e652 WHIRLPOOL 0eaf9e3e2a1bc34ff78c17b7eb5e3bfdef6c554825cd872892e712c16c9bfd786227a4dda98743d28d85a36d0f1b06e0ad8ab1552803e08a7b3e56ea642b9c04
-EBUILD netbeans-ide-9999_p20160227.ebuild 30250 SHA256 672392406ee7a7020e0a6081ea61f081013b06a022e1c2119da22bd476588584 SHA512 09bd47e3ee168aca0bbc5f17a0aede47055417c017928debd7acd89cc4a43f2cbe56d3caff5c8a0d62ece1a4decff7bde022029a0ff99f7168677448af10a8c7 WHIRLPOOL a15bf2072f4c6fee47a43e280de99a438d079737c41b97a8a367a19bfa4776a3474412323e3d8b2e825e0f2966b40973bb513cdd1292b4b61810a56680d11073
 EBUILD netbeans-ide-9999_p20160228.ebuild 30250 SHA256 20c33c2342adeb5ff72d4da522fd1db5b2c816d701b54c031548be91254f1acf SHA512 884a400439d3debf2811ed019a141ef241298e678b80cc81af8450c85b7085e9fd345b136eb5a4197bdc27ca94388c98d72a480edb0e89491ed13d90639dfdce WHIRLPOOL fbfb7d15b9de1ecf8947aa4da50c3e9c4ceb685fb7c89af00428c4a2d39ded9c312ee075759661f9036e6f0de76d8bc1e135fa83f2a77e41e0485a7e77b62250
 EBUILD netbeans-ide-9999_p20160229.ebuild 30250 SHA256 3813f312604f8529be6950a33f8a63a481517121b1bf29a4387684ef4e327b1d SHA512 e250a40d27873c8571f004880aee310ffd88effcb1762342b8e5e92a7b44f98041c4f7bb8f4f0068fffd033dd41992463523aecda945f85612a50edae8211182 WHIRLPOOL 434375df37a6f080b2800591aec8f2b81587eab0cae1d9553e0af8f81ea7ff07d48f5b6b90a0526f7c21641c65d7cd1de73e7d6376b718e55732e001b064e8e0
 EBUILD netbeans-ide-9999_p20160301.ebuild 30250 SHA256 fd104ea5963d5b4a14dbbaea49e1441925a6e796bf426f213c6fdf74b7372f7e SHA512 66dd3b743009045f006593d3fdf23cbeb181c9ef1f42c54a099d4733db660160e037664da1e6a0de2ccf558fdb0701dedaeb716c34716f47202e3adedf54b66d WHIRLPOOL b3b9ebafaaaa0011d111fcb0d1d90c1b16462608c4e25507300a6e1c9cc079dcbceb14a5b8bdaa2ff7d27dac6457be2b2ca7292428462c699cb8bfa5ee3184a0

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

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index da1e1c7..fb3703e 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -35,8 +35,6 @@ DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r15-build.xml.patch.bz2 2680 SHA256 d686f1e352eae400393577a456042f4475b9c321369101d2f05ec627aa61ef0c SHA512 7428b664749878fd1ead2c821277769a5af9636388515a4786284568ea656734ba2a9e90758385f5b6a0c009469df3dcc005936c8865c93cc9bc29576d2171e4 WHIRLPOOL fea09d3b1e2cc07e090a9618cbdaf6b2e3d4cab9679fdb4321a856922035871e485f492e6298e7e2562d8ecba626f2bdb3130f09840e83878e3c1e6fd6944899
-DIST netbeans-trunk-nightly-201602260002-src.zip 209828915 SHA256 79e707455e36ff5602efab93c10a4d1a2548e51b8ce9799f9793fe24eb029302 SHA512 f506d2ec8b3ffd8ece1f08ced77579e816df11afa8e85246eaa04c166c67e306ee20b3afe5dd856ac1d47ce2a97f9bce69ffdffc5ee38df633a7abc441a2a25c WHIRLPOOL 88f6627dc291e47e487359d7bda443a228ff258269a715d561faa4af4c4e57ac98a3179f3e9fb7150504f1a6dedaddec3d21f38f88eb7f3e99eae4fd2e51cd54
-DIST netbeans-trunk-nightly-201602270002-src.zip 209831963 SHA256 20b41ce3e47c43d3e255e9833fa3f2c3bcd48876ff620c40ed93c878c7abd883 SHA512 980ab79ed39cea631f45d7609b5d3bd8e8310737d7934dbe6a3f93f9c31031d5b38c40370ef6d35898bb7f39eb7a72a00ea1715a77b12678eb5d3a2e2f12a76a WHIRLPOOL f4a058519c51572208225a141a6745583c6ce1019e4d4b2ae994e0b6dd000034e330113decdfc2a6589025e61d11583852e64e121dd42fd833552d35f9ba748a
 DIST netbeans-trunk-nightly-201602280002-src.zip 209832078 SHA256 9db7e895e76748c876558471306afbb5a6af856a8cb391248be4f8d700cb0fc0 SHA512 41bfbb29f4e9760e11336d13908703b13276dac95dd070945963a213969dbdfa844e96340a0ec7e32d721cda3bd11a7f940855a3b1ddccd3d3349b32efcf4c36 WHIRLPOOL e2ca8afcc4a6a1b5a8f19958df6015709542f0d896bd7f9b35fbb7671571732fb1931a5de6e1e0deb21ee86fdecdf2a013ff319d76e1569f8c0ba2b252e959d6
 DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf77015ad8c9ca15c1a54953eec0492be748fde20af0b464700c80f SHA512 56d79deda1cb4624b7136c0028d8786ee5f560aef52f305548654b873232a968b0bd25322c53caa44c61dd0557d177c5725eaed4b6b6e554920e9f5e8b8dcf85 WHIRLPOOL e0bd59c30e04b4a67b7924890f0e377bbb120564a155815b1aa64a28da7f835362e583333240672aeb2b39d63c5c37e2739d4a9e9f25488ce2cfb5ee1e475569
 DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
@@ -57,8 +55,6 @@ DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a5747
 DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 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_p20160226.ebuild 14930 SHA256 fc9c476d372a29d8699e21fcd7452ba730898f33dc9711b38dbd475c6ec743f6 SHA512 f674aae89d47aec2de403d15f8afe0d5baba2c5adcd1bb200b9486f0a4626b13ce03f795c199888e990179a721d3bc53e8bb7950a6a630a96ef43ef5f13606ad WHIRLPOOL aad7150ab031335e97bc666eef873dc34714ab83d2df3f199bc3dd083f4058295c77a278616830707636c0dfb8fb7147a7a27dde944b1db1206f1dcc17f378a8
-EBUILD netbeans-java-9999_p20160227.ebuild 14930 SHA256 2438fd3e258d595b01d76a464498a9a98f5b1e65e7cb85f0d52917c86815b6e2 SHA512 2985dc065805e4bd913443385eec8c8996445ca45f428e63c84b27cfb8ddf718d9e1c55c52896bf64bd0da024034da5c8b4ad7be69d190a54ef768bdd2903a79 WHIRLPOOL eecec8658bf855de6acb365b4d78bd8dcca08cdf13ef3fa2d75f748da3994fe113f812d095f6a4a0f2f6d68f1bf17df159813846ab70a9b9bda3cac7d30157e2
 EBUILD netbeans-java-9999_p20160228.ebuild 14930 SHA256 22fa74a31da327b39ae5874bf4f2bdeff14baea8013624d4797c5e1beb061f20 SHA512 85114afca7be5818741429fda4aad80551bae95418b3c1d7e836d8d7c5ef455b4f3682bcfb3e0a216a5165058bddc2de07cb7b20ea30b94a8134625f48a32df9 WHIRLPOOL ffe3fee26d028a908a7b46513d378994eb1b4886c8ed01a23288dfccafec3723c92c62a2dd4021a019e66de04212ad73473c1df1b071a297caa84438119a3960
 EBUILD netbeans-java-9999_p20160229.ebuild 14930 SHA256 d08bbb49f0a99f7d93a1b421c1a01efba287c1d27447e6329b9acbb8c41db1df SHA512 78e4f19cfc202a94bf6b418729424446b22fe9829723f0dda69548976de61b5704a9f337fa58051d8978adeb4f38032e3e3617614e77168f7c1226a521798054 WHIRLPOOL 0ed2df8e72c2cf69a217d239edc3df4eb9723fe1051ea10a2d984317ce537056e6acc13d9798b275ef454ef036d0943dfd31937050ad8826bd53a103fad154cb
 EBUILD netbeans-java-9999_p20160301.ebuild 14930 SHA256 dfd8e964af69f4b18011df7f4935e092ebc5a272345171afcdc7e83a0be674cf SHA512 03769dcf1cc8539e80faaac9fbf22ecd1ef8f9838b7001ff89f8b43c9aa5f5d9531480588df527cfa93146654ffb4e27a463bbe5f97d0b4289124b9b5088667d WHIRLPOOL 07871a6627db1cc93b1afc8760bf6e33d1cccb54611ba675f52ba3df0ef4ab5fc64bafb9e405e8e60deb76ce85b8adaa190a50abc935d00daccd4b4ddb6d9b96

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160226.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160226.ebuild
deleted file mode 100644
index 507d4d2..0000000
--- a/dev-java/netbeans-java/netbeans-java-9999_p20160226.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-# Maven cannot be unbundled because it depends on exact maven version and exact content of maven directory
-
-DESCRIPTION="Netbeans Java Cluster"
-HOMEPAGE="http://netbeans.org/projects/java"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-02-26_00-02-15/zip/netbeans-trunk-nightly-201602260002-src.zip"
-# jarjar-1.4 contains also asm libraries
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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/37781101C4BAF40437CA4D1A16149647B4082F3B-nb-javac-impl.jar
-	http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
-	http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar
-	http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip
-	http://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip
-	http://hg.netbeans.org/binaries/B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-websvccommon-${PV}
-	dev-java/beansbinding:0
-	dev-java/cglib:3
-	dev-java/jdom:0"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0
-	dev-java/json-simple:0
-	dev-java/junit:4"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}
-	dev-java/absolutelayout:0
-	>=dev-java/antlr-2.7.7-r7:0
-	dev-java/c3p0:0
-	dev-java/commons-cli:1
-	dev-java/commons-collections:0
-	dev-java/dom4j:1
-	dev-java/fastinfoset:0
-	dev-java/glassfish-transaction-api:0
-	dev-java/javassist:3
-	dev-java/jboss-logging:0
-	dev-java/jsr67:0
-	dev-java/jsr181:0
-	>=dev-java/jtidy-1:0
-	dev-java/log4j:0
-	dev-java/mimepull:0
-	dev-java/oracle-javamail:0
-	dev-java/saaj:0
-	dev-java/slf4j-api:0
-	dev-java/slf4j-log4j12:0
-	dev-java/slf4j-simple:0
-	dev-java/stax-ex:0
-	dev-java/stax2-api:0
-	dev-java/xmlstreambuffer:0"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.java -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-pkg_pretend() {
-	local die_now=""
-
-	if [ -d /usr/share/netbeans-java-${SLOT}/ant ]; then
-		if [ -n "$(find /usr/share/netbeans-java-${SLOT}/ant -type l)" ]; then
-			eerror "Please remove following symlinks and run emerge again:"
-			find /usr/share/netbeans-java-${SLOT}/ant -type l
-			die_now="1"
-		fi
-	fi
-
-	if [ -L /usr/share/netbeans-java-${SLOT}/maven ]; then
-		if [ -z "${die_now}" ]; then
-			eerror "Please remove following symlinks and run emerge again:"
-		fi
-
-		echo "/usr/share/netbeans-java-${SLOT}/maven"
-		die_now="1"
-	fi
-
-	if [ -n "${die_now}" ]; then
-		die "Symlinks exist"
-	fi
-}
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r14-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}"/37781101C4BAF40437CA4D1A16149647B4082F3B-nb-javac-impl.jar libs.javacimpl/external/nb-javac-impl.jar || die
-	ln -s "${DISTDIR}"/CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.jar maven/external/netbeans-cos.jar || die
-	ln -s "${DISTDIR}"/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar || die
-	ln -s "${DISTDIR}"/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselinkmodelgen/external/org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar || die
-	ln -s "${DISTDIR}"/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip libs.springframework/external/spring-framework-3.2.7.RELEASE.zip || die
-	ln -s "${DISTDIR}"/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip libs.springframework/external/spring-framework-4.0.1.RELEASE.zip || die
-	ln -s "${DISTDIR}"/B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.jar maven.embedder/external/wagon-http-2.8-shaded.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r14-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-java/netbeans-java-9999_p20160227.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160227.ebuild
deleted file mode 100644
index 6643133..0000000
--- a/dev-java/netbeans-java/netbeans-java-9999_p20160227.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-# Maven cannot be unbundled because it depends on exact maven version and exact content of maven directory
-
-DESCRIPTION="Netbeans Java Cluster"
-HOMEPAGE="http://netbeans.org/projects/java"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-02-27_00-02-15/zip/netbeans-trunk-nightly-201602270002-src.zip"
-# jarjar-1.4 contains also asm libraries
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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/37781101C4BAF40437CA4D1A16149647B4082F3B-nb-javac-impl.jar
-	http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
-	http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar
-	http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip
-	http://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip
-	http://hg.netbeans.org/binaries/B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-websvccommon-${PV}
-	dev-java/beansbinding:0
-	dev-java/cglib:3
-	dev-java/jdom:0"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0
-	dev-java/json-simple:0
-	dev-java/junit:4"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}
-	dev-java/absolutelayout:0
-	>=dev-java/antlr-2.7.7-r7:0
-	dev-java/c3p0:0
-	dev-java/commons-cli:1
-	dev-java/commons-collections:0
-	dev-java/dom4j:1
-	dev-java/fastinfoset:0
-	dev-java/glassfish-transaction-api:0
-	dev-java/javassist:3
-	dev-java/jboss-logging:0
-	dev-java/jsr67:0
-	dev-java/jsr181:0
-	>=dev-java/jtidy-1:0
-	dev-java/log4j:0
-	dev-java/mimepull:0
-	dev-java/oracle-javamail:0
-	dev-java/saaj:0
-	dev-java/slf4j-api:0
-	dev-java/slf4j-log4j12:0
-	dev-java/slf4j-simple:0
-	dev-java/stax-ex:0
-	dev-java/stax2-api:0
-	dev-java/xmlstreambuffer:0"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.java -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-pkg_pretend() {
-	local die_now=""
-
-	if [ -d /usr/share/netbeans-java-${SLOT}/ant ]; then
-		if [ -n "$(find /usr/share/netbeans-java-${SLOT}/ant -type l)" ]; then
-			eerror "Please remove following symlinks and run emerge again:"
-			find /usr/share/netbeans-java-${SLOT}/ant -type l
-			die_now="1"
-		fi
-	fi
-
-	if [ -L /usr/share/netbeans-java-${SLOT}/maven ]; then
-		if [ -z "${die_now}" ]; then
-			eerror "Please remove following symlinks and run emerge again:"
-		fi
-
-		echo "/usr/share/netbeans-java-${SLOT}/maven"
-		die_now="1"
-	fi
-
-	if [ -n "${die_now}" ]; then
-		die "Symlinks exist"
-	fi
-}
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r14-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}"/37781101C4BAF40437CA4D1A16149647B4082F3B-nb-javac-impl.jar libs.javacimpl/external/nb-javac-impl.jar || die
-	ln -s "${DISTDIR}"/CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.jar maven/external/netbeans-cos.jar || die
-	ln -s "${DISTDIR}"/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar || die
-	ln -s "${DISTDIR}"/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselinkmodelgen/external/org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar || die
-	ln -s "${DISTDIR}"/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip libs.springframework/external/spring-framework-3.2.7.RELEASE.zip || die
-	ln -s "${DISTDIR}"/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip libs.springframework/external/spring-framework-4.0.1.RELEASE.zip || die
-	ln -s "${DISTDIR}"/B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.jar maven.embedder/external/wagon-http-2.8-shaded.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r14-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 3b12bd3..3da687a 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -7,8 +7,6 @@ DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r15-build.xml.patch.bz2 2680 SHA256 d686f1e352eae400393577a456042f4475b9c321369101d2f05ec627aa61ef0c SHA512 7428b664749878fd1ead2c821277769a5af9636388515a4786284568ea656734ba2a9e90758385f5b6a0c009469df3dcc005936c8865c93cc9bc29576d2171e4 WHIRLPOOL fea09d3b1e2cc07e090a9618cbdaf6b2e3d4cab9679fdb4321a856922035871e485f492e6298e7e2562d8ecba626f2bdb3130f09840e83878e3c1e6fd6944899
-DIST netbeans-trunk-nightly-201602260002-src.zip 209828915 SHA256 79e707455e36ff5602efab93c10a4d1a2548e51b8ce9799f9793fe24eb029302 SHA512 f506d2ec8b3ffd8ece1f08ced77579e816df11afa8e85246eaa04c166c67e306ee20b3afe5dd856ac1d47ce2a97f9bce69ffdffc5ee38df633a7abc441a2a25c WHIRLPOOL 88f6627dc291e47e487359d7bda443a228ff258269a715d561faa4af4c4e57ac98a3179f3e9fb7150504f1a6dedaddec3d21f38f88eb7f3e99eae4fd2e51cd54
-DIST netbeans-trunk-nightly-201602270002-src.zip 209831963 SHA256 20b41ce3e47c43d3e255e9833fa3f2c3bcd48876ff620c40ed93c878c7abd883 SHA512 980ab79ed39cea631f45d7609b5d3bd8e8310737d7934dbe6a3f93f9c31031d5b38c40370ef6d35898bb7f39eb7a72a00ea1715a77b12678eb5d3a2e2f12a76a WHIRLPOOL f4a058519c51572208225a141a6745583c6ce1019e4d4b2ae994e0b6dd000034e330113decdfc2a6589025e61d11583852e64e121dd42fd833552d35f9ba748a
 DIST netbeans-trunk-nightly-201602280002-src.zip 209832078 SHA256 9db7e895e76748c876558471306afbb5a6af856a8cb391248be4f8d700cb0fc0 SHA512 41bfbb29f4e9760e11336d13908703b13276dac95dd070945963a213969dbdfa844e96340a0ec7e32d721cda3bd11a7f940855a3b1ddccd3d3349b32efcf4c36 WHIRLPOOL e2ca8afcc4a6a1b5a8f19958df6015709542f0d896bd7f9b35fbb7671571732fb1931a5de6e1e0deb21ee86fdecdf2a013ff319d76e1569f8c0ba2b252e959d6
 DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf77015ad8c9ca15c1a54953eec0492be748fde20af0b464700c80f SHA512 56d79deda1cb4624b7136c0028d8786ee5f560aef52f305548654b873232a968b0bd25322c53caa44c61dd0557d177c5725eaed4b6b6e554920e9f5e8b8dcf85 WHIRLPOOL e0bd59c30e04b4a67b7924890f0e377bbb120564a155815b1aa64a28da7f835362e583333240672aeb2b39d63c5c37e2739d4a9e9f25488ce2cfb5ee1e475569
 DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
@@ -29,8 +27,6 @@ DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a5747
 DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 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_p20160226.ebuild 4971 SHA256 e47ba2e3e2ba7b1407b873668eb341f1c7bcc0af6f202524d03830d771db418d SHA512 654aab63a0d07577b744ec686ae8dc3c2d61cc934798f61fece32d3619bbe8e6b148271695d56544aefba06ef33888e93df7824040ce2f87f8d31f8691aa2448 WHIRLPOOL 7a0e5f77cd3672589f580c181903f3a2e68d3e119fb4e406760a54d775760493825df80fdb425702cacf2e8604a20dc7620a4b43016133aa3866dee7a01d542b
-EBUILD netbeans-javacard-9999_p20160227.ebuild 4971 SHA256 ec10c9a4e50173211dd3054814517b9813fd2e51a723fa9a8730ff8c23de7e87 SHA512 1c721c40df05c41006efd060e35b8ae981337b1a8470bc68b03d7a7831529cfd34f40c7291d4090277acb54f3f08abd1339f63746642a8ef9e88f3efd4011a82 WHIRLPOOL c3d97feffde552a9b2a67a3395a67aee56161460ffc1c2fe95331b6fb8e3947822b2ad7a3a2edbc4170f744961330d3c4f3184c2647347fd9da44f008054fb0b
 EBUILD netbeans-javacard-9999_p20160228.ebuild 4971 SHA256 7d637c93ed833b61b41396066da4aa00e58a82962552c313abd6a8522888dee6 SHA512 8d010318839e20cd7c9fe9d772612d3800ae082cea9e717b718ef315356229b2a1d10974dd6c4d692d2b8aedd40c92d9b973bef800d8bbe1c3aa0475753903be WHIRLPOOL b439e9b6968331d4fbed5cb31f095946c5ddb5842525cf87617734c7c62a698c9a7b5231e8bb6f9ac69ef8d0353d8576e41614ba35131950f752e24bfe7b91b9
 EBUILD netbeans-javacard-9999_p20160229.ebuild 4971 SHA256 5b979076158ab82cbe7b8cd478925c1abb8490bed352e18d2a314206c3b6c099 SHA512 f0703f432c0ed74cd3598ad393059682ec5f7932553266e4f959d9f69e4535817a18780c5e9da1e872b4ae48b8f9bc3d45ecc32d73179fd7f95000cc43224a77 WHIRLPOOL 776301820de6974c707a6ab77e7fd2ba92190bd93e4a70b2e05266f98b9145b998b4ba6e3a29b88e71eec65b53170c884056bf0bfd2a16da4a11ccbc43962331
 EBUILD netbeans-javacard-9999_p20160301.ebuild 4971 SHA256 38b2fd0b5d066080657ca0dcf55cf864a2459639de80ab42be9f84a659740364 SHA512 995680bfb4baa747d260ec775773204570e49ec28e1d43124bdb9ca935c807ffa4b64f27d0f9de08df31ceba21a983b3b1fd454802fefaffb271213e6d8b85d3 WHIRLPOOL 7ce1a3cf9c2fcdcf07f8a1940d6c7dc9cf3bbe60a3913c5e1b2a3ac00a769e74a5eea9835d44e559a1d7dc8047e6407ef41942fdfc05ae5abeec9f469b29656c

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160226.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160226.ebuild
deleted file mode 100644
index eb5eedc..0000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160226.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-02-26_00-02-15/zip/netbeans-trunk-nightly-201602260002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-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-r14-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-javacard/netbeans-javacard-9999_p20160227.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160227.ebuild
deleted file mode 100644
index 70049d9..0000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160227.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-02-27_00-02-15/zip/netbeans-trunk-nightly-201602270002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-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-r14-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 39855f8..80f7d2b 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -5,8 +5,6 @@ DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r15-build.xml.patch.bz2 2680 SHA256 d686f1e352eae400393577a456042f4475b9c321369101d2f05ec627aa61ef0c SHA512 7428b664749878fd1ead2c821277769a5af9636388515a4786284568ea656734ba2a9e90758385f5b6a0c009469df3dcc005936c8865c93cc9bc29576d2171e4 WHIRLPOOL fea09d3b1e2cc07e090a9618cbdaf6b2e3d4cab9679fdb4321a856922035871e485f492e6298e7e2562d8ecba626f2bdb3130f09840e83878e3c1e6fd6944899
-DIST netbeans-trunk-nightly-201602260002-src.zip 209828915 SHA256 79e707455e36ff5602efab93c10a4d1a2548e51b8ce9799f9793fe24eb029302 SHA512 f506d2ec8b3ffd8ece1f08ced77579e816df11afa8e85246eaa04c166c67e306ee20b3afe5dd856ac1d47ce2a97f9bce69ffdffc5ee38df633a7abc441a2a25c WHIRLPOOL 88f6627dc291e47e487359d7bda443a228ff258269a715d561faa4af4c4e57ac98a3179f3e9fb7150504f1a6dedaddec3d21f38f88eb7f3e99eae4fd2e51cd54
-DIST netbeans-trunk-nightly-201602270002-src.zip 209831963 SHA256 20b41ce3e47c43d3e255e9833fa3f2c3bcd48876ff620c40ed93c878c7abd883 SHA512 980ab79ed39cea631f45d7609b5d3bd8e8310737d7934dbe6a3f93f9c31031d5b38c40370ef6d35898bb7f39eb7a72a00ea1715a77b12678eb5d3a2e2f12a76a WHIRLPOOL f4a058519c51572208225a141a6745583c6ce1019e4d4b2ae994e0b6dd000034e330113decdfc2a6589025e61d11583852e64e121dd42fd833552d35f9ba748a
 DIST netbeans-trunk-nightly-201602280002-src.zip 209832078 SHA256 9db7e895e76748c876558471306afbb5a6af856a8cb391248be4f8d700cb0fc0 SHA512 41bfbb29f4e9760e11336d13908703b13276dac95dd070945963a213969dbdfa844e96340a0ec7e32d721cda3bd11a7f940855a3b1ddccd3d3349b32efcf4c36 WHIRLPOOL e2ca8afcc4a6a1b5a8f19958df6015709542f0d896bd7f9b35fbb7671571732fb1931a5de6e1e0deb21ee86fdecdf2a013ff319d76e1569f8c0ba2b252e959d6
 DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf77015ad8c9ca15c1a54953eec0492be748fde20af0b464700c80f SHA512 56d79deda1cb4624b7136c0028d8786ee5f560aef52f305548654b873232a968b0bd25322c53caa44c61dd0557d177c5725eaed4b6b6e554920e9f5e8b8dcf85 WHIRLPOOL e0bd59c30e04b4a67b7924890f0e377bbb120564a155815b1aa64a28da7f835362e583333240672aeb2b39d63c5c37e2739d4a9e9f25488ce2cfb5ee1e475569
 DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
@@ -27,8 +25,6 @@ DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a5747
 DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 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_p20160226.ebuild 6293 SHA256 44dccd18e1094dd3bd7f93c6a612394b1377d76d1d5ad6b5b22917b7882a0bd4 SHA512 1f51fd4ebe3ddf9465550ecf9d24adb0acefbce99a066bb0e0df6b107717788fb5b740508f8b3343b6870f60a58e797f4f07959073610b850efa2e86d9571624 WHIRLPOOL 220187d969ec51ae82e946edb1d20c3ec5599592751c63ba788992c328cf608b22934a4559624792d8510c67863a3afc9fd47397ffcb6db45eb212c9c70f8d9c
-EBUILD netbeans-javadoc-9999_p20160227.ebuild 6293 SHA256 302140bcff4d2bcbeb2103cec340fe2ddc1b6e451844420a60b9efd4ef4af322 SHA512 e8ce4e814b0b3631e86e0603c0f40503934450212c02a6be2a31707cd609cd76d220ca69ed6fd32f41de746c4dc85407a527f6808583de683ad00abdb10335fa WHIRLPOOL 49a69a018363fafcb96bcab5dddea9c25e8720469cc5a30b419d41db8db757c70600c813a3ea3980615ce7f68da581b7c245babefc617d874af46543b9e82f83
 EBUILD netbeans-javadoc-9999_p20160228.ebuild 6293 SHA256 fadc8066a7863dfd365f84d05bb57f7cd1ac747dfd7dabf777cf833ccd0f5b9a SHA512 04e4ebc0f1102e0b84c2ffa4c73e6f409a891fd343c8b3b4fb8569b390c3874bc3f9fccbcc1f6d39a051a8ce6bdffb28f2c173253047f9b12b3e200db75e9611 WHIRLPOOL 3055249fc7feea4499846fb4738f4210180f1df16f9e146bd0826f988976b2154c9e664e81b59ef575ecba33f42c56aa8f68a9b7f6623b754f816b3fee538382
 EBUILD netbeans-javadoc-9999_p20160229.ebuild 6293 SHA256 b5fefe45bf0c0b0afdca35451b0d688aa540741071d1d258974d3337d1f2a37d SHA512 db5ec2f49ce245a3a7dc0f987abb4efe6ddd102731d67549b4a56e5eb3b85f255db529785954492bc50a796cf5272d70c26516398b978731eb61c3ec255d6801 WHIRLPOOL 3f328708209667b6abe0d72542acb330a199c0044de34bc45a19ea8f93dae2e7902932896723375bb6626d30afbb31bfb7ca1a37b630c33b0cbe2e91b5a4ac48
 EBUILD netbeans-javadoc-9999_p20160301.ebuild 6293 SHA256 02706fcb70b5981a1a9862c07086958512e3b7b3efcd63bd2b6c1e53750da2fb SHA512 32110531136e3ae855e53deba7de06cb1bc94162c0feb2da1c3464fed6b1a2bc11483aaca25cac5eed7dfaf269ae832bb888be55e54d3734dd51cf0bcefb5adb WHIRLPOOL 6e798a7b90802c29f8a2fdecc1f5692880b63c6a19b1392ec06e840fd155afdfe8e0abfe4d5a4d647922f89d0e911165d3622f93847516bcc51ee9e2c3571c98

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160226.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160226.ebuild
deleted file mode 100644
index 4aeebe5..0000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160226.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-02-26_00-02-15/zip/netbeans-trunk-nightly-201602260002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-# oracle-jdk-bin is needed because of javafx which is not currently packaged separately
-DEPEND="dev-java/oracle-jdk-bin:1.8[javafx]
-	app-arch/unzip
-	dev-java/javahelp:0
-	dev-java/junit:4
-	~dev-java/netbeans-apisupport-${PV}
-	~dev-java/netbeans-cnd-${PV}
-	~dev-java/netbeans-dlight-${PV}
-	~dev-java/netbeans-enterprise-${PV}
-	~dev-java/netbeans-ergonomics-${PV}
-	~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-groovy-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-javacard-${PV}
-	~dev-java/netbeans-mobility-${PV}
-	~dev-java/netbeans-nb-${PV}
-	~dev-java/netbeans-php-${PV}
-	~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-profiler-${PV}
-	~dev-java/netbeans-websvccommon-${PV}"
-RDEPEND=""
-
-JAVA_PKG_BSFIX="off"
-JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.8"
-JAVA_PKG_WANT_SOURCE="1.7"
-JAVA_PKG_WANT_TARGET="1.7"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r14-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip o.apache.tools.ant.module/external/ant-libs-1.9.4.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r14-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-javadoc/netbeans-javadoc-9999_p20160227.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160227.ebuild
deleted file mode 100644
index 7db9561..0000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160227.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-02-27_00-02-15/zip/netbeans-trunk-nightly-201602270002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-# oracle-jdk-bin is needed because of javafx which is not currently packaged separately
-DEPEND="dev-java/oracle-jdk-bin:1.8[javafx]
-	app-arch/unzip
-	dev-java/javahelp:0
-	dev-java/junit:4
-	~dev-java/netbeans-apisupport-${PV}
-	~dev-java/netbeans-cnd-${PV}
-	~dev-java/netbeans-dlight-${PV}
-	~dev-java/netbeans-enterprise-${PV}
-	~dev-java/netbeans-ergonomics-${PV}
-	~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-groovy-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-javacard-${PV}
-	~dev-java/netbeans-mobility-${PV}
-	~dev-java/netbeans-nb-${PV}
-	~dev-java/netbeans-php-${PV}
-	~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-profiler-${PV}
-	~dev-java/netbeans-websvccommon-${PV}"
-RDEPEND=""
-
-JAVA_PKG_BSFIX="off"
-JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.8"
-JAVA_PKG_WANT_SOURCE="1.7"
-JAVA_PKG_WANT_TARGET="1.7"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r14-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip o.apache.tools.ant.module/external/ant-libs-1.9.4.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r14-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 eceb7d4..5dbbd61 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -12,8 +12,6 @@ DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r15-build.xml.patch.bz2 2680 SHA256 d686f1e352eae400393577a456042f4475b9c321369101d2f05ec627aa61ef0c SHA512 7428b664749878fd1ead2c821277769a5af9636388515a4786284568ea656734ba2a9e90758385f5b6a0c009469df3dcc005936c8865c93cc9bc29576d2171e4 WHIRLPOOL fea09d3b1e2cc07e090a9618cbdaf6b2e3d4cab9679fdb4321a856922035871e485f492e6298e7e2562d8ecba626f2bdb3130f09840e83878e3c1e6fd6944899
-DIST netbeans-trunk-nightly-201602260002-src.zip 209828915 SHA256 79e707455e36ff5602efab93c10a4d1a2548e51b8ce9799f9793fe24eb029302 SHA512 f506d2ec8b3ffd8ece1f08ced77579e816df11afa8e85246eaa04c166c67e306ee20b3afe5dd856ac1d47ce2a97f9bce69ffdffc5ee38df633a7abc441a2a25c WHIRLPOOL 88f6627dc291e47e487359d7bda443a228ff258269a715d561faa4af4c4e57ac98a3179f3e9fb7150504f1a6dedaddec3d21f38f88eb7f3e99eae4fd2e51cd54
-DIST netbeans-trunk-nightly-201602270002-src.zip 209831963 SHA256 20b41ce3e47c43d3e255e9833fa3f2c3bcd48876ff620c40ed93c878c7abd883 SHA512 980ab79ed39cea631f45d7609b5d3bd8e8310737d7934dbe6a3f93f9c31031d5b38c40370ef6d35898bb7f39eb7a72a00ea1715a77b12678eb5d3a2e2f12a76a WHIRLPOOL f4a058519c51572208225a141a6745583c6ce1019e4d4b2ae994e0b6dd000034e330113decdfc2a6589025e61d11583852e64e121dd42fd833552d35f9ba748a
 DIST netbeans-trunk-nightly-201602280002-src.zip 209832078 SHA256 9db7e895e76748c876558471306afbb5a6af856a8cb391248be4f8d700cb0fc0 SHA512 41bfbb29f4e9760e11336d13908703b13276dac95dd070945963a213969dbdfa844e96340a0ec7e32d721cda3bd11a7f940855a3b1ddccd3d3349b32efcf4c36 WHIRLPOOL e2ca8afcc4a6a1b5a8f19958df6015709542f0d896bd7f9b35fbb7671571732fb1931a5de6e1e0deb21ee86fdecdf2a013ff319d76e1569f8c0ba2b252e959d6
 DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf77015ad8c9ca15c1a54953eec0492be748fde20af0b464700c80f SHA512 56d79deda1cb4624b7136c0028d8786ee5f560aef52f305548654b873232a968b0bd25322c53caa44c61dd0557d177c5725eaed4b6b6e554920e9f5e8b8dcf85 WHIRLPOOL e0bd59c30e04b4a67b7924890f0e377bbb120564a155815b1aa64a28da7f835362e583333240672aeb2b39d63c5c37e2739d4a9e9f25488ce2cfb5ee1e475569
 DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
@@ -34,8 +32,6 @@ DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a5747
 DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 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_p20160226.ebuild 4717 SHA256 65d06a481db89dc3734e1e09c11ef3cb3fc4b212a3512e5c2d871de35ab6fa25 SHA512 b72bee6950fc1231be8cb6f02ddbe2c5b95e84061ac90b7a9b3b4e3bead61d2661bb6c89284334a9f4e38e0636b3c5efeb8c99eff6b7f249b68b556f818fb802 WHIRLPOOL 0a5c2f159e3c1701e5c4a8df36d77882ccac36de3d0cb5ea17b57ffdb60b8823b0dc2856cc2a5df0d82458350100905627c9ca7ee83737487a54638a53de0f76
-EBUILD netbeans-javafx-9999_p20160227.ebuild 4717 SHA256 dcaf0583089f0a9d0f887271226485c8f7c1c0149321fb7c93514929cd28fbfe SHA512 5e57c120b0d0faeb4a24c90f3cb8a3e1aa9b36124c1b4d38efadfa24c8a0115f99be701cf38cb1496178f4f2993915be192b10bf10c6e16e747f9ed84de85465 WHIRLPOOL ad848a3ffe376c7ad2e365d8a2b6a57b3090b22cfd5f67cccfdbdd260d39f43115701ece8d24c2088c5744e6c93d86289b056391a0bab7a4c682acf5661a5be8
 EBUILD netbeans-javafx-9999_p20160228.ebuild 4717 SHA256 a404421c29b60f801004496d00ee18e2ae539ace60c703cfa03e96cd29c3d69d SHA512 c6ca4d5d4a03b41c7e95d6e6f0558914661f002eee0cd875d38abb423d3e4b7c79184c04392d9048fa9c80c641bec14fd103415793cb55167525dcab2fc669b4 WHIRLPOOL 089f7d269e373b378f06fc9b80e8aa2e2c2a10516e12eba718a9b45f1196c1f2a7b754d4a844706ac198a45697c4654898d129e3ca826dac295a44da26cad7c1
 EBUILD netbeans-javafx-9999_p20160229.ebuild 4717 SHA256 8b5d9fecbdd2add9731cc48c9b394aa691dbae12bf56673d2685787560c5e9fb SHA512 a47fb9a4790c6fd6879697c3aeb1e491d6e762f8df1062e4d5d68392ce8e15ad5e1714a85ee584bc2bffba448ea04c6810e55ecfca57a81960e66519e0cfba7d WHIRLPOOL c9a8f2596a343c073386d19627290104561fb3c0daa1bd60082a43fbaa3d20f89240139ae70887a89ca5cc743a43e6884eb9772ed4806776b55919cdca27ebc3
 EBUILD netbeans-javafx-9999_p20160301.ebuild 4717 SHA256 a5316aefe4568fb967458b842cc383c5650e99f1accc07c06489f169abab5d07 SHA512 70cfd52efdd0dfceba0b70b4a217bbeedb534f7de0ae73411cdce3f760fdb981531bc9dac3db17ac6ff1adc2638705d6990dd87582551b04582731d42375ff2d WHIRLPOOL bada5a1667b69e1793a0f3ffd324e9aad52b32fdfa41d9c9301ac034cc24c832f05523a8f8033f37afee867d3190bff4162765642e724249cf40a90d3a27479e

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160226.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160226.ebuild
deleted file mode 100644
index 92bd714..0000000
--- a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160226.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-02-26_00-02-15/zip/netbeans-trunk-nightly-201602260002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-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-r14-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-javafx/netbeans-javafx-9999_p20160227.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160227.ebuild
deleted file mode 100644
index 44d95db..0000000
--- a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160227.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-02-27_00-02-15/zip/netbeans-trunk-nightly-201602270002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-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-r14-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 130825f..7a9fd2c 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -4,8 +4,6 @@ DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r15-build.xml.patch.bz2 2680 SHA256 d686f1e352eae400393577a456042f4475b9c321369101d2f05ec627aa61ef0c SHA512 7428b664749878fd1ead2c821277769a5af9636388515a4786284568ea656734ba2a9e90758385f5b6a0c009469df3dcc005936c8865c93cc9bc29576d2171e4 WHIRLPOOL fea09d3b1e2cc07e090a9618cbdaf6b2e3d4cab9679fdb4321a856922035871e485f492e6298e7e2562d8ecba626f2bdb3130f09840e83878e3c1e6fd6944899
-DIST netbeans-trunk-nightly-201602260002-src.zip 209828915 SHA256 79e707455e36ff5602efab93c10a4d1a2548e51b8ce9799f9793fe24eb029302 SHA512 f506d2ec8b3ffd8ece1f08ced77579e816df11afa8e85246eaa04c166c67e306ee20b3afe5dd856ac1d47ce2a97f9bce69ffdffc5ee38df633a7abc441a2a25c WHIRLPOOL 88f6627dc291e47e487359d7bda443a228ff258269a715d561faa4af4c4e57ac98a3179f3e9fb7150504f1a6dedaddec3d21f38f88eb7f3e99eae4fd2e51cd54
-DIST netbeans-trunk-nightly-201602270002-src.zip 209831963 SHA256 20b41ce3e47c43d3e255e9833fa3f2c3bcd48876ff620c40ed93c878c7abd883 SHA512 980ab79ed39cea631f45d7609b5d3bd8e8310737d7934dbe6a3f93f9c31031d5b38c40370ef6d35898bb7f39eb7a72a00ea1715a77b12678eb5d3a2e2f12a76a WHIRLPOOL f4a058519c51572208225a141a6745583c6ce1019e4d4b2ae994e0b6dd000034e330113decdfc2a6589025e61d11583852e64e121dd42fd833552d35f9ba748a
 DIST netbeans-trunk-nightly-201602280002-src.zip 209832078 SHA256 9db7e895e76748c876558471306afbb5a6af856a8cb391248be4f8d700cb0fc0 SHA512 41bfbb29f4e9760e11336d13908703b13276dac95dd070945963a213969dbdfa844e96340a0ec7e32d721cda3bd11a7f940855a3b1ddccd3d3349b32efcf4c36 WHIRLPOOL e2ca8afcc4a6a1b5a8f19958df6015709542f0d896bd7f9b35fbb7671571732fb1931a5de6e1e0deb21ee86fdecdf2a013ff319d76e1569f8c0ba2b252e959d6
 DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf77015ad8c9ca15c1a54953eec0492be748fde20af0b464700c80f SHA512 56d79deda1cb4624b7136c0028d8786ee5f560aef52f305548654b873232a968b0bd25322c53caa44c61dd0557d177c5725eaed4b6b6e554920e9f5e8b8dcf85 WHIRLPOOL e0bd59c30e04b4a67b7924890f0e377bbb120564a155815b1aa64a28da7f835362e583333240672aeb2b39d63c5c37e2739d4a9e9f25488ce2cfb5ee1e475569
 DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
@@ -26,8 +24,6 @@ DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a5747
 DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 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_p20160226.ebuild 4412 SHA256 bbec2e6c2e650d2fc08f509630fd75b94ab377164e8039f739412a9733703e23 SHA512 6ee2a3cac08f3dee80da86aa60b49427682d9fba372f79459249d08a536eaab7aadb8a028db7500bfc7c9c4701ce5b84919ad34391e7527d833a52ea747560f0 WHIRLPOOL 838385e60b32c9cc438a1406469f21983038b62ff3bb158d16ef14d2675af940b371efbfbf14bedcc4cd7e1ef4a1ae73839a9f7c06b66149d89c9ad3ea585b2d
-EBUILD netbeans-mobility-9999_p20160227.ebuild 4412 SHA256 58ce32ee3c6e8e0a907e159515b584f2be6533b97709b35895c6dfeefc9dae8f SHA512 e15addc7bee2138ff2063ced6c9b5678e9608e1cb278fa0003638f7c8effe15f7751cbc25d4111122b437d91e91ea7b297397384b2c25a500b823ab61f47fcc6 WHIRLPOOL a5647b8a32b231c474d1b67cf06917ae483317c2f56ef880544571c122b6626c1fd6ca56d76b9dc0feb6ac423ebfd3e948f3389a4983becaf7dd2e9a2acd70c6
 EBUILD netbeans-mobility-9999_p20160228.ebuild 4412 SHA256 a5050d8a8822caef1f0bbea40fa95c36d96bdfb4b591ed3a857f32d6884ee136 SHA512 3543fc6a6100e917e072138b1431e3836b3d07549a1528c2151b4f24582eff3987eeae09e0896c92f855c6f28c828c3b42e309ff84de72af91cd4d886862a7e5 WHIRLPOOL 9a1c12bf864ae69cffc1703ed14057ee3d6d6897ea5bf7c874245b65db3fb3bb31409f932ed82c1eb6180a9b0dcbbd3d6ac977d5621be665440d4f05ed86b378
 EBUILD netbeans-mobility-9999_p20160229.ebuild 4412 SHA256 c2c5d930e198b3ce95fa0a33324c4e45221e5875dee06fcd09bed779b738e79b SHA512 2e294c66578cbc8f99216338a06b7b3b5adf0bbe5ce8431ace989c5569f54047997e242041e476c4ef9db1b2b67117bf8cb2f9a98c8ed59d9052c4f1a6c931db WHIRLPOOL 274ce754ce8a48442e0d31b1f017396becfb424f33ded9b2deaac1e6888bd7e80e413c094b792ea834098d5f2afd122ee987ac1471555b16ebaa378370b570bf
 EBUILD netbeans-mobility-9999_p20160301.ebuild 4412 SHA256 ee5b93428590409d0512334645285aac845973ae391ecb4ddbcbd8f269122793 SHA512 078fd31b8be1245c32d2fa614c5e436cf865aa5eefd791c3ede91e01474c0efb8b19a4123be3f7fd3df5410341c4b608f6f0aaf6e1b297852a443dc5855ee2d9 WHIRLPOOL 05156331306daa211f0f2a55199eb59a9957614b1dbbd08ca43aeb25e6a6511ad69245c0f1dbbd75a6c7f26d78de058b38260f53a5e9157fe68ed4d06154a341

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160226.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160226.ebuild
deleted file mode 100644
index 0914376..0000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160226.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-02-26_00-02-15/zip/netbeans-trunk-nightly-201602260002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r14-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-mobility/netbeans-mobility-9999_p20160227.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160227.ebuild
deleted file mode 100644
index 9e5217e..0000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160227.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-02-27_00-02-15/zip/netbeans-trunk-nightly-201602270002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r14-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 d24e30d..71e7d26 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -7,8 +7,6 @@ DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r15-build.xml.patch.bz2 2680 SHA256 d686f1e352eae400393577a456042f4475b9c321369101d2f05ec627aa61ef0c SHA512 7428b664749878fd1ead2c821277769a5af9636388515a4786284568ea656734ba2a9e90758385f5b6a0c009469df3dcc005936c8865c93cc9bc29576d2171e4 WHIRLPOOL fea09d3b1e2cc07e090a9618cbdaf6b2e3d4cab9679fdb4321a856922035871e485f492e6298e7e2562d8ecba626f2bdb3130f09840e83878e3c1e6fd6944899
-DIST netbeans-trunk-nightly-201602260002-src.zip 209828915 SHA256 79e707455e36ff5602efab93c10a4d1a2548e51b8ce9799f9793fe24eb029302 SHA512 f506d2ec8b3ffd8ece1f08ced77579e816df11afa8e85246eaa04c166c67e306ee20b3afe5dd856ac1d47ce2a97f9bce69ffdffc5ee38df633a7abc441a2a25c WHIRLPOOL 88f6627dc291e47e487359d7bda443a228ff258269a715d561faa4af4c4e57ac98a3179f3e9fb7150504f1a6dedaddec3d21f38f88eb7f3e99eae4fd2e51cd54
-DIST netbeans-trunk-nightly-201602270002-src.zip 209831963 SHA256 20b41ce3e47c43d3e255e9833fa3f2c3bcd48876ff620c40ed93c878c7abd883 SHA512 980ab79ed39cea631f45d7609b5d3bd8e8310737d7934dbe6a3f93f9c31031d5b38c40370ef6d35898bb7f39eb7a72a00ea1715a77b12678eb5d3a2e2f12a76a WHIRLPOOL f4a058519c51572208225a141a6745583c6ce1019e4d4b2ae994e0b6dd000034e330113decdfc2a6589025e61d11583852e64e121dd42fd833552d35f9ba748a
 DIST netbeans-trunk-nightly-201602280002-src.zip 209832078 SHA256 9db7e895e76748c876558471306afbb5a6af856a8cb391248be4f8d700cb0fc0 SHA512 41bfbb29f4e9760e11336d13908703b13276dac95dd070945963a213969dbdfa844e96340a0ec7e32d721cda3bd11a7f940855a3b1ddccd3d3349b32efcf4c36 WHIRLPOOL e2ca8afcc4a6a1b5a8f19958df6015709542f0d896bd7f9b35fbb7671571732fb1931a5de6e1e0deb21ee86fdecdf2a013ff319d76e1569f8c0ba2b252e959d6
 DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf77015ad8c9ca15c1a54953eec0492be748fde20af0b464700c80f SHA512 56d79deda1cb4624b7136c0028d8786ee5f560aef52f305548654b873232a968b0bd25322c53caa44c61dd0557d177c5725eaed4b6b6e554920e9f5e8b8dcf85 WHIRLPOOL e0bd59c30e04b4a67b7924890f0e377bbb120564a155815b1aa64a28da7f835362e583333240672aeb2b39d63c5c37e2739d4a9e9f25488ce2cfb5ee1e475569
 DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
@@ -29,8 +27,6 @@ DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a5747
 DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 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_p20160226.ebuild 4111 SHA256 459b48abe12e8b6aa8270805cd48fbda1bd7125426f991b1b4f10e13b25f69e7 SHA512 ebcd39ae8e705cbacb605179b24f48697949b3d3dfc69ced472d328eaa495dcb2874867ab89c666128099a14aba5c660652cd9491eda0ecd67fb056f6cd7eb8e WHIRLPOOL 0ee12ecd87f84db8425b661c6cd7d71e005205bb96a77b932a8ff194ca93e738d1d77ee415c8ccf1e0373c7afe7a79065d14179c188769956e8e3a786175fed3
-EBUILD netbeans-nb-9999_p20160227.ebuild 4111 SHA256 296a708ea143d5a8bd89e37de45354d50ab910f6d473ef2080aa91716e501c98 SHA512 059ded1e6e0a0598d2b4d6a2b026ec327533820c6b22715af0e34d10db6eeda6af7cb4ac0e015ef674422db7ca0e581a6fad449e8eea0bb6e8cd33ac8dcd4619 WHIRLPOOL b37d95987b158dc6440e13d2e654e3b409bf9496e4ba52972ab13d3de91125b190ac287f24dd9155bd34fe84af73a4c6a1f30831b015ad9c86c9b142aedbb784
 EBUILD netbeans-nb-9999_p20160228.ebuild 4111 SHA256 6dfa77fa2deb2866c732f3c78a5593c6f8b84675c12d25056b440929e5f34226 SHA512 4efb1b78c63b1d6b43e1deb85e3b6de9ffe7e20a8ace4016119bd6a74b7aa378d7aaa80fefb4a515fde13c977bfcf140c70b19f63accc54154b98b86b67c148d WHIRLPOOL 63ed904d7db3f534b8727d5c74bfb5ce8a12a7afeb6ceb79abd4c735b14fe7eed18164d9885bc68ebe95fce4a2b0289794ba9329d88f36488a4c601e026c4bed
 EBUILD netbeans-nb-9999_p20160229.ebuild 4111 SHA256 b29764da4d9dd43e4b56c31379604756f8b7e37b4bb900dc6bb295285c39a5a3 SHA512 8bdff64a431f2095d1fc414f239d4f99f1843eea46d752904f444dadf942bf5df9b7341483f2e8123510e0d52ba9d9c2da9b298eebfa00bc224d0f0dfe86be8b WHIRLPOOL f1582f1bee9fc4a68ecbac8d83766fda9524e62351aca18dc14239c068320d5e499a6ea6601a0b5ba0c9fc5f5bf624593ef15eed06ae1ddc55f5e0439b92c6a6
 EBUILD netbeans-nb-9999_p20160301.ebuild 4111 SHA256 20da83bbd1ccd58874f3408b88f1887b49f3761731daa79f19c01b14c542b962 SHA512 80e2f7a685367b6b5af3b3173b727f20dadc293ea08e071ce9cec8213df1a58c58deb8ad24b388680a9ab34cb28d8e0414e89bb1fbddbe31966a84aafa5abb4e WHIRLPOOL 2dbfa48747b56e60ad5a926540aaa69f204399d1cb54e473f9954da7d9581a53d2e79fc0d0660363c49a5641947499f09ce18eecff035b2d08e2a82286e92d69

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160226.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160226.ebuild
deleted file mode 100644
index 528416e..0000000
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20160226.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-02-26_00-02-15/zip/netbeans-trunk-nightly-201602260002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r14-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-nb/netbeans-nb-9999_p20160227.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160227.ebuild
deleted file mode 100644
index 58b75e4..0000000
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20160227.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-02-27_00-02-15/zip/netbeans-trunk-nightly-201602270002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r14-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 9059c05..cfedb0a 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -8,8 +8,6 @@ DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r15-build.xml.patch.bz2 2680 SHA256 d686f1e352eae400393577a456042f4475b9c321369101d2f05ec627aa61ef0c SHA512 7428b664749878fd1ead2c821277769a5af9636388515a4786284568ea656734ba2a9e90758385f5b6a0c009469df3dcc005936c8865c93cc9bc29576d2171e4 WHIRLPOOL fea09d3b1e2cc07e090a9618cbdaf6b2e3d4cab9679fdb4321a856922035871e485f492e6298e7e2562d8ecba626f2bdb3130f09840e83878e3c1e6fd6944899
-DIST netbeans-trunk-nightly-201602260002-src.zip 209828915 SHA256 79e707455e36ff5602efab93c10a4d1a2548e51b8ce9799f9793fe24eb029302 SHA512 f506d2ec8b3ffd8ece1f08ced77579e816df11afa8e85246eaa04c166c67e306ee20b3afe5dd856ac1d47ce2a97f9bce69ffdffc5ee38df633a7abc441a2a25c WHIRLPOOL 88f6627dc291e47e487359d7bda443a228ff258269a715d561faa4af4c4e57ac98a3179f3e9fb7150504f1a6dedaddec3d21f38f88eb7f3e99eae4fd2e51cd54
-DIST netbeans-trunk-nightly-201602270002-src.zip 209831963 SHA256 20b41ce3e47c43d3e255e9833fa3f2c3bcd48876ff620c40ed93c878c7abd883 SHA512 980ab79ed39cea631f45d7609b5d3bd8e8310737d7934dbe6a3f93f9c31031d5b38c40370ef6d35898bb7f39eb7a72a00ea1715a77b12678eb5d3a2e2f12a76a WHIRLPOOL f4a058519c51572208225a141a6745583c6ce1019e4d4b2ae994e0b6dd000034e330113decdfc2a6589025e61d11583852e64e121dd42fd833552d35f9ba748a
 DIST netbeans-trunk-nightly-201602280002-src.zip 209832078 SHA256 9db7e895e76748c876558471306afbb5a6af856a8cb391248be4f8d700cb0fc0 SHA512 41bfbb29f4e9760e11336d13908703b13276dac95dd070945963a213969dbdfa844e96340a0ec7e32d721cda3bd11a7f940855a3b1ddccd3d3349b32efcf4c36 WHIRLPOOL e2ca8afcc4a6a1b5a8f19958df6015709542f0d896bd7f9b35fbb7671571732fb1931a5de6e1e0deb21ee86fdecdf2a013ff319d76e1569f8c0ba2b252e959d6
 DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf77015ad8c9ca15c1a54953eec0492be748fde20af0b464700c80f SHA512 56d79deda1cb4624b7136c0028d8786ee5f560aef52f305548654b873232a968b0bd25322c53caa44c61dd0557d177c5725eaed4b6b6e554920e9f5e8b8dcf85 WHIRLPOOL e0bd59c30e04b4a67b7924890f0e377bbb120564a155815b1aa64a28da7f835362e583333240672aeb2b39d63c5c37e2739d4a9e9f25488ce2cfb5ee1e475569
 DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
@@ -30,8 +28,6 @@ DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a5747
 DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 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_p20160226.ebuild 4418 SHA256 0b7f0264c328f605a440d95a92df29adb174dcb38a9da56ffca6f0acabeed204 SHA512 9da2ec6718e15411780f8d90aea41da30b348608177b14b55258230109c7a9bfa176fe5849a06c28a1cc19c79fbcdeb0a117a025eaf5e8c20d11524802230c42 WHIRLPOOL c4012442efd2fbda3a0e6d57df5b5fdaed62a992bf11110317eeb67f3424a6abf1db256af752281669e0d170d8c7aec0fdfa2ba1a2c282cd2045cd529a03c467
-EBUILD netbeans-php-9999_p20160227.ebuild 4418 SHA256 fa28d7dc3c37bd2611c46bca589b09c61b784ec32337aa89354de0e63a88a7c0 SHA512 639c89ab60a0db8e38624258196ee418e0dc78eea853ca1239bdb8576a04902c77c0f10e5b0a641fbcfa900f65f6075e07c5fa2cdca56570855a8af0b754f712 WHIRLPOOL ce863b2c2559b6f217ea9cc9d2edc3c2120e36db301c8fe8ef393bfc4b620ee0b81b37fdca311875df01c2473cf0215b699a47c2baf2e19d0c8a7f9a107c1ad4
 EBUILD netbeans-php-9999_p20160228.ebuild 4418 SHA256 663133eab5f1f34f379804cbc7b50a7fa082d78ef44ebdffeac8f4e0814e1d75 SHA512 a90ab524efdd7292000b389ff40075843a7be9ff1eee226ead2dd2be96174481922405a7939b6741ab82ced4a7b93d6ffa8b32fa1e591fae0accecc0a87db515 WHIRLPOOL ec45144cafe63152ac712148c6bcd5fccec68383d35641132bff612a31a732501bea6bb592c7425581903fbe1d59f0ea84b4870d91508c48d403b6d71c8f933d
 EBUILD netbeans-php-9999_p20160229.ebuild 4418 SHA256 10ca3643744a20215b8a798fee2e2272e6c0661ba9e49a936a2be013c036e2ec SHA512 ef06a8cb5300a405b257071fb8e274df1311becce2739c98ed1d8e32cef18f5d6cdcbbdc4bd1ca6bf2f9527a9699919b47e265768383c692e9c0b13125c7dff6 WHIRLPOOL b28e54548217b9f4360341ea9039d0e59857ead2f538110ff6d74c6c231c8eef568792185315c6495430f420512c9ffeaaa912f454c82d56d30a02337bb4db5c
 EBUILD netbeans-php-9999_p20160301.ebuild 4418 SHA256 ab37f6d8a2875857293d07e99fe3782cc2836e4f167026c33cd77b554aa1b1d2 SHA512 42cc1fc8fc64a17e121fcf6fe444dc4c2f7237a41b419cf89ac5e2d0ea27ab96323d0868d730e2244bdeac9e1dbb0f60e50e2d804f5742e61bc13133da9cbc78 WHIRLPOOL 7c108704dc0e817fcc3cf5ec29a967f42b0f14fe39e36d1598e6ab4eea0107c5518c09b1768b66d1f076cd675b752925d536ea4699e18327fb274f6f88c0418d

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160226.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160226.ebuild
deleted file mode 100644
index f5c5fdd..0000000
--- a/dev-java/netbeans-php/netbeans-php-9999_p20160226.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-02-26_00-02-15/zip/netbeans-trunk-nightly-201602260002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-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-r14-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-php/netbeans-php-9999_p20160227.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160227.ebuild
deleted file mode 100644
index cbe60d7..0000000
--- a/dev-java/netbeans-php/netbeans-php-9999_p20160227.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-02-27_00-02-15/zip/netbeans-trunk-nightly-201602270002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-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-r14-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 1b7a972..cdb0f64 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -31,8 +31,6 @@ DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r15-build.xml.patch.bz2 2680 SHA256 d686f1e352eae400393577a456042f4475b9c321369101d2f05ec627aa61ef0c SHA512 7428b664749878fd1ead2c821277769a5af9636388515a4786284568ea656734ba2a9e90758385f5b6a0c009469df3dcc005936c8865c93cc9bc29576d2171e4 WHIRLPOOL fea09d3b1e2cc07e090a9618cbdaf6b2e3d4cab9679fdb4321a856922035871e485f492e6298e7e2562d8ecba626f2bdb3130f09840e83878e3c1e6fd6944899
-DIST netbeans-trunk-nightly-201602260002-src.zip 209828915 SHA256 79e707455e36ff5602efab93c10a4d1a2548e51b8ce9799f9793fe24eb029302 SHA512 f506d2ec8b3ffd8ece1f08ced77579e816df11afa8e85246eaa04c166c67e306ee20b3afe5dd856ac1d47ce2a97f9bce69ffdffc5ee38df633a7abc441a2a25c WHIRLPOOL 88f6627dc291e47e487359d7bda443a228ff258269a715d561faa4af4c4e57ac98a3179f3e9fb7150504f1a6dedaddec3d21f38f88eb7f3e99eae4fd2e51cd54
-DIST netbeans-trunk-nightly-201602270002-src.zip 209831963 SHA256 20b41ce3e47c43d3e255e9833fa3f2c3bcd48876ff620c40ed93c878c7abd883 SHA512 980ab79ed39cea631f45d7609b5d3bd8e8310737d7934dbe6a3f93f9c31031d5b38c40370ef6d35898bb7f39eb7a72a00ea1715a77b12678eb5d3a2e2f12a76a WHIRLPOOL f4a058519c51572208225a141a6745583c6ce1019e4d4b2ae994e0b6dd000034e330113decdfc2a6589025e61d11583852e64e121dd42fd833552d35f9ba748a
 DIST netbeans-trunk-nightly-201602280002-src.zip 209832078 SHA256 9db7e895e76748c876558471306afbb5a6af856a8cb391248be4f8d700cb0fc0 SHA512 41bfbb29f4e9760e11336d13908703b13276dac95dd070945963a213969dbdfa844e96340a0ec7e32d721cda3bd11a7f940855a3b1ddccd3d3349b32efcf4c36 WHIRLPOOL e2ca8afcc4a6a1b5a8f19958df6015709542f0d896bd7f9b35fbb7671571732fb1931a5de6e1e0deb21ee86fdecdf2a013ff319d76e1569f8c0ba2b252e959d6
 DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf77015ad8c9ca15c1a54953eec0492be748fde20af0b464700c80f SHA512 56d79deda1cb4624b7136c0028d8786ee5f560aef52f305548654b873232a968b0bd25322c53caa44c61dd0557d177c5725eaed4b6b6e554920e9f5e8b8dcf85 WHIRLPOOL e0bd59c30e04b4a67b7924890f0e377bbb120564a155815b1aa64a28da7f835362e583333240672aeb2b39d63c5c37e2739d4a9e9f25488ce2cfb5ee1e475569
 DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
@@ -53,8 +51,6 @@ DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a5747
 DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 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_p20160226.ebuild 9360 SHA256 acef938e46799002469a5dd2fa9a77ebfc997a0151a1511efc38abde0925566b SHA512 50a9330f81a4a70d95e76f0558e93f065e41e701d254577d1fdb0c7fd7ec4974cd94591c439b0c55e005409173c0d2e412a9a2c2bad25b5af75dd2201432fcca WHIRLPOOL afe64db0ad385eba21a52172e540728016ab85a2d4c00ac32fa1957b519209579efd60326475e86c90d17fee016166d4355ceeb32815ee90b4d839c27eb7131a
-EBUILD netbeans-platform-9999_p20160227.ebuild 9360 SHA256 9131a019a6e7b2fcb149d00256de15d218923005e03190d76516a9444ff4e89b SHA512 ddfbcb38ae855385c6ff2d0c37cbb6d6a35104bcf4979e5ea617f89ceb4922e55d23f7d6f90c66b7e1a37edd8b3d2a947bfe0ddea4a3ee0943052938041d3699 WHIRLPOOL 34d3313df7773fd0ffc73d49396369c1b7d05cfbf23639a2c79cc674d9c66262975ccdcff871fc6405193a82819ca8fc4e636648463aeee1987402f9107a532c
 EBUILD netbeans-platform-9999_p20160228.ebuild 9360 SHA256 2097241f363db2ed7fde819615b5139561982b4cafd86fe17ba31247c0e67805 SHA512 2b45bad7ad1f9bf1c40e261cbd8fe354f0651c3901ef471d75551cf0d683e0d849ed3bbc3936170048bb1d30e9cea9e90b6fe731afc32ee949e48a87245a1bd5 WHIRLPOOL 47007b58e3daddc13d4b9472e5e3cbdc0f389a4dc13bfd8d58f94f7b8bf9dd8fa05b290bc1fe0667a8b7d5ca77a8c378229f3fed5c9c8be0121fb73dc3999d7f
 EBUILD netbeans-platform-9999_p20160229.ebuild 9360 SHA256 2ce181db89643a2e45017fc2af6a6c303049bd8fe702253357a2761672754d8b SHA512 cf76e79f455dd82be9c43b77214612ee1920e5a16dd4c674f622a711ae2d1434f892d524e9979db15c3bd8a18d82c3dc4853668f0dcb1d2801470e34c7a195bc WHIRLPOOL 77ed37501a771fce6651d3a859f0ee0689800bb5f4143e949cfcfd170454f3f6a99e47d044ccb38cdb212200f95aeea5695faff2953fa427528927a4a9d203b8
 EBUILD netbeans-platform-9999_p20160301.ebuild 9360 SHA256 741766e920fb2bcdb0c1f2a72e022a1790861f5b8877549e31da1c0358c3b14f SHA512 c7453634255d0979684d294652033cf763b5d6a5f5a263b2d1e03b1f1095f8e04d6874a8441f37fb67200c4349b333f3762f4e726cd0b00d2c3cd63e347b89c1 WHIRLPOOL 0fea8af0680fc73d75ecab2e5a0e2ea4fcd751267b029ff33adce182c638aa0a524485d2ae2f0c3b4029d4f2ae482b402e27fb0dfb02e2dab4332efcbbb675d9

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160226.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160226.ebuild
deleted file mode 100644
index 5b6445b..0000000
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20160226.ebuild
+++ /dev/null
@@ -1,165 +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-02-26_00-02-15/zip/netbeans-trunk-nightly-201602260002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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/A3432F57D9B3B4AD62CB0B294EEC43D12FCF3F62-ko4j-1.2.3.jar
-	http://hg.netbeans.org/binaries/78DD1C0B4EDC348FF4DCD0616597BB809AAE248D-net.java.html-1.2.3.jar
-	http://hg.netbeans.org/binaries/7BA1E1C450BCD0AD9D0D2F6797A2EB50A4822E0E-net.java.html.boot-1.2.3.jar
-	http://hg.netbeans.org/binaries/068B9902E65F2292C9EA30E5423E41FB6B30D8AA-net.java.html.boot.fx-1.2.3.jar
-	http://hg.netbeans.org/binaries/8621531E83EC4850DA61AA2266FE41105C304F40-net.java.html.boot.script-1.2.3.jar
-	http://hg.netbeans.org/binaries/24824B1E8C2A2D3A5C471F5875BF61F27E8916DB-net.java.html.geo-1.2.3.jar
-	http://hg.netbeans.org/binaries/F41518385DA4B5682C864F19B82C3BA4AF65AE83-net.java.html.json-1.2.3.jar
-	http://hg.netbeans.org/binaries/989A81454D4FA962EB1C158FE794D2EB060AB9F6-net.java.html.sound-1.2.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"
-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-r14-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}"/A3432F57D9B3B4AD62CB0B294EEC43D12FCF3F62-ko4j-1.2.3.jar o.n.html.ko4j/external/ko4j-1.2.3.jar || die
-	ln -s "${DISTDIR}"/78DD1C0B4EDC348FF4DCD0616597BB809AAE248D-net.java.html-1.2.3.jar net.java.html/external/net.java.html-1.2.3.jar || die
-	ln -s "${DISTDIR}"/7BA1E1C450BCD0AD9D0D2F6797A2EB50A4822E0E-net.java.html.boot-1.2.3.jar net.java.html.boot/external/net.java.html.boot-1.2.3.jar || die
-	ln -s "${DISTDIR}"/068B9902E65F2292C9EA30E5423E41FB6B30D8AA-net.java.html.boot.fx-1.2.3.jar net.java.html.boot.fx/external/net.java.html.boot.fx-1.2.3.jar || die
-	ln -s "${DISTDIR}"/8621531E83EC4850DA61AA2266FE41105C304F40-net.java.html.boot.script-1.2.3.jar net.java.html.boot.script/external/net.java.html.boot.script-1.2.3.jar || die
-	ln -s "${DISTDIR}"/24824B1E8C2A2D3A5C471F5875BF61F27E8916DB-net.java.html.geo-1.2.3.jar net.java.html.geo/external/net.java.html.geo-1.2.3.jar || die
-	ln -s "${DISTDIR}"/F41518385DA4B5682C864F19B82C3BA4AF65AE83-net.java.html.json-1.2.3.jar net.java.html.json/external/net.java.html.json-1.2.3.jar || die
-	ln -s "${DISTDIR}"/989A81454D4FA962EB1C158FE794D2EB060AB9F6-net.java.html.sound-1.2.3.jar net.java.html.sound/external/net.java.html.sound-1.2.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
-	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-r14-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 libs.jna.platform/external jna platform.jar jna-platform-4.1.0.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.1.0.jar
-	java-pkg_jar-from --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
-	ln -s /usr/share/junit-4/sources/junit-src.zip junitlib/external/junit-4.12-sources.jar || die
-	java-pkg_jar-from --into libs.osgi/external osgi-core-api osgi-core-api.jar osgi.core-5.0.0.jar
-	java-pkg_jar-from --into libs.osgi/external osgi-compendium osgi-compendium.jar osgi.cmpn-4.2.jar
-	java-pkg_jar-from --into o.jdesktop.layout/external swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
-	ln -s /usr/share/swing-layout-1/sources/swing-layout-src.zip o.jdesktop.layout/external/swing-layout-1.0.4-src.zip || die
-	java-pkg_jar-from --into libs.testng/external testng testng.jar testng-6.8.1-dist.jar
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	unset DISPLAY
-	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
-}
-
-src_install() {
-	pushd nbbuild/netbeans/platform >/dev/null || die
-
-	java-pkg_dojar lib/*.jar
-	grep -E "/platform$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	insinto ${INSTALL_DIR}
-	doins -r *
-	rm "${D}"/${INSTALL_DIR}/docs/junit-4.12-sources.jar || die
-	dosym /usr/share/junit-4/sources/junit-src.zip ${INSTALL_DIR}/docs/junit-4.12-sources.jar
-	rm "${D}"/${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip || die
-	dosym /usr/share/swing-layout-1/sources/swing-layout-src.zip ${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip
-	find "${D}"/${INSTALL_DIR} -name "*.exe" -delete
-	find "${D}"/${INSTALL_DIR} -name "*.dll" -delete
-	rm -fr "${D}"/modules/lib || die
-
-	popd >/dev/null || die
-
-	fperms 775 ${INSTALL_DIR}/lib/nbexec
-	dosym ${INSTALL_DIR}/lib/nbexec /usr/bin/nbexec-${SLOT}
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext
-	pushd "${instdir}" >/dev/null || die
-	rm hamcrest-core-1.3.jar && java-pkg_jar-from --into "${instdir}" hamcrest-core-1.3 hamcrest-core.jar hamcrest-core-1.3.jar
-	rm jhall-2.0_05.jar && java-pkg_jar-from --into "${instdir}" javahelp jhall.jar jhall-2.0_05.jar
-	rm jna-4.1.0.jar && java-pkg_jar-from --into "${instdir}" jna jna.jar jna-4.1.0.jar
-	rm jna-platform-4.1.0.jar && java-pkg_jar-from --into "${instdir}" jna platform.jar jna-platform-4.1.0.jar
-	rm junit-4.12.jar && java-pkg_jar-from --into "${instdir}" junit-4 junit.jar junit-4.12.jar
-	rm osgi.cmpn-4.2.jar && java-pkg_jar-from --into "${instdir}" osgi-compendium osgi-compendium.jar osgi.cmpn-4.2.jar
-	rm osgi.core-5.0.0.jar && java-pkg_jar-from --into "${instdir}" osgi-core-api osgi-core-api.jar osgi.core-5.0.0.jar
-	rm swing-layout-1.0.4.jar && java-pkg_jar-from --into "${instdir}" swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
-	rm testng-6.8.1-dist.jar && java-pkg_jar-from --into "${instdir}" testng testng.jar testng-6.8.1-dist.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/platform
-}

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160227.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160227.ebuild
deleted file mode 100644
index ed102aa..0000000
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20160227.ebuild
+++ /dev/null
@@ -1,165 +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-02-27_00-02-15/zip/netbeans-trunk-nightly-201602270002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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/A3432F57D9B3B4AD62CB0B294EEC43D12FCF3F62-ko4j-1.2.3.jar
-	http://hg.netbeans.org/binaries/78DD1C0B4EDC348FF4DCD0616597BB809AAE248D-net.java.html-1.2.3.jar
-	http://hg.netbeans.org/binaries/7BA1E1C450BCD0AD9D0D2F6797A2EB50A4822E0E-net.java.html.boot-1.2.3.jar
-	http://hg.netbeans.org/binaries/068B9902E65F2292C9EA30E5423E41FB6B30D8AA-net.java.html.boot.fx-1.2.3.jar
-	http://hg.netbeans.org/binaries/8621531E83EC4850DA61AA2266FE41105C304F40-net.java.html.boot.script-1.2.3.jar
-	http://hg.netbeans.org/binaries/24824B1E8C2A2D3A5C471F5875BF61F27E8916DB-net.java.html.geo-1.2.3.jar
-	http://hg.netbeans.org/binaries/F41518385DA4B5682C864F19B82C3BA4AF65AE83-net.java.html.json-1.2.3.jar
-	http://hg.netbeans.org/binaries/989A81454D4FA962EB1C158FE794D2EB060AB9F6-net.java.html.sound-1.2.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"
-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-r14-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}"/A3432F57D9B3B4AD62CB0B294EEC43D12FCF3F62-ko4j-1.2.3.jar o.n.html.ko4j/external/ko4j-1.2.3.jar || die
-	ln -s "${DISTDIR}"/78DD1C0B4EDC348FF4DCD0616597BB809AAE248D-net.java.html-1.2.3.jar net.java.html/external/net.java.html-1.2.3.jar || die
-	ln -s "${DISTDIR}"/7BA1E1C450BCD0AD9D0D2F6797A2EB50A4822E0E-net.java.html.boot-1.2.3.jar net.java.html.boot/external/net.java.html.boot-1.2.3.jar || die
-	ln -s "${DISTDIR}"/068B9902E65F2292C9EA30E5423E41FB6B30D8AA-net.java.html.boot.fx-1.2.3.jar net.java.html.boot.fx/external/net.java.html.boot.fx-1.2.3.jar || die
-	ln -s "${DISTDIR}"/8621531E83EC4850DA61AA2266FE41105C304F40-net.java.html.boot.script-1.2.3.jar net.java.html.boot.script/external/net.java.html.boot.script-1.2.3.jar || die
-	ln -s "${DISTDIR}"/24824B1E8C2A2D3A5C471F5875BF61F27E8916DB-net.java.html.geo-1.2.3.jar net.java.html.geo/external/net.java.html.geo-1.2.3.jar || die
-	ln -s "${DISTDIR}"/F41518385DA4B5682C864F19B82C3BA4AF65AE83-net.java.html.json-1.2.3.jar net.java.html.json/external/net.java.html.json-1.2.3.jar || die
-	ln -s "${DISTDIR}"/989A81454D4FA962EB1C158FE794D2EB060AB9F6-net.java.html.sound-1.2.3.jar net.java.html.sound/external/net.java.html.sound-1.2.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
-	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-r14-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 libs.jna.platform/external jna platform.jar jna-platform-4.1.0.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.1.0.jar
-	java-pkg_jar-from --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
-	ln -s /usr/share/junit-4/sources/junit-src.zip junitlib/external/junit-4.12-sources.jar || die
-	java-pkg_jar-from --into libs.osgi/external osgi-core-api osgi-core-api.jar osgi.core-5.0.0.jar
-	java-pkg_jar-from --into libs.osgi/external osgi-compendium osgi-compendium.jar osgi.cmpn-4.2.jar
-	java-pkg_jar-from --into o.jdesktop.layout/external swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
-	ln -s /usr/share/swing-layout-1/sources/swing-layout-src.zip o.jdesktop.layout/external/swing-layout-1.0.4-src.zip || die
-	java-pkg_jar-from --into libs.testng/external testng testng.jar testng-6.8.1-dist.jar
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	unset DISPLAY
-	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
-}
-
-src_install() {
-	pushd nbbuild/netbeans/platform >/dev/null || die
-
-	java-pkg_dojar lib/*.jar
-	grep -E "/platform$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	insinto ${INSTALL_DIR}
-	doins -r *
-	rm "${D}"/${INSTALL_DIR}/docs/junit-4.12-sources.jar || die
-	dosym /usr/share/junit-4/sources/junit-src.zip ${INSTALL_DIR}/docs/junit-4.12-sources.jar
-	rm "${D}"/${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip || die
-	dosym /usr/share/swing-layout-1/sources/swing-layout-src.zip ${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip
-	find "${D}"/${INSTALL_DIR} -name "*.exe" -delete
-	find "${D}"/${INSTALL_DIR} -name "*.dll" -delete
-	rm -fr "${D}"/modules/lib || die
-
-	popd >/dev/null || die
-
-	fperms 775 ${INSTALL_DIR}/lib/nbexec
-	dosym ${INSTALL_DIR}/lib/nbexec /usr/bin/nbexec-${SLOT}
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext
-	pushd "${instdir}" >/dev/null || die
-	rm hamcrest-core-1.3.jar && java-pkg_jar-from --into "${instdir}" hamcrest-core-1.3 hamcrest-core.jar hamcrest-core-1.3.jar
-	rm jhall-2.0_05.jar && java-pkg_jar-from --into "${instdir}" javahelp jhall.jar jhall-2.0_05.jar
-	rm jna-4.1.0.jar && java-pkg_jar-from --into "${instdir}" jna jna.jar jna-4.1.0.jar
-	rm jna-platform-4.1.0.jar && java-pkg_jar-from --into "${instdir}" jna platform.jar jna-platform-4.1.0.jar
-	rm junit-4.12.jar && java-pkg_jar-from --into "${instdir}" junit-4 junit.jar junit-4.12.jar
-	rm osgi.cmpn-4.2.jar && java-pkg_jar-from --into "${instdir}" osgi-compendium osgi-compendium.jar osgi.cmpn-4.2.jar
-	rm osgi.core-5.0.0.jar && java-pkg_jar-from --into "${instdir}" osgi-core-api osgi-core-api.jar osgi.core-5.0.0.jar
-	rm swing-layout-1.0.4.jar && java-pkg_jar-from --into "${instdir}" swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
-	rm testng-6.8.1-dist.jar && java-pkg_jar-from --into "${instdir}" testng testng.jar testng-6.8.1-dist.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/platform
-}

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index c26d11e..576ff31 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -4,8 +4,6 @@ DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r15-build.xml.patch.bz2 2680 SHA256 d686f1e352eae400393577a456042f4475b9c321369101d2f05ec627aa61ef0c SHA512 7428b664749878fd1ead2c821277769a5af9636388515a4786284568ea656734ba2a9e90758385f5b6a0c009469df3dcc005936c8865c93cc9bc29576d2171e4 WHIRLPOOL fea09d3b1e2cc07e090a9618cbdaf6b2e3d4cab9679fdb4321a856922035871e485f492e6298e7e2562d8ecba626f2bdb3130f09840e83878e3c1e6fd6944899
-DIST netbeans-trunk-nightly-201602260002-src.zip 209828915 SHA256 79e707455e36ff5602efab93c10a4d1a2548e51b8ce9799f9793fe24eb029302 SHA512 f506d2ec8b3ffd8ece1f08ced77579e816df11afa8e85246eaa04c166c67e306ee20b3afe5dd856ac1d47ce2a97f9bce69ffdffc5ee38df633a7abc441a2a25c WHIRLPOOL 88f6627dc291e47e487359d7bda443a228ff258269a715d561faa4af4c4e57ac98a3179f3e9fb7150504f1a6dedaddec3d21f38f88eb7f3e99eae4fd2e51cd54
-DIST netbeans-trunk-nightly-201602270002-src.zip 209831963 SHA256 20b41ce3e47c43d3e255e9833fa3f2c3bcd48876ff620c40ed93c878c7abd883 SHA512 980ab79ed39cea631f45d7609b5d3bd8e8310737d7934dbe6a3f93f9c31031d5b38c40370ef6d35898bb7f39eb7a72a00ea1715a77b12678eb5d3a2e2f12a76a WHIRLPOOL f4a058519c51572208225a141a6745583c6ce1019e4d4b2ae994e0b6dd000034e330113decdfc2a6589025e61d11583852e64e121dd42fd833552d35f9ba748a
 DIST netbeans-trunk-nightly-201602280002-src.zip 209832078 SHA256 9db7e895e76748c876558471306afbb5a6af856a8cb391248be4f8d700cb0fc0 SHA512 41bfbb29f4e9760e11336d13908703b13276dac95dd070945963a213969dbdfa844e96340a0ec7e32d721cda3bd11a7f940855a3b1ddccd3d3349b32efcf4c36 WHIRLPOOL e2ca8afcc4a6a1b5a8f19958df6015709542f0d896bd7f9b35fbb7671571732fb1931a5de6e1e0deb21ee86fdecdf2a013ff319d76e1569f8c0ba2b252e959d6
 DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf77015ad8c9ca15c1a54953eec0492be748fde20af0b464700c80f SHA512 56d79deda1cb4624b7136c0028d8786ee5f560aef52f305548654b873232a968b0bd25322c53caa44c61dd0557d177c5725eaed4b6b6e554920e9f5e8b8dcf85 WHIRLPOOL e0bd59c30e04b4a67b7924890f0e377bbb120564a155815b1aa64a28da7f835362e583333240672aeb2b39d63c5c37e2739d4a9e9f25488ce2cfb5ee1e475569
 DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
@@ -26,8 +24,6 @@ DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a5747
 DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 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_p20160226.ebuild 3472 SHA256 cf513aa4cac3a4780a032fb5a6dfe2b44d94eca33b1955c68dd81c5adc18f44d SHA512 0e507d7749f1200e9fb21c1acb594656098587937efc28c5259c1147df2625fbce79f327d0342007f0865a09820ceff4fb6cfe87eefab4abefd87bbfdc27bd7b WHIRLPOOL 1fa2c89ad1a1035b025e17dadf3d63d353bb4ba6b66eea9a3e7973eac0cedfe33098416319b2b5e3e9113d7fa909d9b39a72838e9868137af98c45d54364bfee
-EBUILD netbeans-profiler-9999_p20160227.ebuild 3472 SHA256 2f0d19936dce4e57cd5de04f3e59281ac76057c3663f9701eabb739c3f6cb37e SHA512 f7a144f99387d0123a8b2fe7293d3a3fd25b96e0ed0c0eb90a02e17143df84f9cc1b49a5b635e80680b29daa412bfab69d641e0af2c3918e0ac5d70ba4bbddec WHIRLPOOL b27cc7bded31e6c3db5705218340c3e59744ed39061991585965fbe569ef3e72b8e039c97b877096aba6f57717ec68536f79aa4c7a2ef87d4f19cea2885b34ad
 EBUILD netbeans-profiler-9999_p20160228.ebuild 3472 SHA256 7b5d0787d219447df94434ffa84f3d59169ff3d7d21f9946c764ea025344bcc9 SHA512 fef7d5a49bed4f27db5780fb646da66d5cda175df05592ed24821e6979bc304a28ffe380a0aaa9ca16cefa3cbccc7a141eb015a0bfe707a703f27f07570fec9d WHIRLPOOL c68c7771335cd6c0663c4a9756d3bd7e57c494b9abfe28562bfde565efb3a4a11d57b2ef575eb9c2a5398e87ef3a8c502b7a803fa29ef1c55ae88e98cdcdb2ac
 EBUILD netbeans-profiler-9999_p20160229.ebuild 3472 SHA256 9a1e10f617be4eeceb35b4d5a9e85b7208a6c58b0f5a398c557998de39bc196f SHA512 0d919687c389c1a830215539c77f201c059322f7b5ede60db3c6b90d812c7c09d2450ae9b8ddf32821a9f7673ea6e166fc11de469a12adefb4ed119fd43247cd WHIRLPOOL 62db7875c57a661418ea9dbb0a1de395d996ccdd99d910c244c5d635897c7f23437bc8ea8b54d2fe40535e7c4f661a1135bec508b3b6d14fd51c85ea8cf71574
 EBUILD netbeans-profiler-9999_p20160301.ebuild 3472 SHA256 d867b5c68ed9c128746fadf09f9418cf0b4b446b3f0864c135d5df5a83d9b424 SHA512 6ef67732b4a43257a6494aba652afb3cfdbca8b80f8e9488cba691057677f46fcf0043dc155a6e63f96ec7f5ba7bfa6c6dc8a66b1e4fe47d506a38adc0ecf051 WHIRLPOOL 51ee7170c8926376e9a2d4fb418020b08426244201fafefcdb96ac1ff8366ffca49247b61e54c214e21d48c7e3046d48cafe1acec7f05afa0d7f42b0ba351703

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160226.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160226.ebuild
deleted file mode 100644
index 47db8f1..0000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160226.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-02-26_00-02-15/zip/netbeans-trunk-nightly-201602260002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r14-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-profiler/netbeans-profiler-9999_p20160227.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160227.ebuild
deleted file mode 100644
index 8e72558..0000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160227.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-02-27_00-02-15/zip/netbeans-trunk-nightly-201602270002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r14-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 9bf7988..e21e982 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -20,8 +20,6 @@ DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r15-build.xml.patch.bz2 2680 SHA256 d686f1e352eae400393577a456042f4475b9c321369101d2f05ec627aa61ef0c SHA512 7428b664749878fd1ead2c821277769a5af9636388515a4786284568ea656734ba2a9e90758385f5b6a0c009469df3dcc005936c8865c93cc9bc29576d2171e4 WHIRLPOOL fea09d3b1e2cc07e090a9618cbdaf6b2e3d4cab9679fdb4321a856922035871e485f492e6298e7e2562d8ecba626f2bdb3130f09840e83878e3c1e6fd6944899
-DIST netbeans-trunk-nightly-201602260002-src.zip 209828915 SHA256 79e707455e36ff5602efab93c10a4d1a2548e51b8ce9799f9793fe24eb029302 SHA512 f506d2ec8b3ffd8ece1f08ced77579e816df11afa8e85246eaa04c166c67e306ee20b3afe5dd856ac1d47ce2a97f9bce69ffdffc5ee38df633a7abc441a2a25c WHIRLPOOL 88f6627dc291e47e487359d7bda443a228ff258269a715d561faa4af4c4e57ac98a3179f3e9fb7150504f1a6dedaddec3d21f38f88eb7f3e99eae4fd2e51cd54
-DIST netbeans-trunk-nightly-201602270002-src.zip 209831963 SHA256 20b41ce3e47c43d3e255e9833fa3f2c3bcd48876ff620c40ed93c878c7abd883 SHA512 980ab79ed39cea631f45d7609b5d3bd8e8310737d7934dbe6a3f93f9c31031d5b38c40370ef6d35898bb7f39eb7a72a00ea1715a77b12678eb5d3a2e2f12a76a WHIRLPOOL f4a058519c51572208225a141a6745583c6ce1019e4d4b2ae994e0b6dd000034e330113decdfc2a6589025e61d11583852e64e121dd42fd833552d35f9ba748a
 DIST netbeans-trunk-nightly-201602280002-src.zip 209832078 SHA256 9db7e895e76748c876558471306afbb5a6af856a8cb391248be4f8d700cb0fc0 SHA512 41bfbb29f4e9760e11336d13908703b13276dac95dd070945963a213969dbdfa844e96340a0ec7e32d721cda3bd11a7f940855a3b1ddccd3d3349b32efcf4c36 WHIRLPOOL e2ca8afcc4a6a1b5a8f19958df6015709542f0d896bd7f9b35fbb7671571732fb1931a5de6e1e0deb21ee86fdecdf2a013ff319d76e1569f8c0ba2b252e959d6
 DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf77015ad8c9ca15c1a54953eec0492be748fde20af0b464700c80f SHA512 56d79deda1cb4624b7136c0028d8786ee5f560aef52f305548654b873232a968b0bd25322c53caa44c61dd0557d177c5725eaed4b6b6e554920e9f5e8b8dcf85 WHIRLPOOL e0bd59c30e04b4a67b7924890f0e377bbb120564a155815b1aa64a28da7f835362e583333240672aeb2b39d63c5c37e2739d4a9e9f25488ce2cfb5ee1e475569
 DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
@@ -42,8 +40,6 @@ DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a5747
 DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 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_p20160226.ebuild 5280 SHA256 4def44255acf79f56ce8c4517b7b65fe946425506d1cf5b638058183b9e371c9 SHA512 4a85b6ac3b4be47ea80dba95dc0a6074555b7597babf6b54c9a3357d3868a33af2d3e0855331553de488c72c828f005ebcdcf3b939a93ea1b48a844682ca2bfb WHIRLPOOL adcf5609e086ed39181719fd0bec7482eed0de20e021d761c59fcdff653d601a7e2feccfec5ecea3a26554294b2928b8ee30acc8520262ce0146cbca4ca9b53c
-EBUILD netbeans-webcommon-9999_p20160227.ebuild 5280 SHA256 668a577f60298773af8af6e7004eb303f84b2a12a93e2be3151f49c125879a6b SHA512 48b970cd8bb7a8fa228797ecfae6db097ce0f2f478d78039d1ea56a0e4e79a9dd1d876b577c5b20e4d0a9b3bc494d90ae2e997e4b94cfe515c6b3df42f443f9a WHIRLPOOL 03b2fc093d42785eb55121932f28bd3605792a5e45cf8a8f65c90dbcc9e82868009e8f68279f09afb8b7bdd5514dab4ebed6382dddc1b1a7f884fd4cdf1bf2ce
 EBUILD netbeans-webcommon-9999_p20160228.ebuild 5280 SHA256 67d280637114364cb30a76e3b12ac4f33f51b80570aba43745e4f0ee4d4f3b72 SHA512 6cb3a4735325076f960fce347deef43f1199e3dd1a5d3c342fd6eea13012082d24cbdd20c41a06a985fe5f3cbf106009937d70d0ff62f09af8544e651809ef9a WHIRLPOOL 3d7c79ef509a3f08e3f09203e50f62aae725ff176227a4cf902f053e473df70ff25acc5597489b33e45d85270452cfbee1e4ba48eb13e4fd28182dd9f335bcda
 EBUILD netbeans-webcommon-9999_p20160229.ebuild 5280 SHA256 0d9c00f4200b2fd8d3810b14443a2b40b23068b9abc8032055d576ea467cdf38 SHA512 a81b22df0d6c2aef80f4a6b1c558a07479ac3a2aa198836221bd748ae0631214867f718cbb9bfbaa71ead5b56ce3bcfe5bdaa48d00c9b6c04fa9ca7096f9a392 WHIRLPOOL 2fdb85e3c3d5418b36b05ca815e80625855c60a879a13d1cbdcf42d9e3367d3fa3a4c163d91169ca0ec4b93ef6c11f8f6e14e850c60a937571d9336cbb8f7831
 EBUILD netbeans-webcommon-9999_p20160301.ebuild 5280 SHA256 a55abc8217e7993406b7d8eb7d15da92c1a301924170eeb12ada4096e1449a59 SHA512 ff4c59b659025560fbc99fb288586111f10f3f12383eb7b73d1678a93580db057a7ca646f93afbe3702d8ab94dcf6e412d6f9198e43c6be1596476024eb4b920 WHIRLPOOL 8037e38035ba4453ba7ba96c29170403fad5b12480c198eb394d9e35a9bc0f082ece40f071caf15555251e5c82bbbb45ded5dec079d7d18770bc37f486a0096c

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

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

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 406d3d9..00a5e56 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -4,8 +4,6 @@ DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r15-build.xml.patch.bz2 2680 SHA256 d686f1e352eae400393577a456042f4475b9c321369101d2f05ec627aa61ef0c SHA512 7428b664749878fd1ead2c821277769a5af9636388515a4786284568ea656734ba2a9e90758385f5b6a0c009469df3dcc005936c8865c93cc9bc29576d2171e4 WHIRLPOOL fea09d3b1e2cc07e090a9618cbdaf6b2e3d4cab9679fdb4321a856922035871e485f492e6298e7e2562d8ecba626f2bdb3130f09840e83878e3c1e6fd6944899
-DIST netbeans-trunk-nightly-201602260002-src.zip 209828915 SHA256 79e707455e36ff5602efab93c10a4d1a2548e51b8ce9799f9793fe24eb029302 SHA512 f506d2ec8b3ffd8ece1f08ced77579e816df11afa8e85246eaa04c166c67e306ee20b3afe5dd856ac1d47ce2a97f9bce69ffdffc5ee38df633a7abc441a2a25c WHIRLPOOL 88f6627dc291e47e487359d7bda443a228ff258269a715d561faa4af4c4e57ac98a3179f3e9fb7150504f1a6dedaddec3d21f38f88eb7f3e99eae4fd2e51cd54
-DIST netbeans-trunk-nightly-201602270002-src.zip 209831963 SHA256 20b41ce3e47c43d3e255e9833fa3f2c3bcd48876ff620c40ed93c878c7abd883 SHA512 980ab79ed39cea631f45d7609b5d3bd8e8310737d7934dbe6a3f93f9c31031d5b38c40370ef6d35898bb7f39eb7a72a00ea1715a77b12678eb5d3a2e2f12a76a WHIRLPOOL f4a058519c51572208225a141a6745583c6ce1019e4d4b2ae994e0b6dd000034e330113decdfc2a6589025e61d11583852e64e121dd42fd833552d35f9ba748a
 DIST netbeans-trunk-nightly-201602280002-src.zip 209832078 SHA256 9db7e895e76748c876558471306afbb5a6af856a8cb391248be4f8d700cb0fc0 SHA512 41bfbb29f4e9760e11336d13908703b13276dac95dd070945963a213969dbdfa844e96340a0ec7e32d721cda3bd11a7f940855a3b1ddccd3d3349b32efcf4c36 WHIRLPOOL e2ca8afcc4a6a1b5a8f19958df6015709542f0d896bd7f9b35fbb7671571732fb1931a5de6e1e0deb21ee86fdecdf2a013ff319d76e1569f8c0ba2b252e959d6
 DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf77015ad8c9ca15c1a54953eec0492be748fde20af0b464700c80f SHA512 56d79deda1cb4624b7136c0028d8786ee5f560aef52f305548654b873232a968b0bd25322c53caa44c61dd0557d177c5725eaed4b6b6e554920e9f5e8b8dcf85 WHIRLPOOL e0bd59c30e04b4a67b7924890f0e377bbb120564a155815b1aa64a28da7f835362e583333240672aeb2b39d63c5c37e2739d4a9e9f25488ce2cfb5ee1e475569
 DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
@@ -26,8 +24,6 @@ DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a5747
 DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 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_p20160226.ebuild 2721 SHA256 69c6a48bc572ba9bc77bfc4631ddfe2fc12727b4ed218e58959f6be46e7c0448 SHA512 23e76bb47f71a267363ba434becd1c567d5002629c9e13e20437381e4158333af75182847a8fc3147dba69bda5319d50aa2edaba51dfe87ba8a8a8daab2c45a0 WHIRLPOOL 4fe9d791c26863723fa62de791cbd0630231a5101c6386d31258ecbb26011e86b4cd373f15dfc35fb284618b41ad4ec453a2a1da17ab148cc45cfa5652cd49bf
-EBUILD netbeans-websvccommon-9999_p20160227.ebuild 2721 SHA256 6cf7f517a482c7f38c1cdfc998a53a644ef9aac9bcd69b5c6e00571c9f78a15a SHA512 6a78c5a15e8a8c129e056f2218fe7d328bf8ba398fdd1902b38c101cdb0fca3a03db10b48249d40eb272a6cc6908ccd16466dbfa1acc499d94f09aa4c94815ff WHIRLPOOL 1d35ecee50e04532634cd1294dd1b17fa0c73be3c9733282858ea492bd396cbf0ad42e5af334a7c20cf3b2cd53eaea79343cdc55eebe0716fdfe9cbc3f47b814
 EBUILD netbeans-websvccommon-9999_p20160228.ebuild 2721 SHA256 fc0757e8d75deb6892dac5699b2580b83a8d3c359a6288e2c9672a48d907243b SHA512 6d6ffbed9657b60edb4233601850354571fefb0a160ef55d8cedbabb319b7d615f9d2eaaf959bf13b16a3e4b0fb5f7a31f4b6e6a942ae9143ad3f2aa2e445c3f WHIRLPOOL cee3f73e9a38c80ebf589a5340208fe169a6ae7b88ec462e9c25bffcf732cf8e7ae2836ba7fe1d56b67ae18a07f243f13e80dd70079ca890f1c84f8a77ea18fa
 EBUILD netbeans-websvccommon-9999_p20160229.ebuild 2721 SHA256 29fe5abf4864d87ff2f78a6bc4ec95a8b130b212b0202ae5475b83a1a4bbae74 SHA512 1055e7f67e34a9d475e382fb2eacd038d6770a47e5a7ea68e189b9f8a5e3db55fd747345a208a76e3bbfc29a5daa256a57cf2283d9e3d418bb7b5aa793f13d99 WHIRLPOOL 9ed9ac8ffd62a3487c80c4b8135b0eb3052db0774570f23f0165a01613ce380476fb30e86799591f7248ced82700a0d65ce287cb12e8d112a0c70f851cbcc060
 EBUILD netbeans-websvccommon-9999_p20160301.ebuild 2721 SHA256 dd2f33ac0b715769f80caedca9b75712637778978b220ef81d967c32afbd6ebf SHA512 f1210d692f31917729e1c0d463b175c92588c465408d1517ae7283cdf447b61a52b46e1d7c80dd1871fd38d319c4eadf9ed6a170c4a2882fb4750d9e397618dd WHIRLPOOL 54605d7255504b43b23b3015101821b243fefe8b3d4c85e02d9add29ac6f9b422b5ffd0d08743aeaa55d709e4e644942703ee35ccf970eea4d380231b5763c5e

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160226.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160226.ebuild
deleted file mode 100644
index 521916e..0000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160226.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-02-26_00-02-15/zip/netbeans-trunk-nightly-201602260002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r14-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-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160227.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160227.ebuild
deleted file mode 100644
index 7d33350..0000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160227.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-02-27_00-02-15/zip/netbeans-trunk-nightly-201602270002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r14-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 e9d2c8b..cfa42bc 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -7,8 +7,6 @@ DIST netbeans-9999-r15-build.xml.patch.bz2 2680 SHA256 d686f1e352eae400393577a45
 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-201602260002-src.zip 209828915 SHA256 79e707455e36ff5602efab93c10a4d1a2548e51b8ce9799f9793fe24eb029302 SHA512 f506d2ec8b3ffd8ece1f08ced77579e816df11afa8e85246eaa04c166c67e306ee20b3afe5dd856ac1d47ce2a97f9bce69ffdffc5ee38df633a7abc441a2a25c WHIRLPOOL 88f6627dc291e47e487359d7bda443a228ff258269a715d561faa4af4c4e57ac98a3179f3e9fb7150504f1a6dedaddec3d21f38f88eb7f3e99eae4fd2e51cd54
-DIST netbeans-trunk-nightly-201602270002-src.zip 209831963 SHA256 20b41ce3e47c43d3e255e9833fa3f2c3bcd48876ff620c40ed93c878c7abd883 SHA512 980ab79ed39cea631f45d7609b5d3bd8e8310737d7934dbe6a3f93f9c31031d5b38c40370ef6d35898bb7f39eb7a72a00ea1715a77b12678eb5d3a2e2f12a76a WHIRLPOOL f4a058519c51572208225a141a6745583c6ce1019e4d4b2ae994e0b6dd000034e330113decdfc2a6589025e61d11583852e64e121dd42fd833552d35f9ba748a
 DIST netbeans-trunk-nightly-201602280002-src.zip 209832078 SHA256 9db7e895e76748c876558471306afbb5a6af856a8cb391248be4f8d700cb0fc0 SHA512 41bfbb29f4e9760e11336d13908703b13276dac95dd070945963a213969dbdfa844e96340a0ec7e32d721cda3bd11a7f940855a3b1ddccd3d3349b32efcf4c36 WHIRLPOOL e2ca8afcc4a6a1b5a8f19958df6015709542f0d896bd7f9b35fbb7671571732fb1931a5de6e1e0deb21ee86fdecdf2a013ff319d76e1569f8c0ba2b252e959d6
 DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf77015ad8c9ca15c1a54953eec0492be748fde20af0b464700c80f SHA512 56d79deda1cb4624b7136c0028d8786ee5f560aef52f305548654b873232a968b0bd25322c53caa44c61dd0557d177c5725eaed4b6b6e554920e9f5e8b8dcf85 WHIRLPOOL e0bd59c30e04b4a67b7924890f0e377bbb120564a155815b1aa64a28da7f835362e583333240672aeb2b39d63c5c37e2739d4a9e9f25488ce2cfb5ee1e475569
 DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
@@ -29,8 +27,6 @@ DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a5747
 DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 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_p20160226.ebuild 6939 SHA256 26aaa8f427926fe184550a8f6025271886c7ccd8b16a4e605e6672d904c4a3b2 SHA512 9c99d3fa5c892fbb0b3b486e6f5a2a03947868840074e08569f06e06beb8d1b2374ce51c5244b892ccc0974913f10939d2b057a306774b5b8163d101a3784a6b WHIRLPOOL a243f9fa4d0635c7e85b0eb263551f8ce2c21f773a4298ffdf649a96e4245ac0119fcbc1474c53d6f2eea7e7fb3e995da34c16d7fdc387f6dc9c76b0f292d6ef
-EBUILD netbeans-9999_p20160227.ebuild 6939 SHA256 92a1edf460e2135f0f878672e63cba0842d4e4ef777a20e51752127f627dbe86 SHA512 b1b551e2c15be7056394afc1c15d64531deba8e6f2df35c2ccd9969cffd9b5a937a4625018ab90a0f64b3abc536479fc016272d026361f38d14670dadbf57adb WHIRLPOOL 855b7f713e7259d25375157c2757f7d62d22e8f3652217e3c5f62ded36c29b54ec8639e468064e0f60e1f8a4f4f71ef86a330711bd7b11f210ef3da9bc78c8ac
 EBUILD netbeans-9999_p20160228.ebuild 6939 SHA256 0c6d6f1a1550161392e57c92c6223d70a0f42ad01dbe84b81f1321529757133c SHA512 90f4be6ec1de0c1fd12bd3b25def02b3ea25daa90118f62e284b522012c7418b07d4b0ff218d96a50cc29da96473f12c2ad32755e81af586cbfd2c6a855968fb WHIRLPOOL 8a24365a3c4a279c49c25d9a928d4708f54cab0868174bef47166b94ef578d0c805c714ff1c80fa6329f52a9f10c3f0347977d189f583a0b129d24b5df1042e1
 EBUILD netbeans-9999_p20160229.ebuild 6939 SHA256 249c77ed591f56126a2b41d6a66e53e7539a362f55536a43a4992ddc81367b93 SHA512 6ea19f01ba7f2d149dc1e652448d867eb0b694c4bb8528f1adfdcb5cf7f8020d600a282d8e1f6d89c5b86659c9e885270a7ad5d7d6f9d9c9afb1c6609e30380e WHIRLPOOL dcc2c5f6e97759e0880cfb4e77960e0c238df5a38061b1ff99253ed2b9643d67cf3f2e3335df6755788cf0ef27c0c003d448309dcf5aba4a6262ae7aac94ce54
 EBUILD netbeans-9999_p20160301.ebuild 6939 SHA256 0746fa2f895092887f0f2065610bbeedd61a4493a7f27a290b7473df9bdb2738 SHA512 80e6412b4da453b524d2221a2e851becd45c7090132607561cc510fa323fafd2d8b65d3687a4f3b69ddc8ed924aafcb69d2318755f5e2d95bc24ad6725890e87 WHIRLPOOL b4913ff2bed53f5cc3aeba4ffae37c41a7443653a0a08982885fb74eb2b61bd5340e7edff400628b294da2c36892aeb031ec565af58455e8b0d7c3ece1d507dd

diff --git a/dev-util/netbeans/netbeans-9999_p20160226.ebuild b/dev-util/netbeans/netbeans-9999_p20160226.ebuild
deleted file mode 100644
index 87671e8..0000000
--- a/dev-util/netbeans/netbeans-9999_p20160226.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-02-26_00-02-15/zip/netbeans-trunk-nightly-201602260002-src.zip"
-PATCHES_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-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-r14-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
-}

diff --git a/dev-util/netbeans/netbeans-9999_p20160227.ebuild b/dev-util/netbeans/netbeans-9999_p20160227.ebuild
deleted file mode 100644
index 8f167c5..0000000
--- a/dev-util/netbeans/netbeans-9999_p20160227.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-02-27_00-02-15/zip/netbeans-trunk-nightly-201602270002-src.zip"
-PATCHES_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-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-r14-build.xml.patch
-
-		# Support for custom patches
-		if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-			local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-			if [ -n "${files}" ] ; then
-				einfo "Applying custom patches:"
-
-				for file in ${files} ; do
-					epatch "${file}"
-				done
-			fi
-		fi
-
-		einfo "Symlinking external libraries..."
-		java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	fi
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	if [ -n "${NBLOCALES}" ] ; then
-		einfo "Compiling support for locales: ${NBLOCALES}"
-		eant -f nbbuild/build.xml bootstrap || die
-		eant -Dlocales=${NBLOCALES} -Ddist.dir=../nbbuild/netbeans -Dnbms.dir="" -Dnbms.dist.dir="" \
-			-Dpermit.jdk7.builds=true -f l10n/build.xml build || die
-	fi
-}
-
-src_install() {
-	if [ -n "${NBLOCALES}" ] ; then
-		pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-		for cluster in apisupport cnd dlight enterprise ergonomics groovy harness ide java javacard javafx mobility php platform profiler webcommon websvccommon ; do
-			if [ -d "${cluster}" ] ; then
-				insinto /usr/share/netbeans-${cluster}-${SLOT}
-				doins -r ${cluster}/*
-			fi
-		done
-
-		if [ -d nb ] ; then
-			insinto /usr/share/netbeans-nb-${SLOT}/nb
-			doins -r nb/*
-		fi
-
-		popd >/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	if [ -n "${NBLOCALES}" ] ; then
-		einfo "Netbeans automatically starts with the locale you have set in your user profile, if"
-		einfo "the locale is built for Netbeans."
-		einfo "If you want to force specific locale, use --locale argument, for example:"
-		einfo "${PN}-${SLOT} --locale de"
-		einfo "${PN}-${SLOT} --locale pt:BR"
-	fi
-
-	if use linguas_ar ; then
-		einfo
-		einfo "You selected Arabic locale so you can choose either ar:EG or ar:SA variant."
-	fi
-
-	if use linguas_es ; then
-		einfo
-		einfo "You selected Spanish locale so you can choose either es or es:CO variant."
-	fi
-
-	if use linguas_id_ID ; then
-		einfo
-		einfo "You selected Indonesian locale which has locale code in:ID in Netbeans."
-	fi
-}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-ergonomics/, dev-java/netbeans-java/, ...
@ 2016-06-24  9:25 Miroslav Šulc
  0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2016-06-24  9:25 UTC (permalink / raw
  To: gentoo-commits

commit:     c0a12dcc9567f787e3209ecd9c10aac5f992672e
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 24 09:25:00 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Jun 24 09:25:00 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=c0a12dcc

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.3.0

 dev-java/netbeans-apisupport/Manifest              |  4 +-
 ...d => netbeans-apisupport-9999_p20160624.ebuild} |  2 +-
 dev-java/netbeans-cnd/Manifest                     |  4 +-
 ...5.ebuild => netbeans-cnd-9999_p20160624.ebuild} | 10 ++---
 dev-java/netbeans-dlight/Manifest                  |  4 +-
 ...build => netbeans-dlight-9999_p20160624.ebuild} |  2 +-
 dev-java/netbeans-enterprise/Manifest              |  4 +-
 ...d => netbeans-enterprise-9999_p20160624.ebuild} |  2 +-
 dev-java/netbeans-ergonomics/Manifest              |  4 +-
 ...d => netbeans-ergonomics-9999_p20160624.ebuild} |  2 +-
 dev-java/netbeans-extide/Manifest                  |  4 +-
 ...build => netbeans-extide-9999_p20160624.ebuild} |  2 +-
 dev-java/netbeans-groovy/Manifest                  |  4 +-
 ...build => netbeans-groovy-9999_p20160624.ebuild} |  2 +-
 dev-java/netbeans-harness/Manifest                 |  4 +-
 ...uild => netbeans-harness-9999_p20160624.ebuild} |  2 +-
 dev-java/netbeans-ide/Manifest                     |  4 +-
 ...5.ebuild => netbeans-ide-9999_p20160624.ebuild} | 52 +++++++++-------------
 dev-java/netbeans-java/Manifest                    |  5 +--
 ....ebuild => netbeans-java-9999_p20160624.ebuild} |  6 +--
 dev-java/netbeans-javacard/Manifest                |  4 +-
 ...ild => netbeans-javacard-9999_p20160624.ebuild} |  2 +-
 dev-java/netbeans-javadoc/Manifest                 |  4 +-
 ...uild => netbeans-javadoc-9999_p20160624.ebuild} |  2 +-
 dev-java/netbeans-javafx/Manifest                  |  4 +-
 ...build => netbeans-javafx-9999_p20160624.ebuild} |  2 +-
 dev-java/netbeans-mobility/Manifest                |  4 +-
 ...ild => netbeans-mobility-9999_p20160624.ebuild} |  2 +-
 dev-java/netbeans-nb/Manifest                      |  4 +-
 ...25.ebuild => netbeans-nb-9999_p20160624.ebuild} |  2 +-
 dev-java/netbeans-php/Manifest                     |  4 +-
 ...5.ebuild => netbeans-php-9999_p20160624.ebuild} |  2 +-
 dev-java/netbeans-platform/Manifest                |  4 +-
 ...ild => netbeans-platform-9999_p20160624.ebuild} |  2 +-
 dev-java/netbeans-profiler/Manifest                |  4 +-
 ...ild => netbeans-profiler-9999_p20160624.ebuild} |  2 +-
 dev-java/netbeans-webcommon/Manifest               |  4 +-
 ...ld => netbeans-webcommon-9999_p20160624.ebuild} | 10 ++++-
 dev-java/netbeans-websvccommon/Manifest            |  4 +-
 ...=> netbeans-websvccommon-9999_p20160624.ebuild} |  2 +-
 dev-util/netbeans/Manifest                         |  4 +-
 ...60525.ebuild => netbeans-9999_p20160624.ebuild} |  2 +-
 42 files changed, 98 insertions(+), 99 deletions(-)

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index c1d756d..c3a7886 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-201605250002-src.zip 213747513 SHA256 89b56f89feefee274f4fe9ececf427d7e7e1e9e2b4b6c485dcc469cda7aade2b SHA512 0ebb5e3cf920937ec79953618fae6a8c299625f762c8d4684aa8e55b2c90d04b7694bb6d62919609124482313feb8a74782bcc20932361131d3540c628717441 WHIRLPOOL d60023772410f24346bd9a7002d0f99f905f138e0286d5fcfe4138694419af4ecf94d36a53ed2b2b33ad7e5b8e2b58f3db66ecd4e950cf5887cdcad540ff1d29
 DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
@@ -26,9 +25,9 @@ DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312
 DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
 DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62d58fda2a89ef87d7a1a3d4080b66aa8330fe9a2156d8ca9b69 SHA512 9d7c92a325761b3c448c0876858865ef49963abdd40099dc9285fe3164709229de780d33ef08379787d05f4701cbda407794e32a33966cb3ef30921f60639674 WHIRLPOOL 080ca294dd6ab79bb8df1f1a9caf54765eeab73b4e7ae38ecdb9eb25c889da44c5583b61296e8f68dbb8e0b0ce30810e580aee3008e1d50bd156ca96184caebd
 DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae933c49b42cea56fe36ace1ac114430312e20a9484532e4ffeb3 SHA512 7efc824e3e47f07202d3f687726a5432fbc391c22bc762a0810a95c454c9f1f515bd0b026f22a9a00e39027023e31e9d0fcb3bc95688f8e54ec1465267246bd6 WHIRLPOOL d58c979aacb6021322b5595de5ac1a99f441413aae39bc5a02c09dc353125e778a9c62f45b8e3c88db125f27010d901d6a763f875e86e5f1aae6cc571579c2df
+DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 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_p20160525.ebuild 3384 SHA256 5c92c7fa7bc62ba8307fc6d7dd2e78d79244dfef612d5202a76728797ff9b10f SHA512 17c9035b035265e36e1473767d44f0a4bb04b624525a48284f247e095ab3d2faa89d9e34071e89f29186669fdf8d4c15ac7fa72fb5be419130624cb5a98392b2 WHIRLPOOL a172f5a7425da13aae19036311d46af5fcd11688994dd3ce6b60e2510475f98a0abd7482df18b558b4ac5b76105d72ef9770e184ecde06cf8f5dffb36fdf9905
 EBUILD netbeans-apisupport-9999_p20160526.ebuild 3384 SHA256 78b42989812c06a312a216ba4d7478ba3ac8ff3553724cf8301d5bf50e00160a SHA512 d9b856dac4c202eb279fefcf3354496f48847c2e62d054bc2cd6f983d3b6ef108dfad5f5a962fe5d938619bb1168864227b529c0dfe9465f3bc93199c379e859 WHIRLPOOL ce2799381ebcbb851d972b5c93a96d40cb65eb773ec7ba787ef1c36b15fd20a89ffa561ccc344c2dcb9bf273c1d4e8c5e6e7baa72a174711f47a8cc8db87c645
 EBUILD netbeans-apisupport-9999_p20160527.ebuild 3384 SHA256 6b1cdd342ea791cd5a43da5207aacd826f027402357c638fb0c2949a67a064db SHA512 b89d4adde2359b36d31b520d7795a9c52c0a13a1b26da354148e4622143f50dc28aa8e2f61755d3e7f10a91bc21b9f8df78089cf286ebcb641f4f95f4c990cd5 WHIRLPOOL e3fbdb080132993746349a051a15102ff3268986d963a1933e3f9c7d2dfad5e4585006a52f083cd7b070da870f99410846c37b6e4612bef01f8b129b022b2703
 EBUILD netbeans-apisupport-9999_p20160528.ebuild 3384 SHA256 dea76ca12a89bdc4de57bf75ef99a2d11aa1813abac00884438810fff9669d75 SHA512 aee2a8891a7f2ce8bef07ad356ec38e32e34a99b8ba0ca8b8e5ec79f1c1d5718df4968afdfb2c3ffb8e5e0ab3b49cb3f16a2e19c1e50d1d2279eaf68c869d564 WHIRLPOOL ec6188dd99f247ac87b35abd162b23a1fb9cba47f7f039850ec600664322b7db1e375cf70d5d69df588bdd64f632ed4ca8e37e7aff10225a602447fe4d4d317c
@@ -51,4 +50,5 @@ EBUILD netbeans-apisupport-9999_p20160618.ebuild 3384 SHA256 653f6024a84998bac9a
 EBUILD netbeans-apisupport-9999_p20160619.ebuild 3384 SHA256 62d7250742c2f06f4115d173a3e43389467575b08a45c01ea0f184e1a554e0ef SHA512 bcac6290b100d2c4816955fda39dcc8aef4775559db5971df90aa669a078708161fc8afbf5ad2f7b1c5c52d058ce52e7df4ccc445688e5eb4fae71f621ef09e4 WHIRLPOOL 8ee0d9caf9d18bf3a81319cb3f4ee6260a49f9ee57411dc05eb1591773edecec136d57a21808dc1c0a1f4de08aeef6e75df8b2270436b1e5553310c46a7c3d68
 EBUILD netbeans-apisupport-9999_p20160620.ebuild 3384 SHA256 dc1efedb045c624a498a39daf4cc8f20d8ab52fc50cbfc868413eb09a73f6ceb SHA512 6c68f25f395d7a2dce5320cefdb859e62ef09e7ab2a44898a90aa8d2be35a71a64ecb2e9179dbe3dbece3a05b7689601a85e07c2dd6cb563f3d4ecf6731cea4a WHIRLPOOL a6b58a07ca8e6dd4de7c9f68a8179522938db0a571f8f3cc11a1fb6f9454ec2759aae3cfa400c76ecabe4b8fb79a40bf84e78e8355cbcdca290bcec7e1c493bf
 EBUILD netbeans-apisupport-9999_p20160623.ebuild 3384 SHA256 b81dcfbd3c810d95ac1fff137ff674f7b11604ecd5fe14a48cbf668787df585b SHA512 b84a782c5898e243108eefe9d7f71b1dff2efd0ad4c15cb9e785b4b8cc227207b3908050259511325dee6070d0f6368839654bae0992e136d586613662b1a142 WHIRLPOOL e617eaf1c0dcd2581892a5fc2e3e71b22ec4c903c480a8c989da9795ec2a8b375244609921846cbb3f767ae3963bf93e721ae373be4151e4db6ac19508109923
+EBUILD netbeans-apisupport-9999_p20160624.ebuild 3384 SHA256 e431cabec3f55aa7d6a35ded434ea414172050c53d9b09a28b182e5eb06ab03d SHA512 347d6410c7421a5f3c069484e264d92ed604eded7a8ea223761daa4fc69062edaa1025c299919c4d1d2f0d5023833a68bf50fed449d1cae7a78fcd7d6175d826 WHIRLPOOL d96440d9c988d1cbc415eeba691b8d7547dfbf844f15870d5e7cdf77b7d0e070f11c02435db733ec099a8b2dea271848616ae3b56a8c459200e5dfc720119348
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160525.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160624.ebuild
similarity index 98%
rename from dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160525.ebuild
rename to dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160624.ebuild
index b578700..383d684 100644
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160525.ebuild
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160624.ebuild
@@ -8,7 +8,7 @@ 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-25_00-02-33/zip/netbeans-trunk-nightly-201605250002-src.zip"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-24_00-02-33/zip/netbeans-trunk-nightly-201606240002-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 )"

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index aa43486..d017142 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-201605250002-src.zip 213747513 SHA256 89b56f89feefee274f4fe9ececf427d7e7e1e9e2b4b6c485dcc469cda7aade2b SHA512 0ebb5e3cf920937ec79953618fae6a8c299625f762c8d4684aa8e55b2c90d04b7694bb6d62919609124482313feb8a74782bcc20932361131d3540c628717441 WHIRLPOOL d60023772410f24346bd9a7002d0f99f905f138e0286d5fcfe4138694419af4ecf94d36a53ed2b2b33ad7e5b8e2b58f3db66ecd4e950cf5887cdcad540ff1d29
 DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
@@ -39,9 +38,9 @@ DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312
 DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
 DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62d58fda2a89ef87d7a1a3d4080b66aa8330fe9a2156d8ca9b69 SHA512 9d7c92a325761b3c448c0876858865ef49963abdd40099dc9285fe3164709229de780d33ef08379787d05f4701cbda407794e32a33966cb3ef30921f60639674 WHIRLPOOL 080ca294dd6ab79bb8df1f1a9caf54765eeab73b4e7ae38ecdb9eb25c889da44c5583b61296e8f68dbb8e0b0ce30810e580aee3008e1d50bd156ca96184caebd
 DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae933c49b42cea56fe36ace1ac114430312e20a9484532e4ffeb3 SHA512 7efc824e3e47f07202d3f687726a5432fbc391c22bc762a0810a95c454c9f1f515bd0b026f22a9a00e39027023e31e9d0fcb3bc95688f8e54ec1465267246bd6 WHIRLPOOL d58c979aacb6021322b5595de5ac1a99f441413aae39bc5a02c09dc353125e778a9c62f45b8e3c88db125f27010d901d6a763f875e86e5f1aae6cc571579c2df
+DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 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_p20160525.ebuild 4790 SHA256 0f486830393ad04b308b301b296c3c9ae58b69dda5b981a7d361163d71dca2e1 SHA512 ec29b39e18855fa435fdc493e654cc61eb8ec2874ddbff7438683891abd736a04008cd5452014f2c14c5e950b7fcedead08568f1f3f9e6543aaef90de3c46816 WHIRLPOOL ce3cd3bd01068741a83e6fe3ce9c2b902e9c5daad9e73b7f6e310c10f0299250768a4d31baf065ce6897eab6f6b83777c30d2380a66ff4fbf06a99ef2babf3f3
 EBUILD netbeans-cnd-9999_p20160526.ebuild 4790 SHA256 15c1efdf697e4eec5d827e580c4d2ee6e3ac3308a0184fedf3b882ff16abc55b SHA512 055977fc46ed6ea306c43a939cb9a24deec2764a881ada5a32d15f5f8e06024a628785d71827dcd331d0ae8d0aea8e89a780ae3a09e6a24a5a1aaf1acaed3ba6 WHIRLPOOL 1d04809ee29093158af062fc7e8e3f9843bc11d51c439c7b47c45f646f4a21b9f5231e5bdccb6e168fcf30b0dfb613c7ba4265c014b298cec68edf6276d33c02
 EBUILD netbeans-cnd-9999_p20160527.ebuild 4790 SHA256 3cf4a0d65a879cc2a8f9e5ebb83abc6bc3fd8c804adaae9d33792639b762ba26 SHA512 9cd977b0c24d4b5422f55b47dd593fb45980ecaba25dc71d5eefa77e365d446bb12b32d3211a449b804515924785117bb4dd31915fb65c28f31aa2c0994cc202 WHIRLPOOL 6b41d54b12d7fde225f5673c6acefa2d9a1d4616be5be9f1b949023d2c35af70577ef5d680c86c03035ddf8b3ba22294a7d052c224904a12e77c014fef21e10c
 EBUILD netbeans-cnd-9999_p20160528.ebuild 4790 SHA256 51886877261cfbad884f0726664a048b620d40e5a0e2782d812990762027dcd5 SHA512 73284fbc92397b2abd8d67e3d343f010e82d2b35df86ae3a2787d5f88434c2211098452a8b203e16a5afa083d62a35d404ef4e0ff0927b77c6ddf62a6a19c015 WHIRLPOOL ae5620916361e0970e17476ade2d3bb50848b5840775d903daf7bafecc2dc70311ede53b268d211cbefca8820b346fcb4bf3dddb5fe2f72dca0c497fe61c7900
@@ -64,4 +63,5 @@ EBUILD netbeans-cnd-9999_p20160618.ebuild 4790 SHA256 5da83ad7908207f88eb4f8e426
 EBUILD netbeans-cnd-9999_p20160619.ebuild 4790 SHA256 bad9a5191965dd8ce7f73f8a87a0cea2bedf32775b93d9c110bb8be6c31d5b0b SHA512 8b843cda21bdc47091ae05b531f3a5c2b953b05030f57f520cc963cdbd53422a18f4a4276f040fda4bd21bfc4722454d68a4400caf10532d7d74c2d46c9ecea4 WHIRLPOOL 6452dfd59f1f46eb96d1e7f365bd3235c81df6640129c834edb8f4f27b07dc9951e35c54f0fd8a852fd5108fe2e8c7029831ecd8e775f0a1f3a201cb4c3c73be
 EBUILD netbeans-cnd-9999_p20160620.ebuild 4790 SHA256 952df2833e6bc5eddac469dba4201975d65cbbc59c9f5033dbb8e5731547e87e SHA512 3b94badd5baea172fbf5e554ee1a17603f3267c2d8e5c1f532369d2249c5ac87c0cbe6c3a5681cda57f812c19cc67bdf1fc22791522c347b2c1277dbdbf473d2 WHIRLPOOL cd6233946c417feec87d84c01348bcf86bdee377a258d15d02748cda28e68bef85ebe093544fecd2805426496e9a85deea42d11efda29e41a356572bd9c4146f
 EBUILD netbeans-cnd-9999_p20160623.ebuild 4790 SHA256 c65c20a80f812bc612d06127b77f102d7d789039aa2d12f34012a7be937695da SHA512 25532433ca63cc1540a5efafab3cb0829d4141210352b1ec661c363a63dea4af43e20766b7bfdb3494a9af2405f0a4b25d475c606b6e6169c50ce9baf38d3bbb WHIRLPOOL b27cc31f94bc5aea8a5eaf98688eb80482e602c83e6dda6813da28d53d1909fab95710854d269cc11d1715195cb3bf310f57ad78b8b08c2e87c68bafe05ecea4
+EBUILD netbeans-cnd-9999_p20160624.ebuild 4790 SHA256 4f434bac078af589851bf4e2af8dc133a755215a1d7a980c579ca00465f93735 SHA512 7aba1d9935844e6f43bfffc2e7888d973470d0e308988b281a274f2e4c0a4694182d6a7b6941ea852e56487a4d19741aadb0c11c5dbf0178ba1400c94e8dcb42 WHIRLPOOL 7810bdd0e73991a8abef9291aefdc1b8be7b65f5f6f9525e7b944dbd3b47bd52cf861eb48037ba78723f31045544a78ad778cd8528af6f028e7416773034f6fa
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160525.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160624.ebuild
similarity index 92%
rename from dev-java/netbeans-cnd/netbeans-cnd-9999_p20160525.ebuild
rename to dev-java/netbeans-cnd/netbeans-cnd-9999_p20160624.ebuild
index 0bffdb6..e638eed 100644
--- a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160525.ebuild
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160624.ebuild
@@ -8,13 +8,13 @@ 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-25_00-02-33/zip/netbeans-trunk-nightly-201605250002-src.zip"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-24_00-02-33/zip/netbeans-trunk-nightly-201606240002-src.zip"
 SRC_URI="${SOURCE_URL}
 	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
 	http://hg.netbeans.org/binaries/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar
 	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
-	http://hg.netbeans.org/binaries/85FD13415B0553D6421F4BBA5FE0F587B9748B20-clank_0.3.6.zip
-	http://hg.netbeans.org/binaries/2B406087CE1AF289539768BDF36F52E63F69F1CB-cnd-build-trace-1.0.zip
+	http://hg.netbeans.org/binaries/1BD2563498D0E0BE1C7B3DD31FAD892B41EC041A-clank_0.3.6.zip
+	http://hg.netbeans.org/binaries/43A82EB3CE61B9B0B1C60586C7D84729BD5BE3E0-cnd-build-trace-1.0.zip
 	http://hg.netbeans.org/binaries/E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip
 	http://hg.netbeans.org/binaries/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
@@ -56,8 +56,8 @@ src_unpack() {
 	pushd "${S}" >/dev/null || die
 	ln -s "${DISTDIR}"/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar libs.antlr3.devel/external/antlr-3.4.jar || die
 	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
-	ln -s "${DISTDIR}"/85FD13415B0553D6421F4BBA5FE0F587B9748B20-clank_0.3.6.zip libs.clank/external/clank_0.3.6.zip || die
-	ln -s "${DISTDIR}"/2B406087CE1AF289539768BDF36F52E63F69F1CB-cnd-build-trace-1.0.zip cnd.discovery/external/cnd-build-trace-1.0.zip || die
+	ln -s "${DISTDIR}"/1BD2563498D0E0BE1C7B3DD31FAD892B41EC041A-clank_0.3.6.zip libs.clank/external/clank_0.3.6.zip || die
+	ln -s "${DISTDIR}"/43A82EB3CE61B9B0B1C60586C7D84729BD5BE3E0-cnd-build-trace-1.0.zip cnd.discovery/external/cnd-build-trace-1.0.zip || die
 	ln -s "${DISTDIR}"/E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip cnd.remote/external/cnd-rfs-1.0.zip || die
 	ln -s "${DISTDIR}"/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip cnd.modelimpl/external/open-fortran-parser-0.7.1.2.zip || die
 	popd >/dev/null || die

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index d06f5fa..800c642 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-201605250002-src.zip 213747513 SHA256 89b56f89feefee274f4fe9ececf427d7e7e1e9e2b4b6c485dcc469cda7aade2b SHA512 0ebb5e3cf920937ec79953618fae6a8c299625f762c8d4684aa8e55b2c90d04b7694bb6d62919609124482313feb8a74782bcc20932361131d3540c628717441 WHIRLPOOL d60023772410f24346bd9a7002d0f99f905f138e0286d5fcfe4138694419af4ecf94d36a53ed2b2b33ad7e5b8e2b58f3db66ecd4e950cf5887cdcad540ff1d29
 DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
@@ -29,9 +28,9 @@ DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312
 DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
 DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62d58fda2a89ef87d7a1a3d4080b66aa8330fe9a2156d8ca9b69 SHA512 9d7c92a325761b3c448c0876858865ef49963abdd40099dc9285fe3164709229de780d33ef08379787d05f4701cbda407794e32a33966cb3ef30921f60639674 WHIRLPOOL 080ca294dd6ab79bb8df1f1a9caf54765eeab73b4e7ae38ecdb9eb25c889da44c5583b61296e8f68dbb8e0b0ce30810e580aee3008e1d50bd156ca96184caebd
 DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae933c49b42cea56fe36ace1ac114430312e20a9484532e4ffeb3 SHA512 7efc824e3e47f07202d3f687726a5432fbc391c22bc762a0810a95c454c9f1f515bd0b026f22a9a00e39027023e31e9d0fcb3bc95688f8e54ec1465267246bd6 WHIRLPOOL d58c979aacb6021322b5595de5ac1a99f441413aae39bc5a02c09dc353125e778a9c62f45b8e3c88db125f27010d901d6a763f875e86e5f1aae6cc571579c2df
+DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 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_p20160525.ebuild 2968 SHA256 b225c348d11bfc697fdd2dba0a17c03278307a1d9f5b628b0e23d20b5ac037bf SHA512 cd3b639b78d11f459e4fe418bf8753c503aa4fc35c47fb30a01da3a293f0fa7eea1fe0cdd008f1c723c21ac89b9a75ec359c8074485d04078ccba23af83cce6f WHIRLPOOL 9daee93c1a50b6718896f1374efad835869abfdb5f750efd40526bd616b3a70a4a486edce04f5bfe8297e96bdab5bb2e9e05da5f14335a23e7c963da80e34382
 EBUILD netbeans-dlight-9999_p20160526.ebuild 2968 SHA256 627ff0954db98e43e9961942b65ed75c2faf99904e31275ed290f72438142738 SHA512 a39dfcf667517f62ec637af1ea16aa7481e598016e83201aec40a0414bbcb60e8e00a4aa7f407358a1c07e93dc915444c1913966140a45d7b23ee0bc59fdadc7 WHIRLPOOL 6667817edc1d8e81d2ddc9d9304c4cd12f2af1ddba13c534427f11183fb8e241bac9bc4d4755f19d53163beeb0bfb0d33535292b6c56fb77fab79064269cccc1
 EBUILD netbeans-dlight-9999_p20160527.ebuild 2968 SHA256 e31aa9c2e0d9768c6734acb590461f8a45007517b52f24eb1020a5bae75bb505 SHA512 950b04493deae35018a60bfdc2d245e1ca114deee3acb888bc89d0a86d10010d096be1d48b0740173ae9cb54bc07af0269e8f060578ee0dcdbcc85ae41f37622 WHIRLPOOL a1122ae0ac832f1a22574411b92e83513f10372d6952d64159724e31826d11acf209d5e0af8dd1ed51eb3964c8fcbcfc988b8c9b8548aef9871ad453c8e87dbc
 EBUILD netbeans-dlight-9999_p20160528.ebuild 2968 SHA256 44a7bac7ffc8b7b17500ee8d784debe345e573f796ae4615453198d5712a6762 SHA512 f1ce3a2e8790b1a70efbec5914ae90d0e2282cb9aa16f3758f124413a81c51cf6b797f50fa8fe87b3e06a1cccbdc014e51875d412e28a6aaafefb12fe4617966 WHIRLPOOL e61c1c70dbde5e769e5a62247247673c367239a8278cba3b278dd7a96b0ed11e6e662acd3c97c96235e65ad552058de4b32c3081c6a65ba0c9d1ea776d6688a4
@@ -54,4 +53,5 @@ EBUILD netbeans-dlight-9999_p20160618.ebuild 2968 SHA256 9507130be7074091b9005a2
 EBUILD netbeans-dlight-9999_p20160619.ebuild 2968 SHA256 aa29f6e3e86b05ec8ae1b794f8d29c9c58bda4ca6c3e45142b4a3912ec1f3233 SHA512 66a4f1a5b3787b20e0fbad6bde2011fb106aa2b38dca8e3542b260ded852968dde1ec277fcd31fea3efe5fbe355dfb1e3f7274ca1d1186cd5763edd390ee9a0d WHIRLPOOL 047b83b1497ed9c97bd1fad6577b8eb049f38c2fa55e40622e0150154e8cb296c9d4f001ac8995c668aa6bb7846ea841ce4e5af264ba6b0228182fac1dcd84ff
 EBUILD netbeans-dlight-9999_p20160620.ebuild 2968 SHA256 f9e9572d5d109050da1a7857957af50e573bbcff41866a6d8bbdc257fd421c5c SHA512 da91706cedce1c990c61ab9d1ade8c40371739fa2c8a7ae0347e0572b13f91cbe6d663cf3b0e052b57c3e9c70b42d3d71b2b2fe5276c538b6f14620a772d9d21 WHIRLPOOL dc3b28c17dafd4200d7fad31b8f4380b687cba573d025badf4f433931ae2045ff233b7a14a2648c6e37f27de56590ef68e4bae12fb294d1d22fdbcde556943e2
 EBUILD netbeans-dlight-9999_p20160623.ebuild 2968 SHA256 0cf93c044fbdfb46ddfe0ffb40efb572dbf7a3f9751e156b3d31c3479f0ee0e5 SHA512 1c0d64fbd8429f9bb8ff9bda2ff0c1389b041d49fba3e4976a6cd4d78e78203b31b2bc8827866c28b044c20894f5d1806a17ea557963ec8ae8444552e2c362cf WHIRLPOOL 573b1715614f70969a206e8970943c625793b3076e8c3a1b29158f3ddc516b2d42ecd765045baab6c4d7460bc61231d9b89c39d447619b2fc1093488c06a4267
+EBUILD netbeans-dlight-9999_p20160624.ebuild 2968 SHA256 9ff84b6b9364fd7301449856f3738f09f7cfd1347995eaa18e3694e9e299ba7f SHA512 11d1706c15962c2f115c915880f3b426f60d87657991928baa6701eea3e2e8706385980adc260c9935a737e54c6f611a81bcf39e56963c4aef42d667fd78fca1 WHIRLPOOL 061db39bd88e2396e4247c85d9e7148aa668a969d7b4c0639f0503a140ba325bb673db4bdd25a3d1d718cb15c52f2ab6bc3ca54118814e900db57c26cfed7199
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160525.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160624.ebuild
similarity index 97%
rename from dev-java/netbeans-dlight/netbeans-dlight-9999_p20160525.ebuild
rename to dev-java/netbeans-dlight/netbeans-dlight-9999_p20160624.ebuild
index ed67620..7dc5a7e 100644
--- a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160525.ebuild
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160624.ebuild
@@ -8,7 +8,7 @@ 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-25_00-02-33/zip/netbeans-trunk-nightly-201605250002-src.zip"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-24_00-02-33/zip/netbeans-trunk-nightly-201606240002-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"

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 9f30edb..ff91703 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-201605250002-src.zip 213747513 SHA256 89b56f89feefee274f4fe9ececf427d7e7e1e9e2b4b6c485dcc469cda7aade2b SHA512 0ebb5e3cf920937ec79953618fae6a8c299625f762c8d4684aa8e55b2c90d04b7694bb6d62919609124482313feb8a74782bcc20932361131d3540c628717441 WHIRLPOOL d60023772410f24346bd9a7002d0f99f905f138e0286d5fcfe4138694419af4ecf94d36a53ed2b2b33ad7e5b8e2b58f3db66ecd4e950cf5887cdcad540ff1d29
 DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
@@ -58,9 +57,9 @@ DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312
 DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
 DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62d58fda2a89ef87d7a1a3d4080b66aa8330fe9a2156d8ca9b69 SHA512 9d7c92a325761b3c448c0876858865ef49963abdd40099dc9285fe3164709229de780d33ef08379787d05f4701cbda407794e32a33966cb3ef30921f60639674 WHIRLPOOL 080ca294dd6ab79bb8df1f1a9caf54765eeab73b4e7ae38ecdb9eb25c889da44c5583b61296e8f68dbb8e0b0ce30810e580aee3008e1d50bd156ca96184caebd
 DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae933c49b42cea56fe36ace1ac114430312e20a9484532e4ffeb3 SHA512 7efc824e3e47f07202d3f687726a5432fbc391c22bc762a0810a95c454c9f1f515bd0b026f22a9a00e39027023e31e9d0fcb3bc95688f8e54ec1465267246bd6 WHIRLPOOL d58c979aacb6021322b5595de5ac1a99f441413aae39bc5a02c09dc353125e778a9c62f45b8e3c88db125f27010d901d6a763f875e86e5f1aae6cc571579c2df
+DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 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_p20160525.ebuild 15825 SHA256 4ff12331787132ba2fcf2a4b7c78453c63bb4027f56e3a66e77cb12bcb596ac2 SHA512 08d33fc45156f35d33a977fc9f66f62943cf5f7726527603863f764a47403ef3312d1cccfb3289a2c605180180bd558896e186eb5c239e51b15e9058cef4cdc7 WHIRLPOOL 6b0bd69269a851291f6c9fa4decebdb2981917d7254a92f1cabdd77f48ecf7ea8509877592a9a49c352c39b482c0ab73b82125edd29f5b97d4cda107c52c97a8
 EBUILD netbeans-enterprise-9999_p20160526.ebuild 15825 SHA256 95734908288d5bc9cc17af2c0906bda2fa17e50f24dc295334a339083d95e756 SHA512 d85ff9ba3e3420832b65f6863ffa352b3cb9b28dbd33e2ba110c0b7d15a0a68f5546341d83e6e18419c3c33feb8f95dda6bb0839f3f852733f0e0d0ce5657cc1 WHIRLPOOL 77c0a24f3a1e2da993a1c01cc67a216f011bb877f4afb9cea648251b73ce34b80ae5fc692a2b3236a965bfba95b0d7700764eb7429c45cc1abca7b4e5305dc3c
 EBUILD netbeans-enterprise-9999_p20160527.ebuild 15825 SHA256 5ae5cf98ef42b44e124270fb3709dd675c651830f1ecc6c2ab8f6c7e4e8602d1 SHA512 b34cb992fbd884382264e975f0d51866af7c25564b24f90a76253b25356340f108a84863394da00ff2f15bd0c65059265c6dc758d142b99f5095cc2a3df195a9 WHIRLPOOL 613d2de27c9936d86f878666257a9fdf8868478b39c06ff7504779aea2f5dda257cfc86db013967090278a0cfbbcf116d3a75407ae10c97c37ef89b8a0c59613
 EBUILD netbeans-enterprise-9999_p20160528.ebuild 15825 SHA256 05765270dd6968aac62912496073a5b8a45c4f0721ae3f2e55fa9b956c04a73b SHA512 dce21c1246bc6a6c7d2953a92bc7662f8ab3867dbab34289556c09a9a6d4af339717a830288308680077b9a68fd333197fbaba5ee0c78610e26b1e018f308721 WHIRLPOOL e7bc32b284e69d83733e2d134828c56b09600a2e523fe8200c339056d707f6800b8bd117df43b7fbdc4028839ee3d3ad0cbc683d5cc8662329b71317ae0837f0
@@ -83,4 +82,5 @@ EBUILD netbeans-enterprise-9999_p20160618.ebuild 15825 SHA256 86aaa2168888a50c25
 EBUILD netbeans-enterprise-9999_p20160619.ebuild 15825 SHA256 8aa66ace0e3d555df5d838047d3399909fb2c8463fb7ee5c91041ab297dfd677 SHA512 b956046db574db9e871e50a89986dd9f4a8e59c98e2989c30d660979b2ee061b4f51c700feb9b016d26785b8240ffd3dd388ce9b310cffd5e93d709da66c7fcd WHIRLPOOL 6c5fdd9f5edcfe5b17eac1352b3866230a01e44bd619bdb625f8700b5548d30e3a531561dfc05dfc9d5e3f0dd8733d5e029f75819a3913f3707d1d816b8c584a
 EBUILD netbeans-enterprise-9999_p20160620.ebuild 15825 SHA256 189acebbc23a0c6121320e1d1332763bf4d0f92e05e0c6084b5a59b576a7429c SHA512 aa88ea33097d1956471cb935c1c02195f2711cd33f3455edd523aeecba55bce3fcf4981855eafb0b054b7aef5de688a95904b7a03089610fcef6e12cee914e76 WHIRLPOOL ebd9d115aca175a4d4c2c995cd570b02746d99016e78cc0b5ca9f744187ef322a29e40db95401fec80bc6a47ddd38e29f4fac1f53c194c6abfcc9a4ba63cb3c1
 EBUILD netbeans-enterprise-9999_p20160623.ebuild 15825 SHA256 ce86cbadd5583f98f07da4c086b4118ca149a07045462b9ca0b93adaf5f899b6 SHA512 61723065c911e3d0204e32e2ee8b5e787ba70894508e6253aee72f96906cf867cc3edb694b27a6fc3223af9fd98db60cf69bcf5b0b3d793ad6f5c3fe70a56a51 WHIRLPOOL 314a9f88e488f1f1b37a039ef8dc40b0deb6404437f0e9ddc7c9107ce5cb34668a2e4aa808d9c57f059731fe09a87533264af780abc5b8ca0b7505440c3e4f4a
+EBUILD netbeans-enterprise-9999_p20160624.ebuild 15825 SHA256 e6f71be68512f48dd6dca27f1b0912f2936bfa4b307d53e45b554f02d7e7fcac SHA512 b2659671d2dacfee02d53fb8e60fca4f0966410ae6744baf44a778aa43eaeb9f00e0854c44ad529023305eab2693682411fd5f4fa52f46c853272cc5a829b79f WHIRLPOOL 79deb19fa2b996c8c4ede92cceb275d2a0db915ce1ea4304bcbd19163c277eca81562a667ea50af559cea041bb544cb281d2157be418ecf33d3a5b7a551c2629
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160525.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160624.ebuild
similarity index 99%
rename from dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160525.ebuild
rename to dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160624.ebuild
index 9c8fea3..e66419a 100644
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160525.ebuild
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160624.ebuild
@@ -8,7 +8,7 @@ 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-25_00-02-33/zip/netbeans-trunk-nightly-201605250002-src.zip"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-24_00-02-33/zip/netbeans-trunk-nightly-201606240002-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

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 55a8a8f..0219a5c 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-201605250002-src.zip 213747513 SHA256 89b56f89feefee274f4fe9ececf427d7e7e1e9e2b4b6c485dcc469cda7aade2b SHA512 0ebb5e3cf920937ec79953618fae6a8c299625f762c8d4684aa8e55b2c90d04b7694bb6d62919609124482313feb8a74782bcc20932361131d3540c628717441 WHIRLPOOL d60023772410f24346bd9a7002d0f99f905f138e0286d5fcfe4138694419af4ecf94d36a53ed2b2b33ad7e5b8e2b58f3db66ecd4e950cf5887cdcad540ff1d29
 DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
@@ -26,9 +25,9 @@ DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312
 DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
 DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62d58fda2a89ef87d7a1a3d4080b66aa8330fe9a2156d8ca9b69 SHA512 9d7c92a325761b3c448c0876858865ef49963abdd40099dc9285fe3164709229de780d33ef08379787d05f4701cbda407794e32a33966cb3ef30921f60639674 WHIRLPOOL 080ca294dd6ab79bb8df1f1a9caf54765eeab73b4e7ae38ecdb9eb25c889da44c5583b61296e8f68dbb8e0b0ce30810e580aee3008e1d50bd156ca96184caebd
 DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae933c49b42cea56fe36ace1ac114430312e20a9484532e4ffeb3 SHA512 7efc824e3e47f07202d3f687726a5432fbc391c22bc762a0810a95c454c9f1f515bd0b026f22a9a00e39027023e31e9d0fcb3bc95688f8e54ec1465267246bd6 WHIRLPOOL d58c979aacb6021322b5595de5ac1a99f441413aae39bc5a02c09dc353125e778a9c62f45b8e3c88db125f27010d901d6a763f875e86e5f1aae6cc571579c2df
+DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 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_p20160525.ebuild 2913 SHA256 562acf2ee31be2895a3a7a4f6a3349831079a1f8a6fae08426dac651c257a7e5 SHA512 ffdebdcb5a18b9458f38f2964745c51cf762608a8626b1cd63addd90a025044ac520013c58b748aa5e543a864d81dfe470d6bcd874d28b2c31fd1ab8406ec39f WHIRLPOOL 9ca3cf78027d875252076335072198b719fee96365ffc73fd613f5fc30932d5f047985771211be7f87210e02cf6a208a004f8978e50e1ea2466cff458dc0b6a4
 EBUILD netbeans-ergonomics-9999_p20160526.ebuild 2913 SHA256 cb90adcc4199e00b2781e94bd34c5ef0c05361dad1bb389b9a583c2ea4d83a36 SHA512 bb235a9b2421fe6369e5700c924c66a19c8a4798f133b886fa87f2d0213ee41eb9902b602d78d766a568b355f8178ea445958d00af7dfe7bdb19b2d37e96723b WHIRLPOOL 50ef76e33091a3c40e8b1791a273a9525210f02a0ba0bd0fdbdf69182d2a709c01ca019c01f12c84721c1427dbefcc9ccef4af2c22670d35df703d5c72d4fe38
 EBUILD netbeans-ergonomics-9999_p20160527.ebuild 2913 SHA256 d0a9c443f59b0f26f50c7faf75ecc091e6c82c7ed7b07bfca2ecab8f622ae24a SHA512 c8b64476f191ed7cca4980c8f80046ddc68780bc9176249606247fbfd16f234fc1941a8a6035628967906278f2f07b087da67962cc076fdfe4ebdfda1e4b16c9 WHIRLPOOL 16067a2a0dfe092143a35ebff76ca6ef2170fcbd0db6890f5abbce25ae094385d7c54f88be771279f9dd7341732e406535d2d79ab31220569bb08f4dd891f7db
 EBUILD netbeans-ergonomics-9999_p20160528.ebuild 2913 SHA256 a9167b158e314e46f83edbd5d520e3defc3af442bc32455a1916fcb028244380 SHA512 bcf7d2833f57f7376ed4638b3ce0d807ad2d86f6114d5c34ea95dec01b05929c73bb6cf4a4dbf90d581ab2c9706ae16047a9e52346f396b6f0dd79d83db31ebe WHIRLPOOL d1faa8f2a115beeab22807028e43a0a972e057a9ea1d0ccbf0a1ab96bca64ec952e588c93d4c49a1540002a8f5463f19bd25ae3c5134859010b11c646cd2065f
@@ -51,4 +50,5 @@ EBUILD netbeans-ergonomics-9999_p20160618.ebuild 2913 SHA256 51abcc43a1da2281210
 EBUILD netbeans-ergonomics-9999_p20160619.ebuild 2913 SHA256 895a2f0d66ca9fc0fd9e034320052d8b58e6148d87a43bd347f2ca26d38c522a SHA512 372439cb2f326dd38e8dda1692ade104628b4735e3a3b5d07736afb6ad701e37c8d6f322a4ca9dea70573ef4cba01a5f020a8f9e27447f682fed15481e6c9173 WHIRLPOOL a79e80bfac86cd7c1b102a50d67a27c99818e0abe65783243e8bf7e74d6ed38116fb1ed9301cbb5f4948e204f01ce3031e7bee4046e0637a87e16a684ce2a640
 EBUILD netbeans-ergonomics-9999_p20160620.ebuild 2913 SHA256 ae0de72df0662eac1276984c40e34b19a1d4f6132bc2ad5e22dbe321395023c1 SHA512 b00900b401130b60ebca16c66c1b25603810acc6475eb9997931d7609027d5d6598b9ee792dbf682a126bf7a2a2f524625f5721e8aa941767cb61abf88bfe1c0 WHIRLPOOL 9e131cf6d46eb2e7353c7d8059dd900674751f21e34c66f4a5fbbcefe08933e1454324a069c882133e738d77891a63cbe14514e84c1915aef942af56b24e0148
 EBUILD netbeans-ergonomics-9999_p20160623.ebuild 2913 SHA256 aa044120ca7af2bfcee8ed1670637cd863010c022318974d30606a1191835666 SHA512 e0a3f14cdffe30202fe778f579a35d0f02f117ba9d81c83820c841161afe68c772b47ef8d3a6e20f30dbbafcc5dcc81ffb48a6362dfabb7cf7db89c8b5a7ed32 WHIRLPOOL 609632051fadd1638d807a62e37e887b589ab489ee5769c9e28116fe6ff519f4cd35013a87702093b76fc094e5de63effb9c05d8f1cee508763a9f756476ffe5
+EBUILD netbeans-ergonomics-9999_p20160624.ebuild 2913 SHA256 10b41dbffcbe022eeae17505b0d818b0b07953d44b3f20a024fe1d1db8854b12 SHA512 e08f7e71328e992cf8ee9cd4f39ff5e1f11deb597284db757aa969e27b58f15fa4b488bbc44d474f367d678ea09c7f452541fef9aa6648447acdd859c9daabb4 WHIRLPOOL 8fe488cef5a74ed57f39ae4820270cd0433dd72278cf6363d5f79776f103769494f7917ac87bc869ff22c77ce8cd4bcc3ed4360ba6975c8de33ba4e3045d12be
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160525.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160624.ebuild
similarity index 97%
rename from dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160525.ebuild
rename to dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160624.ebuild
index 1a32514..cd3a90f 100644
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160525.ebuild
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160624.ebuild
@@ -8,7 +8,7 @@ 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-25_00-02-33/zip/netbeans-trunk-nightly-201605250002-src.zip"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-24_00-02-33/zip/netbeans-trunk-nightly-201606240002-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 )"

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index 589dc43..9548e9b 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-201605250002-src.zip 213747513 SHA256 89b56f89feefee274f4fe9ececf427d7e7e1e9e2b4b6c485dcc469cda7aade2b SHA512 0ebb5e3cf920937ec79953618fae6a8c299625f762c8d4684aa8e55b2c90d04b7694bb6d62919609124482313feb8a74782bcc20932361131d3540c628717441 WHIRLPOOL d60023772410f24346bd9a7002d0f99f905f138e0286d5fcfe4138694419af4ecf94d36a53ed2b2b33ad7e5b8e2b58f3db66ecd4e950cf5887cdcad540ff1d29
 DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
@@ -30,9 +29,9 @@ DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312
 DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
 DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62d58fda2a89ef87d7a1a3d4080b66aa8330fe9a2156d8ca9b69 SHA512 9d7c92a325761b3c448c0876858865ef49963abdd40099dc9285fe3164709229de780d33ef08379787d05f4701cbda407794e32a33966cb3ef30921f60639674 WHIRLPOOL 080ca294dd6ab79bb8df1f1a9caf54765eeab73b4e7ae38ecdb9eb25c889da44c5583b61296e8f68dbb8e0b0ce30810e580aee3008e1d50bd156ca96184caebd
 DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae933c49b42cea56fe36ace1ac114430312e20a9484532e4ffeb3 SHA512 7efc824e3e47f07202d3f687726a5432fbc391c22bc762a0810a95c454c9f1f515bd0b026f22a9a00e39027023e31e9d0fcb3bc95688f8e54ec1465267246bd6 WHIRLPOOL d58c979aacb6021322b5595de5ac1a99f441413aae39bc5a02c09dc353125e778a9c62f45b8e3c88db125f27010d901d6a763f875e86e5f1aae6cc571579c2df
+DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 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_p20160525.ebuild 3377 SHA256 c454ecc26a6f7f4312f3179add42fa23702e2f5c81a5dd65a6c98a861ad79496 SHA512 bb4d8236ea72d6a7f76f162d22d6cb37639cd30320a72429bf2138653a3aeaf46bcd75de2c2613e6ff2b7c2a54f3f42c5214bc09b14d7e90eddf67735dd941ab WHIRLPOOL 0e0ce9feef29059c3bf9beb052bb0e137aa8c3304717a223c54e9d36654f451b75761804cf083b95f3ba95c30939aafd003c4b8c1288f9260c1c1428005219bb
 EBUILD netbeans-extide-9999_p20160526.ebuild 3377 SHA256 32ae570338aab8acd5f5dac7154bba217fb1baf507d24e6d2df7c13c0eda06a6 SHA512 0c295a66ace5709c4ad71569f32c645de4bf39f09ea308388becec3b55753d363763b2e22733d234992e0471b0ffeeb1ed94d69e2121140519434781c4ffdaf2 WHIRLPOOL f478663b9c91a5f4400286b714cd49d9efa8a2d193b4c0209926b062ac9f35443d7ac620712112dab3448139bcfde744c5fb37767e2530a9ebecd0ac19c86796
 EBUILD netbeans-extide-9999_p20160527.ebuild 3377 SHA256 c34a7b73508938fae77cd74201f666d9fe7e12a64846e2950cf8e236ffa8658d SHA512 c3449cb97376606ac0e728e6a93deccc4fc0d9d46b96d33bbedfa8479bcdd0c89220f3302565ed9d1e4f7e78102e51d78d757c6f7a8f5886c62b36470c7175df WHIRLPOOL 7e1320997af8ff09f5da347671287a869856296e96863595bccf195f02f11bbf7ada4f377565cd94e0e456cfab91b04d7658c8d456796a71fc5758b1045e3a3f
 EBUILD netbeans-extide-9999_p20160528.ebuild 3377 SHA256 2d0a71ea5ca88ab01cb5e6c35ef961750821f30632158856d757b1a8ccb2fba4 SHA512 3fa3bead601fd0d04f59be7ffd7b8c009d3b31986f2dff444e1398767c31b96cdf6df4926b6486b0f91dbb970a1eda3e884b981e596b0d4f233e89dcaa31a78b WHIRLPOOL 6b4cf850a935d3357bf5af97ed2a9945b6c0946ff79c68940f28626c293a099e6d3bbe0e18335f4c1024f95ace91b0a20d2640f4b613c1c875a63436c7fa26da
@@ -55,4 +54,5 @@ EBUILD netbeans-extide-9999_p20160618.ebuild 3377 SHA256 0b89a7a67e28521b8429075
 EBUILD netbeans-extide-9999_p20160619.ebuild 3377 SHA256 8218ece1f0dfc76088617f60dc1389b5833dd952901a3d4796cbfe9439834395 SHA512 a5773c99fc8a3546ed2a080f2342503a4bc2ba985b9a1ec549cd126da4df72cd0b8ec7c7b436caf1dd5e7306a5a4897943b2545305aea183426e551dac61e302 WHIRLPOOL 1ac9f80566d306ed1df60833007ac3c6bc1c46283aa3532b43e16553d0ec0a6287bbeb582a9ac014001985683656d292717b11fafc1b79b0942b0c18978ba4f4
 EBUILD netbeans-extide-9999_p20160620.ebuild 3377 SHA256 99510df57abd7eb44da5619c2ddea2e3bb9d57e12f05cf87eee6d20671ca76b9 SHA512 f5eb18495c90a14211550d37ef4a560635e97a05274cd15bc7f74a772ac77def18e96b53091614563e8ca0bde555f9ed1b8cb0eb0372cfbb528074333915036a WHIRLPOOL 67c39375c7f4ecd75a7fd01e2eb25e577a92b67c4182b4cee29dccec38947309f4761f37e960b421ead1b90ca93268bcabd11a2db7a8b24f4270bd41762d32e1
 EBUILD netbeans-extide-9999_p20160623.ebuild 3377 SHA256 9110ba0f5512c37751ff67efb47cb8daa02165a95638349d0021172d0a3261b5 SHA512 dd5b2735915012a1e80372819da66e3fe765ac78e7da257b7890667406f6e15abb9ab6144bcd3f981bc02325e8235e2fe33772c07de13742d3da19cac61e6a8a WHIRLPOOL 29b9d307e472a73288fba307fa28f5cc12aa28149472d49b283046a7843aa6dfd4595d4cf7436d33673b12233a7b3a4e2f60cbbc21416da38ee9a0adbca7b001
+EBUILD netbeans-extide-9999_p20160624.ebuild 3377 SHA256 4822ccf1f24743aafd4c5196c46ea6b8f067292fe33d7763bf5e9691369d4351 SHA512 53612be6cc06db6e3ce050aab9170e1c5fa34f3a581778527d696beddeecac43a3ce84371bea64248dc4b1ab95d2aa797a15de27a4e7afa5ab716017772ca5b4 WHIRLPOOL 3822fe7832811a1f69b343a84cc5596403e07076aaa60600e3d469bbbfc8b0d817e229e0206866ff939b45c185adbbd5be81d4df9ca348872f84b36b43ca22d9
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160525.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160624.ebuild
similarity index 98%
rename from dev-java/netbeans-extide/netbeans-extide-9999_p20160525.ebuild
rename to dev-java/netbeans-extide/netbeans-extide-9999_p20160624.ebuild
index 15c5f46..01b5fdb 100644
--- a/dev-java/netbeans-extide/netbeans-extide-9999_p20160525.ebuild
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20160624.ebuild
@@ -8,7 +8,7 @@ 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-25_00-02-33/zip/netbeans-trunk-nightly-201605250002-src.zip"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-24_00-02-33/zip/netbeans-trunk-nightly-201606240002-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

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 922f652..3e62518 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-201605250002-src.zip 213747513 SHA256 89b56f89feefee274f4fe9ececf427d7e7e1e9e2b4b6c485dcc469cda7aade2b SHA512 0ebb5e3cf920937ec79953618fae6a8c299625f762c8d4684aa8e55b2c90d04b7694bb6d62919609124482313feb8a74782bcc20932361131d3540c628717441 WHIRLPOOL d60023772410f24346bd9a7002d0f99f905f138e0286d5fcfe4138694419af4ecf94d36a53ed2b2b33ad7e5b8e2b58f3db66ecd4e950cf5887cdcad540ff1d29
 DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
@@ -28,9 +27,9 @@ DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312
 DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
 DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62d58fda2a89ef87d7a1a3d4080b66aa8330fe9a2156d8ca9b69 SHA512 9d7c92a325761b3c448c0876858865ef49963abdd40099dc9285fe3164709229de780d33ef08379787d05f4701cbda407794e32a33966cb3ef30921f60639674 WHIRLPOOL 080ca294dd6ab79bb8df1f1a9caf54765eeab73b4e7ae38ecdb9eb25c889da44c5583b61296e8f68dbb8e0b0ce30810e580aee3008e1d50bd156ca96184caebd
 DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae933c49b42cea56fe36ace1ac114430312e20a9484532e4ffeb3 SHA512 7efc824e3e47f07202d3f687726a5432fbc391c22bc762a0810a95c454c9f1f515bd0b026f22a9a00e39027023e31e9d0fcb3bc95688f8e54ec1465267246bd6 WHIRLPOOL d58c979aacb6021322b5595de5ac1a99f441413aae39bc5a02c09dc353125e778a9c62f45b8e3c88db125f27010d901d6a763f875e86e5f1aae6cc571579c2df
+DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 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_p20160525.ebuild 3416 SHA256 7c55a64823b7b6732b690e2111d36499f19a34dddc8c083024735855c61c808a SHA512 4c825d11ffbcc635786b4afcfd2d534683164b41da4ae76e8cfa72faf8947c70b6a5b0587f7edc9e132e0e70f8290431e03cd34293ca8f0474163fcfef63497e WHIRLPOOL e37e19f820e33309163a5538e1a8a704530f885b396401d7a53b1d32e9f9fdd40abede3ae56b3d2a43563318eff16cef4750033b86e9e22b12664da326d4bc8a
 EBUILD netbeans-groovy-9999_p20160526.ebuild 3416 SHA256 be1ee8f717846b15a238066b76cc786a50cfff7753ee71e63b121dd10d44013a SHA512 ff10317dfb02d9ed8dbcfdc42ee97c5860a6122feaa5393078f4c5605fb386a85df7b18c4e163d9d2d87a53d8f6b55b5171ef05dc81307d804884c4879dd6f04 WHIRLPOOL d09c5c26b83863ec3608941b9fad7dd34f8d7f4b1dff1b34035d151033bf0a201aaab8b934aca4d5f679df78f6e95a879a26b1e164a9f05b6682c007de4aa11d
 EBUILD netbeans-groovy-9999_p20160527.ebuild 3416 SHA256 0f2f2e202c85daf713c98770e52be0d0c073ab7ee584c55c8d3222b46fc9f760 SHA512 3b2b0b87f80de8e749415853ef46ad84a5c5d9d72844f90eefa460868bb83565ed7f056dc8dea9e22ecb07852122995abe4f5c2cd38e9c2fae995d8f7c1f0598 WHIRLPOOL 6ccaaeb8e90376b932016b9cc84aa4e6fb5db26ff6430e3960ab0d452df4ca7f16c7a0ccb02d286771320045118ea5c85883843f4da93ed27a7f92ee6ab9e6f4
 EBUILD netbeans-groovy-9999_p20160528.ebuild 3416 SHA256 e665a7c01fc1a2d1b677d309eb7f8948f8e6f1f0e28ac44366a6611bd295348f SHA512 4fd0989c9b68477f8c47ce83d85f22ff56d0f407551b91aef0f43e1f6e2a435e3cde6fa7ae911d835874fd7457a1ee6a922d05f78529ebd29fff0d7b829c3dde WHIRLPOOL a52adde743894e8da2fa3a8cc810e69382f4807d61dd758a83e4d04771b0400b2720737437e5ca54fe9748dcb0fd5c043394db69f22bc21daff90fe99d203b20
@@ -53,4 +52,5 @@ EBUILD netbeans-groovy-9999_p20160618.ebuild 3416 SHA256 1520a2c04fb828d423e5314
 EBUILD netbeans-groovy-9999_p20160619.ebuild 3416 SHA256 b99f21addf291e4d4e197d424f37322f16ea656df1b39cb1d435a0f224d0d698 SHA512 a2a68139e97d1cb61f0996b63daae1d7ac74039c06d2a287085f66bcd73a16b0b0e745abce478b7f49f8b3146ec7dd9aca1cd44c17ad84e35770a0fb2dab6bc4 WHIRLPOOL 71519ff4e6e6fc14c760c753948294eaf201e5bf67918629cd51293367ede03f62f30dcf86386eefdf0ca8d29ae773656ee27d60f2b0b707dda111e745dcfdd4
 EBUILD netbeans-groovy-9999_p20160620.ebuild 3416 SHA256 e9d9d62161cbfd589ca3a3fd99e9f74cb513fa68ac10cb19b9de400b4cec3c2f SHA512 65db3d5e678caf69f6dccfaa42e2d4a492dacaf98952b71d708eb161af840b547171a13852fb6a5e7dab750db6bd0b1efad8576d00440c505c882ed5ef5a79b2 WHIRLPOOL 2b0b67c7592676890d8a0bdd3f736b28e92eea10b43d8d99215f7887673b7bd966d311d832decbee29c4cee93cf76c5f3f19f84d7c86cf69ee73003b602cfbee
 EBUILD netbeans-groovy-9999_p20160623.ebuild 3416 SHA256 f2661a9a996c6add6ee7f4994ce33f396d5d9b0876bb7b08528b79eee3d93a05 SHA512 6ea29ab03b267c46e9580367ac6d3a2398422401c355809e47d529e36e7d332efd28e512e1d01195b0d14b6852c2e37b5d0df3e3d9c6ec1a9ddb1ab8ca2fc5c3 WHIRLPOOL 9207b873136cccd177f91f6c998d8aae37b52d822985da9510d82c162065f17f432dbf5b398551ddf4362b60d00ba4235600c8e379121023f4354a25fd7f42e0
+EBUILD netbeans-groovy-9999_p20160624.ebuild 3416 SHA256 deecef74257451bf7b85d599730001873c34583f67187a3cad01f100eb188656 SHA512 cb9e2d5396a32927a1d98c7bef2a7e9379dfe14217bdc5b50aa88206947c447ff5c96b01130ada2541060e72078f85940cb3fa9c78dff86714a3145433481ae9 WHIRLPOOL eead86547dad2cf321cb729977e0ec08ae6d6379d22190420d71727a04784b169af39b9cf0ce867ee8ac4f21e89bb28d24f57e0460d93427ff92669f320f53f2
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160525.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160624.ebuild
similarity index 98%
rename from dev-java/netbeans-groovy/netbeans-groovy-9999_p20160525.ebuild
rename to dev-java/netbeans-groovy/netbeans-groovy-9999_p20160624.ebuild
index bd6c670..d94152c 100644
--- a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160525.ebuild
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160624.ebuild
@@ -8,7 +8,7 @@ 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-25_00-02-33/zip/netbeans-trunk-nightly-201605250002-src.zip"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-24_00-02-33/zip/netbeans-trunk-nightly-201606240002-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"

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 931fc37..01d74b1 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-201605250002-src.zip 213747513 SHA256 89b56f89feefee274f4fe9ececf427d7e7e1e9e2b4b6c485dcc469cda7aade2b SHA512 0ebb5e3cf920937ec79953618fae6a8c299625f762c8d4684aa8e55b2c90d04b7694bb6d62919609124482313feb8a74782bcc20932361131d3540c628717441 WHIRLPOOL d60023772410f24346bd9a7002d0f99f905f138e0286d5fcfe4138694419af4ecf94d36a53ed2b2b33ad7e5b8e2b58f3db66ecd4e950cf5887cdcad540ff1d29
 DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
@@ -31,9 +30,9 @@ DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312
 DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
 DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62d58fda2a89ef87d7a1a3d4080b66aa8330fe9a2156d8ca9b69 SHA512 9d7c92a325761b3c448c0876858865ef49963abdd40099dc9285fe3164709229de780d33ef08379787d05f4701cbda407794e32a33966cb3ef30921f60639674 WHIRLPOOL 080ca294dd6ab79bb8df1f1a9caf54765eeab73b4e7ae38ecdb9eb25c889da44c5583b61296e8f68dbb8e0b0ce30810e580aee3008e1d50bd156ca96184caebd
 DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae933c49b42cea56fe36ace1ac114430312e20a9484532e4ffeb3 SHA512 7efc824e3e47f07202d3f687726a5432fbc391c22bc762a0810a95c454c9f1f515bd0b026f22a9a00e39027023e31e9d0fcb3bc95688f8e54ec1465267246bd6 WHIRLPOOL d58c979aacb6021322b5595de5ac1a99f441413aae39bc5a02c09dc353125e778a9c62f45b8e3c88db125f27010d901d6a763f875e86e5f1aae6cc571579c2df
+DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 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_p20160525.ebuild 4126 SHA256 251213b08a34921e2c895310959b908823533e1d77129e074e66b2bc90e27e5e SHA512 e3d77f4c58614178b4825f3449b3f86bb0c5c5b6e5e12aaa57b338b858ed43649a07eb8d563766479b6e4a48c5da70fcad957f970156600d301a53d0842fc0f5 WHIRLPOOL fd50071d0380865556e1ddc22fbf633496d8017424e870d1ca130fbf155574dd8aef35cad8f34f6d488a0a115b7eb02911144d66dbf88dd7365b048d54e42ea2
 EBUILD netbeans-harness-9999_p20160526.ebuild 4126 SHA256 426d851e07f7b4aecb4dbf0dd7d6bb5fcede49dd6adc57323f5f9dce73dfc458 SHA512 c5196c5c0ce120cbf0f99f5d7086970f2985dd020e989c0818dfb39311a268970a56631bd6989a7ddce6655194417f60888532775cd3597f2de54ced3fb98c5c WHIRLPOOL f0d745155325d6fc65f9953e097b9bbb9e65c4972621c5761b29c603acc98362a55faebb33d05b6daa0791cafca99460e16a57a9cacbe71acdeb64858d29bbd0
 EBUILD netbeans-harness-9999_p20160527.ebuild 4126 SHA256 6ea77d6402426bfd58f582615164c3fd8a36fb4a79e10843fb8fe345ab6c8b36 SHA512 85d2523f2ab58847cc39933ebd7e17c66a1c2c6e9f4b7a150b9fa9ba354e64b31497e9218aaa7b121b267ba0d44cdca8dff3550ceceff269913389bb85dce533 WHIRLPOOL b864cea4fb36f50f228120b337c704128b244ae335caa8657c4437a3e677eb16f883ea4f0e28a9dcc67e3e64c687506de8ffd8b3a08cdfae4ddff0799e62a79a
 EBUILD netbeans-harness-9999_p20160528.ebuild 4126 SHA256 99f5fa177880e85be0724d2aae9fe5e940fed4532d5c59018fa01be4b98c5ab1 SHA512 09c011633e1a96636f11aa64033fcf082952684626560ff48817075f4613af2c42674d7eac3ffea8e4f9f525a2696e60b10c523541f303e7389dd3c566efd4e3 WHIRLPOOL 83beb42e42ef2b659e9f6945eb0519d042bb6d8345f762c667984ddf0ee7d65ebe10b364b134f4d852f5882331e2af8fd7744a359e672d34dcb53916cf6b6293
@@ -56,4 +55,5 @@ EBUILD netbeans-harness-9999_p20160618.ebuild 4126 SHA256 78c646271692572f5f2ee7
 EBUILD netbeans-harness-9999_p20160619.ebuild 4126 SHA256 fa85ceff556cf477ff9e03abaa0efa3914a4999fed15849b2566d2049091b68d SHA512 acd36f4e9d684e03f1fe4fd36a054dadd58d75e209a619d3fcbc422f4029a8558d48a67a73af1748010e55d8e9ebca7a74b57b3f42e3008ed3279acd20c1e5af WHIRLPOOL 7f680cd3a1113af287495b71fcb09099476d787527b0ec73a8e40b823c520c6dfb5151442b93a6fcf143b8b07df7e03c0baa86cfdbcf012658f7821c43331793
 EBUILD netbeans-harness-9999_p20160620.ebuild 4126 SHA256 b780bdd9c4558c4822f7a815f3a4b1ffc2e9ac0a08bd2fa82eec870b1717f7ce SHA512 f0e5d2e950bcfbf15ca373da493210ae0e28ec7f42ada50e9afc0907ad5376e07b4047beaee823abb226740dab1edfdabe146b891688876edaa9801943d372f9 WHIRLPOOL 21acef74d7cd58deeeaf783f50f50669ca532be9b9e7214a63ada8b1ad5024e24cbe90930d15aab139c11ed99a48be1e52ad33404864461f4ea23b2e1f6d7242
 EBUILD netbeans-harness-9999_p20160623.ebuild 4126 SHA256 a47d24f53df9c45778058bbd99f4b8a7269eb7d03767d6fa7c529ac7db1a921e SHA512 122b7e7258deee689e685a48aa0b0938f8949c2f060207bf455415ed60e6b9ba5d1062318d69959de14b21f3a74df20ff4e4220b068cfab96aa8e2f504e8ece1 WHIRLPOOL 3313d732896d6104db3cbc3b1e7562bedf36f09f7c228b41faa48ba32fbe340566d8440e339bd99c9ea2bf7e8b9115a2ed203bdf57a29a3f231b5fb13eb88b6f
+EBUILD netbeans-harness-9999_p20160624.ebuild 4126 SHA256 d889c88b917f55171baede682d0a04f48dfa12a20b8d2a18ee14a62d9482520c SHA512 43f1add15f6d7988aca396e2e086c38344d1c1e5f22f03702f9b93eafc9235f9c3cbefba9c9f85326807b8131485f689e3403c6407a46dfeb68c906f1f934ca9 WHIRLPOOL ddcdebbe640f1f35413f42514e9e198b32c81c5f4e40e7780928fcb917f12580bea9173d5e3660b2eb18f1a35468aedddcd3df22bc08346de49eca34ca371fed
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160525.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160624.ebuild
similarity index 98%
rename from dev-java/netbeans-harness/netbeans-harness-9999_p20160525.ebuild
rename to dev-java/netbeans-harness/netbeans-harness-9999_p20160624.ebuild
index 5fce9f2..ccbfc1a 100644
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20160525.ebuild
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20160624.ebuild
@@ -8,7 +8,7 @@ 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-25_00-02-33/zip/netbeans-trunk-nightly-201605250002-src.zip"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-24_00-02-33/zip/netbeans-trunk-nightly-201606240002-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

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index a25d362..39c17f5 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -143,7 +143,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201605250002-src.zip 213747513 SHA256 89b56f89feefee274f4fe9ececf427d7e7e1e9e2b4b6c485dcc469cda7aade2b SHA512 0ebb5e3cf920937ec79953618fae6a8c299625f762c8d4684aa8e55b2c90d04b7694bb6d62919609124482313feb8a74782bcc20932361131d3540c628717441 WHIRLPOOL d60023772410f24346bd9a7002d0f99f905f138e0286d5fcfe4138694419af4ecf94d36a53ed2b2b33ad7e5b8e2b58f3db66ecd4e950cf5887cdcad540ff1d29
 DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
@@ -166,9 +165,9 @@ DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312
 DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
 DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62d58fda2a89ef87d7a1a3d4080b66aa8330fe9a2156d8ca9b69 SHA512 9d7c92a325761b3c448c0876858865ef49963abdd40099dc9285fe3164709229de780d33ef08379787d05f4701cbda407794e32a33966cb3ef30921f60639674 WHIRLPOOL 080ca294dd6ab79bb8df1f1a9caf54765eeab73b4e7ae38ecdb9eb25c889da44c5583b61296e8f68dbb8e0b0ce30810e580aee3008e1d50bd156ca96184caebd
 DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae933c49b42cea56fe36ace1ac114430312e20a9484532e4ffeb3 SHA512 7efc824e3e47f07202d3f687726a5432fbc391c22bc762a0810a95c454c9f1f515bd0b026f22a9a00e39027023e31e9d0fcb3bc95688f8e54ec1465267246bd6 WHIRLPOOL d58c979aacb6021322b5595de5ac1a99f441413aae39bc5a02c09dc353125e778a9c62f45b8e3c88db125f27010d901d6a763f875e86e5f1aae6cc571579c2df
+DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 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_p20160525.ebuild 30761 SHA256 af3ed95df1e451fb3dc429c86ba3611f639f1502d97f8f9a43179ae8feaf2f48 SHA512 e446094a92675f83991f31b6333e02ea1e27ab194663007b41be955c02e26cfcd00d91a2902a3661cc5d50b125bf9e588e310ae9929d61078cc4305db8e85729 WHIRLPOOL 8e1bb13e5217100789322c3a37f7a4944396be35fde71de4349956e25fdeb9187035eb9e6cb8e60b34095b824a04b0b241dc1d06069430d3f0024c7d8dee0335
 EBUILD netbeans-ide-9999_p20160526.ebuild 30761 SHA256 aa8fd88f3ff99839f86621747c14468edb5b7a17fd2674d7f818e51c22e66ab0 SHA512 a6005dd66cc846cb911435e51b630ce9a2373c61bd5ea086fad16ee0240929707ec2385626c6a970fd2dbac0dd02eb6cff7297ac0b616a93544f21d527324183 WHIRLPOOL b54d768432f1d48822383bd03fa00143ac588c1e660bf3ac2dfa79068bf9c910e53f161302048c2dd966d1dfe2a34e7f59d8aede8930b1345c947b57aac242d8
 EBUILD netbeans-ide-9999_p20160527.ebuild 30761 SHA256 30a7c01e43ea6727c41f308b99f970f1746c1c88d42e3d67357f725305855222 SHA512 304c7aa29e132ed0a7d6dcc5e96ad57c7b6cf22807f4580bb4505a86cf2583dc4a8b6930ab0678462707df81bd97076408aa0ee7d0edbd923aed7116aa631af7 WHIRLPOOL 46e57e5010ce719a538fbfdef4e090fc9d961923bce888e2c7d186bb4f281a607fd66991d0536f3760259806bc5691590fb76742402fa54db48121af7efb2f58
 EBUILD netbeans-ide-9999_p20160528.ebuild 30761 SHA256 f96ccfd9ca8d15d671c2262f1e1b88b18f650567c313750cea011fcd6886a7da SHA512 1f19648d50f20876ae1ca79da4e79d87fe876d87cd113ac4a876ef77e0c4503e3bcfe1e233e08a9edbad5a4f97f980c789b087666137c23874d22666fa17eeff WHIRLPOOL a46f961a1d7d19b42834bf67acb49247a7efa7877d21a832224dde769aff62c7f4505f531ac24fcd516b06a1f9e7c9c527b111d7d644fc85dc9fc94595034b5f
@@ -191,4 +190,5 @@ EBUILD netbeans-ide-9999_p20160618.ebuild 29867 SHA256 0ee16b306ed43c6046e732889
 EBUILD netbeans-ide-9999_p20160619.ebuild 29867 SHA256 72ddc326ea660a16eab2730a23e574c7299e7c950400b03d88b67f9112a80fae SHA512 28b30a234da4b930cd64b3fe7c94cdad5ba5f0c60aef4b4824fd13b2acf67b96473502e619b191ad1f7860b4249efe85518f19db0a19e06c6d526f227ea031db WHIRLPOOL e08860541343c964a569b0b4a53f657b476cbb693ddf6ad34f74878f500fbfae58cabc626c4b1eb389c2fee7d08eb6c0cd19bcaed7ca2fa48ce2cba1550bcae2
 EBUILD netbeans-ide-9999_p20160620.ebuild 29867 SHA256 3b66da71001f5525582f0d86751a8c7cce67f2749d495a171f26244ca77f74d9 SHA512 f0a62c77c8200579bb3ca8c9b05633233be376186cc306a7a7eddfc133470d49bee97a8d9a12670d3cbff3c5cf29387da6fcdfe2c370645472e82a39dd7dda4b WHIRLPOOL fcb971c153644e5645a3e182136d7b1052107d690b7f7ef49142ebe15ee43feb04dfbee62f5d4b2d9b55eaba8644bb01492300605909fce77b8f4e5a1ed8ef36
 EBUILD netbeans-ide-9999_p20160623.ebuild 29867 SHA256 41723791ba5a1468af48e1afa45b47c15908fa4e65f06de424e3ec0b2a4e8663 SHA512 16b676d92078fd69152938c358ad1db74c5522985dd2bb3e888bf217427abf3c24a9ac0f71021f906fd1357764d556bbe923a0253cf1e944417d23e3e4011bfc WHIRLPOOL cfa44cfa7e436158a0fa7ce85761eaf5e5e43537b9e5a37dd942ae54cb36ba6e958523818ef5a69e8895df7202d9d5772df63966e0c7056fc7e200e2d77be76f
+EBUILD netbeans-ide-9999_p20160624.ebuild 29867 SHA256 e91e8649490f38bcf35279743bde5d435190a903f5b690984e34ca80d2fc787e SHA512 2b2acc69cd5fb2a7c790d910f445d859b5d6c52005f1d496cb730554da192cf8c68cee9b1b34c8c50dbb24a24e7b93420e334d0b56bde9c324521b9470a90dd1 WHIRLPOOL f4ea80141b6ed53f5d90f2ddc7df81c07c431f31c2eccbcb24116356e1b6ccbb6697ebc05ff313499b0b906754237f0a28f2b44597326ee03f9a69d7262cb6f9
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160525.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160624.ebuild
similarity index 95%
rename from dev-java/netbeans-ide/netbeans-ide-9999_p20160525.ebuild
rename to dev-java/netbeans-ide/netbeans-ide-9999_p20160624.ebuild
index 9f57967..2830c19 100644
--- a/dev-java/netbeans-ide/netbeans-ide-9999_p20160525.ebuild
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20160624.ebuild
@@ -8,11 +8,10 @@ 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-25_00-02-33/zip/netbeans-trunk-nightly-201605250002-src.zip"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-24_00-02-33/zip/netbeans-trunk-nightly-201606240002-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
@@ -38,16 +37,12 @@ SRC_URI="${SOURCE_URL}
 	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
@@ -82,7 +77,7 @@ SRC_URI="${SOURCE_URL}
 	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/15ACB06E2E3A70FC188782BA51369CA81ACFE860-validator.jar
 	http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar
 	http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar
 	http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar
@@ -94,6 +89,7 @@ S="${WORKDIR}"
 
 CDEPEND="~dev-java/netbeans-harness-${PV}
 	~dev-java/netbeans-platform-${PV}
+	dev-java/antlr:4
 	dev-java/commons-compress:0
 	dev-java/commons-httpclient:3
 	dev-java/commons-logging:0
@@ -155,7 +151,6 @@ src_unpack() {
 
 	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
@@ -181,16 +176,12 @@ src_unpack() {
 	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
@@ -227,7 +218,7 @@ src_unpack() {
 	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}"/15ACB06E2E3A70FC188782BA51369CA81ACFE860-validator.jar html.validation/external/validator.jar || die
 	ln -s "${DISTDIR}"/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar extexecution.process/external/winp-1.14-patched.jar || die
 	ln -s "${DISTDIR}"/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar o.apache.xmlrpc/external/xmlrpc-client-3.0.jar || die
 	ln -s "${DISTDIR}"/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar o.apache.xmlrpc/external/xmlrpc-common-3.0.jar || die
@@ -255,23 +246,6 @@ src_prepare() {
 	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
@@ -280,9 +254,12 @@ src_prepare() {
 	java-pkg_jar-from --into html.validation/external iso-relax iso-relax.jar isorelax.jar
 	java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
 	java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.antlr4.runtime/external antlr-4 antlr-runtime.jar antlr-runtime-4.5.3.jar
 	java-pkg_jar-from --into libs.commons_compress/external commons-compress commons-compress.jar commons-compress-1.8.1.jar
 	# java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.19.jar
 	java-pkg_jar-from --build-only --into libs.jna/external jna jna.jar jna-4.2.2.jar
+	java-pkg_jar-from --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
 	java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
 	java-pkg_jar-from --into libs.lucene/external lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
 	java-pkg_jar-from --into libs.smack/external smack-2.2 smack.jar smack.jar
@@ -297,6 +274,20 @@ src_prepare() {
 	java-pkg_jar-from --into xml.jaxb.api/external sun-jaf activation.jar activation.jar
 	java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_1.0_api.jar
 
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	popd >/dev/null || die
+
 	java-pkg-2_src_prepare
 }
 
@@ -350,6 +341,7 @@ src_install() {
 
 	local instdir="${D}"/${INSTALL_DIR}/modules/ext
 	pushd "${instdir}" >/dev/null || die
+	rm antlr-runtime-4.5.3.jar && java-pkg_jar-from --into "${instdir}" antlr-4 antlr-runtime.jar antlr-runtime-4.5.3.jar
 	rm commons-compress-1.8.1.jar && java-pkg_jar-from --into "${instdir}" commons-compress commons-compress.jar commons-compress-1.8.1.jar
 	# rm freemarker-2.3.19.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.19.jar || die
 	rm icu4j-4_4_2.jar && java-pkg_jar-from --into "${instdir}" icu4j-55 icu4j.jar icu4j-4_4_2.jar

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 63a5a88..deb19e1 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -35,7 +35,6 @@ DIST CAA3DA01AA82FCD617CD3247DFA82D619273B450-nb-javac-impl.jar 3036268 SHA256 2
 DIST CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar 8632395 SHA256 67d175c1858005308ae9a02ff85c0bc7efc9a2a3c058a6838d51769f417f5247 SHA512 56559a40532fa42775a92d82296a86033a587116870d8201dd42f07e29990a28de5b1547e3fb59ddedadfe6b4fc3dd109b108cc65cf7b253ac1b0fbb9cc03fcc WHIRLPOOL fc40cf8d49919d3ef38f6c3473736f56ee5ac1d4db848681536c3bd3532cb112e9490e76c1ef7b15d88b2ab87ed54e58dbf1227c173a3256194b5887d37f8a84
 DIST D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip 84706 SHA256 214c8f6da105d8bcc4583f3f160d94fa4a8ec266c4fea4b5e12929a6386fec3a SHA512 5dd4270d3514f448f2d1533b099dbe64aab97c21e89066c467a3332d354f0675e27f6ed5ca1b23c01a2222c8e1ad261c374ae6549b9323951763b7a542a386f5 WHIRLPOOL 88a6357f335bd50d3cf3608cee0228b0c99b4b20a962e2dcd68b83c3fdd49b113618342f87cb8b758ad18612efdff0128876ae9018eeba5b682cd8267f97f8fb
 DIST D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar 120575 SHA256 51945be4ed200cfc439d2db986bdcc184ecdfec5d0880a8c2854f88dcf20df0b SHA512 788bb5e115a77e12e9329db70e0b6edca185ebd5e30a8178f451da3a8492acba8c89848873acff224868772f464f17bd9eccc9130638d49c95593edd697d3dd2 WHIRLPOOL 9026c59ae69df71d205278a2cd7aeae24c72d74f1356bbf7d3dbe2fcceddb02948a94a87d4f7e6d710a5cc4e642d0de38d16690fff830d10b8372bcbecdd86b5
-DIST E3764E0AB4F9F9ED16AEB6A68B8E3F2442DDCCB6-nb-javac-impl.jar 3035390 SHA256 b1cdf8da594fb9969d522519bc8674d64cbd43b2e84ad3fa21f294b918cb3030 SHA512 eb74ffdcbd992a691f743ab2fe740618e41390a66f8e405d2fc1e8cb6fb483c36b8f88ff97be6240cc68cc40e8b8960e49225b628125058952ac2f09543a58d3 WHIRLPOOL cf494f2918fd95500760adc7b529db675c730179de6d821b1410e5d5904a1708eb5328ca1873101dd01800469bdf086fb9084faba864055ab8175f737f84ec19
 DIST E5579EF3B0C1EF2F43562DD0C3B32F8E1F603B49-nb-javac-api.jar 173813 SHA256 39fa3597e77942f589e299942e4d5f25ae04f699edfe6bd9135d5f425845649b SHA512 ca940f40881ff5a908fafc80f6aa90866d58c54189bfc073a2559ee76496f3127df920abda5d9c7aacf9a54cda693884127c1e3f696d4fc8367351313c900cc5 WHIRLPOOL fae1db760f988f4e2886d8a2f9b2384a194bf8b579825971466a21ec4fa4971a6e4e56b477ba0b61e2e034777af6c49c66d4425734cd6f9db4aca15041b384f6
 DIST E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar 227553 SHA256 2884a6c80cb647199c9edf9d00c5b709502aa63092279b93b9a50ba1578bfc32 SHA512 5ff83f5925fa4250ecb46e08f7f064ccf5d637bff14edadf16abbcd0d6a6203cedd07a64cc5718656249d18b17a1016f7152094da3f8ed13fdbee9afbdfcd926 WHIRLPOOL d80fbd65b3aefa48361b4bafaf179e8076caf97cc7b2a4b5f7437a14f30ea568aa86b699fb2dcc1fb6a4042b131702c87e37d8cf04591f8669414b89d0acc185
 DIST F232BB729E73E713811833986C86EF096B99A4A7-nb-javac-impl.jar 3035984 SHA256 65422dac671658173bbe73ecdecb15074e5df314718f0a98318e7b0fdafa65ef SHA512 3f49ca786a33acc1a4578c870debc57afa31323946e45d05ea0d770f270d9fd20e287dd20b9c34ea91347554ffd510e9fc9d367c339883b28e3847501cb54276 WHIRLPOOL e80c7da1acf0fb374c9dc52354043b25db7994aac3459a67758e7133d6cc1891c48d98f8b150e5ae851a8ea4e114430f73feb4d3fcb814f0808c8ec5b74e79df
@@ -46,7 +45,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-201605250002-src.zip 213747513 SHA256 89b56f89feefee274f4fe9ececf427d7e7e1e9e2b4b6c485dcc469cda7aade2b SHA512 0ebb5e3cf920937ec79953618fae6a8c299625f762c8d4684aa8e55b2c90d04b7694bb6d62919609124482313feb8a74782bcc20932361131d3540c628717441 WHIRLPOOL d60023772410f24346bd9a7002d0f99f905f138e0286d5fcfe4138694419af4ecf94d36a53ed2b2b33ad7e5b8e2b58f3db66ecd4e950cf5887cdcad540ff1d29
 DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
@@ -69,9 +67,9 @@ DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312
 DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
 DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62d58fda2a89ef87d7a1a3d4080b66aa8330fe9a2156d8ca9b69 SHA512 9d7c92a325761b3c448c0876858865ef49963abdd40099dc9285fe3164709229de780d33ef08379787d05f4701cbda407794e32a33966cb3ef30921f60639674 WHIRLPOOL 080ca294dd6ab79bb8df1f1a9caf54765eeab73b4e7ae38ecdb9eb25c889da44c5583b61296e8f68dbb8e0b0ce30810e580aee3008e1d50bd156ca96184caebd
 DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae933c49b42cea56fe36ace1ac114430312e20a9484532e4ffeb3 SHA512 7efc824e3e47f07202d3f687726a5432fbc391c22bc762a0810a95c454c9f1f515bd0b026f22a9a00e39027023e31e9d0fcb3bc95688f8e54ec1465267246bd6 WHIRLPOOL d58c979aacb6021322b5595de5ac1a99f441413aae39bc5a02c09dc353125e778a9c62f45b8e3c88db125f27010d901d6a763f875e86e5f1aae6cc571579c2df
+DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 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_p20160525.ebuild 15656 SHA256 75a7cf5be55b5195890921652a6506ef65a8e36dd1df427238c7c268ed03d8fe SHA512 0dcf7ce21f7f6a93c4d9a49cddea76e4004b59b9de19fb1f98647bac572925782826a195c620c780451d62aa77eb54ec68c1840e26954bbf7d9dba282ec99272 WHIRLPOOL 9dfcae738d45309efc623ea9e317d660a5edb20f2ea714fd76630d3ad6446431cf07e477f3b1a97013849da4d230c3c92c763b684f48585a823c5e6932a819fa
 EBUILD netbeans-java-9999_p20160526.ebuild 15656 SHA256 7ab21a594c4dbfb50403217ae8ae32613bdaad67d92035bf725601a23836b53f SHA512 3a2ea79df5dc4e481324fe22cb93bdd59189f22fcf92b333aaf45e975bee73192a732c2901eab2822d2e5bb4f7f0f02f5101b554734317b1b2bf96021f57f0a4 WHIRLPOOL e4f0aef8a47f2065c9256058588603975c2612bb3a3e20e990dab86b467ce7d4b7102091904478a05bed8e5d9bc5c4f75f332807930f4a6bcfbc9d969ed27daa
 EBUILD netbeans-java-9999_p20160527.ebuild 15656 SHA256 82f8a59c3f4d2173ae303f5f9088cfe156c31a9856e0ae1db15531ea9c45b975 SHA512 d6bff5d1324e912f7ad385cf8f2ffb1922ce9e498924da16b25f438f1d3ece1d83558e42839bdec39bc744e1d3ad8e8c6b1698a6061c331ffeda3adc3a1cc798 WHIRLPOOL ef578a7a426cedbe3cf42bc31aca392f280bf193df244e6a86f71f28135cec15e0827d3cc59b9accdf08806d83b78e5db9b058f806e05259e70b458198af08f4
 EBUILD netbeans-java-9999_p20160528.ebuild 15656 SHA256 6dd45030be2a0858ed1651144cf484f6cc5e4d1dacc06fa6005d55079b8290bd SHA512 58ebbe7985852cd6613875ece3322fcc0bf3dfc6993cdf9009d9fdcd51e35b21b53071b448883d78bf8650f9549e11144f6dffb5c24bc5ca9c2055b4cef208a9 WHIRLPOOL a7e93b5b94f6551521040bd10bc90dbca666eb83594db9716d2d6d0c80d8d02446bde557844691c8d052a75ea8445410eeddac218c698336bf11473ada7b369f
@@ -94,4 +92,5 @@ EBUILD netbeans-java-9999_p20160618.ebuild 15656 SHA256 13adf4d265715f0bb5b5c5e7
 EBUILD netbeans-java-9999_p20160619.ebuild 15656 SHA256 3bd997ea34c3a2730eec6737f828a40937d2bb1324f03c04b7f42f5d50c02da7 SHA512 25e233c71bbc75697c71ce5fa0e86e77af2e76a1a5a4ce8602d20d6833d54b72882d38958325de4e8d31b9a5a0622eb2a1b25fac543d20f4c8f4c1673af55815 WHIRLPOOL 34b056b95c30d25525e2e83d22df79a006bfb47e4ba706c80d06ec0375c8b521dd7b265a01c0def667453ce523254046ca54c2a6ba7548f97de75167813ff8f2
 EBUILD netbeans-java-9999_p20160620.ebuild 15656 SHA256 0edb8c9338d57eacca6858cb23266dd8187eef09230b7c8081db95d1b91ac438 SHA512 159296a9bcc5c43113dcb63de8ea5ecddd3506deaaaadf056dc646ea7581b6094553cd4d3af245985e3858e741612366cd2457b23ac60aa0fc70923593f3b8a2 WHIRLPOOL ef5308676c781c3f86ed41244b28970ec073c90ca433101c3cfbf3957fc72c29a2e5ee628cc84b12fb62b0d366f26b144e7bc3405d47a5dc3e1ecef1bebd53c2
 EBUILD netbeans-java-9999_p20160623.ebuild 15656 SHA256 8a970675e48f73062c3608d3988929798fc4a13e265850774cc497d7986965e8 SHA512 1b5c555e80fb19bd739cf42e2032e6766c5fd018d462b002b18de3f801e180785e9fce39f59a00009684f94a0f56dc7ad10f56420cce6c9da3e727ddb4b23729 WHIRLPOOL 17eaddd58cb650ab0aa39816f3ad3588e8119606c095644771743c0c54ea75fd5377750a8083cf280c306c046a0749bdb9c30481aca7e1b93e8658c6603b7371
+EBUILD netbeans-java-9999_p20160624.ebuild 15656 SHA256 d5cde83be38240ff5bd5c46b8de5e9e895f582c1c62b5171c2d135f23afbc888 SHA512 15656d3ec5065e4c23a4aaec9bfcf0c2133f3d33423cdfb17fd0bc49e460ed43be503a9793d50cc6631bd408f16235d657fef23654f339c92f8f5e8b0fae86c8 WHIRLPOOL 49b74d9f36dc2071510b3201987a4e5d552eed2b8a1efa72294c9ac84e4f85715aabe1f79a01b5a1bed36e3d246b7164a3994aac0ce8500249bd276577442896
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160525.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160624.ebuild
similarity index 98%
rename from dev-java/netbeans-java/netbeans-java-9999_p20160525.ebuild
rename to dev-java/netbeans-java/netbeans-java-9999_p20160624.ebuild
index b2a11b3..b648057 100644
--- a/dev-java/netbeans-java/netbeans-java-9999_p20160525.ebuild
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20160624.ebuild
@@ -10,7 +10,7 @@ inherit eutils java-pkg-2 java-ant-2
 DESCRIPTION="Netbeans Java Cluster"
 HOMEPAGE="http://netbeans.org/projects/java"
 SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-05-25_00-02-33/zip/netbeans-trunk-nightly-201605250002-src.zip"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-24_00-02-33/zip/netbeans-trunk-nightly-201606240002-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
@@ -31,7 +31,7 @@ SRC_URI="${SOURCE_URL}
 	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/47E8B11BBA8D4796ADC351499A07197ADF03383B-nb-javac-impl.jar
 	http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
 	http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar
 	http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip
@@ -144,7 +144,7 @@ src_unpack() {
 	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}"/47E8B11BBA8D4796ADC351499A07197ADF03383B-nb-javac-impl.jar libs.javacimpl/external/nb-javac-impl.jar || die
 	ln -s "${DISTDIR}"/CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.jar maven/external/netbeans-cos.jar || die
 	ln -s "${DISTDIR}"/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar || die
 	ln -s "${DISTDIR}"/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselinkmodelgen/external/org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar || die

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index f29fb8f..2adb597 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-201605250002-src.zip 213747513 SHA256 89b56f89feefee274f4fe9ececf427d7e7e1e9e2b4b6c485dcc469cda7aade2b SHA512 0ebb5e3cf920937ec79953618fae6a8c299625f762c8d4684aa8e55b2c90d04b7694bb6d62919609124482313feb8a74782bcc20932361131d3540c628717441 WHIRLPOOL d60023772410f24346bd9a7002d0f99f905f138e0286d5fcfe4138694419af4ecf94d36a53ed2b2b33ad7e5b8e2b58f3db66ecd4e950cf5887cdcad540ff1d29
 DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
@@ -29,9 +28,9 @@ DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312
 DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
 DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62d58fda2a89ef87d7a1a3d4080b66aa8330fe9a2156d8ca9b69 SHA512 9d7c92a325761b3c448c0876858865ef49963abdd40099dc9285fe3164709229de780d33ef08379787d05f4701cbda407794e32a33966cb3ef30921f60639674 WHIRLPOOL 080ca294dd6ab79bb8df1f1a9caf54765eeab73b4e7ae38ecdb9eb25c889da44c5583b61296e8f68dbb8e0b0ce30810e580aee3008e1d50bd156ca96184caebd
 DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae933c49b42cea56fe36ace1ac114430312e20a9484532e4ffeb3 SHA512 7efc824e3e47f07202d3f687726a5432fbc391c22bc762a0810a95c454c9f1f515bd0b026f22a9a00e39027023e31e9d0fcb3bc95688f8e54ec1465267246bd6 WHIRLPOOL d58c979aacb6021322b5595de5ac1a99f441413aae39bc5a02c09dc353125e778a9c62f45b8e3c88db125f27010d901d6a763f875e86e5f1aae6cc571579c2df
+DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 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_p20160525.ebuild 4971 SHA256 7bf29ca24938c787b33f303c75dcc02888da0eeacbe272a0c868e7faade51c84 SHA512 ca2d909d0d54440703f119191d532c945cbcc9f9609429408795ab84016c59925a66fd9f923851522950ac7079bf9d44c6278aa3d652cedfe31a87059f5cf71d WHIRLPOOL 800a9b5c31bc1bc5cb1dc013243ca075b4e0caf5a257a3623e2dccc82a9f454659f96a2ffbe5125235a9b6ecfc791f57276b582eb0941fadf8ccc5de33d0df24
 EBUILD netbeans-javacard-9999_p20160526.ebuild 4971 SHA256 78ce43ca036f26420537eb05b34c6c0079a8d16899c6f4a2c95461ab9ec86153 SHA512 e1190b0a1fe0e1f91a71fd9bcd9ebaf1e66a87d5866b0c08c883fb37eb98bb267610289068bf14b0625385fda1c568851901e143406b1b47050718a09c45d56f WHIRLPOOL 48a011eb8157d25349659c952d51ae4178851345e0999c2c3cc9ffbd0879008355874c80eecd4923f0c7108a3fd3acf13a19b81486c6e5c3f00d6227d0d82ed8
 EBUILD netbeans-javacard-9999_p20160527.ebuild 4971 SHA256 53b3a9fa460a828eb7500f8be6ffe71a692ed829090b81e866ec5c2184dc3fd2 SHA512 bad4d747cd0fdbecd7ad142690e4b5ca7274fa7eddf95189ab4553bb80c2c16202d98b9a35e4878a96d4bd462b76ffaf5c4cee9fe3522191c624d1fb4b223c8f WHIRLPOOL 9a7ab13755a4a3f3df80c530a04980c0f1c504a0bbdd51fcb80600e888a2b35fa4b0b26cf4a19d77357681d226379ca92016d9cb3f121220f7f4619b614be7a6
 EBUILD netbeans-javacard-9999_p20160528.ebuild 4971 SHA256 540550bc4c687bd48bb77fe687b97f392fc0204e30ea9939a9d2d4537ab35999 SHA512 bd132115990a1687bab73ce04621d52c4625ffc9e00075ace4efab6e565f80b76bf1d8781a2b0f4e861bef04b7bfb24d5eed6c0c782c4d9e1567cbc39be7fd14 WHIRLPOOL 2340d8fcb95fc5d562b9717cdded960de68b770f44370a00d7af2cc7af98f16220b3a72711d76c66516613c5dfbed9fead249d560852383dc29d6c8b85a20bfe
@@ -54,4 +53,5 @@ EBUILD netbeans-javacard-9999_p20160618.ebuild 4971 SHA256 6164ef9dca6e4ed2cb6ea
 EBUILD netbeans-javacard-9999_p20160619.ebuild 4971 SHA256 da2b8a275b12e9f6f7918b161ba774af404273911eb844373f57856d81a410a5 SHA512 02291d90b6dc7666da421ff44aefb37d536a11113b3a631ad0cd16c3b0f210804240a4d540e823d5f78ce5d2b952557db92f1aa119f06cd20b48a44d8ace88ea WHIRLPOOL 3deb5220853462938a593d9cd8819e3c7de12b5e3ccbb2d4340ae691218f1c2512d8854c3bb70d506f65fb5ba1da24b47acd31b0b587363f820d75198b1197d8
 EBUILD netbeans-javacard-9999_p20160620.ebuild 4971 SHA256 b15d354298a2102fec7660874828f8dc01540e6d92a1c8104eeddef7a6baf638 SHA512 d06898bbc2d416b5d645a830f6447dd40f20b079d74fc37149c3c4557436f42a442b69add7c56dbdb4c0d326fa65befb4cba5c1a810354959118009a5b49353a WHIRLPOOL c240bfbe1ba3b5d53b70d860f01f80e37097cef0e800badbe46fb4579d453453602428220ed677893efec671b3089dc30e308a5cc843b700c2e366665dfdb7dd
 EBUILD netbeans-javacard-9999_p20160623.ebuild 4971 SHA256 1d53284fe8e704e7bd355dc98a1630b2877ff251bc30e944646a668d9036271a SHA512 71524eea6ba281b58e95fe57ab758d96e2beb424a64f1b33b4f94157719a25b9f934033f17cc6bcb3f5d1dc8665dcd34ab61a80389e7578b180345f853fe3686 WHIRLPOOL 2ef3f1902133b16b76266de774049f6424cdb7f31a35656a1df4f91fbcc8af86c53a4ea32bfed153ad302e43d750387ab38812c76fb58979f5f900279727d54c
+EBUILD netbeans-javacard-9999_p20160624.ebuild 4971 SHA256 0eac450e404c30c7379e4829c42424b54a84352bc46322cf2bcf62636b6ecfa0 SHA512 b2aefb77c0c763ca33127dd128f8a145d4d8632ff79fe159440f318e1ac14e0b1790832abcabc7dfb7d928bd7e9d6f72f386f3c5e4e89e41ef043e4fbfd0ed3d WHIRLPOOL 21d02d1119d9aa3dde8fab77730a2fc73e0f533de6a279c95c78b72411117159f4c2f3d400eb5e4b8dafdac141312c690cd8399713b7af5c06d91d4144ca384e
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160525.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160624.ebuild
similarity index 98%
rename from dev-java/netbeans-javacard/netbeans-javacard-9999_p20160525.ebuild
rename to dev-java/netbeans-javacard/netbeans-javacard-9999_p20160624.ebuild
index e98c567..752098b 100644
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160525.ebuild
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160624.ebuild
@@ -8,7 +8,7 @@ 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-25_00-02-33/zip/netbeans-trunk-nightly-201605250002-src.zip"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-24_00-02-33/zip/netbeans-trunk-nightly-201606240002-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

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index 9133eb1..7298fcd 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-201605250002-src.zip 213747513 SHA256 89b56f89feefee274f4fe9ececf427d7e7e1e9e2b4b6c485dcc469cda7aade2b SHA512 0ebb5e3cf920937ec79953618fae6a8c299625f762c8d4684aa8e55b2c90d04b7694bb6d62919609124482313feb8a74782bcc20932361131d3540c628717441 WHIRLPOOL d60023772410f24346bd9a7002d0f99f905f138e0286d5fcfe4138694419af4ecf94d36a53ed2b2b33ad7e5b8e2b58f3db66ecd4e950cf5887cdcad540ff1d29
 DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
@@ -28,9 +27,9 @@ DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312
 DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
 DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62d58fda2a89ef87d7a1a3d4080b66aa8330fe9a2156d8ca9b69 SHA512 9d7c92a325761b3c448c0876858865ef49963abdd40099dc9285fe3164709229de780d33ef08379787d05f4701cbda407794e32a33966cb3ef30921f60639674 WHIRLPOOL 080ca294dd6ab79bb8df1f1a9caf54765eeab73b4e7ae38ecdb9eb25c889da44c5583b61296e8f68dbb8e0b0ce30810e580aee3008e1d50bd156ca96184caebd
 DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae933c49b42cea56fe36ace1ac114430312e20a9484532e4ffeb3 SHA512 7efc824e3e47f07202d3f687726a5432fbc391c22bc762a0810a95c454c9f1f515bd0b026f22a9a00e39027023e31e9d0fcb3bc95688f8e54ec1465267246bd6 WHIRLPOOL d58c979aacb6021322b5595de5ac1a99f441413aae39bc5a02c09dc353125e778a9c62f45b8e3c88db125f27010d901d6a763f875e86e5f1aae6cc571579c2df
+DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 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_p20160525.ebuild 6293 SHA256 de3e7a2d178bcb77ec8c79a10d2a074519fc18bbe816b0d1c47208976e8b97bb SHA512 79e33acd238c23097695bc158afc1ef832f26d3da7b8ee5bd26a5fc1b8ca66b5bcead70a5cfdfb9314e515fafedf58dbce1c630f7f10256cdd2a46baacf2976c WHIRLPOOL 045fac6cf2ca9546e20d9d7f74c11bef7859752939f985c44e4a9782e6b07a55d96ee23e7afd5b1061e7c9b3cee2dcb2a3c520ef8fbbe0f6490cadb13723b39e
 EBUILD netbeans-javadoc-9999_p20160526.ebuild 6293 SHA256 8fa5191a0ac5191df7f812f391bdade4829283bb7f6044e64c37324c24d8adc4 SHA512 8dd2d609f1badefb9d55af6a51b7e89ceb774d589b1a4f8ff845826fe2f8c0d43261b959da89404eddf68fef1dbff9d7af097a44cb4f87036bc8cfc6ac252902 WHIRLPOOL 969646b20d660d40ad6a8caaa72836900b5ae85f83b3a10493f73686e761abbccd4e144a7bf1d3c3cc7b7e98bb672d85a3d091ae7d697d6910cc52e19a863653
 EBUILD netbeans-javadoc-9999_p20160527.ebuild 6293 SHA256 ff75ead29a2cc11526903a4a47206492af3ad3b97411c690f4a0b5fe0aa0b3d2 SHA512 b5c233c49cfa52a8c06ba5851f2ccef84528ffa0cb368b42ddf186092a38455a684458872ec9bd0abf65ee048495e1a25b4e52b9c94ab00fdbe44ac5d1ab217e WHIRLPOOL 7f4284e14b082a75b148f318ac4759ec692fb39a1a801fda68138982505c25db8150f7ee4e6267a626adc62967a54b539e3f775315103ec1be3d530cd9b56ab5
 EBUILD netbeans-javadoc-9999_p20160528.ebuild 6293 SHA256 1819bdd300775c2e68859957bd2e494f5712b87e3c71a3b4a17da1515310a0ac SHA512 c560c0eb3f21c2cfa8f7eb940998332268b8566eba553dc5dd9bc83b4f3566c1a2c909c5a2a7503a4da4ebd01c8f70eb016570d85584bfcda33344614946303f WHIRLPOOL 3fd6cb40583c2b6a3ed056013e5b3ee95ded71f0586c0d4d48211ff89fd64e3c635ddd1453aad3b77249d4edd338aaa5e553d328af99651020da2e8a9c2ab46a
@@ -53,4 +52,5 @@ EBUILD netbeans-javadoc-9999_p20160618.ebuild 6293 SHA256 77a9eeecc11fdb8a1c1f6d
 EBUILD netbeans-javadoc-9999_p20160619.ebuild 6293 SHA256 e4fd24198b55e0e7e6513655178c5cf0543c13bf1eef1bea66da2a58f1fd4e48 SHA512 8baf00c3d0779adaa3e3bb495e239498637d71b55dde2b06fae72591ef05e40389da597114c8706e218c890a58ce7805d7da3a2bbaab018b51f60a72c5935afa WHIRLPOOL 2523655dd9f19bbf20c62768b66c15892ab7f7d24d00a48051a5226de2648985ad6c65b931ab8de4864ad8b95951a09347e88452ffa1d0b94c80c8f0e4ffdd78
 EBUILD netbeans-javadoc-9999_p20160620.ebuild 6293 SHA256 70827ae80a9f11fba41fea7f8b864271cffc1bb62a2e8f107d42b4e097576629 SHA512 fcd643106204d563bc6964706486c20485d2f4c09e8b73e3106513df2ad321def5da1a74d4910feca844ca0082fd3da9926585c5d5b0d0d29752224c54ce4d67 WHIRLPOOL 3bdc516df2db74f1164e24c370badcfca7e94d6ce57d8ce3120b628cbd377f0ae69f3d190b4d090ed6cd08bf394b5d6defa228dccfee145050495d083ed12766
 EBUILD netbeans-javadoc-9999_p20160623.ebuild 6293 SHA256 1b729e8fb95ec05abc2e967d0fb95a599ad0475ee69ad50eb7350d2c4c92e64c SHA512 b48f24fe5ea0cb0b2ca5cb8c6ca4f36375ee0da7017e45e122ca20e2cb47fc8c645bccf644f14bbbc9fc58732fcf8d0b7d2f58a84d7c631b50c6ab08bcbbab7c WHIRLPOOL 1989499e1df231d3bdce527f33f8d06d0f7da961e0b1ce09c764569fd2590a8d293516e635e648400233f0ab8d8553eeba1e8bac5a6f8471dce68d3b0fa3883c
+EBUILD netbeans-javadoc-9999_p20160624.ebuild 6293 SHA256 e1feaa816f465a59c44ca8d8550df2a5b17f942b65ced7093c95331e3c788dd6 SHA512 3a7b125204765137039fe574754b2a6f208ccf8d8d4f1040ed2d8126f7f237b6ed3841e5f4b1369574561fce600b1a45a3f7f51b759eec97b78354fb77c070f5 WHIRLPOOL 9c1a50a22255b3b0fcfef02d8596c5b01e85bee4a5ab79628cc15c873a684ee982f2eef6606029df781ba2ad00d030ccb181d5d17cdbf09d0299ea04b4849d18
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160525.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160624.ebuild
similarity index 98%
rename from dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160525.ebuild
rename to dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160624.ebuild
index a6eefac..5f7025e 100644
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160525.ebuild
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160624.ebuild
@@ -8,7 +8,7 @@ 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-25_00-02-33/zip/netbeans-trunk-nightly-201605250002-src.zip"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-24_00-02-33/zip/netbeans-trunk-nightly-201606240002-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"

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 272f2a0..598deb8 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-201605250002-src.zip 213747513 SHA256 89b56f89feefee274f4fe9ececf427d7e7e1e9e2b4b6c485dcc469cda7aade2b SHA512 0ebb5e3cf920937ec79953618fae6a8c299625f762c8d4684aa8e55b2c90d04b7694bb6d62919609124482313feb8a74782bcc20932361131d3540c628717441 WHIRLPOOL d60023772410f24346bd9a7002d0f99f905f138e0286d5fcfe4138694419af4ecf94d36a53ed2b2b33ad7e5b8e2b58f3db66ecd4e950cf5887cdcad540ff1d29
 DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
@@ -34,9 +33,9 @@ DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312
 DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
 DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62d58fda2a89ef87d7a1a3d4080b66aa8330fe9a2156d8ca9b69 SHA512 9d7c92a325761b3c448c0876858865ef49963abdd40099dc9285fe3164709229de780d33ef08379787d05f4701cbda407794e32a33966cb3ef30921f60639674 WHIRLPOOL 080ca294dd6ab79bb8df1f1a9caf54765eeab73b4e7ae38ecdb9eb25c889da44c5583b61296e8f68dbb8e0b0ce30810e580aee3008e1d50bd156ca96184caebd
 DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae933c49b42cea56fe36ace1ac114430312e20a9484532e4ffeb3 SHA512 7efc824e3e47f07202d3f687726a5432fbc391c22bc762a0810a95c454c9f1f515bd0b026f22a9a00e39027023e31e9d0fcb3bc95688f8e54ec1465267246bd6 WHIRLPOOL d58c979aacb6021322b5595de5ac1a99f441413aae39bc5a02c09dc353125e778a9c62f45b8e3c88db125f27010d901d6a763f875e86e5f1aae6cc571579c2df
+DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 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_p20160525.ebuild 4717 SHA256 c15b89ecd88d0e1697d5d23683590d178fa3aa60cea823e812be5f4bc100c1b0 SHA512 331f1329e45a286e48fd54628f1000044471890ce06c517fac6caa66938985d2dc9eff45556ac1a98de78ba6b0916faeccffc2a5ac69e70a48f6a53b26262271 WHIRLPOOL e4f4a131a595c84bf9aea805054bccab6d8efe5fed2a25e4c3ee4c9f3a4ee298590207a09f5b025f2cabab32ff967161d4ca53bc3f8da86df85f041b9c45d833
 EBUILD netbeans-javafx-9999_p20160526.ebuild 4717 SHA256 4225476bd2157f41fce02dea5997d9241c5734a6f523782276cd0e1cc8446797 SHA512 88beac29101918cfb7e51ae9f2facacc94959f6368f15783837e29c43640f166e51fe1b021635c15f3e4a426b3ccc253bdad90fac4b1c93fb23eb30edda8396d WHIRLPOOL d6c35b42954f656e44e65524d049f940a6e357aa40f684cc120a3cc0cff79fded39a42a2dacdef95cdd04879897bc430eac77b5d8e63e67c56ef6323eb9e8b0a
 EBUILD netbeans-javafx-9999_p20160527.ebuild 4717 SHA256 a3378dcc1dcc5f3e9404fa2d4abcea51f5db5cd146aafe6d86dfc109d61c03b6 SHA512 d56a70aebf8613e15327844fbea54ec3d31db5a5037d2af8663bdef320c048a7c1e34a0747b901e0483c6a083627e2f88f01151d65bc3dc3cfbd5c987820d97d WHIRLPOOL b08b97e419e59d58c0f1f0a539a03d3ab135adfdebd32253953997e3abd472935b336256e1504d19b1b8aa91c79600576d98504479fb86bb531567fdd47db62f
 EBUILD netbeans-javafx-9999_p20160528.ebuild 4717 SHA256 a6768b7e080c378775cad95ceea1cb37f280c3995a56008eea5d16d2c9b0ab68 SHA512 2864481bafccf49f714b96554713f7142de1265d23526fba1b82c104e7463c8be4dda95eb1f9b19ca824959f579c63d0e9367bf994b5f29609c178bc234577c5 WHIRLPOOL 7055fb8dd6da8d93c1b6e729b7851be87335b279f61442982ca5a044b6f241bafed60f8c901de980a6ec829601c329e2f0767959994ab372acbfe261d32ee4cd
@@ -59,4 +58,5 @@ EBUILD netbeans-javafx-9999_p20160618.ebuild 4717 SHA256 daa849216b3d786b7549c4e
 EBUILD netbeans-javafx-9999_p20160619.ebuild 4717 SHA256 d4b6d29310536b5dac6b03087b40f8722308608487aecad11cd037b1303b7a33 SHA512 58a789051b4c644ba58e9fe1b29a980ca904b9b16b00b0ee4de0886360e41748dd5f06825c43b18226c1b2f4bb7a8e7984213a045b2426ef61fc7e2c855beea7 WHIRLPOOL 0203b08c2c7a115b1bd2c80b1486e826e141be1671677da97fa5a556e704e6284c77b386bdba2e25b29dd63cea30a223f4de71ddd0c41f0356e61fff56466165
 EBUILD netbeans-javafx-9999_p20160620.ebuild 4717 SHA256 89bab6c932266ab6153969ea62d1f1447da435e62876207712b890275b341b4b SHA512 e4b58499d1d96c364a3019bf4907dc6bb37721828ed94a9b12f6ed13af522fcb0b24d75f2064b370f2133fc0882375587a066f835168d9921c85440f64a12c1a WHIRLPOOL 905f429b965e9768618140fa6d0b63534a8a26a132cb21392c13eb00ac6c4106177b78bd0ff160f3b69af8b34486c3ff9efbeacfd3a6fc90dfdd06fe98ef2023
 EBUILD netbeans-javafx-9999_p20160623.ebuild 4717 SHA256 0fe784e95f748fb6c8a667037053d303ef87d2e53b928fa43a30973739527593 SHA512 37e5e3d61723b1ed140b01a7a8fb311e05d82b76c5b8da5a994116cea8c2d8ca456d71990797a250e2e7e505254d3a3b29e850a87cbdb8477fef66ce9726161c WHIRLPOOL bff8051898d1a9ecb90d18e4fdd1d1ccdd99c0d5a4d35d5a11607ec4891baedea4146c55bf969830cc7d603a9d79e5041dee85694db99bebaff20ad62ed32cef
+EBUILD netbeans-javafx-9999_p20160624.ebuild 4717 SHA256 4c220a12e121b7c277ba1c77698f1a0e50404e963b497ca6c50ceeb0aeadabd9 SHA512 e5a16bd31917ea0dc731fede1cf8be706f291c86797fed1bb91566bf32c03d66491e138d16f380d32e83905bd4db7295388a6c55da9f210341ff505681a5e0f2 WHIRLPOOL 44dca52b15131dab14202079ac869a696265e863faa513eaac72702a7d8ec7017cbead84f69b5754a594f33e8dcc0fe2b1e8cc725c34d8ea58d38612aacf4ca9
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160525.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160624.ebuild
similarity index 98%
rename from dev-java/netbeans-javafx/netbeans-javafx-9999_p20160525.ebuild
rename to dev-java/netbeans-javafx/netbeans-javafx-9999_p20160624.ebuild
index 7b0fc81..fec02fb 100644
--- a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160525.ebuild
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160624.ebuild
@@ -8,7 +8,7 @@ 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-25_00-02-33/zip/netbeans-trunk-nightly-201605250002-src.zip"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-24_00-02-33/zip/netbeans-trunk-nightly-201606240002-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

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index db347dc..80667e6 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-201605250002-src.zip 213747513 SHA256 89b56f89feefee274f4fe9ececf427d7e7e1e9e2b4b6c485dcc469cda7aade2b SHA512 0ebb5e3cf920937ec79953618fae6a8c299625f762c8d4684aa8e55b2c90d04b7694bb6d62919609124482313feb8a74782bcc20932361131d3540c628717441 WHIRLPOOL d60023772410f24346bd9a7002d0f99f905f138e0286d5fcfe4138694419af4ecf94d36a53ed2b2b33ad7e5b8e2b58f3db66ecd4e950cf5887cdcad540ff1d29
 DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
@@ -26,9 +25,9 @@ DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312
 DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
 DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62d58fda2a89ef87d7a1a3d4080b66aa8330fe9a2156d8ca9b69 SHA512 9d7c92a325761b3c448c0876858865ef49963abdd40099dc9285fe3164709229de780d33ef08379787d05f4701cbda407794e32a33966cb3ef30921f60639674 WHIRLPOOL 080ca294dd6ab79bb8df1f1a9caf54765eeab73b4e7ae38ecdb9eb25c889da44c5583b61296e8f68dbb8e0b0ce30810e580aee3008e1d50bd156ca96184caebd
 DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae933c49b42cea56fe36ace1ac114430312e20a9484532e4ffeb3 SHA512 7efc824e3e47f07202d3f687726a5432fbc391c22bc762a0810a95c454c9f1f515bd0b026f22a9a00e39027023e31e9d0fcb3bc95688f8e54ec1465267246bd6 WHIRLPOOL d58c979aacb6021322b5595de5ac1a99f441413aae39bc5a02c09dc353125e778a9c62f45b8e3c88db125f27010d901d6a763f875e86e5f1aae6cc571579c2df
+DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 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_p20160525.ebuild 4412 SHA256 62229014579941a3187c1990b21f48d84838137ec35b2d17fbf0585550d6c8da SHA512 274b9b7a55ad0c5e7d930fd9496100bbac5a03d8a7ca840afdaad07dd42f5065eca5874743f593ad7d684c2e3b6974bbb8f924052740ce3fb2ee55796ac520bd WHIRLPOOL cc2f085dcf91416a7df04e490224d46355d55945b673c4e14cbd9cfb1b5f0935acfd8ecd5e19aef098bd920378e9d93186ffd8683b16079a1d918d0607865e96
 EBUILD netbeans-mobility-9999_p20160526.ebuild 4412 SHA256 08e99f6a150a8646821e68f3cfae74afc8da8c2165056c31965ad97671d3fce7 SHA512 078206786fb0ebce9f7f439e9038b3ece094113d6a842842263210e2ecb9527c32dc0164eca238aaafe9d41c6fb4d2105c55f02ad61a37b9ac73d92df303359b WHIRLPOOL 80cd1e1db614f23fed21b3225e9b0546ecc7574e569ed411e39f6bf47007f50fe3b0586d6bf4e580c3be7ffdf80bc78c56ef0a99c4a91706ffa7047008f5b640
 EBUILD netbeans-mobility-9999_p20160527.ebuild 4412 SHA256 ed5ed3bcc24bc10c7cf4a1a13149e8913b13d0714c0b6b124e3329b61cba840b SHA512 f0e71dbe8fbf0810ec38e16317551be93d75baf0717e7345418a8e72970b6301642acdfaa7d335fb5b693f3505679421c52a9b221dae152ae9d26dc1698e7b0a WHIRLPOOL 227788711dca74888fff365b850c7a0d71f59ff834be6ad0f47af676f454c58ad9c02f5d54da969d30dc8a8dd178fbc9952f136a203e3106257a41d20f5eede4
 EBUILD netbeans-mobility-9999_p20160528.ebuild 4412 SHA256 8d5a5a9c719ae131256033cd64457e7bdac10b58acc7bb0afd6bf3e7d910d492 SHA512 02fbbe548076277b229043b61fb411aefcc04fc10caf84754ae8c7a3b252736aa495a10d06be6fc0feee466b0d16b390e2cc4b22e432b03d084735229072b6b1 WHIRLPOOL 85561167229adf05bba05c7c92549ee111f3724feea68c5b0da824bd539a912d800742fd5d8388e1cad7b0dfbd41ce8165e8c3979116e7f328ab9ab6d8a8afa9
@@ -51,4 +50,5 @@ EBUILD netbeans-mobility-9999_p20160618.ebuild 4412 SHA256 8c5d5d6ed13d9d190c8c8
 EBUILD netbeans-mobility-9999_p20160619.ebuild 4412 SHA256 efc0216499f91514fe2cd70b64071a93548275acb68fd489a16278b178b36957 SHA512 464084eed61bf2595c51e3ccfe7069cb4c73f0c82feb5793e102a55820401e265e4932bd7a022f12c6d2f7ec10c37d926ceb1fdd6ba203a5b35d8baf2094a774 WHIRLPOOL 5d7f3f7849980405d94dabe56092d37008aff55202a7565123f3e6d97abe55d3a1addd6e91e7704590184ef77557789490969f06e94de75ed243b7fd09ae763a
 EBUILD netbeans-mobility-9999_p20160620.ebuild 4412 SHA256 e27fefcc1095fe6ddb39b68f53f2fbabeb7535b6c3b0029737817a1acabc98d4 SHA512 ff612db2a4a8ff53bdbe804a0c2a803008a5f63e8560b8de0807ec9ecd23ec40f9a8791bc01f4b8e620ed3f8beeba9a1d25f6831e6440519c6c5120465de5329 WHIRLPOOL 99c2d4ed69999afb8b41330c965e0d6391c6849e79b0dd6eebe9ca04a4ce568f744937dfdedb08db73048fb920d8d0687cba0f419e5b31d91bf6b0d4566e1bcf
 EBUILD netbeans-mobility-9999_p20160623.ebuild 4412 SHA256 c3e43d6b8ef1171fb121d6c91e59bbd635b99900e19f13b9d13523fc3a3a3967 SHA512 7a5f9788c9b784b90fab481a72d22e66585c1d18be7f4ef7feb42db56e2a076c2f41f71aa74c15372b5c53ad3af0084c8c8c8961de9a3e36267f6e851af9c103 WHIRLPOOL be12b49ede237930e2b3ef73b9f316f4ae52bc3075ecd438bc1a5bdd1b596ed764910ff18bc38312e95e079026a1a28bfc809c67463a7f17783fec4da8dc150b
+EBUILD netbeans-mobility-9999_p20160624.ebuild 4412 SHA256 dee02c50a33798f851ddab55ef6fea8f63ad839b43d299c7a269ce17c522e34e SHA512 8d5aefe4a357000e0705a4aa9385778ee9e5edf18f35a8b3f1dacb5cc61cffec99e884f0d30dec9ebda73f7d4443be7370a1c34a42d59aa385c0d4a14ce6c31d WHIRLPOOL cd13490c3d897d775e1db76cae594af370b9806f7c6813a2a78f99a40b6e93d97ea25bd1edb2d2f76c26c8e98878e4cd3d7dfe4692bed98c23fe0743f4a86b75
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160525.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160624.ebuild
similarity index 98%
rename from dev-java/netbeans-mobility/netbeans-mobility-9999_p20160525.ebuild
rename to dev-java/netbeans-mobility/netbeans-mobility-9999_p20160624.ebuild
index bc38e0b..2574cc7 100644
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160525.ebuild
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160624.ebuild
@@ -8,7 +8,7 @@ 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-25_00-02-33/zip/netbeans-trunk-nightly-201605250002-src.zip"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-24_00-02-33/zip/netbeans-trunk-nightly-201606240002-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 )"

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 68683bf..973a6f8 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-201605250002-src.zip 213747513 SHA256 89b56f89feefee274f4fe9ececf427d7e7e1e9e2b4b6c485dcc469cda7aade2b SHA512 0ebb5e3cf920937ec79953618fae6a8c299625f762c8d4684aa8e55b2c90d04b7694bb6d62919609124482313feb8a74782bcc20932361131d3540c628717441 WHIRLPOOL d60023772410f24346bd9a7002d0f99f905f138e0286d5fcfe4138694419af4ecf94d36a53ed2b2b33ad7e5b8e2b58f3db66ecd4e950cf5887cdcad540ff1d29
 DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
@@ -29,9 +28,9 @@ DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312
 DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
 DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62d58fda2a89ef87d7a1a3d4080b66aa8330fe9a2156d8ca9b69 SHA512 9d7c92a325761b3c448c0876858865ef49963abdd40099dc9285fe3164709229de780d33ef08379787d05f4701cbda407794e32a33966cb3ef30921f60639674 WHIRLPOOL 080ca294dd6ab79bb8df1f1a9caf54765eeab73b4e7ae38ecdb9eb25c889da44c5583b61296e8f68dbb8e0b0ce30810e580aee3008e1d50bd156ca96184caebd
 DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae933c49b42cea56fe36ace1ac114430312e20a9484532e4ffeb3 SHA512 7efc824e3e47f07202d3f687726a5432fbc391c22bc762a0810a95c454c9f1f515bd0b026f22a9a00e39027023e31e9d0fcb3bc95688f8e54ec1465267246bd6 WHIRLPOOL d58c979aacb6021322b5595de5ac1a99f441413aae39bc5a02c09dc353125e778a9c62f45b8e3c88db125f27010d901d6a763f875e86e5f1aae6cc571579c2df
+DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 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_p20160525.ebuild 4111 SHA256 c0191a55bcfd6db0de1ddb5e66cd0d25abd8365b7cb098f4219f57c0df1aed7c SHA512 8d0f071883021493eb8a479a9c35901f602b5d92ca14410bc080d4f6658a1040891b66e45a560d0d4d7d60fb41d457a0e135ff2885832daf4792a23e72462e36 WHIRLPOOL 2600fb1d1a958e109d0b5f1c361616f61805564aa8371215db6380a6e6ee28610a5fd2e37c5a3697d9ee150534627e9ead1babdc3de4ce98fcae89a5bfc1649c
 EBUILD netbeans-nb-9999_p20160526.ebuild 4111 SHA256 e931fffc71d94a04205eadbfb0de0860b452ae5736f2306bb2bc152f2f38b349 SHA512 f62400f7255598b7d484095298b8332ffda0591019603e1c4d46c33eb053c1cf24f3102ff1450cf778f7d00fa1c39b4074d36196bb967308ab51c516192bc84e WHIRLPOOL 5a0abeb8b9df6132e2671179710b2323e3e13b116f38d767c279e03be1a08bbbc27ab4e71037bb1bfcf7c670a95aeaaef7e0fa2317dd4ac84c6a4cf247f1e1c9
 EBUILD netbeans-nb-9999_p20160527.ebuild 4111 SHA256 a6dfefd5ee97a3a17f592ab00b3c97c9ed3d2bb6971c0758b215f65a70907dd2 SHA512 bcee6f396b2020052c7723d30d8447efa54e1e2a7e086e1b4ca5a45edccf452c11ba1c6a08487a7b354a76ac110004f7a99520ab7322c1d5dee7d18e2189f70b WHIRLPOOL f30344ef2098f118261d5bdfc1f0a7dd573cdc491956d36207fa5b609fbb51c0972001d9bb64976ca8fa22f896da46023645a3900404301d40eba3494d6fcbc0
 EBUILD netbeans-nb-9999_p20160528.ebuild 4111 SHA256 59330ba4b6068e00b552441f03f908a7df398b21d909410a26e8d24013ec05bc SHA512 dad57262798f5567cfe4469fc144eef0e9a061326bc426670bc533ceb0f636e5fb8915facf09a7e7c5b686deb9cf3436a28f7a57fbb520ab56201729520fd649 WHIRLPOOL 13d6816b75dc66ef5c794f1ca5ed82d0e77854e432e4b6226aefe78b501f3010d0104a9795004e505d907daf44d6a4963ad08f3c70490ed5f3dbbf6be59cd4a3
@@ -54,4 +53,5 @@ EBUILD netbeans-nb-9999_p20160618.ebuild 4111 SHA256 7b78f15bff2355ae9d2cdd4afb1
 EBUILD netbeans-nb-9999_p20160619.ebuild 4111 SHA256 ff3b55348cd8c24c7edc1be9b698a3c4e7b2c53f0e8218b3f39ada013d6e994b SHA512 d201de03963aa3d7196193a87bde1d112ea5034212ef0e5a5fece5cc71432f579fb0b3367da5c1da937fbd611124d715c97bdb02e708e896b3244f85810d27e9 WHIRLPOOL 445f10d9f4e19125ee9757d3e24c027ec6a6cc58b7eebf81afe67c804931798d063bea65b1604bce83cc24d53e840f3f114d6138d0bbf31650d82a883fa1a7eb
 EBUILD netbeans-nb-9999_p20160620.ebuild 4111 SHA256 d1bbd78991d6cbeabff33d603d2f52800d263fa962c763dd6f1cfed40048fa36 SHA512 b0a96c8531448cf4a94600e6e7ac226e21983d384ccb0876febe8da1ea67b968598b6850e63f5587d25b3b1dba1e48bd0b1e1c7e36488f4264f89533672abbc6 WHIRLPOOL 2ecaf22bd0e38fed32373e0b760106355de19bdaca7b25b19e7652cb56071ed58a2744972527f8962db134f54e32d5a9e820db203ee17856796662b511420e8a
 EBUILD netbeans-nb-9999_p20160623.ebuild 4111 SHA256 53c2fa0fdda1ad5fe21508f2d54ce79cf5c1c67dbacf7cdde499784a6fd88e11 SHA512 f15cf6f54d4a7f7c73335e89d9a09d33734562c5247f30c0d0857796c71fa464d9270f2727a14ca390bbab0eac6a7bb937f841f7c03aefdf118f21fc16dad7bb WHIRLPOOL 435ed396d90a52e81523feee7c1244929c07a440820b9e408b53680f50e1e593601316c57eb327c578d23ba37d5276fdaf27b10b9c572b5884c63488f3a5dd3f
+EBUILD netbeans-nb-9999_p20160624.ebuild 4111 SHA256 1d9be27c25ec9a599d800ddb15cfe1a9ab36a3e4f6ee45a2401e985d687b45c0 SHA512 d31b636fe3bd91179efad10650525f8525e29f4767393cd7ca0e0525d61f7598adb197c96dc9d91fafb94e2628e6570af9f8fac55f949d526fca69ef49893206 WHIRLPOOL 159ce1a51adac191c957279904b0cb2dce26075297f2b10a53184ca00a00b9ebcf918b391b7457e3c5f9a6ad32f07eb9ee725245de27e747be6e23b10e646c0f
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160525.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160624.ebuild
similarity index 98%
rename from dev-java/netbeans-nb/netbeans-nb-9999_p20160525.ebuild
rename to dev-java/netbeans-nb/netbeans-nb-9999_p20160624.ebuild
index 29b8019..7811f61 100644
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20160525.ebuild
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20160624.ebuild
@@ -8,7 +8,7 @@ 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-25_00-02-33/zip/netbeans-trunk-nightly-201605250002-src.zip"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-24_00-02-33/zip/netbeans-trunk-nightly-201606240002-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"

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index fed9f10..eecee13 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-201605250002-src.zip 213747513 SHA256 89b56f89feefee274f4fe9ececf427d7e7e1e9e2b4b6c485dcc469cda7aade2b SHA512 0ebb5e3cf920937ec79953618fae6a8c299625f762c8d4684aa8e55b2c90d04b7694bb6d62919609124482313feb8a74782bcc20932361131d3540c628717441 WHIRLPOOL d60023772410f24346bd9a7002d0f99f905f138e0286d5fcfe4138694419af4ecf94d36a53ed2b2b33ad7e5b8e2b58f3db66ecd4e950cf5887cdcad540ff1d29
 DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
@@ -31,9 +30,9 @@ DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312
 DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
 DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62d58fda2a89ef87d7a1a3d4080b66aa8330fe9a2156d8ca9b69 SHA512 9d7c92a325761b3c448c0876858865ef49963abdd40099dc9285fe3164709229de780d33ef08379787d05f4701cbda407794e32a33966cb3ef30921f60639674 WHIRLPOOL 080ca294dd6ab79bb8df1f1a9caf54765eeab73b4e7ae38ecdb9eb25c889da44c5583b61296e8f68dbb8e0b0ce30810e580aee3008e1d50bd156ca96184caebd
 DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae933c49b42cea56fe36ace1ac114430312e20a9484532e4ffeb3 SHA512 7efc824e3e47f07202d3f687726a5432fbc391c22bc762a0810a95c454c9f1f515bd0b026f22a9a00e39027023e31e9d0fcb3bc95688f8e54ec1465267246bd6 WHIRLPOOL d58c979aacb6021322b5595de5ac1a99f441413aae39bc5a02c09dc353125e778a9c62f45b8e3c88db125f27010d901d6a763f875e86e5f1aae6cc571579c2df
+DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 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_p20160525.ebuild 4418 SHA256 ee73ed1101b0c91c105a8f3aafb20cabf467d8623b317c4365ade30da4255a45 SHA512 faf2dafa869c722462165e4c0e6fd8b2791a8814cba44f45b51fdc42abedf6331d6248b44e907b22f6ce0b4c846cbbfc9e0a937e4c59f748806e1652eadfabf9 WHIRLPOOL 2f669aa1c1bd04f64751d8aa8d8f19893f89a2dbb3742bfd729e56a765cdec2bdb70ba5722c0605ff51ad0f6470832e211e6304a3d667e76f4dbb1ba5b6c6fc6
 EBUILD netbeans-php-9999_p20160526.ebuild 4418 SHA256 539f53cd6a9e911a052485e7bf5f523293dfa9991b34d23ef8b12a2e0867ade2 SHA512 563bd8382822108144477619c6ee105e6a2961569f3bc699d5914ee46d4815130ada2c214a770ce4cbf94363f63b09531cb540e83b20c91b6ef481e20bfad081 WHIRLPOOL 98cec862c50ed659e6f8295db4b6ec40712f257c75d351eb418873147fdabf16adee232233b5f1fa12d8f79925b5508b5e7db24c014d64c1ee9285761b7aaf58
 EBUILD netbeans-php-9999_p20160527.ebuild 4418 SHA256 a14c7a641f7f0b4e73f3bcf74bf783c0b93d4fbe871a1b5e522da7e98c58a166 SHA512 66dec4856192ab502fb4b702b2b73021181c16c232905eca73d68e049433603e4d2b7c3779a49d8e5b58a24d5b4fc1b90a8dfbe28659e33a1aebfd6566a770ed WHIRLPOOL aeb8c177b49be01b55f83155aa64ec9a132eeb2858e04e552b03189a62ac8a0aad115b3012d2203c3bfbb33ed11a7d41bf8b50eb6e116c2f55851b9eca5639c3
 EBUILD netbeans-php-9999_p20160528.ebuild 4418 SHA256 89f59ed6c89ba5e6cbfb4ed92e7a0473f8698a888cdbcb3d3664c5095be265b0 SHA512 d861bb733db82aad7e69d79e78ee997a0b3da2982cd36c463f5b14bb44e97732acc9eb928aa98081cee1cfd1f0c685e3c3039a65cd699a7186e730427ee6e588 WHIRLPOOL a86c2b18877287e331e0f9318d775388ef2401295b5c9f5df933016c11684bb92a3d959bcbad8b6280e4c4d8d2b828bd30995a4f56237aa9334d8a305d7f0c99
@@ -56,4 +55,5 @@ EBUILD netbeans-php-9999_p20160618.ebuild 4418 SHA256 de42362981145792e82ba98219
 EBUILD netbeans-php-9999_p20160619.ebuild 4418 SHA256 53e05c163c65dca14ea563179c50dbe9b39c0538e22b24658ba3ee1d5b07544e SHA512 d7754a50c1ea296f22ec0c9472d94aeb14d2913a185020a30f179cf2613ade4595e6cd1fcbc4f155ee26e247b01ef288b91a3b2df488af561a77dc94d15acdbe WHIRLPOOL 46c37aaae176ddf638c3f25a6dae2eaaf10193f5bafea257dd6260f332171734646b5421189b7bfe133024f714fa52f8d4760b049c10961977f032fc0ab3f578
 EBUILD netbeans-php-9999_p20160620.ebuild 4418 SHA256 3a9b143d6f707b717a3de6651f8ad4c3ab409b3be518a9f10793420b27c3fe7e SHA512 6f0098f87e3824b172165f5827eda882e8bb7bf3db0c7cca24d69614cc503f740bf68bb3d2bec4ec0977d7a60cb155e9ae93afa4f4b9846ca009e46b77ffbc60 WHIRLPOOL 12ed304091ec5a6ad088dd1750652d72a9ea5c077a877336dbd28bd87c643d6ce33267a43435e71cab5c9a47a83b3ce63524b0e4dc35a10e8e1869a8d485012e
 EBUILD netbeans-php-9999_p20160623.ebuild 4418 SHA256 3b2eb39bf10475587a261f03126d903d650c521970797868b876d2590482285f SHA512 0e43b248e98a0c6249409ea7562b8631ca4609eec997c9b8801d746542aea6bf1072f71c1b7ded5fb9ed5a3937130b62bffb99894a1e5b169f5bd51d0532dfc6 WHIRLPOOL 2ff98e42d200fe23adc2b39f5e7344d8a569a859dbbdb1f6f2c53f2c647d997987dd234aee3316661c989d8feddeeae5a8cf0689caf92b707d9ea8e2333a9f76
+EBUILD netbeans-php-9999_p20160624.ebuild 4418 SHA256 48e78f4bc26c43d4e7fe09c26496ca82cc05ef45e68d24a21c716719424f470b SHA512 db0c02a6bdf14a1ba941c075c7b953b5aee4b5de3408850d107b9a03dd30916c7e8798685ea328847919e2c9a3ad3485bfc037e2a90a84ea4281b57b5a9985ef WHIRLPOOL f5f79d8e776bc2e692394f77c5f5c02ada1f2f9e3988389d489b1f5635f9cea2b33f402e24cb6a35d2775c0614b00fd3805a39760fa50611347ba6e9750b4cbe
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160525.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160624.ebuild
similarity index 98%
rename from dev-java/netbeans-php/netbeans-php-9999_p20160525.ebuild
rename to dev-java/netbeans-php/netbeans-php-9999_p20160624.ebuild
index a403cb2..31ba8ab 100644
--- a/dev-java/netbeans-php/netbeans-php-9999_p20160525.ebuild
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20160624.ebuild
@@ -8,7 +8,7 @@ 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-25_00-02-33/zip/netbeans-trunk-nightly-201605250002-src.zip"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-24_00-02-33/zip/netbeans-trunk-nightly-201606240002-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

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index db586bb..9bb94e3 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-201605250002-src.zip 213747513 SHA256 89b56f89feefee274f4fe9ececf427d7e7e1e9e2b4b6c485dcc469cda7aade2b SHA512 0ebb5e3cf920937ec79953618fae6a8c299625f762c8d4684aa8e55b2c90d04b7694bb6d62919609124482313feb8a74782bcc20932361131d3540c628717441 WHIRLPOOL d60023772410f24346bd9a7002d0f99f905f138e0286d5fcfe4138694419af4ecf94d36a53ed2b2b33ad7e5b8e2b58f3db66ecd4e950cf5887cdcad540ff1d29
 DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
@@ -52,9 +51,9 @@ DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312
 DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
 DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62d58fda2a89ef87d7a1a3d4080b66aa8330fe9a2156d8ca9b69 SHA512 9d7c92a325761b3c448c0876858865ef49963abdd40099dc9285fe3164709229de780d33ef08379787d05f4701cbda407794e32a33966cb3ef30921f60639674 WHIRLPOOL 080ca294dd6ab79bb8df1f1a9caf54765eeab73b4e7ae38ecdb9eb25c889da44c5583b61296e8f68dbb8e0b0ce30810e580aee3008e1d50bd156ca96184caebd
 DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae933c49b42cea56fe36ace1ac114430312e20a9484532e4ffeb3 SHA512 7efc824e3e47f07202d3f687726a5432fbc391c22bc762a0810a95c454c9f1f515bd0b026f22a9a00e39027023e31e9d0fcb3bc95688f8e54ec1465267246bd6 WHIRLPOOL d58c979aacb6021322b5595de5ac1a99f441413aae39bc5a02c09dc353125e778a9c62f45b8e3c88db125f27010d901d6a763f875e86e5f1aae6cc571579c2df
+DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 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_p20160525.ebuild 9520 SHA256 2f2d5cdb8e76728e2de3120cbb73fa96a3046dbfed22b3644b2fffe84ecffda1 SHA512 79434826851e8ef08eb45bd1908ba67409bb7bda6680bef63e10f316c74dc4aaf8d88cc121c04482f55b3fcb81259bdb50aa6866ab19ce83c76b9e2fa5f8f7d1 WHIRLPOOL f0e8f8480874acb8f7194dd746db6cd59e32171eeca976ae21d5adccfb38e8d0ad96f7849f1d68c0bc152957bfa9cbbe64fc759e1f58dd1ceae62437fdc3462f
 EBUILD netbeans-platform-9999_p20160526.ebuild 9520 SHA256 258a40482a2e3a2f2c95c9d01ea629812a818387eeb2ef8086ca5324935a91a6 SHA512 f78c19a870b32734cb60154a0ab0a7645d9171cfaf280aea736bfc008cded701043703745d8cd273dc7fcd0622f9bf40bb63ee4bda8f8d45c106c8ffa041a86b WHIRLPOOL 0a31f9dc97fd2fe961dfb9619005e95e1f7c26e66b32f9ad50285ebb2b1048a1db6db43598bc2f9f8c26ce4dbbdb2e6aaa3b610c33f4ac221eff187c1ea891c0
 EBUILD netbeans-platform-9999_p20160527.ebuild 9520 SHA256 6182f4e93aeb1875102826bba91362b9313a0e3f23257d7d02b88f4d1b641132 SHA512 b5030e9f64ad6406ec887fd6fd41aca394e5676cabeec574aec0ec4ad1db38c97e44be85fa46d88573c9f9f611a5931d287db55610683c86ffe41b732f0d55d3 WHIRLPOOL 0c4a9bc995979e3e7f5ecc1e4634cc798b83f137e7ba89e3a91168654cff6a45dcb80e0cde934c34a959867553d7445f26d8422a0fcd3e51f1f02e19628392f8
 EBUILD netbeans-platform-9999_p20160528.ebuild 9520 SHA256 e8ae71da574ddadb2103716aa0c511df722a8c57bed50b849dbfecf0939ccf82 SHA512 2bbc29ff5ef604b029590b4021f3caca21a46bc2876370776f665982032df896e32d49171c1046255e7b015fc51a3298264503eb7456a26c4d8fd5171bc28513 WHIRLPOOL 11a7e0b2dff87a673b720f9aa92e11fc47a22d1e22908cfb62c1ba8efdcd2702b7312be08c9e80d8db628dcb8a81951ad5296f84304917a75573136f2387104e
@@ -77,4 +76,5 @@ EBUILD netbeans-platform-9999_p20160618.ebuild 9520 SHA256 9652f01d9264a93f13fa8
 EBUILD netbeans-platform-9999_p20160619.ebuild 9520 SHA256 2bea95f0cf80a2f2f9d4063051704f828876b778ca9a0f4035d13f62a98ed19f SHA512 52efd3b75e7944200a54dbdaf70f449d84323f836393c34917570e1cadf938dee225e1396c5ae86f1f3f92de9dd0b9619338d51f61d5127b9c09d67076fd0a7f WHIRLPOOL 5b00e32a4a57a4f7d375239beabf897cd65ac9e4c00e10a45b26e6c9c1ff6beeeb4697bedf0e11b1bac5db0f4dbc1d9284cc922ec843d89688b64c9c8821f2d8
 EBUILD netbeans-platform-9999_p20160620.ebuild 9520 SHA256 b3b9097df1ef8e45811ab16ce9b54edd6dc4d19aff461e3b22fb8e6982efec60 SHA512 dc382b0c54a0f2a1907b336536c08929b49d8c0826a94772426a19d4536082379536d7963ad31599f63b750aca1e859692760551125b35c9471f80cca9dbd296 WHIRLPOOL c578c6654c62718fba0f0cab39b7657c7d9eadea4108f44d73d869fb0f8cbc0d51fff66b0f41f4fbbfeba0c0d4c5dab52bb06fbd0b05918ee18a42f8eff5284f
 EBUILD netbeans-platform-9999_p20160623.ebuild 9520 SHA256 f3383e217dfd5b03fe753222dbf3b241ab0379f57a41bed382624dfa017afb49 SHA512 d8abbf6ffb0f5d0f13b2ff4da9e94b728215eb9eb2fcbab9a8c57c01171257d21e9ac34ab1ac3205ba292c7c2d1ce969a8b6b908245aab5eb92d52705841deb8 WHIRLPOOL eaf6391b1025c3e6b0081cc77fecbb4c5dbae5f72447ba2a33206ad453365c35d684ad1a22a7132e1b40da09fdf2360d1ba7399a51509cfcdcc0541c65bda283
+EBUILD netbeans-platform-9999_p20160624.ebuild 9520 SHA256 82402103054e31f617c8044942ca9adc43afa23056a9356f30b4eb3c529fe2e2 SHA512 8742742ad15a5eb3b56024b08b93244797643a2d22e854afdc65635d275733e5c01e210a71b29b34b69b48e24771ad34716aa75143af5c789449154ff3fe802a WHIRLPOOL 4ffb630d9dc8f073f9c0d942d47995ea08080ca278d16143c04759a97538fb91bd023e082e1b9288671a733ee3d13c84bf499b2854c656fd9e256afb0ada30e1
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160525.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160624.ebuild
similarity index 99%
rename from dev-java/netbeans-platform/netbeans-platform-9999_p20160525.ebuild
rename to dev-java/netbeans-platform/netbeans-platform-9999_p20160624.ebuild
index 730828f..0a86eb8 100644
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20160525.ebuild
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20160624.ebuild
@@ -8,7 +8,7 @@ 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-25_00-02-33/zip/netbeans-trunk-nightly-201605250002-src.zip"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-24_00-02-33/zip/netbeans-trunk-nightly-201606240002-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

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 91e000a..0cc0de2 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-201605250002-src.zip 213747513 SHA256 89b56f89feefee274f4fe9ececf427d7e7e1e9e2b4b6c485dcc469cda7aade2b SHA512 0ebb5e3cf920937ec79953618fae6a8c299625f762c8d4684aa8e55b2c90d04b7694bb6d62919609124482313feb8a74782bcc20932361131d3540c628717441 WHIRLPOOL d60023772410f24346bd9a7002d0f99f905f138e0286d5fcfe4138694419af4ecf94d36a53ed2b2b33ad7e5b8e2b58f3db66ecd4e950cf5887cdcad540ff1d29
 DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
@@ -26,9 +25,9 @@ DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312
 DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
 DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62d58fda2a89ef87d7a1a3d4080b66aa8330fe9a2156d8ca9b69 SHA512 9d7c92a325761b3c448c0876858865ef49963abdd40099dc9285fe3164709229de780d33ef08379787d05f4701cbda407794e32a33966cb3ef30921f60639674 WHIRLPOOL 080ca294dd6ab79bb8df1f1a9caf54765eeab73b4e7ae38ecdb9eb25c889da44c5583b61296e8f68dbb8e0b0ce30810e580aee3008e1d50bd156ca96184caebd
 DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae933c49b42cea56fe36ace1ac114430312e20a9484532e4ffeb3 SHA512 7efc824e3e47f07202d3f687726a5432fbc391c22bc762a0810a95c454c9f1f515bd0b026f22a9a00e39027023e31e9d0fcb3bc95688f8e54ec1465267246bd6 WHIRLPOOL d58c979aacb6021322b5595de5ac1a99f441413aae39bc5a02c09dc353125e778a9c62f45b8e3c88db125f27010d901d6a763f875e86e5f1aae6cc571579c2df
+DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 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_p20160525.ebuild 3472 SHA256 43b44998a9d7d396856daf7554b38edbddf86fa2a18acd04d880172913263915 SHA512 0c0cb64de39321b3d0ec10df3c058096369c60c4c24bacc89f894e4a2b1a52f4545c71ec2e32f53e85623e3d81c1b25c2f10f6bd16b48c652a5d4833254f6864 WHIRLPOOL 430f866dcb6e75282c25cf908c789e20fb0015ba729b5d74b36bcad8c6edcf9158c7151e1d98e15a6e2ead5cbbbc0db2da00a47e689116541630b042cd5daeca
 EBUILD netbeans-profiler-9999_p20160526.ebuild 3472 SHA256 9c5c819930b714dd0dfa69331167ffe84f3e1f64091a2bf98bdbb193ea5d02eb SHA512 6920123dd625b37f41b0fd7fe6a56264737003ae056db050e954a41a7c9e0344247214c7be51ed4bd91e923edd1ba453540690bcd9491a07c5f0aa6bbfc04a8b WHIRLPOOL 9e12ef4ee182fd6d4b9808adaf2f5f0264a93d7a1dbb1e1a0fcda61ca0bcdf4b967820485c462eaa569663c9c4a04184dd6e3f79cdb61296634cb24505a08098
 EBUILD netbeans-profiler-9999_p20160527.ebuild 3472 SHA256 a606cd9bf4b3cd59ab6f6837c30a87030073c1c3f99067074b4a9a54aeb7ace7 SHA512 3d6530b60d7fbab5c389813df9a9100f630289a82301572f50158492c2f624fa6c36e63c79c6fb74b7cde690aa6a529a20b9fcbf7bb4b0d973fe10126fba91eb WHIRLPOOL 33770ccd6c966b016d6627bafc8cbc8019972f01222fe09957d1cd23ce4cfa90c62fb11b2782f975189ca510a6b27054629f3a4cd3ac8e435734a1e582f958d3
 EBUILD netbeans-profiler-9999_p20160528.ebuild 3472 SHA256 8a49898402a8dc8a616ab2ac090bc203a5d1ab18d51d0ae84beca00a10957654 SHA512 51aeab139a508fe6b722ce6c7d88b11d6f6554d1b5786d5163a2a0f09d4b0d4398673087e5cf055aa1f46e3e2f210b02347d0c372fb1205e52419620cabc78df WHIRLPOOL c6e3b7cbbac535dd84894cd3ec76552a57986d6f7406a36644da7f98571e519691f4803f4841b451564fccbe2a58b797b7500c0edcbed9fc8512ab6c57c250a0
@@ -51,4 +50,5 @@ EBUILD netbeans-profiler-9999_p20160618.ebuild 3472 SHA256 068ea21c8310f9cb3ba14
 EBUILD netbeans-profiler-9999_p20160619.ebuild 3472 SHA256 19af1b1244f0e3ffb19c71bdf9eaf6a3c73793f70ea79e2822d3574fc9a3ed0f SHA512 2e503b285d681f996ee71bf7b9edee711566a8c30a6c7df68984c08ae33058215fd2df41df4667f4c9714a68d039fcf743c57722f6974658bc469b226688efc8 WHIRLPOOL 27138ef985f80a5b6ea94e127e7b00c693c8002912202c623e337c121a2cad02cb9380a503872e08623db6ae72c9f3aa32b4e63be2ebe2a2de593dc62298fe26
 EBUILD netbeans-profiler-9999_p20160620.ebuild 3472 SHA256 2783d740b452ef41f7a254e2980990f4ea2260ccd9863f1e5bf107f6a1ee0222 SHA512 0d965efab8a7f720c2ea49db5312d9157cbd3263d228220ed8fb8e34b4cbbc01e759a1edd21379c79a7925c0fb03d5b4102762c82f6a4c4a016fbc635fa090e6 WHIRLPOOL 1a113912e4d62d5bef5c299a54cb6d64b20650202d601afc2e88c1066ca4931afe4429d57569c0500e423c6467fad8e3db462294d18671c86e39fd8b74d10bfb
 EBUILD netbeans-profiler-9999_p20160623.ebuild 3472 SHA256 c03ba3f77191b2c0278902a6c27d129647e4c83027b6e4646961500cc994d592 SHA512 9cee72e33ff2d17da6fd3fadc6fcdf20e53f9eabb35c9439e68b005dc0ba44d449535ff4d2b93cdaf473b380a40ec97aa3da597dab61a11e6e64dc73c8fca8c0 WHIRLPOOL 7c2205e79ceb1d07a5d156dcd1264045d9542bc44a10e94df0ec928ca82b19099ed027dda5a071af3a6882ca7f1ff78da43c35fe26e746f8eb332a46ea130bed
+EBUILD netbeans-profiler-9999_p20160624.ebuild 3472 SHA256 5f219257179d5ef29341672efb029a636fd40260c8547284d83b75a1a2ad2b6a SHA512 236783097672dd47c95fb97494d7700ef4de7a1179440ffc76584b7ef30b9ae87150fc1fed06ca9841515ca739c52f3e483601de1163c8ec76ec6d6065ac12b9 WHIRLPOOL b251bccb975f523bca6c255da0c2bf0b3e677cea1a2d5ef898ba2128623ad15f97f5be0e8e70074b8c38a4b942b0c84d982e6717d52397e3184908731b49f641
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160525.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160624.ebuild
similarity index 98%
rename from dev-java/netbeans-profiler/netbeans-profiler-9999_p20160525.ebuild
rename to dev-java/netbeans-profiler/netbeans-profiler-9999_p20160624.ebuild
index f45da82..b74cba6 100644
--- a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160525.ebuild
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160624.ebuild
@@ -8,7 +8,7 @@ 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-25_00-02-33/zip/netbeans-trunk-nightly-201605250002-src.zip"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-24_00-02-33/zip/netbeans-trunk-nightly-201606240002-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 )"

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index e39dc2d..0d6de3f 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -23,7 +23,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-201605250002-src.zip 213747513 SHA256 89b56f89feefee274f4fe9ececf427d7e7e1e9e2b4b6c485dcc469cda7aade2b SHA512 0ebb5e3cf920937ec79953618fae6a8c299625f762c8d4684aa8e55b2c90d04b7694bb6d62919609124482313feb8a74782bcc20932361131d3540c628717441 WHIRLPOOL d60023772410f24346bd9a7002d0f99f905f138e0286d5fcfe4138694419af4ecf94d36a53ed2b2b33ad7e5b8e2b58f3db66ecd4e950cf5887cdcad540ff1d29
 DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
@@ -46,9 +45,9 @@ DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312
 DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
 DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62d58fda2a89ef87d7a1a3d4080b66aa8330fe9a2156d8ca9b69 SHA512 9d7c92a325761b3c448c0876858865ef49963abdd40099dc9285fe3164709229de780d33ef08379787d05f4701cbda407794e32a33966cb3ef30921f60639674 WHIRLPOOL 080ca294dd6ab79bb8df1f1a9caf54765eeab73b4e7ae38ecdb9eb25c889da44c5583b61296e8f68dbb8e0b0ce30810e580aee3008e1d50bd156ca96184caebd
 DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae933c49b42cea56fe36ace1ac114430312e20a9484532e4ffeb3 SHA512 7efc824e3e47f07202d3f687726a5432fbc391c22bc762a0810a95c454c9f1f515bd0b026f22a9a00e39027023e31e9d0fcb3bc95688f8e54ec1465267246bd6 WHIRLPOOL d58c979aacb6021322b5595de5ac1a99f441413aae39bc5a02c09dc353125e778a9c62f45b8e3c88db125f27010d901d6a763f875e86e5f1aae6cc571579c2df
+DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 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_p20160525.ebuild 5343 SHA256 7b3276a21b03a8fccfc074f2c4f6d3d6901d3bf15a19e35c4c83d3e44dee36fd SHA512 df2e30ba7cf2d54651ab5203a32b15f5bd86c35ea5fa0e57f597bd9e8b93dfcc433360862a9e341a1ecbaa55bfda5b307f5e30faad6bf1a79d7c2e8d41b2b7e9 WHIRLPOOL 30018545fa4ecc42a14bedcfb0b0548ca31aed107b1e410fa5fe188dde587159c3f7d6bc41206c220642a67757b3a54375c951ee41c99203387527c33ba1ee01
 EBUILD netbeans-webcommon-9999_p20160526.ebuild 5343 SHA256 641c9053ad1d10625552c0b8564dc0f0f2e47c92bfc3ec076a2d255a5fcebbf5 SHA512 5d473720ff5e7d35e6cf03d29575e5d517fe92a67f652a82babc25c9a255c09eccdc89d68c1e48c7b2e19c0e265827cca3572ed45df445c27de07bc41601ea00 WHIRLPOOL b1ba9950f0cdc9aa10e98e2821c5ae0c9ade328fcac7e86554092a9dcfd276ef3497ffa84f66f85b2b630e6a9ab708ee7730c9a01ab94cbb1f6a4a06cacb6fc5
 EBUILD netbeans-webcommon-9999_p20160527.ebuild 5343 SHA256 0a8def86900796e0200f07ec7dc461f19765fcf6051d7a394d55d5b343510153 SHA512 fbe546b3c51d7c84779b1ec88f9894e3bf74bd76d0a4badf61ad39b154e51ae78e7a172a5bf7cd71a8872d4984661203f087010fd225ba9002b87c3a1a00d344 WHIRLPOOL ffab5b9147ac7c4fc49004d4dd0e8116e6011baad4aef4a8b46214dc950b7d6774622b13cacc38a8f50f4f43b7e86c4e96fde45d6a64f3f7471b2a1fba3dc675
 EBUILD netbeans-webcommon-9999_p20160528.ebuild 5343 SHA256 b1c3e0af12fac98bcb169b4cccd822919f965a7f842e56b2c8bec1afdcb55912 SHA512 6f77a01c8336f45fc41ea179dff017e791b3fec16ad3820ecd99abeaf597b408b6732087d4625e9325ff04379a27a580f01159c85d2abe6136b510bfafd55f76 WHIRLPOOL 170981192a08e7213376631275ec1503e5c8aac0623c5ad490f3ebe4d1b698338d57e33c79a8000b34c6c391fd76def1efe48d117e8daa4634ee7347c6067462
@@ -71,4 +70,5 @@ EBUILD netbeans-webcommon-9999_p20160618.ebuild 6242 SHA256 4c6a8e293a215d954386
 EBUILD netbeans-webcommon-9999_p20160619.ebuild 6242 SHA256 81033852b76d0de2e2031c3dc1cc4bc1149a297b12d53a871a715bbb77e58c72 SHA512 9fc9deb4ba086076c38c75bf4edeed787fd851e5cd6f9dee53d57dda5f63ba7a6f5b295c7f81e9408fa674817901c51c4a22089eef5f483ae8f9499cbfe422d3 WHIRLPOOL c8c3c187f5668db4bc1fb3445e11e706ffc6a32f912f6b98f4d2a3f4b90aa6f7c50d8a03a1386683215716b2bf01dc03b1be2872eda891921a73a1d058c909b8
 EBUILD netbeans-webcommon-9999_p20160620.ebuild 6242 SHA256 50f813cd9c83364d9fd5abc794f22c989db21227bdf74248629d3292920cc527 SHA512 5450578b8b3a630ec895ebf47d2b79b69228d04ee23035b1d3cee1879442cf36796b1673dea0fb988416ebf55b3d705fdba9f56ce46ba6b62712c6cee8ecf4c0 WHIRLPOOL d96192bac5d21537c42a3a334e95da4c67a166328c844a9bc00203969d093368f7b1a5fd4ce950e8a9715455442d51440801766efc397aaefe0975087c72e8fa
 EBUILD netbeans-webcommon-9999_p20160623.ebuild 6242 SHA256 679cf2d55516f7f13995e2aa9de1bc4d4d41903ed8f0cf58932f976f2046822a SHA512 23399f315261f8c70e37b911ae6fcfddd7050fa333e640b53bfbf841f946561a40e3dc3620ef7817602bb2bbd5080fb1ee2a72f66332c4a4f80ff240c1925f2f WHIRLPOOL 80520016205a64ca4d413892a6c0f4edc7e5576c5689d298b3c07df7b7efb257ee9d46f658c6741d0a357cc126bc54e6f6e3a4ffbf7ed3f62a674b811ce410b2
+EBUILD netbeans-webcommon-9999_p20160624.ebuild 6242 SHA256 b33d4de9344999e8f6143f29427dd689d1d6d84a205a6c07db93df897841cbe6 SHA512 b11642c296d63a1ee088f6c0bf49dba1bdea835d6956f08ee010f89578a49ccd16d80803ee087e4bff500805d0d061ea032d090be143859beeeaefd3ce3ba806 WHIRLPOOL bd9a4be8ae27eb0eb1b654752eebb2bdc23669db6a42c3b88b6e8f4963b5cc22ad1d0c554cd7d18e7c1eb23641a62081e98e6cb3d6018bfcd6f6a2a4f7b613e8
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160525.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160624.ebuild
similarity index 84%
rename from dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160525.ebuild
rename to dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160624.ebuild
index 8a478d6..da1b416 100644
--- a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160525.ebuild
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160624.ebuild
@@ -8,11 +8,15 @@ 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-25_00-02-33/zip/netbeans-trunk-nightly-201605250002-src.zip"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-24_00-02-33/zip/netbeans-trunk-nightly-201606240002-src.zip"
 SRC_URI="${SOURCE_URL}
 	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/C926927CC9D32F80BF93D2F9623E5C1C8425A75E-com.oracle.js.parser.jar
 	http://hg.netbeans.org/binaries/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar
 	http://hg.netbeans.org/binaries/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim
+	http://hg.netbeans.org/binaries/070F24B74BF12B52351FF7A9B3F7A074E5117BC8-js-corestubs.zip
+	http://hg.netbeans.org/binaries/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip
+	http://hg.netbeans.org/binaries/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip
 	http://hg.netbeans.org/binaries/0929AC5F40B5A8667021408748D64F30F77B3165-libiDeviceNativeBinding.dylib
 	http://hg.netbeans.org/binaries/2A38DA3DB5D36DBBDC0B03990B46810F72430D5E-libimobiledevice.4.dylib
 	http://hg.netbeans.org/binaries/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib
@@ -54,8 +58,12 @@ src_unpack() {
 	unpack netbeans-9999-r16-build.xml.patch.bz2
 
 	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/C926927CC9D32F80BF93D2F9623E5C1C8425A75E-com.oracle.js.parser.jar libs.nashorn/external/com.oracle.js.parser.jar || die
 	ln -s "${DISTDIR}"/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar libs.plist/external/dd-plist.jar || die
 	ln -s "${DISTDIR}"/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim cordova.platforms.ios/external/ios-sim || die
+	ln -s "${DISTDIR}"/070F24B74BF12B52351FF7A9B3F7A074E5117BC8-js-corestubs.zip javascript2.editor/external/js-corestubs.zip || die
+	ln -s "${DISTDIR}"/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip javascript2.editor/external/js-domstubs.zip || die
+	ln -s "${DISTDIR}"/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip javascript2.editor/external/js-reststubs.zip || die
 	ln -s "${DISTDIR}"/0929AC5F40B5A8667021408748D64F30F77B3165-libiDeviceNativeBinding.dylib cordova.platforms.ios/external/libiDeviceNativeBinding.dylib || die
 	ln -s "${DISTDIR}"/2A38DA3DB5D36DBBDC0B03990B46810F72430D5E-libimobiledevice.4.dylib cordova.platforms.ios/external/libimobiledevice.4.dylib || die
 	ln -s "${DISTDIR}"/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib cordova.platforms.ios/external/libplist.1.dylib || die

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 28374e4..eeb680e 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-201605250002-src.zip 213747513 SHA256 89b56f89feefee274f4fe9ececf427d7e7e1e9e2b4b6c485dcc469cda7aade2b SHA512 0ebb5e3cf920937ec79953618fae6a8c299625f762c8d4684aa8e55b2c90d04b7694bb6d62919609124482313feb8a74782bcc20932361131d3540c628717441 WHIRLPOOL d60023772410f24346bd9a7002d0f99f905f138e0286d5fcfe4138694419af4ecf94d36a53ed2b2b33ad7e5b8e2b58f3db66ecd4e950cf5887cdcad540ff1d29
 DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
@@ -26,9 +25,9 @@ DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312
 DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
 DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62d58fda2a89ef87d7a1a3d4080b66aa8330fe9a2156d8ca9b69 SHA512 9d7c92a325761b3c448c0876858865ef49963abdd40099dc9285fe3164709229de780d33ef08379787d05f4701cbda407794e32a33966cb3ef30921f60639674 WHIRLPOOL 080ca294dd6ab79bb8df1f1a9caf54765eeab73b4e7ae38ecdb9eb25c889da44c5583b61296e8f68dbb8e0b0ce30810e580aee3008e1d50bd156ca96184caebd
 DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae933c49b42cea56fe36ace1ac114430312e20a9484532e4ffeb3 SHA512 7efc824e3e47f07202d3f687726a5432fbc391c22bc762a0810a95c454c9f1f515bd0b026f22a9a00e39027023e31e9d0fcb3bc95688f8e54ec1465267246bd6 WHIRLPOOL d58c979aacb6021322b5595de5ac1a99f441413aae39bc5a02c09dc353125e778a9c62f45b8e3c88db125f27010d901d6a763f875e86e5f1aae6cc571579c2df
+DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 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_p20160525.ebuild 2721 SHA256 454a5fc60a23bc6288047a465a65ff1f1180b474a0189c84e869d65d678fc5ab SHA512 3a0ef98bf0f379e49d5340eb61810301a27f53e4e04256674349df6f08c9008bb706027550b392226b89ea6821920b0241b63533d7315c03f205187912896b55 WHIRLPOOL 9f73da6fd7ff3ace9fa4d2a0f40d51ed2026026bb91bf03f48998fda47241ca2ed146bf4ee5f8352873f16c5b538840c9539915b252b3c81a2295dcb47be9375
 EBUILD netbeans-websvccommon-9999_p20160526.ebuild 2721 SHA256 970655934ee3b7eec8935449ccd63a35112d33a858d4e9cc6404c46045f24ff3 SHA512 57de5ff271959da3a04a733df902e37d14e51fa0ee60c94ec6567eee65b182da68cfe98c90ac5a218ede59ea17f624b252bcce2f2f1072194301aa1639e0af5e WHIRLPOOL 3d3c5df73a4ee8cb03ad232792780e989bd4626a16b061c84b6e675c75448f398de0a0fab6a778ab39e511cf3e222248a954247ee833ce9bb113f281f406eb7f
 EBUILD netbeans-websvccommon-9999_p20160527.ebuild 2721 SHA256 f5f9b560951f634e83d1744f9bca681eaaf2f8a44b1d4047b4bd11f60bd27c99 SHA512 7fd7a7a696891db0c760c1c40aae8fcf1f9cd76c3f934d4c2ac14315fb629804c875edc197d438e1844d8778cf38a2a81e6de7bce4296dcdc60ec493b8938fdf WHIRLPOOL a86ed25643632aefc85f9da470473839a79944fc40e79025881c8ba9ae763b304a5f36c270087cef5f68f7d2f117637c5a85c7ac37269188f24a06afaf541769
 EBUILD netbeans-websvccommon-9999_p20160528.ebuild 2721 SHA256 df33ea22af6c470e5949bfe5fef8870f67e598cb1e33c07ff122f78c15ad06c3 SHA512 c96153fde1e4cfecbb80c9903cd9039d5cf2bacaaa97e90750c2df727bdf404f0795159895a85865f78ac4cc64617f2e565a40c27e8b7e57cfd41dc854d8142a WHIRLPOOL fde53ceeefbd901667b8df002551c17a95c19baacee332841c008755a16e25e69da3abaffa53c6be281e0e0ca15e2b34bc84804ac8fd08a0f400ebbb768d3fca
@@ -51,4 +50,5 @@ EBUILD netbeans-websvccommon-9999_p20160618.ebuild 2721 SHA256 816eeeaeefd9971b1
 EBUILD netbeans-websvccommon-9999_p20160619.ebuild 2721 SHA256 b3ea72eea2daee4050d15be4651ff7737eaefb858c8377a6e0157f771c99cf0f SHA512 84eedceb57c9426e208bf963849c1c795518f3226374b74e112c34f37027b9927a91d7ece6ee519f92bc2feed8620acd74447d8255df180d61780d2d068bbea7 WHIRLPOOL c902df360ecbab629270ca75265d2358af4276d2500f3af92333503d123512fff1467ff4d34dc135d38180e73367968c2a289fda058348c8728f7625d86b3da2
 EBUILD netbeans-websvccommon-9999_p20160620.ebuild 2721 SHA256 0fba571efa2cbc1777d55e545c9a35a6540b58e5021ccec5a054c6d990140b72 SHA512 893210316b18abb14b4e3ee3c6d8ea86a00f21ffd9f738f9f4c0538d698b20920e7209ffbeb69fc878c90c996608e0c37cada6cc6d7117731d91b853ef0cbb2d WHIRLPOOL d8c6e50f126f595292409989b2ee7312935765c1094f17aadec335f81687b80c5698c88b7b2ba154bb7eba5ed497a06692f8a39d15b3d00dd62f9051b235201a
 EBUILD netbeans-websvccommon-9999_p20160623.ebuild 2721 SHA256 d3ec1b666ede975d0d24027b33ef4bf8ed1dd7fa829f49f2f535db0e0c71a491 SHA512 b35ec5596fb73c55d037cd89877e908d9d71bb7ffdc602134f0fa096164cb173005048ed4b89230a878bad6b7588bf6753a9ac87ce4ffa709cdc9346cfe7f9e0 WHIRLPOOL f4c368f396c6c97a0e438855744dfa4e8f7ee7b80d6549490fc86b3d226d27921cd623d26ef58832c1026cb84b6209d9367fc7ad8d2261714357657000f68e9d
+EBUILD netbeans-websvccommon-9999_p20160624.ebuild 2721 SHA256 bbfe41fcc347cd0cdcd7e461e2d9d4712009af6582017a6424f0c5d233048a08 SHA512 aad2c8f4566549a62e4352b9da79ea3b2642fe675f5f49f293ed803d63c2d0239fa55a74be72b806ddc01e229e0f1cc55b56ddb7692bbc91298e08260e6e3928 WHIRLPOOL f9c39dca5560d8ec8080bcaea6197ec0583ad91e693c1ee7f6bd1b6ead2df6ae07abf93d0f0168f2aaad59b5e0f245ece3329b0862a8406dd8cbaf76419d860a
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160525.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160624.ebuild
similarity index 97%
rename from dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160525.ebuild
rename to dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160624.ebuild
index 16011a9..6c86420 100644
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160525.ebuild
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160624.ebuild
@@ -8,7 +8,7 @@ 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-25_00-02-33/zip/netbeans-trunk-nightly-201605250002-src.zip"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-24_00-02-33/zip/netbeans-trunk-nightly-201606240002-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 )"

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 4859392..bc645d9 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-201605250002-src.zip 213747513 SHA256 89b56f89feefee274f4fe9ececf427d7e7e1e9e2b4b6c485dcc469cda7aade2b SHA512 0ebb5e3cf920937ec79953618fae6a8c299625f762c8d4684aa8e55b2c90d04b7694bb6d62919609124482313feb8a74782bcc20932361131d3540c628717441 WHIRLPOOL d60023772410f24346bd9a7002d0f99f905f138e0286d5fcfe4138694419af4ecf94d36a53ed2b2b33ad7e5b8e2b58f3db66ecd4e950cf5887cdcad540ff1d29
 DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
@@ -29,9 +28,9 @@ DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312
 DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
 DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62d58fda2a89ef87d7a1a3d4080b66aa8330fe9a2156d8ca9b69 SHA512 9d7c92a325761b3c448c0876858865ef49963abdd40099dc9285fe3164709229de780d33ef08379787d05f4701cbda407794e32a33966cb3ef30921f60639674 WHIRLPOOL 080ca294dd6ab79bb8df1f1a9caf54765eeab73b4e7ae38ecdb9eb25c889da44c5583b61296e8f68dbb8e0b0ce30810e580aee3008e1d50bd156ca96184caebd
 DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae933c49b42cea56fe36ace1ac114430312e20a9484532e4ffeb3 SHA512 7efc824e3e47f07202d3f687726a5432fbc391c22bc762a0810a95c454c9f1f515bd0b026f22a9a00e39027023e31e9d0fcb3bc95688f8e54ec1465267246bd6 WHIRLPOOL d58c979aacb6021322b5595de5ac1a99f441413aae39bc5a02c09dc353125e778a9c62f45b8e3c88db125f27010d901d6a763f875e86e5f1aae6cc571579c2df
+DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 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_p20160525.ebuild 6939 SHA256 0547c4c4c43aac77de818f28a39cd6b436e99bc15b51e4ccdd9bb6d59a8107e1 SHA512 99f5ed7ca68640352b0cbc22813d4cd3926e56e507791c3232e212781a60403f701a1a9cf7e32212a3f236b23fa6fac56e48be6d264408b6a5a8d3c9efe6b58f WHIRLPOOL 857bfeae2aaee8e26b65bdb3186d7e20c139da37384ae80950c6d1b4bf01ba20a074cafb0aef76bf87341cdba84566440e56e9e1ac8538a974ddfba78f765c2e
 EBUILD netbeans-9999_p20160526.ebuild 6939 SHA256 2565f9c875e0303e0c161ba372716b4c6b0972abd4013b3da988e0cd5c223dfd SHA512 13583780bacb761445bc2c9331b374d889c9629c69cf70bf800951b8e57e80b86bf59bb5872bb0d3bd18c48cf21bd0420eca9ce59cc89e46ac845a9bdc6e9c1a WHIRLPOOL 910a1c3a7518eff6be5fc69a0f33fc3f09ff0b88452b1cf43eebc1df1bd4d86fa63710a4da739755a9d4d0bcf3ca8bb1023728d035f9021479fc6d4845a0ea9b
 EBUILD netbeans-9999_p20160527.ebuild 6939 SHA256 4609ef39a87fc0528b592a021a612c0e7c855a0b70778385a5f18a90ea8b73af SHA512 8912aea322ba92c9d8a03bf10717cae056a9ecfb89928e76aa468923c92d6c251980ccc7e3bfc99792863c9cd8983c5a916c41693df3f0d7160c582a5e354f6b WHIRLPOOL 66ba582715f13692fcffb6daf43e0b43bdd49393e2f1528e2aee62d86f4d31a7f1ab5557dcb7779909e0d0e8fe968f59664cd18002ec962b1095f00239ba590a
 EBUILD netbeans-9999_p20160528.ebuild 6939 SHA256 01fdb05047da53305851d0354c5abc106a327936c614853b62e56568d613bbaa SHA512 2fcffe52bca886750d9189914eddf6531e6c4c391731860e277ee8ccb394ea7f781e8ca9cc395d47c0c446cf9b16b27bf31f6bf90583f0c7a7db5b597d302c45 WHIRLPOOL 65f5b1614121b0defa87598d869af5904d14ab6ee8fc82cf9f51674972e3faa9273eba8bd6d8ab4b947940bf1517e759ea2d25888f01b3b551c9a92d84cc0ce8
@@ -54,4 +53,5 @@ EBUILD netbeans-9999_p20160618.ebuild 6939 SHA256 115c177d4137f3b54438b94d1ea5c2
 EBUILD netbeans-9999_p20160619.ebuild 6939 SHA256 da8991b33d26229f4c62b77cdbe12cf66306c2d891c109f7c471857248cecf62 SHA512 d5ef59d47f653b5fc5484c834d5571fded1d98645d0364790b6bce2e0f11f86133aa2649c7ffd8089769e6d2e2fff32025f8fd60cfd5385bc03d731321d00a43 WHIRLPOOL 3c55665ad0770d827d63709124f4bd70d61b7c3e099acba84fcdebff685427cb118322750d175baaaeb0a376e5251bdef7df2b935bd6640eebae4db52dac496c
 EBUILD netbeans-9999_p20160620.ebuild 6939 SHA256 8d7f89bd84e5979e27ac02ec9d644b8735a29ac19227b954ce8d5303cd9977ec SHA512 062c9d78fe2a6ad5d43248f2358ebb5351bc6f9b81ee430c914bb7f92d9ad0743312ec65b432e176900a6b8247b81ecc4b8ae11dbeb80be149f9482a0824a5be WHIRLPOOL bccb4c83212e26a002127747691ade7a7302300e8695e0a7a4caa312da4ea0a1e36a95a6c22288f2f2eeb32e72f6379ab9cc4b52eb43df28557b54cbccd15ee7
 EBUILD netbeans-9999_p20160623.ebuild 6939 SHA256 78857857866bdffcd2b189abd7065e678df23e0f15144e257b3f61d0e82e19c5 SHA512 e0feedb2fd5a3ba682c271c3326f600d319150308128cbaff160d2caa0e55d37125c2c5b7b7f5449b40cce9720a48d75eeafa4374290912ae1fb198401e9bb4c WHIRLPOOL 2b3a1ae8fb565122065043e28d5573872137886a10c6e12d2f57fab9a0a9e3f760a2778dad62647aba4cd79dd12bc336ad41d148d730f47e664cebde1fc5f6d0
+EBUILD netbeans-9999_p20160624.ebuild 6939 SHA256 e0af54b241a84ce091841bf5f5554b8d1e13ff91f77dd04fc26a7038cd4901ed SHA512 c20988d0f5633c4bb3c6f969fee8397743f997a1db197c646212c40ad0454adee3d2186c1b09080ca42fb43add0538b92a6e296392bf8250be2a5a18fd96579a WHIRLPOOL 8ac633aa467f081bfe5222db40851fadb5cacb88db6125e53f81dc984a00ea94febee236f961b425611b1877f22aec1c2798ff3ca739524e77728afdbcd880db
 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834

diff --git a/dev-util/netbeans/netbeans-9999_p20160525.ebuild b/dev-util/netbeans/netbeans-9999_p20160624.ebuild
similarity index 99%
rename from dev-util/netbeans/netbeans-9999_p20160525.ebuild
rename to dev-util/netbeans/netbeans-9999_p20160624.ebuild
index 282c6a7..b06f39a 100644
--- a/dev-util/netbeans/netbeans-9999_p20160525.ebuild
+++ b/dev-util/netbeans/netbeans-9999_p20160624.ebuild
@@ -8,7 +8,7 @@ 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-25_00-02-33/zip/netbeans-trunk-nightly-201605250002-src.zip"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-24_00-02-33/zip/netbeans-trunk-nightly-201606240002-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}"


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-06-24  9:25 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-24  9:25 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-ergonomics/, dev-java/netbeans-java/, Miroslav Šulc
  -- strict thread matches above, loose matches on Subject: below --
2016-03-31  9:48 Miroslav Šulc

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