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

[Miroslav Šulc]

commit:     9fb32f26d38d6911958b2ca9603b0a7c175de760
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  1 08:15:08 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Apr  1 08:15:08 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=9fb32f26

netbeans: removed obsolete ebuilds

Package-Manager: portage-2.2.28

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 71b3b1a..dc9caa4 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -5,7 +5,6 @@ DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296
 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-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-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
 DIST netbeans-trunk-nightly-201603020002-src.zip 209839907 SHA256 91c9ed3b576c52bffba075ad256b28b6b1802021a76be1d175e2312c361bb60b SHA512 5bb4e3e00ee257f3b2210263af0a60d67b23aa4b1fc306f4be3356a62ba3244e8a7a251f3b959dfc6f9b96ec105b93c0921c01e3edfc5406ffbb7793d6187e14 WHIRLPOOL 484732e1f08ef761e6abf2152145237a09df188ad2000b4d456e44559bcfc350e88a9050b83a45f065db6a42317bace29e1cb65b2f371aa8d59ef8d5aa3c0fb7
@@ -26,7 +25,6 @@ DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e83
 DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58600be3c4071f913d65b8a73ed4e4610f8890fe0fc7cf5cec7b SHA512 80b6c4987a553f651da90e1d3b690eb0f0892993c52d23d85047cad19fa9fecf107bfdddbb2615ece2ba2c41a157a59f5e0d7c0f79081ae4972b297b1a28547b WHIRLPOOL f9d7bf3d1291b3447221e23d775c6d0236b8f676d39ed1298f30f90d733c079515a1ea9b2abb6c7598d57da26d1698178937bbf54e1dfcca08dce9fa398771b1
 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_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
 EBUILD netbeans-apisupport-9999_p20160302.ebuild 3384 SHA256 9b574dadfe820241cadbbb02141957f69ee39ff886311a3a4f9b5dc84f8ec19f SHA512 55932d28ebd9ee3f4501f3c7d14c46e1f80a5e4f20d4a64fedc356539b7dcbbb2f49a51c7e89e1a983ae0130bad16d9682ac2495e32501e497142763cc651c5f WHIRLPOOL ee07d4211e69cc0b10e85018aec29dabd2aed1b10ad68447e8011cd3fac635ef7f84a793acd3039b4eee36b56f13d2575725579041e238ae5ab414f251e2f7d8

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160228.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160228.ebuild
deleted file mode 100644
index 2053e30..0000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160228.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-28_00-02-15/zip/netbeans-trunk-nightly-201602280002-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 2d9d6d1..24c18e0 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -18,7 +18,6 @@ DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296
 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-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-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
 DIST netbeans-trunk-nightly-201603020002-src.zip 209839907 SHA256 91c9ed3b576c52bffba075ad256b28b6b1802021a76be1d175e2312c361bb60b SHA512 5bb4e3e00ee257f3b2210263af0a60d67b23aa4b1fc306f4be3356a62ba3244e8a7a251f3b959dfc6f9b96ec105b93c0921c01e3edfc5406ffbb7793d6187e14 WHIRLPOOL 484732e1f08ef761e6abf2152145237a09df188ad2000b4d456e44559bcfc350e88a9050b83a45f065db6a42317bace29e1cb65b2f371aa8d59ef8d5aa3c0fb7
@@ -39,7 +38,6 @@ DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e83
 DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58600be3c4071f913d65b8a73ed4e4610f8890fe0fc7cf5cec7b SHA512 80b6c4987a553f651da90e1d3b690eb0f0892993c52d23d85047cad19fa9fecf107bfdddbb2615ece2ba2c41a157a59f5e0d7c0f79081ae4972b297b1a28547b WHIRLPOOL f9d7bf3d1291b3447221e23d775c6d0236b8f676d39ed1298f30f90d733c079515a1ea9b2abb6c7598d57da26d1698178937bbf54e1dfcca08dce9fa398771b1
 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_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
 EBUILD netbeans-cnd-9999_p20160302.ebuild 4790 SHA256 201c8f9988034548d74a03096a28213afab359665fbf5256288d4e8c717e795c SHA512 e557171e283d86e8fc5f5798a51f4c2b8bab6261857b218303854b9a5c5417a5b8d92268a244f5607d02e18f26b1b8cf5f44ff4771e012b8c11a32f3db484d20 WHIRLPOOL bb12d48fdf69b938114514667c759ab9f66dba5058d0ba1b75afdb37f020fd6273cfa37c615ed9593a77462cbf1529dfb946ee6457e2888e6b6b2227222c7e97

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160228.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160228.ebuild
deleted file mode 100644
index ae1101a..0000000
--- a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160228.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-28_00-02-15/zip/netbeans-trunk-nightly-201602280002-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 fdbfef8..b49d540 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -8,7 +8,6 @@ DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296
 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-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-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
 DIST netbeans-trunk-nightly-201603020002-src.zip 209839907 SHA256 91c9ed3b576c52bffba075ad256b28b6b1802021a76be1d175e2312c361bb60b SHA512 5bb4e3e00ee257f3b2210263af0a60d67b23aa4b1fc306f4be3356a62ba3244e8a7a251f3b959dfc6f9b96ec105b93c0921c01e3edfc5406ffbb7793d6187e14 WHIRLPOOL 484732e1f08ef761e6abf2152145237a09df188ad2000b4d456e44559bcfc350e88a9050b83a45f065db6a42317bace29e1cb65b2f371aa8d59ef8d5aa3c0fb7
