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

[Miroslav Šulc]

commit:     b9101d796d38d25ba3c2de5a98eadf64362b107f
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 23 07:51:30 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Feb 23 07:51:30 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=b9101d79

netbeans: removed obsolete ebuilds

Package-Manager: portage-2.2.27

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 2fac507..e33ed13 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-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
 DIST netbeans-trunk-nightly-201601280002-src.zip 209553372 SHA256 ccbc7eb7f1317a14111bc06b7f35089ade220aed0d91e5aa91d774eed602c7cf SHA512 aeeebe3500207a3a4b63d775fec0119980bdf19dfa7e7bd4436c75f4d6b542c3ee6d0a2955165ff50b8d3e4f27acdbf93a5bee29e1f1b4ce0b16c0f4c85cbae1 WHIRLPOOL 08957d670b1816869be8ac6d6de3a67ca3cbe8ffb3c4c92c681355f0fd98016d76de29a49f039b6d333291f5dbe9c2e601f3c80bd4f8fefdd37bdf095c72ef51
@@ -29,7 +28,6 @@ DIST netbeans-trunk-nightly-201602190002-src.zip 209766182 SHA256 80b4e9ded78077
 DIST netbeans-trunk-nightly-201602200002-src.zip 209774521 SHA256 406135c415d38ce3909c4b1debcac43f83d52971cc1cd246c23be73e278464bb SHA512 b9378d3d140a371fbfd31473fe03a98fc222825b6c565df136c28b8de90a7b00b728decccf0a21caa9a1f7d9e0dd0d851f3abdd0e2301f185dbb8de6d29f70cd WHIRLPOOL 79389e9b343f1ff8afec95f8e2dd41265bb96ec6106dfd491a8a53021d71ace9cf2c699ac99ad2b648c7902301d8fa0521f788c1227a963b142ca84bf71635a0
 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_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
 EBUILD netbeans-apisupport-9999_p20160128.ebuild 3384 SHA256 8b644f55bf5f5136ee9f45e12756275983275847f0124641026053006ef2792d SHA512 268e02b9615c69f1ba63505b56effd917c737e3b08cbea628ef21c10218006698691a3fe84e68fd8c7823238a3f7eeb0cbc3fcd15f8ec13d2f269d0b06fcd3ff WHIRLPOOL f623cef513bda37e016bf62025bec76e18980d8927c623b18f1cfd2998d0b96cd579f37135258da597331dae6864555c68e799ae8f747037001c1248cb774b1d

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160121.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160121.ebuild
deleted file mode 100644
index 59857f3..0000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160121.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-21_00-02-04/zip/netbeans-trunk-nightly-201601210002-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 c7470ec..e77e648 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-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
 DIST netbeans-trunk-nightly-201601280002-src.zip 209553372 SHA256 ccbc7eb7f1317a14111bc06b7f35089ade220aed0d91e5aa91d774eed602c7cf SHA512 aeeebe3500207a3a4b63d775fec0119980bdf19dfa7e7bd4436c75f4d6b542c3ee6d0a2955165ff50b8d3e4f27acdbf93a5bee29e1f1b4ce0b16c0f4c85cbae1 WHIRLPOOL 08957d670b1816869be8ac6d6de3a67ca3cbe8ffb3c4c92c681355f0fd98016d76de29a49f039b6d333291f5dbe9c2e601f3c80bd4f8fefdd37bdf095c72ef51
@@ -41,7 +40,6 @@ DIST netbeans-trunk-nightly-201602190002-src.zip 209766182 SHA256 80b4e9ded78077
 DIST netbeans-trunk-nightly-201602200002-src.zip 209774521 SHA256 406135c415d38ce3909c4b1debcac43f83d52971cc1cd246c23be73e278464bb SHA512 b9378d3d140a371fbfd31473fe03a98fc222825b6c565df136c28b8de90a7b00b728decccf0a21caa9a1f7d9e0dd0d851f3abdd0e2301f185dbb8de6d29f70cd WHIRLPOOL 79389e9b343f1ff8afec95f8e2dd41265bb96ec6106dfd491a8a53021d71ace9cf2c699ac99ad2b648c7902301d8fa0521f788c1227a963b142ca84bf71635a0
 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_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
 EBUILD netbeans-cnd-9999_p20160128.ebuild 4790 SHA256 a03039f09241763376fc87452e9f6b928d915e56e2ea9bd47297a3630a3dac71 SHA512 05ef01cf018da426f538b7b8f2c0feb7da3e980ef54afec2b7daaad850f4dbac0c319a6b2b04bc7cec8bb3f10e0ce98f684223178b0d002e5ece6e7cfb0e1552 WHIRLPOOL 1f68d1a02f4454b447f8ba7334f631f5fc7f851c173c7b4687a466a8e3bdb921e2c000a33d010837e225d17102cfd273f4ad3c67c5eaf0563cb97539a7a3eecc

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160121.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160121.ebuild
deleted file mode 100644
index a8cef9e..0000000
--- a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160121.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-21_00-02-04/zip/netbeans-trunk-nightly-201601210002-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/C796A5575BF0F5364ACD3D8173ED6EC664686AC2-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}"/C796A5575BF0F5364ACD3D8173ED6EC664686AC2-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 e01833c..1636ee4 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/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-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
 DIST netbeans-trunk-nightly-201601280002-src.zip 209553372 SHA256 ccbc7eb7f1317a14111bc06b7f35089ade220aed0d91e5aa91d774eed602c7cf SHA512 aeeebe3500207a3a4b63d775fec0119980bdf19dfa7e7bd4436c75f4d6b542c3ee6d0a2955165ff50b8d3e4f27acdbf93a5bee29e1f1b4ce0b16c0f4c85cbae1 WHIRLPOOL 08957d670b1816869be8ac6d6de3a67ca3cbe8ffb3c4c92c681355f0fd98016d76de29a49f039b6d333291f5dbe9c2e601f3c80bd4f8fefdd37bdf095c72ef51
