public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-ide/, dev-java/netbeans-webcommon/, ...
@ 2016-02-20 14:19 Miroslav Šulc
  0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2016-02-20 14:19 UTC (permalink / raw
  To: gentoo-commits

commit:     3c925c6e0c8d75461b21043acc11afa8db9927ea
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 20 12:35:56 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Feb 20 12:35:56 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=3c925c6e

netbeans: removed obsolete ebuilds

Package-Manager: portage-2.2.27

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index b105d35..297c345 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201601190002-src.zip 209493622 SHA256 170dd02b09b8e637f67e9ba65239a901239db60505da64e996a883d6f6796268 SHA512 f6aa1806046166536f775914ecfc91adc4894f15d55d3164386f83733346a65f52f1bc9323f8fe2f14f65046c9409fd24ca72d623e5474736718fb88cdd0f875 WHIRLPOOL 92e847dcf9f46e58b1b94e404be99dcc16f38bfefdcaa698d290aa3c0af3a5d9c6fa8decc552bd8e8d04f3a6b86cf65729a35fcdd38fc629ffb6fd854c22210f
 DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818ce4503d91850e5a853c67249b646c7bb54710c1905202e04971 SHA512 5dd6a6dab6671ce956ed16e0072d51843cb48e3b53bdb80aa356aaaa93fa9513ecf9440556987082907cdb5054b1be70569e342848c45a6ad5754d3166375ad7 WHIRLPOOL c50bfa3d015364282856853b92e99c235786e1744f3e0eaa937b1e1db48dfa4e7cc1a29c15b6fed875d144572cb951a56dc7668be9790245276f347b2ba99b38
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 DIST netbeans-trunk-nightly-201601270002-src.zip 209531425 SHA256 368e7f65afd280d20a26b31be55a46dd03eb2ec10bc10a6126ce782b855372a2 SHA512 633671e83592c1016efcd91226b46d957435c8d55066339dc712f30a17821638b20bc617373d715914087dcb3498fa68817373f63e0489b0a35dcb9a47e382e5 WHIRLPOOL 3d5b403e4cdf89382e47c3bc471047162081a2403689484afb3b08ef764d3f38932f5dd057240840a5cf9fd6b64919ded7b08d4fc81e75352aef4ff61065c6da
@@ -29,7 +28,6 @@ DIST netbeans-trunk-nightly-201602180002-src.zip 209750814 SHA256 d26953a05588a0
 DIST netbeans-trunk-nightly-201602190002-src.zip 209766182 SHA256 80b4e9ded780778d73e969a8bf14915e140a7308918731c354eaeac4522a07cb SHA512 ed15d416fdf92adbe13eb0352174cb921ded39c8c0b496535dd0aea80589b2742116655367730226f341a5fe7901f43a0326ba68fea8f3abc14ee0940ad5accb WHIRLPOOL fc8c42415df906bb1979fc8d0192f4f360d8bd79e96531a2432769b9ff24dd0c6594fcc0d433f290b2401c74f02851daff4de1d929053459e35c6133be19dccd
 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_p20160119.ebuild 3384 SHA256 fc41bbaae084b70787fada95b6b7dcd27d02b9bcaba1f3fbe2f6ebf1356dca28 SHA512 cd05f32112cd7fb64cb576abd9422d71e59b57fc34c52b6a26f115fa0f0f0e5fb33af4e46bc2348d3586f02e03987b1cc58a0ae79275dfcc9096b1371380bc2e WHIRLPOOL c6968e851062642f3b5f645ed821e0a2ec409a536ce26a9867895ce0590ee0dc4f5ae142f19329a8adecad6176fd06279a3192802d9aa596fb20c597c8fe3b2e
 EBUILD netbeans-apisupport-9999_p20160121.ebuild 3384 SHA256 9c75578c0131b5bafb19767a703ffdf2e76240d93503c357f90bff79ad911ad4 SHA512 1e7aaa3180319e983e309ea6f4590592cd16e526481324a40911710b9fd6875f2c04701a29d13ca3ea458938220ace45367cfcb5385d060f27f45d6074ed7421 WHIRLPOOL 47180c832b41fc028d6c3cdb8dc8d1ee94ec140a570f41d03299b1e1cbed30b854ba91857be8b6ad3a4ab2f34a60abc75be78d5a92fd7b8486089fc4ff67b379
 EBUILD netbeans-apisupport-9999_p20160125.ebuild 3384 SHA256 026b4dacef92126af0149ccada098af1b10426486e00897e4d5a26a0d93a1649 SHA512 d187affb6e68ed2fb7b2a329071c3d0306ac21e8de5f6c16686e31f26f9e678eac5f32e09572cd2c4e6bccc2094ab91bd2fafe93ac8e9b4f7abf686c4effc6d4 WHIRLPOOL 6fd16327b807c2f0883faad195093368ae4586e9be8029c85a4eef05210869036aeea7faac8b36d60ecadbc7b43baf6de357c3f2c6dd9f252ba4436735cbe85f
 EBUILD netbeans-apisupport-9999_p20160127.ebuild 3384 SHA256 ebe398d51659b89da5184ade85ebab6f80aafa29a4787390c86f97c411e97adb SHA512 64c2ca899841ebb20456d4457251aa2e1e591db2c2eb6867039b8c04d7bdbbe61d2af48e0a17d2af45763ed320bc02f5379ec60114ad52ddb17ff6d058f8e7d4 WHIRLPOOL de17de704b6f37bb7d282b18c7d28ea1e9b02f6361005b3f9bbcd82612921e20c1c047398b2b66d54b03b7f74ce078fb1bcc738342a948293eaa8b3b55a2d67c

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160119.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160119.ebuild
deleted file mode 100644
index cc30d94..0000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160119.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-01-19_00-02-04/zip/netbeans-trunk-nightly-201601190002-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 52f2659..1aa6c22 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -4,7 +4,6 @@ DIST 2BCF2047382FB68A2F275677745C80E79B4046AB-cnd-rfs-1.0.zip 152701 SHA256 ee45
 DIST 4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar 164365 SHA256 8633aa79a2566f51a089195e09a4581af3ee71bfc13eb234af5e0cf6383078b4 SHA512 f1300e2d1e47659f6113a0a3dcc953766b5a8ab32f13bedf4d6ac652ffcf828c17474d47edec08d7ad9039d7abb8570770b48fa53b8ff6b47a028836490777bc WHIRLPOOL 765c87803d9cf622ae7936cb922ad9bff8823a09baf01a6c8b4a81df8ba5fd7cd17b513b36da9910b75349de45185f4641680f35be8335e08b9c30283b6d3345
 DIST 5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar 2388361 SHA256 9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7 SHA512 04be4dfba3a21f3ab9d9e439a64958bd8e844a9f151b798383bd9e0dd6ebc416783ae7cb1d1dbb27fb7288ab9756b13b8338cdb8ceb41a10949c852ad45ab1f2 WHIRLPOOL 488b7b9af1d1d06cca163d43e7be190730e2f0421796c21a26ace11196ee37a16b1bdeea78a1e2e64f8ca0e87f67a2aecd066af21505f3dd92dd76de40a94fa0
 DIST 99529DC0E1426A102A98EF5494B6F6AA6E497F62-clank_0.3.6.zip 7930942 SHA256 ad9a64303fc4db833d2789a7d5b0be537ea7db55090189411e5778efff54a8a6 SHA512 46d91f0cbe86af186b87e6b972ecc9391f5b2a670eaf7238b60bb5399c0da40382c729338d1e2cf8ab94eb4ac64bfe9253da1cfad2ec900a87d56df4d299d707 WHIRLPOOL 52ab6b35eaa04d0e375bc4aaad43c4390021309da1956e81db6ba4fc8730da147f35eeceb8a02fa7e42e315296e8be3eb03d88d7d8987fdce30ec433ac5c407b
-DIST A21C58CFB61ABF2BE8A71C920F36583C122BC8F9-clank_0.3.6.zip 9308036 SHA256 9fb2c26dd7c8926d437d68d570b27ff6410097f92e84f8bdbf307bd5df7d5418 SHA512 1cd19f85919b71442a428b01a3f82c0e97e487b7c1dc25e667c85b8693e9c089c3cfb38da9d5077d4a02489c98727157788678a8d47a9152fa44c032fcc5eba5 WHIRLPOOL 80313643cf5e1206540d49862c72d568da0fc31068489548368e62fcf2e30bb020767fdafd8391dfd435dcf041d542b373e68ddfa2b1fd1665bb4810d1881304
 DIST BB83D4F8047D608858154CB041054F5CAE35B903-cnd-rfs-1.0.zip 177647 SHA256 c92c3d3311b8f75883f4f9280fe8d6932b154c67c9dd1bd65a49beb45e578cd1 SHA512 c42e4f0c1b7efb24a45dc375180bfc8b0e02e74e01233665d3e74bf83a182c2b0bbe8b572a8eeb993d77312f6d118777d0576adfca4ea8f4c2cfe08892155345 WHIRLPOOL 41b573c7ca4b926333f28a9329a2423955055ff716e7be03b7a6f4714e7261e57574b16a0e89b96ae744dc0a36f9a4a72f8d948b11a6b8052159d42cbd40876a
 DIST BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip 31891 SHA256 dd9105ad309b56d22ef08573ec48a5f21baa2c50f8606df9c7b6245abd9dbe72 SHA512 288229a85536a45fbae6ba5a4dc085fa2053264259f14833cd435f64191a4b2f4b93c3e9981589087ec293afbb0fc76e97d2b5312a196e3b3fed11a605ab650a WHIRLPOOL 69379d331a68e1c4eb15aa8b1ff5256c9b98d9fad4688f2d306841973b151fd22ddbca25c5388af39b487b8810a2e521ffefbbb9775cf02271626179c3810c04
 DIST C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip 92177 SHA256 71e6d46d9c7e624bc83dbfa4edde20bfdcb47ae76dc2b19dd553d23f22b454e7 SHA512 64b15aa898a45c1dce0d9c58ec4ef8c3dc1a32e1213543d98002cbf5419d67b3caf4357c8a252e36951197f3edd70e34a226c989e5479ce3b2d1405783d3d530 WHIRLPOOL 675db7f81ecadcecfe52f18cf8bd465867c1dac12f818717248da9a7d071d45adeb3c6af2e6ac1863bb5ccca36ae9383722d2361c28af52e51e5f2ac34736e89
@@ -15,7 +14,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201601190002-src.zip 209493622 SHA256 170dd02b09b8e637f67e9ba65239a901239db60505da64e996a883d6f6796268 SHA512 f6aa1806046166536f775914ecfc91adc4894f15d55d3164386f83733346a65f52f1bc9323f8fe2f14f65046c9409fd24ca72d623e5474736718fb88cdd0f875 WHIRLPOOL 92e847dcf9f46e58b1b94e404be99dcc16f38bfefdcaa698d290aa3c0af3a5d9c6fa8decc552bd8e8d04f3a6b86cf65729a35fcdd38fc629ffb6fd854c22210f
 DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818ce4503d91850e5a853c67249b646c7bb54710c1905202e04971 SHA512 5dd6a6dab6671ce956ed16e0072d51843cb48e3b53bdb80aa356aaaa93fa9513ecf9440556987082907cdb5054b1be70569e342848c45a6ad5754d3166375ad7 WHIRLPOOL c50bfa3d015364282856853b92e99c235786e1744f3e0eaa937b1e1db48dfa4e7cc1a29c15b6fed875d144572cb951a56dc7668be9790245276f347b2ba99b38
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 DIST netbeans-trunk-nightly-201601270002-src.zip 209531425 SHA256 368e7f65afd280d20a26b31be55a46dd03eb2ec10bc10a6126ce782b855372a2 SHA512 633671e83592c1016efcd91226b46d957435c8d55066339dc712f30a17821638b20bc617373d715914087dcb3498fa68817373f63e0489b0a35dcb9a47e382e5 WHIRLPOOL 3d5b403e4cdf89382e47c3bc471047162081a2403689484afb3b08ef764d3f38932f5dd057240840a5cf9fd6b64919ded7b08d4fc81e75352aef4ff61065c6da
@@ -41,7 +39,6 @@ DIST netbeans-trunk-nightly-201602180002-src.zip 209750814 SHA256 d26953a05588a0
 DIST netbeans-trunk-nightly-201602190002-src.zip 209766182 SHA256 80b4e9ded780778d73e969a8bf14915e140a7308918731c354eaeac4522a07cb SHA512 ed15d416fdf92adbe13eb0352174cb921ded39c8c0b496535dd0aea80589b2742116655367730226f341a5fe7901f43a0326ba68fea8f3abc14ee0940ad5accb WHIRLPOOL fc8c42415df906bb1979fc8d0192f4f360d8bd79e96531a2432769b9ff24dd0c6594fcc0d433f290b2401c74f02851daff4de1d929053459e35c6133be19dccd
 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_p20160119.ebuild 4790 SHA256 d46a4429bf7097f3ee1bee15f738c1b29d2fb9f757cb55225e8cadade376d29b SHA512 5511ac6b765df5df83ae70f724d35c6e9cec60f620586c1ecbf61e2b75c4d522fd2fbfcf180fb79835b72a0a70d496e7f9de68d770a16c5d052cc1bbaf998656 WHIRLPOOL 939621f68132c49798ea382d717f0e41a8398c02c52002dcfa5e246fba99f55283381d616b81e67988e282084d52875785799293e4d910b0b410c97645e6cf9c
 EBUILD netbeans-cnd-9999_p20160121.ebuild 4790 SHA256 41c4fc5b64465ccb2722388c652568b2f06d4e602f7dbffc07aec401f0e6e2f5 SHA512 8a6115fc1d327d037f85af41c1b0b38e91f47bede6f58c30d7295f455f3ea0c1e2c48ecd67dc2d52856b39b8a053d870ccecb56aba43ea701498b41bdea252db WHIRLPOOL e25efd81e7c5bf411f6d35a361535f5ce6b9899b22f4563654a42dd494c36febd27ef651052c8b112f0b8f345ec976cb3292ff45d089a6bd0026b591fe05294e
 EBUILD netbeans-cnd-9999_p20160125.ebuild 4790 SHA256 329612eb3c00acad47ba0b76ebe582d8bc741224ca0b0d98b6f3d7ae0d1ca744 SHA512 98b37e66fb7e6b90d1e2ea80e52df5d1dd922daf7fc6fd930f82c70ce860b46724912b077bd28ee8ab1aa8e2c307205cebe41bf6eb0fbe84801bf7c9f295d37b WHIRLPOOL 2dae8cbd262156efbdc716580dcc610af3a57fcccbce1c2d00f467ad561519fd05e0d2ff6b27f760b4099b76947beed33c589e7909e1a9032e76f439e761e739
 EBUILD netbeans-cnd-9999_p20160127.ebuild 4790 SHA256 ef97f5648fb7e4c62ca46a05745dac7523d4286892ffc13e3fbc0f3301586071 SHA512 ccd6e138f940a3d17cab39c1206f54f161b9fa6267bc895f7bed9ef600abe94b37372c311c745738bc3857468f99e4b9d8db956b6f617c42f5b331c207d2176a WHIRLPOOL 96461880dc3076ec6c6069e7c850e42d66476217f4f385555b7aa1b874222eac1b3b87a6263e48d2d0eb3a06f8196038b8ff47fbf838d8edbb221fd14d7a7dee

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160119.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160119.ebuild
deleted file mode 100644
index a6f6b99..0000000
--- a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160119.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-01-19_00-02-04/zip/netbeans-trunk-nightly-201601190002-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/A21C58CFB61ABF2BE8A71C920F36583C122BC8F9-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}"/A21C58CFB61ABF2BE8A71C920F36583C122BC8F9-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 3bd441a..756a27c 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -2,13 +2,11 @@ DIST 0F89C62CA701D20BA9A9A526D4D017888C3B5A65-fs_server-1.0.zip 469579 SHA256 26
 DIST 457A4C66AE33D1D5887BB1F359EEA41A10EBB2AB-fs_server-1.0.zip 283369 SHA256 2da5ca58d9960bb19f3b573709c0f73a408cbd94a19e89abfcc261b85decf9d2 SHA512 60a742dad5967c2eb5350d62cfc39925a4413fc4dc904ebdf1e6a04849a4f659dc75ff6166189957854d1241badc0bc0925aa868509d96495f41f4d91565a545 WHIRLPOOL 27e8e1219ee65f87b4cf0a24ac9955bbf65e33d4cd2315bfc9c157b170b6b9eba1d703a72a4a1a2ae05462b6c8c99b82b1e908362d65bfc36685e2c1ccb75b5f
 DIST 51AC4960C19CF4C2CCA636765BFBC09A5029BFC5-fs_server-1.0.zip 453773 SHA256 9b339678aac261dd2353a4938be897eebff43c34a532263cc0c827743cd4c1b9 SHA512 ea965ed488fabe8bcb93e4b95d3c7e6f546cd8a30ec57b0268645e8270097308be9eaabeb524c4401baa78922d6a782021b46042bd44236e19ae8c94ae2e3a02 WHIRLPOOL 9044f2eb2cca1205266b065f6bf086140a33acc33b833b9e367b5f888952fa786a58bb29cf0947a863caf3c00b60fe418b8a248a06064197703d230c2374b358
 DIST AE86A01A66ADBA4126F61A340A97B093FDFC1F47-fs_server-1.0.zip 468271 SHA256 f8d7c89f465144775a2c9c44ffc3e56884f533fb53f3ed0191c9287c28042d4d SHA512 fe41daebdfff5079dc020563ae2e83ff49f868065cf60cfd50e5daac402bf38b31c33661eab3bc0aa5f07a1435fa8fec3447fbbcafee9798837203650594f7b9 WHIRLPOOL 87150771f5fb53b702cf8208fef6df1dc2e25efd6c2310b90ca0f6c188acf88ed153f4a3876cc3f54764768168f1c7dd6f6ef79282c973338af56a44c63780f2
-DIST B04B2918B79C287651DDC88A9C3D115C62056F4C-fs_server-1.0.zip 463060 SHA256 b7c77cb5ce3d94aa9f46f4ce8a26c51d76015a9cc32d8973091fbe33531a9714 SHA512 989156b5e24183cf265dea47319c9841d71812afa06149dc7ab0d45f6cf06d2701eb213aaaf919f6739ccea78ca4f81415be111ec351e556fd3af93fb0320dba WHIRLPOOL 23dbfdbcc7ffce08ab0020e0fe4c8def3fbbabaee141a6bddb02dc856b7de1700fb91e6eb96c63f68a5e35e2673d580ec4cd1b0a54d359f520a1ea07edc08e09
 DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
 DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201601190002-src.zip 209493622 SHA256 170dd02b09b8e637f67e9ba65239a901239db60505da64e996a883d6f6796268 SHA512 f6aa1806046166536f775914ecfc91adc4894f15d55d3164386f83733346a65f52f1bc9323f8fe2f14f65046c9409fd24ca72d623e5474736718fb88cdd0f875 WHIRLPOOL 92e847dcf9f46e58b1b94e404be99dcc16f38bfefdcaa698d290aa3c0af3a5d9c6fa8decc552bd8e8d04f3a6b86cf65729a35fcdd38fc629ffb6fd854c22210f
 DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818ce4503d91850e5a853c67249b646c7bb54710c1905202e04971 SHA512 5dd6a6dab6671ce956ed16e0072d51843cb48e3b53bdb80aa356aaaa93fa9513ecf9440556987082907cdb5054b1be70569e342848c45a6ad5754d3166375ad7 WHIRLPOOL c50bfa3d015364282856853b92e99c235786e1744f3e0eaa937b1e1db48dfa4e7cc1a29c15b6fed875d144572cb951a56dc7668be9790245276f347b2ba99b38
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 DIST netbeans-trunk-nightly-201601270002-src.zip 209531425 SHA256 368e7f65afd280d20a26b31be55a46dd03eb2ec10bc10a6126ce782b855372a2 SHA512 633671e83592c1016efcd91226b46d957435c8d55066339dc712f30a17821638b20bc617373d715914087dcb3498fa68817373f63e0489b0a35dcb9a47e382e5 WHIRLPOOL 3d5b403e4cdf89382e47c3bc471047162081a2403689484afb3b08ef764d3f38932f5dd057240840a5cf9fd6b64919ded7b08d4fc81e75352aef4ff61065c6da
@@ -34,7 +32,6 @@ DIST netbeans-trunk-nightly-201602180002-src.zip 209750814 SHA256 d26953a05588a0
 DIST netbeans-trunk-nightly-201602190002-src.zip 209766182 SHA256 80b4e9ded780778d73e969a8bf14915e140a7308918731c354eaeac4522a07cb SHA512 ed15d416fdf92adbe13eb0352174cb921ded39c8c0b496535dd0aea80589b2742116655367730226f341a5fe7901f43a0326ba68fea8f3abc14ee0940ad5accb WHIRLPOOL fc8c42415df906bb1979fc8d0192f4f360d8bd79e96531a2432769b9ff24dd0c6594fcc0d433f290b2401c74f02851daff4de1d929053459e35c6133be19dccd
 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_p20160119.ebuild 2968 SHA256 d09bc2ff3999157b727f9aa94a5d7480238cdcec08a348c5a9a50bef552568df SHA512 6ccab528b74eb281ded52d67942dff775ac33edbbea11197becf80f1fc407475b946f562e8e756ce4b33e3243bde17ef5f405cdb9ebf205a52c39995e9a41f1d WHIRLPOOL db6da4cdfcdf07eb62cd98e29c5821193972d50d8ab64f527235b94da04073020af0cb90aa3112bf4f0ec0d7bc290ad762dc8dd5aae4f6c6f0e26aa9ed5fd0d7
 EBUILD netbeans-dlight-9999_p20160121.ebuild 2968 SHA256 6a9ec7a28a5bd924827a94ca78733fb65386009e768d5b53f25a9daa93085066 SHA512 73709a09e83511409eab138a81d67443f5c82756c3607d94001e9d8ac42209840d64895eebc37262b3b31bc4f5ba561a663866073b246c53e801739775724b0f WHIRLPOOL 72f16d68f768ae1db82bbe3c9810dc7618350565fa58132a743020ee3730a39dbc27dd678a912e138753f6bb938a7c867aa5519540a97aa90bb12010069a78c0
 EBUILD netbeans-dlight-9999_p20160125.ebuild 2968 SHA256 fdbc13f390dc1d752e9aaa75f091afbf632c2da18a9a2cb15247d6333f8ce3cd SHA512 d6690b604c302de92d99ab1eeaf589a7556930d3109fcfe01d4ce5e3cd660b9a7849cd15d0ecaff716d7dfbec0a63fbe5710fc27903130143f8cb9ee39e7d524 WHIRLPOOL e2ef49127bae13d19ec4ee3c5ca8df258cca536c58453bf10ce446cf1190eb477435178a991a59b9995c28afcf2c824c97097468ee14a312fa60368a19056c76
 EBUILD netbeans-dlight-9999_p20160127.ebuild 2968 SHA256 94c777096574b90c00e795b157014e56f20f101be5ea66db92bdd9f71ee22167 SHA512 a2ab661a2b7dcbd4845b8d790bd64b1f6f75dabfcee466ab90d7859e008f19d9606c891576d01563d02eb25e20ac581c36b9748b1db67229582c61bce1b4031d WHIRLPOOL 5b960d602009e2c7fa613545d8e5442646368bc90c514c0abb05c2436d1a96a7d8c0c634f8dc4e877244b7e23b09763b4641e3b888f9ef85f8adde33be394188

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160119.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160119.ebuild
deleted file mode 100644
index e3c06d1..0000000
--- a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160119.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-01-19_00-02-04/zip/netbeans-trunk-nightly-201601190002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/B04B2918B79C287651DDC88A9C3D115C62056F4C-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}"/B04B2918B79C287651DDC88A9C3D115C62056F4C-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 e14edbd..656282d 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -35,7 +35,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201601190002-src.zip 209493622 SHA256 170dd02b09b8e637f67e9ba65239a901239db60505da64e996a883d6f6796268 SHA512 f6aa1806046166536f775914ecfc91adc4894f15d55d3164386f83733346a65f52f1bc9323f8fe2f14f65046c9409fd24ca72d623e5474736718fb88cdd0f875 WHIRLPOOL 92e847dcf9f46e58b1b94e404be99dcc16f38bfefdcaa698d290aa3c0af3a5d9c6fa8decc552bd8e8d04f3a6b86cf65729a35fcdd38fc629ffb6fd854c22210f
 DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818ce4503d91850e5a853c67249b646c7bb54710c1905202e04971 SHA512 5dd6a6dab6671ce956ed16e0072d51843cb48e3b53bdb80aa356aaaa93fa9513ecf9440556987082907cdb5054b1be70569e342848c45a6ad5754d3166375ad7 WHIRLPOOL c50bfa3d015364282856853b92e99c235786e1744f3e0eaa937b1e1db48dfa4e7cc1a29c15b6fed875d144572cb951a56dc7668be9790245276f347b2ba99b38
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 DIST netbeans-trunk-nightly-201601270002-src.zip 209531425 SHA256 368e7f65afd280d20a26b31be55a46dd03eb2ec10bc10a6126ce782b855372a2 SHA512 633671e83592c1016efcd91226b46d957435c8d55066339dc712f30a17821638b20bc617373d715914087dcb3498fa68817373f63e0489b0a35dcb9a47e382e5 WHIRLPOOL 3d5b403e4cdf89382e47c3bc471047162081a2403689484afb3b08ef764d3f38932f5dd057240840a5cf9fd6b64919ded7b08d4fc81e75352aef4ff61065c6da
@@ -61,7 +60,6 @@ DIST netbeans-trunk-nightly-201602180002-src.zip 209750814 SHA256 d26953a05588a0
 DIST netbeans-trunk-nightly-201602190002-src.zip 209766182 SHA256 80b4e9ded780778d73e969a8bf14915e140a7308918731c354eaeac4522a07cb SHA512 ed15d416fdf92adbe13eb0352174cb921ded39c8c0b496535dd0aea80589b2742116655367730226f341a5fe7901f43a0326ba68fea8f3abc14ee0940ad5accb WHIRLPOOL fc8c42415df906bb1979fc8d0192f4f360d8bd79e96531a2432769b9ff24dd0c6594fcc0d433f290b2401c74f02851daff4de1d929053459e35c6133be19dccd
 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_p20160119.ebuild 15825 SHA256 b31a1e788efc9ceb19f8ff6a1cb92935b0fea619bb5978cd2e3469c76215d342 SHA512 2f8941413e44e99fdd3254f37602dc47fccd7227ac770afd494eec9b7628e644d2f5c3ae195ce877571b772469fd650ae6ac392e41688a4a4112350171bba3f8 WHIRLPOOL fffbf79b8cc7b17ea4e26f706cab4ba1d9471507fd04882c7e5588d0f0644fd48cab3d72b7f51235a28dce42bef8588a876c1fbbc90001c3d94753ab1fa715b7
 EBUILD netbeans-enterprise-9999_p20160121.ebuild 15825 SHA256 0182ce742ecb59b48123a240bf0e164ae0a5dea33c8e603f07f5d94bdce72d02 SHA512 1f3f67f9a6ac2f525590b62a5064d8f1962035279b96ffdc90585693e0e40a05fca029451fc915d9126be75a136d1f2782d3cb37e1984d9c467428775410e55b WHIRLPOOL f0172b055bf5f1817e9dde5fb2cf48bf877e94454698be978f034548320ba1fdd20a37d35e4f13cc55638dbff851844ce63c9f94773e1f8f629b2cfb959f4e0f
 EBUILD netbeans-enterprise-9999_p20160125.ebuild 15825 SHA256 16f2c8bf66e344129385753b11dfb0d8a5752105e172cb593f6a1a6f52c7c68a SHA512 cae8547d52e376b6b35a7c8895f361f0ccfcf78ce3d1527c78ecc48813ad8d0d465cfba09ba58f407c45bae2b1ed3ce1a75ddbfa9dab555985faf7111d8c5e8b WHIRLPOOL b91e3a8d4efd1c4440e4eb2cd08f51fd15996de10104a930e56daf7d63c061bfba8b16ff4636eca00d5a85d225008d9c1a922353dbb89a7234cd43b06ba9ff2c
 EBUILD netbeans-enterprise-9999_p20160127.ebuild 15825 SHA256 fda016ce13996815dc1a97776d8ae4fca321fdf31926633afbc1f17f9427cdb1 SHA512 24ae4e8bbbab5cfe3fc74e3e730db4e5d66d26a04ae7fefe72e51e87d6207c18619907fe01affa7a66b9efe7ccb250be9920b9b916c7c1f0101cd2d83037a8bc WHIRLPOOL 0f6397e92aae46bd81e548dadd6491c1a7cb0032b4848b72bc4f45c652a8271e3878d1fca14cfa844799109afb7f5b5e700d6917a8c5b1bfa1eae6b3e095b7a5

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160119.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160119.ebuild
deleted file mode 100644
index 593ac51..0000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160119.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-01-19_00-02-04/zip/netbeans-trunk-nightly-201601190002-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 15898b3..c3ae0c8 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201601190002-src.zip 209493622 SHA256 170dd02b09b8e637f67e9ba65239a901239db60505da64e996a883d6f6796268 SHA512 f6aa1806046166536f775914ecfc91adc4894f15d55d3164386f83733346a65f52f1bc9323f8fe2f14f65046c9409fd24ca72d623e5474736718fb88cdd0f875 WHIRLPOOL 92e847dcf9f46e58b1b94e404be99dcc16f38bfefdcaa698d290aa3c0af3a5d9c6fa8decc552bd8e8d04f3a6b86cf65729a35fcdd38fc629ffb6fd854c22210f
 DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818ce4503d91850e5a853c67249b646c7bb54710c1905202e04971 SHA512 5dd6a6dab6671ce956ed16e0072d51843cb48e3b53bdb80aa356aaaa93fa9513ecf9440556987082907cdb5054b1be70569e342848c45a6ad5754d3166375ad7 WHIRLPOOL c50bfa3d015364282856853b92e99c235786e1744f3e0eaa937b1e1db48dfa4e7cc1a29c15b6fed875d144572cb951a56dc7668be9790245276f347b2ba99b38
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 DIST netbeans-trunk-nightly-201601270002-src.zip 209531425 SHA256 368e7f65afd280d20a26b31be55a46dd03eb2ec10bc10a6126ce782b855372a2 SHA512 633671e83592c1016efcd91226b46d957435c8d55066339dc712f30a17821638b20bc617373d715914087dcb3498fa68817373f63e0489b0a35dcb9a47e382e5 WHIRLPOOL 3d5b403e4cdf89382e47c3bc471047162081a2403689484afb3b08ef764d3f38932f5dd057240840a5cf9fd6b64919ded7b08d4fc81e75352aef4ff61065c6da
@@ -29,7 +28,6 @@ DIST netbeans-trunk-nightly-201602180002-src.zip 209750814 SHA256 d26953a05588a0
 DIST netbeans-trunk-nightly-201602190002-src.zip 209766182 SHA256 80b4e9ded780778d73e969a8bf14915e140a7308918731c354eaeac4522a07cb SHA512 ed15d416fdf92adbe13eb0352174cb921ded39c8c0b496535dd0aea80589b2742116655367730226f341a5fe7901f43a0326ba68fea8f3abc14ee0940ad5accb WHIRLPOOL fc8c42415df906bb1979fc8d0192f4f360d8bd79e96531a2432769b9ff24dd0c6594fcc0d433f290b2401c74f02851daff4de1d929053459e35c6133be19dccd
 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_p20160119.ebuild 2913 SHA256 9b204ca24d11f36f4ffd1804aadd7622dc3dbbb8beb01227804cb7750f1e37cd SHA512 9ac79c5ad0a8310345a83b79cb7d6249b0b5d77587462f725263ce4777390f7777b40bebc5076f1ba3557bc571f55a8e33b2416aef71f0186a9bf70b26274170 WHIRLPOOL ab7a9fb8a1ccf573cfbf0ea729e71209f947e1506267af977a4a09f2fc1e1948265ece0559b64420918fc7d27d28dae9cde662a3d6c7bf718fcef39780065541
 EBUILD netbeans-ergonomics-9999_p20160121.ebuild 2913 SHA256 ee6f268018a8991ab73305d758860f8ac342cf201943a79c0f636658e075c8e8 SHA512 16ffdf17a831da26a14092155fbc727c29bf642da3403843d1226ec64f1e8e669abfc35a3fed7eb916add5dc8a3dfd9c61f6703dfe3111deff27f3935791c0ad WHIRLPOOL 04090f8e5105107a90cbda0cf4c1f3dc88fde510a850e0d4285042ab5b069df7d50bff2cc15079f3b9f542c60f1a6ba6e3180a2c74b76e34fe908a8b51774913
 EBUILD netbeans-ergonomics-9999_p20160125.ebuild 2913 SHA256 cd41ca354ba9ad3e801fae43f5023af962d31a7dd0da997b40c37bf36acdd1b0 SHA512 7153dbef75dc90439c600f65cc2937c2534db17f110c8783a3a6b2e05fe8ab5150cdcd8b39c13ff8a4fb9852b1e4f68988623efc9d42e5d1afea936ae8aa2792 WHIRLPOOL 652c87cdee900888e140969c5c8b826e3a88d052ef373c55840b6c1aa43d3703f0d17207fd9d7e8f63f1a939dcfb29c3a527be628fb97b16e8eeed4cf90eeb99
 EBUILD netbeans-ergonomics-9999_p20160127.ebuild 2913 SHA256 3ff7d0ca56a47b907c8eb59fdda44013347653ac74216ae56d14217cf3961ced SHA512 028471dd3fd49a160fa212bd3dcca9a5c3724efb119ea939553f3e11174f27729c0282b844a3a7080e0bca622f8fb2680d6461d5c95f7abeb393aad2d19cdbc5 WHIRLPOOL 0b3a2d2435cabf0aabb57f6941f8db8d0f27106aa2ff47694b89653057aa25183fc586b3fa1c63c1aeb399fa8e754c9e112c8c7ffe04f031a1ee4befb3e767ec

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160119.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160119.ebuild
deleted file mode 100644
index a4dbbce..0000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160119.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-01-19_00-02-04/zip/netbeans-trunk-nightly-201601190002-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 553fc82..604c70d 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -5,7 +5,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201601190002-src.zip 209493622 SHA256 170dd02b09b8e637f67e9ba65239a901239db60505da64e996a883d6f6796268 SHA512 f6aa1806046166536f775914ecfc91adc4894f15d55d3164386f83733346a65f52f1bc9323f8fe2f14f65046c9409fd24ca72d623e5474736718fb88cdd0f875 WHIRLPOOL 92e847dcf9f46e58b1b94e404be99dcc16f38bfefdcaa698d290aa3c0af3a5d9c6fa8decc552bd8e8d04f3a6b86cf65729a35fcdd38fc629ffb6fd854c22210f
 DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818ce4503d91850e5a853c67249b646c7bb54710c1905202e04971 SHA512 5dd6a6dab6671ce956ed16e0072d51843cb48e3b53bdb80aa356aaaa93fa9513ecf9440556987082907cdb5054b1be70569e342848c45a6ad5754d3166375ad7 WHIRLPOOL c50bfa3d015364282856853b92e99c235786e1744f3e0eaa937b1e1db48dfa4e7cc1a29c15b6fed875d144572cb951a56dc7668be9790245276f347b2ba99b38
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 DIST netbeans-trunk-nightly-201601270002-src.zip 209531425 SHA256 368e7f65afd280d20a26b31be55a46dd03eb2ec10bc10a6126ce782b855372a2 SHA512 633671e83592c1016efcd91226b46d957435c8d55066339dc712f30a17821638b20bc617373d715914087dcb3498fa68817373f63e0489b0a35dcb9a47e382e5 WHIRLPOOL 3d5b403e4cdf89382e47c3bc471047162081a2403689484afb3b08ef764d3f38932f5dd057240840a5cf9fd6b64919ded7b08d4fc81e75352aef4ff61065c6da
@@ -31,7 +30,6 @@ DIST netbeans-trunk-nightly-201602180002-src.zip 209750814 SHA256 d26953a05588a0
 DIST netbeans-trunk-nightly-201602190002-src.zip 209766182 SHA256 80b4e9ded780778d73e969a8bf14915e140a7308918731c354eaeac4522a07cb SHA512 ed15d416fdf92adbe13eb0352174cb921ded39c8c0b496535dd0aea80589b2742116655367730226f341a5fe7901f43a0326ba68fea8f3abc14ee0940ad5accb WHIRLPOOL fc8c42415df906bb1979fc8d0192f4f360d8bd79e96531a2432769b9ff24dd0c6594fcc0d433f290b2401c74f02851daff4de1d929053459e35c6133be19dccd
 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_p20160119.ebuild 3377 SHA256 abf57ca85ea05d37bc1dde00796b39aa99483a49b68ae14a45fa88f3dc814666 SHA512 c79a5f69adc48a39e7786a70c89f089b611091f237f51047a9b3ba4de3b7461eba9a87983514e8eca615715a87be599e9c37a8cfe2e4e6f42966c7120bfccf40 WHIRLPOOL b525622a3df13ecf22b30128da4e242cba8acc843f4bd096d7c40acb6a11d26d705da2e775cc0d767b9c41ca01dc6ce20e93b2c640ec44027f634862775da4e8
 EBUILD netbeans-extide-9999_p20160121.ebuild 3377 SHA256 1171b89b0eb78d27cc98e2cfab502c11a375df9d53ecb0f66aa5d51db5a7132f SHA512 034b9761b9edf50685e79af80b57677207961e17c1745af201c94bfc4d8bc034de67e437ac787782f3d06a72800e0610dc5a06f0042e9f51a0aa6f4d02255154 WHIRLPOOL 3d98b3b868b849e5ffe7ad4aee5b67ec0a5fff0027544d2801febe8ecd8941199447d3056925a4be48aa620bf9dcd4cdf998d7ebdf1121909ac2c762703cddc7
 EBUILD netbeans-extide-9999_p20160125.ebuild 3377 SHA256 7f0642abe32741ef7b2bc58e569044e69c904a544e29a54d1f954e988e533930 SHA512 d90866d6d526d74d43ac2d24730173fdb17a9183fe7b7a0745b83310215a108899557d8827dfc83a6f86cd46a648b95867d87e3feeaeea4435ca4e0595538c6c WHIRLPOOL 678e3b652eee8e3eae19feae4c6a186454bfa9410f23429cf25b360743eac4c7e60891f4ee93caf57671519f1e7d9e20fe35a7f1bfdf9eaf52e6d4e375239e82
 EBUILD netbeans-extide-9999_p20160127.ebuild 3377 SHA256 3a46903906bf4438183e94e6105f15fa5967e228bcfd91b3fd5c0208bc0e09b1 SHA512 ef9978b48f38e1c5f68e73873c214b70c5a7ab46af81562e25cf6756189c09b771dd4d57daff41f7e71161421a5490dd13bf474c7de930f2ed4b607766de4892 WHIRLPOOL d510712c6351e7833bd19081a976925d93c0096e0b5b70efc9e7659810ebf9312c7d4077368b454ebdaa3f8b2f56fa366352cf16057c69a5644e8f67d8d58867

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160119.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160119.ebuild
deleted file mode 100644
index ba0e510..0000000
--- a/dev-java/netbeans-extide/netbeans-extide-9999_p20160119.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-01-19_00-02-04/zip/netbeans-trunk-nightly-201601190002-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 db8f847..3b27598 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -5,7 +5,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201601190002-src.zip 209493622 SHA256 170dd02b09b8e637f67e9ba65239a901239db60505da64e996a883d6f6796268 SHA512 f6aa1806046166536f775914ecfc91adc4894f15d55d3164386f83733346a65f52f1bc9323f8fe2f14f65046c9409fd24ca72d623e5474736718fb88cdd0f875 WHIRLPOOL 92e847dcf9f46e58b1b94e404be99dcc16f38bfefdcaa698d290aa3c0af3a5d9c6fa8decc552bd8e8d04f3a6b86cf65729a35fcdd38fc629ffb6fd854c22210f
 DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818ce4503d91850e5a853c67249b646c7bb54710c1905202e04971 SHA512 5dd6a6dab6671ce956ed16e0072d51843cb48e3b53bdb80aa356aaaa93fa9513ecf9440556987082907cdb5054b1be70569e342848c45a6ad5754d3166375ad7 WHIRLPOOL c50bfa3d015364282856853b92e99c235786e1744f3e0eaa937b1e1db48dfa4e7cc1a29c15b6fed875d144572cb951a56dc7668be9790245276f347b2ba99b38
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 DIST netbeans-trunk-nightly-201601270002-src.zip 209531425 SHA256 368e7f65afd280d20a26b31be55a46dd03eb2ec10bc10a6126ce782b855372a2 SHA512 633671e83592c1016efcd91226b46d957435c8d55066339dc712f30a17821638b20bc617373d715914087dcb3498fa68817373f63e0489b0a35dcb9a47e382e5 WHIRLPOOL 3d5b403e4cdf89382e47c3bc471047162081a2403689484afb3b08ef764d3f38932f5dd057240840a5cf9fd6b64919ded7b08d4fc81e75352aef4ff61065c6da
@@ -31,7 +30,6 @@ DIST netbeans-trunk-nightly-201602180002-src.zip 209750814 SHA256 d26953a05588a0
 DIST netbeans-trunk-nightly-201602190002-src.zip 209766182 SHA256 80b4e9ded780778d73e969a8bf14915e140a7308918731c354eaeac4522a07cb SHA512 ed15d416fdf92adbe13eb0352174cb921ded39c8c0b496535dd0aea80589b2742116655367730226f341a5fe7901f43a0326ba68fea8f3abc14ee0940ad5accb WHIRLPOOL fc8c42415df906bb1979fc8d0192f4f360d8bd79e96531a2432769b9ff24dd0c6594fcc0d433f290b2401c74f02851daff4de1d929053459e35c6133be19dccd
 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_p20160119.ebuild 3416 SHA256 e0d334028052fee896b00b9ff5bc1cbe658e7bc383204247b1560c458b2e030e SHA512 436159ecde463e6e2a47cfb2b916238c4a62c8ee2591f9bc2141b84af3c0c479cac9ea0fa44203350cb1ffec271b1b7a2cce8a8eb6d77e6347337bc955b717c2 WHIRLPOOL 89480050d25972c2cab9797909a11dab4a39c4efe08b4de14b3732e5c1fb548f608e64a6e7137ea264c9f3354a531d4570cd611966dd2b08e01a6938db0e6874
 EBUILD netbeans-groovy-9999_p20160121.ebuild 3416 SHA256 12c591901df8e14dbab8b3209996816269c1ee37e9342b9abfc1613e3253151c SHA512 cc64537ac91b33abd440ec6cf91d9979d065a31dfa092e7094fc9d5a71adcf33735f47452e5deab1d6c2b75c94315208f0e606df68256ab9ef5ef48bf96d1864 WHIRLPOOL 996f2d3a0ee069dfa374837cd2f47a7c5d5038cbe494ef5319d8112fcedaa43add975343792bf8a814bda823bed47c910fb28b24fd48f10497d5dfdbd286fe9c
 EBUILD netbeans-groovy-9999_p20160125.ebuild 3416 SHA256 4c294320f9f8c97c64c04f0a47f2b0d673efed3d489eaee78093353644e8b210 SHA512 9c8349252f862ca11c2af7a0de35eb208dbfcc4d228c312771f86b0e24a7dc28fbf1f224f89f6c4dd0e8c761e2266ef5ba68a9aa58ed5a05030e4e6e7bad7260 WHIRLPOOL 96e65af55f677ccf44b0150bc1c07dea41e41a6cad9be549ba0bf577c774d49368e18e618d9b3ca00a5f11a63de46da9d3b85d00c1ca8f0716e7707af2313fdb
 EBUILD netbeans-groovy-9999_p20160127.ebuild 3416 SHA256 18ec3e56910a46236867084529a3985fa55cf6f4c15652fa60d68d91e07c313d SHA512 2919ec033c55c235b4e2f20285b205045a80dfced74b482fda0943a904b5c98e51763bd67b9502afd794b3884523800fe27789a88f6906d35cfbd8f5e6e155e5 WHIRLPOOL 9679c5174ebf41d2c8046e0651dca4ed8ff8b210cd68fbad3a1ab5babb60be68fff0f7b722bc6f435a84ecec628bb5d52dbe2923d1ef1996aa2759c42a2ed1fb

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160119.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160119.ebuild
deleted file mode 100644
index 00f0cb2..0000000
--- a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160119.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-01-19_00-02-04/zip/netbeans-trunk-nightly-201601190002-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 bc02815..81367c0 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -8,7 +8,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201601190002-src.zip 209493622 SHA256 170dd02b09b8e637f67e9ba65239a901239db60505da64e996a883d6f6796268 SHA512 f6aa1806046166536f775914ecfc91adc4894f15d55d3164386f83733346a65f52f1bc9323f8fe2f14f65046c9409fd24ca72d623e5474736718fb88cdd0f875 WHIRLPOOL 92e847dcf9f46e58b1b94e404be99dcc16f38bfefdcaa698d290aa3c0af3a5d9c6fa8decc552bd8e8d04f3a6b86cf65729a35fcdd38fc629ffb6fd854c22210f
 DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818ce4503d91850e5a853c67249b646c7bb54710c1905202e04971 SHA512 5dd6a6dab6671ce956ed16e0072d51843cb48e3b53bdb80aa356aaaa93fa9513ecf9440556987082907cdb5054b1be70569e342848c45a6ad5754d3166375ad7 WHIRLPOOL c50bfa3d015364282856853b92e99c235786e1744f3e0eaa937b1e1db48dfa4e7cc1a29c15b6fed875d144572cb951a56dc7668be9790245276f347b2ba99b38
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 DIST netbeans-trunk-nightly-201601270002-src.zip 209531425 SHA256 368e7f65afd280d20a26b31be55a46dd03eb2ec10bc10a6126ce782b855372a2 SHA512 633671e83592c1016efcd91226b46d957435c8d55066339dc712f30a17821638b20bc617373d715914087dcb3498fa68817373f63e0489b0a35dcb9a47e382e5 WHIRLPOOL 3d5b403e4cdf89382e47c3bc471047162081a2403689484afb3b08ef764d3f38932f5dd057240840a5cf9fd6b64919ded7b08d4fc81e75352aef4ff61065c6da
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201602180002-src.zip 209750814 SHA256 d26953a05588a0
 DIST netbeans-trunk-nightly-201602190002-src.zip 209766182 SHA256 80b4e9ded780778d73e969a8bf14915e140a7308918731c354eaeac4522a07cb SHA512 ed15d416fdf92adbe13eb0352174cb921ded39c8c0b496535dd0aea80589b2742116655367730226f341a5fe7901f43a0326ba68fea8f3abc14ee0940ad5accb WHIRLPOOL fc8c42415df906bb1979fc8d0192f4f360d8bd79e96531a2432769b9ff24dd0c6594fcc0d433f290b2401c74f02851daff4de1d929053459e35c6133be19dccd
 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_p20160119.ebuild 4126 SHA256 fdbda4c4946130cd7e887097d15a15d0a426c5f96116968f991718b9dc21eb4a SHA512 8fd31cebb8fd05cdf0d83aeb0d5e2a29684b488d7df7800ea390b7a9850db2008bfd0f01763c2d5103b2fd0259132886a1abb573203a246320eb207ece7cc081 WHIRLPOOL d958625b53c60d4ddad6e982560582de653f57c8e05c61b7d53b475d126a6bf3134cfc0ac2ff4baa216b1274339c6fc956fb0578d28ff584958dea05672e6c00
 EBUILD netbeans-harness-9999_p20160121.ebuild 4126 SHA256 138c8796c0af90a99da20697ab16ecf0e94bb087fb4b555b42d34fc86240b6c5 SHA512 6a00f7d3d6170b97207fd5ed04ea0249b81d5fc28ca5db4e392b4965af9d7584b527d4e34848b08eac97ac424767b1a1e4e9e5b7530c8b5db33154a438b31a61 WHIRLPOOL 638262cfdd7cdb2622d57eab578f581a2bf1e54c0b9ee2053eab725766185e694f7eab8445fe98364c659af32dc5c18915b566fc1117995050e9ce57637c3eab
 EBUILD netbeans-harness-9999_p20160125.ebuild 4126 SHA256 05524991bd73909391ce4ab66d5d2567895f63e8863d1e11177d6617f2ce3f80 SHA512 80039f45fb33807621fd816320967a01d4f3c2ed9155837bb3eaaea31412357e421efffebd7434880d3456f3a235183175a23a4f79dfa94d382066e3da254e2b WHIRLPOOL 584c74a02d1beed52b07bc9e10432eb0ac9ada42b9c38a6115435e511545df31dd80f1acb454603a3a0845bd4a0f0d02eff3763db565c1075b81cefa251f8800
 EBUILD netbeans-harness-9999_p20160127.ebuild 4126 SHA256 186c45c90a58b47beb8fa339948f775c1635725688e8c7857fc0ece213fc26c8 SHA512 73e34bfc24482b7c8a056e54f4457acce99111c118a80cf579caa12dfea338318042a9066b5e1151020ae696174033e8174f4394c6ec331eea3326551f0d5183 WHIRLPOOL 4374ea0243c7ec94345815136bac0665cfab71405212b6c60be46ea5e626432a6f320e94577ef4d9827e8f0009db1f8a18a5e5c98162e5bcb05659f895cd0b4a

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160119.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160119.ebuild
deleted file mode 100644
index c73054c..0000000
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20160119.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-01-19_00-02-04/zip/netbeans-trunk-nightly-201601190002-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 149170c..c347e3c 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -136,7 +136,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201601190002-src.zip 209493622 SHA256 170dd02b09b8e637f67e9ba65239a901239db60505da64e996a883d6f6796268 SHA512 f6aa1806046166536f775914ecfc91adc4894f15d55d3164386f83733346a65f52f1bc9323f8fe2f14f65046c9409fd24ca72d623e5474736718fb88cdd0f875 WHIRLPOOL 92e847dcf9f46e58b1b94e404be99dcc16f38bfefdcaa698d290aa3c0af3a5d9c6fa8decc552bd8e8d04f3a6b86cf65729a35fcdd38fc629ffb6fd854c22210f
 DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818ce4503d91850e5a853c67249b646c7bb54710c1905202e04971 SHA512 5dd6a6dab6671ce956ed16e0072d51843cb48e3b53bdb80aa356aaaa93fa9513ecf9440556987082907cdb5054b1be70569e342848c45a6ad5754d3166375ad7 WHIRLPOOL c50bfa3d015364282856853b92e99c235786e1744f3e0eaa937b1e1db48dfa4e7cc1a29c15b6fed875d144572cb951a56dc7668be9790245276f347b2ba99b38
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 DIST netbeans-trunk-nightly-201601270002-src.zip 209531425 SHA256 368e7f65afd280d20a26b31be55a46dd03eb2ec10bc10a6126ce782b855372a2 SHA512 633671e83592c1016efcd91226b46d957435c8d55066339dc712f30a17821638b20bc617373d715914087dcb3498fa68817373f63e0489b0a35dcb9a47e382e5 WHIRLPOOL 3d5b403e4cdf89382e47c3bc471047162081a2403689484afb3b08ef764d3f38932f5dd057240840a5cf9fd6b64919ded7b08d4fc81e75352aef4ff61065c6da
@@ -162,7 +161,6 @@ DIST netbeans-trunk-nightly-201602180002-src.zip 209750814 SHA256 d26953a05588a0
 DIST netbeans-trunk-nightly-201602190002-src.zip 209766182 SHA256 80b4e9ded780778d73e969a8bf14915e140a7308918731c354eaeac4522a07cb SHA512 ed15d416fdf92adbe13eb0352174cb921ded39c8c0b496535dd0aea80589b2742116655367730226f341a5fe7901f43a0326ba68fea8f3abc14ee0940ad5accb WHIRLPOOL fc8c42415df906bb1979fc8d0192f4f360d8bd79e96531a2432769b9ff24dd0c6594fcc0d433f290b2401c74f02851daff4de1d929053459e35c6133be19dccd
 EBUILD netbeans-ide-8.0.2.ebuild 29317 SHA256 42218788ab0fc7c7cd1bb42a8b0c72a66543a3260b752aa55365833c355bcc63 SHA512 c712b66b6bee654390a45e5c616479df2be624bb770f3838d4fcce875f71a8d165703dffd55c4fd7d30e19c392784203e5fe01e2404907d88c935d439efaf578 WHIRLPOOL 67763e4a36215ac002fd321556ce2269affc15ba48ad5069d7ccc746d918179994f174e09305a9d9ddadddbea690778c2769e0ea1993eafc09e01580485e2292
 EBUILD netbeans-ide-8.1.ebuild 30288 SHA256 783332022c33a787ededc22d5250e30e1a91676508076fddc69ec64bbe5a6e7c SHA512 402d72f8b1a4e849dfe86054d466afeb0ab3987cd5ee747d3173874cd875fe3572be9e3ccd639fadf9e329db92e7543fd68dffc497805aa4d40b1d008c4a79ad WHIRLPOOL fd2cd798a1763af3fae44bb0eef0a4c4d932ffead6427e27d3483639348d969598b9c81d8949a3950ace1e68d3dfa0e08fe0c787b201b0cc9a95ea0040d156bf
-EBUILD netbeans-ide-9999_p20160119.ebuild 30178 SHA256 7aff885bca7e20da65f0392867aa77ce222c6c3ef95375abe727f0bae9b8f1c4 SHA512 95632c189466d632f82b082ffc84a9dce96248c9107eb7dab8ad2dcea4c3dc6bed24f8d0a1227aa86948c886623b2d40577fa8b401955e957c224fbda19da606 WHIRLPOOL aad84f24f5436a9132fa0f3ed562eebc24b635412046d1c6e93e7f6bf2bdffb3c92563c4f0701bd0da25f15aff169ec270288aad35671ae26603dbc2553130e1
 EBUILD netbeans-ide-9999_p20160121.ebuild 30178 SHA256 52f21738d45b020a58541973de6fbb2ad63b2c63ad040590528bc15156841f12 SHA512 750d147ea3100a9bede5dff4b7de1b0a5277e9648ba4961ac95c3d8f58ed9fec500e02364510e1cae0b36e735c9100164e68819fd1cfc37b3622875018117353 WHIRLPOOL 7707492251a6f14a3878f7970e9231da72b6d95fca0d818288046a786c66c21067b6f5cbc1daa0f05bacf54c5339e9edf28c2796d06bfe4793a98f71b809443b
 EBUILD netbeans-ide-9999_p20160125.ebuild 30238 SHA256 11b1d7b04d8b14a750a7a987072c7eb213f7ec34eb639bac7762dd1c76447a26 SHA512 6a2f946bffcc398fa4a101f1a6a769f86fc03615ac7c50b98c899158ade3af5105e0cd283646b9d56f2f812ca25695ffca8b5ba6ccae649c73741d383a69e2b7 WHIRLPOOL 9e8b7cadeb4d105f7ca74aea95bc513579a89aaf874ad682f317da141a5a668495ff2a1e2b476eb12d796a54a2deed3fc09da6d4b8630dd6cb142bd68692ed89
 EBUILD netbeans-ide-9999_p20160127.ebuild 30238 SHA256 efc40dd5a874dde7deeadc823f2f9805419095d49e9a49f954b3816ad8fd6487 SHA512 231a335d3b1b2aa202b4f3b9faf6b33e5047f5ac61f68d87acc047b2ce702ce2702ab6cd2ec48feffd8a55179518a9ceaef526a148c75a9ef48f8c645a3342a7 WHIRLPOOL 9d1eb9adb85233a0bbf45e48950791aef088f5c4041d5467ccd5d6c1b7d6583377e1286ba4d22323861a9ca4a19ff7e2d7e3b216b6b1d9c4a32bd497af44b674

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160119.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160119.ebuild
deleted file mode 100644
index e0a3cc8..0000000
--- a/dev-java/netbeans-ide/netbeans-ide-9999_p20160119.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-01-19_00-02-04/zip/netbeans-trunk-nightly-201601190002-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/3A7012C03E61CAF9539DAD8326659EB4CE3EA436-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143.jar
-	http://hg.netbeans.org/binaries/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar
-	http://hg.netbeans.org/binaries/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:4.4
-	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}"/3A7012C03E61CAF9539DAD8326659EB4CE3EA436-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143.jar || die
-	ln -s "${DISTDIR}"/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar || die
-	ln -s "${DISTDIR}"/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-4.4 icu4j.jar icu4j-4_4_2.jar
-	java-pkg_jar-from --into html.validation/external iso-relax isorelax.jar isorelax.jar
-	java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
-	java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
-	java-pkg_jar-from --into libs.commons_compress/external commons-compress commons-compress.jar commons-compress-1.8.1.jar
-	# java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.19.jar
-	java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
-	java-pkg_jar-from --into libs.lucene/external lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
-	java-pkg_jar-from --into libs.smack/external smack-2.2 smack.jar smack.jar
-	java-pkg_jar-from --into libs.smack/external smack-2.2 smackx.jar smackx.jar
-	# java-pkg_jar-from --into libs.svnClientAdapter.javahl/external subversion svn-javahl.jar svnjavahl-1.8.4.jar
-	java-pkg_jar-from --into libs.xerces/external xerces-2 xercesImpl.jar xerces-2.8.0.jar
-	java-pkg_jar-from --build-only --into o.apache.commons.codec/external commons-codec commons-codec.jar apache-commons-codec-1.3.jar
-	java-pkg_jar-from --into o.apache.commons.httpclient/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.1.jar
-	java-pkg_jar-from --into o.apache.commons.logging/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
-	java-pkg_jar-from --into o.apache.ws.commons.util/external ws-commons-util ws-commons-util.jar ws-commons-util-1.0.1.jar
-	java-pkg_jar-from --into servletapi/external tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
-	java-pkg_jar-from --into xml.jaxb.api/external sun-jaf activation.jar activation.jar
-	java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_1.0_api.jar
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	unset DISPLAY
-	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
-}
-
-src_install() {
-	pushd nbbuild/netbeans/ide >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/ide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	rm -fr "${D}"/${INSTALL_DIR}/bin/nativeexecution || die
-	rm -fr "${D}"/${INSTALL_DIR}/modules/lib || die
-
-	insinto ${INSTALL_DIR}/bin/nativeexecution
-	doins bin/nativeexecution/*
-
-	pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution >/dev/null || die
-	for file in *.sh ; do
-		fperms 755 ${file}
-	done
-	popd >/dev/null || die
-
-	if use x86 ; then
-		doins -r bin/nativeexecution/Linux-x86
-		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86 >/dev/null || die
-		for file in * ; do
-			fperms 755 ${file}
-		done
-		popd >/dev/null || die
-	elif use amd64 ; then
-		doins -r bin/nativeexecution/Linux-x86_64
-		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86_64 >/dev/null || die
-		for file in * ; do
-			fperms 755 ${file}
-		done
-		popd >/dev/null || die
-	fi
-
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules
-	pushd "${instdir}" >/dev/null || die
-	rm com-jcraft-jsch.jar && java-pkg_jar-from --into "${instdir}" jsch jsch.jar com-jcraft-jsch.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext
-	pushd "${instdir}" >/dev/null || die
-	rm commons-compress-1.8.1.jar && java-pkg_jar-from --into "${instdir}" commons-compress commons-compress.jar commons-compress-1.8.1.jar
-	# rm freemarker-2.3.19.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.19.jar || die
-	rm icu4j-4_4_2.jar && java-pkg_jar-from --into "${instdir}" icu4j-4.4 icu4j.jar icu4j-4_4_2.jar
-	rm isorelax.jar && java-pkg_jar-from --into "${instdir}" iso-relax isorelax.jar
-	rm json-simple-1.1.1.jar && java-pkg_jar-from --into "${instdir}" json-simple json-simple.jar json-simple-1.1.1.jar
-	rm jvyamlb-0.2.7.jar && java-pkg_jar-from --into "${instdir}" jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
-	rm log4j-1.2.15.jar && java-pkg_jar-from --into "${instdir}" log4j log4j.jar log4j-1.2.15.jar
-	rm lucene-core-3.5.0.jar && java-pkg_jar-from --into "${instdir}" lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
-	rm mysql-connector-java-5.1.23-bin.jar && java-pkg_jar-from --into "${instdir}" jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
-	rm postgresql-9.2-1002.jdbc4.jar && java-pkg_jar-from --into "${instdir}" jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
-	rm saxon9B.jar && java-pkg_jar-from --into "${instdir}" saxon-9 saxon.jar saxon9B.jar
-	rm servlet-2.2.jar && java-pkg_jar-from --into "${instdir}" tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
-	rm smack.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smack.jar
-	rm smackx.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smackx.jar
-	# rm svnjavahl.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl.jar || die
-	rm xerces-2.8.0.jar && java-pkg_jar-from --into "${instdir}" xerces-2 xercesImpl.jar xerces-2.8.0.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb
-	pushd "${instdir}" >/dev/null || die
-	rm activation.jar && java-pkg_jar-from --into "${instdir}" sun-jaf activation.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb/api
-	pushd "${instdir}" >/dev/null || die
-	rm jsr173_1.0_api.jar && java-pkg_jar-from --into "${instdir}" jsr173 jsr173.jar jsr173_1.0_api.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ide
-}

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index bce2f57..4e943ef 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -32,7 +32,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201601190002-src.zip 209493622 SHA256 170dd02b09b8e637f67e9ba65239a901239db60505da64e996a883d6f6796268 SHA512 f6aa1806046166536f775914ecfc91adc4894f15d55d3164386f83733346a65f52f1bc9323f8fe2f14f65046c9409fd24ca72d623e5474736718fb88cdd0f875 WHIRLPOOL 92e847dcf9f46e58b1b94e404be99dcc16f38bfefdcaa698d290aa3c0af3a5d9c6fa8decc552bd8e8d04f3a6b86cf65729a35fcdd38fc629ffb6fd854c22210f
 DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818ce4503d91850e5a853c67249b646c7bb54710c1905202e04971 SHA512 5dd6a6dab6671ce956ed16e0072d51843cb48e3b53bdb80aa356aaaa93fa9513ecf9440556987082907cdb5054b1be70569e342848c45a6ad5754d3166375ad7 WHIRLPOOL c50bfa3d015364282856853b92e99c235786e1744f3e0eaa937b1e1db48dfa4e7cc1a29c15b6fed875d144572cb951a56dc7668be9790245276f347b2ba99b38
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 DIST netbeans-trunk-nightly-201601270002-src.zip 209531425 SHA256 368e7f65afd280d20a26b31be55a46dd03eb2ec10bc10a6126ce782b855372a2 SHA512 633671e83592c1016efcd91226b46d957435c8d55066339dc712f30a17821638b20bc617373d715914087dcb3498fa68817373f63e0489b0a35dcb9a47e382e5 WHIRLPOOL 3d5b403e4cdf89382e47c3bc471047162081a2403689484afb3b08ef764d3f38932f5dd057240840a5cf9fd6b64919ded7b08d4fc81e75352aef4ff61065c6da
@@ -59,7 +58,6 @@ DIST netbeans-trunk-nightly-201602190002-src.zip 209766182 SHA256 80b4e9ded78077
 EBUILD netbeans-java-8.0.2-r4.ebuild 13298 SHA256 d4172dfdec5afecb1cd099e18a21aa872c7822bff40b192b5f4ec4d35e6e0ef8 SHA512 48ae6f7141117fbf58123ded750d76f2e7311211a6be3b62bd491349817460da11f781ec5694da91584315547c32008f568fac3bfb406dbdb5ed7fd825ff694e WHIRLPOOL 73fb68aec003707c14b2b390c2de80f24e1e5413cf7e16cf7e661af47c908e2d559214580379e45e21d316767987ac906b5a119a61ae39f03c3d01dafad49b7c
 EBUILD netbeans-java-8.1-r1.ebuild 14775 SHA256 1bbcc19358e42931f2ebcffbc234ba4f903506bb255142f5dc8a6a3dfaac621a SHA512 9578fbd4732edfeca9d6abc6da147af8fe5bae2f740405b28bf82d403f7952a4f9302605dab07f4ad1e42b525d1562579d0b84de0b0a73c06113eaa8a617924e WHIRLPOOL 77e4d2a188b2aafb2506cc47abf98619edc783cd82c19d1c89c6278a4a3136c3f157e164354588fe6b6cc5889934380353b59e68cbe28f3e49d2c5989a7e4628
 EBUILD netbeans-java-8.1-r2.ebuild 14814 SHA256 1f49212c90fcaa9a6483f19bb60c963520f20aa08c2a509aa19cc7fda12e4564 SHA512 2d6b225f5d32f0ce1801124808b0cc2101f16a703540877c4818be06694742cfa262c3a2e7018761254f9244a7992eb7fe9bc15cdb20f6f4cb83958789c0ef42 WHIRLPOOL 8557163a46ea91a47efec3c272b8a8a0f2acbf9eaa8f6c280d0ddaac6dd8b2185f06716ab12ebf76fb87fe6c05ab1a14bfd281875ebef586f1304d2162e5f2dc
-EBUILD netbeans-java-9999_p20160119.ebuild 14930 SHA256 f9aae8e29f8b2626b41acdafa10e1fe9c09c8f619137b2981c213aebd9adae37 SHA512 1ad7f1fa40368b44a86cc1d0abb5ee5778d3e61ec0f7bd818cb3963ad1038e13f325e7ad90bc561ab5a1f6ffd3579ad25e39d343a4b251b3996665917f6361fe WHIRLPOOL ad6d8fb05bc9b01491c5abfeccc27b92789b4551cc12767c4beac3b6c7fdcedfb3ecca3abb972e48e7b99e55ac1cd74228654970eed8e15a6e2a42eb210bceb0
 EBUILD netbeans-java-9999_p20160121.ebuild 14930 SHA256 13d5b8e7020b0116cf68bc13681032e2883efcffe3bd1359e2c5c070d04706d7 SHA512 fa6936db35d42245df0358c246682381c432d69e28c68f4f90a09dca573ed3e79b9bd351c5d1cbccc58099534fdd72960d7fd6c8d73f12e82a2e5fcd075af699 WHIRLPOOL a3623ea8bfa5297ac603c686fd08ef62d84ff1b812618d753c1521a140f637ef51446a6f1ab803255927b86d493c0fafed970c8d10231927076bfe5e3d50005f
 EBUILD netbeans-java-9999_p20160125.ebuild 14930 SHA256 6b36dc8417d870f0b5df2820e53150b1ded820274814e58bf4b20e73caefb468 SHA512 6286865e757c8f389a0c0672fe14cf6789c052d12829f3c613e96e19bd0132ce9a272a9ef43e9d5bfd4b47ab2ad7b56ed998a8f062cecda0c9400dc0745ba279 WHIRLPOOL 7bef24c8f67dc5e1bfc1bed71d04095ce6188a5dc6aa5c7cc168a7fac45eddbf65273afa857ced7f8cee892692d907d7648b61d6492e60d130e2a269a5b3d329
 EBUILD netbeans-java-9999_p20160127.ebuild 14930 SHA256 500c2591d6e6eebd50e188703cd1275c81a31f6971129e4ad7c80a4afcfdec00 SHA512 eef1903403bfe2f482d28d7637b9554b893dcc28a432c524c2a13f213079ecf76a8b8a0b387370cb25c15ac609575c3d89801b133c462adb428250c7e21047a4 WHIRLPOOL 6cb411cd7c1df1c8e1d2eabe2959518fcefdfc0faf429a7c49e4489c75c7e0f51d6abb9f12f9a81b8811b65c64f0d6ba8f4e7dcc918a6805c4a4bd086bff9808

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160119.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160119.ebuild
deleted file mode 100644
index 68eca3b..0000000
--- a/dev-java/netbeans-java/netbeans-java-9999_p20160119.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-01-19_00-02-04/zip/netbeans-trunk-nightly-201601190002-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 a54b323..e0bbaa9 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201601190002-src.zip 209493622 SHA256 170dd02b09b8e637f67e9ba65239a901239db60505da64e996a883d6f6796268 SHA512 f6aa1806046166536f775914ecfc91adc4894f15d55d3164386f83733346a65f52f1bc9323f8fe2f14f65046c9409fd24ca72d623e5474736718fb88cdd0f875 WHIRLPOOL 92e847dcf9f46e58b1b94e404be99dcc16f38bfefdcaa698d290aa3c0af3a5d9c6fa8decc552bd8e8d04f3a6b86cf65729a35fcdd38fc629ffb6fd854c22210f
 DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818ce4503d91850e5a853c67249b646c7bb54710c1905202e04971 SHA512 5dd6a6dab6671ce956ed16e0072d51843cb48e3b53bdb80aa356aaaa93fa9513ecf9440556987082907cdb5054b1be70569e342848c45a6ad5754d3166375ad7 WHIRLPOOL c50bfa3d015364282856853b92e99c235786e1744f3e0eaa937b1e1db48dfa4e7cc1a29c15b6fed875d144572cb951a56dc7668be9790245276f347b2ba99b38
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 DIST netbeans-trunk-nightly-201601270002-src.zip 209531425 SHA256 368e7f65afd280d20a26b31be55a46dd03eb2ec10bc10a6126ce782b855372a2 SHA512 633671e83592c1016efcd91226b46d957435c8d55066339dc712f30a17821638b20bc617373d715914087dcb3498fa68817373f63e0489b0a35dcb9a47e382e5 WHIRLPOOL 3d5b403e4cdf89382e47c3bc471047162081a2403689484afb3b08ef764d3f38932f5dd057240840a5cf9fd6b64919ded7b08d4fc81e75352aef4ff61065c6da
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201602180002-src.zip 209750814 SHA256 d26953a05588a0
 DIST netbeans-trunk-nightly-201602190002-src.zip 209766182 SHA256 80b4e9ded780778d73e969a8bf14915e140a7308918731c354eaeac4522a07cb SHA512 ed15d416fdf92adbe13eb0352174cb921ded39c8c0b496535dd0aea80589b2742116655367730226f341a5fe7901f43a0326ba68fea8f3abc14ee0940ad5accb WHIRLPOOL fc8c42415df906bb1979fc8d0192f4f360d8bd79e96531a2432769b9ff24dd0c6594fcc0d433f290b2401c74f02851daff4de1d929053459e35c6133be19dccd
 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_p20160119.ebuild 4971 SHA256 4a579a53a18e6f3245c69b0a7ecb5743be9de3ffaca6bb1697883fd7306aa5c0 SHA512 f40e696fab93970c50677bde904f9cefd35c7277c8c62eb1d18ee6d36c4cf2c1adb02972dc414c224afce2712adf0ce05fb480402055e0ad32ed4e3001f00f32 WHIRLPOOL 83454967a2e385ac4efb60d17618c4d7a648e1b758a958b35928cabe29f0abf65049cf78e763ed5502f1e6a33f7be29dd61c58efc8da8123b2ae66801f3dd0d3
 EBUILD netbeans-javacard-9999_p20160121.ebuild 4971 SHA256 aa122e17c159ff2ceacc436e0834899ba650665f85e2fba9f3a6c82e6f47849f SHA512 371e0cc1b4f4efd4234c44e0cad2fffca2ab78b544c725f5533e82dd957ed36b8f32560ad44148bb0e45de7e2e4aa937516f8c53fca2d8c5ec89677f80bf9e5a WHIRLPOOL b0172f02fcc7e1b6667c64407a681b9c2d836ec50b43e1722623fb59510c28b6de64b720f2778e6b76d6bd190de773a7077b2f9e5daf1ae0a4246fc9f3a5d26f
 EBUILD netbeans-javacard-9999_p20160125.ebuild 4971 SHA256 6bfe1dd55ca236c21f0b48383860acc1399b27680c9513bca5179558106e8044 SHA512 33571365d86a8b2032bd5e344236c5da7f647fddc604903e437720b98f4ca71c7ca4c273eb074a71c38af7b38e1bf60845f45f42c91b345b35add74d422456c7 WHIRLPOOL 7b7a0076ad5cee4893e289d66884c897b462e56e9b743e1dccdb425f00f6a692e1e33af8af1ee9102000a5ffc361e1c64cef9890bf6fb43595d3acbed08a461b
 EBUILD netbeans-javacard-9999_p20160127.ebuild 4971 SHA256 76fb1c7ceaec8fb8989ed21cd3d09df4451b1db2112ce9fe61411104a26afd75 SHA512 4bd73b9de8718f986641ecb6256b25d71d090e5e2dd789be5103d0b9ef5b996e6ce3a0bf53640be07b6a3397eaa9c66682b4de2ad626d056c010744c63ab84be WHIRLPOOL ee3568c0fac0b7eba0ebb713b392f58661200b0c80115a5357323f2b8a514296e6d31a7b5dbe1e97d3b542ccd529da0f71bae5fef72ae3adb02d8a2741e3c889

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160119.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160119.ebuild
deleted file mode 100644
index 331025c..0000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160119.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-01-19_00-02-04/zip/netbeans-trunk-nightly-201601190002-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 f1b4bbc..d4dfbaf 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -4,7 +4,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201601190002-src.zip 209493622 SHA256 170dd02b09b8e637f67e9ba65239a901239db60505da64e996a883d6f6796268 SHA512 f6aa1806046166536f775914ecfc91adc4894f15d55d3164386f83733346a65f52f1bc9323f8fe2f14f65046c9409fd24ca72d623e5474736718fb88cdd0f875 WHIRLPOOL 92e847dcf9f46e58b1b94e404be99dcc16f38bfefdcaa698d290aa3c0af3a5d9c6fa8decc552bd8e8d04f3a6b86cf65729a35fcdd38fc629ffb6fd854c22210f
 DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818ce4503d91850e5a853c67249b646c7bb54710c1905202e04971 SHA512 5dd6a6dab6671ce956ed16e0072d51843cb48e3b53bdb80aa356aaaa93fa9513ecf9440556987082907cdb5054b1be70569e342848c45a6ad5754d3166375ad7 WHIRLPOOL c50bfa3d015364282856853b92e99c235786e1744f3e0eaa937b1e1db48dfa4e7cc1a29c15b6fed875d144572cb951a56dc7668be9790245276f347b2ba99b38
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 DIST netbeans-trunk-nightly-201601270002-src.zip 209531425 SHA256 368e7f65afd280d20a26b31be55a46dd03eb2ec10bc10a6126ce782b855372a2 SHA512 633671e83592c1016efcd91226b46d957435c8d55066339dc712f30a17821638b20bc617373d715914087dcb3498fa68817373f63e0489b0a35dcb9a47e382e5 WHIRLPOOL 3d5b403e4cdf89382e47c3bc471047162081a2403689484afb3b08ef764d3f38932f5dd057240840a5cf9fd6b64919ded7b08d4fc81e75352aef4ff61065c6da
@@ -30,7 +29,6 @@ DIST netbeans-trunk-nightly-201602180002-src.zip 209750814 SHA256 d26953a05588a0
 DIST netbeans-trunk-nightly-201602190002-src.zip 209766182 SHA256 80b4e9ded780778d73e969a8bf14915e140a7308918731c354eaeac4522a07cb SHA512 ed15d416fdf92adbe13eb0352174cb921ded39c8c0b496535dd0aea80589b2742116655367730226f341a5fe7901f43a0326ba68fea8f3abc14ee0940ad5accb WHIRLPOOL fc8c42415df906bb1979fc8d0192f4f360d8bd79e96531a2432769b9ff24dd0c6594fcc0d433f290b2401c74f02851daff4de1d929053459e35c6133be19dccd
 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_p20160119.ebuild 6293 SHA256 8978d3012a31306f631f0a7d0b5530aad53f3446f75a7a6764e3d5cabc3d7e6e SHA512 e901396245bddd566d504f8cc7631648187899e99c4445aadb75c9c788ef19c3203e8f78884f5a6f15e7ec56df119b600bd74f73675cbedf3c92840f38bafe61 WHIRLPOOL 86b3fa3f5f43390f62516f4ec02bea1a2b3d38c5c7bf3490d613347bb92f814fac687105127ffaa3e26cfc74ac08dfe626b6ecb1d7c366a08bdf19b77eb1681d
 EBUILD netbeans-javadoc-9999_p20160121.ebuild 6293 SHA256 38bddc2ae0d8c91664d561e2b672a96700fea9a0b5b22e8a847480c643e39995 SHA512 6ffa6c6e17186777542773bf82f9cfd04cd226b3a91b96bc1c758a6b18c9792d4367bf4531b870cf7a9f8a86d591cc2ed202f6bfbf2ba48854f5dd5220f5b7ea WHIRLPOOL 674d818e7504b3c2172f617a74bf0ef1a3fd529cd7430298ce5204a0fb25b042b4d63805c15bf11299a76fece973dfee211a54b29e42ffe4175070a84d2854a1
 EBUILD netbeans-javadoc-9999_p20160125.ebuild 6293 SHA256 18e5af8739780b5213abe4e2c10d983572825976da1bf4eb5fbf6d750cb5d260 SHA512 d8fba73e3af16900952c8420fd820ce18d70bc05735087408ff40b26885050d87f4121f6e700de4989260b4acdf45a4f50f9c3d71f2302d46d2fd7e0dcb89ca8 WHIRLPOOL b0f4c6fff7da7ee5d2745b03d6a069dd632e857f3f6314a0928c20fde0ed86a8231927f9c8ac5c26b179587deb617fbdf8a061c1bcf5b4497c5aaa9b64f57502
 EBUILD netbeans-javadoc-9999_p20160127.ebuild 6293 SHA256 486c1718998065afc210628e78055a6b94d8a31b2b73cf1f3dd708f55b1e9f88 SHA512 bafecb1d0525c5ea7198998c5fe0eb39a6d19a9c14b744dea09dbf983ccfe8f5be962f404446d3c620c4b8f576a873e4ff499b1a45aeca6835a88aacc1089aa6 WHIRLPOOL 4e5479d6ea7df97a37217b7407cd1e50690f3e4b0265e0a232b45d72143838d10b5dda25d71fa496d324ea1fc14e97ba97ef310d283ceedee39b6ca1e4edee1a

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160119.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160119.ebuild
deleted file mode 100644
index 03dd4a6..0000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160119.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-01-19_00-02-04/zip/netbeans-trunk-nightly-201601190002-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 c37fbe3..87b2905 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -11,7 +11,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201601190002-src.zip 209493622 SHA256 170dd02b09b8e637f67e9ba65239a901239db60505da64e996a883d6f6796268 SHA512 f6aa1806046166536f775914ecfc91adc4894f15d55d3164386f83733346a65f52f1bc9323f8fe2f14f65046c9409fd24ca72d623e5474736718fb88cdd0f875 WHIRLPOOL 92e847dcf9f46e58b1b94e404be99dcc16f38bfefdcaa698d290aa3c0af3a5d9c6fa8decc552bd8e8d04f3a6b86cf65729a35fcdd38fc629ffb6fd854c22210f
 DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818ce4503d91850e5a853c67249b646c7bb54710c1905202e04971 SHA512 5dd6a6dab6671ce956ed16e0072d51843cb48e3b53bdb80aa356aaaa93fa9513ecf9440556987082907cdb5054b1be70569e342848c45a6ad5754d3166375ad7 WHIRLPOOL c50bfa3d015364282856853b92e99c235786e1744f3e0eaa937b1e1db48dfa4e7cc1a29c15b6fed875d144572cb951a56dc7668be9790245276f347b2ba99b38
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 DIST netbeans-trunk-nightly-201601270002-src.zip 209531425 SHA256 368e7f65afd280d20a26b31be55a46dd03eb2ec10bc10a6126ce782b855372a2 SHA512 633671e83592c1016efcd91226b46d957435c8d55066339dc712f30a17821638b20bc617373d715914087dcb3498fa68817373f63e0489b0a35dcb9a47e382e5 WHIRLPOOL 3d5b403e4cdf89382e47c3bc471047162081a2403689484afb3b08ef764d3f38932f5dd057240840a5cf9fd6b64919ded7b08d4fc81e75352aef4ff61065c6da
@@ -37,7 +36,6 @@ DIST netbeans-trunk-nightly-201602180002-src.zip 209750814 SHA256 d26953a05588a0
 DIST netbeans-trunk-nightly-201602190002-src.zip 209766182 SHA256 80b4e9ded780778d73e969a8bf14915e140a7308918731c354eaeac4522a07cb SHA512 ed15d416fdf92adbe13eb0352174cb921ded39c8c0b496535dd0aea80589b2742116655367730226f341a5fe7901f43a0326ba68fea8f3abc14ee0940ad5accb WHIRLPOOL fc8c42415df906bb1979fc8d0192f4f360d8bd79e96531a2432769b9ff24dd0c6594fcc0d433f290b2401c74f02851daff4de1d929053459e35c6133be19dccd
 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_p20160119.ebuild 4717 SHA256 12e101cfd304cd5947aa4a1af43f6ff81ee90b759ef64e9d525fdd0fd89b302f SHA512 1849831266153ea950a864e1fb9997481bd530c0da53f637eec07015b3dbcf930a39c4710132db305a5249a78cce204a0e178d0747843d383edfb2e56bf144b8 WHIRLPOOL 35d11fefde478fa246cd1e32b14aa979b27e27994a9210759d91be77e7899d2fa489b20ffe55004038a3fbd93f14d6f6d6a44fb98d6ea9b32c16a2f9f385bbdf
 EBUILD netbeans-javafx-9999_p20160121.ebuild 4717 SHA256 29790345f540788bc0f5f149ba94f86bf13f09ed7e5de3ca625337cc5f47a356 SHA512 b6393529bda8bc48da938454062ed451de450f26cfb5679d918eec1bb4e671711b73f717924ea58268e718ae72b12e00e22360d31cdd6f9ec242ad089834cab1 WHIRLPOOL a1cbadc4ed9594a0ac626df077e13489dac1349e4d66a0f7b5426ed2dd3da43c9cec429927e79b1788c187457b84884ed64f47744222fa80d783a2aa9b497ba7
 EBUILD netbeans-javafx-9999_p20160125.ebuild 4717 SHA256 5004b2950f3b38e04bcd74adf1cf0bee928f6aee9fb5fa3e441263203ce256fc SHA512 f34bfd597b59c50c93e814d2025e0381fea56da83ac0ffd3997d50176abc8d9446528e1607faceb59ea016ced0ca5bf79a9c218293d116e311a1e6987e9443a6 WHIRLPOOL ffa89dd30c772f4606ca18d025c12ef2877c1b5110b3715547deab6ccee06128d64221c3deb2025dabba95f2fea556ad0f2f2817974893e01b38092b4e9e2508
 EBUILD netbeans-javafx-9999_p20160127.ebuild 4717 SHA256 01a9226fb3c2da59cb88f8001c7598fd379b566a55fd4e89215e4150d81292b5 SHA512 3c5833a8ef4d15c19018852dab3c6db1f4716d056df26caa5cfe8e2e9830432535064b3291ba53e2193eb27d15fc25669717891e5678cf36555f599bfed1c3c0 WHIRLPOOL e1f62a2cc00f9d18b096ff2eb189beadeb032d4f7401deefc9902009ee6d06710796526ee74d1d697bb3e8be5b1b1f5b8acd44ea62e9603dd7ca19e72a146ff8

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160119.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160119.ebuild
deleted file mode 100644
index 90cd147..0000000
--- a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160119.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-01-19_00-02-04/zip/netbeans-trunk-nightly-201601190002-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 a5960fc..c2f427e 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201601190002-src.zip 209493622 SHA256 170dd02b09b8e637f67e9ba65239a901239db60505da64e996a883d6f6796268 SHA512 f6aa1806046166536f775914ecfc91adc4894f15d55d3164386f83733346a65f52f1bc9323f8fe2f14f65046c9409fd24ca72d623e5474736718fb88cdd0f875 WHIRLPOOL 92e847dcf9f46e58b1b94e404be99dcc16f38bfefdcaa698d290aa3c0af3a5d9c6fa8decc552bd8e8d04f3a6b86cf65729a35fcdd38fc629ffb6fd854c22210f
 DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818ce4503d91850e5a853c67249b646c7bb54710c1905202e04971 SHA512 5dd6a6dab6671ce956ed16e0072d51843cb48e3b53bdb80aa356aaaa93fa9513ecf9440556987082907cdb5054b1be70569e342848c45a6ad5754d3166375ad7 WHIRLPOOL c50bfa3d015364282856853b92e99c235786e1744f3e0eaa937b1e1db48dfa4e7cc1a29c15b6fed875d144572cb951a56dc7668be9790245276f347b2ba99b38
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 DIST netbeans-trunk-nightly-201601270002-src.zip 209531425 SHA256 368e7f65afd280d20a26b31be55a46dd03eb2ec10bc10a6126ce782b855372a2 SHA512 633671e83592c1016efcd91226b46d957435c8d55066339dc712f30a17821638b20bc617373d715914087dcb3498fa68817373f63e0489b0a35dcb9a47e382e5 WHIRLPOOL 3d5b403e4cdf89382e47c3bc471047162081a2403689484afb3b08ef764d3f38932f5dd057240840a5cf9fd6b64919ded7b08d4fc81e75352aef4ff61065c6da
@@ -29,7 +28,6 @@ DIST netbeans-trunk-nightly-201602180002-src.zip 209750814 SHA256 d26953a05588a0
 DIST netbeans-trunk-nightly-201602190002-src.zip 209766182 SHA256 80b4e9ded780778d73e969a8bf14915e140a7308918731c354eaeac4522a07cb SHA512 ed15d416fdf92adbe13eb0352174cb921ded39c8c0b496535dd0aea80589b2742116655367730226f341a5fe7901f43a0326ba68fea8f3abc14ee0940ad5accb WHIRLPOOL fc8c42415df906bb1979fc8d0192f4f360d8bd79e96531a2432769b9ff24dd0c6594fcc0d433f290b2401c74f02851daff4de1d929053459e35c6133be19dccd
 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_p20160119.ebuild 4412 SHA256 209d90788c5728b7500569187e3b20fe49698dc486d55803812d6455c0864006 SHA512 656a73a90b67c162a3ee15f84f96aa96bd7a906abadc0a1ab43be4f59d88c218a8356607dd057d2c10d59b08ad67e90f1e4fecfdc54e1825a687301580d3ea1c WHIRLPOOL 0135d12f077c689d5cf799cd983b4767a38d951193cdf7dd1fc4d251dc98c23cc1e51ff6a9fff94f32d6158ef5223401022439c0ea77fef5c0a72599b0359809
 EBUILD netbeans-mobility-9999_p20160121.ebuild 4412 SHA256 9381b6fb1a9f3960480d51db0c10c78070f4d7982e7a1dae5812d14c9a668398 SHA512 e845a15e66f2b40cbe56f5aa7319298e341696f534425857d79f61abd5cb26ebb93e791272538f459f261080d221eb5200208418130fbdd413c884a50ce22000 WHIRLPOOL f96a9eabf325d32c2efe019cae64c63d57456e04c818db453857c3d7c5a0b6ba60b82de7d5966c01e239b2472bd57c410f2df999e04839c0352d549d9146ce29
 EBUILD netbeans-mobility-9999_p20160125.ebuild 4412 SHA256 f63c849148ae893fd8e3c3c2f7d4e0026cfa42ea3c635b44fcd129b0a9b818b2 SHA512 1984c37a01c026ce32e8c1768641f6dda86c60c9bab569f07400340f27d04aa10c51bb37a2e4e078f968349e9119406316d7062602aa67648d2046a1240e57b8 WHIRLPOOL 1beefdab4cd9e82691de59e12accfbff8e63b2ebe2462055aa970c7544df19e03f447220a053577fbbd624686b521af1d4bdc8599d6e9a2527057ec97980c4ff
 EBUILD netbeans-mobility-9999_p20160127.ebuild 4412 SHA256 5c3d8395ff4a353d459a33db6445d6d35d2edaa85b862d4853328c3f8f46c3fe SHA512 0209d5a60418a404ea4953944eb207698f015b027ad192c8326825bfc97a802da481f68bc3159e026fba028a1aa1cac4c06ac0eb6e4e9d97e06ebded27a5d84d WHIRLPOOL 42679b7e2d21d314346c88e11a8abe53e3b5f206f73c64936d92d4c2a226091fa70d8fcf59be53fd1a64d7524c9a1d4169b0d3bce095b4eec94770ec2bfe8217

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160119.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160119.ebuild
deleted file mode 100644
index 11fdf13..0000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160119.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-01-19_00-02-04/zip/netbeans-trunk-nightly-201601190002-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 c3325bf..ad9cfc2 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201601190002-src.zip 209493622 SHA256 170dd02b09b8e637f67e9ba65239a901239db60505da64e996a883d6f6796268 SHA512 f6aa1806046166536f775914ecfc91adc4894f15d55d3164386f83733346a65f52f1bc9323f8fe2f14f65046c9409fd24ca72d623e5474736718fb88cdd0f875 WHIRLPOOL 92e847dcf9f46e58b1b94e404be99dcc16f38bfefdcaa698d290aa3c0af3a5d9c6fa8decc552bd8e8d04f3a6b86cf65729a35fcdd38fc629ffb6fd854c22210f
 DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818ce4503d91850e5a853c67249b646c7bb54710c1905202e04971 SHA512 5dd6a6dab6671ce956ed16e0072d51843cb48e3b53bdb80aa356aaaa93fa9513ecf9440556987082907cdb5054b1be70569e342848c45a6ad5754d3166375ad7 WHIRLPOOL c50bfa3d015364282856853b92e99c235786e1744f3e0eaa937b1e1db48dfa4e7cc1a29c15b6fed875d144572cb951a56dc7668be9790245276f347b2ba99b38
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 DIST netbeans-trunk-nightly-201601270002-src.zip 209531425 SHA256 368e7f65afd280d20a26b31be55a46dd03eb2ec10bc10a6126ce782b855372a2 SHA512 633671e83592c1016efcd91226b46d957435c8d55066339dc712f30a17821638b20bc617373d715914087dcb3498fa68817373f63e0489b0a35dcb9a47e382e5 WHIRLPOOL 3d5b403e4cdf89382e47c3bc471047162081a2403689484afb3b08ef764d3f38932f5dd057240840a5cf9fd6b64919ded7b08d4fc81e75352aef4ff61065c6da
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201602180002-src.zip 209750814 SHA256 d26953a05588a0
 DIST netbeans-trunk-nightly-201602190002-src.zip 209766182 SHA256 80b4e9ded780778d73e969a8bf14915e140a7308918731c354eaeac4522a07cb SHA512 ed15d416fdf92adbe13eb0352174cb921ded39c8c0b496535dd0aea80589b2742116655367730226f341a5fe7901f43a0326ba68fea8f3abc14ee0940ad5accb WHIRLPOOL fc8c42415df906bb1979fc8d0192f4f360d8bd79e96531a2432769b9ff24dd0c6594fcc0d433f290b2401c74f02851daff4de1d929053459e35c6133be19dccd
 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_p20160119.ebuild 4111 SHA256 0a5d05e4cf8b99e5281a6b7839b568c8b3c0f8f0577b5f35e9f882ccc54fd992 SHA512 fe7bc6d8d4017e03e87e2fd6318e4904709b3a8a980c1e91b4426c587ce02f654e7be877056a2b28b4008c84d757c29eee58c5dd341e1986ab265d1a1558357b WHIRLPOOL f241d4b9c933212fe0d8388b677e44e8bd0e8a3131322989eddfae9fb20ae2fc2f0a063a5a0ac918b692ce6168567f083e1c66554e1b35c0a0352aa1a3af1e39
 EBUILD netbeans-nb-9999_p20160121.ebuild 4111 SHA256 5cbec8b7d6a5ce65e8bf445e8a25bd029b56c55c79fd8f2ba9da5e663eaa101a SHA512 4e5899192a56a4daf300f90955cc9da3acb6aa535c82819e975e7f90d4cc7ca2caf630335bb91eb799d373121603b5aa4fbe15da36ef49a049371c375d81388b WHIRLPOOL 38abf088265e17752b0bac009a1e2071cbb542cc7e28b637860410641169d770d984e1ced8c2db1b5a19e1e55374bc50dcc846d7a992db787e921bc1b483937f
 EBUILD netbeans-nb-9999_p20160125.ebuild 4111 SHA256 b3964a32dcba536c8867f5fafc33bd8525d2028d0cbf7543f9e67cc5b6924fd2 SHA512 ab91c4221728488e03903b0773fe7800d09d79f74760a05173c09d0049fd5e50e9f5365160a3e079aa5c2ad6c8283860ea74100c694ad8d754e66624a599c06b WHIRLPOOL cfac9d97ec8a0339c325012e556c7b8354028dd0b41daf6a12a047049a3d7566cf676521c85256bf0c541eade7ef065ff5bd2397f9dcf035195ae43ea22ffce0
 EBUILD netbeans-nb-9999_p20160127.ebuild 4111 SHA256 ce157e576dd46447d07117004ea9d28863e02c9ffe5158690a79d82c4c30ec95 SHA512 0b559a54db875da07f338b8c247c23e03ad894c27bd7cad6a20beb5d66fad132cb4c0db9706e2e5051692e37b8d5d2320ba3c7ce02c3a35579423d11e57a66e1 WHIRLPOOL 84e30c09c49ac3ce1c6cb3d30366c56352fa9ca827dc93b17c2031624fc19cc8182e1cef75f69efc0010da5202b8e0f05f707323e3effef6cdc1c882728a6882

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160119.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160119.ebuild
deleted file mode 100644
index 1def199..0000000
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20160119.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-01-19_00-02-04/zip/netbeans-trunk-nightly-201601190002-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 c4f1d04..9ed26f6 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -7,7 +7,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201601190002-src.zip 209493622 SHA256 170dd02b09b8e637f67e9ba65239a901239db60505da64e996a883d6f6796268 SHA512 f6aa1806046166536f775914ecfc91adc4894f15d55d3164386f83733346a65f52f1bc9323f8fe2f14f65046c9409fd24ca72d623e5474736718fb88cdd0f875 WHIRLPOOL 92e847dcf9f46e58b1b94e404be99dcc16f38bfefdcaa698d290aa3c0af3a5d9c6fa8decc552bd8e8d04f3a6b86cf65729a35fcdd38fc629ffb6fd854c22210f
 DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818ce4503d91850e5a853c67249b646c7bb54710c1905202e04971 SHA512 5dd6a6dab6671ce956ed16e0072d51843cb48e3b53bdb80aa356aaaa93fa9513ecf9440556987082907cdb5054b1be70569e342848c45a6ad5754d3166375ad7 WHIRLPOOL c50bfa3d015364282856853b92e99c235786e1744f3e0eaa937b1e1db48dfa4e7cc1a29c15b6fed875d144572cb951a56dc7668be9790245276f347b2ba99b38
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 DIST netbeans-trunk-nightly-201601270002-src.zip 209531425 SHA256 368e7f65afd280d20a26b31be55a46dd03eb2ec10bc10a6126ce782b855372a2 SHA512 633671e83592c1016efcd91226b46d957435c8d55066339dc712f30a17821638b20bc617373d715914087dcb3498fa68817373f63e0489b0a35dcb9a47e382e5 WHIRLPOOL 3d5b403e4cdf89382e47c3bc471047162081a2403689484afb3b08ef764d3f38932f5dd057240840a5cf9fd6b64919ded7b08d4fc81e75352aef4ff61065c6da
@@ -33,7 +32,6 @@ DIST netbeans-trunk-nightly-201602180002-src.zip 209750814 SHA256 d26953a05588a0
 DIST netbeans-trunk-nightly-201602190002-src.zip 209766182 SHA256 80b4e9ded780778d73e969a8bf14915e140a7308918731c354eaeac4522a07cb SHA512 ed15d416fdf92adbe13eb0352174cb921ded39c8c0b496535dd0aea80589b2742116655367730226f341a5fe7901f43a0326ba68fea8f3abc14ee0940ad5accb WHIRLPOOL fc8c42415df906bb1979fc8d0192f4f360d8bd79e96531a2432769b9ff24dd0c6594fcc0d433f290b2401c74f02851daff4de1d929053459e35c6133be19dccd
 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_p20160119.ebuild 4418 SHA256 17ec971e85b534c7db43489035bbd44cc8410ac1e2d377f427c920d7e3cadef3 SHA512 dfe1995d102eae573633d2dafd8ed6dcd32953368acb1349351db7f1673e2cc98c18a571b784d60ee6d23b6fc5b5dab83d997ad9cd1ae10d64e32c664ff7f393 WHIRLPOOL 56eadd74aca9d7260b04a2458eb6cec4c5e1f6eefc90b46c7324f443421bc1c37f739d4677f489dbd69780787fe354dc06d6b9d5ff6ba966e54fee84274bbe70
 EBUILD netbeans-php-9999_p20160121.ebuild 4418 SHA256 e9320841ed82feca422c1279b79ad270e2d3141c850e2fc1f87127e94b1d0be1 SHA512 08b0bc8d9caa6f6992f0efa860b75c59059b67cecb380ff76b0dc34521d0cd40fcdf997faf1f633a95f33025cbd7303dabc5bf83bb413a5d9fd46ac5a5b68769 WHIRLPOOL cddf08f9dc19fe1687e1d031af010b385232056731f2cce279fa89ba9ca274261e7b6e721a19481306fb0f92cbf970b3ccaf7a6dd42d8d7791b497e3115ead58
 EBUILD netbeans-php-9999_p20160125.ebuild 4418 SHA256 9c7f4504e4d037de58bf456c7365f90e3cc456f07c85e15c36b11493e6c70c7c SHA512 901327079700e78027ae56758872d3c288453a6ad94527b95721cbd1cb63187c6e6fcb9facf73fe467b3533722f063d87f9a6b4c61a507beb91f63c44341704a WHIRLPOOL fa7f914bb1663b284320d528cdea3d19035b11c4a129c28c8adf21bee2a77f021c7f720cc59c695718455adf0fec88eda2137e910b158fdce35483da00cf8c92
 EBUILD netbeans-php-9999_p20160127.ebuild 4418 SHA256 2719e0dfe3f27fc5030f4be2116d6d854cd862dc5ca329fa90c8489774f13acf SHA512 b91ad8b25e707989d9810284e33088d872f16ccad54d097a7af7e247d575f56d5826ac7736edd90e4883052f72ad5fe8a287b0d463b155facce24243e6e0b231 WHIRLPOOL f6d178ced3274ca624e4ffa296974c3fe99a645a0f93949d9c36f64ca98dfc4754c8531fd22ea196a97197e476a69494c7edc4a76caac1acb009455b917d99bb

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160119.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160119.ebuild
deleted file mode 100644
index 6482b92..0000000
--- a/dev-java/netbeans-php/netbeans-php-9999_p20160119.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-01-19_00-02-04/zip/netbeans-trunk-nightly-201601190002-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 8301d4f..dad3194 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -20,7 +20,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201601190002-src.zip 209493622 SHA256 170dd02b09b8e637f67e9ba65239a901239db60505da64e996a883d6f6796268 SHA512 f6aa1806046166536f775914ecfc91adc4894f15d55d3164386f83733346a65f52f1bc9323f8fe2f14f65046c9409fd24ca72d623e5474736718fb88cdd0f875 WHIRLPOOL 92e847dcf9f46e58b1b94e404be99dcc16f38bfefdcaa698d290aa3c0af3a5d9c6fa8decc552bd8e8d04f3a6b86cf65729a35fcdd38fc629ffb6fd854c22210f
 DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818ce4503d91850e5a853c67249b646c7bb54710c1905202e04971 SHA512 5dd6a6dab6671ce956ed16e0072d51843cb48e3b53bdb80aa356aaaa93fa9513ecf9440556987082907cdb5054b1be70569e342848c45a6ad5754d3166375ad7 WHIRLPOOL c50bfa3d015364282856853b92e99c235786e1744f3e0eaa937b1e1db48dfa4e7cc1a29c15b6fed875d144572cb951a56dc7668be9790245276f347b2ba99b38
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 DIST netbeans-trunk-nightly-201601270002-src.zip 209531425 SHA256 368e7f65afd280d20a26b31be55a46dd03eb2ec10bc10a6126ce782b855372a2 SHA512 633671e83592c1016efcd91226b46d957435c8d55066339dc712f30a17821638b20bc617373d715914087dcb3498fa68817373f63e0489b0a35dcb9a47e382e5 WHIRLPOOL 3d5b403e4cdf89382e47c3bc471047162081a2403689484afb3b08ef764d3f38932f5dd057240840a5cf9fd6b64919ded7b08d4fc81e75352aef4ff61065c6da
@@ -46,7 +45,6 @@ DIST netbeans-trunk-nightly-201602180002-src.zip 209750814 SHA256 d26953a05588a0
 DIST netbeans-trunk-nightly-201602190002-src.zip 209766182 SHA256 80b4e9ded780778d73e969a8bf14915e140a7308918731c354eaeac4522a07cb SHA512 ed15d416fdf92adbe13eb0352174cb921ded39c8c0b496535dd0aea80589b2742116655367730226f341a5fe7901f43a0326ba68fea8f3abc14ee0940ad5accb WHIRLPOOL fc8c42415df906bb1979fc8d0192f4f360d8bd79e96531a2432769b9ff24dd0c6594fcc0d433f290b2401c74f02851daff4de1d929053459e35c6133be19dccd
 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_p20160119.ebuild 9360 SHA256 504d49d8aacba2d5f8bec35033ccd49339717687f6cab6cdcbb0aee029eede91 SHA512 3e6cca35fe600bb07803bf0644b08e0865f16a0996ebb2bfffc52e427db7754bd0f5b4beda101edb76a7d189536f7672fa8ec1d62ee7635a3ac71df8e20c8890 WHIRLPOOL 80f12021516123629f97c9269945c02d707577ec3cd0a9e24c4265a17685eaacbaa281ce3d885055a9a5a96ffac4aac389583be2cba17ee6d59d55162f148762
 EBUILD netbeans-platform-9999_p20160121.ebuild 9360 SHA256 0133633a35e3810694d485445ff96547f80ef41180b7b4667ce174f0ec867849 SHA512 c384d2e91e7a6551edf58ceff84eafe1d9ee3ecf61598adf7c3dc4a02741477098e09f5b9ad9c1727889fc75962f80b0969e525cb89b982c2b5bc15fa3a7c608 WHIRLPOOL ff5892b1732af8cb55333adfebcf3b6472034197631099dd2e9f62a7f666da98ccdaa6a78681b8f4a410e7f5a5bc9004bd7adfd125d9426a5cf79b0f44e77820
 EBUILD netbeans-platform-9999_p20160125.ebuild 9360 SHA256 2f6e5113bbf662b72c4f348be0563088733b49d619f5efdd9fb91c48a5861569 SHA512 5f438f9a72f64db4239b0ffbb733f2804b50cb0bd29137892e0461d1bd2d5c08154adae26149221cbcbc8e70a535e0e5160f888fd27f4b274add90caf2819e11 WHIRLPOOL 6bb4733093308c0e01df5d95c1d2079c2bdadffe2720d014456e692dc09df31f39bcb744d91910273093e14c5a6edf5219260ba2517fc87a835f48f3f9a9073f
 EBUILD netbeans-platform-9999_p20160127.ebuild 9360 SHA256 5486f4e750e866b20f984767b6ca3bb43a1eab0e19f604348e269228a5b46630 SHA512 022c982650474d9f017b90217620ec33a5c11d98019965698f1c2e35c6cbbcadba7f14922c0d66676f398be652092b6db9e7a4ed3dbb2389f72bc102aab04f15 WHIRLPOOL 791bd245f93025cb2299e3410c68e79f1577dca644e91d74634a2a4e2780d371f2bc0de099409c09b25ac5b061402d54315f3b0e64bd2f043ceebea78eaa6992

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160119.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160119.ebuild
deleted file mode 100644
index df3b6a6..0000000
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20160119.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-01-19_00-02-04/zip/netbeans-trunk-nightly-201601190002-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 5a85e50..23d36c1 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201601190002-src.zip 209493622 SHA256 170dd02b09b8e637f67e9ba65239a901239db60505da64e996a883d6f6796268 SHA512 f6aa1806046166536f775914ecfc91adc4894f15d55d3164386f83733346a65f52f1bc9323f8fe2f14f65046c9409fd24ca72d623e5474736718fb88cdd0f875 WHIRLPOOL 92e847dcf9f46e58b1b94e404be99dcc16f38bfefdcaa698d290aa3c0af3a5d9c6fa8decc552bd8e8d04f3a6b86cf65729a35fcdd38fc629ffb6fd854c22210f
 DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818ce4503d91850e5a853c67249b646c7bb54710c1905202e04971 SHA512 5dd6a6dab6671ce956ed16e0072d51843cb48e3b53bdb80aa356aaaa93fa9513ecf9440556987082907cdb5054b1be70569e342848c45a6ad5754d3166375ad7 WHIRLPOOL c50bfa3d015364282856853b92e99c235786e1744f3e0eaa937b1e1db48dfa4e7cc1a29c15b6fed875d144572cb951a56dc7668be9790245276f347b2ba99b38
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 DIST netbeans-trunk-nightly-201601270002-src.zip 209531425 SHA256 368e7f65afd280d20a26b31be55a46dd03eb2ec10bc10a6126ce782b855372a2 SHA512 633671e83592c1016efcd91226b46d957435c8d55066339dc712f30a17821638b20bc617373d715914087dcb3498fa68817373f63e0489b0a35dcb9a47e382e5 WHIRLPOOL 3d5b403e4cdf89382e47c3bc471047162081a2403689484afb3b08ef764d3f38932f5dd057240840a5cf9fd6b64919ded7b08d4fc81e75352aef4ff61065c6da
@@ -29,7 +28,6 @@ DIST netbeans-trunk-nightly-201602180002-src.zip 209750814 SHA256 d26953a05588a0
 DIST netbeans-trunk-nightly-201602190002-src.zip 209766182 SHA256 80b4e9ded780778d73e969a8bf14915e140a7308918731c354eaeac4522a07cb SHA512 ed15d416fdf92adbe13eb0352174cb921ded39c8c0b496535dd0aea80589b2742116655367730226f341a5fe7901f43a0326ba68fea8f3abc14ee0940ad5accb WHIRLPOOL fc8c42415df906bb1979fc8d0192f4f360d8bd79e96531a2432769b9ff24dd0c6594fcc0d433f290b2401c74f02851daff4de1d929053459e35c6133be19dccd
 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_p20160119.ebuild 3472 SHA256 0e9b4437610d122ed13e74a8635c4d60a148081e4a28f3d4ba1a9e8da2c3a8aa SHA512 2e5882a8aeb20853d296f8e4ae8dd989ef9a4057e46a906a2b6da6031cd3cd71a47ece8cf35ad70e42b740d9d21119c381e8ad212fc8d45b343892d05d916e50 WHIRLPOOL 800edfea541fa71bb4106aa34fa09e82fc98da6721d2c33c72b00e34920e0a73fc0b93941016c954ac8cdf73e6d84c9aef220bd7c6de251f864850d131d4ad52
 EBUILD netbeans-profiler-9999_p20160121.ebuild 3472 SHA256 42aed204a88d1798c4a386a48c41ed90a16296d86d3fa494d7a69c68396adaf2 SHA512 fc31fcd8e3f979a2ed89328483a1e643983a525a58db2513e6260d05e5cef702c380d6acca1775ce4951cfb782cf78f3139cbe9b9d23d2f3e395c2c58819df88 WHIRLPOOL 7e11e54f116f87d596820b7ce75911a49617eb94e13d7e6f92ec9734ec8c3ea0197917ea60749c874165dae13f034ae4287f0bb13392172f0f1a11a6b63432b6
 EBUILD netbeans-profiler-9999_p20160125.ebuild 3472 SHA256 39ad69bfd9154588edbe9adb76ef886739c5d1fbc20c371090129610c33fc0be SHA512 c9fa91c3e41cf8e3487199ed922f49293f0d1048e1fe6ff4ebe4fc0741278298c25266efb9da56e99fef6aa4efd70646829279cc18045a21f0d91388b9a274f5 WHIRLPOOL 12207ddeebec847e95bc00e33c511451c75c69b20c7f3f64741334eb7ebee953ef60a08d2646bc4de7a933aeb0d6e0088fe9adc355d62febc51114ffb2761e55
 EBUILD netbeans-profiler-9999_p20160127.ebuild 3472 SHA256 bb315fc5faaf2de8e982c475d6096473871a01ae1f3b338bc7e3543208898793 SHA512 889d98e6f0f264a74c580a051455f990461395259951b3c0c428741fb42ec0d4c09e163bc773781e7ea2d7819f672597b55ad8db37bbae1190dede96e496b5b8 WHIRLPOOL be0d38b9a1557888c4012eda401eeebd70b04a4be26dfcef2eb0703dc515881480c5e2c552d8837bb50293943736f014e81dad3a5955af2d5d4e40f2df772ea5

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160119.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160119.ebuild
deleted file mode 100644
index 4e880f8..0000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160119.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-01-19_00-02-04/zip/netbeans-trunk-nightly-201601190002-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 c78b3dd..9b7bd1e 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -18,7 +18,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201601190002-src.zip 209493622 SHA256 170dd02b09b8e637f67e9ba65239a901239db60505da64e996a883d6f6796268 SHA512 f6aa1806046166536f775914ecfc91adc4894f15d55d3164386f83733346a65f52f1bc9323f8fe2f14f65046c9409fd24ca72d623e5474736718fb88cdd0f875 WHIRLPOOL 92e847dcf9f46e58b1b94e404be99dcc16f38bfefdcaa698d290aa3c0af3a5d9c6fa8decc552bd8e8d04f3a6b86cf65729a35fcdd38fc629ffb6fd854c22210f
 DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818ce4503d91850e5a853c67249b646c7bb54710c1905202e04971 SHA512 5dd6a6dab6671ce956ed16e0072d51843cb48e3b53bdb80aa356aaaa93fa9513ecf9440556987082907cdb5054b1be70569e342848c45a6ad5754d3166375ad7 WHIRLPOOL c50bfa3d015364282856853b92e99c235786e1744f3e0eaa937b1e1db48dfa4e7cc1a29c15b6fed875d144572cb951a56dc7668be9790245276f347b2ba99b38
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 DIST netbeans-trunk-nightly-201601270002-src.zip 209531425 SHA256 368e7f65afd280d20a26b31be55a46dd03eb2ec10bc10a6126ce782b855372a2 SHA512 633671e83592c1016efcd91226b46d957435c8d55066339dc712f30a17821638b20bc617373d715914087dcb3498fa68817373f63e0489b0a35dcb9a47e382e5 WHIRLPOOL 3d5b403e4cdf89382e47c3bc471047162081a2403689484afb3b08ef764d3f38932f5dd057240840a5cf9fd6b64919ded7b08d4fc81e75352aef4ff61065c6da
@@ -44,7 +43,6 @@ DIST netbeans-trunk-nightly-201602180002-src.zip 209750814 SHA256 d26953a05588a0
 DIST netbeans-trunk-nightly-201602190002-src.zip 209766182 SHA256 80b4e9ded780778d73e969a8bf14915e140a7308918731c354eaeac4522a07cb SHA512 ed15d416fdf92adbe13eb0352174cb921ded39c8c0b496535dd0aea80589b2742116655367730226f341a5fe7901f43a0326ba68fea8f3abc14ee0940ad5accb WHIRLPOOL fc8c42415df906bb1979fc8d0192f4f360d8bd79e96531a2432769b9ff24dd0c6594fcc0d433f290b2401c74f02851daff4de1d929053459e35c6133be19dccd
 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_p20160119.ebuild 5280 SHA256 b7f84d34fa490f12d9d7c5042d7a0869cc918f781982c83ed3bcc28ea0a70514 SHA512 e2acba0cb8f1a7e1d9bb378e06ac50549769537743a4db7e3d311ccc1f83758612eb288f9a49f24486431e84def86a1a745c5788aa4ab2cc86807f56666ebbc7 WHIRLPOOL d183b47cbb2345f69e0e825cbb6ac13fcd6415fd179da1bddd71ae9dd755951ab3bfdd614a6d216d499f5438866530997e0647c9ff2a57300e7ba21f3e9756a0
 EBUILD netbeans-webcommon-9999_p20160121.ebuild 5280 SHA256 b307d7f99148f077993b8a60ba1d9e93c635df73a7809ab7d129512ce07fd67d SHA512 e9cc4e62a6eb47f7336cfe2e5d839b87ddf83115bb4130121474fbd0bfe445adaa41c728a73ef12230ed600dcf4332fe9964d570023d4e792a234757478c4c58 WHIRLPOOL d52e68c5e34615da009e36ed8c28d85d8f12bd15ba24f87cb7b46b23f1907841459951ccac03550880834c65972c686977258c65baf2edb50b42ef6e19223c05
 EBUILD netbeans-webcommon-9999_p20160125.ebuild 5280 SHA256 32cac5377afb2e2625f926577667b147131b1b6f6de01881a80fd2429cb6ac2b SHA512 eaf4d04f0b5795c0ccab7d91d7b663690cb40d25f2b6f913ef9c490a55313b93ad1df2b8d18446f4f1284de195a471fedda51f2bedd3c04ed00d7a4f14e9adec WHIRLPOOL d7aa94a8c4d567013ff816c8a3622143969f53d446b18865f4414781e18c92e8e49f4a992227b0f4e51e98177766ca7855dba2e84be9ae1c26687e24a3a0f7d0
 EBUILD netbeans-webcommon-9999_p20160127.ebuild 5280 SHA256 612fab564b5d2f1bedda004ca7994b7c3978894b4da087c79fb81e5faf1c1d38 SHA512 30c9335487f4d9ae8bd2569271fb3222d37974035d27aa02e6f9ec7cdb52dc6cf0a0e37e8dbe866adc9d522e5a27e4a4e0dcb453396070380d9a4e64869e0d48 WHIRLPOOL 7764d5ae9d89774aa129918d937359aaeb03731bd1dee4cab70e26febb38e3bd8f0b47d8e20e3e75e8e06f00ad61c6a4e4c59f82a24ac0fedde18cf0c5f30e8e

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160119.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160119.ebuild
deleted file mode 100644
index e59ebda..0000000
--- a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160119.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-01-19_00-02-04/zip/netbeans-trunk-nightly-201601190002-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 36fb7da..9869a5e 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201601190002-src.zip 209493622 SHA256 170dd02b09b8e637f67e9ba65239a901239db60505da64e996a883d6f6796268 SHA512 f6aa1806046166536f775914ecfc91adc4894f15d55d3164386f83733346a65f52f1bc9323f8fe2f14f65046c9409fd24ca72d623e5474736718fb88cdd0f875 WHIRLPOOL 92e847dcf9f46e58b1b94e404be99dcc16f38bfefdcaa698d290aa3c0af3a5d9c6fa8decc552bd8e8d04f3a6b86cf65729a35fcdd38fc629ffb6fd854c22210f
 DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818ce4503d91850e5a853c67249b646c7bb54710c1905202e04971 SHA512 5dd6a6dab6671ce956ed16e0072d51843cb48e3b53bdb80aa356aaaa93fa9513ecf9440556987082907cdb5054b1be70569e342848c45a6ad5754d3166375ad7 WHIRLPOOL c50bfa3d015364282856853b92e99c235786e1744f3e0eaa937b1e1db48dfa4e7cc1a29c15b6fed875d144572cb951a56dc7668be9790245276f347b2ba99b38
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 DIST netbeans-trunk-nightly-201601270002-src.zip 209531425 SHA256 368e7f65afd280d20a26b31be55a46dd03eb2ec10bc10a6126ce782b855372a2 SHA512 633671e83592c1016efcd91226b46d957435c8d55066339dc712f30a17821638b20bc617373d715914087dcb3498fa68817373f63e0489b0a35dcb9a47e382e5 WHIRLPOOL 3d5b403e4cdf89382e47c3bc471047162081a2403689484afb3b08ef764d3f38932f5dd057240840a5cf9fd6b64919ded7b08d4fc81e75352aef4ff61065c6da
@@ -29,7 +28,6 @@ DIST netbeans-trunk-nightly-201602180002-src.zip 209750814 SHA256 d26953a05588a0
 DIST netbeans-trunk-nightly-201602190002-src.zip 209766182 SHA256 80b4e9ded780778d73e969a8bf14915e140a7308918731c354eaeac4522a07cb SHA512 ed15d416fdf92adbe13eb0352174cb921ded39c8c0b496535dd0aea80589b2742116655367730226f341a5fe7901f43a0326ba68fea8f3abc14ee0940ad5accb WHIRLPOOL fc8c42415df906bb1979fc8d0192f4f360d8bd79e96531a2432769b9ff24dd0c6594fcc0d433f290b2401c74f02851daff4de1d929053459e35c6133be19dccd
 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_p20160119.ebuild 2721 SHA256 6a6be237b2b1e7d1437a50a9d183e13f73705cec1f6f7e270050e6b02ab599ed SHA512 0a2d6230c0801fafce2ef11b61007166c76b9bef4915c71e0049af6265efa6cb9b5cca14aa8bfe1cf10010a33431269306d8826a31c0ebdd58c1cc07ae5a96ca WHIRLPOOL 63f5e897128197e1ff8b3dc649117c7bcd17dff4460462658592e844a2979ec943f84877875ab42e11d629664ad50415a9987161acecf3b3048fa7b82b774aee
 EBUILD netbeans-websvccommon-9999_p20160121.ebuild 2721 SHA256 67589289094b23e5b1c06a82c23427815ea5934b153e51cadfb851ea37a318e0 SHA512 fef7e1c3e0d344a2907c35b9b6b5fa34be9c1deab0e2d48a6a348d3552a72b58b64a66d14e72aee0d8b10c640e205360fae6d25de6da5b7bc12c8021813ef7a4 WHIRLPOOL d3ec5db514c199d3e1553516a351ab05d31c4cc32d8da7acd4b58ed049c661e280163a5099b1b5caf90916500a6607e2d324d9c913f4722fcf12ccb3226cbd3f
 EBUILD netbeans-websvccommon-9999_p20160125.ebuild 2721 SHA256 b47db4469fbcbbc9d50b2f4d33a023b1153f746e2e12851672ce743bc628c788 SHA512 4b87eea915c12a711b97812e99b1d57a87e72ef87df649bbebdcab6960638c970faa572462e8703cf9a537561b191bae5d126cfc06a4a0bb718e72964ce32e8e WHIRLPOOL 2f394abf3cf522e86d84dcd9448cc998e0f6914c0171c0b539c2b4fa1c489065e4b5770238a3331d864f6299a068773d0f6e192f035c3cc5e764a593196645cc
 EBUILD netbeans-websvccommon-9999_p20160127.ebuild 2721 SHA256 35426db523390957555b9e3a6b61b918b2084ec910d9b1ee606e8aa6728b8e3c SHA512 f3a9fdf8233ee0a10eabb593e78a6b06fffee7b009b53a858f7bd66e5c3c23283aa12c6681e61657863d1fe3b6623e69c28e3f16cb611497c6c5080f69378266 WHIRLPOOL 9bba1616a170fd5179c0605643c05ccfa00eabb05965e1e0f8f8c1dbe4de059e641474fe17f4231dc9ca8964b7e0b9d3da208bad57261480824a5bc309c3718e

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160119.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160119.ebuild
deleted file mode 100644
index 23ce962..0000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160119.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-01-19_00-02-04/zip/netbeans-trunk-nightly-201601190002-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 76155a5..6f21540 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3
 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-201601190002-src.zip 209493622 SHA256 170dd02b09b8e637f67e9ba65239a901239db60505da64e996a883d6f6796268 SHA512 f6aa1806046166536f775914ecfc91adc4894f15d55d3164386f83733346a65f52f1bc9323f8fe2f14f65046c9409fd24ca72d623e5474736718fb88cdd0f875 WHIRLPOOL 92e847dcf9f46e58b1b94e404be99dcc16f38bfefdcaa698d290aa3c0af3a5d9c6fa8decc552bd8e8d04f3a6b86cf65729a35fcdd38fc629ffb6fd854c22210f
 DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818ce4503d91850e5a853c67249b646c7bb54710c1905202e04971 SHA512 5dd6a6dab6671ce956ed16e0072d51843cb48e3b53bdb80aa356aaaa93fa9513ecf9440556987082907cdb5054b1be70569e342848c45a6ad5754d3166375ad7 WHIRLPOOL c50bfa3d015364282856853b92e99c235786e1744f3e0eaa937b1e1db48dfa4e7cc1a29c15b6fed875d144572cb951a56dc7668be9790245276f347b2ba99b38
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 DIST netbeans-trunk-nightly-201601270002-src.zip 209531425 SHA256 368e7f65afd280d20a26b31be55a46dd03eb2ec10bc10a6126ce782b855372a2 SHA512 633671e83592c1016efcd91226b46d957435c8d55066339dc712f30a17821638b20bc617373d715914087dcb3498fa68817373f63e0489b0a35dcb9a47e382e5 WHIRLPOOL 3d5b403e4cdf89382e47c3bc471047162081a2403689484afb3b08ef764d3f38932f5dd057240840a5cf9fd6b64919ded7b08d4fc81e75352aef4ff61065c6da
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201602180002-src.zip 209750814 SHA256 d26953a05588a0
 DIST netbeans-trunk-nightly-201602190002-src.zip 209766182 SHA256 80b4e9ded780778d73e969a8bf14915e140a7308918731c354eaeac4522a07cb SHA512 ed15d416fdf92adbe13eb0352174cb921ded39c8c0b496535dd0aea80589b2742116655367730226f341a5fe7901f43a0326ba68fea8f3abc14ee0940ad5accb WHIRLPOOL fc8c42415df906bb1979fc8d0192f4f360d8bd79e96531a2432769b9ff24dd0c6594fcc0d433f290b2401c74f02851daff4de1d929053459e35c6133be19dccd
 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_p20160119.ebuild 6938 SHA256 261ca9cf94a9704dd2d4d42994245012ce6d17712d35be33fc3b852fed55050b SHA512 e657f19451d2f0e43a1437b39e93ac19d392a5a3b1904510b3d7510b0494c0aad6a2f6a5977043afceecf7e6b06c77eeaaa916ff3e1056f2f2c0dcaf47f7362b WHIRLPOOL 8070c7783ea9e02ea91d8f2d6126f0b4ff0ae51489010cdebc1913a2563fc612f20e1ea785c79e09c067e1ac5a13a6c742868904b562c7e8251f7b924b7c5fd7
 EBUILD netbeans-9999_p20160121.ebuild 6938 SHA256 c84fd6f7f762e15bd9f7b7f651ca72857f8a6b5b450bb44e867e57543fc8eb50 SHA512 7621f7adc2c3282f01682fe2a25706d289d64edf04914edc581fab8161cf297eea01e40e12f35caf7c7feea7b867dd575b788c282e153e1f6f1fb9c275ad4b40 WHIRLPOOL ae19d9e17395dc0b3ebd832cfd08826f0f0a1afbbde9034dffe21ce95687777fb73a10ae84465882ce1f6f5870607ef940d4fa516280b0003f4f56c9dd7cee2d
 EBUILD netbeans-9999_p20160125.ebuild 6938 SHA256 2111252d6adc9305b2bf08704893ecd0e4927705ae51de47fecb1b3fdf572656 SHA512 8c587525d1786a3f9932c296f66a2299f76003bd07926d3801391fe5c9b0b27378f56dc0dcd8d5727ef04ad952b357c9f13e57de053c401520e7bcfb817f6dfb WHIRLPOOL 4fc9171d5ff63bc6aae6efc5b11880d6d1954f9af6e52517854267096558b139659ab8358d23836bd06574d47220d21a547cd751de089b0a8a6d4159e0e533f5
 EBUILD netbeans-9999_p20160127.ebuild 6938 SHA256 0ba9f3863fb853a9611a9f8f06fb5d041f6c3f802e336046c72364409d81800c SHA512 bf163db5182369e9412b3985275f47275e8023a3695a71e6012d3bf3dbd4e6738f079009bdf778695113f638a93b1665989001a5db8ee02129b3e09389e182cf WHIRLPOOL 1917bdf9759e03d27726f3228f7d333d2004ada0d936430cabe0c17f6760cc760c374286bf8422166a09fc8a531e545d89dbb851cd3fe026a1bea1485594eb8f

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


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

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-ide/, dev-java/netbeans-webcommon/, ...
@ 2016-03-07  9:31 Miroslav Šulc
  0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2016-03-07  9:31 UTC (permalink / raw
  To: gentoo-commits

commit:     bd5e7d041b60e042ca31af2c49d1c7c128b4b7c3
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  7 09:30:36 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Mar  7 09:30:36 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=bd5e7d04

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.2.27

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 2e60ef7..ccddd6e 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201603030002-src.zip 209842396 SHA256 e5aa9f6bfd0301
 DIST netbeans-trunk-nightly-201603040002-src.zip 209874039 SHA256 1c09271301d3c339c32e7e4f357344d576258bcd47945cddb8c35425b08094fc SHA512 3afb51c5740c1fbfa8c6d246f7cd125185dc93f1b0150ae22055179123b35dafc9657564a4c5981047e8ad8c60b72f1f4ea908ae78123f62b318fd022cbf6ba5 WHIRLPOOL 712f146d886fde5a5a6e5be198b82f5fd61f557e9de70e4a07f144350e4213918143bf50706139b7947de1c0f2d1f819dec749899d8a896c36d08a1fa561c15a
 DIST netbeans-trunk-nightly-201603050002-src.zip 209877850 SHA256 63189967b006451d5881dc2b31d086ddfd57334752adca57aa47e736f21fd09a SHA512 a5b1bd2518102de7d4d0552e11e8fe99aa17e05b1b77c69801421ec5b821dabe145a3a9fc245591b349e82d54670c182336a8d6c9340097fb843113269efcf43 WHIRLPOOL 9dd1fbf1a95c33b4d5b83a91ab469c3d174c6f1fd3d7bea0836fafafeb933b7142f56512a882f8387fe9c9292fd9c7276121b75c700e75617d0e9651e89f4d58
 DIST netbeans-trunk-nightly-201603060002-src.zip 209877850 SHA256 8626e8cefe8c5c2c65b0da44edef5148f85f9bbef39d7aea60baf2ec240b360d SHA512 0bef47e29211cec98b037361db3d6e5a513212f8761a2163430d74dd7f837f736de649416408966bf14344e68873a9dfabc5501ce83034a8c944193dbdc46ede WHIRLPOOL b6fc7291b14c66d546c9031e0fdef21900f284eec4aecd751e65c91efda33027da61174e3affb6420671e6822dd075de65802cc6798c3804078924c0b4a5b284
+DIST netbeans-trunk-nightly-201603070002-src.zip 209877839 SHA256 fc1c88bc66f6c53325a5fa69610b4b5ce2ddd77f716f9786d51865048d839657 SHA512 efb500a2975b40a251dbcbc85b51a23b3cff188d85c67592a2463ca8645f0a0ffd41222d38501be9b39f8737e11b3cc17a5c8f55a5c5b047ab41fdf93be30baf WHIRLPOOL c63d4521cca81cb8ad232f8bbe83fd9f8e98870884fc986d45c12325674f12bacab79ab2a978b73ee3a5d8a2d5f4bdeec08438b9f1bfd99ea292ef31c407cae8
 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_p20160204.ebuild 3384 SHA256 62c662c5fee46e2f93f4ee0f49371575131b06f19015dff393b00ecd1d6e2e40 SHA512 0d132752086073ca18233c851f33bc26cfcdcd1a5f50bde71298ffd7fc8833f91e40bf945a6b9a1821ef3b54684a921a6b96022a4203ac7087d2fcb6a8f66841 WHIRLPOOL fab8805e9862cd70299d4a42cb016cab2680850a8b5da5d7751e69f1c5810151219e6b302b1771b72e46212dce07c71e6126578c908c16ed4882b45bfd1b4774
@@ -59,4 +60,5 @@ EBUILD netbeans-apisupport-9999_p20160303.ebuild 3384 SHA256 52a3f8365db13f9ed95
 EBUILD netbeans-apisupport-9999_p20160304.ebuild 3384 SHA256 f3213028bba3ed46dcda12998289a0e991318436fb1f9942056878cfaab54042 SHA512 9f19fc93db38b381fb29920feb2c7a320914f45bb292808aae45dd90bfd0ef666a20ed3f9721041192125cc25cfddf84fceed3bf2875cee2b56773257032bfe1 WHIRLPOOL c652bde4846719e0e6b577abbf3c08a62f3d5a3e7b90ffa22e0836ea2c740064552d1a3962d6f1866c10c68e3031cbfae4a7f77c13cb578a8f7acd9eccdefb7a
 EBUILD netbeans-apisupport-9999_p20160305.ebuild 3384 SHA256 d1deb8d1ffbff3d67a092e910dfff551ddab408fa7ee522b6f987403d13cb3c9 SHA512 bf7cca104f61f4944ca7d712053bbe23cc4f5be3ba96690a6c48ed14a02416c50bc472c9c2c5596acc3f080513afbecd99afd8b6126f16453faa01438e1c84af WHIRLPOOL 3f35a2e765cfb8aa9584bc1f2b55f29de9aa36a308b5aa1ba4db80bf5f8e140f5b3722ab3eed120faed244af5a00f7f5f440f2c54d5564e557f8fa77bf1c1acf
 EBUILD netbeans-apisupport-9999_p20160306.ebuild 3384 SHA256 1b57b15b5f431a70a2d983a9db02e49e6d51b7b6f1377f7624269456b9b71a53 SHA512 cb55af955e21072a6e3bb3d7d4eef23f156a1c285705cbab318f40887b7b4c555428659bec14f52d2e23d3dd79e152fe19edf6d2ef166d8cd9e80880c634136f WHIRLPOOL 8df1ed80ab7e8aac63a0eb8ab42b11cab96490865ff054cc06cfb9c24567b7e4fc8fbc3077860984f15c1b0012b47d647e867e43fe55e04b33688a51fc502fd3
+EBUILD netbeans-apisupport-9999_p20160307.ebuild 3384 SHA256 60e6b5a9314d519d340bd3d11f44c5a839cc332c88ddb947cb705bd0ad451b98 SHA512 46aeeb9367cd6496e9aa4b2257854fa22d675fd2e0d70aa16ffe4ec929d044b4dd63b40ce6f6115233c16886a33bb950a4c23bc26139c1f1dc7a672a04ba8230 WHIRLPOOL 9dbca9693b722a3460d60e7e0c7afefb772c8532de222edbc01b22ec81089c044608cdb3e7e9026b8d45ac1843ae48838473a41e78b5816c90a7a2446f47194f
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160307.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160307.ebuild
new file mode 100644
index 0000000..0e830df
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160307.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans API Support Cluster"
+HOMEPAGE="http://netbeans.org/projects/apisupport"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-07_00-02-15/zip/netbeans-trunk-nightly-201603070002-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 6ce5baa..eb2d2f1 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -7,6 +7,7 @@ DIST 688488BF9E65AC39749AF959A5653F536EDABACD-clank_0.3.6.zip 7548154 SHA256 a73
 DIST 99529DC0E1426A102A98EF5494B6F6AA6E497F62-clank_0.3.6.zip 7930942 SHA256 ad9a64303fc4db833d2789a7d5b0be537ea7db55090189411e5778efff54a8a6 SHA512 46d91f0cbe86af186b87e6b972ecc9391f5b2a670eaf7238b60bb5399c0da40382c729338d1e2cf8ab94eb4ac64bfe9253da1cfad2ec900a87d56df4d299d707 WHIRLPOOL 52ab6b35eaa04d0e375bc4aaad43c4390021309da1956e81db6ba4fc8730da147f35eeceb8a02fa7e42e315296e8be3eb03d88d7d8987fdce30ec433ac5c407b
 DIST BB83D4F8047D608858154CB041054F5CAE35B903-cnd-rfs-1.0.zip 177647 SHA256 c92c3d3311b8f75883f4f9280fe8d6932b154c67c9dd1bd65a49beb45e578cd1 SHA512 c42e4f0c1b7efb24a45dc375180bfc8b0e02e74e01233665d3e74bf83a182c2b0bbe8b572a8eeb993d77312f6d118777d0576adfca4ea8f4c2cfe08892155345 WHIRLPOOL 41b573c7ca4b926333f28a9329a2423955055ff716e7be03b7a6f4714e7261e57574b16a0e89b96ae744dc0a36f9a4a72f8d948b11a6b8052159d42cbd40876a
 DIST BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip 31891 SHA256 dd9105ad309b56d22ef08573ec48a5f21baa2c50f8606df9c7b6245abd9dbe72 SHA512 288229a85536a45fbae6ba5a4dc085fa2053264259f14833cd435f64191a4b2f4b93c3e9981589087ec293afbb0fc76e97d2b5312a196e3b3fed11a605ab650a WHIRLPOOL 69379d331a68e1c4eb15aa8b1ff5256c9b98d9fad4688f2d306841973b151fd22ddbca25c5388af39b487b8810a2e521ffefbbb9775cf02271626179c3810c04
+DIST C2F2896DBA341334C88ADC79997F67E6C9059CD3-clank_0.3.6.zip 7432242 SHA256 e4a71891e77e401d468f874f4b582c4271e7e965820a99be902d7af0aa2d6ea2 SHA512 6e9f3e80668e7ce83f4d762703a5280cf1cac68064d674ccabcd8d3a73112ab39025ecc2db7d743db6129a9901278d92ec8cec47114c9f73811980af7f76a0a8 WHIRLPOOL fe748ad3b8493a336ae94fb86d973c002fd1a130bcea71a4583e5912f805c5743b3b970cdd0e09d049421bdc04b2d195cc034e6edd472014bc85e8544a7f04fd
 DIST C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip 92177 SHA256 71e6d46d9c7e624bc83dbfa4edde20bfdcb47ae76dc2b19dd553d23f22b454e7 SHA512 64b15aa898a45c1dce0d9c58ec4ef8c3dc1a32e1213543d98002cbf5419d67b3caf4357c8a252e36951197f3edd70e34a226c989e5479ce3b2d1405783d3d530 WHIRLPOOL 675db7f81ecadcecfe52f18cf8bd465867c1dac12f818717248da9a7d071d45adeb3c6af2e6ac1863bb5ccca36ae9383722d2361c28af52e51e5f2ac34736e89
 DIST DD5ECBE848DDC19E34F4ABB74A7C1950C0F587CA-clank_0.3.6.zip 7604674 SHA256 c28d4456ccb87adb7c782f442d045046bcb376b5a3d8f20dfeca526b20dfb109 SHA512 a61611b9067cd311ffe7e4c770e49415b451e57eab2da7cb0d12b3478f4d3eb9b588791e325017b815c40f93087acce86538498ddb26d30517c31554df2b39a6 WHIRLPOOL a49d5ff6fcc22d73cbdb9894eb392f4a09e8a281fc1d068b9c5f50f34bdb5b0cf33e3c8ae3859eb7094347a712c7a9cec292e5b0bd623b2fb708db08b94cd329
 DIST E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip 179656 SHA256 33d046408ce7a59158c550c672de03dba87485e0e83ca2e408b704e7a2a60591 SHA512 748979d810751d570087dc60bc02cb5969c6f713cba87d32004c505b9a92150d518c6dcf66caca61841ca8f28c16cf3cd2a5a40b370f5dec5c9482b57bd051d8 WHIRLPOOL 12cc51c73f8511b84d4860ed8c2545e96c72477755d6027a086537187ac3c16322305a0158480498968a4f71a72ff6513d91d9f7d37ab2c38c8293dceced0da6
@@ -42,6 +43,7 @@ DIST netbeans-trunk-nightly-201603030002-src.zip 209842396 SHA256 e5aa9f6bfd0301
 DIST netbeans-trunk-nightly-201603040002-src.zip 209874039 SHA256 1c09271301d3c339c32e7e4f357344d576258bcd47945cddb8c35425b08094fc SHA512 3afb51c5740c1fbfa8c6d246f7cd125185dc93f1b0150ae22055179123b35dafc9657564a4c5981047e8ad8c60b72f1f4ea908ae78123f62b318fd022cbf6ba5 WHIRLPOOL 712f146d886fde5a5a6e5be198b82f5fd61f557e9de70e4a07f144350e4213918143bf50706139b7947de1c0f2d1f819dec749899d8a896c36d08a1fa561c15a
 DIST netbeans-trunk-nightly-201603050002-src.zip 209877850 SHA256 63189967b006451d5881dc2b31d086ddfd57334752adca57aa47e736f21fd09a SHA512 a5b1bd2518102de7d4d0552e11e8fe99aa17e05b1b77c69801421ec5b821dabe145a3a9fc245591b349e82d54670c182336a8d6c9340097fb843113269efcf43 WHIRLPOOL 9dd1fbf1a95c33b4d5b83a91ab469c3d174c6f1fd3d7bea0836fafafeb933b7142f56512a882f8387fe9c9292fd9c7276121b75c700e75617d0e9651e89f4d58
 DIST netbeans-trunk-nightly-201603060002-src.zip 209877850 SHA256 8626e8cefe8c5c2c65b0da44edef5148f85f9bbef39d7aea60baf2ec240b360d SHA512 0bef47e29211cec98b037361db3d6e5a513212f8761a2163430d74dd7f837f736de649416408966bf14344e68873a9dfabc5501ce83034a8c944193dbdc46ede WHIRLPOOL b6fc7291b14c66d546c9031e0fdef21900f284eec4aecd751e65c91efda33027da61174e3affb6420671e6822dd075de65802cc6798c3804078924c0b4a5b284
+DIST netbeans-trunk-nightly-201603070002-src.zip 209877839 SHA256 fc1c88bc66f6c53325a5fa69610b4b5ce2ddd77f716f9786d51865048d839657 SHA512 efb500a2975b40a251dbcbc85b51a23b3cff188d85c67592a2463ca8645f0a0ffd41222d38501be9b39f8737e11b3cc17a5c8f55a5c5b047ab41fdf93be30baf WHIRLPOOL c63d4521cca81cb8ad232f8bbe83fd9f8e98870884fc986d45c12325674f12bacab79ab2a978b73ee3a5d8a2d5f4bdeec08438b9f1bfd99ea292ef31c407cae8
 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_p20160204.ebuild 4790 SHA256 69f584edf1482f4cf4bc11d9b5177728340fd4e08acf28a0b2537124c655e77b SHA512 6a80766fcc07a8b7ff46d909d5d5a9f65407c7683366d7dfe0893dae92aaa1705d8f6edf23d08c29b09a5c585147151e0dc56fc86822f80fa008e3444942bf53 WHIRLPOOL 6ec5772493f0aac9ab26960ac948aee50f88b988f360716f49348640a654efc959a9361ad38a4e50f2e10a28e4ed2d854f0086af96d3672f73564ba6bc16562e
@@ -71,4 +73,5 @@ EBUILD netbeans-cnd-9999_p20160303.ebuild 4790 SHA256 0f7630db1a724b6a54e4a7bf14
 EBUILD netbeans-cnd-9999_p20160304.ebuild 4790 SHA256 1be1a29a9b9ff2664300f0cdd13b87bf5ef168ec85b18ddc2faa53099c0f63f6 SHA512 911ffec2a3773a27e9a29b1b41a4e8de3d4aacf121f94a6640bba0a1e1460c7b80f5ed9d230de974fd2b2f8bcd29538db08ea0202cbcf2558d3c4af649a70679 WHIRLPOOL 35dc0e38eb9ade8ad0333d1a048accefe59ceeec7b0b803a9ec8a01ca61a663937c038c6b02d44201eab749ef79e0380011125dbd04d61b72133cd332b038f0f
 EBUILD netbeans-cnd-9999_p20160305.ebuild 4790 SHA256 9d35df71300133989f66de042dee4ace3f983cc49d31a7c1e14c53901e858b17 SHA512 44b19f4f91d9851f881d01760076a459a7afb2dd0b4e7b7e338d562c25d86a1ff57991d5ad06e1fbe2f44d9806b9b1cb2904a5d98697d2516754d432fa09304d WHIRLPOOL a2e447b1e3d0152cded8acd6012a39698ab7630ae07a333ab4f2ed4ee2865bb5ce7e099f65eab8744d29ce7772ebb1170f629b2ca9d68bae77bc0df29c5ce102
 EBUILD netbeans-cnd-9999_p20160306.ebuild 4790 SHA256 97dd173ac83542326a4163070681d9d54d3801d8df638d14e1e99e07a6435e77 SHA512 a5b5fbea0911fb5c8ac7e01ec3f9f75d1c96e70d7af0e6e2345919cda7e114e5a4e62516b75df771e25d4c9c1c79ba987cdb015d66e160eaf4644bb6e41bf2f5 WHIRLPOOL e09e8398f2f45fa9e86f8ddb4528ff415d5eaac908577d2f6acaa469affad0b7f33aeb1e29a66bb385c74cf20bbd826080c8aacf4fafd5f9e2a843475538832b
+EBUILD netbeans-cnd-9999_p20160307.ebuild 4790 SHA256 34522e0a12b535cf3bbe6e06cab4830d9582f9773ecb6e8988e70efbac368704 SHA512 8646bb0c43ba524db1bc4d89c66dedd97b5689661901ba3aeebb833f962e2e80286411155571bf36d77fc73c7761b5a9ebf203760f0330f416904aa9ab4bb692 WHIRLPOOL 50e0c3b92c2b8d8af954142a1bae16055904b7eb2132bdcd2aa2673a3a6cdbfd7a250deb6fe63e08ae986a98a6b1588d72cb0799b38d82bf77998f002c308d73
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160307.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160307.ebuild
new file mode 100644
index 0000000..49dcff5
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160307.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans CND Cluster"
+HOMEPAGE="http://netbeans.org/projects/cnd"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-07_00-02-15/zip/netbeans-trunk-nightly-201603070002-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/C2F2896DBA341334C88ADC79997F67E6C9059CD3-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}"/C2F2896DBA341334C88ADC79997F67E6C9059CD3-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 d7a3ef6..68bc7ba 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201603030002-src.zip 209842396 SHA256 e5aa9f6bfd0301
 DIST netbeans-trunk-nightly-201603040002-src.zip 209874039 SHA256 1c09271301d3c339c32e7e4f357344d576258bcd47945cddb8c35425b08094fc SHA512 3afb51c5740c1fbfa8c6d246f7cd125185dc93f1b0150ae22055179123b35dafc9657564a4c5981047e8ad8c60b72f1f4ea908ae78123f62b318fd022cbf6ba5 WHIRLPOOL 712f146d886fde5a5a6e5be198b82f5fd61f557e9de70e4a07f144350e4213918143bf50706139b7947de1c0f2d1f819dec749899d8a896c36d08a1fa561c15a
 DIST netbeans-trunk-nightly-201603050002-src.zip 209877850 SHA256 63189967b006451d5881dc2b31d086ddfd57334752adca57aa47e736f21fd09a SHA512 a5b1bd2518102de7d4d0552e11e8fe99aa17e05b1b77c69801421ec5b821dabe145a3a9fc245591b349e82d54670c182336a8d6c9340097fb843113269efcf43 WHIRLPOOL 9dd1fbf1a95c33b4d5b83a91ab469c3d174c6f1fd3d7bea0836fafafeb933b7142f56512a882f8387fe9c9292fd9c7276121b75c700e75617d0e9651e89f4d58
 DIST netbeans-trunk-nightly-201603060002-src.zip 209877850 SHA256 8626e8cefe8c5c2c65b0da44edef5148f85f9bbef39d7aea60baf2ec240b360d SHA512 0bef47e29211cec98b037361db3d6e5a513212f8761a2163430d74dd7f837f736de649416408966bf14344e68873a9dfabc5501ce83034a8c944193dbdc46ede WHIRLPOOL b6fc7291b14c66d546c9031e0fdef21900f284eec4aecd751e65c91efda33027da61174e3affb6420671e6822dd075de65802cc6798c3804078924c0b4a5b284
+DIST netbeans-trunk-nightly-201603070002-src.zip 209877839 SHA256 fc1c88bc66f6c53325a5fa69610b4b5ce2ddd77f716f9786d51865048d839657 SHA512 efb500a2975b40a251dbcbc85b51a23b3cff188d85c67592a2463ca8645f0a0ffd41222d38501be9b39f8737e11b3cc17a5c8f55a5c5b047ab41fdf93be30baf WHIRLPOOL c63d4521cca81cb8ad232f8bbe83fd9f8e98870884fc986d45c12325674f12bacab79ab2a978b73ee3a5d8a2d5f4bdeec08438b9f1bfd99ea292ef31c407cae8
 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_p20160204.ebuild 2968 SHA256 0a6627c5c04ce5b80ffb78b9d7741ea1244e0cba07ab2c965d6311629aea1f43 SHA512 32fa80ab23393f8cb7199e3107b9ea2f9d9e4e0f382ba41eafc9801866277f4a40e976c22e6df03bf9dd01611e8a8f066f5e0cf6b51ba6121e4c6036da1ae713 WHIRLPOOL 0cf3aedc58b7e91e776d6c72edae4ecdda368e37f9b499731bfe71c40b9828c04ae13ab24523401e0944f31296f9bc828a65a02f166ad0413e9b99a8c9715abb
@@ -62,4 +63,5 @@ EBUILD netbeans-dlight-9999_p20160303.ebuild 2968 SHA256 948d9d319f6a28861581bdf
 EBUILD netbeans-dlight-9999_p20160304.ebuild 2968 SHA256 4e079f1f62ef2d50ee1926baab30ef6fe3d70abac10bc222200e5119505ee61b SHA512 828fbc1474d512fd6ee106402383b7442e593755790fe18cbb88411aab7a278b7622ed63cd86e6d34c144d9316913c19618c529e3379e48e81453479798cb8b1 WHIRLPOOL e59978e9de8bd33dc46c3a6ef72bef87f4caa7ec920892b7363097e3160a1a4f404c63bc4c154d6997d776b9d2b4408a205f2ab146bf25dea70418008e13b973
 EBUILD netbeans-dlight-9999_p20160305.ebuild 2968 SHA256 2844b5e4268f05f4a150f452707257c5a1fd06e91df52ac25d7acff12a35b8c8 SHA512 c30a6167079a6fe67cb6b6c2d3511611f69ce5e059ec85b7aae5a2024f90eee7628a9f85a27994afcac93be378560e0dae51abaf9308592ce863ae1ab90844e6 WHIRLPOOL d147401b3f8c907bbbcbd8a6c08fdf40fd987b1e57dfed89d8c900c2c4d77320be480fe4489623299e646bd5d1951cfab9cf7416497ea7ee95be3dd5f7804f0b
 EBUILD netbeans-dlight-9999_p20160306.ebuild 2968 SHA256 933df16ad2d5495061a4475805f1ff23c090e37c4cab1fa41136a5564e19f229 SHA512 17148bf7b926a80cca8da00d7eb80063993e911b60669b9ef1b715be2c121ab93256b35a3b65a45360d04c7a5f8de6a039c83a7552beb19903ab3e3d01e1a308 WHIRLPOOL cacb49e541e5883df5138380bb086f2f2c7f2ed7f5ddc06258afa94d8da025cc20e31d29ce4b20bc90bd256126a8292e3dddea7269f146f038438748ac52565e
+EBUILD netbeans-dlight-9999_p20160307.ebuild 2968 SHA256 fda5436e35f855f644ea1779d96f870b6618aed8e14309ba69293167dbcf8957 SHA512 89d3f1cccda31d6f767f5fd0e9cc8eb58d1b63da01ba7002db206e2167b53a1c31804f1eb9f3567d4f1d051541a6b6c420073584b75918c0806d76bdb170979f WHIRLPOOL c15d0de501512a0f55faf4c467e1ee4a5d186cecbe61a7b87976ae8b6e1266b0cce77a5806ba0300e203c03174a47f2d009f5668f3171ea22acda468dfb5713d
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160307.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160307.ebuild
new file mode 100644
index 0000000..77ca679
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160307.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans D-Light Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-07_00-02-15/zip/netbeans-trunk-nightly-201603070002-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 2579090..ca7b557 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -62,6 +62,7 @@ DIST netbeans-trunk-nightly-201603030002-src.zip 209842396 SHA256 e5aa9f6bfd0301
 DIST netbeans-trunk-nightly-201603040002-src.zip 209874039 SHA256 1c09271301d3c339c32e7e4f357344d576258bcd47945cddb8c35425b08094fc SHA512 3afb51c5740c1fbfa8c6d246f7cd125185dc93f1b0150ae22055179123b35dafc9657564a4c5981047e8ad8c60b72f1f4ea908ae78123f62b318fd022cbf6ba5 WHIRLPOOL 712f146d886fde5a5a6e5be198b82f5fd61f557e9de70e4a07f144350e4213918143bf50706139b7947de1c0f2d1f819dec749899d8a896c36d08a1fa561c15a
 DIST netbeans-trunk-nightly-201603050002-src.zip 209877850 SHA256 63189967b006451d5881dc2b31d086ddfd57334752adca57aa47e736f21fd09a SHA512 a5b1bd2518102de7d4d0552e11e8fe99aa17e05b1b77c69801421ec5b821dabe145a3a9fc245591b349e82d54670c182336a8d6c9340097fb843113269efcf43 WHIRLPOOL 9dd1fbf1a95c33b4d5b83a91ab469c3d174c6f1fd3d7bea0836fafafeb933b7142f56512a882f8387fe9c9292fd9c7276121b75c700e75617d0e9651e89f4d58
 DIST netbeans-trunk-nightly-201603060002-src.zip 209877850 SHA256 8626e8cefe8c5c2c65b0da44edef5148f85f9bbef39d7aea60baf2ec240b360d SHA512 0bef47e29211cec98b037361db3d6e5a513212f8761a2163430d74dd7f837f736de649416408966bf14344e68873a9dfabc5501ce83034a8c944193dbdc46ede WHIRLPOOL b6fc7291b14c66d546c9031e0fdef21900f284eec4aecd751e65c91efda33027da61174e3affb6420671e6822dd075de65802cc6798c3804078924c0b4a5b284
+DIST netbeans-trunk-nightly-201603070002-src.zip 209877839 SHA256 fc1c88bc66f6c53325a5fa69610b4b5ce2ddd77f716f9786d51865048d839657 SHA512 efb500a2975b40a251dbcbc85b51a23b3cff188d85c67592a2463ca8645f0a0ffd41222d38501be9b39f8737e11b3cc17a5c8f55a5c5b047ab41fdf93be30baf WHIRLPOOL c63d4521cca81cb8ad232f8bbe83fd9f8e98870884fc986d45c12325674f12bacab79ab2a978b73ee3a5d8a2d5f4bdeec08438b9f1bfd99ea292ef31c407cae8
 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_p20160204.ebuild 15825 SHA256 23a9b0bfcd6b28c1b37d0426ec09f19b9934ac44a69c1d4da75ccca5fc25351c SHA512 993ade5e5d3f5d5f75356362738b48c94a4c0f065b4a8c3001a0bdc53f753108ed8faf35bff8d27eec279420db7dcadf7b08ff01b24ee2b8e46802fe9d85cca6 WHIRLPOOL 475091111c581f06ac4e5e4f9749c0b5b01f8de287c1e9ae1a3166d8fb6269985ed93dede057d2f013a707583fb2f7c603cb038c0fdf991c94b934e8a06b1e60
@@ -91,4 +92,5 @@ EBUILD netbeans-enterprise-9999_p20160303.ebuild 15825 SHA256 b01b08c90e434f2744
 EBUILD netbeans-enterprise-9999_p20160304.ebuild 15825 SHA256 cacae844485117fb589ec58ef2fc1dd43574a9886803825a818853dcd36c4353 SHA512 626866b493f95707116eb3938a1734fbaf39a64a1aaa0d81a376186f367523b429416ecb75d49f69930a98b31946379eedf592a1358b2759a4d31011df875857 WHIRLPOOL e6bad13b30ee3006db84d8e2b011773575ae9158403627c6424daacd503824c61f040588e42e0b7663d23b0890b5ec14f5bebd07069e8ea31bca7b731296c22b
 EBUILD netbeans-enterprise-9999_p20160305.ebuild 15825 SHA256 6ae0554020df826dffc38a1fa56d4e68ba2d2c4e3cfa7b5625d1bf3a23416524 SHA512 dc7f8ef2d83d3cddd19624a6636e4a73679786b00c8a990025804f395d3199dce72612beccc504952cf12f0838036682023efdd0e43383a6327638986bf46220 WHIRLPOOL eea003af6cb521668f25cec809307e960c27fe4cd047a0d7b683babe076211630d70b970026453f1c57917fdcc3d7f5b5c8882f811214cfacbff22d9bb805ce7
 EBUILD netbeans-enterprise-9999_p20160306.ebuild 15825 SHA256 72460b56cfe22f250bfef4399e80895c04d542748b5ceedb3480d71503becdb9 SHA512 2788a742001e66bb4fff461a49c1286ea6385afee18833cbe1799c2467fff1c00175e2f9c735c888e335f281e5d81c7abb40f8425e28e098a8cb5f59ed68a67c WHIRLPOOL 86d66f6d19571651147483abdb78b63fd663b6d1b0d4d5c0dc5b9dba25a49c95b504b7f34c901b712684d0043557a4c907d69bf509f45a3c126d08e5e8ad786d
+EBUILD netbeans-enterprise-9999_p20160307.ebuild 15825 SHA256 fd88dc63ef3019770c0b054ba478d48197006d22196967e8f71359fc9b83b67c SHA512 64fb9509cdd8b7318d64197a8db7879a85545b227873966e4c7efad6da22ab0a86d05cc2e35c5c82b7293542200777059a365a1af4eb629e364d7762f7b43cd9 WHIRLPOOL ae595987f4fc198b47a0c2c2bc024994cc22a875d86f207f0acb21cdaf835cc0108439043f3ed1d8a39c8a333a66dcda0336edfe630ed1d002f7e0519401634f
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160307.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160307.ebuild
new file mode 100644
index 0000000..7a31264
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160307.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Enterprise cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-07_00-02-15/zip/netbeans-trunk-nightly-201603070002-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 1abd024..eb9d796 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201603030002-src.zip 209842396 SHA256 e5aa9f6bfd0301
 DIST netbeans-trunk-nightly-201603040002-src.zip 209874039 SHA256 1c09271301d3c339c32e7e4f357344d576258bcd47945cddb8c35425b08094fc SHA512 3afb51c5740c1fbfa8c6d246f7cd125185dc93f1b0150ae22055179123b35dafc9657564a4c5981047e8ad8c60b72f1f4ea908ae78123f62b318fd022cbf6ba5 WHIRLPOOL 712f146d886fde5a5a6e5be198b82f5fd61f557e9de70e4a07f144350e4213918143bf50706139b7947de1c0f2d1f819dec749899d8a896c36d08a1fa561c15a
 DIST netbeans-trunk-nightly-201603050002-src.zip 209877850 SHA256 63189967b006451d5881dc2b31d086ddfd57334752adca57aa47e736f21fd09a SHA512 a5b1bd2518102de7d4d0552e11e8fe99aa17e05b1b77c69801421ec5b821dabe145a3a9fc245591b349e82d54670c182336a8d6c9340097fb843113269efcf43 WHIRLPOOL 9dd1fbf1a95c33b4d5b83a91ab469c3d174c6f1fd3d7bea0836fafafeb933b7142f56512a882f8387fe9c9292fd9c7276121b75c700e75617d0e9651e89f4d58
 DIST netbeans-trunk-nightly-201603060002-src.zip 209877850 SHA256 8626e8cefe8c5c2c65b0da44edef5148f85f9bbef39d7aea60baf2ec240b360d SHA512 0bef47e29211cec98b037361db3d6e5a513212f8761a2163430d74dd7f837f736de649416408966bf14344e68873a9dfabc5501ce83034a8c944193dbdc46ede WHIRLPOOL b6fc7291b14c66d546c9031e0fdef21900f284eec4aecd751e65c91efda33027da61174e3affb6420671e6822dd075de65802cc6798c3804078924c0b4a5b284
+DIST netbeans-trunk-nightly-201603070002-src.zip 209877839 SHA256 fc1c88bc66f6c53325a5fa69610b4b5ce2ddd77f716f9786d51865048d839657 SHA512 efb500a2975b40a251dbcbc85b51a23b3cff188d85c67592a2463ca8645f0a0ffd41222d38501be9b39f8737e11b3cc17a5c8f55a5c5b047ab41fdf93be30baf WHIRLPOOL c63d4521cca81cb8ad232f8bbe83fd9f8e98870884fc986d45c12325674f12bacab79ab2a978b73ee3a5d8a2d5f4bdeec08438b9f1bfd99ea292ef31c407cae8
 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_p20160204.ebuild 2913 SHA256 36cbc3ac545d5851d512a733bdb2d6fad919aac006ca7b4b54119962049b5751 SHA512 ee48db487dbda967f3a06aec98496c7164a8ba8c4a66b4ed1f904a91d086490a232de55f5e83893b0b7bc5cbd8f4fdf4b7bdf5cf300344f229dcef636170da01 WHIRLPOOL 32954110b0447df394b67a9be29ef20576f1a7bcf9518e6a6b0aba8b7aed846573e925ce87f2410ced7f79de6f6f9daa68b92159f427cf4c29cba229e0a0f453
@@ -59,4 +60,5 @@ EBUILD netbeans-ergonomics-9999_p20160303.ebuild 2913 SHA256 1780ddbc014c939cf37
 EBUILD netbeans-ergonomics-9999_p20160304.ebuild 2913 SHA256 12ef018080f077c1c4c96c83c187ffafe8044b0f731bab99ade16178e04930a9 SHA512 50ad4580b1434f97b7fa1444936cafabe99b43e5e6efc25da4760cbcba4ef44b7e9e602d48c1e83033d3bceb199e7777ddb81745a8ac3dd0c40943681435d9a4 WHIRLPOOL 84532e014a2a07e6276b85c84dc70515bbc4c37ca6b8479f1d755c567c8cf171cd5a5756b43c0d81c3a74c7955744634602bfa7458425d0b93aa2d3d48341908
 EBUILD netbeans-ergonomics-9999_p20160305.ebuild 2913 SHA256 521829abfd1c5ea62045587d465b32f6f2667b292341fb551e3ceffac5d3d5b0 SHA512 c85e4420d03aad8570f56bddca1bccca45b962955cffaf88da2037dc7bbd8b81d5791cced36c5e21beabf9e2974e190c8f0fb27b761b01b41355c67577faaa74 WHIRLPOOL 4e572f5f83c4bf7c8b6e518f7b5c85f69275cdb74dfba09b208d6fdc202d812894fe184b6a624df3f85b6cd6fc25b815f4af0c77fedd467cf2e03caed04953c4
 EBUILD netbeans-ergonomics-9999_p20160306.ebuild 2913 SHA256 2580b44ac893dba5fa257693cfcc7d7c29ceb230944eb403bd07022e8012d967 SHA512 539b5b1cd00933132dfded163171339ba233e0161d0484646800a0146d4276717d67d02802cfd5999078149af449964b4da73b59c1e6201604f342bdbb10968a WHIRLPOOL 1a1215eb893b3c4d5ba4f6d1dfbfe4df0b604a5ab86d2109bd132ab40dafe6ba58ff32007a688bba166e8878c59f9acbfd7cc6e9575d039e71bfe13667bf548a
+EBUILD netbeans-ergonomics-9999_p20160307.ebuild 2913 SHA256 52735b95eb3a27e26030a07356bd870088dac16095d8e0e0a370d15781c5aa93 SHA512 24f6f310afd0e693294097125a68a0306417bbe90b2e588f18fe095ec4a10c40a52e8a1dc669cd61fb9374f14ad3334fa89779cf3a27018ef267025ab9521f3d WHIRLPOOL 6b340d1134633a7392415e16b2068b603182749abe6e46e8b70bfa867c78cfc861efdb8d70d09c5dd17f95011f22b62a639e22489cbdb1cec879df4642a96a02
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160307.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160307.ebuild
new file mode 100644
index 0000000..78f4b2a
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160307.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Ergonomics Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-07_00-02-15/zip/netbeans-trunk-nightly-201603070002-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 12d7b15..69c0153 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201603030002-src.zip 209842396 SHA256 e5aa9f6bfd0301
 DIST netbeans-trunk-nightly-201603040002-src.zip 209874039 SHA256 1c09271301d3c339c32e7e4f357344d576258bcd47945cddb8c35425b08094fc SHA512 3afb51c5740c1fbfa8c6d246f7cd125185dc93f1b0150ae22055179123b35dafc9657564a4c5981047e8ad8c60b72f1f4ea908ae78123f62b318fd022cbf6ba5 WHIRLPOOL 712f146d886fde5a5a6e5be198b82f5fd61f557e9de70e4a07f144350e4213918143bf50706139b7947de1c0f2d1f819dec749899d8a896c36d08a1fa561c15a
 DIST netbeans-trunk-nightly-201603050002-src.zip 209877850 SHA256 63189967b006451d5881dc2b31d086ddfd57334752adca57aa47e736f21fd09a SHA512 a5b1bd2518102de7d4d0552e11e8fe99aa17e05b1b77c69801421ec5b821dabe145a3a9fc245591b349e82d54670c182336a8d6c9340097fb843113269efcf43 WHIRLPOOL 9dd1fbf1a95c33b4d5b83a91ab469c3d174c6f1fd3d7bea0836fafafeb933b7142f56512a882f8387fe9c9292fd9c7276121b75c700e75617d0e9651e89f4d58
 DIST netbeans-trunk-nightly-201603060002-src.zip 209877850 SHA256 8626e8cefe8c5c2c65b0da44edef5148f85f9bbef39d7aea60baf2ec240b360d SHA512 0bef47e29211cec98b037361db3d6e5a513212f8761a2163430d74dd7f837f736de649416408966bf14344e68873a9dfabc5501ce83034a8c944193dbdc46ede WHIRLPOOL b6fc7291b14c66d546c9031e0fdef21900f284eec4aecd751e65c91efda33027da61174e3affb6420671e6822dd075de65802cc6798c3804078924c0b4a5b284
+DIST netbeans-trunk-nightly-201603070002-src.zip 209877839 SHA256 fc1c88bc66f6c53325a5fa69610b4b5ce2ddd77f716f9786d51865048d839657 SHA512 efb500a2975b40a251dbcbc85b51a23b3cff188d85c67592a2463ca8645f0a0ffd41222d38501be9b39f8737e11b3cc17a5c8f55a5c5b047ab41fdf93be30baf WHIRLPOOL c63d4521cca81cb8ad232f8bbe83fd9f8e98870884fc986d45c12325674f12bacab79ab2a978b73ee3a5d8a2d5f4bdeec08438b9f1bfd99ea292ef31c407cae8
 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_p20160204.ebuild 3377 SHA256 08b7349b773d4a3a02dc209c7ab34a38a9150e158e552fbbd1c3fe2bac561c21 SHA512 f995df55c0fb48fb3fc0c36ca531d98a34dd3ceef836ad049d5b6f56864c73a2087536eff61d4c9856513f9e52a9e789c0de41eea38b9efa83fe3812ff5a574c WHIRLPOOL 55f7829c1c344444a71198bda3594390812fc3d910cf38297aeac819b04add79c7b46b2ca9179274872d9886dfabf1eef5932557ec8da47089346758c21e3fbb
@@ -61,4 +62,5 @@ EBUILD netbeans-extide-9999_p20160303.ebuild 3377 SHA256 63c3800a0a1900d64e6b832
 EBUILD netbeans-extide-9999_p20160304.ebuild 3377 SHA256 a45dfb7fdfe434df9b67e593e735749384e870f2eb9ab732977ffd3deb86636f SHA512 7b931fae6b9c60430df8e44060815d4cf6c3d2d8ac68bea554c4365cb4f2b0ac82ab817501391190f045b94e4db3fbf08ac8f1303dcfed2979ad7fdcc2996765 WHIRLPOOL 55b1a81ec036fed6997bcd322858ca14b15bbc54db1611e0f22b2db16bb7b67e4ed48bda98a4010ea2ab2fd6e86bcdd3b00f80d275226cd94bf9f871ddcac54c
 EBUILD netbeans-extide-9999_p20160305.ebuild 3377 SHA256 268af4838c567b20ea7ccfd4d8d49b5b057f273caa1749defde339cf89499653 SHA512 ee33e2c2793cdb302bf3954973f42e8c6220fc28266dd7e2c66750c2e9d4a765ff679677afa69979a681d5b12cdd2c5c6d7250bd6fd6c620ba030ad69276f2c8 WHIRLPOOL 3a03c53640b8b88c4a9dca954cac0f2dfdd49d28e30cde6a5e94d6ace6b3c70c3a472c7013074354d5d5380471fef9e685b18b6ba4af99430e82bae30a13c081
 EBUILD netbeans-extide-9999_p20160306.ebuild 3377 SHA256 2acd35b5450a2997b88383cc734fa58f08db957440c7ea374374874f6b9118df SHA512 3ed75a38605d0d0b8d5dc73b4692579101beda43f5f195c307196c459ce0aa6f13c59641c6fcee9450c425af15b715ba76b607bf819637133ffb7c3ac92995a6 WHIRLPOOL ea6907455dc412921d6ecfeb4047598f44714ed3f18e7fa8385e36bc924eeb9382c5285abfcc71a60e298ffc37d65fcd23fe5f0892e83c717781d96391d9d24e
+EBUILD netbeans-extide-9999_p20160307.ebuild 3377 SHA256 2ac072a2c0eb5c24765da6abb18eeeff45aa44152cc42e6c9d93d0cf2d9d4261 SHA512 0ab753d28b8d2958bc3f8d8118dfa58c6ea73695ea25d1ac09404fceb0c8e783088df1adcb0ee15d8c7ba7446f0c24436b9f3485fb78cb1dd1b3a7fefba3f39d WHIRLPOOL 996166d96feed5871823b84355bef8e2c937c11c452110ecf187664b57e584afd2edd43e88ef3e0113ec5fa72eb06f58a075e93c9b3013ed64a2b2cf917f3cab
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160307.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160307.ebuild
new file mode 100644
index 0000000..d7c1ed4
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20160307.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans ExtIDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-07_00-02-15/zip/netbeans-trunk-nightly-201603070002-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 ce5bf82..364800e 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201603030002-src.zip 209842396 SHA256 e5aa9f6bfd0301
 DIST netbeans-trunk-nightly-201603040002-src.zip 209874039 SHA256 1c09271301d3c339c32e7e4f357344d576258bcd47945cddb8c35425b08094fc SHA512 3afb51c5740c1fbfa8c6d246f7cd125185dc93f1b0150ae22055179123b35dafc9657564a4c5981047e8ad8c60b72f1f4ea908ae78123f62b318fd022cbf6ba5 WHIRLPOOL 712f146d886fde5a5a6e5be198b82f5fd61f557e9de70e4a07f144350e4213918143bf50706139b7947de1c0f2d1f819dec749899d8a896c36d08a1fa561c15a
 DIST netbeans-trunk-nightly-201603050002-src.zip 209877850 SHA256 63189967b006451d5881dc2b31d086ddfd57334752adca57aa47e736f21fd09a SHA512 a5b1bd2518102de7d4d0552e11e8fe99aa17e05b1b77c69801421ec5b821dabe145a3a9fc245591b349e82d54670c182336a8d6c9340097fb843113269efcf43 WHIRLPOOL 9dd1fbf1a95c33b4d5b83a91ab469c3d174c6f1fd3d7bea0836fafafeb933b7142f56512a882f8387fe9c9292fd9c7276121b75c700e75617d0e9651e89f4d58
 DIST netbeans-trunk-nightly-201603060002-src.zip 209877850 SHA256 8626e8cefe8c5c2c65b0da44edef5148f85f9bbef39d7aea60baf2ec240b360d SHA512 0bef47e29211cec98b037361db3d6e5a513212f8761a2163430d74dd7f837f736de649416408966bf14344e68873a9dfabc5501ce83034a8c944193dbdc46ede WHIRLPOOL b6fc7291b14c66d546c9031e0fdef21900f284eec4aecd751e65c91efda33027da61174e3affb6420671e6822dd075de65802cc6798c3804078924c0b4a5b284
+DIST netbeans-trunk-nightly-201603070002-src.zip 209877839 SHA256 fc1c88bc66f6c53325a5fa69610b4b5ce2ddd77f716f9786d51865048d839657 SHA512 efb500a2975b40a251dbcbc85b51a23b3cff188d85c67592a2463ca8645f0a0ffd41222d38501be9b39f8737e11b3cc17a5c8f55a5c5b047ab41fdf93be30baf WHIRLPOOL c63d4521cca81cb8ad232f8bbe83fd9f8e98870884fc986d45c12325674f12bacab79ab2a978b73ee3a5d8a2d5f4bdeec08438b9f1bfd99ea292ef31c407cae8
 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_p20160204.ebuild 3416 SHA256 56e8dfc4347210e20fd127b70c0ec318d034c386f29f5a11126002c95045c272 SHA512 a6366e27ebf0de777a69bb2acd52f7f16c49c34741f77e08a84666e1fbb90412feb70655ddfbb86744266356ba705afdc8e430e46d007f6eec9d50ffe33a321a WHIRLPOOL a19ae714d1415cfa17f344da200c08ac504a32c0e29e21380b0e7a6c5060fbd38ac17a7391b23c6a99486470ab7478c7c24766fedd7307197235c868f7c6adf2
@@ -61,4 +62,5 @@ EBUILD netbeans-groovy-9999_p20160303.ebuild 3416 SHA256 dc43d706026c978dcf72e34
 EBUILD netbeans-groovy-9999_p20160304.ebuild 3416 SHA256 30a8467b1da38b63dda67c87f14ca150d668615ca422adafaa7283577e19408e SHA512 9fa536090970a04491827b48ebe5e162f53a76b28dee6e1d466604bc965875ae83eba49f76c586fc39cf2fc02a78a9162fbba61072e1a27b4f864879cdb8e23c WHIRLPOOL 8dfc3b5e40a3e06bf656cea9b173b717e9134118a2840c86ee9b793883635ac43beedb669a743bbeeae61cce291519a62d7c5ac6fbd6e7c493babe62737f22e2
 EBUILD netbeans-groovy-9999_p20160305.ebuild 3416 SHA256 aa13faf780bb02bbabbadcc10df25942108c5dae04952a354296b1383268f3aa SHA512 324726f390269180e4ddb85cca636142ecbee5c5a662cbb6b0767024fd11234423c4bc19371744c32b8c1b5791175467a6ea75f0061b65277fd6d849b64bfae3 WHIRLPOOL f80c44d08f7b74cda28cfe8d81753e685f6e4e3d93307c4c57a3df01c7845dc585dcaa8299fccaa32eb2876dce8c878644b44dcc418e3d0b208a1492668f3915
 EBUILD netbeans-groovy-9999_p20160306.ebuild 3416 SHA256 558ad261158f302442abe5eb39c916e885059eb5849311f7a3c6dac0f028f2e4 SHA512 fda69d1ee0343649750bcc2e7b617789d4c761a9d65f407b1c89cc191942fcff91bdb14f9931d97a7c8ac36d02af82e5c4d418755caad103ad57530fcd621a9f WHIRLPOOL d016c7b16e7e93fab5c8bb881e887ef31e4daa39744425bce1a556e74774af4624f19829845816c0b36caadc22325663e7e31e682eadcdff3ac2cc7924bb044e
+EBUILD netbeans-groovy-9999_p20160307.ebuild 3416 SHA256 4745d2248088ec6a71043d4c2b257528364d6a5642faea3c31ebe319dc79c87b SHA512 8f0863a3626851419014c89c6fd66a83153badf562c0b7c905b8398adc976b7f19911629c152b9540d1e3374acbc75ee9644443afb834fcb1a377fbaf825ce83 WHIRLPOOL 37b135daf04ea321fb55b0984a61b249095e0da168ed5c2383e09705a7db2834488ec2164900b214e18d2468ebbce70dca70373ad4b2cc85aff6a37d7df6a63a
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160307.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160307.ebuild
new file mode 100644
index 0000000..5a2f3f1
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160307.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Groovy Cluster"
+HOMEPAGE="http://netbeans.org/projects/groovy"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-07_00-02-15/zip/netbeans-trunk-nightly-201603070002-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 395a9a6..0f9011e 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201603030002-src.zip 209842396 SHA256 e5aa9f6bfd0301
 DIST netbeans-trunk-nightly-201603040002-src.zip 209874039 SHA256 1c09271301d3c339c32e7e4f357344d576258bcd47945cddb8c35425b08094fc SHA512 3afb51c5740c1fbfa8c6d246f7cd125185dc93f1b0150ae22055179123b35dafc9657564a4c5981047e8ad8c60b72f1f4ea908ae78123f62b318fd022cbf6ba5 WHIRLPOOL 712f146d886fde5a5a6e5be198b82f5fd61f557e9de70e4a07f144350e4213918143bf50706139b7947de1c0f2d1f819dec749899d8a896c36d08a1fa561c15a
 DIST netbeans-trunk-nightly-201603050002-src.zip 209877850 SHA256 63189967b006451d5881dc2b31d086ddfd57334752adca57aa47e736f21fd09a SHA512 a5b1bd2518102de7d4d0552e11e8fe99aa17e05b1b77c69801421ec5b821dabe145a3a9fc245591b349e82d54670c182336a8d6c9340097fb843113269efcf43 WHIRLPOOL 9dd1fbf1a95c33b4d5b83a91ab469c3d174c6f1fd3d7bea0836fafafeb933b7142f56512a882f8387fe9c9292fd9c7276121b75c700e75617d0e9651e89f4d58
 DIST netbeans-trunk-nightly-201603060002-src.zip 209877850 SHA256 8626e8cefe8c5c2c65b0da44edef5148f85f9bbef39d7aea60baf2ec240b360d SHA512 0bef47e29211cec98b037361db3d6e5a513212f8761a2163430d74dd7f837f736de649416408966bf14344e68873a9dfabc5501ce83034a8c944193dbdc46ede WHIRLPOOL b6fc7291b14c66d546c9031e0fdef21900f284eec4aecd751e65c91efda33027da61174e3affb6420671e6822dd075de65802cc6798c3804078924c0b4a5b284
+DIST netbeans-trunk-nightly-201603070002-src.zip 209877839 SHA256 fc1c88bc66f6c53325a5fa69610b4b5ce2ddd77f716f9786d51865048d839657 SHA512 efb500a2975b40a251dbcbc85b51a23b3cff188d85c67592a2463ca8645f0a0ffd41222d38501be9b39f8737e11b3cc17a5c8f55a5c5b047ab41fdf93be30baf WHIRLPOOL c63d4521cca81cb8ad232f8bbe83fd9f8e98870884fc986d45c12325674f12bacab79ab2a978b73ee3a5d8a2d5f4bdeec08438b9f1bfd99ea292ef31c407cae8
 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_p20160204.ebuild 4126 SHA256 d52552c9a50a8cf824bd434a115f32221de25ae243a2f8943dd2039a105a3e1b SHA512 51dfd9bef54d4b2a7f52439ccd48c7ebd883890fe5a3f05e63f0a064d56d3d4e50f4c6ca1ce9be2e610f6e20a22cf880f958f6295e0324b511c5f9b62a30b7a6 WHIRLPOOL a95192e40581f8ce5b1a7a9f7d5fbeb38c9b720e025936e506842745c265e9e269133b633e3e70fe61ee11a4ed46a7ebf13dc6aa439af082ec9cf88ba1a35dd5
@@ -64,4 +65,5 @@ EBUILD netbeans-harness-9999_p20160303.ebuild 4126 SHA256 754cad0825f87fd715b855
 EBUILD netbeans-harness-9999_p20160304.ebuild 4126 SHA256 f6f9e3908a92125ccb69f77fa46c359747820af6fd85b76f981e03ebb22036e8 SHA512 f41939f69fd3f6f081b2d764d2a4776131a1c31c57c91ec4bc7874b17bd46f00f3ccf898ac5155c8724b6e5363b8a7c533125cdcadb2f710e616d24ca1b75270 WHIRLPOOL c850c5d501ad1a91ceedc06185c07f30370dc8f2bac7685f81ad0329b6571219b0b69fbd817d2570750066c403587653efbe1427db162856db3c9b04b40e7f03
 EBUILD netbeans-harness-9999_p20160305.ebuild 4126 SHA256 254e9b8efd54a126d7dc2aa8b0392a2915f73bac58e972f899aab3b88d659e62 SHA512 d56b483efe3c049218fb21940c15c8fa15c2e241bd8601da4be5f2684aa56f42220f1849fbb6eec4038cc77264aef370013fd1d0b01de8118bce1186450ca4d5 WHIRLPOOL 617393625d16bd2b6d74584ab3502325e13ac481f5203661d06e205d9032cf5aee5174b8f25a6605a172633c201e8e91c54c1d69565326ff6e057472dc93a0d0
 EBUILD netbeans-harness-9999_p20160306.ebuild 4126 SHA256 87507bff557ec2117ac5ec782fab47d1781b54a136d62b5600d4d199f382cf2e SHA512 e7d924ff7b59b14c64735d8c1027cc9c0ec0fb146c18f5857355abb58becb6dc5ab59f93670e1e8d5acbfc2867d7ad9f28acfd10a25fd95f82ff24897f9ed6a1 WHIRLPOOL 48fb8ba2ff814db3234ac1dbdf5acd7c05a7fef2e2507d9d76a9b6a8ac856459957dfa4e801e1a0800ce94e4b22dfb5e2bf59f42cfc85e49fed68c341e26a0e4
+EBUILD netbeans-harness-9999_p20160307.ebuild 4126 SHA256 3c75000a5838a3683cdb73943fc31aa64b52cb34b1ca9cd0f517841a14984530 SHA512 c9510eb4e9dd7647cf5ff69bb70a8975ee5c82d112d70ee3b878c9d10454d169b619bd7ac71de05e529a34458bc154ccc9f6b6d6bc1b46b74b146b54106fce4e WHIRLPOOL 11beed1ccb9e107ca26b135b6df988b0dcbee057dd15ff3299fcb22d8334d244e6acfe01cc1b170e0b49187c14168226a851140ab9d675a4876892902018e391
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160307.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160307.ebuild
new file mode 100644
index 0000000..3d43cc2
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20160307.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Harness"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-07_00-02-15/zip/netbeans-trunk-nightly-201603070002-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 387ad95..4d21ef0 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -162,6 +162,7 @@ DIST netbeans-trunk-nightly-201603030002-src.zip 209842396 SHA256 e5aa9f6bfd0301
 DIST netbeans-trunk-nightly-201603040002-src.zip 209874039 SHA256 1c09271301d3c339c32e7e4f357344d576258bcd47945cddb8c35425b08094fc SHA512 3afb51c5740c1fbfa8c6d246f7cd125185dc93f1b0150ae22055179123b35dafc9657564a4c5981047e8ad8c60b72f1f4ea908ae78123f62b318fd022cbf6ba5 WHIRLPOOL 712f146d886fde5a5a6e5be198b82f5fd61f557e9de70e4a07f144350e4213918143bf50706139b7947de1c0f2d1f819dec749899d8a896c36d08a1fa561c15a
 DIST netbeans-trunk-nightly-201603050002-src.zip 209877850 SHA256 63189967b006451d5881dc2b31d086ddfd57334752adca57aa47e736f21fd09a SHA512 a5b1bd2518102de7d4d0552e11e8fe99aa17e05b1b77c69801421ec5b821dabe145a3a9fc245591b349e82d54670c182336a8d6c9340097fb843113269efcf43 WHIRLPOOL 9dd1fbf1a95c33b4d5b83a91ab469c3d174c6f1fd3d7bea0836fafafeb933b7142f56512a882f8387fe9c9292fd9c7276121b75c700e75617d0e9651e89f4d58
 DIST netbeans-trunk-nightly-201603060002-src.zip 209877850 SHA256 8626e8cefe8c5c2c65b0da44edef5148f85f9bbef39d7aea60baf2ec240b360d SHA512 0bef47e29211cec98b037361db3d6e5a513212f8761a2163430d74dd7f837f736de649416408966bf14344e68873a9dfabc5501ce83034a8c944193dbdc46ede WHIRLPOOL b6fc7291b14c66d546c9031e0fdef21900f284eec4aecd751e65c91efda33027da61174e3affb6420671e6822dd075de65802cc6798c3804078924c0b4a5b284
+DIST netbeans-trunk-nightly-201603070002-src.zip 209877839 SHA256 fc1c88bc66f6c53325a5fa69610b4b5ce2ddd77f716f9786d51865048d839657 SHA512 efb500a2975b40a251dbcbc85b51a23b3cff188d85c67592a2463ca8645f0a0ffd41222d38501be9b39f8737e11b3cc17a5c8f55a5c5b047ab41fdf93be30baf WHIRLPOOL c63d4521cca81cb8ad232f8bbe83fd9f8e98870884fc986d45c12325674f12bacab79ab2a978b73ee3a5d8a2d5f4bdeec08438b9f1bfd99ea292ef31c407cae8
 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_p20160204.ebuild 30238 SHA256 d27a4bed3dbfef8d93a530d582314901236639dc84d055a46b2d00264a184d0b SHA512 4f19ba1e45c50ee40de6f77f5d6dc0ce6764fce0a425e52c4596c082a731bad7a76b77d31982c0fd5d5a78ef72691a6314c496f9eb7bfbfd8e161185f9c8d489 WHIRLPOOL e2e03dd0dc0790a80610721e38f684fc14fc106f7dda66b61df602af54fcc2455ef659c1d8db1a02fc73ffae0196f201b807a4c87c44afe819d7b44db83798c5
@@ -191,4 +192,5 @@ EBUILD netbeans-ide-9999_p20160303.ebuild 30250 SHA256 8e95840ddfb681c49a7f20d00
 EBUILD netbeans-ide-9999_p20160304.ebuild 30250 SHA256 2d7305acf4ef9ba48e1349642eedd7c12c21c5dd4ee95c240e78a4cf7146c57c SHA512 abccbdf576bb9cb242943179e17807f36c0d7f59b52f97042f86ae7df34044508e1f3cfc77a493b9dd9dec57dadc35679ac867aaa570abac1fe24e66609ffc85 WHIRLPOOL 07bc0b5ec502fbd5790e2958b1efbc515ca531ba083648bdbfc7d093519a537641108173cf2aa2df5cc4fdee06452f6bed630c14c9e414b045bf740a03a891b8
 EBUILD netbeans-ide-9999_p20160305.ebuild 30250 SHA256 e8db3cab14bffb174faea1085aa12d6762ac1e38f68abe9399464bd039030610 SHA512 18df76b40783efb9689164bcfebb0222d21f2979c5810bf8fae23b29e798c972d2d1f8c77036b2350f5f5ba39c34bcf5893243868f4169c8cdda5cb0fde5115c WHIRLPOOL 2c17aea8ef7f4076620fd6f64862695789f4dafe4f35cf4b3f88b4c8e43f7f36ce0a0cdfe0249b95cdde55a89ceb71178334d019b21df6fe1941e706b3f05a49
 EBUILD netbeans-ide-9999_p20160306.ebuild 30250 SHA256 529ac3385d352d2798e547e48b78d68c27ecfda6812618935a1b98b212fc65ad SHA512 219ef1b1b01e9e905569eb900e8839e157a09ea50ee242899fe6680568cdc63e147c63c53749aec4d783753fa8e50559842ff3d8ad982cceb948ccd55ee3518b WHIRLPOOL 513d21b6b44297d9bd435cb8e4a9a1443f67fc677b9ce55ebd82ffff6f480931f00a4492f1cfd8ed4de06c442cde9a983d2c7f5d396bcc3812604c8733497e8e
+EBUILD netbeans-ide-9999_p20160307.ebuild 30250 SHA256 55ccb263571bf9514b8057650b52b25904c73d2eb05f0ca3d77788dc145b22a8 SHA512 293d9a0a4418a009b2f0a90af7186d4d9605293146bf08c7069384745c409554e966862e45db947dba979fb3ca34201dfdeff9f141a752977be9eb11a5b0dab4 WHIRLPOOL c57bf294a9fb4f136fb7cda206f72ed4c5465debb5b67199c8a28acdb57a6cb7dc4086aa5081a1f8f6b5808598d1968e732498df05afc7381ca643422bdd86ec
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160307.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160307.ebuild
new file mode 100644
index 0000000..e19cac1
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20160307.ebuild
@@ -0,0 +1,378 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-07_00-02-15/zip/netbeans-trunk-nightly-201603070002-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 a7aa198..2571068 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -59,6 +59,7 @@ DIST netbeans-trunk-nightly-201603030002-src.zip 209842396 SHA256 e5aa9f6bfd0301
 DIST netbeans-trunk-nightly-201603040002-src.zip 209874039 SHA256 1c09271301d3c339c32e7e4f357344d576258bcd47945cddb8c35425b08094fc SHA512 3afb51c5740c1fbfa8c6d246f7cd125185dc93f1b0150ae22055179123b35dafc9657564a4c5981047e8ad8c60b72f1f4ea908ae78123f62b318fd022cbf6ba5 WHIRLPOOL 712f146d886fde5a5a6e5be198b82f5fd61f557e9de70e4a07f144350e4213918143bf50706139b7947de1c0f2d1f819dec749899d8a896c36d08a1fa561c15a
 DIST netbeans-trunk-nightly-201603050002-src.zip 209877850 SHA256 63189967b006451d5881dc2b31d086ddfd57334752adca57aa47e736f21fd09a SHA512 a5b1bd2518102de7d4d0552e11e8fe99aa17e05b1b77c69801421ec5b821dabe145a3a9fc245591b349e82d54670c182336a8d6c9340097fb843113269efcf43 WHIRLPOOL 9dd1fbf1a95c33b4d5b83a91ab469c3d174c6f1fd3d7bea0836fafafeb933b7142f56512a882f8387fe9c9292fd9c7276121b75c700e75617d0e9651e89f4d58
 DIST netbeans-trunk-nightly-201603060002-src.zip 209877850 SHA256 8626e8cefe8c5c2c65b0da44edef5148f85f9bbef39d7aea60baf2ec240b360d SHA512 0bef47e29211cec98b037361db3d6e5a513212f8761a2163430d74dd7f837f736de649416408966bf14344e68873a9dfabc5501ce83034a8c944193dbdc46ede WHIRLPOOL b6fc7291b14c66d546c9031e0fdef21900f284eec4aecd751e65c91efda33027da61174e3affb6420671e6822dd075de65802cc6798c3804078924c0b4a5b284
+DIST netbeans-trunk-nightly-201603070002-src.zip 209877839 SHA256 fc1c88bc66f6c53325a5fa69610b4b5ce2ddd77f716f9786d51865048d839657 SHA512 efb500a2975b40a251dbcbc85b51a23b3cff188d85c67592a2463ca8645f0a0ffd41222d38501be9b39f8737e11b3cc17a5c8f55a5c5b047ab41fdf93be30baf WHIRLPOOL c63d4521cca81cb8ad232f8bbe83fd9f8e98870884fc986d45c12325674f12bacab79ab2a978b73ee3a5d8a2d5f4bdeec08438b9f1bfd99ea292ef31c407cae8
 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_p20160204.ebuild 14930 SHA256 087db72f622177dc8a775716e84fa5d1038f1d9be443461da6432f73629b34e3 SHA512 99345436338e6908d4b28f84fc58145138ce610b89be902db4f45bcaf492bd7bd580136f5dd8b06862082159d9d56c36fc3fdfc7f1a76b37aa3f3c9c7992c241 WHIRLPOOL 681fe5156562e15bc046ee0df5f5a322726584a8f6bc7e0ea07e489815a38f8a36a2f8e95fbb4b9552510ab88f3cedcab4bf2504546df594ff79b8cfae16638d
@@ -88,4 +89,5 @@ EBUILD netbeans-java-9999_p20160303.ebuild 14930 SHA256 48040d08990cf6747fcb4021
 EBUILD netbeans-java-9999_p20160304.ebuild 14930 SHA256 650a61b9e39822c25a55cf08221f118e8d1aa168f9947a32bfaeeb1b991798bd SHA512 c0edb556a1dde102b0979335e9a312850baa8dc8dfc8479f0e4ca576ae2326b026a7df7581d50b829dbc9cfa183c144e366fd53e0ea8996a91d9e0e944b658ab WHIRLPOOL 4e0780d57cbe0c0992354cd1ea273bdec1eb1d98821654a2c69b7a8ca459296dae2ac95aff2dccc708b9d1600dde95550c811a35371fbeb54e069f270dc7d957
 EBUILD netbeans-java-9999_p20160305.ebuild 14930 SHA256 166fb0768711779fe4c9df5e51610fbc194145679ed12f6d027676a77fdb30c6 SHA512 b0c77303fbf1175c703f5100b7a88f715b7ab207c52b4ea286f763c3e074f1a25fe1a4b72b9644379b64dc276b0a72225e4d58295ec87dc69213feeb1cb8f7a4 WHIRLPOOL 30fd4bd537b21529b5e7e5bbd803016db200d6acbcf8545c7e84a7e32a6e6db43afe8d215bd84fb1997ded7dba09fc99f58686c50088a611a7144c915e4aae78
 EBUILD netbeans-java-9999_p20160306.ebuild 14930 SHA256 834f0d69202fd501db1e44d401b792845ed4abdb658f68439d30c09b3bdfd7c5 SHA512 7d4e3aaeda2d882729ed938090203f2713bd164cc2d5889675172155316753d3eecbdc9758f36b2e5215dc48e9f063383a8189c9b1effaab19c1dfca96ba44bd WHIRLPOOL 92a6369d45a897ae56b3545a8602e11ee029bef7d85fda9d35edfd09830dfb201154775ac52c9708778311f594c1d632394345f9d1ab86a20a2a604ae32119ee
+EBUILD netbeans-java-9999_p20160307.ebuild 14930 SHA256 60be9c350422bc7eb146df9c23936a544de930f549534fd24abcd64086eb5df1 SHA512 7dee03d4f777e3d6793dcae3b889a1558d788086ce78e69ae34e73aae16075fa0b592ea5955eeb441fc757c07ad8c92fe82dcd6aedd1cdc9c3c00b2d52c2c7fb WHIRLPOOL c6fa96e60699642e5331e2ff33881dced0e07044d241c15aab5b766a73945f82e2b7c4f1114c0f5a92e157fbe3ed4aa955e01cb15d85e17ea5ab43ee491945d7
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160307.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160307.ebuild
new file mode 100644
index 0000000..5a7aab2
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20160307.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+# Maven cannot be unbundled because it depends on exact maven version and exact content of maven directory
+
+DESCRIPTION="Netbeans Java Cluster"
+HOMEPAGE="http://netbeans.org/projects/java"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-07_00-02-15/zip/netbeans-trunk-nightly-201603070002-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 580f5b5..724f7a9 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201603030002-src.zip 209842396 SHA256 e5aa9f6bfd0301
 DIST netbeans-trunk-nightly-201603040002-src.zip 209874039 SHA256 1c09271301d3c339c32e7e4f357344d576258bcd47945cddb8c35425b08094fc SHA512 3afb51c5740c1fbfa8c6d246f7cd125185dc93f1b0150ae22055179123b35dafc9657564a4c5981047e8ad8c60b72f1f4ea908ae78123f62b318fd022cbf6ba5 WHIRLPOOL 712f146d886fde5a5a6e5be198b82f5fd61f557e9de70e4a07f144350e4213918143bf50706139b7947de1c0f2d1f819dec749899d8a896c36d08a1fa561c15a
 DIST netbeans-trunk-nightly-201603050002-src.zip 209877850 SHA256 63189967b006451d5881dc2b31d086ddfd57334752adca57aa47e736f21fd09a SHA512 a5b1bd2518102de7d4d0552e11e8fe99aa17e05b1b77c69801421ec5b821dabe145a3a9fc245591b349e82d54670c182336a8d6c9340097fb843113269efcf43 WHIRLPOOL 9dd1fbf1a95c33b4d5b83a91ab469c3d174c6f1fd3d7bea0836fafafeb933b7142f56512a882f8387fe9c9292fd9c7276121b75c700e75617d0e9651e89f4d58
 DIST netbeans-trunk-nightly-201603060002-src.zip 209877850 SHA256 8626e8cefe8c5c2c65b0da44edef5148f85f9bbef39d7aea60baf2ec240b360d SHA512 0bef47e29211cec98b037361db3d6e5a513212f8761a2163430d74dd7f837f736de649416408966bf14344e68873a9dfabc5501ce83034a8c944193dbdc46ede WHIRLPOOL b6fc7291b14c66d546c9031e0fdef21900f284eec4aecd751e65c91efda33027da61174e3affb6420671e6822dd075de65802cc6798c3804078924c0b4a5b284
+DIST netbeans-trunk-nightly-201603070002-src.zip 209877839 SHA256 fc1c88bc66f6c53325a5fa69610b4b5ce2ddd77f716f9786d51865048d839657 SHA512 efb500a2975b40a251dbcbc85b51a23b3cff188d85c67592a2463ca8645f0a0ffd41222d38501be9b39f8737e11b3cc17a5c8f55a5c5b047ab41fdf93be30baf WHIRLPOOL c63d4521cca81cb8ad232f8bbe83fd9f8e98870884fc986d45c12325674f12bacab79ab2a978b73ee3a5d8a2d5f4bdeec08438b9f1bfd99ea292ef31c407cae8
 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_p20160204.ebuild 4971 SHA256 e1456bc550d560b86475e36e9828ad514c26848f646caf1b289c6e90cd10bbe6 SHA512 3df9fe2a5bfa51365bfcc63739eeea92742d1e22f3e9d3e65f65e086556a5670a12663411dc4e0e25f093d41ca40e0613b82bea81407215fddb3132e8229dc14 WHIRLPOOL 65ebe30b488ed04a64fa46668e0fee0fa464e1f04a64d2fbf8ff7c894bb8c12f20ef944707c5752c7a76b5d024f7008e20c8771336b75182502748b54d0a7bec
@@ -62,4 +63,5 @@ EBUILD netbeans-javacard-9999_p20160303.ebuild 4971 SHA256 7a6b595b5f021e7dabc75
 EBUILD netbeans-javacard-9999_p20160304.ebuild 4971 SHA256 747cad2182c461390f07519ea12f1bc2516d90dbbb20c93aace62f9ad4239365 SHA512 b61910b15df6dd0c2f718498582316375c30681aba6ac6d454cd7ad4d306f7bd05df1ddc75f8202ffb5e6889e70e6c901dcaa72dc57d407b9fedffe72923efd5 WHIRLPOOL ce1e0f7300a5fc08cd6dd496201b2be5ef33b42436c455c8d4b62f0f2e1baf7d06a419a4010e8027edb1e1b91ab33985dcb963e14ec144f0f98d7eae8920c1ca
 EBUILD netbeans-javacard-9999_p20160305.ebuild 4971 SHA256 7141bf3b3fa0ae6b8b1fc5b234d7eb1a80e977172341e378b7c15ca77a05a2ff SHA512 b00d919c5de355c1a0df8ba2b753e4ced82e567935e7e7aca9baa5f419b91655d197b3083a7d9f89ae06cbbe92a56e2ed38f9c2ddba92b831a913e30549efcc0 WHIRLPOOL dbdf9deb00fc89ce1c3c52549a54ea4bee649d3a2d678b74a27a8f937b9cabc1e6e32d3b974614997d336dbc508043bed621b9b20d4fa74c32a865e63283ba87
 EBUILD netbeans-javacard-9999_p20160306.ebuild 4971 SHA256 342ddbfc7409f51a4d6704599c245805c0e86a62367d41171b2f7104edfcdff9 SHA512 eac2e543bb92bde68cc308a040f4c3907a3ee288ce6772052cf87132d118a07678b68cbc60095223c4ff283b48c69c3906a962ca6743aaf6afd6f5540830daf7 WHIRLPOOL 5c23ac62c9bc94746d496c4079239299665ae4d5d3ed73439645164c7facd02fbe807377bfd4938243255639c9a77be7ffded23d1c862ece854a2fc26efb00d1
+EBUILD netbeans-javacard-9999_p20160307.ebuild 4971 SHA256 20a0bf81d2ba440ae1f9e8d0d95296339a5cc0234ae8862a7c349262915838d8 SHA512 379dc4311159b18a75c3e6bfe58d096cb184512373cbf09b6c3365620da4b7f3b4c404131c04ae72be7c8256de204e8cf491bb0cdc01cdbde671d2b8792c7c30 WHIRLPOOL 2014da0eab60807558ec3d46fa87456387a4edf8fa08e493c8201a98f3c699fc07e8ee37a592acfef9d3bb80a4e67689d1ae1dc4792eed63deabf1f4b463b121
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160307.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160307.ebuild
new file mode 100644
index 0000000..ff81ab0
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160307.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaCard Cluster"
+HOMEPAGE="http://netbeans.org/projects/javacard"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-07_00-02-15/zip/netbeans-trunk-nightly-201603070002-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 eee6a23..ffe6ce0 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201603030002-src.zip 209842396 SHA256 e5aa9f6bfd0301
 DIST netbeans-trunk-nightly-201603040002-src.zip 209874039 SHA256 1c09271301d3c339c32e7e4f357344d576258bcd47945cddb8c35425b08094fc SHA512 3afb51c5740c1fbfa8c6d246f7cd125185dc93f1b0150ae22055179123b35dafc9657564a4c5981047e8ad8c60b72f1f4ea908ae78123f62b318fd022cbf6ba5 WHIRLPOOL 712f146d886fde5a5a6e5be198b82f5fd61f557e9de70e4a07f144350e4213918143bf50706139b7947de1c0f2d1f819dec749899d8a896c36d08a1fa561c15a
 DIST netbeans-trunk-nightly-201603050002-src.zip 209877850 SHA256 63189967b006451d5881dc2b31d086ddfd57334752adca57aa47e736f21fd09a SHA512 a5b1bd2518102de7d4d0552e11e8fe99aa17e05b1b77c69801421ec5b821dabe145a3a9fc245591b349e82d54670c182336a8d6c9340097fb843113269efcf43 WHIRLPOOL 9dd1fbf1a95c33b4d5b83a91ab469c3d174c6f1fd3d7bea0836fafafeb933b7142f56512a882f8387fe9c9292fd9c7276121b75c700e75617d0e9651e89f4d58
 DIST netbeans-trunk-nightly-201603060002-src.zip 209877850 SHA256 8626e8cefe8c5c2c65b0da44edef5148f85f9bbef39d7aea60baf2ec240b360d SHA512 0bef47e29211cec98b037361db3d6e5a513212f8761a2163430d74dd7f837f736de649416408966bf14344e68873a9dfabc5501ce83034a8c944193dbdc46ede WHIRLPOOL b6fc7291b14c66d546c9031e0fdef21900f284eec4aecd751e65c91efda33027da61174e3affb6420671e6822dd075de65802cc6798c3804078924c0b4a5b284
+DIST netbeans-trunk-nightly-201603070002-src.zip 209877839 SHA256 fc1c88bc66f6c53325a5fa69610b4b5ce2ddd77f716f9786d51865048d839657 SHA512 efb500a2975b40a251dbcbc85b51a23b3cff188d85c67592a2463ca8645f0a0ffd41222d38501be9b39f8737e11b3cc17a5c8f55a5c5b047ab41fdf93be30baf WHIRLPOOL c63d4521cca81cb8ad232f8bbe83fd9f8e98870884fc986d45c12325674f12bacab79ab2a978b73ee3a5d8a2d5f4bdeec08438b9f1bfd99ea292ef31c407cae8
 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_p20160204.ebuild 6293 SHA256 52b4fe09eeb978ea56c21a8921093118399adbff4f14b89ff910fc29ff96ded7 SHA512 ae629ad596d30fba7300eee3da34ba9117173186ef1be78c2e5f50787e001c61259b5b6c275adf24cf95f79081a62125f2182085b68a28207eb88dfadb6565dc WHIRLPOOL 841ecbc5bb4c3c2b6605ea1acf3292edd16edaa0f18ccc52388439c7e5e111dfa3b3d3e9e4aab8e9f04516f88d42873b768a0db507126d2301e7766dd24c14c5
@@ -60,4 +61,5 @@ EBUILD netbeans-javadoc-9999_p20160303.ebuild 6293 SHA256 a4fbb12f22ff73af67571a
 EBUILD netbeans-javadoc-9999_p20160304.ebuild 6293 SHA256 71c88043d8c79b22f860623f4c3be4a5a7ae4b081cf726f7822b112425d145ec SHA512 9879a283cf9ba07b928c8e178d84aa3f7ba3011e96def675a29341987209aad414ca1bfa46b502b05e99477cbebd3ec4d6b21b07489dbd3ca7a3161d470dd7a9 WHIRLPOOL ffd97ff2dc609aff1c708f9fd177f3b51247e5c7c7e07d008267a803791a34c989430b0dafef1f6f3cc862339fc69feea6141d49b8bf6486deb6fd852ac6ac82
 EBUILD netbeans-javadoc-9999_p20160305.ebuild 6293 SHA256 6d54476125f110acd5ff8dc9bd27783dbe68567e7a54ea6df06a7acfdfe78505 SHA512 a7eef53daec4d58de3fed7c104a8434672b04b51d9f7a76b7bf2b3649b7b52aaf7c4d69d3686698919206673398da9c31026eea7068b779d496ffd64381d04d1 WHIRLPOOL bce41961cc159e6681d301d649498daaa44aedf62b3eb1a00a2bd70d5d57749642c468d252ce87100bc93e222627812ccfbd86f0a6e32bdf338f5ebac5a724b9
 EBUILD netbeans-javadoc-9999_p20160306.ebuild 6293 SHA256 90d8c9bf61988cc6c47b21bb5b23fba23ab984ce13c28435df975cfa27f5e430 SHA512 85d18c251da87b0d13a16144d45ebe3aad67e9a9b10736045c3a0ab8b27f9499e4bcd657d2f26214e2389ea8b3081ac7f217409ccdf66746175ea6b2994a2769 WHIRLPOOL 00256f06fc84b66983cb795d12c1dac96ee400c6bab6fbd6c11a3733bf32294e7bee29bee4639a3b43d76e6c8a663d3da75845bd3c84c93b85555c6570542a94
+EBUILD netbeans-javadoc-9999_p20160307.ebuild 6293 SHA256 dd58cf0421dc0845294d1158d79b2d644e63520649cfec83ceb162df60664530 SHA512 bfd0d7e5ce88db16a0c10648b7bbf54b28916dc0861718099d76bcc30df98c8427e845157d91d2d5b4939adcfe1ae378653a963d69c81ce4c0308b8acbad5cb1 WHIRLPOOL b1c2a73104e75451e4ee0b570ae5527c5562c5a05da6bfda0cbd6a84f32e880c53dd1d580834d13f993720bc76a0ad72d8de5dd32d856193bce7464692cfb1ec
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160307.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160307.ebuild
new file mode 100644
index 0000000..c735e4e
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160307.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaDocs"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-07_00-02-15/zip/netbeans-trunk-nightly-201603070002-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 ac4f64a..7bdf985 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201603030002-src.zip 209842396 SHA256 e5aa9f6bfd0301
 DIST netbeans-trunk-nightly-201603040002-src.zip 209874039 SHA256 1c09271301d3c339c32e7e4f357344d576258bcd47945cddb8c35425b08094fc SHA512 3afb51c5740c1fbfa8c6d246f7cd125185dc93f1b0150ae22055179123b35dafc9657564a4c5981047e8ad8c60b72f1f4ea908ae78123f62b318fd022cbf6ba5 WHIRLPOOL 712f146d886fde5a5a6e5be198b82f5fd61f557e9de70e4a07f144350e4213918143bf50706139b7947de1c0f2d1f819dec749899d8a896c36d08a1fa561c15a
 DIST netbeans-trunk-nightly-201603050002-src.zip 209877850 SHA256 63189967b006451d5881dc2b31d086ddfd57334752adca57aa47e736f21fd09a SHA512 a5b1bd2518102de7d4d0552e11e8fe99aa17e05b1b77c69801421ec5b821dabe145a3a9fc245591b349e82d54670c182336a8d6c9340097fb843113269efcf43 WHIRLPOOL 9dd1fbf1a95c33b4d5b83a91ab469c3d174c6f1fd3d7bea0836fafafeb933b7142f56512a882f8387fe9c9292fd9c7276121b75c700e75617d0e9651e89f4d58
 DIST netbeans-trunk-nightly-201603060002-src.zip 209877850 SHA256 8626e8cefe8c5c2c65b0da44edef5148f85f9bbef39d7aea60baf2ec240b360d SHA512 0bef47e29211cec98b037361db3d6e5a513212f8761a2163430d74dd7f837f736de649416408966bf14344e68873a9dfabc5501ce83034a8c944193dbdc46ede WHIRLPOOL b6fc7291b14c66d546c9031e0fdef21900f284eec4aecd751e65c91efda33027da61174e3affb6420671e6822dd075de65802cc6798c3804078924c0b4a5b284
+DIST netbeans-trunk-nightly-201603070002-src.zip 209877839 SHA256 fc1c88bc66f6c53325a5fa69610b4b5ce2ddd77f716f9786d51865048d839657 SHA512 efb500a2975b40a251dbcbc85b51a23b3cff188d85c67592a2463ca8645f0a0ffd41222d38501be9b39f8737e11b3cc17a5c8f55a5c5b047ab41fdf93be30baf WHIRLPOOL c63d4521cca81cb8ad232f8bbe83fd9f8e98870884fc986d45c12325674f12bacab79ab2a978b73ee3a5d8a2d5f4bdeec08438b9f1bfd99ea292ef31c407cae8
 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_p20160204.ebuild 4717 SHA256 37886081275fe7a67ee945f372547b5f8ec1f7055421fe3438cac315291a7480 SHA512 20c6002ebb34f3fc4e97f799dd4cd04f87dbf30a031f8b6ee68edd7ed3f14eeaa52d8955d66b1bda5f969d26b7ec159a20a492939d66d3da0abc57af6afc383a WHIRLPOOL 9f773764ae4d3691e1541b48a72fe2d8eab257f8b5bef7524bf07ff2b131622c8d45beac9d4f966bbdc6dfcbf9615836f4f1c1098763e40a5b90b3d69dd7e8ba
@@ -67,4 +68,5 @@ EBUILD netbeans-javafx-9999_p20160303.ebuild 4717 SHA256 be7244682dc2c2aecab8ffb
 EBUILD netbeans-javafx-9999_p20160304.ebuild 4717 SHA256 166a2baa58f236e911e9388646b82ef01a335e3a773d919b50cd44ad46b0da09 SHA512 da5f3452d3ac712a628ba1ccf9ae2c540e98b3fafb81c0b6e0bd0b59ab213259e1e006eac2830821b496bc8f8f8987c1c1549b6741f5bda22eaad621802a4876 WHIRLPOOL 6720dd8f2bd3d997cd64b89bf939014b0318e6c88293906d455c8458b883bf2189edc7de9c0c5a07ecf0d7e832af7d0c32fd98664477c5ca0b1ab53da3e7ecd9
 EBUILD netbeans-javafx-9999_p20160305.ebuild 4717 SHA256 626a8701e506e608c9f717328eb508ef3d2f2233227d8e972ac66cf300fed5d4 SHA512 38c37377f355dba3ff82e3d853a030333d82cbc6a302286ad6668fd1307e3750160993e8b1e68b1e1887e9824329ccf1230cd8808295ac6fcd7d59bd638ca236 WHIRLPOOL 832c17fdb96fd67c81a1d1bddcc77442b5d8142ca83348eb9e24bd1428869b739a38d4016a3578a8df16b8a66a6e8e3ff206d3d0b5d221da5dec00582f4a244c
 EBUILD netbeans-javafx-9999_p20160306.ebuild 4717 SHA256 e3c89f0b2dffbc7dd781e0c2d8b4024f81cbbcbd38c5b8028b267b2afdb1dd53 SHA512 b696da538f2e25113e4ef7ce3abc3a85a3fe498d9de553a7a56e20cdebf1d0fe1396639640156aa608d637c5a84c40d9988c98f0dfd2cef9d3f71fc833ee5fa6 WHIRLPOOL bed549132e695b27148d8e4fcc17dfffb4567861b9378cf05cda1e58558dd0f43c2cdcb2ed93e0482f8af9ae2993facc47d6c880912664cb2e32b89020bc2936
+EBUILD netbeans-javafx-9999_p20160307.ebuild 4717 SHA256 b9c6b92fc5d3bc61ec5e7ba32b0900e8cd5b82c25b6c09be17d3ee7c45aedad5 SHA512 373bd1e0a7255626dd3a42905de1fbdc8172f43025b6c9bc8f6eb6ebad6fd709865915d9a96c93f71e54baf1ab7c9f36033449a4a840797009fb1d87aef735f0 WHIRLPOOL 10fa57554383542eadcac2428a6061227f27e2bb12307a4e273568c0cc03dfa0b469c1ff5a7706e425ac85af0528d4d3fa5ea1cf0be70d8bce88eef9d6be7da7
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160307.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160307.ebuild
new file mode 100644
index 0000000..a5210ed
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160307.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaFX Cluster"
+HOMEPAGE="http://netbeans.org/projects/javafx"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-07_00-02-15/zip/netbeans-trunk-nightly-201603070002-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 c545f74..5753b29 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201603030002-src.zip 209842396 SHA256 e5aa9f6bfd0301
 DIST netbeans-trunk-nightly-201603040002-src.zip 209874039 SHA256 1c09271301d3c339c32e7e4f357344d576258bcd47945cddb8c35425b08094fc SHA512 3afb51c5740c1fbfa8c6d246f7cd125185dc93f1b0150ae22055179123b35dafc9657564a4c5981047e8ad8c60b72f1f4ea908ae78123f62b318fd022cbf6ba5 WHIRLPOOL 712f146d886fde5a5a6e5be198b82f5fd61f557e9de70e4a07f144350e4213918143bf50706139b7947de1c0f2d1f819dec749899d8a896c36d08a1fa561c15a
 DIST netbeans-trunk-nightly-201603050002-src.zip 209877850 SHA256 63189967b006451d5881dc2b31d086ddfd57334752adca57aa47e736f21fd09a SHA512 a5b1bd2518102de7d4d0552e11e8fe99aa17e05b1b77c69801421ec5b821dabe145a3a9fc245591b349e82d54670c182336a8d6c9340097fb843113269efcf43 WHIRLPOOL 9dd1fbf1a95c33b4d5b83a91ab469c3d174c6f1fd3d7bea0836fafafeb933b7142f56512a882f8387fe9c9292fd9c7276121b75c700e75617d0e9651e89f4d58
 DIST netbeans-trunk-nightly-201603060002-src.zip 209877850 SHA256 8626e8cefe8c5c2c65b0da44edef5148f85f9bbef39d7aea60baf2ec240b360d SHA512 0bef47e29211cec98b037361db3d6e5a513212f8761a2163430d74dd7f837f736de649416408966bf14344e68873a9dfabc5501ce83034a8c944193dbdc46ede WHIRLPOOL b6fc7291b14c66d546c9031e0fdef21900f284eec4aecd751e65c91efda33027da61174e3affb6420671e6822dd075de65802cc6798c3804078924c0b4a5b284
+DIST netbeans-trunk-nightly-201603070002-src.zip 209877839 SHA256 fc1c88bc66f6c53325a5fa69610b4b5ce2ddd77f716f9786d51865048d839657 SHA512 efb500a2975b40a251dbcbc85b51a23b3cff188d85c67592a2463ca8645f0a0ffd41222d38501be9b39f8737e11b3cc17a5c8f55a5c5b047ab41fdf93be30baf WHIRLPOOL c63d4521cca81cb8ad232f8bbe83fd9f8e98870884fc986d45c12325674f12bacab79ab2a978b73ee3a5d8a2d5f4bdeec08438b9f1bfd99ea292ef31c407cae8
 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_p20160204.ebuild 4412 SHA256 77b7056f05a10b097a438114c85eaef6fed8fdb329885e37e214b0117cbe0806 SHA512 cc80379c048335fb6dda529802bbe4f204659e286c287c0bd8419853b07362498c83a09e8c49ad311bc8fd943c1afa9d35fa09b2c88ec6f076a2fe6f23faa6b0 WHIRLPOOL 2cb88c599d212f830ca675ee3940628eb0bc77e581201cde2403f9fae5a96608400f166ff883888ff35b9abab673e71fa273e2cad02cdeb0268984a589a0e71c
@@ -59,4 +60,5 @@ EBUILD netbeans-mobility-9999_p20160303.ebuild 4412 SHA256 8f52fcc92dbaf37e3887f
 EBUILD netbeans-mobility-9999_p20160304.ebuild 4412 SHA256 5a0e86a9aa4b9ce082677514b00470216500bf471044b9c271afb1bcc3a59381 SHA512 ace567e0483a17d5272b4c8c94cc46523f5021b076eb21bd20c726dce3d5c686b20c422a9cf75f94ca36473912830dcca2f6306eda291d0a0e9674c21f535369 WHIRLPOOL 124e23939f5393cf624df9b4050cec6ba441f3fd1f1476d32e8b4729eb1cbadd32032288ae36992dbbe623180d7b59de8c08dddbb5dd002062d1874c075f855c
 EBUILD netbeans-mobility-9999_p20160305.ebuild 4412 SHA256 bbd6a166a9d85dacb24c6ba40bb00f92e2de626a34659060ec39f8ead703e0b0 SHA512 9363a7009822ff2d94eafe26c9a0bc57aff711053aa4f1620841e8d205dd791ad20b333f739d0cc5821b99f88c1ee007784265b6dfb602500481e9859615afea WHIRLPOOL 74f87f6a12e3cc076f3956368cb87a583f6e795d165517d04588d02a08bac036ae2e985f64895892529edcdf84a7dbc16417b380415382307739b15e71943000
 EBUILD netbeans-mobility-9999_p20160306.ebuild 4412 SHA256 5260cb87cd999409dae66829b23ba42a4cf44a62af524b9bec73e3741c5da84d SHA512 5b857fa3be723f2718b0c02b5f648e09b1803402b116592302c3aa1f4d5201a9db1e84d9c36b9ab1af178122d6abc5ffeef9937b1538b47ff5f888b1e88e0ae7 WHIRLPOOL 92e8bfab1bbe7d0b7fb69563ee865f5cea4be24a2a2eb30e6d70401c292bae59c59c03a6c9857a427780d1fd58062160e8e0464dbd540924cbbe20242629728c
+EBUILD netbeans-mobility-9999_p20160307.ebuild 4412 SHA256 5ac54129a4b161c374af828c61be4fe2d34e908455f14133b049c398e6240fd6 SHA512 89d5f4500e1b35b970de43254d900b0104cdaf5806aeb15a5bf0c9e8d6254e38aa16287a2b9c0931c7a8d89a9281aa45b2c65e3dabdf3f255425ed53b3768000 WHIRLPOOL 035b69d0e87a0d436fce79439064be87cdc591d4abc7d6a17f08580da54a0c46f9f296c291203d6030520db2181a74a79f2d633a5685e4b89c2f0863eea2ab95
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160307.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160307.ebuild
new file mode 100644
index 0000000..600e7d1
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160307.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Mobility Cluster"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-07_00-02-15/zip/netbeans-trunk-nightly-201603070002-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 8779b94..dfffc16 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201603030002-src.zip 209842396 SHA256 e5aa9f6bfd0301
 DIST netbeans-trunk-nightly-201603040002-src.zip 209874039 SHA256 1c09271301d3c339c32e7e4f357344d576258bcd47945cddb8c35425b08094fc SHA512 3afb51c5740c1fbfa8c6d246f7cd125185dc93f1b0150ae22055179123b35dafc9657564a4c5981047e8ad8c60b72f1f4ea908ae78123f62b318fd022cbf6ba5 WHIRLPOOL 712f146d886fde5a5a6e5be198b82f5fd61f557e9de70e4a07f144350e4213918143bf50706139b7947de1c0f2d1f819dec749899d8a896c36d08a1fa561c15a
 DIST netbeans-trunk-nightly-201603050002-src.zip 209877850 SHA256 63189967b006451d5881dc2b31d086ddfd57334752adca57aa47e736f21fd09a SHA512 a5b1bd2518102de7d4d0552e11e8fe99aa17e05b1b77c69801421ec5b821dabe145a3a9fc245591b349e82d54670c182336a8d6c9340097fb843113269efcf43 WHIRLPOOL 9dd1fbf1a95c33b4d5b83a91ab469c3d174c6f1fd3d7bea0836fafafeb933b7142f56512a882f8387fe9c9292fd9c7276121b75c700e75617d0e9651e89f4d58
 DIST netbeans-trunk-nightly-201603060002-src.zip 209877850 SHA256 8626e8cefe8c5c2c65b0da44edef5148f85f9bbef39d7aea60baf2ec240b360d SHA512 0bef47e29211cec98b037361db3d6e5a513212f8761a2163430d74dd7f837f736de649416408966bf14344e68873a9dfabc5501ce83034a8c944193dbdc46ede WHIRLPOOL b6fc7291b14c66d546c9031e0fdef21900f284eec4aecd751e65c91efda33027da61174e3affb6420671e6822dd075de65802cc6798c3804078924c0b4a5b284
+DIST netbeans-trunk-nightly-201603070002-src.zip 209877839 SHA256 fc1c88bc66f6c53325a5fa69610b4b5ce2ddd77f716f9786d51865048d839657 SHA512 efb500a2975b40a251dbcbc85b51a23b3cff188d85c67592a2463ca8645f0a0ffd41222d38501be9b39f8737e11b3cc17a5c8f55a5c5b047ab41fdf93be30baf WHIRLPOOL c63d4521cca81cb8ad232f8bbe83fd9f8e98870884fc986d45c12325674f12bacab79ab2a978b73ee3a5d8a2d5f4bdeec08438b9f1bfd99ea292ef31c407cae8
 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_p20160204.ebuild 4111 SHA256 05c1b57b99f8e6f3bc8532bde6a08f5311ec9015abaee1a7f93e79fbcabbbc6d SHA512 d1cc225dd1418e2f3efb4cded2b61081f785f90e35405537931ce9c8a6e37ee834fd8a584494d0e5d9d330a07942253cc6fab158c9bcaed98b0b54fd00949c1c WHIRLPOOL ba349e4b640b7f3143a480a6eca2338b8d1496fb3d23b56d7382dcaa358273cdba548938db69df2020827bf5e91c89201aee88108acdfb518e137cd54839e91a
@@ -62,4 +63,5 @@ EBUILD netbeans-nb-9999_p20160303.ebuild 4111 SHA256 f42d9576c503c4ece2d21fd1016
 EBUILD netbeans-nb-9999_p20160304.ebuild 4111 SHA256 dde7a75ee404d2f1e84aa839f1af3c09dc735f82ff7caaf85878a7ffc10de2cd SHA512 e801fcc7b5360f0bbc0f14a81dd202d6375e0e31a45bea67d999055d24a0097c42e5711adfc0316b913ac56725d2f339bdbb623fcd3869ca016ac315f0657ad1 WHIRLPOOL b61e584a06d136d81780292f17bd73e453c280460f51a561a9ab4f6b9cf08bd69069bf5bee5ea2918c033b8ad5f2ea9d10afd475572ed8c4648bbfece0a4389b
 EBUILD netbeans-nb-9999_p20160305.ebuild 4111 SHA256 f6d6c8dafb52e73331b0548b3341786f20c423036d7ffbece56158dd9d238a02 SHA512 6becf66261a91e093af3adf276c6b3c68ea0e1ed8c4bb3ae1a51739a0593833a7359c49d7233562fca75911a69e4b3be494efa977e425368ab83143e32e7790c WHIRLPOOL 5ab1170786c285fa17322dc004d88ce6de07e0a753b97861e6f2f144d252df9f0ec45a51d1bf920963d6739fd9cf61955701076995d6bb9a04ed69a8fc17ef57
 EBUILD netbeans-nb-9999_p20160306.ebuild 4111 SHA256 5d40bd23a8dcc2d9e92175922e3ee431ffbfd0f8e2cdab82e984c32069cdaac7 SHA512 c3da0c98ecb2105a43b9029b5f438dcdab23b1657af0d31cabf9954d9bb7d27112e1cf8f03bde004eaa13f8db6db45ff0942ebfef0736c862a8116ebc2bc951a WHIRLPOOL 7f14f203817ad8c8029b3abc771a6069bf17383123e4e6b3b59e123b183f53b887aeca6f6ae17bb50500071533f10585c0c8a5313497c4edd2c49c19c0d47b54
+EBUILD netbeans-nb-9999_p20160307.ebuild 4111 SHA256 42e15662196adbba81f40caf97a4f1611fc12dee4a5cbd52a3cdc34591c39bb7 SHA512 4c0f83b0234027ad2ff7857b046c4da83edc9a2d16a1e2ce8f215048818c683a37a1fb4098ce76745c97b3c7ce16cfee90910052b95dc4dc854f73cc1bf4b1c6 WHIRLPOOL c4f10870adaea1870ac3e58ab15eb06a628e9c864b7fc397d8d0ab1450dd481d46e1d17d1d2c52fdd96bc4906e991dd01089599c2b417b38ac4ddf334449cacd
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160307.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160307.ebuild
new file mode 100644
index 0000000..b1befc8
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20160307.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Branding"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-07_00-02-15/zip/netbeans-trunk-nightly-201603070002-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 ae4682d..370bebf 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201603030002-src.zip 209842396 SHA256 e5aa9f6bfd0301
 DIST netbeans-trunk-nightly-201603040002-src.zip 209874039 SHA256 1c09271301d3c339c32e7e4f357344d576258bcd47945cddb8c35425b08094fc SHA512 3afb51c5740c1fbfa8c6d246f7cd125185dc93f1b0150ae22055179123b35dafc9657564a4c5981047e8ad8c60b72f1f4ea908ae78123f62b318fd022cbf6ba5 WHIRLPOOL 712f146d886fde5a5a6e5be198b82f5fd61f557e9de70e4a07f144350e4213918143bf50706139b7947de1c0f2d1f819dec749899d8a896c36d08a1fa561c15a
 DIST netbeans-trunk-nightly-201603050002-src.zip 209877850 SHA256 63189967b006451d5881dc2b31d086ddfd57334752adca57aa47e736f21fd09a SHA512 a5b1bd2518102de7d4d0552e11e8fe99aa17e05b1b77c69801421ec5b821dabe145a3a9fc245591b349e82d54670c182336a8d6c9340097fb843113269efcf43 WHIRLPOOL 9dd1fbf1a95c33b4d5b83a91ab469c3d174c6f1fd3d7bea0836fafafeb933b7142f56512a882f8387fe9c9292fd9c7276121b75c700e75617d0e9651e89f4d58
 DIST netbeans-trunk-nightly-201603060002-src.zip 209877850 SHA256 8626e8cefe8c5c2c65b0da44edef5148f85f9bbef39d7aea60baf2ec240b360d SHA512 0bef47e29211cec98b037361db3d6e5a513212f8761a2163430d74dd7f837f736de649416408966bf14344e68873a9dfabc5501ce83034a8c944193dbdc46ede WHIRLPOOL b6fc7291b14c66d546c9031e0fdef21900f284eec4aecd751e65c91efda33027da61174e3affb6420671e6822dd075de65802cc6798c3804078924c0b4a5b284
+DIST netbeans-trunk-nightly-201603070002-src.zip 209877839 SHA256 fc1c88bc66f6c53325a5fa69610b4b5ce2ddd77f716f9786d51865048d839657 SHA512 efb500a2975b40a251dbcbc85b51a23b3cff188d85c67592a2463ca8645f0a0ffd41222d38501be9b39f8737e11b3cc17a5c8f55a5c5b047ab41fdf93be30baf WHIRLPOOL c63d4521cca81cb8ad232f8bbe83fd9f8e98870884fc986d45c12325674f12bacab79ab2a978b73ee3a5d8a2d5f4bdeec08438b9f1bfd99ea292ef31c407cae8
 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_p20160204.ebuild 4418 SHA256 0ef6bb16c8c4d3e68601323a1e6749a028451deb5bcdc8ad78685f1412378ea8 SHA512 e4205c41422a475f7b20f90ffdf16bf852069315ac7d6539bfe696b0098cc5a2217c364bf67540e251da9445424df5aa34e0ea669e8eba89182042652e422801 WHIRLPOOL 27eab580350f55a8cdf8e3676b098e2a7ed803a3d4493a5b177955492e44e113a619b709c58c8e0eb990193eb1bd7aba5182b5b0e2cdf9bd07ca2e637de81797
@@ -63,4 +64,5 @@ EBUILD netbeans-php-9999_p20160303.ebuild 4418 SHA256 516a8d94b363471554af18a580
 EBUILD netbeans-php-9999_p20160304.ebuild 4418 SHA256 20e988491ddc08070e0d69b20ccc7c931824bd687df616fb4adf9f8c521d2468 SHA512 446757a7e9074387d596b24e5b657aa9ae7849b1cf626379179e7fa1fc1f5be9b1caa75ecaf9ce99bc46fef8dd7a6481ff693fb85607dc9848dac0c0c273abd2 WHIRLPOOL 49daaa882e8444267d4c5cd5f136b096978018e58b230e283912e02e00c88d03235efa1922fab35376b2fe58ca228e2064395cac75fbdd191c9bd2bf4c8c4c81
 EBUILD netbeans-php-9999_p20160305.ebuild 4418 SHA256 cb700dcde205295ac4abaeda0ec7a9a2da8d78794e012c357db088ccd9b6011f SHA512 40d15ffc73e8a8e3d96aaccc6a47f6a05c161a431edfb37525e8bc0b194840efb11d903ff2b6cba45ff97b82cf02b4717abd0106128ad6387089629603f3442b WHIRLPOOL 6ff6c59a9a9f2b501eb11512f22e0d8ab89919fcdb2f2ddb0c47df16166101b60fded5993f8cd297d355369b74684d3c23d79f304dd23e38601e0b7935211164
 EBUILD netbeans-php-9999_p20160306.ebuild 4418 SHA256 ab8c05574707013fd5e00eb917ba143b42cc7f983093480e74bad2cc782579ae SHA512 2602299d7e95a616cc0aa33755ae8d068404b14ac1e4b998e2fb07eff811064221a6df9f7a4c76a3ad42c1f3bf1bc0fcead56657e7152fa17a873af67167061f WHIRLPOOL 589b76999f72bd4054202f86672e1f282147e8162dd6d48dd7ee71f30c6f81a6f52479d19a35a90d03478e1c1f0a663f2bacb9028ef6592b051e474019a6df33
+EBUILD netbeans-php-9999_p20160307.ebuild 4418 SHA256 3dcddbc01845b74288574579865dc2b11c7aa19399fda477ca431daebc0c0f24 SHA512 7654634d0d8ced95184017ccf8b859d26020ec76372730fcd037bac596572a833366e79fb05ea03359a76ab640416e004c3ca2f5d06a7e505767f985e72860eb WHIRLPOOL 9dcfb6d3a3a589ce1552a8cfb9cc0466c50bda4df789dcfdaa416e0175c282736b27200bb74057303d27b7fc24b669ca0c9b4cb6a0e74871a806266579af0357
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160307.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160307.ebuild
new file mode 100644
index 0000000..ac87f01
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20160307.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans PHP Cluster"
+HOMEPAGE="http://netbeans.org/projects/php"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-07_00-02-15/zip/netbeans-trunk-nightly-201603070002-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 1b59380..179b1d0 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -47,6 +47,7 @@ DIST netbeans-trunk-nightly-201603030002-src.zip 209842396 SHA256 e5aa9f6bfd0301
 DIST netbeans-trunk-nightly-201603040002-src.zip 209874039 SHA256 1c09271301d3c339c32e7e4f357344d576258bcd47945cddb8c35425b08094fc SHA512 3afb51c5740c1fbfa8c6d246f7cd125185dc93f1b0150ae22055179123b35dafc9657564a4c5981047e8ad8c60b72f1f4ea908ae78123f62b318fd022cbf6ba5 WHIRLPOOL 712f146d886fde5a5a6e5be198b82f5fd61f557e9de70e4a07f144350e4213918143bf50706139b7947de1c0f2d1f819dec749899d8a896c36d08a1fa561c15a
 DIST netbeans-trunk-nightly-201603050002-src.zip 209877850 SHA256 63189967b006451d5881dc2b31d086ddfd57334752adca57aa47e736f21fd09a SHA512 a5b1bd2518102de7d4d0552e11e8fe99aa17e05b1b77c69801421ec5b821dabe145a3a9fc245591b349e82d54670c182336a8d6c9340097fb843113269efcf43 WHIRLPOOL 9dd1fbf1a95c33b4d5b83a91ab469c3d174c6f1fd3d7bea0836fafafeb933b7142f56512a882f8387fe9c9292fd9c7276121b75c700e75617d0e9651e89f4d58
 DIST netbeans-trunk-nightly-201603060002-src.zip 209877850 SHA256 8626e8cefe8c5c2c65b0da44edef5148f85f9bbef39d7aea60baf2ec240b360d SHA512 0bef47e29211cec98b037361db3d6e5a513212f8761a2163430d74dd7f837f736de649416408966bf14344e68873a9dfabc5501ce83034a8c944193dbdc46ede WHIRLPOOL b6fc7291b14c66d546c9031e0fdef21900f284eec4aecd751e65c91efda33027da61174e3affb6420671e6822dd075de65802cc6798c3804078924c0b4a5b284
+DIST netbeans-trunk-nightly-201603070002-src.zip 209877839 SHA256 fc1c88bc66f6c53325a5fa69610b4b5ce2ddd77f716f9786d51865048d839657 SHA512 efb500a2975b40a251dbcbc85b51a23b3cff188d85c67592a2463ca8645f0a0ffd41222d38501be9b39f8737e11b3cc17a5c8f55a5c5b047ab41fdf93be30baf WHIRLPOOL c63d4521cca81cb8ad232f8bbe83fd9f8e98870884fc986d45c12325674f12bacab79ab2a978b73ee3a5d8a2d5f4bdeec08438b9f1bfd99ea292ef31c407cae8
 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_p20160204.ebuild 9360 SHA256 9164a33bb78f0a410d068e1d200eb383be996a01b65da993d66c5702e059e9a7 SHA512 ad43c41337764ecc4dfb0f043fe95eecb0e3d8494ce16f2c425ff96a483047d531f892d5aa8819aa0fab1d8f2c3c13a87611ac7210e363875227ed2404c44d49 WHIRLPOOL fb5d959de8ef000ff60ebbbbe4e7dc2a9d4989fe94afd8b01f02bc202822cdcfd53c5802fda21b456f3b6350bccbede6e56fc3ce5f7427ebba961aa4b9529d3d
@@ -76,4 +77,5 @@ EBUILD netbeans-platform-9999_p20160303.ebuild 9360 SHA256 aac5b549e4e9e0951f784
 EBUILD netbeans-platform-9999_p20160304.ebuild 9360 SHA256 bceedbb18067e9e362589f41a97e8b6394b86a1f5dca73c238881edb9f304711 SHA512 fa83f915c3183f069206758fc32809cbd0d5d65f0d189c3b1d8dca4d3eaa0faa87e886da33936c5f9c1bc47415b835790ca3c0238e8f4568193e31be1d3e6cfa WHIRLPOOL 065024a4c748c501c6f1d5e4d2fffd8c64d1add0b4a6513efcf8540d71572db323d9a23c718d64cbdeeba7fd0ca159bfd8d2a682c86f01c6e4a2296d2194d5e3
 EBUILD netbeans-platform-9999_p20160305.ebuild 9360 SHA256 d7846fed030776182ca4a379b820ee217eb2c6777ca8fe7b3bf5728a17dd9245 SHA512 02ffe3237fa85e5c9dfb7505aab1260bc1ac9f020d64cdf1201e68e59f5a28c12b042f2063600d0160337657c390815e8d8f5aa487b46b6be888810f51ae8756 WHIRLPOOL 1135c6f9998aae6b8d31958949c5c35be5014aee75c8dc33b324a415fe848c562cba97ac8e0f0a4a44ec731301dc8efa13e3b4a5514e9d342b47b768f4951144
 EBUILD netbeans-platform-9999_p20160306.ebuild 9360 SHA256 697d2a9ed77e74047949310de5cd862863c75b00e4f8449a2067520b2f137087 SHA512 5666338be76e6bf2d95051597b389429ef3dd9d798e4f438a5771a954b76f315a31fb5f8f9d628ac40cb6b6fb65ff7bd077523845df2191b24c70cedd1dfd71e WHIRLPOOL b4e1315ad4f4a64af397263c3dc42289960d5d364d34946c0707ba7c65c2b863f7c1e64166e292fe1e0cf61aa9e51016b94cfe5b0627a3dbbe344f7fd95728df
+EBUILD netbeans-platform-9999_p20160307.ebuild 9360 SHA256 9d393160ecf587d725042a84638c3e163bdb2010ecb350f770791ce3b2449652 SHA512 b7129a8544fc1addb6fc164bc4741762d5da8ca6dd3dcab4e12208b5a0c9768f99fa9024cf5ff46a7b1b3e5d950972b29dc2e7265bccfd1343f85aa58f24fdfe WHIRLPOOL 00138cb80a41ef3d6f50951880868e0b56249c1ed6222e7e61e94688f793f8d41e296a0ab6f8e3a179eb4fe89ac86af1e4ca37929527691b7e6c7d0bb1af31cd
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160307.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160307.ebuild
new file mode 100644
index 0000000..4a22940
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20160307.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Platform"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-07_00-02-15/zip/netbeans-trunk-nightly-201603070002-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 a6a45a3..8187e2f 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201603030002-src.zip 209842396 SHA256 e5aa9f6bfd0301
 DIST netbeans-trunk-nightly-201603040002-src.zip 209874039 SHA256 1c09271301d3c339c32e7e4f357344d576258bcd47945cddb8c35425b08094fc SHA512 3afb51c5740c1fbfa8c6d246f7cd125185dc93f1b0150ae22055179123b35dafc9657564a4c5981047e8ad8c60b72f1f4ea908ae78123f62b318fd022cbf6ba5 WHIRLPOOL 712f146d886fde5a5a6e5be198b82f5fd61f557e9de70e4a07f144350e4213918143bf50706139b7947de1c0f2d1f819dec749899d8a896c36d08a1fa561c15a
 DIST netbeans-trunk-nightly-201603050002-src.zip 209877850 SHA256 63189967b006451d5881dc2b31d086ddfd57334752adca57aa47e736f21fd09a SHA512 a5b1bd2518102de7d4d0552e11e8fe99aa17e05b1b77c69801421ec5b821dabe145a3a9fc245591b349e82d54670c182336a8d6c9340097fb843113269efcf43 WHIRLPOOL 9dd1fbf1a95c33b4d5b83a91ab469c3d174c6f1fd3d7bea0836fafafeb933b7142f56512a882f8387fe9c9292fd9c7276121b75c700e75617d0e9651e89f4d58
 DIST netbeans-trunk-nightly-201603060002-src.zip 209877850 SHA256 8626e8cefe8c5c2c65b0da44edef5148f85f9bbef39d7aea60baf2ec240b360d SHA512 0bef47e29211cec98b037361db3d6e5a513212f8761a2163430d74dd7f837f736de649416408966bf14344e68873a9dfabc5501ce83034a8c944193dbdc46ede WHIRLPOOL b6fc7291b14c66d546c9031e0fdef21900f284eec4aecd751e65c91efda33027da61174e3affb6420671e6822dd075de65802cc6798c3804078924c0b4a5b284
+DIST netbeans-trunk-nightly-201603070002-src.zip 209877839 SHA256 fc1c88bc66f6c53325a5fa69610b4b5ce2ddd77f716f9786d51865048d839657 SHA512 efb500a2975b40a251dbcbc85b51a23b3cff188d85c67592a2463ca8645f0a0ffd41222d38501be9b39f8737e11b3cc17a5c8f55a5c5b047ab41fdf93be30baf WHIRLPOOL c63d4521cca81cb8ad232f8bbe83fd9f8e98870884fc986d45c12325674f12bacab79ab2a978b73ee3a5d8a2d5f4bdeec08438b9f1bfd99ea292ef31c407cae8
 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_p20160204.ebuild 3472 SHA256 83bc4d60299d042ae913b6d824ff74f05de6f371bedc0acb3fc98323ef2333a5 SHA512 b08cc9b67e7bff6bec5681b6d5160b9c5210f820b9e6016efae4a75eae39d90cc5dc6fc60caffddab534a455353a241f753148dc9814c63d1858fb1d3ba5280f WHIRLPOOL 2aa727c60f4f89e81f32f7af23f5f6474bef24b07f0a95e07cb58cd8030d92cef266a7e55f3b27610aab2f0b956089dc9c97f82468e36c497e50b4452ee8e66c
@@ -59,4 +60,5 @@ EBUILD netbeans-profiler-9999_p20160303.ebuild 3472 SHA256 a62d4ddfd07891f3eb190
 EBUILD netbeans-profiler-9999_p20160304.ebuild 3472 SHA256 a892e83c4428af2cb424652a39a2cda7bc289c25a88debb43a31f8fa91a1cab3 SHA512 0f80455c5f4850575da80a9d01e7bff73bd79de0c0dcc602404b7d5ef6f57e59e21b350a0354e90c5a3af742631df39fd459d4099352dd03c99f85b92c665bdc WHIRLPOOL 56ce90eccf3731b1d635ef54d24bee2923a079ca41397292f47a94ba7cf8ceeb9f4f1319a40e866e25f90e2f6f9a0228f6566acd844ce6b459c9c25900d4c1a0
 EBUILD netbeans-profiler-9999_p20160305.ebuild 3472 SHA256 55c72b78b368749b6878d32567f708be294b5ff91aa091fd73affeff812de27e SHA512 8351a44182d4ae3643ac70039eeacc4dd68e77f5683bbfe8d70017dec61f26ee11c72eadc8a42638672781185bbef6e1c976f4566c0feaa7b6c046ee67deb857 WHIRLPOOL 7944d569e9c63e7142bf3093ef046c047857be6f0df58b8eb1d6f9f37a8d28dddd913e4e23b7bc6ab5d5029f6c4313a9409c909b5f09ace40a2b769fe13ba538
 EBUILD netbeans-profiler-9999_p20160306.ebuild 3472 SHA256 d243c6c57755c1fac5e730acf33dbb92ba0f036ffc0e271ac149eb8de44b8cef SHA512 7a7b3f9e80c1c4924ecb4b69f5244fb41f59b412bbf91a296cb0dffc3792c65f01bf5f7bfcaf18ffcb331f223ba2d90cf8bc48955e1dd82cfcfc13937e8d3d79 WHIRLPOOL 4111399bba2da5fffa24eb443ab95b99e37e41449aff1c2d6a0bb207f5916540ef30840e28f8725c2a26a7e7df2b6ff5c17e8071ae6e20a3ea634d8e8ae25ad6
+EBUILD netbeans-profiler-9999_p20160307.ebuild 3472 SHA256 ad194408cc9a3f5ec5664232847e000d75c7807eeb0d0ba94d91e09ff04d1442 SHA512 370a593b3b8bf3edb7aefcb2fde0f671599b4b2404e73b51638f1bad4381c88b1e097f32fa8bc839658b6a2ef5560c12368f222e2c5eee0b335a3084068c3d8e WHIRLPOOL a054a6bf48c86494965b3a1f22608e72ed250bbcb825499d73d3ba7b9901779bfe6283f4c07c0f434df0e89bab638b4697aa44923ee7749bb63aa3feec75f510
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160307.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160307.ebuild
new file mode 100644
index 0000000..d6a5de9
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160307.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Profiler Cluster"
+HOMEPAGE="http://netbeans.org/projects/profiler"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-07_00-02-15/zip/netbeans-trunk-nightly-201603070002-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 8e6acce..d52787e 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -45,6 +45,7 @@ DIST netbeans-trunk-nightly-201603030002-src.zip 209842396 SHA256 e5aa9f6bfd0301
 DIST netbeans-trunk-nightly-201603040002-src.zip 209874039 SHA256 1c09271301d3c339c32e7e4f357344d576258bcd47945cddb8c35425b08094fc SHA512 3afb51c5740c1fbfa8c6d246f7cd125185dc93f1b0150ae22055179123b35dafc9657564a4c5981047e8ad8c60b72f1f4ea908ae78123f62b318fd022cbf6ba5 WHIRLPOOL 712f146d886fde5a5a6e5be198b82f5fd61f557e9de70e4a07f144350e4213918143bf50706139b7947de1c0f2d1f819dec749899d8a896c36d08a1fa561c15a
 DIST netbeans-trunk-nightly-201603050002-src.zip 209877850 SHA256 63189967b006451d5881dc2b31d086ddfd57334752adca57aa47e736f21fd09a SHA512 a5b1bd2518102de7d4d0552e11e8fe99aa17e05b1b77c69801421ec5b821dabe145a3a9fc245591b349e82d54670c182336a8d6c9340097fb843113269efcf43 WHIRLPOOL 9dd1fbf1a95c33b4d5b83a91ab469c3d174c6f1fd3d7bea0836fafafeb933b7142f56512a882f8387fe9c9292fd9c7276121b75c700e75617d0e9651e89f4d58
 DIST netbeans-trunk-nightly-201603060002-src.zip 209877850 SHA256 8626e8cefe8c5c2c65b0da44edef5148f85f9bbef39d7aea60baf2ec240b360d SHA512 0bef47e29211cec98b037361db3d6e5a513212f8761a2163430d74dd7f837f736de649416408966bf14344e68873a9dfabc5501ce83034a8c944193dbdc46ede WHIRLPOOL b6fc7291b14c66d546c9031e0fdef21900f284eec4aecd751e65c91efda33027da61174e3affb6420671e6822dd075de65802cc6798c3804078924c0b4a5b284
+DIST netbeans-trunk-nightly-201603070002-src.zip 209877839 SHA256 fc1c88bc66f6c53325a5fa69610b4b5ce2ddd77f716f9786d51865048d839657 SHA512 efb500a2975b40a251dbcbc85b51a23b3cff188d85c67592a2463ca8645f0a0ffd41222d38501be9b39f8737e11b3cc17a5c8f55a5c5b047ab41fdf93be30baf WHIRLPOOL c63d4521cca81cb8ad232f8bbe83fd9f8e98870884fc986d45c12325674f12bacab79ab2a978b73ee3a5d8a2d5f4bdeec08438b9f1bfd99ea292ef31c407cae8
 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_p20160204.ebuild 5280 SHA256 b7e52fa271999978dbbdad26e0d68a922514a7a55bcb7044bf4bf892532c43a1 SHA512 c54ec71d2ff6cb3d501ee4a3e1db15d2f701023cbe000b9764f826c40a9a7c0191c71e38ada726516885a01eb805e5a09f83e59ec54a7609f79e2dba1495da45 WHIRLPOOL 7a37448315f9d3b3ddf8d15ab50b3d645f39a3a72614593eb7caccac2a9fe2bd31b49ac4bf110afcd1dced21c049a630a89a9eb05bce8227752ea6d70817b163
@@ -74,4 +75,5 @@ EBUILD netbeans-webcommon-9999_p20160303.ebuild 5280 SHA256 17176743f2d7826ade0b
 EBUILD netbeans-webcommon-9999_p20160304.ebuild 5280 SHA256 b1e8cba256efe0742265cb9c061ccb77a6554a3fbd2f206178fc362eef25f5b1 SHA512 7ecb75e01268c778b432e971efca3615af017b8281be02f3cb04e35ca2c50ab57b4b22e3b9d224df49027644fe1dcf697a73faffbe95aca40e1eff2cf99933ad WHIRLPOOL abb6b5d70e4b84c3694f1c74817b10ee80cae8588e6076efe0a580206596a6ebbacab07c14f53394a11559d01a92b945d711805c5ae78bbec6c0c5e9c20b6787
 EBUILD netbeans-webcommon-9999_p20160305.ebuild 5280 SHA256 b9ed8087dff5fb7297642c7fa5f5cfd64a3140a286f3adb03a8e380129d20b5d SHA512 29abc81ba7741dfc52d07f11785e412f7d92f9d2c8529114815bb86fd0d1fa4724b9001fa9ac2da63efc362d0892f05a8b620e172bed60ddadef448316760c3c WHIRLPOOL d32a89d9ef26e83cafbdabb23cda506ded2a5405e9871e1e1783b1be7b8b872b8425346581e6da38b0d1df3a989fa8ae6202209a8d5e95bc4785e80958a9d29f
 EBUILD netbeans-webcommon-9999_p20160306.ebuild 5280 SHA256 832a6ee7bab01af1654dd2308b0acc7948b22c9dcd26e9e26e658c988e9169b7 SHA512 da7e9a02a7da0e75569cbad24ecbdfd4c750036ad6f85d1b2d2b9a1a7ee4bc1592cc2d156d3d4f7b7c203d6b8f36ff85fcacd2587649a1da2341cc76f0ef65a2 WHIRLPOOL acad7aec8ae2ae3a68b53ff4806bad056c79e08c22eead5dc39797d78a8f1059aef27d183887dad4ae6b3aa73aaa2c1813762524c33e38a8775fd18433a2a288
+EBUILD netbeans-webcommon-9999_p20160307.ebuild 5280 SHA256 b715eaaafb9c9ded77ef58690b77f388507e311691d315208aef1db087ada34a SHA512 616ca3436fd9c1c85c3b51d262ffaeed68c4f186f470fb4dca65a7bd3e7f5de277e88844e4c050db6bd280503f2c6836c81adb55fb441710387f3f5b9dcaee38 WHIRLPOOL 83dc4debd9efa6c8e97e9c835c3badef6ef5f0e9c34db1acfed94d90ae361ab06900ac505aa99f88e1bd6c13fcf713b51b28010f96d46a31d2132079d99369ef
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160307.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160307.ebuild
new file mode 100644
index 0000000..a78a43a
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160307.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-07_00-02-15/zip/netbeans-trunk-nightly-201603070002-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 aee41fa..2bfad0c 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201603030002-src.zip 209842396 SHA256 e5aa9f6bfd0301
 DIST netbeans-trunk-nightly-201603040002-src.zip 209874039 SHA256 1c09271301d3c339c32e7e4f357344d576258bcd47945cddb8c35425b08094fc SHA512 3afb51c5740c1fbfa8c6d246f7cd125185dc93f1b0150ae22055179123b35dafc9657564a4c5981047e8ad8c60b72f1f4ea908ae78123f62b318fd022cbf6ba5 WHIRLPOOL 712f146d886fde5a5a6e5be198b82f5fd61f557e9de70e4a07f144350e4213918143bf50706139b7947de1c0f2d1f819dec749899d8a896c36d08a1fa561c15a
 DIST netbeans-trunk-nightly-201603050002-src.zip 209877850 SHA256 63189967b006451d5881dc2b31d086ddfd57334752adca57aa47e736f21fd09a SHA512 a5b1bd2518102de7d4d0552e11e8fe99aa17e05b1b77c69801421ec5b821dabe145a3a9fc245591b349e82d54670c182336a8d6c9340097fb843113269efcf43 WHIRLPOOL 9dd1fbf1a95c33b4d5b83a91ab469c3d174c6f1fd3d7bea0836fafafeb933b7142f56512a882f8387fe9c9292fd9c7276121b75c700e75617d0e9651e89f4d58
 DIST netbeans-trunk-nightly-201603060002-src.zip 209877850 SHA256 8626e8cefe8c5c2c65b0da44edef5148f85f9bbef39d7aea60baf2ec240b360d SHA512 0bef47e29211cec98b037361db3d6e5a513212f8761a2163430d74dd7f837f736de649416408966bf14344e68873a9dfabc5501ce83034a8c944193dbdc46ede WHIRLPOOL b6fc7291b14c66d546c9031e0fdef21900f284eec4aecd751e65c91efda33027da61174e3affb6420671e6822dd075de65802cc6798c3804078924c0b4a5b284
+DIST netbeans-trunk-nightly-201603070002-src.zip 209877839 SHA256 fc1c88bc66f6c53325a5fa69610b4b5ce2ddd77f716f9786d51865048d839657 SHA512 efb500a2975b40a251dbcbc85b51a23b3cff188d85c67592a2463ca8645f0a0ffd41222d38501be9b39f8737e11b3cc17a5c8f55a5c5b047ab41fdf93be30baf WHIRLPOOL c63d4521cca81cb8ad232f8bbe83fd9f8e98870884fc986d45c12325674f12bacab79ab2a978b73ee3a5d8a2d5f4bdeec08438b9f1bfd99ea292ef31c407cae8
 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_p20160204.ebuild 2721 SHA256 fe7b289eaac77dd9951fb1365ce6b831b50f12734a31c8546bed0f78c6827696 SHA512 0ac4702e243ed9ee35b70c255dc865f8fe678c30dcc94eae4013ce8ea031c7c3a44f34c28d85ed76a45c710cfae65e0b6742e12f41b011329abd20a1ad660cb2 WHIRLPOOL d3ef19dffc04ccf6514e69e8b7a6c34b9bb407f0d5808fe80b9ce5645922e7b92ad2ea825cfc564d8a9c5ae19fa19f8d9db20b43d8c8ccc9924727ac1280a0c7
@@ -59,4 +60,5 @@ EBUILD netbeans-websvccommon-9999_p20160303.ebuild 2721 SHA256 8de1746444842698a
 EBUILD netbeans-websvccommon-9999_p20160304.ebuild 2721 SHA256 5a1197b666514124e4463fed005a0cfb2a81c7e843ccd180313f440c03e447f7 SHA512 a154ae502b2bb3c860443de89ea66b1846ea8e213bf7ca91f2c6d32b992073c86a07abac3761e1a9e649a12b3a87a1cbcd298634e239855a6bbe601b3aeb99e1 WHIRLPOOL 6422c81e01e4c5a9f29618535a9af7c7a14c7722a3b057cef2ca778924e1709e2e263dd125869e33c0c6e965dc757a79f3d6152226e0e13353dd0a0d73dfe040
 EBUILD netbeans-websvccommon-9999_p20160305.ebuild 2721 SHA256 3c94d9d3de225179a84ad28dd142eb87db1e7f4cccac768eee5fdecd4eacf393 SHA512 fe20a92fcbcf8ad9f580695f4c2fac0b6cfd4d9b1a04458718e5c1ab863e2799564715aba70b642609b3a1a6c5a1234a7b9eded65c106c228675b0274a096dac WHIRLPOOL eb57f9a397c440c3b102a181b0c57d4058a93d8d53bcaea2b3091a5da0dbb25c292a3a70a5e3f86402590dd96a1ba079225adf3a12c8dfedf8a1904f9ebc6d42
 EBUILD netbeans-websvccommon-9999_p20160306.ebuild 2721 SHA256 6883a676beb19101a91d8c6f89944179972db1b790ce9135578db3e8f03f6e07 SHA512 67a15b7e306aea2b759798a979b7011d0c30d910b80b24e15c10edfa6183d4e99c8dd58ea151a96c65a74a0c5a7151792c132080390394dc47a913f1fee1b87c WHIRLPOOL 72f17c8dfc4cf789a9e8bb030572736c4690d8a4a5d52513cdf804551d220e7919f2ff00e5289bb782ecd079e56861b71be9f3cc7a17b5488abe2806933da8dd
+EBUILD netbeans-websvccommon-9999_p20160307.ebuild 2721 SHA256 d8b9f5d585942e7c274276c66f3077f6a1aaa839b0f0d15c501221a10d069886 SHA512 a2676636ea5ddf474932f526a8c29be0257254e414a6acefd595743f717e83573969fc7e17b6d96b56a64ad7c4316c5590cd689574eaf646b64a2e346590f242 WHIRLPOOL 94961acfb2c8248487ba1947fdf6827b5f5a3203d070dadc5df6e0f611287523f8d541f769ba89a61dc73046ddb8f525fc4785a1c7668fbe672db165438533dd
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160307.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160307.ebuild
new file mode 100644
index 0000000..2510cbd
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160307.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Common Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-07_00-02-15/zip/netbeans-trunk-nightly-201603070002-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 ddf10fd..05f30fa 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201603030002-src.zip 209842396 SHA256 e5aa9f6bfd0301
 DIST netbeans-trunk-nightly-201603040002-src.zip 209874039 SHA256 1c09271301d3c339c32e7e4f357344d576258bcd47945cddb8c35425b08094fc SHA512 3afb51c5740c1fbfa8c6d246f7cd125185dc93f1b0150ae22055179123b35dafc9657564a4c5981047e8ad8c60b72f1f4ea908ae78123f62b318fd022cbf6ba5 WHIRLPOOL 712f146d886fde5a5a6e5be198b82f5fd61f557e9de70e4a07f144350e4213918143bf50706139b7947de1c0f2d1f819dec749899d8a896c36d08a1fa561c15a
 DIST netbeans-trunk-nightly-201603050002-src.zip 209877850 SHA256 63189967b006451d5881dc2b31d086ddfd57334752adca57aa47e736f21fd09a SHA512 a5b1bd2518102de7d4d0552e11e8fe99aa17e05b1b77c69801421ec5b821dabe145a3a9fc245591b349e82d54670c182336a8d6c9340097fb843113269efcf43 WHIRLPOOL 9dd1fbf1a95c33b4d5b83a91ab469c3d174c6f1fd3d7bea0836fafafeb933b7142f56512a882f8387fe9c9292fd9c7276121b75c700e75617d0e9651e89f4d58
 DIST netbeans-trunk-nightly-201603060002-src.zip 209877850 SHA256 8626e8cefe8c5c2c65b0da44edef5148f85f9bbef39d7aea60baf2ec240b360d SHA512 0bef47e29211cec98b037361db3d6e5a513212f8761a2163430d74dd7f837f736de649416408966bf14344e68873a9dfabc5501ce83034a8c944193dbdc46ede WHIRLPOOL b6fc7291b14c66d546c9031e0fdef21900f284eec4aecd751e65c91efda33027da61174e3affb6420671e6822dd075de65802cc6798c3804078924c0b4a5b284
+DIST netbeans-trunk-nightly-201603070002-src.zip 209877839 SHA256 fc1c88bc66f6c53325a5fa69610b4b5ce2ddd77f716f9786d51865048d839657 SHA512 efb500a2975b40a251dbcbc85b51a23b3cff188d85c67592a2463ca8645f0a0ffd41222d38501be9b39f8737e11b3cc17a5c8f55a5c5b047ab41fdf93be30baf WHIRLPOOL c63d4521cca81cb8ad232f8bbe83fd9f8e98870884fc986d45c12325674f12bacab79ab2a978b73ee3a5d8a2d5f4bdeec08438b9f1bfd99ea292ef31c407cae8
 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_p20160204.ebuild 6939 SHA256 f5ffafa6bc643cf357cfd9cbff27cc3158c1867a80055506078bfcc884b5ef02 SHA512 c746d17600fef56be26813bfc12c8ea6dca41fa9ab374357e86fc46b9c2388a0d4a0d80a38cb6143ec1ddebb7972c4f6dd6e6c6ad96e0051e68daaa3e5d2a33f WHIRLPOOL 1cbbc4db7444464d1d9171e95b729513102ef34a4a7d18960f730c13e75c7788cd5288bc6015028e08f2e1b4f59ca5201f80eb7b27e5ac2fdf78ff856d281a48
@@ -62,4 +63,5 @@ EBUILD netbeans-9999_p20160303.ebuild 6939 SHA256 e2f34d201cfe2c1fa08e721254c4d2
 EBUILD netbeans-9999_p20160304.ebuild 6939 SHA256 218118ab7763417d107fe79074f5a7bd1ca99e8a373325981c4138bf60d594fd SHA512 4b4efb5df479ff97174c4b760099edf1403178cbfc571f4064fdc1cc39119a916446ee3cc555a67977082d68f3c01a82794828a8f7a884f91ff3fa0ded77fc8f WHIRLPOOL 975f796308eabb202ffe3954af345930c0e76cd1beced830a410d49f1353d6aea6b8617ecf051d1ca33ab38a5d613f6d25dcc48e8919a7b386fe48b1098de466
 EBUILD netbeans-9999_p20160305.ebuild 6939 SHA256 69a7351acb9f4f753f495fd3c3f7b9cb3cb384b91dfa8ca94f420b72c348f296 SHA512 a686a26693077c23bf896424f489caba46b1a53d36f973dc405a7a0a7fd91388468c318da740d083c4593e7dad846c9744e69257b4c2810b6004366b5517856e WHIRLPOOL 68e630d27dbc68a3219bef4b8819b86c81a348fad55ac07e7084f3c0a3e8a45f5b2c6c0d6b833d33adea33bc64270dde860857f6e162c261d3e0c8a0b5da0ebc
 EBUILD netbeans-9999_p20160306.ebuild 6939 SHA256 027d8fbdc821845b140e2209c1299fcbe12e1c76a82d5e5ad1982e1ed4b4fe30 SHA512 8936c1bf3b6af07290ce8e0d1029b57414f97cdf6f5a7fa8a18c79001c55f9c1f17be77df8468ad9cd14ad8ccc89a395b6962412f5cc8ec7d8a546dc6813db22 WHIRLPOOL df94942f14846b08901d82b8ea56b69fe1ae87b45cae4a535bd7fecf44bdb831569ada6f0da704215bd8a1737feb70244e00a34282e5142368d744a41a4f67ea
+EBUILD netbeans-9999_p20160307.ebuild 6939 SHA256 9f988dfcf478c609d5d98420cc69e9b4126256833afd8d8f41ba37ee6c28ece8 SHA512 467a74220e0cdc22612a7dda3a95016a35211f0e8230ce2b44b12667998f3254bd3181725d93a0fd8ef990cc40c09eb0997d87c56d7786b888edc41c739a46cd WHIRLPOOL 38cb0e35f75b7d3e5b443731faab3b90ee2cd15365494f3353a6e3d866a1ae18108f968ce362dd262dfdbf73ebe82a0049eab47c2c80f1f894ed252fe6b822de
 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834

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


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

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-ide/, dev-java/netbeans-webcommon/, ...
@ 2016-03-07  9:31 Miroslav Šulc
  0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2016-03-07  9:31 UTC (permalink / raw
  To: gentoo-commits

commit:     d27c89136376293edebedcbab5a5974035086c96
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  7 08:33:10 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Mar  7 08:33:10 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=d27c8913

netbeans: removed obsolete ebuilds

Package-Manager: portage-2.2.27

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 195e75e..2e60ef7 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232d1b71f43142523a79fd0627b569bde6039141810334c7bab27 SHA512 46ab55b9253c04ba2c807531b723a00eeac73af33d2dd0efca6c7db595aca0e0811725b37603148b82a59bb324bfa88f7de56cddd312b2ba2cf28db604fcff67 WHIRLPOOL 84775701a651db0b540ab9aa86835d44d81544ccd11879c189018fd781d73662b2411f8212d33754001fb4b598f784b74bfcef6819fd034683cbe624a697e7f3
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
 DIST netbeans-trunk-nightly-201602080002-src.zip 209611236 SHA256 4d951395dbf396fd41d43efb30f19b7482eccc19969c479d91576ab0bf7662f3 SHA512 2f4e76cb78bf06a6290e291a1663c2931e53d08abb56356eb3e4e6443eb79e2261e77caa10d6fef70e3f7c8cf7b9772e0036a58781a8e11c22503e76d70abfad WHIRLPOOL b063ead0d9beee28352e03e499d891efe4f06ba8c739576b253f825e7559e9f0f98951162e10be48da86c0c1b0432ea18fcace727a7bff34aa4e07bd2543b6bc
@@ -33,7 +32,6 @@ DIST netbeans-trunk-nightly-201603050002-src.zip 209877850 SHA256 63189967b00645
 DIST netbeans-trunk-nightly-201603060002-src.zip 209877850 SHA256 8626e8cefe8c5c2c65b0da44edef5148f85f9bbef39d7aea60baf2ec240b360d SHA512 0bef47e29211cec98b037361db3d6e5a513212f8761a2163430d74dd7f837f736de649416408966bf14344e68873a9dfabc5501ce83034a8c944193dbdc46ede WHIRLPOOL b6fc7291b14c66d546c9031e0fdef21900f284eec4aecd751e65c91efda33027da61174e3affb6420671e6822dd075de65802cc6798c3804078924c0b4a5b284
 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_p20160203.ebuild 3384 SHA256 22e7421d319eb975b86c9c848e9af668f7f7c70ffffaf7ea8596ba1ca6a06850 SHA512 bed277c8ff7f693bc834b38d80ba7f2d8aeca8917e38aae91a3dc45e2b5acab6237726eba1f4fc6e5fc95bf62f26df5778cdd44ad2eb724bb9b3dc294cf50470 WHIRLPOOL 157a2ce99f4ce71c4c9959eccab899affec8c890255d96780344568213c59aeb0c22a51afd38e4655af87689da384bd3e7be1b5a0aeaa7bc395f69eac41ce4fd
 EBUILD netbeans-apisupport-9999_p20160204.ebuild 3384 SHA256 62c662c5fee46e2f93f4ee0f49371575131b06f19015dff393b00ecd1d6e2e40 SHA512 0d132752086073ca18233c851f33bc26cfcdcd1a5f50bde71298ffd7fc8833f91e40bf945a6b9a1821ef3b54684a921a6b96022a4203ac7087d2fcb6a8f66841 WHIRLPOOL fab8805e9862cd70299d4a42cb016cab2680850a8b5da5d7751e69f1c5810151219e6b302b1771b72e46212dce07c71e6126578c908c16ed4882b45bfd1b4774
 EBUILD netbeans-apisupport-9999_p20160205.ebuild 3384 SHA256 227cb78f8576f57d6055844a25340ed07cd5e67764937868309951ecc71bef13 SHA512 c204dc4a248a337a30bb0600db6e4dba9a47f916c32c93f8cdafa1542dcb99df64b9b6f0a0a64d86a1d072e8d5f7effa321e6762da9cca7ad6a1e8ce0cba998e WHIRLPOOL fa35e801e8f77f614165d897a2bc93099e39e6b7a85f38151ca4e11bb0b3e232b31f59250f60e445439406e7af7ae16d51d47d21b455659cbb40fd8017ef11df
 EBUILD netbeans-apisupport-9999_p20160208.ebuild 3384 SHA256 1378de92b48edb8c503b2e7402542b57b5dcf5fad13f54824ba37ec4d360c69d SHA512 a51384567dc74108ebcdfc04b33367721088f6d176c67510856998d16577b63dff470b3aba0e00d80703d3115c59529102aa412da154465f2d97258af0aa84c1 WHIRLPOOL 68083e1b331a9f87c1e408214181d7494c786dfcac9a64076ee561854f3e90bd1cdc011bbc042b79cd8a561ac770b175733c5d4900b0d9e60b12291eef0e2888

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160203.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160203.ebuild
deleted file mode 100644
index e0063f5..0000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160203.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-03_00-02-15/zip/netbeans-trunk-nightly-201602030002-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 3e23b6e..6ce5baa 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -15,7 +15,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232d1b71f43142523a79fd0627b569bde6039141810334c7bab27 SHA512 46ab55b9253c04ba2c807531b723a00eeac73af33d2dd0efca6c7db595aca0e0811725b37603148b82a59bb324bfa88f7de56cddd312b2ba2cf28db604fcff67 WHIRLPOOL 84775701a651db0b540ab9aa86835d44d81544ccd11879c189018fd781d73662b2411f8212d33754001fb4b598f784b74bfcef6819fd034683cbe624a697e7f3
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
 DIST netbeans-trunk-nightly-201602080002-src.zip 209611236 SHA256 4d951395dbf396fd41d43efb30f19b7482eccc19969c479d91576ab0bf7662f3 SHA512 2f4e76cb78bf06a6290e291a1663c2931e53d08abb56356eb3e4e6443eb79e2261e77caa10d6fef70e3f7c8cf7b9772e0036a58781a8e11c22503e76d70abfad WHIRLPOOL b063ead0d9beee28352e03e499d891efe4f06ba8c739576b253f825e7559e9f0f98951162e10be48da86c0c1b0432ea18fcace727a7bff34aa4e07bd2543b6bc
@@ -45,7 +44,6 @@ DIST netbeans-trunk-nightly-201603050002-src.zip 209877850 SHA256 63189967b00645
 DIST netbeans-trunk-nightly-201603060002-src.zip 209877850 SHA256 8626e8cefe8c5c2c65b0da44edef5148f85f9bbef39d7aea60baf2ec240b360d SHA512 0bef47e29211cec98b037361db3d6e5a513212f8761a2163430d74dd7f837f736de649416408966bf14344e68873a9dfabc5501ce83034a8c944193dbdc46ede WHIRLPOOL b6fc7291b14c66d546c9031e0fdef21900f284eec4aecd751e65c91efda33027da61174e3affb6420671e6822dd075de65802cc6798c3804078924c0b4a5b284
 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_p20160203.ebuild 4790 SHA256 a84980c76aab918bdef5926a687529157108e0350053ff7454ea5e3cabf1772d SHA512 8468bec6196534c2d50a35aabb195e27eec9ecd5ce865ce7c00a6c1c6e807d2ee966acb9e7545687bc2020ab0bb466a9bb125301362ec8dcfa8f1a6b4f9fd67c WHIRLPOOL 7e748cdfc61bdf26932e1957e173b4937a27df173aaa3a5b328693c717e37e2a6d634493ea08982dba5699987543dbd6d98db16adf3784a08a6877f81d55347d
 EBUILD netbeans-cnd-9999_p20160204.ebuild 4790 SHA256 69f584edf1482f4cf4bc11d9b5177728340fd4e08acf28a0b2537124c655e77b SHA512 6a80766fcc07a8b7ff46d909d5d5a9f65407c7683366d7dfe0893dae92aaa1705d8f6edf23d08c29b09a5c585147151e0dc56fc86822f80fa008e3444942bf53 WHIRLPOOL 6ec5772493f0aac9ab26960ac948aee50f88b988f360716f49348640a654efc959a9361ad38a4e50f2e10a28e4ed2d854f0086af96d3672f73564ba6bc16562e
 EBUILD netbeans-cnd-9999_p20160205.ebuild 4790 SHA256 66dfeaeec56d6033f3103acdbe76672c406524d47262264654961e62befda5df SHA512 163713dee358566daa29c76d73626525d23750eed0965d07f3c0f0d828908b3c8a8123b3d9d143825e9a553d0bd71e24893b5efbcf162683b1cb3a3a4ff4a8d9 WHIRLPOOL cde5795c3b576971302a1cfc6ce26254be9f063acc093d2240bec6c7534cbe83d50a55c97cd190a88715892a04e03d23a0d3215fc2879db1911bab07a35a471c
 EBUILD netbeans-cnd-9999_p20160208.ebuild 4790 SHA256 10059c6d4e5eff0f93ba4e3b2a36540044316f6cf4dfd914962b4842d81fab33 SHA512 7b4b07a06249736c9fd42405b320a3dcbd2a93901a62b82102f10d6ccd8f62fc98b45009a437fb37edcc41800da7f45050c6fcf8460054827435d32937b3fee1 WHIRLPOOL 0353a46ccee672c4b7551ecca06cee74116c00c0d05295b09fcbebea97b1eb025f13d5fc3b7d186c15ef52f45338fdf3c3e9553fc5a5adaed501af61f5868afe

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160203.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160203.ebuild
deleted file mode 100644
index da3dfab..0000000
--- a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160203.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-03_00-02-15/zip/netbeans-trunk-nightly-201602030002-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/147687C3E91A8E448305A946A9D585F0DB544465-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}"/147687C3E91A8E448305A946A9D585F0DB544465-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 1cbece7..d7a3ef6 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232d1b71f43142523a79fd0627b569bde6039141810334c7bab27 SHA512 46ab55b9253c04ba2c807531b723a00eeac73af33d2dd0efca6c7db595aca0e0811725b37603148b82a59bb324bfa88f7de56cddd312b2ba2cf28db604fcff67 WHIRLPOOL 84775701a651db0b540ab9aa86835d44d81544ccd11879c189018fd781d73662b2411f8212d33754001fb4b598f784b74bfcef6819fd034683cbe624a697e7f3
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
 DIST netbeans-trunk-nightly-201602080002-src.zip 209611236 SHA256 4d951395dbf396fd41d43efb30f19b7482eccc19969c479d91576ab0bf7662f3 SHA512 2f4e76cb78bf06a6290e291a1663c2931e53d08abb56356eb3e4e6443eb79e2261e77caa10d6fef70e3f7c8cf7b9772e0036a58781a8e11c22503e76d70abfad WHIRLPOOL b063ead0d9beee28352e03e499d891efe4f06ba8c739576b253f825e7559e9f0f98951162e10be48da86c0c1b0432ea18fcace727a7bff34aa4e07bd2543b6bc
@@ -36,7 +35,6 @@ DIST netbeans-trunk-nightly-201603050002-src.zip 209877850 SHA256 63189967b00645
 DIST netbeans-trunk-nightly-201603060002-src.zip 209877850 SHA256 8626e8cefe8c5c2c65b0da44edef5148f85f9bbef39d7aea60baf2ec240b360d SHA512 0bef47e29211cec98b037361db3d6e5a513212f8761a2163430d74dd7f837f736de649416408966bf14344e68873a9dfabc5501ce83034a8c944193dbdc46ede WHIRLPOOL b6fc7291b14c66d546c9031e0fdef21900f284eec4aecd751e65c91efda33027da61174e3affb6420671e6822dd075de65802cc6798c3804078924c0b4a5b284
 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_p20160203.ebuild 2968 SHA256 271a111780f6f2d942fa13d0acaa55d5555958524ac0a36604980e6f291686f0 SHA512 1cbc553f71d7ce1fa9fce8b3a9fba90b4fe451d641cc8524a2f78de06a3ec59572ee8c9501edc8df0047c1c40eedce250e5e912d54bbdd57eeb55b5d3f04cccd WHIRLPOOL dab32fa280d1ffcc0823cf6775d34bf9d37cbccbf9997f009f4dcddffb6b5f2a7ab54f95da0d4ed3a3b966a7066af566eb9e96f9550ce84165b8e23b8372ef55
 EBUILD netbeans-dlight-9999_p20160204.ebuild 2968 SHA256 0a6627c5c04ce5b80ffb78b9d7741ea1244e0cba07ab2c965d6311629aea1f43 SHA512 32fa80ab23393f8cb7199e3107b9ea2f9d9e4e0f382ba41eafc9801866277f4a40e976c22e6df03bf9dd01611e8a8f066f5e0cf6b51ba6121e4c6036da1ae713 WHIRLPOOL 0cf3aedc58b7e91e776d6c72edae4ecdda368e37f9b499731bfe71c40b9828c04ae13ab24523401e0944f31296f9bc828a65a02f166ad0413e9b99a8c9715abb
 EBUILD netbeans-dlight-9999_p20160205.ebuild 2968 SHA256 4884bb61299b8a1aa0b6ff45036074a3f34241e509b60f0b89fd6ec7c4818cda SHA512 4b0e41751d2884e8fb8efd14292d7beee709734a146536f0c8260a5e70b315c5f97f0c2ae0fd5401f73d690fbf4b8628f4108cb3114fe1c58ee28f1326e9e1a9 WHIRLPOOL 0a7fa09bb0ee90d0760bf9016b79685ac3d5d1f7ab25d50c9f37e6df26c434a45c37bfd77ad3655032ae5bcff0f9d321e156dc0657bc03efad86c6cafbaf78ec
 EBUILD netbeans-dlight-9999_p20160208.ebuild 2968 SHA256 a243072b9f90966f865db8bd54e33b940a214aca22f62a22c38f444fa43bd6bf SHA512 7e1cfe66c395a0ef51dc11c0ff5f19edc81a73f71f864d299ecfa635ccd1705b7ef26888ecd8cd1be45058b3cf20c462040b6ee8e1c5dd0cdf1c2e8cba4690d1 WHIRLPOOL d768542cadfb5bb08267f9af1f200f00a65f3e9298bc343eeb94b8190e67a466674347119d48ace874d2415ad9488d0fd28f1bc8e091ceab262b8364bb7775f5

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160203.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160203.ebuild
deleted file mode 100644
index 3f4a3a4..0000000
--- a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160203.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-03_00-02-15/zip/netbeans-trunk-nightly-201602030002-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 7b7e84f..2579090 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -35,7 +35,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232d1b71f43142523a79fd0627b569bde6039141810334c7bab27 SHA512 46ab55b9253c04ba2c807531b723a00eeac73af33d2dd0efca6c7db595aca0e0811725b37603148b82a59bb324bfa88f7de56cddd312b2ba2cf28db604fcff67 WHIRLPOOL 84775701a651db0b540ab9aa86835d44d81544ccd11879c189018fd781d73662b2411f8212d33754001fb4b598f784b74bfcef6819fd034683cbe624a697e7f3
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
 DIST netbeans-trunk-nightly-201602080002-src.zip 209611236 SHA256 4d951395dbf396fd41d43efb30f19b7482eccc19969c479d91576ab0bf7662f3 SHA512 2f4e76cb78bf06a6290e291a1663c2931e53d08abb56356eb3e4e6443eb79e2261e77caa10d6fef70e3f7c8cf7b9772e0036a58781a8e11c22503e76d70abfad WHIRLPOOL b063ead0d9beee28352e03e499d891efe4f06ba8c739576b253f825e7559e9f0f98951162e10be48da86c0c1b0432ea18fcace727a7bff34aa4e07bd2543b6bc
@@ -65,7 +64,6 @@ DIST netbeans-trunk-nightly-201603050002-src.zip 209877850 SHA256 63189967b00645
 DIST netbeans-trunk-nightly-201603060002-src.zip 209877850 SHA256 8626e8cefe8c5c2c65b0da44edef5148f85f9bbef39d7aea60baf2ec240b360d SHA512 0bef47e29211cec98b037361db3d6e5a513212f8761a2163430d74dd7f837f736de649416408966bf14344e68873a9dfabc5501ce83034a8c944193dbdc46ede WHIRLPOOL b6fc7291b14c66d546c9031e0fdef21900f284eec4aecd751e65c91efda33027da61174e3affb6420671e6822dd075de65802cc6798c3804078924c0b4a5b284
 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_p20160203.ebuild 15825 SHA256 5af735a23461a6c42445554e7f71e30d4905ffb11b8d977bc8721da6006eafd6 SHA512 e53cf3ccecfca82558a2cbec469265cf2da610a8f292c37128099978d8a90db524d25c0548c03b4d2885a56e868d82bac16c6b02a04d8ce5db05562972baf3c5 WHIRLPOOL 2a25c2e3e22f43004589ceb111b4a9ba13e816213d431c99643e4e5c05021d08f7753a803bd8d4a39c1b93a96e67c0899d51acbac6c56e19ae46a246a5c40693
 EBUILD netbeans-enterprise-9999_p20160204.ebuild 15825 SHA256 23a9b0bfcd6b28c1b37d0426ec09f19b9934ac44a69c1d4da75ccca5fc25351c SHA512 993ade5e5d3f5d5f75356362738b48c94a4c0f065b4a8c3001a0bdc53f753108ed8faf35bff8d27eec279420db7dcadf7b08ff01b24ee2b8e46802fe9d85cca6 WHIRLPOOL 475091111c581f06ac4e5e4f9749c0b5b01f8de287c1e9ae1a3166d8fb6269985ed93dede057d2f013a707583fb2f7c603cb038c0fdf991c94b934e8a06b1e60
 EBUILD netbeans-enterprise-9999_p20160205.ebuild 15825 SHA256 d056da86e6bf4b8339f195903582640a5c304ab389ef73f317c85360067a77ef SHA512 da045a906c28619065c10f99fe94103535aff5fda023f29fb6cc02a4d2bf10d133f4ddb4f89f146b2cafc93d07a9637bba1354fea7d809af647f296ee9103b85 WHIRLPOOL 38d3c05e1734f375698276e0ff9868f84a1d12b79307329b308af9eee9b5f99bcd92baab4dff91b218a73ba84c7e26c1c179900b18e5537c8c7a7ff017817c39
 EBUILD netbeans-enterprise-9999_p20160208.ebuild 15825 SHA256 ef9d6adb1c161dc79a20bdbb356a772fab2dcfc45728c5b71cb504fcf744fd7f SHA512 ac89c0d915587de9777d6755a94aaf358cad3489f00e92c47eb4afb1113b9e73d4179f8180c142ce5b6ff1637b3c74137d33ce6a9a6d141fdc31368367162724 WHIRLPOOL 4735d8a7814825d6cd9476859c3b19c6f7a021d4b4cf566b7a1b49d4abdae4527d9d50e1521b199fa5e62db7bde55395154ee8d96e4aa4a5472555f6d3c0ec77

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160203.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160203.ebuild
deleted file mode 100644
index cebb58b..0000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160203.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-03_00-02-15/zip/netbeans-trunk-nightly-201602030002-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 7aab444..1abd024 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232d1b71f43142523a79fd0627b569bde6039141810334c7bab27 SHA512 46ab55b9253c04ba2c807531b723a00eeac73af33d2dd0efca6c7db595aca0e0811725b37603148b82a59bb324bfa88f7de56cddd312b2ba2cf28db604fcff67 WHIRLPOOL 84775701a651db0b540ab9aa86835d44d81544ccd11879c189018fd781d73662b2411f8212d33754001fb4b598f784b74bfcef6819fd034683cbe624a697e7f3
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
 DIST netbeans-trunk-nightly-201602080002-src.zip 209611236 SHA256 4d951395dbf396fd41d43efb30f19b7482eccc19969c479d91576ab0bf7662f3 SHA512 2f4e76cb78bf06a6290e291a1663c2931e53d08abb56356eb3e4e6443eb79e2261e77caa10d6fef70e3f7c8cf7b9772e0036a58781a8e11c22503e76d70abfad WHIRLPOOL b063ead0d9beee28352e03e499d891efe4f06ba8c739576b253f825e7559e9f0f98951162e10be48da86c0c1b0432ea18fcace727a7bff34aa4e07bd2543b6bc
@@ -33,7 +32,6 @@ DIST netbeans-trunk-nightly-201603050002-src.zip 209877850 SHA256 63189967b00645
 DIST netbeans-trunk-nightly-201603060002-src.zip 209877850 SHA256 8626e8cefe8c5c2c65b0da44edef5148f85f9bbef39d7aea60baf2ec240b360d SHA512 0bef47e29211cec98b037361db3d6e5a513212f8761a2163430d74dd7f837f736de649416408966bf14344e68873a9dfabc5501ce83034a8c944193dbdc46ede WHIRLPOOL b6fc7291b14c66d546c9031e0fdef21900f284eec4aecd751e65c91efda33027da61174e3affb6420671e6822dd075de65802cc6798c3804078924c0b4a5b284
 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_p20160203.ebuild 2913 SHA256 4882eb60280bd7fa5c0fa602ac1196ef78e9b64253e9c052ca5204de2e38fcb0 SHA512 a966390d5ba253a3c67dceb20e9b142319e83dcf2f352cff45a7bb35af04e4df85a4d926241c72c08bf12b236d2823258e36c5bdd101fd1233f97028687fb8a5 WHIRLPOOL bab60fcf209d6daa93cc11150d56396cb18d1867fc351a0b5f940d9a521e4fc1a094d063d17c151497df6aabe084c37c9237b8c93b44da6502987fe16a8ccfab
 EBUILD netbeans-ergonomics-9999_p20160204.ebuild 2913 SHA256 36cbc3ac545d5851d512a733bdb2d6fad919aac006ca7b4b54119962049b5751 SHA512 ee48db487dbda967f3a06aec98496c7164a8ba8c4a66b4ed1f904a91d086490a232de55f5e83893b0b7bc5cbd8f4fdf4b7bdf5cf300344f229dcef636170da01 WHIRLPOOL 32954110b0447df394b67a9be29ef20576f1a7bcf9518e6a6b0aba8b7aed846573e925ce87f2410ced7f79de6f6f9daa68b92159f427cf4c29cba229e0a0f453
 EBUILD netbeans-ergonomics-9999_p20160205.ebuild 2913 SHA256 fa3959db858909e6eaca5df59bd146f2e3aedc8767b88f75350f27ce917605e1 SHA512 c726714a18301fe7be7c2470f10e3084c7cb952f3feb052afbab2faa3cd00315694e1da717d78e6d94757be48c0da4166bac1db01aa8a560c0f60a17229e466d WHIRLPOOL 5dd3ce235b39454e9b0d4cf0a76f4178c178ad4a1fde56cfb901cb2a8739b85b2dbc836a88733c16bbdc27e96985e88039851a7519c144adbceef434a9c87157
 EBUILD netbeans-ergonomics-9999_p20160208.ebuild 2913 SHA256 a79d254239bc61531f33cb08878440482ceb9dd1c5296061430cf16f6e290d1e SHA512 128cab4b6d825c6f68824b6e058c5fb4f043b3acbb8c9106698c22698bc8f4b85ec18cdb624fc30b01972250a7ed3f429e39f85bacef5f2a8454657ed363132f WHIRLPOOL 6f42f2812e4a72f4ae2d2751c1dd3924e57eeefb79650ed1e2d4fa8965be7fa248fc7102a119eb7f91b68774da873c2196769ff55e32715756da51b0b7ddb68d

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160203.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160203.ebuild
deleted file mode 100644
index 99d1fb0..0000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160203.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-03_00-02-15/zip/netbeans-trunk-nightly-201602030002-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 9f73538..12d7b15 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -5,7 +5,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232d1b71f43142523a79fd0627b569bde6039141810334c7bab27 SHA512 46ab55b9253c04ba2c807531b723a00eeac73af33d2dd0efca6c7db595aca0e0811725b37603148b82a59bb324bfa88f7de56cddd312b2ba2cf28db604fcff67 WHIRLPOOL 84775701a651db0b540ab9aa86835d44d81544ccd11879c189018fd781d73662b2411f8212d33754001fb4b598f784b74bfcef6819fd034683cbe624a697e7f3
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
 DIST netbeans-trunk-nightly-201602080002-src.zip 209611236 SHA256 4d951395dbf396fd41d43efb30f19b7482eccc19969c479d91576ab0bf7662f3 SHA512 2f4e76cb78bf06a6290e291a1663c2931e53d08abb56356eb3e4e6443eb79e2261e77caa10d6fef70e3f7c8cf7b9772e0036a58781a8e11c22503e76d70abfad WHIRLPOOL b063ead0d9beee28352e03e499d891efe4f06ba8c739576b253f825e7559e9f0f98951162e10be48da86c0c1b0432ea18fcace727a7bff34aa4e07bd2543b6bc
@@ -35,7 +34,6 @@ DIST netbeans-trunk-nightly-201603050002-src.zip 209877850 SHA256 63189967b00645
 DIST netbeans-trunk-nightly-201603060002-src.zip 209877850 SHA256 8626e8cefe8c5c2c65b0da44edef5148f85f9bbef39d7aea60baf2ec240b360d SHA512 0bef47e29211cec98b037361db3d6e5a513212f8761a2163430d74dd7f837f736de649416408966bf14344e68873a9dfabc5501ce83034a8c944193dbdc46ede WHIRLPOOL b6fc7291b14c66d546c9031e0fdef21900f284eec4aecd751e65c91efda33027da61174e3affb6420671e6822dd075de65802cc6798c3804078924c0b4a5b284
 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_p20160203.ebuild 3377 SHA256 2e4af3d79f8fe001b6f96a6eaf90baeeab1abd682f6e9ccc119601b3f40bcfd4 SHA512 3776dce886242cc3e55b263baebe58cd5e596f94d71d37dc9b0d656b9432caa69c8d4c4b8670613f54b21e85dff9445f106116a39572989a796d84c9628c6b8d WHIRLPOOL 02986f5db041f67f9f1e21daf45ea7022ac210a185b69833a7e4d3782d80db80cef1d292bc68589c3670911fe83cfe027732415abba18da06ea64baa3c40c212
 EBUILD netbeans-extide-9999_p20160204.ebuild 3377 SHA256 08b7349b773d4a3a02dc209c7ab34a38a9150e158e552fbbd1c3fe2bac561c21 SHA512 f995df55c0fb48fb3fc0c36ca531d98a34dd3ceef836ad049d5b6f56864c73a2087536eff61d4c9856513f9e52a9e789c0de41eea38b9efa83fe3812ff5a574c WHIRLPOOL 55f7829c1c344444a71198bda3594390812fc3d910cf38297aeac819b04add79c7b46b2ca9179274872d9886dfabf1eef5932557ec8da47089346758c21e3fbb
 EBUILD netbeans-extide-9999_p20160205.ebuild 3377 SHA256 aef9f0e2166fc9fddb900349108b6f738215a6f0e2f512b8ec3b6a241a574134 SHA512 579e2f6cd3ebecf9136256ef5325059d1f0cf6461cc776cca55c519e46dfa61f0ee309874453e72da899b8cf00d1334ef4fa20e025716ab4c75074430b0d4cc5 WHIRLPOOL d4f2cf5cf7f5f5cc5ef1f278d1597efcee2ce40977295abe791978b30898a0feebc009397d6a81d9383e5400d508ce7dfb22d33ee45d4a725a1a7ae156bac29f
 EBUILD netbeans-extide-9999_p20160208.ebuild 3377 SHA256 e68b21ab89a817687343cd977b2592bbca641ec8a023ff4dd8d0c1915c96173d SHA512 fdcb86a0ced309c433019dd799cc58f8d085a7f4dbf831fb7312967c217f7aa181d92c6297d7a7d36b9102b2a1d0afbe2aa6d03f5b1a7173281c54341127523a WHIRLPOOL 34c8c50a0185a50f454534161f2d833122fb801e283057f2df634638e6a4374377bc08f88fb00be27a9d4e939b9b300082b67ffa5f816d5b726a0c190703b6ea

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160203.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160203.ebuild
deleted file mode 100644
index 84e925c..0000000
--- a/dev-java/netbeans-extide/netbeans-extide-9999_p20160203.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-03_00-02-15/zip/netbeans-trunk-nightly-201602030002-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 f85663c..ce5bf82 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -5,7 +5,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232d1b71f43142523a79fd0627b569bde6039141810334c7bab27 SHA512 46ab55b9253c04ba2c807531b723a00eeac73af33d2dd0efca6c7db595aca0e0811725b37603148b82a59bb324bfa88f7de56cddd312b2ba2cf28db604fcff67 WHIRLPOOL 84775701a651db0b540ab9aa86835d44d81544ccd11879c189018fd781d73662b2411f8212d33754001fb4b598f784b74bfcef6819fd034683cbe624a697e7f3
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
 DIST netbeans-trunk-nightly-201602080002-src.zip 209611236 SHA256 4d951395dbf396fd41d43efb30f19b7482eccc19969c479d91576ab0bf7662f3 SHA512 2f4e76cb78bf06a6290e291a1663c2931e53d08abb56356eb3e4e6443eb79e2261e77caa10d6fef70e3f7c8cf7b9772e0036a58781a8e11c22503e76d70abfad WHIRLPOOL b063ead0d9beee28352e03e499d891efe4f06ba8c739576b253f825e7559e9f0f98951162e10be48da86c0c1b0432ea18fcace727a7bff34aa4e07bd2543b6bc
@@ -35,7 +34,6 @@ DIST netbeans-trunk-nightly-201603050002-src.zip 209877850 SHA256 63189967b00645
 DIST netbeans-trunk-nightly-201603060002-src.zip 209877850 SHA256 8626e8cefe8c5c2c65b0da44edef5148f85f9bbef39d7aea60baf2ec240b360d SHA512 0bef47e29211cec98b037361db3d6e5a513212f8761a2163430d74dd7f837f736de649416408966bf14344e68873a9dfabc5501ce83034a8c944193dbdc46ede WHIRLPOOL b6fc7291b14c66d546c9031e0fdef21900f284eec4aecd751e65c91efda33027da61174e3affb6420671e6822dd075de65802cc6798c3804078924c0b4a5b284
 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_p20160203.ebuild 3416 SHA256 cbf5d747825772663fbaf4ee474ff1d90cc1531651080430f6c26a183e271607 SHA512 123e7639f80bb364710a264de4560454ebe524fde01899fff4ec84a12bdef6b0e02b2ecf2eec66381127f03b0572f2fc846e0b5f77ab1a5b5763f599a5f509ef WHIRLPOOL e2819e23c7ac314ccc695e3b38d732e57bb104854f479f740af0f1006d4721728c99870a17b1e019f00a37bbedcfa45fd89c6ef5d8bf3a789f6b1d46af8903ac
 EBUILD netbeans-groovy-9999_p20160204.ebuild 3416 SHA256 56e8dfc4347210e20fd127b70c0ec318d034c386f29f5a11126002c95045c272 SHA512 a6366e27ebf0de777a69bb2acd52f7f16c49c34741f77e08a84666e1fbb90412feb70655ddfbb86744266356ba705afdc8e430e46d007f6eec9d50ffe33a321a WHIRLPOOL a19ae714d1415cfa17f344da200c08ac504a32c0e29e21380b0e7a6c5060fbd38ac17a7391b23c6a99486470ab7478c7c24766fedd7307197235c868f7c6adf2
 EBUILD netbeans-groovy-9999_p20160205.ebuild 3416 SHA256 9d7347fc6afdb39776b3a443aee5070b9c07577deaa18f81d883e46b499e6b30 SHA512 274f84204561f44c3ac9d292f31e4132fd8ffebc30e5bb0be9815ff4e336f1aecd046e65afbec2bd9a008d6b173f45c5402d8550262457ad3418c4c5b9a96740 WHIRLPOOL 623024680dfbf3fa8c9bd5736e132519dcac063b0a9c624c51debde79212f1f0a17bb323cca72008d5370528e0be77f9ce757a3924d7d30021854395ace9c5a4
 EBUILD netbeans-groovy-9999_p20160208.ebuild 3416 SHA256 191162afb5a236fbc34384cbd62e32c22c8a7ce93f6adf2423914e9a33742d6c SHA512 9cd17fee4b0fae482f8c8f89adef20131209a8dfdcc8ef89f67bc21640cdf09c60b07b85706216c48706f03a7e2f6395d8c7b5eee2388f59d759d46c5bfc2c43 WHIRLPOOL afde310148332fd647b924287692b4b0d7e0dd348df8ad478bf26f127206351e0eac09b8688c9c096bfd4075204e4df0527b6cf4b98f4049692ccb7150b52f10

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160203.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160203.ebuild
deleted file mode 100644
index c200c25..0000000
--- a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160203.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-03_00-02-15/zip/netbeans-trunk-nightly-201602030002-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 87dec4e..395a9a6 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -8,7 +8,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232d1b71f43142523a79fd0627b569bde6039141810334c7bab27 SHA512 46ab55b9253c04ba2c807531b723a00eeac73af33d2dd0efca6c7db595aca0e0811725b37603148b82a59bb324bfa88f7de56cddd312b2ba2cf28db604fcff67 WHIRLPOOL 84775701a651db0b540ab9aa86835d44d81544ccd11879c189018fd781d73662b2411f8212d33754001fb4b598f784b74bfcef6819fd034683cbe624a697e7f3
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
 DIST netbeans-trunk-nightly-201602080002-src.zip 209611236 SHA256 4d951395dbf396fd41d43efb30f19b7482eccc19969c479d91576ab0bf7662f3 SHA512 2f4e76cb78bf06a6290e291a1663c2931e53d08abb56356eb3e4e6443eb79e2261e77caa10d6fef70e3f7c8cf7b9772e0036a58781a8e11c22503e76d70abfad WHIRLPOOL b063ead0d9beee28352e03e499d891efe4f06ba8c739576b253f825e7559e9f0f98951162e10be48da86c0c1b0432ea18fcace727a7bff34aa4e07bd2543b6bc
@@ -38,7 +37,6 @@ DIST netbeans-trunk-nightly-201603050002-src.zip 209877850 SHA256 63189967b00645
 DIST netbeans-trunk-nightly-201603060002-src.zip 209877850 SHA256 8626e8cefe8c5c2c65b0da44edef5148f85f9bbef39d7aea60baf2ec240b360d SHA512 0bef47e29211cec98b037361db3d6e5a513212f8761a2163430d74dd7f837f736de649416408966bf14344e68873a9dfabc5501ce83034a8c944193dbdc46ede WHIRLPOOL b6fc7291b14c66d546c9031e0fdef21900f284eec4aecd751e65c91efda33027da61174e3affb6420671e6822dd075de65802cc6798c3804078924c0b4a5b284
 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_p20160203.ebuild 4126 SHA256 c01600cf3c56cb0adc6830e3156ce6e20776c6d0053bd76f2965eae9746f4675 SHA512 0651f8321aafd51f7f08b4b345c90e5e90c7f1d49931dad6533b5541c847923ed6ea0fadd0722e978189bc878821097959f6f418b15a7f7908342ef47d069208 WHIRLPOOL 37030fddce70dbdbb926eb58848eb2c0e4b5c7da72db40092836e46d3713c83dd1b5c5afa14187ddeb8354e58e984b4534dff9c66b2ae777329e3bc53f6d3660
 EBUILD netbeans-harness-9999_p20160204.ebuild 4126 SHA256 d52552c9a50a8cf824bd434a115f32221de25ae243a2f8943dd2039a105a3e1b SHA512 51dfd9bef54d4b2a7f52439ccd48c7ebd883890fe5a3f05e63f0a064d56d3d4e50f4c6ca1ce9be2e610f6e20a22cf880f958f6295e0324b511c5f9b62a30b7a6 WHIRLPOOL a95192e40581f8ce5b1a7a9f7d5fbeb38c9b720e025936e506842745c265e9e269133b633e3e70fe61ee11a4ed46a7ebf13dc6aa439af082ec9cf88ba1a35dd5
 EBUILD netbeans-harness-9999_p20160205.ebuild 4126 SHA256 67987e11ba6903fd362367b1413e7d8162f64d67553de9fc67533364aa5b901b SHA512 97bf210ab201fe4e6d17669d791becaa87ae07b83be9d38766557bbe842a4c789331d6203d295163267c24620d2ac0e6a6f068c2fde3dacc88b6ad3610fb30fe WHIRLPOOL fc9d8916e2c262400b36d3d3e9b7f2375a5a28d6fc096219a5f8212335f16f6510cda2e850aa8413d4793a93b62fb25b192206c9bf1a20ea5a565ff680e3fc80
 EBUILD netbeans-harness-9999_p20160208.ebuild 4126 SHA256 71caeda56f3e314a9eb9a39ec372bf22163189a539644d59fdabaae4b87d6b32 SHA512 61b0f748003e7023c4d41e2249c2527c93e54d1f2f7821be6617b95192b80590d958265fdc74cc52153098a1e6331b7abbb46b9ca40e084a2ec356f1f589037e WHIRLPOOL 48bceb1128918aa2d8c5cc19d4c157183fe714270f93fdaa75db75890a0ca195dc9a2347c3c550dfd43e142f1920ea38149feeb88e2b32bb823727fbad656b07

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160203.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160203.ebuild
deleted file mode 100644
index eb07b7a..0000000
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20160203.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-03_00-02-15/zip/netbeans-trunk-nightly-201602030002-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 3bcacdf..387ad95 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -135,7 +135,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232d1b71f43142523a79fd0627b569bde6039141810334c7bab27 SHA512 46ab55b9253c04ba2c807531b723a00eeac73af33d2dd0efca6c7db595aca0e0811725b37603148b82a59bb324bfa88f7de56cddd312b2ba2cf28db604fcff67 WHIRLPOOL 84775701a651db0b540ab9aa86835d44d81544ccd11879c189018fd781d73662b2411f8212d33754001fb4b598f784b74bfcef6819fd034683cbe624a697e7f3
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
 DIST netbeans-trunk-nightly-201602080002-src.zip 209611236 SHA256 4d951395dbf396fd41d43efb30f19b7482eccc19969c479d91576ab0bf7662f3 SHA512 2f4e76cb78bf06a6290e291a1663c2931e53d08abb56356eb3e4e6443eb79e2261e77caa10d6fef70e3f7c8cf7b9772e0036a58781a8e11c22503e76d70abfad WHIRLPOOL b063ead0d9beee28352e03e499d891efe4f06ba8c739576b253f825e7559e9f0f98951162e10be48da86c0c1b0432ea18fcace727a7bff34aa4e07bd2543b6bc
@@ -165,7 +164,6 @@ DIST netbeans-trunk-nightly-201603050002-src.zip 209877850 SHA256 63189967b00645
 DIST netbeans-trunk-nightly-201603060002-src.zip 209877850 SHA256 8626e8cefe8c5c2c65b0da44edef5148f85f9bbef39d7aea60baf2ec240b360d SHA512 0bef47e29211cec98b037361db3d6e5a513212f8761a2163430d74dd7f837f736de649416408966bf14344e68873a9dfabc5501ce83034a8c944193dbdc46ede WHIRLPOOL b6fc7291b14c66d546c9031e0fdef21900f284eec4aecd751e65c91efda33027da61174e3affb6420671e6822dd075de65802cc6798c3804078924c0b4a5b284
 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_p20160203.ebuild 30238 SHA256 45b6e65b641ef76bd673f34d1805fa1ad3554b0290bd0e773e7319e268715c5d SHA512 70f1c1b72b75e91972c5537e1d3ed402e92402adf8793890b65f4f520513547dae5ebc8d634dc737d1d033d2951d91ada003d3a0e520e72eb7d4f36891dc79e2 WHIRLPOOL 6d5f2c8a46fe2b6e27c29e91f59b54d7402aa8ef4c94ff3626125f6091cb18469f975fa9ffb178020c8091838491df7c636c3777d9f0bced093437e035cc8dc6
 EBUILD netbeans-ide-9999_p20160204.ebuild 30238 SHA256 d27a4bed3dbfef8d93a530d582314901236639dc84d055a46b2d00264a184d0b SHA512 4f19ba1e45c50ee40de6f77f5d6dc0ce6764fce0a425e52c4596c082a731bad7a76b77d31982c0fd5d5a78ef72691a6314c496f9eb7bfbfd8e161185f9c8d489 WHIRLPOOL e2e03dd0dc0790a80610721e38f684fc14fc106f7dda66b61df602af54fcc2455ef659c1d8db1a02fc73ffae0196f201b807a4c87c44afe819d7b44db83798c5
 EBUILD netbeans-ide-9999_p20160205.ebuild 30238 SHA256 c206f70f1e8766eeaa00088a9986fdab567c990703db987633d9ea2e94bb6a58 SHA512 3869ac5ddceae25d1da5aeaa8003276b7e9f3bf50abdb714c4f1d4bdef777becac3cacd5238d3c6518e308b172101336955b1f0829f032a943f07cfa365de562 WHIRLPOOL f7ad1b1e3d9fd264aeaf3d40f36e16d0cb9cc17ff4214cdce2199bd5c833f64bf0654b7035021e1d2f5a5a0317603f571d84ec04b9e04ccac0862f404bdc0467
 EBUILD netbeans-ide-9999_p20160208.ebuild 30238 SHA256 85100d877859f47db65ea5961af679a32608def41a8c5237c090c4d1de4361fd SHA512 6f65dab1ddf19e5b9303ac141a4f8e10cb4f054defdade85e7288a840bf929704bf0f54f4999c0aa88a9fac33908c4e94cdaa3d762e601be3fc4f54a9702b9fa WHIRLPOOL 0409884fa587d8ea6737d51e2526e2cb9e3752068410256239067eac90297f7c63b69b50573f79d74b9f1d1be3e1ab226e4f5987850f5fbb1615365862d7e5a1

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160203.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160203.ebuild
deleted file mode 100644
index 4b63893..0000000
--- a/dev-java/netbeans-ide/netbeans-ide-9999_p20160203.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-03_00-02-15/zip/netbeans-trunk-nightly-201602030002-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:4.4
-	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-4.4 icu4j.jar icu4j-4_4_2.jar
-	java-pkg_jar-from --into html.validation/external iso-relax isorelax.jar isorelax.jar
-	java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
-	java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
-	java-pkg_jar-from --into libs.commons_compress/external commons-compress commons-compress.jar commons-compress-1.8.1.jar
-	# java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.19.jar
-	java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
-	java-pkg_jar-from --into libs.lucene/external lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
-	java-pkg_jar-from --into libs.smack/external smack-2.2 smack.jar smack.jar
-	java-pkg_jar-from --into libs.smack/external smack-2.2 smackx.jar smackx.jar
-	# java-pkg_jar-from --into libs.svnClientAdapter.javahl/external subversion svn-javahl.jar svnjavahl-1.8.4.jar
-	java-pkg_jar-from --into libs.xerces/external xerces-2 xercesImpl.jar xerces-2.8.0.jar
-	java-pkg_jar-from --build-only --into o.apache.commons.codec/external commons-codec commons-codec.jar apache-commons-codec-1.3.jar
-	java-pkg_jar-from --into o.apache.commons.httpclient/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.1.jar
-	java-pkg_jar-from --into o.apache.commons.logging/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
-	java-pkg_jar-from --into o.apache.ws.commons.util/external ws-commons-util ws-commons-util.jar ws-commons-util-1.0.1.jar
-	java-pkg_jar-from --into servletapi/external tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
-	java-pkg_jar-from --into xml.jaxb.api/external sun-jaf activation.jar activation.jar
-	java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_1.0_api.jar
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	unset DISPLAY
-	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
-}
-
-src_install() {
-	pushd nbbuild/netbeans/ide >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/ide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	rm -fr "${D}"/${INSTALL_DIR}/bin/nativeexecution || die
-	rm -fr "${D}"/${INSTALL_DIR}/modules/lib || die
-
-	insinto ${INSTALL_DIR}/bin/nativeexecution
-	doins bin/nativeexecution/*
-
-	pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution >/dev/null || die
-	for file in *.sh ; do
-		fperms 755 ${file}
-	done
-	popd >/dev/null || die
-
-	if use x86 ; then
-		doins -r bin/nativeexecution/Linux-x86
-		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86 >/dev/null || die
-		for file in * ; do
-			fperms 755 ${file}
-		done
-		popd >/dev/null || die
-	elif use amd64 ; then
-		doins -r bin/nativeexecution/Linux-x86_64
-		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86_64 >/dev/null || die
-		for file in * ; do
-			fperms 755 ${file}
-		done
-		popd >/dev/null || die
-	fi
-
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules
-	pushd "${instdir}" >/dev/null || die
-	rm com-jcraft-jsch.jar && java-pkg_jar-from --into "${instdir}" jsch jsch.jar com-jcraft-jsch.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext
-	pushd "${instdir}" >/dev/null || die
-	rm commons-compress-1.8.1.jar && java-pkg_jar-from --into "${instdir}" commons-compress commons-compress.jar commons-compress-1.8.1.jar
-	# rm freemarker-2.3.19.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.19.jar || die
-	rm icu4j-4_4_2.jar && java-pkg_jar-from --into "${instdir}" icu4j-4.4 icu4j.jar icu4j-4_4_2.jar
-	rm isorelax.jar && java-pkg_jar-from --into "${instdir}" iso-relax isorelax.jar
-	rm json-simple-1.1.1.jar && java-pkg_jar-from --into "${instdir}" json-simple json-simple.jar json-simple-1.1.1.jar
-	rm jvyamlb-0.2.7.jar && java-pkg_jar-from --into "${instdir}" jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
-	rm log4j-1.2.15.jar && java-pkg_jar-from --into "${instdir}" log4j log4j.jar log4j-1.2.15.jar
-	rm lucene-core-3.5.0.jar && java-pkg_jar-from --into "${instdir}" lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
-	rm mysql-connector-java-5.1.23-bin.jar && java-pkg_jar-from --into "${instdir}" jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
-	rm postgresql-9.2-1002.jdbc4.jar && java-pkg_jar-from --into "${instdir}" jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
-	rm saxon9B.jar && java-pkg_jar-from --into "${instdir}" saxon-9 saxon.jar saxon9B.jar
-	rm servlet-2.2.jar && java-pkg_jar-from --into "${instdir}" tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
-	rm smack.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smack.jar
-	rm smackx.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smackx.jar
-	# rm svnjavahl.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl.jar || die
-	rm xerces-2.8.0.jar && java-pkg_jar-from --into "${instdir}" xerces-2 xercesImpl.jar xerces-2.8.0.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb
-	pushd "${instdir}" >/dev/null || die
-	rm activation.jar && java-pkg_jar-from --into "${instdir}" sun-jaf activation.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb/api
-	pushd "${instdir}" >/dev/null || die
-	rm jsr173_1.0_api.jar && java-pkg_jar-from --into "${instdir}" jsr173 jsr173.jar jsr173_1.0_api.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ide
-}

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index b993b53..a7aa198 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -32,7 +32,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232d1b71f43142523a79fd0627b569bde6039141810334c7bab27 SHA512 46ab55b9253c04ba2c807531b723a00eeac73af33d2dd0efca6c7db595aca0e0811725b37603148b82a59bb324bfa88f7de56cddd312b2ba2cf28db604fcff67 WHIRLPOOL 84775701a651db0b540ab9aa86835d44d81544ccd11879c189018fd781d73662b2411f8212d33754001fb4b598f784b74bfcef6819fd034683cbe624a697e7f3
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
 DIST netbeans-trunk-nightly-201602080002-src.zip 209611236 SHA256 4d951395dbf396fd41d43efb30f19b7482eccc19969c479d91576ab0bf7662f3 SHA512 2f4e76cb78bf06a6290e291a1663c2931e53d08abb56356eb3e4e6443eb79e2261e77caa10d6fef70e3f7c8cf7b9772e0036a58781a8e11c22503e76d70abfad WHIRLPOOL b063ead0d9beee28352e03e499d891efe4f06ba8c739576b253f825e7559e9f0f98951162e10be48da86c0c1b0432ea18fcace727a7bff34aa4e07bd2543b6bc
@@ -62,7 +61,6 @@ DIST netbeans-trunk-nightly-201603050002-src.zip 209877850 SHA256 63189967b00645
 DIST netbeans-trunk-nightly-201603060002-src.zip 209877850 SHA256 8626e8cefe8c5c2c65b0da44edef5148f85f9bbef39d7aea60baf2ec240b360d SHA512 0bef47e29211cec98b037361db3d6e5a513212f8761a2163430d74dd7f837f736de649416408966bf14344e68873a9dfabc5501ce83034a8c944193dbdc46ede WHIRLPOOL b6fc7291b14c66d546c9031e0fdef21900f284eec4aecd751e65c91efda33027da61174e3affb6420671e6822dd075de65802cc6798c3804078924c0b4a5b284
 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_p20160203.ebuild 14930 SHA256 2f751c07b663c0413bd8c1f3a81443dd0e5ffba79f50a7821563492b1cbc4321 SHA512 01b81f9d6c983e70ffdb749b194faae839e14eae49a6954bcf6a660cab6c910f37e2b3a1efe8e7ed3d9d02971fd7521922f7859116527912cbe8b23ff9b01ddf WHIRLPOOL ce6b3e5ea24ce1084a77eb0624ea20fa9f837ce39743f9b259cb25c1456ac94f6f235a0249d3480403ee3d6404adbe14d8a5d105848c77dbb48f2ddfc411ce8f
 EBUILD netbeans-java-9999_p20160204.ebuild 14930 SHA256 087db72f622177dc8a775716e84fa5d1038f1d9be443461da6432f73629b34e3 SHA512 99345436338e6908d4b28f84fc58145138ce610b89be902db4f45bcaf492bd7bd580136f5dd8b06862082159d9d56c36fc3fdfc7f1a76b37aa3f3c9c7992c241 WHIRLPOOL 681fe5156562e15bc046ee0df5f5a322726584a8f6bc7e0ea07e489815a38f8a36a2f8e95fbb4b9552510ab88f3cedcab4bf2504546df594ff79b8cfae16638d
 EBUILD netbeans-java-9999_p20160205.ebuild 14930 SHA256 0af7972d562fe4a577e2fdaa94fd5b28a03de7818d2970faf10c0850972b9c0e SHA512 c31fe56634dfa103a6b5c8e2098a767e9dcc09817ed4f1a76fe0870bfff17602f8f38188ad25434cf6426a3596c8e902f506ea3cfa18979dd7700058ecb1f668 WHIRLPOOL 63b55dc0dc06c709093199375c9faa0724ec8f63f2e15ee75eceb89390de3a2afd9e6cc694731a0142f19cd7ab491a9e503adfd6a93fbdb466a72ed9b7e00aa8
 EBUILD netbeans-java-9999_p20160208.ebuild 14930 SHA256 f73dfeebd9f397a4f083d5a562489a945382ef3323338ef8b87dfce83247e13e SHA512 24c44bba612715f27f2c66aaf2aa87f6613e96af0b8314bd7883a59a631d1667af35e3188342865e351e42a4e1c73e04a0fec1b840d86bd9fdd09a81e472d6f4 WHIRLPOOL bac5d1f1fac2518faa38b0190f1c6497005733f1ed209ebe03f7cbe74da284f4e8979321f921ff8920c43a454e7e39401c32054f18ef4ff197d4c162f4448d43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160203.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160203.ebuild
deleted file mode 100644
index 78fb00a..0000000
--- a/dev-java/netbeans-java/netbeans-java-9999_p20160203.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-03_00-02-15/zip/netbeans-trunk-nightly-201602030002-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 c8ad979..580f5b5 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232d1b71f43142523a79fd0627b569bde6039141810334c7bab27 SHA512 46ab55b9253c04ba2c807531b723a00eeac73af33d2dd0efca6c7db595aca0e0811725b37603148b82a59bb324bfa88f7de56cddd312b2ba2cf28db604fcff67 WHIRLPOOL 84775701a651db0b540ab9aa86835d44d81544ccd11879c189018fd781d73662b2411f8212d33754001fb4b598f784b74bfcef6819fd034683cbe624a697e7f3
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
 DIST netbeans-trunk-nightly-201602080002-src.zip 209611236 SHA256 4d951395dbf396fd41d43efb30f19b7482eccc19969c479d91576ab0bf7662f3 SHA512 2f4e76cb78bf06a6290e291a1663c2931e53d08abb56356eb3e4e6443eb79e2261e77caa10d6fef70e3f7c8cf7b9772e0036a58781a8e11c22503e76d70abfad WHIRLPOOL b063ead0d9beee28352e03e499d891efe4f06ba8c739576b253f825e7559e9f0f98951162e10be48da86c0c1b0432ea18fcace727a7bff34aa4e07bd2543b6bc
@@ -36,7 +35,6 @@ DIST netbeans-trunk-nightly-201603050002-src.zip 209877850 SHA256 63189967b00645
 DIST netbeans-trunk-nightly-201603060002-src.zip 209877850 SHA256 8626e8cefe8c5c2c65b0da44edef5148f85f9bbef39d7aea60baf2ec240b360d SHA512 0bef47e29211cec98b037361db3d6e5a513212f8761a2163430d74dd7f837f736de649416408966bf14344e68873a9dfabc5501ce83034a8c944193dbdc46ede WHIRLPOOL b6fc7291b14c66d546c9031e0fdef21900f284eec4aecd751e65c91efda33027da61174e3affb6420671e6822dd075de65802cc6798c3804078924c0b4a5b284
 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_p20160203.ebuild 4971 SHA256 bcd39258455539171c15ced281e943708c02d0a4dc113de3440dc5a678e763b0 SHA512 2b95b6d11330d9dd25fc59c157bae775064606bc47a8f62d9c4c69fd21567f22a7800d66c09987761b8717839cf86c4bb56b3a07658f6496156efeb2519c29de WHIRLPOOL 1141ff929866cd1475404330adef2dffb83b76ceeae1917e2ff811dc4901617f9a264e63100350207eb38a8d4a8c5794e65166fb623655372d5b06cfd1584d8e
 EBUILD netbeans-javacard-9999_p20160204.ebuild 4971 SHA256 e1456bc550d560b86475e36e9828ad514c26848f646caf1b289c6e90cd10bbe6 SHA512 3df9fe2a5bfa51365bfcc63739eeea92742d1e22f3e9d3e65f65e086556a5670a12663411dc4e0e25f093d41ca40e0613b82bea81407215fddb3132e8229dc14 WHIRLPOOL 65ebe30b488ed04a64fa46668e0fee0fa464e1f04a64d2fbf8ff7c894bb8c12f20ef944707c5752c7a76b5d024f7008e20c8771336b75182502748b54d0a7bec
 EBUILD netbeans-javacard-9999_p20160205.ebuild 4971 SHA256 6c6c30c7d203125e21477e30fa6fbf9b79d832b49e322f9a2faebe0297666268 SHA512 0440d86b49615938c745e6699cc54c96c8a97978663b9a20a703455a06a83ce70c08ee1aba8dc171c68827c887a9e1b04307bd2087619bd63cc63cc2de59660f WHIRLPOOL ff793d42d36dba2c4aa9c3e1aaf737d6d9b660dc7ab4294bb4d21d23396ad7f55297dd689192b2d2c59a22c71295ecaa2cee7eddb19043c7a888623369720a17
 EBUILD netbeans-javacard-9999_p20160208.ebuild 4971 SHA256 5384618d023f6931d445bbf0b0e6c2cde68db26e51a285aa1b546bf90b82b4de SHA512 6a4282938dd96ef529dc2c2a4be6f510647069a42b088bf8f6974643599ed4b2eebcabce81fd858b4fc5444b4635ed76e0be504486986084d5dd1a0e6a47fc40 WHIRLPOOL 6a9eca53bace424f19202745890ad95b27926112d7b8f23781c8e54bc99a976a0906d83e74d1a549844ef936ba75d1e5f17d53192d9e0aec12f704f39269a649

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160203.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160203.ebuild
deleted file mode 100644
index a94aad5..0000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160203.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-03_00-02-15/zip/netbeans-trunk-nightly-201602030002-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 c55c57a..eee6a23 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -4,7 +4,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232d1b71f43142523a79fd0627b569bde6039141810334c7bab27 SHA512 46ab55b9253c04ba2c807531b723a00eeac73af33d2dd0efca6c7db595aca0e0811725b37603148b82a59bb324bfa88f7de56cddd312b2ba2cf28db604fcff67 WHIRLPOOL 84775701a651db0b540ab9aa86835d44d81544ccd11879c189018fd781d73662b2411f8212d33754001fb4b598f784b74bfcef6819fd034683cbe624a697e7f3
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
 DIST netbeans-trunk-nightly-201602080002-src.zip 209611236 SHA256 4d951395dbf396fd41d43efb30f19b7482eccc19969c479d91576ab0bf7662f3 SHA512 2f4e76cb78bf06a6290e291a1663c2931e53d08abb56356eb3e4e6443eb79e2261e77caa10d6fef70e3f7c8cf7b9772e0036a58781a8e11c22503e76d70abfad WHIRLPOOL b063ead0d9beee28352e03e499d891efe4f06ba8c739576b253f825e7559e9f0f98951162e10be48da86c0c1b0432ea18fcace727a7bff34aa4e07bd2543b6bc
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201603050002-src.zip 209877850 SHA256 63189967b00645
 DIST netbeans-trunk-nightly-201603060002-src.zip 209877850 SHA256 8626e8cefe8c5c2c65b0da44edef5148f85f9bbef39d7aea60baf2ec240b360d SHA512 0bef47e29211cec98b037361db3d6e5a513212f8761a2163430d74dd7f837f736de649416408966bf14344e68873a9dfabc5501ce83034a8c944193dbdc46ede WHIRLPOOL b6fc7291b14c66d546c9031e0fdef21900f284eec4aecd751e65c91efda33027da61174e3affb6420671e6822dd075de65802cc6798c3804078924c0b4a5b284
 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_p20160203.ebuild 6293 SHA256 5c9c707695f13b739a022caf52bd313246b62bba71a9a8d77247106c2da40d85 SHA512 e8220e09efcbe51e97b8ec0163a979dac46e2c60fd34c6e3c23782d6d3d75fcc5fdb20286a25e1680494a995c5672d1e006068f2ed92b11294bb1c3a2b42dd4a WHIRLPOOL f7a01c6c640ffbc8ef7560cce2fab88b6ddb0d723df06b5f2164e4c3993ea2e9d2c00b35402249db474199bf86d210553e648c956fa826b4bd06595ef999e53f
 EBUILD netbeans-javadoc-9999_p20160204.ebuild 6293 SHA256 52b4fe09eeb978ea56c21a8921093118399adbff4f14b89ff910fc29ff96ded7 SHA512 ae629ad596d30fba7300eee3da34ba9117173186ef1be78c2e5f50787e001c61259b5b6c275adf24cf95f79081a62125f2182085b68a28207eb88dfadb6565dc WHIRLPOOL 841ecbc5bb4c3c2b6605ea1acf3292edd16edaa0f18ccc52388439c7e5e111dfa3b3d3e9e4aab8e9f04516f88d42873b768a0db507126d2301e7766dd24c14c5
 EBUILD netbeans-javadoc-9999_p20160205.ebuild 6293 SHA256 524444c5d9d3de298d018328bbc7ab3bcd7cdce01bc1e9f5e8f14729dbdd283b SHA512 ff115dd944b1d7a921eb982e52bd99bbc09ab8b145000911650f37d9e34a2ea016f6fd3e8a2967ebe974730a71c61ec919d118cc29aa94acf34372007526baea WHIRLPOOL aafd7942d991de417f86fd98f17e5f85aaa3ab9eb9a51b7412d8d354d58a881aa1ab91bb70432fd5b62ad0fe9c16300ea34aeb4d83cf96685ac12d70b44dddff
 EBUILD netbeans-javadoc-9999_p20160208.ebuild 6293 SHA256 9766a3ab1f9e131bd504fff7859182658b2ef769b47fc89b6f1b0a9b3655c483 SHA512 fee974fd22553d42e183ead0db8e850ed004eee8fa3e35fe1806a92d14a90b837775b17a2c7cee3a9d51afb9bf06a3ca9d1903c3161d876dcc4ef5fa53a678d7 WHIRLPOOL 35eca8fab57b1860a08c983bf96b812760c3b6e5e80ab524436f92f00f34118a380dd692d0940ba6714e5ab71f652e689ac6ad3929f99a2a40ae9465b25124d4

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160203.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160203.ebuild
deleted file mode 100644
index 6f11385..0000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160203.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-03_00-02-15/zip/netbeans-trunk-nightly-201602030002-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 24b5b85..ac4f64a 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -11,7 +11,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232d1b71f43142523a79fd0627b569bde6039141810334c7bab27 SHA512 46ab55b9253c04ba2c807531b723a00eeac73af33d2dd0efca6c7db595aca0e0811725b37603148b82a59bb324bfa88f7de56cddd312b2ba2cf28db604fcff67 WHIRLPOOL 84775701a651db0b540ab9aa86835d44d81544ccd11879c189018fd781d73662b2411f8212d33754001fb4b598f784b74bfcef6819fd034683cbe624a697e7f3
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
 DIST netbeans-trunk-nightly-201602080002-src.zip 209611236 SHA256 4d951395dbf396fd41d43efb30f19b7482eccc19969c479d91576ab0bf7662f3 SHA512 2f4e76cb78bf06a6290e291a1663c2931e53d08abb56356eb3e4e6443eb79e2261e77caa10d6fef70e3f7c8cf7b9772e0036a58781a8e11c22503e76d70abfad WHIRLPOOL b063ead0d9beee28352e03e499d891efe4f06ba8c739576b253f825e7559e9f0f98951162e10be48da86c0c1b0432ea18fcace727a7bff34aa4e07bd2543b6bc
@@ -41,7 +40,6 @@ DIST netbeans-trunk-nightly-201603050002-src.zip 209877850 SHA256 63189967b00645
 DIST netbeans-trunk-nightly-201603060002-src.zip 209877850 SHA256 8626e8cefe8c5c2c65b0da44edef5148f85f9bbef39d7aea60baf2ec240b360d SHA512 0bef47e29211cec98b037361db3d6e5a513212f8761a2163430d74dd7f837f736de649416408966bf14344e68873a9dfabc5501ce83034a8c944193dbdc46ede WHIRLPOOL b6fc7291b14c66d546c9031e0fdef21900f284eec4aecd751e65c91efda33027da61174e3affb6420671e6822dd075de65802cc6798c3804078924c0b4a5b284
 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_p20160203.ebuild 4717 SHA256 a2e1b09dd033d29cd5819c422f7d3f75e3be1733c7db4534f2ddf5d69ce0304f SHA512 4436846211cacbed77b0b4ebc73533e4f3124ea980919e4e6cc6d0b9bf8a8c88950ebec5ae1f43f3591959ad565d10801341ed4e7164f7327c507624228a1534 WHIRLPOOL 2e3dbd52cdbcde1e8d457b9a28b607189b96f401b6bf17938ab557383949d2903e475b82580ed92753d6e0453e063aa956865a0249d49f9b5a9e1cadf0373db9
 EBUILD netbeans-javafx-9999_p20160204.ebuild 4717 SHA256 37886081275fe7a67ee945f372547b5f8ec1f7055421fe3438cac315291a7480 SHA512 20c6002ebb34f3fc4e97f799dd4cd04f87dbf30a031f8b6ee68edd7ed3f14eeaa52d8955d66b1bda5f969d26b7ec159a20a492939d66d3da0abc57af6afc383a WHIRLPOOL 9f773764ae4d3691e1541b48a72fe2d8eab257f8b5bef7524bf07ff2b131622c8d45beac9d4f966bbdc6dfcbf9615836f4f1c1098763e40a5b90b3d69dd7e8ba
 EBUILD netbeans-javafx-9999_p20160205.ebuild 4717 SHA256 925e5ced9c1b99722db087e36b54f8e24869e36cabdf7b59cdc9e52b319b0b68 SHA512 fa045b63c7225d4c0df7837c26cb94acea5eb2cb2e1ee1e97a4ad52a19f03610cd10002c714bd2798029b59bd970813ac42f852b24f157fdbc50a9dbe3e09084 WHIRLPOOL 622c806dc1e4e9e17e6e8d71a826ac53f4b8129acaad286eb5b678480dd1b2636417a9d632fb62379d12f1ff538aa32fb019035dc2e061df391b782c8c6d1c9a
 EBUILD netbeans-javafx-9999_p20160208.ebuild 4717 SHA256 715393e87f8cc90fb576d958dd8602f0a5b0e061fdc0640700799f910386a74b SHA512 66e78494f98154ee7f28d8880fc0fa00791fb3135372dafa622d08564da666235f86bd92b8b3045351093660a3ec9f46fd2617a5bb15cff8754293d4c7155bd8 WHIRLPOOL 2ffbd014733f9c9f8b1ddd37932025e44c4bda7136bff8df8260b66d73120b2e2f2b8b2410672c8ae2238d82f6f2060aaa43734b1f886cafbddeaebf3f8c18ce

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160203.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160203.ebuild
deleted file mode 100644
index b6687ba..0000000
--- a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160203.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-03_00-02-15/zip/netbeans-trunk-nightly-201602030002-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 ca28e31..c545f74 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232d1b71f43142523a79fd0627b569bde6039141810334c7bab27 SHA512 46ab55b9253c04ba2c807531b723a00eeac73af33d2dd0efca6c7db595aca0e0811725b37603148b82a59bb324bfa88f7de56cddd312b2ba2cf28db604fcff67 WHIRLPOOL 84775701a651db0b540ab9aa86835d44d81544ccd11879c189018fd781d73662b2411f8212d33754001fb4b598f784b74bfcef6819fd034683cbe624a697e7f3
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
 DIST netbeans-trunk-nightly-201602080002-src.zip 209611236 SHA256 4d951395dbf396fd41d43efb30f19b7482eccc19969c479d91576ab0bf7662f3 SHA512 2f4e76cb78bf06a6290e291a1663c2931e53d08abb56356eb3e4e6443eb79e2261e77caa10d6fef70e3f7c8cf7b9772e0036a58781a8e11c22503e76d70abfad WHIRLPOOL b063ead0d9beee28352e03e499d891efe4f06ba8c739576b253f825e7559e9f0f98951162e10be48da86c0c1b0432ea18fcace727a7bff34aa4e07bd2543b6bc
@@ -33,7 +32,6 @@ DIST netbeans-trunk-nightly-201603050002-src.zip 209877850 SHA256 63189967b00645
 DIST netbeans-trunk-nightly-201603060002-src.zip 209877850 SHA256 8626e8cefe8c5c2c65b0da44edef5148f85f9bbef39d7aea60baf2ec240b360d SHA512 0bef47e29211cec98b037361db3d6e5a513212f8761a2163430d74dd7f837f736de649416408966bf14344e68873a9dfabc5501ce83034a8c944193dbdc46ede WHIRLPOOL b6fc7291b14c66d546c9031e0fdef21900f284eec4aecd751e65c91efda33027da61174e3affb6420671e6822dd075de65802cc6798c3804078924c0b4a5b284
 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_p20160203.ebuild 4412 SHA256 91d25a672c7301c9879e9d6f4ad2bccabe9f0c0d8004f013d344e5472a116bb4 SHA512 5eb22d769ee79dfdb2b79523b113c5028fe1726b8e209040df714a9e5962b5e649e58aad3593bcbeddd13cef112a3d3fa65f0c67f5ad40e96c453635ffb3897c WHIRLPOOL 49be135a04d786894b0f5424b37bf14a43d8c3aab9a62197f0fff99961dc8e15a6a51db9293e64b2df4cb2ba613cba6b6edf6938961f572e5b5e22a657dc94a3
 EBUILD netbeans-mobility-9999_p20160204.ebuild 4412 SHA256 77b7056f05a10b097a438114c85eaef6fed8fdb329885e37e214b0117cbe0806 SHA512 cc80379c048335fb6dda529802bbe4f204659e286c287c0bd8419853b07362498c83a09e8c49ad311bc8fd943c1afa9d35fa09b2c88ec6f076a2fe6f23faa6b0 WHIRLPOOL 2cb88c599d212f830ca675ee3940628eb0bc77e581201cde2403f9fae5a96608400f166ff883888ff35b9abab673e71fa273e2cad02cdeb0268984a589a0e71c
 EBUILD netbeans-mobility-9999_p20160205.ebuild 4412 SHA256 f63defac13d101fb6671ca3d69c0d5973be294e439b1d8f842e93af3e499f7eb SHA512 2ad416b000612dc0df79e71be2fa21f232488388dfd0dc64fc1565bc44de4678b2561b4fd817a0cf503070b02e1d0487ee2ce8d03a443b94127a536af4f3c112 WHIRLPOOL ca9422df53aa9dad6bedf89789191e23bc31a2c776c803cae82526a774fc59d927c6d1e54962cd8fbbe5f3692c9865031cf97ea007c6fa94c8bbfcb536abe616
 EBUILD netbeans-mobility-9999_p20160208.ebuild 4412 SHA256 c81cf96d97641b2b1a8b6c30f008643316957c84bdc7020b7bc0b4789843d92d SHA512 72839ef2359c89389154d40b9cb5b307702287dc36e9aa0c51a70d11bd5a7d0d6d5d09a3816346f982148ac5d91de563cbbbb840bd2af0a377236a9f5e49bc79 WHIRLPOOL 86ed205a76ee831f3285793b9a2e6267542b903a372f8af1d4dc5308b278b01536e790ca91c488c08c2454ce589798ca6cc67a7b0397566a5bd534d4c953feee

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160203.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160203.ebuild
deleted file mode 100644
index ed5f040..0000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160203.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-03_00-02-15/zip/netbeans-trunk-nightly-201602030002-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 a045251..8779b94 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232d1b71f43142523a79fd0627b569bde6039141810334c7bab27 SHA512 46ab55b9253c04ba2c807531b723a00eeac73af33d2dd0efca6c7db595aca0e0811725b37603148b82a59bb324bfa88f7de56cddd312b2ba2cf28db604fcff67 WHIRLPOOL 84775701a651db0b540ab9aa86835d44d81544ccd11879c189018fd781d73662b2411f8212d33754001fb4b598f784b74bfcef6819fd034683cbe624a697e7f3
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
 DIST netbeans-trunk-nightly-201602080002-src.zip 209611236 SHA256 4d951395dbf396fd41d43efb30f19b7482eccc19969c479d91576ab0bf7662f3 SHA512 2f4e76cb78bf06a6290e291a1663c2931e53d08abb56356eb3e4e6443eb79e2261e77caa10d6fef70e3f7c8cf7b9772e0036a58781a8e11c22503e76d70abfad WHIRLPOOL b063ead0d9beee28352e03e499d891efe4f06ba8c739576b253f825e7559e9f0f98951162e10be48da86c0c1b0432ea18fcace727a7bff34aa4e07bd2543b6bc
@@ -36,7 +35,6 @@ DIST netbeans-trunk-nightly-201603050002-src.zip 209877850 SHA256 63189967b00645
 DIST netbeans-trunk-nightly-201603060002-src.zip 209877850 SHA256 8626e8cefe8c5c2c65b0da44edef5148f85f9bbef39d7aea60baf2ec240b360d SHA512 0bef47e29211cec98b037361db3d6e5a513212f8761a2163430d74dd7f837f736de649416408966bf14344e68873a9dfabc5501ce83034a8c944193dbdc46ede WHIRLPOOL b6fc7291b14c66d546c9031e0fdef21900f284eec4aecd751e65c91efda33027da61174e3affb6420671e6822dd075de65802cc6798c3804078924c0b4a5b284
 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_p20160203.ebuild 4111 SHA256 ac504e5220f34cf0a0bbcfe9664ecdb9365e8f8724cc3c3c43fd4e9365bccb35 SHA512 0cc068ec1ac64b15622d946828a7fd1e13d28f6070dddd57fe5dc96a9553d3b5e42972b2c86934bf2c1f529ee1db6086bc04980bd462b8162451dd75c2c54ff2 WHIRLPOOL 804df7a65d55067e56903b4ac52a5fd488fab28be84d6c4367df53a5c38e88ec05b67082bff15c8809f389b1cb6ab194068fd31c626ed0df0878e88ef5d5824c
 EBUILD netbeans-nb-9999_p20160204.ebuild 4111 SHA256 05c1b57b99f8e6f3bc8532bde6a08f5311ec9015abaee1a7f93e79fbcabbbc6d SHA512 d1cc225dd1418e2f3efb4cded2b61081f785f90e35405537931ce9c8a6e37ee834fd8a584494d0e5d9d330a07942253cc6fab158c9bcaed98b0b54fd00949c1c WHIRLPOOL ba349e4b640b7f3143a480a6eca2338b8d1496fb3d23b56d7382dcaa358273cdba548938db69df2020827bf5e91c89201aee88108acdfb518e137cd54839e91a
 EBUILD netbeans-nb-9999_p20160205.ebuild 4111 SHA256 5448fe4d43a7c61f8c509ab56c240187151fe739e63c1210135e22778dd6c005 SHA512 36abaa95fa2accef66329874edb5c3316f0ae163ca8c590472916f909fd340e184a57bc201303e8081f797ccb04d4490b42a860cda2c4bea5a45cd92c0addaf4 WHIRLPOOL ed228b80c89746c3b6991e7e9ed3eee5a5ffcc0473cae9b96bf72f5955256d6bb76c874fa7360f916ac0a0cbcb28ddc58356d6498422b38178bb7b4bc6dbe6d3
 EBUILD netbeans-nb-9999_p20160208.ebuild 4111 SHA256 f50152ab9a2b57e7d48633aeabb4a49150c98f9afaee19191162672e4513ffd1 SHA512 46a5ab59d7a2489014968c3c79d66a22a4909d30642fe868c7ed381300f3b43bb7ecca4c6c85ee4f8d2244fe68b5f9948a36f642e325c76223c9c256703069bf WHIRLPOOL 346bce19ca96a093666de5c64417805f15c3c75a10b4bb209d389685a54c8526f631024f6d3c9de8681aa2e977135a6aba17b91dae064d2378cb33701aa67bec

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160203.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160203.ebuild
deleted file mode 100644
index 507638e..0000000
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20160203.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-03_00-02-15/zip/netbeans-trunk-nightly-201602030002-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 c0101b8..ae4682d 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -7,7 +7,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232d1b71f43142523a79fd0627b569bde6039141810334c7bab27 SHA512 46ab55b9253c04ba2c807531b723a00eeac73af33d2dd0efca6c7db595aca0e0811725b37603148b82a59bb324bfa88f7de56cddd312b2ba2cf28db604fcff67 WHIRLPOOL 84775701a651db0b540ab9aa86835d44d81544ccd11879c189018fd781d73662b2411f8212d33754001fb4b598f784b74bfcef6819fd034683cbe624a697e7f3
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
 DIST netbeans-trunk-nightly-201602080002-src.zip 209611236 SHA256 4d951395dbf396fd41d43efb30f19b7482eccc19969c479d91576ab0bf7662f3 SHA512 2f4e76cb78bf06a6290e291a1663c2931e53d08abb56356eb3e4e6443eb79e2261e77caa10d6fef70e3f7c8cf7b9772e0036a58781a8e11c22503e76d70abfad WHIRLPOOL b063ead0d9beee28352e03e499d891efe4f06ba8c739576b253f825e7559e9f0f98951162e10be48da86c0c1b0432ea18fcace727a7bff34aa4e07bd2543b6bc
@@ -37,7 +36,6 @@ DIST netbeans-trunk-nightly-201603050002-src.zip 209877850 SHA256 63189967b00645
 DIST netbeans-trunk-nightly-201603060002-src.zip 209877850 SHA256 8626e8cefe8c5c2c65b0da44edef5148f85f9bbef39d7aea60baf2ec240b360d SHA512 0bef47e29211cec98b037361db3d6e5a513212f8761a2163430d74dd7f837f736de649416408966bf14344e68873a9dfabc5501ce83034a8c944193dbdc46ede WHIRLPOOL b6fc7291b14c66d546c9031e0fdef21900f284eec4aecd751e65c91efda33027da61174e3affb6420671e6822dd075de65802cc6798c3804078924c0b4a5b284
 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_p20160203.ebuild 4418 SHA256 263569ba2d7f4c6cb6ff6fcc0d61f5fd511c63fad70f0a7ed35524aa144ba091 SHA512 9a0414bf34ac26a9cf35d93b9aeb3622ac979f12d814565ba8b7ba62a75d5accfc27ecab025c3372ad0ec950eee29dd5d6563598984e4134180539f49176d918 WHIRLPOOL cb746d95abee9cad2408c91b0254b879356acb48c0e18eae85063448040943d7b3cab7d26217fb66e6152ecef75badd396fe74d9490af3318db6bf1660d18e6a
 EBUILD netbeans-php-9999_p20160204.ebuild 4418 SHA256 0ef6bb16c8c4d3e68601323a1e6749a028451deb5bcdc8ad78685f1412378ea8 SHA512 e4205c41422a475f7b20f90ffdf16bf852069315ac7d6539bfe696b0098cc5a2217c364bf67540e251da9445424df5aa34e0ea669e8eba89182042652e422801 WHIRLPOOL 27eab580350f55a8cdf8e3676b098e2a7ed803a3d4493a5b177955492e44e113a619b709c58c8e0eb990193eb1bd7aba5182b5b0e2cdf9bd07ca2e637de81797
 EBUILD netbeans-php-9999_p20160205.ebuild 4418 SHA256 1a88747c9e59a86c3b732cff619c97e442732c5c88f1090eb8811cc59a6ed320 SHA512 260867fec559ae1e8d12ff75413c6b4b107401244aa1e82d67e6a28312618eed2e4587b7f0a71aa7557918478be2c55bdf69e0940e350b7eaf2cad934f5d675b WHIRLPOOL f56e11da5937abec3fa3a0c0e643dba101f8c896bd5c95fb54dcb466c4e2f9b2d7e6387ea0efca807210e3f49fc3a89f5e176b5d0ef5ab39de9782b0c106baf9
 EBUILD netbeans-php-9999_p20160208.ebuild 4418 SHA256 2cc00a3df6e981411323aa3cd289600b7e44afc14ca0e9a5cf869cfe4d1d75f2 SHA512 576529ed5945d720b23b123c13dce8940edea877f5e1c79e08b629f46ebc681fba5d3bf6bdfce732c8f1acc6b4545c927134f15f26fb65a6fa8244faeb1d7837 WHIRLPOOL 82c83c19e40704364e0f3fe90280b0fa42b973612d47c06afebc56766ee311c83395ac8543aa4acfdb2041d3453f8460cd37bddb7765e09ee6573b6c6c9900e3

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160203.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160203.ebuild
deleted file mode 100644
index 7a94173..0000000
--- a/dev-java/netbeans-php/netbeans-php-9999_p20160203.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-03_00-02-15/zip/netbeans-trunk-nightly-201602030002-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 87d5b4f..1b59380 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -20,7 +20,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232d1b71f43142523a79fd0627b569bde6039141810334c7bab27 SHA512 46ab55b9253c04ba2c807531b723a00eeac73af33d2dd0efca6c7db595aca0e0811725b37603148b82a59bb324bfa88f7de56cddd312b2ba2cf28db604fcff67 WHIRLPOOL 84775701a651db0b540ab9aa86835d44d81544ccd11879c189018fd781d73662b2411f8212d33754001fb4b598f784b74bfcef6819fd034683cbe624a697e7f3
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
 DIST netbeans-trunk-nightly-201602080002-src.zip 209611236 SHA256 4d951395dbf396fd41d43efb30f19b7482eccc19969c479d91576ab0bf7662f3 SHA512 2f4e76cb78bf06a6290e291a1663c2931e53d08abb56356eb3e4e6443eb79e2261e77caa10d6fef70e3f7c8cf7b9772e0036a58781a8e11c22503e76d70abfad WHIRLPOOL b063ead0d9beee28352e03e499d891efe4f06ba8c739576b253f825e7559e9f0f98951162e10be48da86c0c1b0432ea18fcace727a7bff34aa4e07bd2543b6bc
@@ -50,7 +49,6 @@ DIST netbeans-trunk-nightly-201603050002-src.zip 209877850 SHA256 63189967b00645
 DIST netbeans-trunk-nightly-201603060002-src.zip 209877850 SHA256 8626e8cefe8c5c2c65b0da44edef5148f85f9bbef39d7aea60baf2ec240b360d SHA512 0bef47e29211cec98b037361db3d6e5a513212f8761a2163430d74dd7f837f736de649416408966bf14344e68873a9dfabc5501ce83034a8c944193dbdc46ede WHIRLPOOL b6fc7291b14c66d546c9031e0fdef21900f284eec4aecd751e65c91efda33027da61174e3affb6420671e6822dd075de65802cc6798c3804078924c0b4a5b284
 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_p20160203.ebuild 9360 SHA256 454751cf761337f1f6aec2efcc643e95f8e7dd7c317b2ecad4de6e40ae388d06 SHA512 718dd3c5cec70fb9c1dcd0fca014b6066812b8be27e351848ae1bfe95db09793144ed99e5dd0f8e47c427e14d4a96ebe879288d7155ff98546a8b87160a0241d WHIRLPOOL c5676bfaab4d35f4511e401a46f981bde4660ac655bd8bed6654bebb5856c8306b63ad7322710c6f0bf58a5c54aeebb18d334d9a9c35304a89e11b341f3beb1d
 EBUILD netbeans-platform-9999_p20160204.ebuild 9360 SHA256 9164a33bb78f0a410d068e1d200eb383be996a01b65da993d66c5702e059e9a7 SHA512 ad43c41337764ecc4dfb0f043fe95eecb0e3d8494ce16f2c425ff96a483047d531f892d5aa8819aa0fab1d8f2c3c13a87611ac7210e363875227ed2404c44d49 WHIRLPOOL fb5d959de8ef000ff60ebbbbe4e7dc2a9d4989fe94afd8b01f02bc202822cdcfd53c5802fda21b456f3b6350bccbede6e56fc3ce5f7427ebba961aa4b9529d3d
 EBUILD netbeans-platform-9999_p20160205.ebuild 9360 SHA256 16f8e4d4f71957e7b815ad84e7fc296018d8e0599429aa1113e565d1e275cc5c SHA512 5ec7cd25348b4205a3d55d2c056d02f78ca139a26b8b3151626b26ff30480cc8069389b5544225279a300dc3442af7ee207f88cba26f1cf9bdedf17e65b3e30f WHIRLPOOL 05a6f8452eaa7f7c33247a539f752c0d4988501212bf5c2314491031c6f289b026c505ba6433b9a53b8414c53775cbcc1772df4994dd5f60c984271adc7383fd
 EBUILD netbeans-platform-9999_p20160208.ebuild 9360 SHA256 46aca5c07ea8f0ac91eeba9e69d487d9e7e2ce15361559a217cbd8293adbf82f SHA512 d4c44b8a6d62be833a643a9ef08adfff13d3dd8ea4f2c9029b42838de2de24d6a6f29d1992b91231f81ea4aca142776d4a0e10449bb004d0b80290916e42d740 WHIRLPOOL 7f6d12052c93dcd19d71426b9479ea8530c84eb522268960465966df87d38d983b0850909c33b3f923c63d737d877ba58cbc37cd6662363b68f5e4605d9ee0d8

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160203.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160203.ebuild
deleted file mode 100644
index 87014cd..0000000
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20160203.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-03_00-02-15/zip/netbeans-trunk-nightly-201602030002-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 7678b02..a6a45a3 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232d1b71f43142523a79fd0627b569bde6039141810334c7bab27 SHA512 46ab55b9253c04ba2c807531b723a00eeac73af33d2dd0efca6c7db595aca0e0811725b37603148b82a59bb324bfa88f7de56cddd312b2ba2cf28db604fcff67 WHIRLPOOL 84775701a651db0b540ab9aa86835d44d81544ccd11879c189018fd781d73662b2411f8212d33754001fb4b598f784b74bfcef6819fd034683cbe624a697e7f3
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
 DIST netbeans-trunk-nightly-201602080002-src.zip 209611236 SHA256 4d951395dbf396fd41d43efb30f19b7482eccc19969c479d91576ab0bf7662f3 SHA512 2f4e76cb78bf06a6290e291a1663c2931e53d08abb56356eb3e4e6443eb79e2261e77caa10d6fef70e3f7c8cf7b9772e0036a58781a8e11c22503e76d70abfad WHIRLPOOL b063ead0d9beee28352e03e499d891efe4f06ba8c739576b253f825e7559e9f0f98951162e10be48da86c0c1b0432ea18fcace727a7bff34aa4e07bd2543b6bc
@@ -33,7 +32,6 @@ DIST netbeans-trunk-nightly-201603050002-src.zip 209877850 SHA256 63189967b00645
 DIST netbeans-trunk-nightly-201603060002-src.zip 209877850 SHA256 8626e8cefe8c5c2c65b0da44edef5148f85f9bbef39d7aea60baf2ec240b360d SHA512 0bef47e29211cec98b037361db3d6e5a513212f8761a2163430d74dd7f837f736de649416408966bf14344e68873a9dfabc5501ce83034a8c944193dbdc46ede WHIRLPOOL b6fc7291b14c66d546c9031e0fdef21900f284eec4aecd751e65c91efda33027da61174e3affb6420671e6822dd075de65802cc6798c3804078924c0b4a5b284
 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_p20160203.ebuild 3472 SHA256 c1bfca18ca82904b70eb27a91f0f175adb78ca98e8f2b65ea4caf42ea08d8c32 SHA512 2c8a9b99a0ae795d744946c5b687743f74b68eda0c7ccbfbaace37cbc4df443943e60b6fa2697b7c4d45ca17a9200fb4420307e895b32b9026d8b7fc2f9eeb07 WHIRLPOOL 6d723463b8349db5ec8ddc14cf51c9772c7544dac451fb2b52a8cf1664dbc199a694bd5e9522e26fc9d3e3ff5bb99b0cdea6dcf5040f4883b690a5e5bfadd637
 EBUILD netbeans-profiler-9999_p20160204.ebuild 3472 SHA256 83bc4d60299d042ae913b6d824ff74f05de6f371bedc0acb3fc98323ef2333a5 SHA512 b08cc9b67e7bff6bec5681b6d5160b9c5210f820b9e6016efae4a75eae39d90cc5dc6fc60caffddab534a455353a241f753148dc9814c63d1858fb1d3ba5280f WHIRLPOOL 2aa727c60f4f89e81f32f7af23f5f6474bef24b07f0a95e07cb58cd8030d92cef266a7e55f3b27610aab2f0b956089dc9c97f82468e36c497e50b4452ee8e66c
 EBUILD netbeans-profiler-9999_p20160205.ebuild 3472 SHA256 1355fa4b9448c07435f56cfd7847599b4b062aa016681bc824aa770944a0dd71 SHA512 8a3bbf6ebca5f30466a68ae450a0206499321396ae65c319618afe42c984f0cbdbe3383a25be730138071dd845c0d5bdf81bc12d19e00ecad731a081c735b08f WHIRLPOOL d73d0df3d97caea76335f509e942d52f92921fdb0af497f3d7757a6de76af33a4e6a7cc26a47a63f917acd72726a03891a4c03b4a0ae562555104ca0a1ea648f
 EBUILD netbeans-profiler-9999_p20160208.ebuild 3472 SHA256 6d22270b34bbd646fb37d1d6c02cf8f40203baf3e3520ba2e80e99a5b85ab94d SHA512 05d8b281bd463bc50ecda6b41269e125e0cb5cc73d9abc6a57fb14f4de052a6001a50b3506b40084b4dde5af10446242a394bfe9d2e546416ada9aa35a3e773b WHIRLPOOL b0f122c35db6635bd6135182e35dd9649e0f45a2821431194e12913ed21675a4fcd1464665023d2f9eda1df05d5badbc43c7d7037eb29f99961fa575e75fb7dc

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160203.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160203.ebuild
deleted file mode 100644
index bbcad69..0000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160203.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-03_00-02-15/zip/netbeans-trunk-nightly-201602030002-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 9dcd555..8e6acce 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -18,7 +18,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232d1b71f43142523a79fd0627b569bde6039141810334c7bab27 SHA512 46ab55b9253c04ba2c807531b723a00eeac73af33d2dd0efca6c7db595aca0e0811725b37603148b82a59bb324bfa88f7de56cddd312b2ba2cf28db604fcff67 WHIRLPOOL 84775701a651db0b540ab9aa86835d44d81544ccd11879c189018fd781d73662b2411f8212d33754001fb4b598f784b74bfcef6819fd034683cbe624a697e7f3
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
 DIST netbeans-trunk-nightly-201602080002-src.zip 209611236 SHA256 4d951395dbf396fd41d43efb30f19b7482eccc19969c479d91576ab0bf7662f3 SHA512 2f4e76cb78bf06a6290e291a1663c2931e53d08abb56356eb3e4e6443eb79e2261e77caa10d6fef70e3f7c8cf7b9772e0036a58781a8e11c22503e76d70abfad WHIRLPOOL b063ead0d9beee28352e03e499d891efe4f06ba8c739576b253f825e7559e9f0f98951162e10be48da86c0c1b0432ea18fcace727a7bff34aa4e07bd2543b6bc
@@ -48,7 +47,6 @@ DIST netbeans-trunk-nightly-201603050002-src.zip 209877850 SHA256 63189967b00645
 DIST netbeans-trunk-nightly-201603060002-src.zip 209877850 SHA256 8626e8cefe8c5c2c65b0da44edef5148f85f9bbef39d7aea60baf2ec240b360d SHA512 0bef47e29211cec98b037361db3d6e5a513212f8761a2163430d74dd7f837f736de649416408966bf14344e68873a9dfabc5501ce83034a8c944193dbdc46ede WHIRLPOOL b6fc7291b14c66d546c9031e0fdef21900f284eec4aecd751e65c91efda33027da61174e3affb6420671e6822dd075de65802cc6798c3804078924c0b4a5b284
 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_p20160203.ebuild 5280 SHA256 49240052283865eafc006568b2c9f116ca9ee62417ba9abada5435365922c1d3 SHA512 be26c27f1db8d1be500cc58c24b6ea69316bf097e3ee40da26c5e7be427cfbac28dd84ec6ef2dbe2a8fb149fa122cac64fb49af033f99bcc24d2cc6b3427c0a7 WHIRLPOOL 747f7217f3af53a9cf677de51bdc16175667b0870f83aa86814fdacde12bfa6be0b1147827cac215a2e0b7176a54139f8e4cdf36067f5ad410d920de2727f539
 EBUILD netbeans-webcommon-9999_p20160204.ebuild 5280 SHA256 b7e52fa271999978dbbdad26e0d68a922514a7a55bcb7044bf4bf892532c43a1 SHA512 c54ec71d2ff6cb3d501ee4a3e1db15d2f701023cbe000b9764f826c40a9a7c0191c71e38ada726516885a01eb805e5a09f83e59ec54a7609f79e2dba1495da45 WHIRLPOOL 7a37448315f9d3b3ddf8d15ab50b3d645f39a3a72614593eb7caccac2a9fe2bd31b49ac4bf110afcd1dced21c049a630a89a9eb05bce8227752ea6d70817b163
 EBUILD netbeans-webcommon-9999_p20160205.ebuild 5280 SHA256 3f6cf4a67ecd8b9947ebbfaaec250e237f2b0a30b16e25015346e3abd16cb4f0 SHA512 121b8d0a568946f154f3f79a159699683a835c4d75a351e1ff22d3407c786ca811d550eebd5a701a38d8c729aa4647ec1876bd673d82984b0d749229c41c8bd1 WHIRLPOOL ec2d98cb78886db8f11d9391e8a501aa47a9c3e705ab9ac98fa87df00bdd3bcff640718e325e5cff31df0224ce1972feda2bc2a4bd24f0b44a1f296d9e4945d2
 EBUILD netbeans-webcommon-9999_p20160208.ebuild 5280 SHA256 57d79803ae8e27b4b87f790ca9e81e46eb9d11ded09eafb09b6f365a318772cf SHA512 745f9970176c23aa5e68a2628daea97ca927014e8467a0fb2a4053978763059459d434005076b6519d564aff80dc8633e04fe307f963c06152270ce44bf975df WHIRLPOOL 11f5a976e04cb1e5de58abbe0031cd26692a3c37eea75ec38ecbc66af5a3c75ff03ce19ec1fab555e09de077656479ba95e520ecb4ea62b8964e2d281830f1e8

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160203.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160203.ebuild
deleted file mode 100644
index 0b70c01..0000000
--- a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160203.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-03_00-02-15/zip/netbeans-trunk-nightly-201602030002-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 a2f958b..aee41fa 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232d1b71f43142523a79fd0627b569bde6039141810334c7bab27 SHA512 46ab55b9253c04ba2c807531b723a00eeac73af33d2dd0efca6c7db595aca0e0811725b37603148b82a59bb324bfa88f7de56cddd312b2ba2cf28db604fcff67 WHIRLPOOL 84775701a651db0b540ab9aa86835d44d81544ccd11879c189018fd781d73662b2411f8212d33754001fb4b598f784b74bfcef6819fd034683cbe624a697e7f3
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
 DIST netbeans-trunk-nightly-201602080002-src.zip 209611236 SHA256 4d951395dbf396fd41d43efb30f19b7482eccc19969c479d91576ab0bf7662f3 SHA512 2f4e76cb78bf06a6290e291a1663c2931e53d08abb56356eb3e4e6443eb79e2261e77caa10d6fef70e3f7c8cf7b9772e0036a58781a8e11c22503e76d70abfad WHIRLPOOL b063ead0d9beee28352e03e499d891efe4f06ba8c739576b253f825e7559e9f0f98951162e10be48da86c0c1b0432ea18fcace727a7bff34aa4e07bd2543b6bc
@@ -33,7 +32,6 @@ DIST netbeans-trunk-nightly-201603050002-src.zip 209877850 SHA256 63189967b00645
 DIST netbeans-trunk-nightly-201603060002-src.zip 209877850 SHA256 8626e8cefe8c5c2c65b0da44edef5148f85f9bbef39d7aea60baf2ec240b360d SHA512 0bef47e29211cec98b037361db3d6e5a513212f8761a2163430d74dd7f837f736de649416408966bf14344e68873a9dfabc5501ce83034a8c944193dbdc46ede WHIRLPOOL b6fc7291b14c66d546c9031e0fdef21900f284eec4aecd751e65c91efda33027da61174e3affb6420671e6822dd075de65802cc6798c3804078924c0b4a5b284
 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_p20160203.ebuild 2721 SHA256 84c859d9f30b1712f4bb4113c7ccd025ad01ceb569674351a313082a489569ec SHA512 38269bf918bc9edc0f5858badd34db0e4166b84f7ef59dc1eed6d3d4e39beb715efaee165e2c89cb99cdaa559047ee2828b7e292673794d4a35998317010f5d7 WHIRLPOOL 20911ea5c5eef526d5573accdd2bc0a1f28d540f65b9268dd1da0671157a99438d0046dc1894600a7bc6b4dc8a36c4b35e16faac284648d8b05f2e7688d653b9
 EBUILD netbeans-websvccommon-9999_p20160204.ebuild 2721 SHA256 fe7b289eaac77dd9951fb1365ce6b831b50f12734a31c8546bed0f78c6827696 SHA512 0ac4702e243ed9ee35b70c255dc865f8fe678c30dcc94eae4013ce8ea031c7c3a44f34c28d85ed76a45c710cfae65e0b6742e12f41b011329abd20a1ad660cb2 WHIRLPOOL d3ef19dffc04ccf6514e69e8b7a6c34b9bb407f0d5808fe80b9ce5645922e7b92ad2ea825cfc564d8a9c5ae19fa19f8d9db20b43d8c8ccc9924727ac1280a0c7
 EBUILD netbeans-websvccommon-9999_p20160205.ebuild 2721 SHA256 34fcd53aa16be3f52f920f9440646c4c50f12f8e665517ba3f81006b12b948bb SHA512 67d95d9f68fff68a672c0fa21ee22cf54b1e548ce060414d6dd65138cb4762991c8f9cf8d5ccaa4e6eabc71879932311e48968fadf3dca389b78cd0975819584 WHIRLPOOL 63dd4e4ebf27e00763e3e023bfa548cff524b26cb2dc4e30bc107d83ef98ab5346e9fb4f10177f71118af2ba24566790e1f237d6e774e5d9271ee4590891ae07
 EBUILD netbeans-websvccommon-9999_p20160208.ebuild 2721 SHA256 49924310e7b7100bc196f1c4173284a60684e30c9be59d6765f983a48bc9a79c SHA512 ac982a2a67e2a4c16ce42baa1f4c81c2e774e3cc593175831a1b7d83d926cae339007308bd06967d4684abf898e95e7c157c4372994d905efc5b15341ed06f7d WHIRLPOOL 6cec7f5e4a15d1d465558eb052ad75536cc6e6aef9b9a1154e268c2592fdfb79720270ee69f089cebd4905a671f4962fb487ce385afacb73175fa070c172d6af

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160203.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160203.ebuild
deleted file mode 100644
index fb56d8e..0000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160203.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-03_00-02-15/zip/netbeans-trunk-nightly-201602030002-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 0bd20f8..ddf10fd 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3
 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-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232d1b71f43142523a79fd0627b569bde6039141810334c7bab27 SHA512 46ab55b9253c04ba2c807531b723a00eeac73af33d2dd0efca6c7db595aca0e0811725b37603148b82a59bb324bfa88f7de56cddd312b2ba2cf28db604fcff67 WHIRLPOOL 84775701a651db0b540ab9aa86835d44d81544ccd11879c189018fd781d73662b2411f8212d33754001fb4b598f784b74bfcef6819fd034683cbe624a697e7f3
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
 DIST netbeans-trunk-nightly-201602080002-src.zip 209611236 SHA256 4d951395dbf396fd41d43efb30f19b7482eccc19969c479d91576ab0bf7662f3 SHA512 2f4e76cb78bf06a6290e291a1663c2931e53d08abb56356eb3e4e6443eb79e2261e77caa10d6fef70e3f7c8cf7b9772e0036a58781a8e11c22503e76d70abfad WHIRLPOOL b063ead0d9beee28352e03e499d891efe4f06ba8c739576b253f825e7559e9f0f98951162e10be48da86c0c1b0432ea18fcace727a7bff34aa4e07bd2543b6bc
@@ -36,7 +35,6 @@ DIST netbeans-trunk-nightly-201603050002-src.zip 209877850 SHA256 63189967b00645
 DIST netbeans-trunk-nightly-201603060002-src.zip 209877850 SHA256 8626e8cefe8c5c2c65b0da44edef5148f85f9bbef39d7aea60baf2ec240b360d SHA512 0bef47e29211cec98b037361db3d6e5a513212f8761a2163430d74dd7f837f736de649416408966bf14344e68873a9dfabc5501ce83034a8c944193dbdc46ede WHIRLPOOL b6fc7291b14c66d546c9031e0fdef21900f284eec4aecd751e65c91efda33027da61174e3affb6420671e6822dd075de65802cc6798c3804078924c0b4a5b284
 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_p20160203.ebuild 6939 SHA256 263ff831228d62c03a08345b5f5a201bcf1e7f150ba2a463ece4607aa0d4b0d7 SHA512 2162d28c8b2dc586ad6e99f76ea0ee921a5c99ab269e6c160373ce7a0c918c73545e0cc5bdcc77e263a78b942f26aabea831cda5fca472c1f00df22e1e2749be WHIRLPOOL 57ae46f70efe07679a3950644839d8ccef9cd7dcd8a90a1552fdb118ee567abc40a9583a714a7b51d28f40fe45ff464ce94e4df0516075629bc27dca3c0d4105
 EBUILD netbeans-9999_p20160204.ebuild 6939 SHA256 f5ffafa6bc643cf357cfd9cbff27cc3158c1867a80055506078bfcc884b5ef02 SHA512 c746d17600fef56be26813bfc12c8ea6dca41fa9ab374357e86fc46b9c2388a0d4a0d80a38cb6143ec1ddebb7972c4f6dd6e6c6ad96e0051e68daaa3e5d2a33f WHIRLPOOL 1cbbc4db7444464d1d9171e95b729513102ef34a4a7d18960f730c13e75c7788cd5288bc6015028e08f2e1b4f59ca5201f80eb7b27e5ac2fdf78ff856d281a48
 EBUILD netbeans-9999_p20160205.ebuild 6939 SHA256 efff901f97e4013e351f9097f95619225b4098fa81e82538e92ab5cc0fa16b36 SHA512 768600f9ba885dd0f3841e8db72d78ef4b02046f8c29caf908b514dae208ed7adf8dbda2d057928dd9709754603747a5f74b71de45b51ab1ab38f7a7c2280ea6 WHIRLPOOL e62664a221ded2c9b9396158592365f13b0f2e246f326d8168890f36cec1e525b20399f63022b138b27d97c8e081f293c3c8cc654a47e560784346177804721f
 EBUILD netbeans-9999_p20160208.ebuild 6939 SHA256 4a8027e9ad93f2896c1a5318123feb995e082e3d1301054dceeeb4d3f797893c SHA512 1043e79cd6bd786ce2994b193a79478b439554cb8e32fd79eb570e84284d7f787de578821a93b41e2a00207e250133aa03f1df2e7fce8dc4b4e84ceb02443cf2 WHIRLPOOL e9535232b65d43e8b7a81c6c047063e91f585dceca5d8b35c8900c332278478486c9afa74367821ed921949f4722e69da13067c7145e03c4a111d17dfcbd839b

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


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

end of thread, other threads:[~2016-03-07  9:32 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-07  9:31 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-ide/, dev-java/netbeans-webcommon/, Miroslav Šulc
  -- strict thread matches above, loose matches on Subject: below --
2016-03-07  9:31 Miroslav Šulc
2016-02-20 14:19 Miroslav Šulc

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