@@ -29,7 +28,6 @@ DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e83
 DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58600be3c4071f913d65b8a73ed4e4610f8890fe0fc7cf5cec7b SHA512 80b6c4987a553f651da90e1d3b690eb0f0892993c52d23d85047cad19fa9fecf107bfdddbb2615ece2ba2c41a157a59f5e0d7c0f79081ae4972b297b1a28547b WHIRLPOOL f9d7bf3d1291b3447221e23d775c6d0236b8f676d39ed1298f30f90d733c079515a1ea9b2abb6c7598d57da26d1698178937bbf54e1dfcca08dce9fa398771b1
 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_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
 EBUILD netbeans-dlight-9999_p20160302.ebuild 2968 SHA256 2afa739f78ccf71ef8329cfe7ce98084d1497cfc5a48bff77d16b2112ccf20c9 SHA512 6996f0e0b5dc403009ccec20ee78bf1b0b80b733d7beb938a28a2c18db9c7925d731ee391c404f5622ef7ce4624c80db00d08531b336e2900b8e6abdbb8b37dc WHIRLPOOL e2c4248aa7ec0f347a0700e64404068d2a3d84ee55822a7ed6fe53709d3fad219999d6056e27030bc3eb8436b622f52bb6d029173cbbc5d908f298db717380ea

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160228.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160228.ebuild
deleted file mode 100644
index cf1017f..0000000
--- a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160228.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-28_00-02-15/zip/netbeans-trunk-nightly-201602280002-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 b02ad7b..f06c51f 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -37,7 +37,6 @@ DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296
 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-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-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
 DIST netbeans-trunk-nightly-201603020002-src.zip 209839907 SHA256 91c9ed3b576c52bffba075ad256b28b6b1802021a76be1d175e2312c361bb60b SHA512 5bb4e3e00ee257f3b2210263af0a60d67b23aa4b1fc306f4be3356a62ba3244e8a7a251f3b959dfc6f9b96ec105b93c0921c01e3edfc5406ffbb7793d6187e14 WHIRLPOOL 484732e1f08ef761e6abf2152145237a09df188ad2000b4d456e44559bcfc350e88a9050b83a45f065db6a42317bace29e1cb65b2f371aa8d59ef8d5aa3c0fb7
@@ -58,7 +57,6 @@ DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e83
 DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58600be3c4071f913d65b8a73ed4e4610f8890fe0fc7cf5cec7b SHA512 80b6c4987a553f651da90e1d3b690eb0f0892993c52d23d85047cad19fa9fecf107bfdddbb2615ece2ba2c41a157a59f5e0d7c0f79081ae4972b297b1a28547b WHIRLPOOL f9d7bf3d1291b3447221e23d775c6d0236b8f676d39ed1298f30f90d733c079515a1ea9b2abb6c7598d57da26d1698178937bbf54e1dfcca08dce9fa398771b1
 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_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
 EBUILD netbeans-enterprise-9999_p20160302.ebuild 15825 SHA256 baa11802b46d4cf54c18f65fe8791f6fc6cdb82b71dbac63eab4a31c819c0965 SHA512 7aec44f17ada9f682df1c1098ab0fa456da4634a3d3d04b9b288b642bd37d69adfc170151f29c80b67084140cc6a543dd6cc5df2e2ffa81f6b029c586c6358c7 WHIRLPOOL 260906e667949ecdebae890a3e074bae10563eb3c7ebc8660330dba7464302975ced174e49971a20f387f1f40e5d848c59ffe1a06bb205571dd32f6485b1c37d

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160228.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160228.ebuild
deleted file mode 100644
index 49bd6b2..0000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160228.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-28_00-02-15/zip/netbeans-trunk-nightly-201602280002-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 1ffcbd7..6b82274 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -5,7 +5,6 @@ DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296
 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-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-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
 DIST netbeans-trunk-nightly-201603020002-src.zip 209839907 SHA256 91c9ed3b576c52bffba075ad256b28b6b1802021a76be1d175e2312c361bb60b SHA512 5bb4e3e00ee257f3b2210263af0a60d67b23aa4b1fc306f4be3356a62ba3244e8a7a251f3b959dfc6f9b96ec105b93c0921c01e3edfc5406ffbb7793d6187e14 WHIRLPOOL 484732e1f08ef761e6abf2152145237a09df188ad2000b4d456e44559bcfc350e88a9050b83a45f065db6a42317bace29e1cb65b2f371aa8d59ef8d5aa3c0fb7
@@ -26,7 +25,6 @@ DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e83
 DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58600be3c4071f913d65b8a73ed4e4610f8890fe0fc7cf5cec7b SHA512 80b6c4987a553f651da90e1d3b690eb0f0892993c52d23d85047cad19fa9fecf107bfdddbb2615ece2ba2c41a157a59f5e0d7c0f79081ae4972b297b1a28547b WHIRLPOOL f9d7bf3d1291b3447221e23d775c6d0236b8f676d39ed1298f30f90d733c079515a1ea9b2abb6c7598d57da26d1698178937bbf54e1dfcca08dce9fa398771b1
 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_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
 EBUILD netbeans-ergonomics-9999_p20160302.ebuild 2913 SHA256 1aacd41b89f0799a591494472a98e0c72ce94c7ca5c774f3f76c739850799fde SHA512 ed97ef9437546a97e27d7f075d65a5705cdbaeebf70a4002df56dd0427083d508066daee7ba0db20bc6fe3cf4c46d7be614f065ebcad9c99fbc9c29b66e53de1 WHIRLPOOL 3e22b5b92997dcc933bbe15ff4a39a449914af735fe8b227d5ab1b9e987f0f26bf57009f5f411d69e47a4036a0fa3f5ed6d25a9685d443812aac8e236cc9f66f

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160228.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160228.ebuild
deleted file mode 100644
index cded30c..0000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160228.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-28_00-02-15/zip/netbeans-trunk-nightly-201602280002-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 a959f87..1addc9f 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -7,7 +7,6 @@ DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296
 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-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-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
 DIST netbeans-trunk-nightly-201603020002-src.zip 209839907 SHA256 91c9ed3b576c52bffba075ad256b28b6b1802021a76be1d175e2312c361bb60b SHA512 5bb4e3e00ee257f3b2210263af0a60d67b23aa4b1fc306f4be3356a62ba3244e8a7a251f3b959dfc6f9b96ec105b93c0921c01e3edfc5406ffbb7793d6187e14 WHIRLPOOL 484732e1f08ef761e6abf2152145237a09df188ad2000b4d456e44559bcfc350e88a9050b83a45f065db6a42317bace29e1cb65b2f371aa8d59ef8d5aa3c0fb7