@@ -33,7 +32,6 @@ DIST netbeans-trunk-nightly-201602190002-src.zip 209766182 SHA256 80b4e9ded78077
 DIST netbeans-trunk-nightly-201602200002-src.zip 209774521 SHA256 406135c415d38ce3909c4b1debcac43f83d52971cc1cd246c23be73e278464bb SHA512 b9378d3d140a371fbfd31473fe03a98fc222825b6c565df136c28b8de90a7b00b728decccf0a21caa9a1f7d9e0dd0d851f3abdd0e2301f185dbb8de6d29f70cd WHIRLPOOL 79389e9b343f1ff8afec95f8e2dd41265bb96ec6106dfd491a8a53021d71ace9cf2c699ac99ad2b648c7902301d8fa0521f788c1227a963b142ca84bf71635a0
 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_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
 EBUILD netbeans-dlight-9999_p20160128.ebuild 2968 SHA256 b7b27bbe3eafac9d5d5586092b1479aed8e0209467885a12fd4ebe17e77daf7c SHA512 2c6d6778e247fac4671e0a7ec926232a5088959442e819e03d31984b10c02dfc173698af7b8cbdc2ec759e907428fc3ecc1f1c9ab2f0e2f91ab9f3a1719b7969 WHIRLPOOL 455c842a59a9ed0f7c1e6d8f20a592fedb16de3e51dabac148a510e5297af702ba29d4c21dd70448ee3d3039c59a16eac499846b1958a319565b769438f742e7

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160121.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160121.ebuild
deleted file mode 100644
index 4f2a171..0000000
--- a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160121.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-21_00-02-04/zip/netbeans-trunk-nightly-201601210002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/AE86A01A66ADBA4126F61A340A97B093FDFC1F47-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}"/AE86A01A66ADBA4126F61A340A97B093FDFC1F47-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 69cc6d1..e42b512 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-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
 DIST netbeans-trunk-nightly-201601280002-src.zip 209553372 SHA256 ccbc7eb7f1317a14111bc06b7f35089ade220aed0d91e5aa91d774eed602c7cf SHA512 aeeebe3500207a3a4b63d775fec0119980bdf19dfa7e7bd4436c75f4d6b542c3ee6d0a2955165ff50b8d3e4f27acdbf93a5bee29e1f1b4ce0b16c0f4c85cbae1 WHIRLPOOL 08957d670b1816869be8ac6d6de3a67ca3cbe8ffb3c4c92c681355f0fd98016d76de29a49f039b6d333291f5dbe9c2e601f3c80bd4f8fefdd37bdf095c72ef51
@@ -61,7 +60,6 @@ DIST netbeans-trunk-nightly-201602190002-src.zip 209766182 SHA256 80b4e9ded78077
 DIST netbeans-trunk-nightly-201602200002-src.zip 209774521 SHA256 406135c415d38ce3909c4b1debcac43f83d52971cc1cd246c23be73e278464bb SHA512 b9378d3d140a371fbfd31473fe03a98fc222825b6c565df136c28b8de90a7b00b728decccf0a21caa9a1f7d9e0dd0d851f3abdd0e2301f185dbb8de6d29f70cd WHIRLPOOL 79389e9b343f1ff8afec95f8e2dd41265bb96ec6106dfd491a8a53021d71ace9cf2c699ac99ad2b648c7902301d8fa0521f788c1227a963b142ca84bf71635a0
 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_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
 EBUILD netbeans-enterprise-9999_p20160128.ebuild 15825 SHA256 08265ef2cf841e6ebe18dd26a227f2fd45061437bae1359e237b1c693519972e SHA512 4ee3c28bdf0b6e04ad09c89d90da0d119e3d434d0cb648704c8f53696d6dee876b5e66bcc844665296f9adb53ee618f21ea3c53bf74554d18265fe35597f248c WHIRLPOOL afb5821c4950c773eac22ec2a601ef25ca036f961360a19781ac52e8f71a9363973e168003e7b0ddc1dff4ee364f84077e157cbc5437c570a0ac7c90a38bb496

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160121.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160121.ebuild
deleted file mode 100644
index 6a8182d..0000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160121.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-21_00-02-04/zip/netbeans-trunk-nightly-201601210002-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 9e7e5c7..d91649e 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-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
 DIST netbeans-trunk-nightly-201601280002-src.zip 209553372 SHA256 ccbc7eb7f1317a14111bc06b7f35089ade220aed0d91e5aa91d774eed602c7cf SHA512 aeeebe3500207a3a4b63d775fec0119980bdf19dfa7e7bd4436c75f4d6b542c3ee6d0a2955165ff50b8d3e4f27acdbf93a5bee29e1f1b4ce0b16c0f4c85cbae1 WHIRLPOOL 08957d670b1816869be8ac6d6de3a67ca3cbe8ffb3c4c92c681355f0fd98016d76de29a49f039b6d333291f5dbe9c2e601f3c80bd4f8fefdd37bdf095c72ef51
@@ -29,7 +28,6 @@ DIST netbeans-trunk-nightly-201602190002-src.zip 209766182 SHA256 80b4e9ded78077
 DIST netbeans-trunk-nightly-201602200002-src.zip 209774521 SHA256 406135c415d38ce3909c4b1debcac43f83d52971cc1cd246c23be73e278464bb SHA512 b9378d3d140a371fbfd31473fe03a98fc222825b6c565df136c28b8de90a7b00b728decccf0a21caa9a1f7d9e0dd0d851f3abdd0e2301f185dbb8de6d29f70cd WHIRLPOOL 79389e9b343f1ff8afec95f8e2dd41265bb96ec6106dfd491a8a53021d71ace9cf2c699ac99ad2b648c7902301d8fa0521f788c1227a963b142ca84bf71635a0
 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_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
 EBUILD netbeans-ergonomics-9999_p20160128.ebuild 2913 SHA256 8f1d28834af6ac8a0877afd2925a579dfd50f96a002b35a7ef49559d198810c0 SHA512 ee5ca206224837e32124f57cd6d1c04158e3bb479e2db2e093705e271cd36531c7d8308bf8b415d4dc29baa57bc201b8d2ba7106277f216c96fb0894897efcef WHIRLPOOL dc2a6ebfc6797d56f607310c28964bf9ebf77c5cd11311bbe2c0bf49676f26e71b32672e21d9422aba8e05b99827a433b82557133c7807237d8a83a930a23820

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160121.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160121.ebuild
deleted file mode 100644
index 5c79917..0000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160121.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-21_00-02-04/zip/netbeans-trunk-nightly-201601210002-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 09357b2..16c7d54 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-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
 DIST netbeans-trunk-nightly-201601280002-src.zip 209553372 SHA256 ccbc7eb7f1317a14111bc06b7f35089ade220aed0d91e5aa91d774eed602c7cf SHA512 aeeebe3500207a3a4b63d775fec0119980bdf19dfa7e7bd4436c75f4d6b542c3ee6d0a2955165ff50b8d3e4f27acdbf93a5bee29e1f1b4ce0b16c0f4c85cbae1 WHIRLPOOL 08957d670b1816869be8ac6d6de3a67ca3cbe8ffb3c4c92c681355f0fd98016d76de29a49f039b6d333291f5dbe9c2e601f3c80bd4f8fefdd37bdf095c72ef51
@@ -31,7 +30,6 @@ DIST netbeans-trunk-nightly-201602190002-src.zip 209766182 SHA256 80b4e9ded78077
 DIST netbeans-trunk-nightly-201602200002-src.zip 209774521 SHA256 406135c415d38ce3909c4b1debcac43f83d52971cc1cd246c23be73e278464bb SHA512 b9378d3d140a371fbfd31473fe03a98fc222825b6c565df136c28b8de90a7b00b728decccf0a21caa9a1f7d9e0dd0d851f3abdd0e2301f185dbb8de6d29f70cd WHIRLPOOL 79389e9b343f1ff8afec95f8e2dd41265bb96ec6106dfd491a8a53021d71ace9cf2c699ac99ad2b648c7902301d8fa0521f788c1227a963b142ca84bf71635a0
 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_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
 EBUILD netbeans-extide-9999_p20160128.ebuild 3377 SHA256 29909a5e82ef010cc75d9b69b4365a3e2631717d14dbadd332a88624330de213 SHA512 ced60b098bfb035c4711c44406f7410d024fb2e4a50f8a596ff5e913e16f6dde590054d6e67976dc310b0a53df571eb5bcce24bd6c9503e70f639ab5a9e1f0b5 WHIRLPOOL b80af6355f5ee6a7f532b72bb98e76ff78f39592f2fa3368c1813d00ee1d0b531790c7566ed9ed5e20aa8031013ec4d4d2e5e7cfbb738906b877581e8cd02f26

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160121.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160121.ebuild
deleted file mode 100644
index 84ac730..0000000
--- a/dev-java/netbeans-extide/netbeans-extide-9999_p20160121.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-21_00-02-04/zip/netbeans-trunk-nightly-201601210002-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 96eba8e..a22e0d9 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-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
 DIST netbeans-trunk-nightly-201601280002-src.zip 209553372 SHA256 ccbc7eb7f1317a14111bc06b7f35089ade220aed0d91e5aa91d774eed602c7cf SHA512 aeeebe3500207a3a4b63d775fec0119980bdf19dfa7e7bd4436c75f4d6b542c3ee6d0a2955165ff50b8d3e4f27acdbf93a5bee29e1f1b4ce0b16c0f4c85cbae1 WHIRLPOOL 08957d670b1816869be8ac6d6de3a67ca3cbe8ffb3c4c92c681355f0fd98016d76de29a49f039b6d333291f5dbe9c2e601f3c80bd4f8fefdd37bdf095c72ef51
@@ -31,7 +30,6 @@ DIST netbeans-trunk-nightly-201602190002-src.zip 209766182 SHA256 80b4e9ded78077
 DIST netbeans-trunk-nightly-201602200002-src.zip 209774521 SHA256 406135c415d38ce3909c4b1debcac43f83d52971cc1cd246c23be73e278464bb SHA512 b9378d3d140a371fbfd31473fe03a98fc222825b6c565df136c28b8de90a7b00b728decccf0a21caa9a1f7d9e0dd0d851f3abdd0e2301f185dbb8de6d29f70cd WHIRLPOOL 79389e9b343f1ff8afec95f8e2dd41265bb96ec6106dfd491a8a53021d71ace9cf2c699ac99ad2b648c7902301d8fa0521f788c1227a963b142ca84bf71635a0
 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_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
 EBUILD netbeans-groovy-9999_p20160128.ebuild 3416 SHA256 d2204bbe6dfdbe3a68bde48288a5f323f0c458449971c475857e43f348ea5f79 SHA512 c21d72c1e65630494662946d1d595539b65ff651a5924e122bbd37df8152cdb1652434c099007c3f92393f5ae1b89e63904357a64f6eee598787b5fb87b75cf1 WHIRLPOOL 3c1273b457393610f5b27511674718da132168e4c5b4cb10b46807fb20f17af11a0105f3675c8d6103029f1c6166d1fddaa41f866218525b4fadfeeeb8695b23

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160121.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160121.ebuild
deleted file mode 100644
index 0bd4063..0000000
--- a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160121.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-21_00-02-04/zip/netbeans-trunk-nightly-201601210002-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 880b3aa..298ff82 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-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
 DIST netbeans-trunk-nightly-201601280002-src.zip 209553372 SHA256 ccbc7eb7f1317a14111bc06b7f35089ade220aed0d91e5aa91d774eed602c7cf SHA512 aeeebe3500207a3a4b63d775fec0119980bdf19dfa7e7bd4436c75f4d6b542c3ee6d0a2955165ff50b8d3e4f27acdbf93a5bee29e1f1b4ce0b16c0f4c85cbae1 WHIRLPOOL 08957d670b1816869be8ac6d6de3a67ca3cbe8ffb3c4c92c681355f0fd98016d76de29a49f039b6d333291f5dbe9c2e601f3c80bd4f8fefdd37bdf095c72ef51
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201602190002-src.zip 209766182 SHA256 80b4e9ded78077
 DIST netbeans-trunk-nightly-201602200002-src.zip 209774521 SHA256 406135c415d38ce3909c4b1debcac43f83d52971cc1cd246c23be73e278464bb SHA512 b9378d3d140a371fbfd31473fe03a98fc222825b6c565df136c28b8de90a7b00b728decccf0a21caa9a1f7d9e0dd0d851f3abdd0e2301f185dbb8de6d29f70cd WHIRLPOOL 79389e9b343f1ff8afec95f8e2dd41265bb96ec6106dfd491a8a53021d71ace9cf2c699ac99ad2b648c7902301d8fa0521f788c1227a963b142ca84bf71635a0
 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_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
 EBUILD netbeans-harness-9999_p20160128.ebuild 4126 SHA256 c545646cc1df0dbb28a0a409848d4a40309fea711524636ecaa46c916cba9bf7 SHA512 66d3884d3513366abad1b69bf2abf5d9b8d35e70117ff5b58bfe55d1271949d60dd503f90e6b1e382d26c6d85df58fa9240abb0ebea41a71d852762d5d32e7e0 WHIRLPOOL 05a9a1c862c800de14f466705b1c7e1b0f7591d1bd566c3443379500ccdfb5751671f0d1bc4eaddce32bfe3128d93c0d4709a59691df02b80aac8e52c2eb0301

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160121.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160121.ebuild
deleted file mode 100644
index a26f752..0000000
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20160121.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-21_00-02-04/zip/netbeans-trunk-nightly-201601210002-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 505ff5f..e3850c7 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -27,7 +27,6 @@ DIST 2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar 12471 SHA256 14db
 DIST 3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip 270250 SHA256 246cd067e04f499117a3d71f8505617c3740445948f727e4d85beb1e8f4e1d8d SHA512 963422b8f498824b880b3f61aaed3aca41e3b3ee81e2710564293c4a694907d187722bdae4b7ab9d7bb98e69cfac99726e269c2fab1f96d56c96f3a097d23ecf WHIRLPOOL 88d859656157133edbacd756e2c567afcc40ddc2844d05450138de9cad656c6f56e0be8b4e8a6448f3ed760674ea1b4a4b69361599825d9b483b2645fa8d95ec
 DIST 3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip 14667 SHA256 05c20527749f4817e036c2105209318ef42dbec79d34db739bf3a6cfa061b57e SHA512 c391d2bdabe047127a0be9ae622afabb32fef086a4941bd50918bd140e84dc79097cdae018e74c661c957146e08fabed4e8b0270f9b27caee92c0831dc3aea1e WHIRLPOOL d07aa54a5d6555ffb7d0a4d0b6ad691a73e138ab527b616127b7a37bdc094470908f89a77f46204dde3c317a216688ffd57641419cf7bc17284d7077c71ec0ed
 DIST 387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar 1106410 SHA256 2c522a693651bdcfbc43767149e4c224b516df3ab835159621af9e0071330cb0 SHA512 51076f5933ba9923d7004b2b205e68f88a564b77c168935a1e96ad9deffb19b9182685bd368d0e0ebb3ec28f0e45a61fb555ff7eaf2acc748f8786136a91ed28 WHIRLPOOL 16ed29e8b00e87838ab4aded0e3c9085b9dda2eee47997ab1fc042781ed83537b092abda41d0dd31b6a8b8edf851da8cfd6041df072e4f5833a4541c1002ba4a