@@ -28,7 +27,6 @@ DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e83
 DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58600be3c4071f913d65b8a73ed4e4610f8890fe0fc7cf5cec7b SHA512 80b6c4987a553f651da90e1d3b690eb0f0892993c52d23d85047cad19fa9fecf107bfdddbb2615ece2ba2c41a157a59f5e0d7c0f79081ae4972b297b1a28547b WHIRLPOOL f9d7bf3d1291b3447221e23d775c6d0236b8f676d39ed1298f30f90d733c079515a1ea9b2abb6c7598d57da26d1698178937bbf54e1dfcca08dce9fa398771b1
 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_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
 EBUILD netbeans-extide-9999_p20160302.ebuild 3377 SHA256 3cc5ca8056721ccaae08a02c1c0b650a24fa8f2c47d9bb01f3c267f02e2e0308 SHA512 5e12ab7e6f8686e7ac3ccef4dc89d5854c1b832f9fe104a02dfd6baf73d8c4dea8081d2e21bdadc9713fa98d33131c00cc92eea23bb3eff1d77fd61eac828cb8 WHIRLPOOL 8ca998540d1844d36de343f77d433e1564fecbac41ed6653adaec62d83d9347ef5514d39da80f3a9b1d0a4e89e0e61e3cf318a3f21c9e8bd6d3d2480406dc859

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160228.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160228.ebuild
deleted file mode 100644
index 9d7735c..0000000
--- a/dev-java/netbeans-extide/netbeans-extide-9999_p20160228.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-28_00-02-15/zip/netbeans-trunk-nightly-201602280002-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 4e1f609..9fdd5b5 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -7,7 +7,6 @@ DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296
 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-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-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
 DIST netbeans-trunk-nightly-201603020002-src.zip 209839907 SHA256 91c9ed3b576c52bffba075ad256b28b6b1802021a76be1d175e2312c361bb60b SHA512 5bb4e3e00ee257f3b2210263af0a60d67b23aa4b1fc306f4be3356a62ba3244e8a7a251f3b959dfc6f9b96ec105b93c0921c01e3edfc5406ffbb7793d6187e14 WHIRLPOOL 484732e1f08ef761e6abf2152145237a09df188ad2000b4d456e44559bcfc350e88a9050b83a45f065db6a42317bace29e1cb65b2f371aa8d59ef8d5aa3c0fb7
@@ -28,7 +27,6 @@ DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e83
 DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58600be3c4071f913d65b8a73ed4e4610f8890fe0fc7cf5cec7b SHA512 80b6c4987a553f651da90e1d3b690eb0f0892993c52d23d85047cad19fa9fecf107bfdddbb2615ece2ba2c41a157a59f5e0d7c0f79081ae4972b297b1a28547b WHIRLPOOL f9d7bf3d1291b3447221e23d775c6d0236b8f676d39ed1298f30f90d733c079515a1ea9b2abb6c7598d57da26d1698178937bbf54e1dfcca08dce9fa398771b1
 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_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
 EBUILD netbeans-groovy-9999_p20160302.ebuild 3416 SHA256 dfeb115f9c8418221c46cf95bced0aea733b1d5097b5dc97c32dc3b4cb51bf51 SHA512 c9a4d9a2ccd0d3d6333a1fa55b3b0271cd7c1fc0906276d3a085750a06fd2e66b3e79cbe049c0963ab10c12aa0e6de5f1b81b2af8c502bb9a4ff37baa4bdcd29 WHIRLPOOL e2844b7f006466ac790b09d53783d3e3e9abac0ba4a5d29b8b550df62c15a26a268e85a5cad340897d99e21b5ff8c37fcd928b602580cd32259f12cbd8f7cc4a

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160228.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160228.ebuild
deleted file mode 100644
index b6e4579..0000000
--- a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160228.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-28_00-02-15/zip/netbeans-trunk-nightly-201602280002-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 9b7bbda..ab85588 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -10,7 +10,6 @@ DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296
 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-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-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
 DIST netbeans-trunk-nightly-201603020002-src.zip 209839907 SHA256 91c9ed3b576c52bffba075ad256b28b6b1802021a76be1d175e2312c361bb60b SHA512 5bb4e3e00ee257f3b2210263af0a60d67b23aa4b1fc306f4be3356a62ba3244e8a7a251f3b959dfc6f9b96ec105b93c0921c01e3edfc5406ffbb7793d6187e14 WHIRLPOOL 484732e1f08ef761e6abf2152145237a09df188ad2000b4d456e44559bcfc350e88a9050b83a45f065db6a42317bace29e1cb65b2f371aa8d59ef8d5aa3c0fb7