-DIST 3A7012C03E61CAF9539DAD8326659EB4CE3EA436-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143.jar 370043 SHA256 c071a8b4306162b2ab05625fc4cacbc6d3ceea80e15c6187d8a0be0f2725acdb SHA512 5876217af37eec1d331c49b23aa8b75172974fdc5104e5dd6e11ed7389b3615f69b1d342b6bf959103cee3eb5a3221b3e47e352d943be5dba6e9314f0ac7e424 WHIRLPOOL b213ca3bce8c4594685210ac6f12ac6015512cf3b51723acc160ae0c233b8590140b68c8ba12679b7ac73fef9845a9fba375a22145f84509a924fe867d610faa
 DIST 3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar 7847 SHA256 74c3a3c4e51ee45e61c8ded069f7a0f8056389b2a93cc62667ec2227be7fd14a SHA512 d1dab33fdf498628fedfafdbe008988df3c079b4de40c4895e9a9aee4f74019d43f8fef85d397c7a48e9db67f7a7bf365b83447a9a674a6aa123c5daad792252 WHIRLPOOL d6cdb838c9d205c5df55e6fd8ad10971b6dd5513d29fd3ee82da19aa6b4382c4ea3be365f9fb214b5776dbce109eec313a63ec9af40ba76636014c676421f523
 DIST 3FB169C95F095B70F05B96BE9496DA63FAE7F707-org.eclipse.equinox.preferences-3.4.2_nosignature.jar 106303 SHA256 98ea64373e378a43f0f247f2d24b691b1ccfb210ac0f94e1362246999440a24a SHA512 dc566142e7573eaa24d183087dd931baffc16a146976359c516adeb6a5ba29c2770f751fca909dd672758f8c072c472932796e0d652236ffef83230e40f4c046 WHIRLPOOL 97f43040f58d16918720ee76fbc7038a87996324c339f438314a347dc69aabf66e9cc23526fc1211fbdde30a5fee6eeeb87a48d7cb38992a5f001a692262ccb2
 DIST 4388C34B9F085A42FBEA06C5B00FDF0A251171EC-html5doc.zip 1251427 SHA256 3b85a7d98e119a1f1993a2154889314df59397c16237c90b007b9d0427cde434 SHA512 9024dce01e26947a9b57009f8ba73e38ead50660c9fca4f327f4e9f0bd170758f9adca075b878066e91419fb8903074b7ebb716aad5fecace2b2885f7b2a57ff WHIRLPOOL 1ce4f27b1d2c7cd77ed65f878886a4e25dc51e7c3133f6739b56c071a5ef37ae99b568f2c1f75423b0b1de392e39efbc0e6e89f731f809c9e38e4bd23fc19220
@@ -136,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-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
 DIST netbeans-trunk-nightly-201601280002-src.zip 209553372 SHA256 ccbc7eb7f1317a14111bc06b7f35089ade220aed0d91e5aa91d774eed602c7cf SHA512 aeeebe3500207a3a4b63d775fec0119980bdf19dfa7e7bd4436c75f4d6b542c3ee6d0a2955165ff50b8d3e4f27acdbf93a5bee29e1f1b4ce0b16c0f4c85cbae1 WHIRLPOOL 08957d670b1816869be8ac6d6de3a67ca3cbe8ffb3c4c92c681355f0fd98016d76de29a49f039b6d333291f5dbe9c2e601f3c80bd4f8fefdd37bdf095c72ef51
@@ -162,7 +160,6 @@ DIST netbeans-trunk-nightly-201602190002-src.zip 209766182 SHA256 80b4e9ded78077
 DIST netbeans-trunk-nightly-201602200002-src.zip 209774521 SHA256 406135c415d38ce3909c4b1debcac43f83d52971cc1cd246c23be73e278464bb SHA512 b9378d3d140a371fbfd31473fe03a98fc222825b6c565df136c28b8de90a7b00b728decccf0a21caa9a1f7d9e0dd0d851f3abdd0e2301f185dbb8de6d29f70cd WHIRLPOOL 79389e9b343f1ff8afec95f8e2dd41265bb96ec6106dfd491a8a53021d71ace9cf2c699ac99ad2b648c7902301d8fa0521f788c1227a963b142ca84bf71635a0
 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_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
 EBUILD netbeans-ide-9999_p20160128.ebuild 30238 SHA256 dba6d87835fed749a8fdf6dae4c10cb0ad7a2333802b9b5eaf91ab757650014c SHA512 b558467b1199d81b4b09f1a7cd81b86059e41778ef26098cc2740d172a9832d3d90d97a6833eca86ade7aa2de76d492eba469123fb52734d441c112bdcd84623 WHIRLPOOL a381c7d6dfd15cdf44008c28374b8212924478c6ec7b364b8ac51510d1bac47dfd830da73f0d6bc763a3614a373661e9537e5f8e5cca9da852642b1fb1ee7c90

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160121.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160121.ebuild
deleted file mode 100644
index 3f21d22..0000000
--- a/dev-java/netbeans-ide/netbeans-ide-9999_p20160121.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-21_00-02-04/zip/netbeans-trunk-nightly-201601210002-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 a4687fe..15aee89 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-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
 DIST netbeans-trunk-nightly-201601280002-src.zip 209553372 SHA256 ccbc7eb7f1317a14111bc06b7f35089ade220aed0d91e5aa91d774eed602c7cf SHA512 aeeebe3500207a3a4b63d775fec0119980bdf19dfa7e7bd4436c75f4d6b542c3ee6d0a2955165ff50b8d3e4f27acdbf93a5bee29e1f1b4ce0b16c0f4c85cbae1 WHIRLPOOL 08957d670b1816869be8ac6d6de3a67ca3cbe8ffb3c4c92c681355f0fd98016d76de29a49f039b6d333291f5dbe9c2e601f3c80bd4f8fefdd37bdf095c72ef51
@@ -59,7 +58,6 @@ DIST netbeans-trunk-nightly-201602200002-src.zip 209774521 SHA256 406135c415d38c
 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_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
 EBUILD netbeans-java-9999_p20160128.ebuild 14930 SHA256 74acab37411bc60aefdb6c1b02638ba6bd6a2817c4a22f4b691dfe986003f5d8 SHA512 e8fd018bd8e9fe1eb3c2d2552c212f67f48987b0ee42b079735c8c77acaf269503a9436a4cf8c26e96f6ff68451afe170fd742e9b243a9d24ca4e179ec45f801 WHIRLPOOL 0dac873e104d540770a8ddece5cfe1c83bf2949a02f738fab7fec2b12e5d843be43ce4b5d5c1442be765a5d94d6f50bf38b338f2b656176a5c15775941502472

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160121.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160121.ebuild
deleted file mode 100644
index 805b5bb..0000000
--- a/dev-java/netbeans-java/netbeans-java-9999_p20160121.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-21_00-02-04/zip/netbeans-trunk-nightly-201601210002-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 f4cd3b5..97cc8ab 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-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
 DIST netbeans-trunk-nightly-201601280002-src.zip 209553372 SHA256 ccbc7eb7f1317a14111bc06b7f35089ade220aed0d91e5aa91d774eed602c7cf SHA512 aeeebe3500207a3a4b63d775fec0119980bdf19dfa7e7bd4436c75f4d6b542c3ee6d0a2955165ff50b8d3e4f27acdbf93a5bee29e1f1b4ce0b16c0f4c85cbae1 WHIRLPOOL 08957d670b1816869be8ac6d6de3a67ca3cbe8ffb3c4c92c681355f0fd98016d76de29a49f039b6d333291f5dbe9c2e601f3c80bd4f8fefdd37bdf095c72ef51
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201602190002-src.zip 209766182 SHA256 80b4e9ded78077
 DIST netbeans-trunk-nightly-201602200002-src.zip 209774521 SHA256 406135c415d38ce3909c4b1debcac43f83d52971cc1cd246c23be73e278464bb SHA512 b9378d3d140a371fbfd31473fe03a98fc222825b6c565df136c28b8de90a7b00b728decccf0a21caa9a1f7d9e0dd0d851f3abdd0e2301f185dbb8de6d29f70cd WHIRLPOOL 79389e9b343f1ff8afec95f8e2dd41265bb96ec6106dfd491a8a53021d71ace9cf2c699ac99ad2b648c7902301d8fa0521f788c1227a963b142ca84bf71635a0
 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_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
 EBUILD netbeans-javacard-9999_p20160128.ebuild 4971 SHA256 e290ef5b9a91733256278122cd3296e8f05f2d029c38f0214e9426f60cb69458 SHA512 d0e79d70442be21061790edd55893de03bc94596b03918af3b24a30e9fb36ff3fbe0681ee3a24c52e6275f84e53a0af3ef2de5f0596ce8e867f926df5a85657d WHIRLPOOL 8c90580feb8b021a947d856df1d470605a52c8478ac36c38dc24b0e5efbb388c1f35a5b0128170581961383c026a85827b8900a28714b01b346da22168a81241

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160121.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160121.ebuild
deleted file mode 100644
index ff1a5e5..0000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160121.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-21_00-02-04/zip/netbeans-trunk-nightly-201601210002-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 2c1e22f..4c95a68 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-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
 DIST netbeans-trunk-nightly-201601280002-src.zip 209553372 SHA256 ccbc7eb7f1317a14111bc06b7f35089ade220aed0d91e5aa91d774eed602c7cf SHA512 aeeebe3500207a3a4b63d775fec0119980bdf19dfa7e7bd4436c75f4d6b542c3ee6d0a2955165ff50b8d3e4f27acdbf93a5bee29e1f1b4ce0b16c0f4c85cbae1 WHIRLPOOL 08957d670b1816869be8ac6d6de3a67ca3cbe8ffb3c4c92c681355f0fd98016d76de29a49f039b6d333291f5dbe9c2e601f3c80bd4f8fefdd37bdf095c72ef51
@@ -30,7 +29,6 @@ DIST netbeans-trunk-nightly-201602190002-src.zip 209766182 SHA256 80b4e9ded78077
 DIST netbeans-trunk-nightly-201602200002-src.zip 209774521 SHA256 406135c415d38ce3909c4b1debcac43f83d52971cc1cd246c23be73e278464bb SHA512 b9378d3d140a371fbfd31473fe03a98fc222825b6c565df136c28b8de90a7b00b728decccf0a21caa9a1f7d9e0dd0d851f3abdd0e2301f185dbb8de6d29f70cd WHIRLPOOL 79389e9b343f1ff8afec95f8e2dd41265bb96ec6106dfd491a8a53021d71ace9cf2c699ac99ad2b648c7902301d8fa0521f788c1227a963b142ca84bf71635a0
 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_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
 EBUILD netbeans-javadoc-9999_p20160128.ebuild 6293 SHA256 41fe67bc125ecffb34986a20064a4255976f6196e2877c22dafdad695886ccf6 SHA512 aecddc75ac6d801c305064c84d84ccbad49ccee6d114807a1cee62b4bb4d8cd130b7fed23de6d923fa1da3f488aef032ee7875894bf288e0b2c7478e4944bc63 WHIRLPOOL 61782be26556c8443ddd5ae0ac620daa887b1e08258f54df81d97324267b227b9ebe2d3abf0d14856aa5598d9c2412da96c1cd98eba2b2f9268b670c750aacee

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160121.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160121.ebuild
deleted file mode 100644
index 94d8911..0000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160121.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-21_00-02-04/zip/netbeans-trunk-nightly-201601210002-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 7e3616f..ff88102 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-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
 DIST netbeans-trunk-nightly-201601280002-src.zip 209553372 SHA256 ccbc7eb7f1317a14111bc06b7f35089ade220aed0d91e5aa91d774eed602c7cf SHA512 aeeebe3500207a3a4b63d775fec0119980bdf19dfa7e7bd4436c75f4d6b542c3ee6d0a2955165ff50b8d3e4f27acdbf93a5bee29e1f1b4ce0b16c0f4c85cbae1 WHIRLPOOL 08957d670b1816869be8ac6d6de3a67ca3cbe8ffb3c4c92c681355f0fd98016d76de29a49f039b6d333291f5dbe9c2e601f3c80bd4f8fefdd37bdf095c72ef51