@@ -31,7 +30,6 @@ DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e83
 DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58600be3c4071f913d65b8a73ed4e4610f8890fe0fc7cf5cec7b SHA512 80b6c4987a553f651da90e1d3b690eb0f0892993c52d23d85047cad19fa9fecf107bfdddbb2615ece2ba2c41a157a59f5e0d7c0f79081ae4972b297b1a28547b WHIRLPOOL f9d7bf3d1291b3447221e23d775c6d0236b8f676d39ed1298f30f90d733c079515a1ea9b2abb6c7598d57da26d1698178937bbf54e1dfcca08dce9fa398771b1
 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_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
 EBUILD netbeans-harness-9999_p20160302.ebuild 4126 SHA256 768bf072e09a800c23bb3b187e754efbb4739480625bf04ae0d8c7b7eda7fca7 SHA512 ca95a2e38f8a70bc2b6a9d201e5fc5621fcaf4bf921ffc2f5d4a4048549b792018e4d854cc1546ebf95857ec600b430d95b2b9494958342f15e93c1453c6036b WHIRLPOOL 6b92e72b9c27ea6a4e5b4629b3486a9f411cb28938be53f79ed102b34d6249b8d9e4b17ec0795ef64981a057c81de59d4003d3f0f94002260dc7765afd5bf863

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160228.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160228.ebuild
deleted file mode 100644
index e111326..0000000
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20160228.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-28_00-02-15/zip/netbeans-trunk-nightly-201602280002-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 14c1009..27a819e 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -137,7 +137,6 @@ DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296
 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-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-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
 DIST netbeans-trunk-nightly-201603020002-src.zip 209839907 SHA256 91c9ed3b576c52bffba075ad256b28b6b1802021a76be1d175e2312c361bb60b SHA512 5bb4e3e00ee257f3b2210263af0a60d67b23aa4b1fc306f4be3356a62ba3244e8a7a251f3b959dfc6f9b96ec105b93c0921c01e3edfc5406ffbb7793d6187e14 WHIRLPOOL 484732e1f08ef761e6abf2152145237a09df188ad2000b4d456e44559bcfc350e88a9050b83a45f065db6a42317bace29e1cb65b2f371aa8d59ef8d5aa3c0fb7
@@ -158,7 +157,6 @@ DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e83
 DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58600be3c4071f913d65b8a73ed4e4610f8890fe0fc7cf5cec7b SHA512 80b6c4987a553f651da90e1d3b690eb0f0892993c52d23d85047cad19fa9fecf107bfdddbb2615ece2ba2c41a157a59f5e0d7c0f79081ae4972b297b1a28547b WHIRLPOOL f9d7bf3d1291b3447221e23d775c6d0236b8f676d39ed1298f30f90d733c079515a1ea9b2abb6c7598d57da26d1698178937bbf54e1dfcca08dce9fa398771b1
 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_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
 EBUILD netbeans-ide-9999_p20160302.ebuild 30250 SHA256 ccff09bad7f4bad2b381fb2dfeb5dd83639f80c3c15709154166b0fb46022abd SHA512 18c3ac6b24d84234c95ae9345034c05d23eada3780510f8113ccaf33b5687a61e5f7c6cdfa4accd05edd30248e8dfae1a1bb3c2244ff99f11e649dd7ff92ce08 WHIRLPOOL 8f20ee3ce48949463d05e7acbc8af6c90972491f79e9a5dce0a9f1a427ce77a2f4dd3eac6446eb413f60ebcbb1bb4de0e4dd0064a06ee0e9b632e40d4be16e33

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160228.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160228.ebuild
deleted file mode 100644
index b771fa7..0000000
--- a/dev-java/netbeans-ide/netbeans-ide-9999_p20160228.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-28_00-02-15/zip/netbeans-trunk-nightly-201602280002-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 a7245d6..607f48b 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -37,7 +37,6 @@ DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296
 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-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-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
 DIST netbeans-trunk-nightly-201603020002-src.zip 209839907 SHA256 91c9ed3b576c52bffba075ad256b28b6b1802021a76be1d175e2312c361bb60b SHA512 5bb4e3e00ee257f3b2210263af0a60d67b23aa4b1fc306f4be3356a62ba3244e8a7a251f3b959dfc6f9b96ec105b93c0921c01e3edfc5406ffbb7793d6187e14 WHIRLPOOL 484732e1f08ef761e6abf2152145237a09df188ad2000b4d456e44559bcfc350e88a9050b83a45f065db6a42317bace29e1cb65b2f371aa8d59ef8d5aa3c0fb7
@@ -58,7 +57,6 @@ DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e83
 DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58600be3c4071f913d65b8a73ed4e4610f8890fe0fc7cf5cec7b SHA512 80b6c4987a553f651da90e1d3b690eb0f0892993c52d23d85047cad19fa9fecf107bfdddbb2615ece2ba2c41a157a59f5e0d7c0f79081ae4972b297b1a28547b WHIRLPOOL f9d7bf3d1291b3447221e23d775c6d0236b8f676d39ed1298f30f90d733c079515a1ea9b2abb6c7598d57da26d1698178937bbf54e1dfcca08dce9fa398771b1
 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_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
 EBUILD netbeans-java-9999_p20160302.ebuild 14930 SHA256 d19ac869f1ed53852561a92f4e81ecdecd9bb558c85156e025f813e4578f0b39 SHA512 2db81bd8f086846c338b5607549f057983c4b67b5881a785aefae4202f00f719e883d2c511aa18a774e45882ea58e88f6e166ba55e88ccef5d87303a272ea450 WHIRLPOOL 027eea539a7c4390e797a56eac7b3e3fe06ad5c9b58bb0111c4c095e8a5be6b4621f06a3097bf002cc8cdb232cd336fd0edeb2b373a5a1f522bd8fa682bf450a

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160228.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160228.ebuild
deleted file mode 100644
index 74ae161..0000000
--- a/dev-java/netbeans-java/netbeans-java-9999_p20160228.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-28_00-02-15/zip/netbeans-trunk-nightly-201602280002-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 f7ba15d..4c51f29 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -8,7 +8,6 @@ DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296
 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-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-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
 DIST netbeans-trunk-nightly-201603020002-src.zip 209839907 SHA256 91c9ed3b576c52bffba075ad256b28b6b1802021a76be1d175e2312c361bb60b SHA512 5bb4e3e00ee257f3b2210263af0a60d67b23aa4b1fc306f4be3356a62ba3244e8a7a251f3b959dfc6f9b96ec105b93c0921c01e3edfc5406ffbb7793d6187e14 WHIRLPOOL 484732e1f08ef761e6abf2152145237a09df188ad2000b4d456e44559bcfc350e88a9050b83a45f065db6a42317bace29e1cb65b2f371aa8d59ef8d5aa3c0fb7