@@ -37,7 +36,6 @@ DIST netbeans-trunk-nightly-201602190002-src.zip 209766182 SHA256 80b4e9ded78077
 DIST netbeans-trunk-nightly-201602200002-src.zip 209774521 SHA256 406135c415d38ce3909c4b1debcac43f83d52971cc1cd246c23be73e278464bb SHA512 b9378d3d140a371fbfd31473fe03a98fc222825b6c565df136c28b8de90a7b00b728decccf0a21caa9a1f7d9e0dd0d851f3abdd0e2301f185dbb8de6d29f70cd WHIRLPOOL 79389e9b343f1ff8afec95f8e2dd41265bb96ec6106dfd491a8a53021d71ace9cf2c699ac99ad2b648c7902301d8fa0521f788c1227a963b142ca84bf71635a0
 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_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
 EBUILD netbeans-javafx-9999_p20160128.ebuild 4717 SHA256 4e085f89c66cb74c0382f7f2d93e1e0dea0357e5238a9451dc6fa5aa0c061883 SHA512 533472813715a38472ee74ed457c4d67aac07d34b67f4628b0fda2e7df9223359f553c023236e9ca9cbd31084940de8769b42c141b924d06651ac3b5d5cb177d WHIRLPOOL 6cde9b01808f84aa250d02a63df6afa42700ffb2c20a021591a6927dda9385346740052ac8ae6d202d0f5ca560edf95f04be9bdcbe6d8ab1d5c160bb69349495

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160121.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160121.ebuild
deleted file mode 100644
index 11818b1..0000000
--- a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160121.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-21_00-02-04/zip/netbeans-trunk-nightly-201601210002-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 8d71f52..c69c0c5 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-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
 DIST netbeans-trunk-nightly-201601280002-src.zip 209553372 SHA256 ccbc7eb7f1317a14111bc06b7f35089ade220aed0d91e5aa91d774eed602c7cf SHA512 aeeebe3500207a3a4b63d775fec0119980bdf19dfa7e7bd4436c75f4d6b542c3ee6d0a2955165ff50b8d3e4f27acdbf93a5bee29e1f1b4ce0b16c0f4c85cbae1 WHIRLPOOL 08957d670b1816869be8ac6d6de3a67ca3cbe8ffb3c4c92c681355f0fd98016d76de29a49f039b6d333291f5dbe9c2e601f3c80bd4f8fefdd37bdf095c72ef51
@@ -29,7 +28,6 @@ DIST netbeans-trunk-nightly-201602190002-src.zip 209766182 SHA256 80b4e9ded78077
 DIST netbeans-trunk-nightly-201602200002-src.zip 209774521 SHA256 406135c415d38ce3909c4b1debcac43f83d52971cc1cd246c23be73e278464bb SHA512 b9378d3d140a371fbfd31473fe03a98fc222825b6c565df136c28b8de90a7b00b728decccf0a21caa9a1f7d9e0dd0d851f3abdd0e2301f185dbb8de6d29f70cd WHIRLPOOL 79389e9b343f1ff8afec95f8e2dd41265bb96ec6106dfd491a8a53021d71ace9cf2c699ac99ad2b648c7902301d8fa0521f788c1227a963b142ca84bf71635a0
 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_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
 EBUILD netbeans-mobility-9999_p20160128.ebuild 4412 SHA256 80187228527b6610e845b1f3f18e78dd543ee0074299366f8fd7acae3b380ce6 SHA512 d4ece59b28fff3121e45a9ef12b5e23585490a0687da01de78030159a2add66e7add7b503809e571a1ccbb24b6a990f0d6f6ea9d129f7fc99cb310be7a444c9a WHIRLPOOL b26bd961c4a81e1e1aedb4b9b104ca09b05f8b3ad19a40a132b73fbf03783fadbdc324ed42737e3dd20f238058570582f147a1e503b8516f99621dae292647ea

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160121.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160121.ebuild
deleted file mode 100644
index 064655b..0000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160121.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-21_00-02-04/zip/netbeans-trunk-nightly-201601210002-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 b6473a2..a076d66 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-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
 DIST netbeans-trunk-nightly-201601280002-src.zip 209553372 SHA256 ccbc7eb7f1317a14111bc06b7f35089ade220aed0d91e5aa91d774eed602c7cf SHA512 aeeebe3500207a3a4b63d775fec0119980bdf19dfa7e7bd4436c75f4d6b542c3ee6d0a2955165ff50b8d3e4f27acdbf93a5bee29e1f1b4ce0b16c0f4c85cbae1 WHIRLPOOL 08957d670b1816869be8ac6d6de3a67ca3cbe8ffb3c4c92c681355f0fd98016d76de29a49f039b6d333291f5dbe9c2e601f3c80bd4f8fefdd37bdf095c72ef51
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201602190002-src.zip 209766182 SHA256 80b4e9ded78077
 DIST netbeans-trunk-nightly-201602200002-src.zip 209774521 SHA256 406135c415d38ce3909c4b1debcac43f83d52971cc1cd246c23be73e278464bb SHA512 b9378d3d140a371fbfd31473fe03a98fc222825b6c565df136c28b8de90a7b00b728decccf0a21caa9a1f7d9e0dd0d851f3abdd0e2301f185dbb8de6d29f70cd WHIRLPOOL 79389e9b343f1ff8afec95f8e2dd41265bb96ec6106dfd491a8a53021d71ace9cf2c699ac99ad2b648c7902301d8fa0521f788c1227a963b142ca84bf71635a0
 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_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
 EBUILD netbeans-nb-9999_p20160128.ebuild 4111 SHA256 37a80cd7aa618832c4ff8baa2af373e10473de6ab3287694e6f3843a89d26f2e SHA512 e6a14ab351263c3b2c9013a7f94207c48cedb059449de3bdcde1bd6ae355ad3e381c7df1e1d2e7aa59e39d9b3df49f26c2684e4e5a959b8be2d8ab5417f5df48 WHIRLPOOL 7264e716c4f34302ccd2c939bc4d9115208a8e4f705c4cca68a20f85597b0aeb33d924c6304d96a9aa0f2ab8129508781986728f38f8142eea570ca7c9511443

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160121.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160121.ebuild
deleted file mode 100644
index 40188e9..0000000
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20160121.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-21_00-02-04/zip/netbeans-trunk-nightly-201601210002-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 4ae6df4..5127327 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-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
 DIST netbeans-trunk-nightly-201601280002-src.zip 209553372 SHA256 ccbc7eb7f1317a14111bc06b7f35089ade220aed0d91e5aa91d774eed602c7cf SHA512 aeeebe3500207a3a4b63d775fec0119980bdf19dfa7e7bd4436c75f4d6b542c3ee6d0a2955165ff50b8d3e4f27acdbf93a5bee29e1f1b4ce0b16c0f4c85cbae1 WHIRLPOOL 08957d670b1816869be8ac6d6de3a67ca3cbe8ffb3c4c92c681355f0fd98016d76de29a49f039b6d333291f5dbe9c2e601f3c80bd4f8fefdd37bdf095c72ef51