@@ -29,7 +28,6 @@ DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e83
 DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58600be3c4071f913d65b8a73ed4e4610f8890fe0fc7cf5cec7b SHA512 80b6c4987a553f651da90e1d3b690eb0f0892993c52d23d85047cad19fa9fecf107bfdddbb2615ece2ba2c41a157a59f5e0d7c0f79081ae4972b297b1a28547b WHIRLPOOL f9d7bf3d1291b3447221e23d775c6d0236b8f676d39ed1298f30f90d733c079515a1ea9b2abb6c7598d57da26d1698178937bbf54e1dfcca08dce9fa398771b1
 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_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
 EBUILD netbeans-javacard-9999_p20160302.ebuild 4971 SHA256 1a5723f51676a9ca95fbffff5f78095120225fc8d7dc02890cc263252072d8d5 SHA512 cbec7feb71f916db3606b616691e2d1a2c1d8cc48b4543d9e8b015afabfe860ca9e46f83d1d4e9a86556b2e62560253f6d509498ec4aa85d0d6acaec79625cca WHIRLPOOL 913b5f5f797bbe4289b8fe24d4f4908274257f87da8eb3e611b7ef8b947c19bcc4910c091aa0eae091f2adcd19edd85d73b6abac9479d0b522d6e2c19a9db84a

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160228.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160228.ebuild
deleted file mode 100644
index 4f4ee3f..0000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160228.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-28_00-02-15/zip/netbeans-trunk-nightly-201602280002-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 f704243..68544e5 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296
 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-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-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
 DIST netbeans-trunk-nightly-201603020002-src.zip 209839907 SHA256 91c9ed3b576c52bffba075ad256b28b6b1802021a76be1d175e2312c361bb60b SHA512 5bb4e3e00ee257f3b2210263af0a60d67b23aa4b1fc306f4be3356a62ba3244e8a7a251f3b959dfc6f9b96ec105b93c0921c01e3edfc5406ffbb7793d6187e14 WHIRLPOOL 484732e1f08ef761e6abf2152145237a09df188ad2000b4d456e44559bcfc350e88a9050b83a45f065db6a42317bace29e1cb65b2f371aa8d59ef8d5aa3c0fb7
@@ -27,7 +26,6 @@ DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e83
 DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58600be3c4071f913d65b8a73ed4e4610f8890fe0fc7cf5cec7b SHA512 80b6c4987a553f651da90e1d3b690eb0f0892993c52d23d85047cad19fa9fecf107bfdddbb2615ece2ba2c41a157a59f5e0d7c0f79081ae4972b297b1a28547b WHIRLPOOL f9d7bf3d1291b3447221e23d775c6d0236b8f676d39ed1298f30f90d733c079515a1ea9b2abb6c7598d57da26d1698178937bbf54e1dfcca08dce9fa398771b1
 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_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
 EBUILD netbeans-javadoc-9999_p20160302.ebuild 6293 SHA256 d687713628124c92e188432675b4ba5731b5838397243978dff02b94b6f80256 SHA512 3a61b27c00b629e3233c95db7014302084698cb31750443fd09644960e3ee511bebfc4920bc77f3d6b648850295002ee47359bd85566964de9e15c05b6d1bba4 WHIRLPOOL 8704d85481502f3f6953ebf595643039133ed411c4ba7c6634f20e9bfeb7c8f70bbf8f347ec5e621772801bad993f7cd1076554bbaca0ef4bd8c6945ab16ae04

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160228.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160228.ebuild
deleted file mode 100644
index 3cfafa3..0000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160228.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-28_00-02-15/zip/netbeans-trunk-nightly-201602280002-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 c2b94a4..c8ccffc 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -13,7 +13,6 @@ DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296
 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-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-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
 DIST netbeans-trunk-nightly-201603020002-src.zip 209839907 SHA256 91c9ed3b576c52bffba075ad256b28b6b1802021a76be1d175e2312c361bb60b SHA512 5bb4e3e00ee257f3b2210263af0a60d67b23aa4b1fc306f4be3356a62ba3244e8a7a251f3b959dfc6f9b96ec105b93c0921c01e3edfc5406ffbb7793d6187e14 WHIRLPOOL 484732e1f08ef761e6abf2152145237a09df188ad2000b4d456e44559bcfc350e88a9050b83a45f065db6a42317bace29e1cb65b2f371aa8d59ef8d5aa3c0fb7
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e83
 DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58600be3c4071f913d65b8a73ed4e4610f8890fe0fc7cf5cec7b SHA512 80b6c4987a553f651da90e1d3b690eb0f0892993c52d23d85047cad19fa9fecf107bfdddbb2615ece2ba2c41a157a59f5e0d7c0f79081ae4972b297b1a28547b WHIRLPOOL f9d7bf3d1291b3447221e23d775c6d0236b8f676d39ed1298f30f90d733c079515a1ea9b2abb6c7598d57da26d1698178937bbf54e1dfcca08dce9fa398771b1
 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_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
 EBUILD netbeans-javafx-9999_p20160302.ebuild 4717 SHA256 be089e245a3a2a817c61b8e775d4868e593524b146954a29e87fdb8c30d1681e SHA512 73bdc6bc81ff630f114d05f6e1bf04d19dca048aaf94412db0d66afd7641453eb9d2489f160b43929f571590cd4388ee2bd1a120f586a6ee1a76fd943dd74ccc WHIRLPOOL 9cd00d0c513382e04d7d867580cb24dc568405c8cd8b53b66500bf50851cb143c1797bbd7cea4a411e9007b064949a0dc9d49e373c13bcad654cb471fae7c5b8

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160228.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160228.ebuild
deleted file mode 100644
index 2c9fd51..0000000
--- a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160228.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-28_00-02-15/zip/netbeans-trunk-nightly-201602280002-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 3cef2e0..c77dbb1 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -5,7 +5,6 @@ DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296
 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-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-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
 DIST netbeans-trunk-nightly-201603020002-src.zip 209839907 SHA256 91c9ed3b576c52bffba075ad256b28b6b1802021a76be1d175e2312c361bb60b SHA512 5bb4e3e00ee257f3b2210263af0a60d67b23aa4b1fc306f4be3356a62ba3244e8a7a251f3b959dfc6f9b96ec105b93c0921c01e3edfc5406ffbb7793d6187e14 WHIRLPOOL 484732e1f08ef761e6abf2152145237a09df188ad2000b4d456e44559bcfc350e88a9050b83a45f065db6a42317bace29e1cb65b2f371aa8d59ef8d5aa3c0fb7