@@ -33,7 +32,6 @@ DIST netbeans-trunk-nightly-201602190002-src.zip 209766182 SHA256 80b4e9ded78077
 DIST netbeans-trunk-nightly-201602200002-src.zip 209774521 SHA256 406135c415d38ce3909c4b1debcac43f83d52971cc1cd246c23be73e278464bb SHA512 b9378d3d140a371fbfd31473fe03a98fc222825b6c565df136c28b8de90a7b00b728decccf0a21caa9a1f7d9e0dd0d851f3abdd0e2301f185dbb8de6d29f70cd WHIRLPOOL 79389e9b343f1ff8afec95f8e2dd41265bb96ec6106dfd491a8a53021d71ace9cf2c699ac99ad2b648c7902301d8fa0521f788c1227a963b142ca84bf71635a0
 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_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
 EBUILD netbeans-php-9999_p20160128.ebuild 4418 SHA256 2dacb8e81072084bec8697b60176d495a04afca510fb20f5afd31a2e8c888620 SHA512 bb4b24e5d7f94b12b03be207299c4fb1b81bdc18f50e9fa91213367bbd8a38af1dc2b341487571f1fd5213c36a7b9020212f8260e5a7acecd660479a04b91d93 WHIRLPOOL e82decd6c2780b911912e8c3c6944ea32561663cef1bd39be2120f3fd0784819db14dedd4ffc8bd9be29e449df587bc5851262b6eb1e542833b14f1fb16846e8

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160121.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160121.ebuild
deleted file mode 100644
index 0945641..0000000
--- a/dev-java/netbeans-php/netbeans-php-9999_p20160121.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-21_00-02-04/zip/netbeans-trunk-nightly-201601210002-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 1fba03b..1ad1eab 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-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
 DIST netbeans-trunk-nightly-201601280002-src.zip 209553372 SHA256 ccbc7eb7f1317a14111bc06b7f35089ade220aed0d91e5aa91d774eed602c7cf SHA512 aeeebe3500207a3a4b63d775fec0119980bdf19dfa7e7bd4436c75f4d6b542c3ee6d0a2955165ff50b8d3e4f27acdbf93a5bee29e1f1b4ce0b16c0f4c85cbae1 WHIRLPOOL 08957d670b1816869be8ac6d6de3a67ca3cbe8ffb3c4c92c681355f0fd98016d76de29a49f039b6d333291f5dbe9c2e601f3c80bd4f8fefdd37bdf095c72ef51
@@ -46,7 +45,6 @@ DIST netbeans-trunk-nightly-201602190002-src.zip 209766182 SHA256 80b4e9ded78077
 DIST netbeans-trunk-nightly-201602200002-src.zip 209774521 SHA256 406135c415d38ce3909c4b1debcac43f83d52971cc1cd246c23be73e278464bb SHA512 b9378d3d140a371fbfd31473fe03a98fc222825b6c565df136c28b8de90a7b00b728decccf0a21caa9a1f7d9e0dd0d851f3abdd0e2301f185dbb8de6d29f70cd WHIRLPOOL 79389e9b343f1ff8afec95f8e2dd41265bb96ec6106dfd491a8a53021d71ace9cf2c699ac99ad2b648c7902301d8fa0521f788c1227a963b142ca84bf71635a0
 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_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
 EBUILD netbeans-platform-9999_p20160128.ebuild 9360 SHA256 0d36267f0fa1a1e43a8359ea97ce5218b0c45cc8ca18b17732d70a47810e555a SHA512 46ec34fddb2bb364d249bc023b36250df0e895123101bdffd06bb99fa57c404dd8cd830bbe0b0dfedbe69e6cc4b466fdca9b66950d97dc7b50e3e421405e45b1 WHIRLPOOL 9571f02d3435160d77b990145b0b0379b43d956e5427db08eeee25fe43d644746385049847d41378ac0970a6a4d5541d1516a6e47ba9493430efe057dbdea42a

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160121.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160121.ebuild
deleted file mode 100644
index 81f2bb4..0000000
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20160121.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-21_00-02-04/zip/netbeans-trunk-nightly-201601210002-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 9c8edaf..9b85a82 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-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
 DIST netbeans-trunk-nightly-201601280002-src.zip 209553372 SHA256 ccbc7eb7f1317a14111bc06b7f35089ade220aed0d91e5aa91d774eed602c7cf SHA512 aeeebe3500207a3a4b63d775fec0119980bdf19dfa7e7bd4436c75f4d6b542c3ee6d0a2955165ff50b8d3e4f27acdbf93a5bee29e1f1b4ce0b16c0f4c85cbae1 WHIRLPOOL 08957d670b1816869be8ac6d6de3a67ca3cbe8ffb3c4c92c681355f0fd98016d76de29a49f039b6d333291f5dbe9c2e601f3c80bd4f8fefdd37bdf095c72ef51
@@ -29,7 +28,6 @@ DIST netbeans-trunk-nightly-201602190002-src.zip 209766182 SHA256 80b4e9ded78077
 DIST netbeans-trunk-nightly-201602200002-src.zip 209774521 SHA256 406135c415d38ce3909c4b1debcac43f83d52971cc1cd246c23be73e278464bb SHA512 b9378d3d140a371fbfd31473fe03a98fc222825b6c565df136c28b8de90a7b00b728decccf0a21caa9a1f7d9e0dd0d851f3abdd0e2301f185dbb8de6d29f70cd WHIRLPOOL 79389e9b343f1ff8afec95f8e2dd41265bb96ec6106dfd491a8a53021d71ace9cf2c699ac99ad2b648c7902301d8fa0521f788c1227a963b142ca84bf71635a0
 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_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
 EBUILD netbeans-profiler-9999_p20160128.ebuild 3472 SHA256 6c134db461fe942ae8fefc77b2b710f01fa9d4bc4abbc2837c9c192852bf7ab1 SHA512 432b5630b6df790b8764c3cb9b8d43db00b9687266e7ebdeb22769fda61418d1b0a6d3fa9a782a2cb1dd53109a2b12d20076abc5f376fe13f73dd90c80992c5a WHIRLPOOL a229de1c38c7af908bdc7d7b22e1d14efa43588fef9095df0883fa91497b9decbe75738e79dafadd501fa16332ef3bebdf0cb84fb91499df48de21844f68a8a2

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160121.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160121.ebuild
deleted file mode 100644
index acde05a..0000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160121.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-21_00-02-04/zip/netbeans-trunk-nightly-201601210002-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 04cb38c..3f40ea3 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-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
 DIST netbeans-trunk-nightly-201601280002-src.zip 209553372 SHA256 ccbc7eb7f1317a14111bc06b7f35089ade220aed0d91e5aa91d774eed602c7cf SHA512 aeeebe3500207a3a4b63d775fec0119980bdf19dfa7e7bd4436c75f4d6b542c3ee6d0a2955165ff50b8d3e4f27acdbf93a5bee29e1f1b4ce0b16c0f4c85cbae1 WHIRLPOOL 08957d670b1816869be8ac6d6de3a67ca3cbe8ffb3c4c92c681355f0fd98016d76de29a49f039b6d333291f5dbe9c2e601f3c80bd4f8fefdd37bdf095c72ef51
@@ -44,7 +43,6 @@ DIST netbeans-trunk-nightly-201602190002-src.zip 209766182 SHA256 80b4e9ded78077
 DIST netbeans-trunk-nightly-201602200002-src.zip 209774521 SHA256 406135c415d38ce3909c4b1debcac43f83d52971cc1cd246c23be73e278464bb SHA512 b9378d3d140a371fbfd31473fe03a98fc222825b6c565df136c28b8de90a7b00b728decccf0a21caa9a1f7d9e0dd0d851f3abdd0e2301f185dbb8de6d29f70cd WHIRLPOOL 79389e9b343f1ff8afec95f8e2dd41265bb96ec6106dfd491a8a53021d71ace9cf2c699ac99ad2b648c7902301d8fa0521f788c1227a963b142ca84bf71635a0
 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_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
 EBUILD netbeans-webcommon-9999_p20160128.ebuild 5280 SHA256 96b03f211ff1321f408c7302c7eaaf449ecd1c8c9afd9c7262466f1a2e77bf65 SHA512 66a8969181804e2ddaf2905d614ffad9c69ca5cea1ff1dde1ee94c388eb947eae8fe13578381b7e4258fa6bbc4d20668f4dabf72e83239fbae48090dc9d681fa WHIRLPOOL 9e598ca4d6827c4690f045665d3fc1e82d626820d1aede3c23ecf085127cd948dba415cb168001d48a75a2a0c7dc51b2e052c87209c612c5035a6ed8cc6ad07e

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160121.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160121.ebuild
deleted file mode 100644
index d42045c..0000000
--- a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160121.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-21_00-02-04/zip/netbeans-trunk-nightly-201601210002-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 8b74ad3..b0c3d20 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-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
 DIST netbeans-trunk-nightly-201601280002-src.zip 209553372 SHA256 ccbc7eb7f1317a14111bc06b7f35089ade220aed0d91e5aa91d774eed602c7cf SHA512 aeeebe3500207a3a4b63d775fec0119980bdf19dfa7e7bd4436c75f4d6b542c3ee6d0a2955165ff50b8d3e4f27acdbf93a5bee29e1f1b4ce0b16c0f4c85cbae1 WHIRLPOOL 08957d670b1816869be8ac6d6de3a67ca3cbe8ffb3c4c92c681355f0fd98016d76de29a49f039b6d333291f5dbe9c2e601f3c80bd4f8fefdd37bdf095c72ef51
@@ -29,7 +28,6 @@ DIST netbeans-trunk-nightly-201602190002-src.zip 209766182 SHA256 80b4e9ded78077
 DIST netbeans-trunk-nightly-201602200002-src.zip 209774521 SHA256 406135c415d38ce3909c4b1debcac43f83d52971cc1cd246c23be73e278464bb SHA512 b9378d3d140a371fbfd31473fe03a98fc222825b6c565df136c28b8de90a7b00b728decccf0a21caa9a1f7d9e0dd0d851f3abdd0e2301f185dbb8de6d29f70cd WHIRLPOOL 79389e9b343f1ff8afec95f8e2dd41265bb96ec6106dfd491a8a53021d71ace9cf2c699ac99ad2b648c7902301d8fa0521f788c1227a963b142ca84bf71635a0
 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_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
 EBUILD netbeans-websvccommon-9999_p20160128.ebuild 2721 SHA256 40ca21c62398724d59e20f7bdecdec56b46e5a2f9d5ee203ce6b9e2ebd9a9fa6 SHA512 b24dbab669a5ac22fba78fd35f791b86f9658e9396e5f566c95dddfdefb8f15e1dfbfa1ddcd0a5393718a6c1393db3496aa46e0475a98847c6e90978ed277849 WHIRLPOOL 2d5a1993d1fd48007f590dff46c376fdcd96270c8dbd15d5a62171fdb2cda77337c390592bf4006777aaf6c03505292527e9c456123d055a69272cb4052718a1

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160121.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160121.ebuild
deleted file mode 100644
index 4d56f3e..0000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160121.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-21_00-02-04/zip/netbeans-trunk-nightly-201601210002-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 7083957..4807a79 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-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
 DIST netbeans-trunk-nightly-201601280002-src.zip 209553372 SHA256 ccbc7eb7f1317a14111bc06b7f35089ade220aed0d91e5aa91d774eed602c7cf SHA512 aeeebe3500207a3a4b63d775fec0119980bdf19dfa7e7bd4436c75f4d6b542c3ee6d0a2955165ff50b8d3e4f27acdbf93a5bee29e1f1b4ce0b16c0f4c85cbae1 WHIRLPOOL 08957d670b1816869be8ac6d6de3a67ca3cbe8ffb3c4c92c681355f0fd98016d76de29a49f039b6d333291f5dbe9c2e601f3c80bd4f8fefdd37bdf095c72ef51
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201602190002-src.zip 209766182 SHA256 80b4e9ded78077
 DIST netbeans-trunk-nightly-201602200002-src.zip 209774521 SHA256 406135c415d38ce3909c4b1debcac43f83d52971cc1cd246c23be73e278464bb SHA512 b9378d3d140a371fbfd31473fe03a98fc222825b6c565df136c28b8de90a7b00b728decccf0a21caa9a1f7d9e0dd0d851f3abdd0e2301f185dbb8de6d29f70cd WHIRLPOOL 79389e9b343f1ff8afec95f8e2dd41265bb96ec6106dfd491a8a53021d71ace9cf2c699ac99ad2b648c7902301d8fa0521f788c1227a963b142ca84bf71635a0
 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_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
 EBUILD netbeans-9999_p20160128.ebuild 6938 SHA256 321e9cecf0a08f93e83bc3d2af6f0ad37881332677d29037a323098cd2df5030 SHA512 68e8c94e350b64ddb780c89cf2ac577912ee4165f9f4a5d2f83c2a120730cf2e23e30d598e3ff514bd83b210b1ba2c0570a4f507cd33f17242a592426161213e WHIRLPOOL 6945144d2b18e22410e504bb8d914d2b80bd510a488fbfe4b7969e27b4277eb6b61c806d3e18914e9de950e4f28072633aeffb08f6be1b667e8417504c2a4237

diff --git a/dev-util/netbeans/netbeans-9999_p20160121.ebuild b/dev-util/netbeans/netbeans-9999_p20160121.ebuild
deleted file mode 100644
index b3c19de..0000000
--- a/dev-util/netbeans/netbeans-9999_p20160121.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-21_00-02-04/zip/netbeans-trunk-nightly-201601210002-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
-}