@@ -26,7 +25,6 @@ DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e83
 DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58600be3c4071f913d65b8a73ed4e4610f8890fe0fc7cf5cec7b SHA512 80b6c4987a553f651da90e1d3b690eb0f0892993c52d23d85047cad19fa9fecf107bfdddbb2615ece2ba2c41a157a59f5e0d7c0f79081ae4972b297b1a28547b WHIRLPOOL f9d7bf3d1291b3447221e23d775c6d0236b8f676d39ed1298f30f90d733c079515a1ea9b2abb6c7598d57da26d1698178937bbf54e1dfcca08dce9fa398771b1
 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_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
 EBUILD netbeans-mobility-9999_p20160302.ebuild 4412 SHA256 4168cb8fd89a5551bba8fc3384106ab37c2086ee30285b40bb76910f59683990 SHA512 807b26b16119cc4c5e6ea76090baaf7399b952647065b144516d1cb2b3527b1f8c1884c125235c6700e3c54f78ff195237a6b4a705fd7ec21a114002022473b0 WHIRLPOOL 56753cd8c8eb376b5b1ce88f713a7ef02537f12b1d5114cef9b418eb387abc3abd405e411c48b2e2d2c407c2e0823601a056a49a609bbe2943fb747db8fcc6ed

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160228.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160228.ebuild
deleted file mode 100644
index 2fa73d9..0000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160228.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-28_00-02-15/zip/netbeans-trunk-nightly-201602280002-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 7a8a5fd..0f6d867 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -8,7 +8,6 @@ DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296
 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-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-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
 DIST netbeans-trunk-nightly-201603020002-src.zip 209839907 SHA256 91c9ed3b576c52bffba075ad256b28b6b1802021a76be1d175e2312c361bb60b SHA512 5bb4e3e00ee257f3b2210263af0a60d67b23aa4b1fc306f4be3356a62ba3244e8a7a251f3b959dfc6f9b96ec105b93c0921c01e3edfc5406ffbb7793d6187e14 WHIRLPOOL 484732e1f08ef761e6abf2152145237a09df188ad2000b4d456e44559bcfc350e88a9050b83a45f065db6a42317bace29e1cb65b2f371aa8d59ef8d5aa3c0fb7
@@ -29,7 +28,6 @@ DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e83
 DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58600be3c4071f913d65b8a73ed4e4610f8890fe0fc7cf5cec7b SHA512 80b6c4987a553f651da90e1d3b690eb0f0892993c52d23d85047cad19fa9fecf107bfdddbb2615ece2ba2c41a157a59f5e0d7c0f79081ae4972b297b1a28547b WHIRLPOOL f9d7bf3d1291b3447221e23d775c6d0236b8f676d39ed1298f30f90d733c079515a1ea9b2abb6c7598d57da26d1698178937bbf54e1dfcca08dce9fa398771b1
 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_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
 EBUILD netbeans-nb-9999_p20160302.ebuild 4111 SHA256 f5f1bf4267fb3fdc2fc235ec972a7df38e331234f7df2dbf00ba847933682cd7 SHA512 c7f8fffb0ef23aecd0f3c2d8a6ec4bb0e3f9bf506c8de8e5878bb034ec9780bc257bacb9652860886c0af3d1ef0ab3e3fe84bfca1f4329a8dfaa65319172f837 WHIRLPOOL 9d2b5cad58db107eb3758e6532cc3edd26590218ba9e967876fb7ba24153abdff284dcc2ead00c3066b6b49c64a605282e2c6c0a1901cdf94f7cf527900a2fab

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160228.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160228.ebuild
deleted file mode 100644
index f8e3325..0000000
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20160228.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-28_00-02-15/zip/netbeans-trunk-nightly-201602280002-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 b64ece2..7fecbcf 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -9,7 +9,6 @@ DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296
 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-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-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
 DIST netbeans-trunk-nightly-201603020002-src.zip 209839907 SHA256 91c9ed3b576c52bffba075ad256b28b6b1802021a76be1d175e2312c361bb60b SHA512 5bb4e3e00ee257f3b2210263af0a60d67b23aa4b1fc306f4be3356a62ba3244e8a7a251f3b959dfc6f9b96ec105b93c0921c01e3edfc5406ffbb7793d6187e14 WHIRLPOOL 484732e1f08ef761e6abf2152145237a09df188ad2000b4d456e44559bcfc350e88a9050b83a45f065db6a42317bace29e1cb65b2f371aa8d59ef8d5aa3c0fb7
@@ -30,7 +29,6 @@ DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e83
 DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58600be3c4071f913d65b8a73ed4e4610f8890fe0fc7cf5cec7b SHA512 80b6c4987a553f651da90e1d3b690eb0f0892993c52d23d85047cad19fa9fecf107bfdddbb2615ece2ba2c41a157a59f5e0d7c0f79081ae4972b297b1a28547b WHIRLPOOL f9d7bf3d1291b3447221e23d775c6d0236b8f676d39ed1298f30f90d733c079515a1ea9b2abb6c7598d57da26d1698178937bbf54e1dfcca08dce9fa398771b1
 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_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
 EBUILD netbeans-php-9999_p20160302.ebuild 4418 SHA256 01a8a029836bac387f50fef43583a86904bf47a2bb1f5ab546f7ae2c82f20fc5 SHA512 c4c8125aec13290d8259dc3037cb9c96808986bac04e4109550dd5993ace6e7aeb7da7b14809f22b58a3cd2cf198d76ca1c18c3b44cc9a365149a4e7ddb68b13 WHIRLPOOL f9ea78e5a14f2ab5fe7637bb611dfcd42de7cac97778439e26c7f24a338227ab0175a4beedcfa20652fcf64520b84a14477d9ebe876bbb4e5dab0faadc904454

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160228.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160228.ebuild
deleted file mode 100644
index a49fd45..0000000
--- a/dev-java/netbeans-php/netbeans-php-9999_p20160228.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-28_00-02-15/zip/netbeans-trunk-nightly-201602280002-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 e16087e..ef335a0 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -32,7 +32,6 @@ DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296
 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-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-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
 DIST netbeans-trunk-nightly-201603020002-src.zip 209839907 SHA256 91c9ed3b576c52bffba075ad256b28b6b1802021a76be1d175e2312c361bb60b SHA512 5bb4e3e00ee257f3b2210263af0a60d67b23aa4b1fc306f4be3356a62ba3244e8a7a251f3b959dfc6f9b96ec105b93c0921c01e3edfc5406ffbb7793d6187e14 WHIRLPOOL 484732e1f08ef761e6abf2152145237a09df188ad2000b4d456e44559bcfc350e88a9050b83a45f065db6a42317bace29e1cb65b2f371aa8d59ef8d5aa3c0fb7
@@ -53,7 +52,6 @@ DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e83
 DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58600be3c4071f913d65b8a73ed4e4610f8890fe0fc7cf5cec7b SHA512 80b6c4987a553f651da90e1d3b690eb0f0892993c52d23d85047cad19fa9fecf107bfdddbb2615ece2ba2c41a157a59f5e0d7c0f79081ae4972b297b1a28547b WHIRLPOOL f9d7bf3d1291b3447221e23d775c6d0236b8f676d39ed1298f30f90d733c079515a1ea9b2abb6c7598d57da26d1698178937bbf54e1dfcca08dce9fa398771b1
 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_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
 EBUILD netbeans-platform-9999_p20160302.ebuild 9360 SHA256 082c0fda7172d24a517a1c08c8eca255ff1ce461f6c1bb95b2e5cdba3d93fb9a SHA512 ca0f0f43afd9bf9ad344259a9f4a75f2a2333330c1e66589c22799e444a4617e459bc226657f4cba69f448a4671f7a283157b7dfb7f16660504e7563c6993b6a WHIRLPOOL b87f5100658399d41984a6d4093f80e48e7fada642ed0918016685f0266a27c5cb97055ec3209f89b7802cc9c653c04c04b6e8193cc9f8e87172f84577c14bbc

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160228.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160228.ebuild
deleted file mode 100644
index 2d60e9b..0000000
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20160228.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-28_00-02-15/zip/netbeans-trunk-nightly-201602280002-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 51ae310..178087b 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -5,7 +5,6 @@ DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296
 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-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-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
 DIST netbeans-trunk-nightly-201603020002-src.zip 209839907 SHA256 91c9ed3b576c52bffba075ad256b28b6b1802021a76be1d175e2312c361bb60b SHA512 5bb4e3e00ee257f3b2210263af0a60d67b23aa4b1fc306f4be3356a62ba3244e8a7a251f3b959dfc6f9b96ec105b93c0921c01e3edfc5406ffbb7793d6187e14 WHIRLPOOL 484732e1f08ef761e6abf2152145237a09df188ad2000b4d456e44559bcfc350e88a9050b83a45f065db6a42317bace29e1cb65b2f371aa8d59ef8d5aa3c0fb7
@@ -26,7 +25,6 @@ DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e83
 DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58600be3c4071f913d65b8a73ed4e4610f8890fe0fc7cf5cec7b SHA512 80b6c4987a553f651da90e1d3b690eb0f0892993c52d23d85047cad19fa9fecf107bfdddbb2615ece2ba2c41a157a59f5e0d7c0f79081ae4972b297b1a28547b WHIRLPOOL f9d7bf3d1291b3447221e23d775c6d0236b8f676d39ed1298f30f90d733c079515a1ea9b2abb6c7598d57da26d1698178937bbf54e1dfcca08dce9fa398771b1
 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_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
 EBUILD netbeans-profiler-9999_p20160302.ebuild 3472 SHA256 86e8ba407c337c7c4c22fac3b4f9f0414ef06d07f654f2dae77aaf88035de4c6 SHA512 2674cda31cd5b2f021e38c632d3b7181ae68fe0e20a4bb028680844ebe833b22ff5cd7e8e3db374019abb56b20685642d5560938a3b1842ea00f95ede113a726 WHIRLPOOL 4b8edf6b9dc823928ea0bcb429b7855750c000b57eb1d5fb4d89d532d21390e4c5c5cbef91bf771477337fa24a7ad0c7ac369809b3430a68e6b033d4d5ded111

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160228.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160228.ebuild
deleted file mode 100644
index a656013..0000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160228.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-28_00-02-15/zip/netbeans-trunk-nightly-201602280002-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 de67364..bf7e820 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -21,7 +21,6 @@ DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296
 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-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-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
 DIST netbeans-trunk-nightly-201603020002-src.zip 209839907 SHA256 91c9ed3b576c52bffba075ad256b28b6b1802021a76be1d175e2312c361bb60b SHA512 5bb4e3e00ee257f3b2210263af0a60d67b23aa4b1fc306f4be3356a62ba3244e8a7a251f3b959dfc6f9b96ec105b93c0921c01e3edfc5406ffbb7793d6187e14 WHIRLPOOL 484732e1f08ef761e6abf2152145237a09df188ad2000b4d456e44559bcfc350e88a9050b83a45f065db6a42317bace29e1cb65b2f371aa8d59ef8d5aa3c0fb7
@@ -42,7 +41,6 @@ DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e83
 DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58600be3c4071f913d65b8a73ed4e4610f8890fe0fc7cf5cec7b SHA512 80b6c4987a553f651da90e1d3b690eb0f0892993c52d23d85047cad19fa9fecf107bfdddbb2615ece2ba2c41a157a59f5e0d7c0f79081ae4972b297b1a28547b WHIRLPOOL f9d7bf3d1291b3447221e23d775c6d0236b8f676d39ed1298f30f90d733c079515a1ea9b2abb6c7598d57da26d1698178937bbf54e1dfcca08dce9fa398771b1
 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_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
 EBUILD netbeans-webcommon-9999_p20160302.ebuild 5280 SHA256 9b61eed264aec035d64fd824532e4311cddf4c6509ec37811665cb2c1a1ad6d6 SHA512 47cbe9a81a2db749d98eea79e420863d06ff3457c10d03fd8378988df76e5878ace72bb0f5d826aabc2839a27c1d465bd8b499336c0ae9a5743659bd7400344f WHIRLPOOL 0c93d1a44c0134f765e6c793f04637ac599eb82c43d14ef057234e1e0a5d081a5979a5ae50469b2e853b6c2458d94f40f44a7d990552e2dc588be68afa21d680

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160228.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160228.ebuild
deleted file mode 100644
index ccbff50..0000000
--- a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160228.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-28_00-02-15/zip/netbeans-trunk-nightly-201602280002-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 6d29921..e812185 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -5,7 +5,6 @@ DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296
 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-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-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
 DIST netbeans-trunk-nightly-201603020002-src.zip 209839907 SHA256 91c9ed3b576c52bffba075ad256b28b6b1802021a76be1d175e2312c361bb60b SHA512 5bb4e3e00ee257f3b2210263af0a60d67b23aa4b1fc306f4be3356a62ba3244e8a7a251f3b959dfc6f9b96ec105b93c0921c01e3edfc5406ffbb7793d6187e14 WHIRLPOOL 484732e1f08ef761e6abf2152145237a09df188ad2000b4d456e44559bcfc350e88a9050b83a45f065db6a42317bace29e1cb65b2f371aa8d59ef8d5aa3c0fb7
@@ -26,7 +25,6 @@ DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e83
 DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58600be3c4071f913d65b8a73ed4e4610f8890fe0fc7cf5cec7b SHA512 80b6c4987a553f651da90e1d3b690eb0f0892993c52d23d85047cad19fa9fecf107bfdddbb2615ece2ba2c41a157a59f5e0d7c0f79081ae4972b297b1a28547b WHIRLPOOL f9d7bf3d1291b3447221e23d775c6d0236b8f676d39ed1298f30f90d733c079515a1ea9b2abb6c7598d57da26d1698178937bbf54e1dfcca08dce9fa398771b1
 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_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
 EBUILD netbeans-websvccommon-9999_p20160302.ebuild 2721 SHA256 833bac6c6d420e8294fe699db7463a80832cdece415c1798594af53ed48ca993 SHA512 319afe677c3b937ed8f85127b5a53990290ae6421d2dd1a69e9afa9202b5e63bb803bfa5a1ce4c2d55c73a3d015757533d24c864b3e4857f3381505272138e6e WHIRLPOOL b6595ce1656623930f406368c723d2bfafb139c5acfe36aa01738f7bb8d1676316a1994c5735dc2a856be30af5e9078827760927da26c903002b3c2ebf51813b

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160228.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160228.ebuild
deleted file mode 100644
index 8424b88..0000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160228.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-28_00-02-15/zip/netbeans-trunk-nightly-201602280002-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 7b42a5f..e0770ee 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -8,7 +8,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-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
 DIST netbeans-trunk-nightly-201603020002-src.zip 209839907 SHA256 91c9ed3b576c52bffba075ad256b28b6b1802021a76be1d175e2312c361bb60b SHA512 5bb4e3e00ee257f3b2210263af0a60d67b23aa4b1fc306f4be3356a62ba3244e8a7a251f3b959dfc6f9b96ec105b93c0921c01e3edfc5406ffbb7793d6187e14 WHIRLPOOL 484732e1f08ef761e6abf2152145237a09df188ad2000b4d456e44559bcfc350e88a9050b83a45f065db6a42317bace29e1cb65b2f371aa8d59ef8d5aa3c0fb7
@@ -29,7 +28,6 @@ DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e83
 DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58600be3c4071f913d65b8a73ed4e4610f8890fe0fc7cf5cec7b SHA512 80b6c4987a553f651da90e1d3b690eb0f0892993c52d23d85047cad19fa9fecf107bfdddbb2615ece2ba2c41a157a59f5e0d7c0f79081ae4972b297b1a28547b WHIRLPOOL f9d7bf3d1291b3447221e23d775c6d0236b8f676d39ed1298f30f90d733c079515a1ea9b2abb6c7598d57da26d1698178937bbf54e1dfcca08dce9fa398771b1
 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_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
 EBUILD netbeans-9999_p20160302.ebuild 6939 SHA256 cd99f538b7ec973a901a535dbe9f1721215304ec3742cf2a9f5dd4fe1aaa8272 SHA512 159fd5b197a4488fa525985b804c8dfce0ab799c1b21abe77a3029a96c41c24dc010608a78e29b66654ef9ab55be91f38def0353f69ebef680a70aa98253d526 WHIRLPOOL 5340e5e79e68be79715e73997cb069e37282d5028c98f4bfe7e7b8825cd80ab9479354a9a8f236cbee8bfa924d339b39f5b627bd207c9d342e5d1c77fb64fea5

diff --git a/dev-util/netbeans/netbeans-9999_p20160228.ebuild b/dev-util/netbeans/netbeans-9999_p20160228.ebuild
deleted file mode 100644
index bb9ad1c..0000000
--- a/dev-util/netbeans/netbeans-9999_p20160228.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-28_00-02-15/zip/netbeans-trunk-nightly-201602280002-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
-}