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

[Miroslav Šulc]

commit:     1d62da15bb323d85a88de811dc3d7bb83a8b57fa
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  2 11:12:06 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Feb  2 11:12:06 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=1d62da15

netbeans: removed obsolete ebuilds

Package-Manager: portage-2.2.27

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 61bc6ab..011746c 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-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
 DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
@@ -20,7 +19,6 @@ DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9a
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 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_p20151229.ebuild 3384 SHA256 a9e8aca349720d3269ba2d112180084112ea2ee7184043e7a9c31dbded2a894c SHA512 a3aeebd561b2e88ae1712e955a797a9e949646758ff5ac66a58dc432d9082270bdf72c866b7c76d767b6febc0ca636805ca82445e58641685d668cb44c20f8e8 WHIRLPOOL 24d00d4c926f4080ef38f75e8e93ef19b4fa0bef2155bd633e6b02f99613db07d74125a18e511eaebd10cb324d2f4b78f36377fd5ccef4384b81fb066cd84fcc
 EBUILD netbeans-apisupport-9999_p20160104.ebuild 3384 SHA256 1b7544b71eb8ca0b29fd04285cf3f1fd7a1b3ed24bee476e091d398e2a8af20d SHA512 f4937cd18f555b2e916f49cba0cf94ec26e0131ff840f52d61d82abb7496b74fd0693051770f6db41c2bb35bfb086cd2e63028ed77234f90669db1ed4379b883 WHIRLPOOL 13003602162a041610cc0448d4adeeef075c346b997c2f49b8084350ea63bb6ecc4e6f1c0ebaa699dd2cf5688e43d58575d39ac91d8bb717c83d41a0721b646f
 EBUILD netbeans-apisupport-9999_p20160108.ebuild 3384 SHA256 d8dc22131998f889bcca0e7b4e6d43b3ec298135e386d7f06883b5aa10c71c9c SHA512 289bae2cd42d587b2721a2e43d887055dd4f292b127b8f1a1424525fb42e755140968ad0c1c5a69cd15d989a5efe63c8cbe5c32a1babf705cd4288552ceba274 WHIRLPOOL 16169c9745087e1e7a336db58321bb406c9e9ad2ca69c3d860e9d74815c323116197db668c62d37189252806b3fc60f72c48c77e53ae0cd96acef6c349fd819c
 EBUILD netbeans-apisupport-9999_p20160111.ebuild 3384 SHA256 65e8ac7c05eec6a2d8124789137e8763bfc06c691bc7c1fd1674a17effb3459e SHA512 8b3b80fd87d07bc1cff7883c986a9aa1dd54f60a34d448e04a29f760d0b23295c9d120f99c2d16ba482a76a8ccd9e84500486dfcbb7a9e7a7868c62fe2b8eacd WHIRLPOOL b1a550ce648252e91082550c15e24ecfc842206c50f97372e50fc960475f8b65a68162ba8711e4e5ac0be9fbc7f1dba9931bfa8b337631c203baeb5bccdb83f4

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20151229.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20151229.ebuild
deleted file mode 100644
index dd1ceeb..0000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20151229.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2015 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/2015-12-29_00-02-04/zip/netbeans-trunk-nightly-201512290002-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 f26a5b0..7c0f819 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -17,7 +17,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-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
 DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9a
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 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_p20151229.ebuild 4790 SHA256 40e984d3e7b16b22d2287dca20a7a19605f5ddc8db4048fa93459625dcd4c22e SHA512 01130cdd859af8a9af42940077931b3d1b71382ab406de5e566f305210f21c1c99e67d957c8f7007103388cea621db54958bd519ed56734fff8e813c6cf18e92 WHIRLPOOL 2495372543e121638a7a42718a37b9eb8ab8b6e2677a44921f0ab9f261075f455e223da621ef59a25f178ddfa63206bbc19aef908417d078bfd29f2e13697f50
 EBUILD netbeans-cnd-9999_p20160104.ebuild 4790 SHA256 6c50d15e2cd72a6d604d038d57ebe93ece2e574d113f73d534e6048e1ec515e7 SHA512 c5ba5a6786c08dae2a90d73b8e5adc769f09212532fe65ce78a7ad8fd285d74905d19889995a65e92416fc8d58940cff7fdcec89339047a8a2ab7efe8388e8bd WHIRLPOOL bf2f4243f17b042e9f6400873a3edb7c6f9a03acab3a7bcc97c793e6267a2cc2f4bd7eab97ece26cc3502d628b728a28b90f0f000d8ad7c9786184fc31859d8c
 EBUILD netbeans-cnd-9999_p20160108.ebuild 4790 SHA256 0e7eabbd12b9f3326d5b5cb240535e7ce9fcb916f2826f078ccac8a70b0b89d1 SHA512 bbeeae09cdfc68ef09452e0793b82aa259d5548663334d42c105da1ff76eb2169d57e3aa3857808b8fe3841c55466efc8c946db431612984bbe5ecb8f82ce751 WHIRLPOOL 07a7d7aebd2bd08fd1167cc9d00657a01987f328e44c7659936b6ab862d4b6ecdb015e3044a44b991545fc6634b75a76dd087ea38b986466f393f5f5b40e77c3
 EBUILD netbeans-cnd-9999_p20160111.ebuild 4790 SHA256 3c86c5a49c8ba8089e3df0531851b6605b5932171ae0d4dd03a2ce152e71a1ad SHA512 2fb21ceab1667e3e120d326be172becfe5df9a0ddfb3dc1193af33a66dc4b7ea675f35a7fe4510a1fdce0eac7a5a25f529ba2b7329b202a7a04cdd3e6df84b99 WHIRLPOOL df46145b7d690ac2aff13a41e23b8849d701a5e361b5e707c99feda72bc0c25ae4fdf2b624a3714bdd7bc6d1ede2a261a18adbafe21bb922ec6f611646824717

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20151229.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20151229.ebuild
deleted file mode 100644
index 4168420..0000000
--- a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20151229.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2015 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/2015-12-29_00-02-04/zip/netbeans-trunk-nightly-201512290002-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/BD0FF6016C9AAF367D5F01625AC4E2BDE75EB355-clank_0.3.6.zip
-	http://hg.netbeans.org/binaries/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip
-	http://hg.netbeans.org/binaries/BB83D4F8047D608858154CB041054F5CAE35B903-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}"/BD0FF6016C9AAF367D5F01625AC4E2BDE75EB355-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}"/BB83D4F8047D608858154CB041054F5CAE35B903-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 ef0fdd2..dfee776 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -9,7 +9,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-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
 DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
@@ -26,7 +25,6 @@ DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9a
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 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_p20151229.ebuild 2968 SHA256 850bfd5b4c690305c784f03103eb6546fe8c9d8580e06f145ffe2d5e04688df5 SHA512 c3df9e2f1d1ce75cdc0cd9374dc8fbb0b6430cce225b3ec40c36a2116f7940a10ba4a72a52cd2aec276727abb1cee47e7528f3d3ffde7151a5e76687f766fad2 WHIRLPOOL 3454d360a63354a2f66a2f0111689ea4480008d1b812dd286c54f46c8e40f4aeb01a144d820a3c79261d89997398639140b3c275be323a1514893e24142a2743
 EBUILD netbeans-dlight-9999_p20160104.ebuild 2968 SHA256 0100bcc27ac6d26bbfb248f08baf151f02c4259bb0e0323bcac6aeb83e6583be SHA512 7fcda8e5abef409491dcde6b2ed7ca4244f1a4316d871a0a1dd1ce77bc1ddd9800b08ad9b22df38dc7f84850a8df0b298642f5631e7e4e799273a5254040fd93 WHIRLPOOL d18ddd21053660c3f67dcf35f47426effff0ccda85c5e72e553b22a36b342cd875d95fdab8ce41e7e91ae9684ff164cebac535c693edef3693bf3f86fa346a51
 EBUILD netbeans-dlight-9999_p20160108.ebuild 2968 SHA256 27f08dfec6e4bb02cbef6a9979b444f0dd74688ac3c44177fdf5444f2909a3bd SHA512 29864e22f61edc575e0bf79687f1857ac57bdd92d185ec72a79418204ef37a62c5f23e3880295445417ebb39c38905952a43f5c3df20196b0e22b3a26469bb2e WHIRLPOOL 6d02dae9d9cfbb27abdde72759982c089f6c6d2426062e215577ac77dada0a5c2e373c417a7517097a75c45e1d9cb6a09664d109d7033c67c92e59c68cc1f8f3
 EBUILD netbeans-dlight-9999_p20160111.ebuild 2968 SHA256 751be0cec30e7ac0e3dc808d1d5e655d76b44408591386e9ae397b4a061fee84 SHA512 eafa2cfc11ba5ef19fc9a792dc245873250b5ea5f9fec369f05f817d4dfca4477b012071f0abcf84a03a17657dfa098b645ad6663845e5ec3bdf1fb9ad719133 WHIRLPOOL 2c7752be1f799f4ce3e1ee0f5c96f59b5f043489739ffcc52f2ac03531cc1815a7dc8ef2f7e5c8d2103bbf8514adc7ca56cd6557c860a4839ef1b4935e59ab5d

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20151229.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20151229.ebuild
deleted file mode 100644
index 2e63c75..0000000
--- a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20151229.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2015 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/2015-12-29_00-02-04/zip/netbeans-trunk-nightly-201512290002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/D84D17804FB0587297CCB4CFF3918561212671A0-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}"/D84D17804FB0587297CCB4CFF3918561212671A0-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 fc44204..8e269d7 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-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
 DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
@@ -52,7 +51,6 @@ DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9a
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 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_p20151229.ebuild 15825 SHA256 b4258d1dc8bef26206ca4cf7ab15af9c2b8d5a299495add2dc32b86789a62d2c SHA512 434ee298b4ca4e8808b979f59eea633c3778d3778949b39497ce2378b3a034dc52dc3d75619b1217dd081a574acfa3a9d6f0e53e0da3b4037da6938eab190db7 WHIRLPOOL d9e2f2e6905213cd8446bedbf5f65995fc0fa0a2279cc54fbbf238c26faf2c613d29b1b9dcaae9d9070c1ccf5ea5237e8fbba08fc1265e3a97f7797236154670
 EBUILD netbeans-enterprise-9999_p20160104.ebuild 15825 SHA256 efe232a4ee688084bfd86d70c2fed4a9fa5cb591fd9ff4237e7c8954340c52da SHA512 ab3ec93b101b8091e979bb574435dde70b22e9b87c230542486843565db6a70521dd933b4f992a13a5ad4ba93f019823130c3e61c6115a4b74519c37a0759524 WHIRLPOOL 9d53fa6b979851c4d46b27cea723ed8d22e85e4e2438e56e7fcdc57745308e98f1927800a12e432de4d6c46eafe7e4e5ba71600e67f031a0394aa42c4e5656e2
 EBUILD netbeans-enterprise-9999_p20160108.ebuild 15825 SHA256 f34cb390190dc60d95784f28d943de98fbfe42eb32bab20cb7c964046295005a SHA512 d265877a76712c6a7a2589a93b90fae87d8bfc1c12aa4a5a9518cbcf366582751c993e47149df924add26d68e348d442f87903d3ec9a60246cc681f70898c8a6 WHIRLPOOL eadca79074ee37848e20e99cdd32b8f87452679899b1f0dabfad79ddc7cfdb1814ffd7a5268a9c1e459d7f0c2eeb821e21c35832750fa02914e5892222b0f2dc
 EBUILD netbeans-enterprise-9999_p20160111.ebuild 15825 SHA256 b5182122909cb40c05257c03a7df1775299bfb2212a029707587dbfd1db5d431 SHA512 f0bcb7c4209a85a9acb750bcd7da0159bba83954aa1b91f2b5f0f0397418dc114aa1f6da55b5371555485ffde62bc80b22bdb904e4634fba7546fd5d793c47b6 WHIRLPOOL 529edff06c75160e4a08bdb1d6056ccc3b387106def6a87984ee81e1dfec8720589d84dd8a03610955ec502f6842966d96cfc8cee7fa6bcbff825b5be4189ac1

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151229.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151229.ebuild
deleted file mode 100644
index b417919..0000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151229.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2015 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/2015-12-29_00-02-04/zip/netbeans-trunk-nightly-201512290002-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 80082f2..a446cb7 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-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
 DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
@@ -20,7 +19,6 @@ DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9a
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 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_p20151229.ebuild 2913 SHA256 659462872eb193d863de274e70b3c2f9833fd09aa92ba11a7a98ece702ab665d SHA512 f270f7bc01575ec00d7eae54d1ee9fb02ef49509404b0ab6f66e3bfd373d406b98f164b3e04cc1c499e76cc064a59f03aabad9d8a0e45d6aec57cfb010c53799 WHIRLPOOL 80f9fe9e2100b3a44c0a9c246f89a6d7cf3a7f0d40853316b01bc31b819c038ad48ef8972ce2c7bdc2aa33e6b59fe5d023553eeacd4e51b4d77271269740fd4a
 EBUILD netbeans-ergonomics-9999_p20160104.ebuild 2913 SHA256 f6962ca5bad97184363417c21b385b4a4e376dfa15b86a42fbb576f281d4edc5 SHA512 5f2dec61077a3750d7feeec4b5b58765f72f4aa8ce2e8966c7140d196cf4608953a3aa00a7c8b0d11150bf134b124200115ab65d0eea107bbd14841cfc46f435 WHIRLPOOL eec826fbe490527fb017b0f9ed8ca729168030261b49c5bd1c57f3bd824b7d76f4ac8bd022b0705443d0e7b2516c36a605737c1e30a2ca429e4f4276df07fbbb
 EBUILD netbeans-ergonomics-9999_p20160108.ebuild 2913 SHA256 4b1afd1b178c6d867c94d6e686561d8c72aeea70feecbacf6fbc6c886ed1c7f1 SHA512 d17c41b2d1750183086c0abbf2da232145102c0f875ae89c840aca85ec670b496e82d46c9558d701f93370998ee6c46eaabcb0eca29274e0d8993f7ae932e80e WHIRLPOOL f339153c2791b78dfa2cc16c208c79de5f66a99b184fcc420ba741b12f6e104334fdfc7de5371834b8d56b75929f498641c56196a307c3e7895e1bb2c3f197ed
 EBUILD netbeans-ergonomics-9999_p20160111.ebuild 2913 SHA256 18e5e4b54ad13418ad908a5e60f4cdd077bc9869da898a7065c81cf92b78e8af SHA512 d6aa0b564d484f5e98630180da459cfe6f9e9dc8f269a833103d0888b234a0b360d4a0d778972009857223bca1876dedfbfa0c82b6591ca54b591600345b4273 WHIRLPOOL 2bf3241d42687b0f4ede5be9a06865962eb4b51fec763b1a0248ffe16795e41b054f00afff69145893efe5ccac7397af0f7e9c1b76de5b150495ed5935387996

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20151229.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20151229.ebuild
deleted file mode 100644
index 7607df3..0000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20151229.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2015 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/2015-12-29_00-02-04/zip/netbeans-trunk-nightly-201512290002-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 de1d414..478cee2 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-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
 DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
@@ -22,7 +21,6 @@ DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9a
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 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_p20151229.ebuild 3377 SHA256 7031c0f8bf48bbaebffe6292961f8232147e830e8f415ce1b374c6e6d90a83d0 SHA512 e87e332e2ccc09d085a85f8b04fb5bcc87c5b1fb05df15b462aaa059b495445c827b6a62be90152eb32b53ad24321a906238a7ecc99a4514a08ad3958d2e6738 WHIRLPOOL 1851185f16dc912805cc2f82846a16fe6e0b709bbc25b1a11e0967e858039c30f91a291a092ce55f4651e8e499692bef14563e4dbda9dd2f9d2464007230b1a0
 EBUILD netbeans-extide-9999_p20160104.ebuild 3377 SHA256 67dab498c39d86278fec38b2a0faf691c889136520bc0692de03c19c2f94be9f SHA512 7cf6f05711df39c569228c0b62734955c8430ed981ddbbb6a7252c834bdb083f043398161b3a6b9cc3ead2666595bd27f51a9413c95ae9397f8cd4766f2c8953 WHIRLPOOL 15cb3f4ef19842935a829e24bedc9910989fc4caacd62750f46263af6c3f501c9b00985e7f7509b034f1b479341f04ed1f7a9a9d3c4a1d4b17ab99cf9785fa82
 EBUILD netbeans-extide-9999_p20160108.ebuild 3377 SHA256 c6676bf6c5ac323a20fafbb6d798413ae7aa982a414873a654ef73365af9c225 SHA512 ed177424f7ad0ecec26071d7c9669198de81aca39d3c0de233220db59b3264fb46756efb77ee791fc9ceb7c8dc31cd7ec4521514fdb7ed411250c5e7060fbf21 WHIRLPOOL 295756c0ae5eaf4f9055ef9f5e02bb3449375fd9564f1288e621d666e82828ae5e20097de5a2bce379214aa6e463cdf46bd4099627361e80d327601ab99eafce
 EBUILD netbeans-extide-9999_p20160111.ebuild 3377 SHA256 d07a40e7a6384cc8a267eaf3a14374e7c2b08635ac055a0c5cebe58f9b138a62 SHA512 1dfe6c2d5c29b7d8d0aaf8f2aac80dd1d8e20a3af8c11edee7fc98eef4eb9f3481150f8c6cdb74d3a9347d6e4a5b4eba709adf282692549df0e838212bb2c94d WHIRLPOOL 4545c48c0fae1bfbcc903dbb6e8b20117e1cada414f6e276a3e2f7bee56c8bb601bee08a5c6080e0d9aee180a350838de61444911c15dceeeb2c4117347ad939

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20151229.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20151229.ebuild
deleted file mode 100644
index 0ae343a..0000000
--- a/dev-java/netbeans-extide/netbeans-extide-9999_p20151229.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2015 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/2015-12-29_00-02-04/zip/netbeans-trunk-nightly-201512290002-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 eeda5c2..5d9468d 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-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
 DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
@@ -22,7 +21,6 @@ DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9a
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 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_p20151229.ebuild 3416 SHA256 9ed0bd8bc7d926fd57aa49b6b5ebdda503b5e84031862b68561e49c17fd851a0 SHA512 dfa061673936bb2a6ae4c034d6d58846e3e9546adaff9916ed8bfea7eb838105b11ff000d018bdc75c90a243c29e51e41de21e83b92c16d2e7d02cd8e05e0643 WHIRLPOOL f4dc8105d0030ed389f77c02cf8c72d0e8252c7068fa7eb663b368e70e641651abbaac614d813b1f496f21960c9f962159578f0cbd52ed9186689b9a4448a8c8
 EBUILD netbeans-groovy-9999_p20160104.ebuild 3416 SHA256 06d03b6e5ae56ee23ec7291f7499b6bbb3007c151c225c31838b41aadb901565 SHA512 e2c9fa07945e0311a5f0d5c5546c00025c5d4d44edc1c97184cd7b8c44b380f6b0303afd88f066165ba7bb4523160753b4535cee5ab820fa97adf7a4d84e9581 WHIRLPOOL 5491d208c112958027225479a6075ee47c45637696a7ab735047715ab3eef3ad1c99c86307c1ee99fa9f498875fceb318526e87f3e0f9e7ac5d495706b06d21e
 EBUILD netbeans-groovy-9999_p20160108.ebuild 3416 SHA256 1c3253d2ff2f80bf8eefeda33cc6f75c7b9125ab3d4a294f646a3b2cebcd514a SHA512 e5d33196531e963597cc7c95dbf742eb4bd2ad1f83f3f2375ec10347a018bdb98403a7eae760956a8379327db5ad81c95051d28f8cfabe4b39da4aff3aec8219 WHIRLPOOL 64739e7e3f824eb4a0a17c786810f501949c5e80e47d09df46319d2e3dbb151faae19a2a3a229c82d1cbd762088932f9bf603bdf57a1510574f10fc4794a1993
 EBUILD netbeans-groovy-9999_p20160111.ebuild 3416 SHA256 2d65c80602130e87d39f8f3759521b3a2d5acd1ebb85ababb1425e52a2855d8f SHA512 f462d33ab3f255aa875a2673b39f2c8a4dae5e0b77521b75e99fa995aa7f427ea4bc6f2f9e346ae03cbae78d0c09b95b9ede48202960f8dc52bf91e3a3c6d6e3 WHIRLPOOL 8b0af3b18ca31e34a6a4f411a387dff97263c17020ca063f7f39d5bfbbc5569d486e99e9b259d09b162fefe6030993dd2a7949e6c8e487816716038181a77c26

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20151229.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20151229.ebuild
deleted file mode 100644
index 9f9f0aa..0000000
--- a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20151229.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2015 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/2015-12-29_00-02-04/zip/netbeans-trunk-nightly-201512290002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/C136AE67C3C40740AE986582BAF65BA5C5CE69A0-groovy-all-2.1.7.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}"/C136AE67C3C40740AE986582BAF65BA5C5CE69A0-groovy-all-2.1.7.jar libs.groovy/external/groovy-all-2.1.7.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 3f4e0a2..30450b2 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-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
 DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
@@ -25,7 +24,6 @@ DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9a
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 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_p20151229.ebuild 4126 SHA256 83fa7c63e708281a8f71121aedb75bf00031151e337442dc5a875755734730c7 SHA512 07b253f8136ec18d0df12556cd76b1c8eec5c4658401ee20a7f836c43860e4dc29609a2ae8edc1296fa3c09353c899f044293771c5cd0c2d9720f9a14a996cb3 WHIRLPOOL b22324479779826bfa201f7095ad4a80bd065089e1bca95ad542aaeae44e32a1e5d89a97a7c76fc82e10d2502291049977b2f8d16c6689a2178f7e0bbb37e330
 EBUILD netbeans-harness-9999_p20160104.ebuild 4126 SHA256 6bf8a72b198b98472cfe603cea05f99c6aef71fd9472f3a70945a7d60c3b424b SHA512 89ebd29de70b23981c3a87bff1c5296931902e5b391a5990af381fdcbfbb27f898841b89720c4ffdc59e2a2aba556ae0f463f92d016aa18a86ce9f73bc16064d WHIRLPOOL 050f630f2b743aad37480f278fdb753db2e2f4f699f7b5abdfc5bab62d7364b5e30a9c6ab91237554fc1f01ed5ab6342ac9370959683146cef57b65d977903dd
 EBUILD netbeans-harness-9999_p20160108.ebuild 4126 SHA256 ac9e052d58e0ef821f2030484f576bfb1778f31e0fbb4295f23cea5de0ae444a SHA512 994bef755ff15e22e2334f1f3fc6a095cfb6a1cfaedfe19ff5ce4932283bc3f2b356d6462d984730f66c002c3fb62fadc6821d80a12ef3a05935e326b42e7c64 WHIRLPOOL 94abc87b3a66da8a3b36e39cd1c34497a3196b88a83679ea230e2d963cab984dbdfb15c799096995cc809ee56c90562eb9f08feeb3a1cf66b540e73b7c88df0c
 EBUILD netbeans-harness-9999_p20160111.ebuild 4126 SHA256 6aa6a32589169d8d304f28ba0f3e69a39b1bb07bbd5178e421d5e7cc63e49ae0 SHA512 5438dfc1baaff1ba18628b568e625c32f0db392531753aadd16b6416eba57db8fa6d8e3874ef0ac5c4cb9b9d505a3c38fb69564e4c04a134872931cb083562eb WHIRLPOOL 82a10fac824a252e9526c16659d97243cae5abfd6caf05dd2d780990c8f89b2010e3af9765d43517e97a654c23e9f8b90c119a5a67b30051ce6b6694cf29b974

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20151229.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20151229.ebuild
deleted file mode 100644
index 73efd58..0000000
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20151229.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2015 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/2015-12-29_00-02-04/zip/netbeans-trunk-nightly-201512290002-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 6577a0b..872f10e 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -136,7 +136,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
 DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
@@ -153,7 +152,6 @@ DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9a
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 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_p20151229.ebuild 30832 SHA256 343c5ea332b85d9773ef3f71d381d3dd3958f5975557de8f6c19f55ffe2cc44b SHA512 d575c83bff68fbfccd27862e5a3c166c427b1b5f0dbd52f10801d2654527801a807d0a692a780d29582c733cd873b8707cc076d7756adecec2e32ec31fdb4f00 WHIRLPOOL 74a477b12d37c9834d3f186b88ca1a9cbee175eee7e7e59527a7955c8d2922afbe80a17498f8d405dd0c8c80a03f052d84d9ebe9467ec8c4a21a9fab50aadfe4
 EBUILD netbeans-ide-9999_p20160104.ebuild 30832 SHA256 a8b1a0a3f049cb08ca20e2458cf0b1fc092a86803e50cda8560ab84310edd5a9 SHA512 e306444283088c8f9b4235e7570da2f7508d0b3a61578384f23150467dd873a8292608656c7129c10e3da34f413da7f9b5d045c533cc746d9685e43390f4b59c WHIRLPOOL 7c002e5145f6b07f23b214b44b390fc2ccd1c44720ac9378ad1e5be262b4d9ced1f13d8aceed181baeb5077d431136960f44783aa00009d2488882e966d0fa00
 EBUILD netbeans-ide-9999_p20160108.ebuild 30832 SHA256 0bc7c27b36ed19cfecdc744c24bf8633dde7a8de5b8596574a7b78609ce36352 SHA512 e67bbf338bd6328655489d258d1dc0ffc1b60e11f911dd02216bab41da337d03f79cac52832a6fd89c0d342913c4873a5d4511017266702ce8d81dcfa9c737a5 WHIRLPOOL 6418d332c041ff069b3009e7cdb7d7e9027b8710ab9780f82616aaf685eb5651ad65bb27c494d439d2f2bb16b1646078eb5f0c9c906c9238ac719a3e86cf8da5
 EBUILD netbeans-ide-9999_p20160111.ebuild 30832 SHA256 a86afff328df13ef40a2d1095c4caddf1c9b9d62f677c0932aa00e51d59a9c02 SHA512 9358184c003761a80e130292ab77731748b368fb7ee9c47288ff455fee18c61e1d9642f4e9b7dd8e66bf0e5958b3fa3c7095525eb85f86d0001f15b726b3ff6a WHIRLPOOL e765780b09c81374468442c533b3697a71d67e1e91c38c05bfc4c06d18eb0d34b0edc655fceba9dd6d336caae8e05bf6fb2d1922d28ce806017270f454a8be75

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20151229.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20151229.ebuild
deleted file mode 100644
index b434fcd..0000000
--- a/dev-java/netbeans-ide/netbeans-ide-9999_p20151229.ebuild
+++ /dev/null
@@ -1,384 +0,0 @@
-# Copyright 1999-2015 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/2015-12-29_00-02-04/zip/netbeans-trunk-nightly-201512290002-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/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar
-	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/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.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/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.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/6FC6098C230D7CBA5730106D379CBBB42F6EC48A-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}"/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar html.validation/external/html5-datatypes.jar || 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}"/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar html.validation/external/io-xml-util.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}"/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar html.validation/external/non-schema.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}"/6FC6098C230D7CBA5730106D379CBBB42F6EC48A-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 0803e48..b91931a 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -33,7 +33,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-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
 DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
@@ -51,7 +50,6 @@ DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a1
 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_p20151229.ebuild 14930 SHA256 27f166d19b52e9ca7c9e8833b234a3d2e024c14f4e79f458db1ae8695895aad5 SHA512 da55f7945bde1ffdf5c933f5ff9830b389cb1c4c3d9fe9634bc64476fee963d977a2711e44db2256499710cbf37454080002367c8159be3fa712206e823a0682 WHIRLPOOL cc771102b6a515bae8681542eeefcef695d12af27e6fa86a6abf10021cbdccc07ab36e963bdd93fd5e5383b24cb6a0c6905f198b87332764fc4f938f27712b0e
 EBUILD netbeans-java-9999_p20160104.ebuild 14930 SHA256 ba68f8dbd62648ed6962e9179cef0f5b8dc9068acc1f1585ede34fb5909d4f15 SHA512 181ebca4afbee9c2dd2c372eebb3402f36338668e52e1a471bd137b65776d7c3d0af28095ffc9067fff54cb95daf1e61fe557de3b485e0b097eb83de9c7c7cbd WHIRLPOOL a8f3af2ea09682a8182638a3766505322445720bd3235127474468bd2b75d2440f477baa44d821cfa3f89faee8ace29fdbf34e4edc7ae7437aabe62c6ad06784
 EBUILD netbeans-java-9999_p20160108.ebuild 14930 SHA256 7a8618286dcb80ad6d6f36edd0e9bfdb4758ee8cbcf1a356628e21e75bce3cad SHA512 31d3e97201b3f355b9497d71b2265c49ef983c6125f378b738812eede8fc2d0539d1d939f719e3ee3d1965650ad4281940f98caa26a444a5c39e5d58e744a288 WHIRLPOOL 0cbf06054910d64eb7364f1374cc82f443a20854dcfed9cf8fea2b0e02772be2301e33560113c0c4b37290c956c85d6304725a1df54bcdd76ed73f017eca139d
 EBUILD netbeans-java-9999_p20160111.ebuild 14930 SHA256 dd0c03f1b8aa7fbba7f8387b75d15a3a04f0573ba598531e893b2b9d9dd19f2e SHA512 be73679b3db61100745704618871d7b85fbeb9b016454a1084ae4435ab81afbc920267337642b793b7be2008a3214194d452346523583ec8ba3b44cdc0b9eb16 WHIRLPOOL daf3be86711d2475f566dd836717284f7a8087f433ad4bd754f87458597299e3180d50b0ade0b7c208be761fbfaead2b54f54d275fe3f2706f48e7881b0316b8

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20151229.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20151229.ebuild
deleted file mode 100644
index 3c37c06..0000000
--- a/dev-java/netbeans-java/netbeans-java-9999_p20151229.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2015 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/2015-12-29_00-02-04/zip/netbeans-trunk-nightly-201512290002-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/450929B1252E7AFEAFD7FCCBE7D1DCA6AE153ED5-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}"/450929B1252E7AFEAFD7FCCBE7D1DCA6AE153ED5-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 5ca48c1..521f35c 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-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
 DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
@@ -23,7 +22,6 @@ DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9a
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 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_p20151229.ebuild 4971 SHA256 cd7446cd9564c50fb7b34a3c41fdc4a02c745d20b32e77f76804de7f678d9932 SHA512 eb381b9c038d298eb8c1f1ac0a9ca417fc6e03d64e3e9ec71c675b05468a4bcbc15407ad41566e3ec00eec27721659165353cd2ebda9315ab8fa5507cdc1b07a WHIRLPOOL f2176499facbab5125dad58816090dba17cb3ea07b6871b2da905517cce6f26a0d590d6524a2c10d9684ecc60c19e23d1c3b13d8298fe3f58d7f60da48a1064e
 EBUILD netbeans-javacard-9999_p20160104.ebuild 4971 SHA256 2d9b446422f5bbdae0bdfb9499f69d24199ff3f6b00d08b50cf85ffa6d92d5d3 SHA512 a5f8a1e4cd2426324c437b37c7119ccdf0826433490911b2f65124e9e37a5084c0021467057a338621f6c6dd0840e2ffc7fe425225ec10b6bc3cd2ad01be804f WHIRLPOOL 7d4c1f5ebf1b91996459f20d0b74b0a4fc18b96047cb967933435474a7c640b45bab067a18d8b86ec903e2dee7b28b59847339461a1d261f5edf677b63e42654
 EBUILD netbeans-javacard-9999_p20160108.ebuild 4971 SHA256 5799211de058e7e9aa1ea0949e6ff80bee1a79ca44af0fa4ba898cac1a5e30d8 SHA512 6a679c0a705c6ce077667f142f0f0c1a45df29630a956d5068e4b874552075ad1d2188c8fb4c99f41268e432988811eb47f3b7deb1c3da2280f04d7d636faa0a WHIRLPOOL 6ac05574f1fd269a1c39e4bc9f4d3c15132ccc69f903d76b8e1b127a8d05861ad6d802be6599794949ed823d97f7995e19d3eca429173c00d5cde8559a102d51
 EBUILD netbeans-javacard-9999_p20160111.ebuild 4971 SHA256 444dff9c2c13f95fb870418bdfd4635ee1d7ed382beca69bce93afd76072d065 SHA512 281dbfeac334ceb8ede44721a73311d0d2ad3f844ce6a725e7d601b3036e86456fc6ada2921c34e394a857ed3ddafa5434dd38aed2552802c2f850246bb902c2 WHIRLPOOL 544744d9bd6601d7c08cea384521c1e424c2f177bc3ac11a314a4c102f3ba3f552b31ba84136981b3b0555c139fa028241914909f4b3189f83af7ae73246d47f

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151229.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151229.ebuild
deleted file mode 100644
index cc675b6..0000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151229.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2015 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/2015-12-29_00-02-04/zip/netbeans-trunk-nightly-201512290002-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 e342597..07d16a1 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-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
 DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
@@ -21,7 +20,6 @@ DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9a
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 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_p20151229.ebuild 6293 SHA256 572525c079b0c8c8a5f547dbe77f22230b5eae8f46410f3e2c8c5b2d87721a69 SHA512 0b67494c2317aae103b194aecdac9f766063cda39f78007ed4edbd5d961bf8f5dd402b7293802acedfadbd7b926c66d28330e4ad077ecd242d216b2cf8da2526 WHIRLPOOL d4fb602fc6291779eab2259e33498559a2604ad68960c30d863964323e9b44c1533ab10a2c1e3f440fc37bc59819649bb53cd6e4b111987d4ef9f5de12bdcfc8
 EBUILD netbeans-javadoc-9999_p20160104.ebuild 6293 SHA256 2d75f2091fbab033f643f1aef2b33034e5a0003846a91bc676165144f8835a7a SHA512 b159873d3cd86818f353f43d7f12b764ca42d24abd965b44513d32b0c6176255eb4ce833a5ecac9e5f1fb68a4dabb10776f6e95dbd13eedfd4b3cf3b352005ff WHIRLPOOL 73a968ce3674f5c4027371543fd286724fb3fb96b25f1d85b7311ac3d978ea13407c2457c9931e814b443349db7e23e58f62946870e38d01a954d31f28dc34a6
 EBUILD netbeans-javadoc-9999_p20160108.ebuild 6293 SHA256 a312c7663133df8311244766d7cd28afb67ac3538647b5c7837bfb99c687e705 SHA512 c6e180bf67cf1f968f97bf083451401faa3d87c772ed4a82c07aec3c0ca612c28bf461adc5536b0a26ed876c441b79d1042bb28cc6c0a0e746edf7d821290c0a WHIRLPOOL bf9d0727e6b5dbe79b5530469cb40ce8eb38b62e50326cb6fb1b1346de7ef2db49600805c86a4c67864bf50fbdcb8e2b9ca5972a1ad8ee0d7bf70317250079bb
 EBUILD netbeans-javadoc-9999_p20160111.ebuild 6293 SHA256 92b134d3634dd196b679285a9b6a1d8643d03e3db03b077645447d5af604271b SHA512 57edac8b237c110581aa1f8740b224370599519100124319560914bc89b8a470ecd3016dc5397f1e48b3c316d19d9611020f2e956eb818fa19a4d4b6c0d9740a WHIRLPOOL a8c6a997461a4ead44384b741dd7f2218176d8c0958624c73d5b90f341614699444350106a2884e5d5c32c570975e5fa1a8f376408130d2d81a1f1a963f7bdb6

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20151229.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20151229.ebuild
deleted file mode 100644
index 8858749..0000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20151229.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2015 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/2015-12-29_00-02-04/zip/netbeans-trunk-nightly-201512290002-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 12f6dec..008654f 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-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
 DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
@@ -28,7 +27,6 @@ DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9a
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 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_p20151229.ebuild 4717 SHA256 8469b0a41e25ad8cd23f44f47e9c2b6db741625466f8023f235703c5bea2c4ef SHA512 b8c78104924823e265da7775a9d5cf8d10a77cdd735a9c0e86a328fb3916be5bd42160a63350977c10b96e730cb0c50c8c30cd2f477c5768aea56fa21af616cc WHIRLPOOL c1a76a0a40bf1b49908df6f85690413d490d743d150c6f5e993629f17014657bf2f82a982aa33405f6e12f49ebe4e56fda798314a8c518945d6d6713e2718126
 EBUILD netbeans-javafx-9999_p20160104.ebuild 4717 SHA256 59a80e6d0bab595781c7a607913a4fdf0b9590d7d81dffa8396f84c3f13d9136 SHA512 b72ba3e52921421bf51edec7080a390df9232f62bce3b7ebfedb732599d4481bf34aecd610799768ba3449c35f8bb50e54bf47c0c78ec8585d424ca3a27a0cea WHIRLPOOL 8073288bea2a476883eb9ddf78fb1327b7b634f9245355b9d6e2490bbadd2a5328515925afa079cca9b307f3026082176027a1cfbb4a4dba70c148bc1b4daad1
 EBUILD netbeans-javafx-9999_p20160108.ebuild 4717 SHA256 e9b5ad69533d04f102b9d6f892e7f0173706f42aa130e075b4e4770f5131b11f SHA512 c7467a586e8cc74f08f36bb8b9a77beb96abe13a0841438cfc8bed174663ea5949ff6da202130c961b2c52e654c502812f79615455d93f3e5727e4cf93e60b7e WHIRLPOOL 24ebe2a5f4b1160a4157423fd277fc4f5222378c022422b5874f65d9346598ec2ee252105042b1e297830418f975b311a7f8efdbecac5f0c83e903c0d7bfe5d1
 EBUILD netbeans-javafx-9999_p20160111.ebuild 4717 SHA256 b324c0fbbba0034583640e08ea5ceb5d94904a93b025f3b01171ea3316ab475b SHA512 81afde2be0b009e2db65835fd72c79de4bf4c411be9600b127281d09eea457b40b6e9fd5492e87c9301da47606e30587319943b7fb1cfea7c93e3dc57c9728ee WHIRLPOOL 7a43413a66573bfe1c572d2781c44f9fcbb6a0fcf98df0ed302987db15763224c19820523899d16dcd290451dd116626366dadd6f197560904d965d70e9e3631

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20151229.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20151229.ebuild
deleted file mode 100644
index fb1f258..0000000
--- a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20151229.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2015 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/2015-12-29_00-02-04/zip/netbeans-trunk-nightly-201512290002-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 7fa50e5..11a20eb 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-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
 DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
@@ -20,7 +19,6 @@ DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9a
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 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_p20151229.ebuild 4412 SHA256 8bc4de3868b8f53ccbb7ab4445fdf027712dea92b8e7ed4587bc159e6bb56097 SHA512 056ee42f1ab26d6e1d463caaa52cbf967fabbd19248a49f358d7e445b0b40f57e65a5f982350bbe9c199188f768c4437fd02fb3f5b917069b96e3c783ab93e7f WHIRLPOOL b1bd9b1ba3f62a8e22e66b592108217a763dedb96ab3cd6b2b078d7849ce411e6eb35500bc1b2181859c2c6f646098c7e6b34c59dbb6ff5405b3f74799ecc474
 EBUILD netbeans-mobility-9999_p20160104.ebuild 4412 SHA256 53139800c0b259b2bd7254d29547e225c9c31695e4b3c195e2d19fa4e65efed2 SHA512 4e0845b40fa279a700e3ca6e5f4ab221465c47c535d2405ad7432139f240a02a58c111753527c09a7de5364c3d6c7d7e83ef242d4711ef0e73109974fd689a51 WHIRLPOOL 3d6fc8ad2bb81055fb9e533265975590784091e8a3f8ff9f8f4d28f347a4c16e61c09bf70775dcdc05d13f0cd56afd391cc2336ff5cc7020eda32d7bd86a6fc6
 EBUILD netbeans-mobility-9999_p20160108.ebuild 4412 SHA256 0b1cd91916939bca6cfb06178757f831625fed434675393a0687069911f1d2f8 SHA512 88764fb80fe99833b24543b2f5580d34d4fe2aba444aab8b1f2384c880f71fc02389456e877461ca96b544a29b3416201d9664a81ee68d5e67e47fcb3c2f7b08 WHIRLPOOL 979ff013bbf69c720157df10c49bce1e453ad42f706b5ac78bb3ef06b5891dba345f906c002506ae46924c23038c807effd318c5acf20c2f2a459b539ab53ca1
 EBUILD netbeans-mobility-9999_p20160111.ebuild 4412 SHA256 a626a4a5232ee5235e851862491c1f0dcc5b84e33ae85ef842531948b8627d4a SHA512 7afb898984150c7491bb1df9f087b2701a689b161914084408ee1fff3ce48a96ad3663032e6db2053c5e0341004f7c34068127126dc893b12fe4dfc9b8d1d3e6 WHIRLPOOL cbb5aa89af025337f5e5cf967849dc10fa2cd81ec397bf8d89752d1a28bad618cb0a06fe44f7e58460724864a82f6da1c6072dba998168647583517aa0f5f73a

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20151229.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20151229.ebuild
deleted file mode 100644
index 3589afa..0000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20151229.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2015 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/2015-12-29_00-02-04/zip/netbeans-trunk-nightly-201512290002-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 b2a69e8..dec5a35 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-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
 DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
@@ -23,7 +22,6 @@ DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9a
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 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_p20151229.ebuild 4111 SHA256 307405ecf0b1996504856035f6d74cb8b4ccac7f433e343ebad0815b87c9901b SHA512 6a4e483e4007790a22bff6f31dfd4d11aed0f899b25c6527e197dd71d779ee2a9e7743d5deb41c9c35d8c11b0b495c086107f5ac5c9091edaf7bd9fdf1cef0dc WHIRLPOOL bb287d8a383384df7e65c8c4bee205598540a0711d725d0e71fa04da7b4afcff728c3f585c7f5c5416a9030e64117b0b76a46beb3ddfeea4a44ea4d2dfb23ac6
 EBUILD netbeans-nb-9999_p20160104.ebuild 4111 SHA256 37c19b6aa13fa95700d10483a58ddaba41482cfb04a7946eb4f6e698fa60a5c0 SHA512 2faff85920f5c09e2b52c7042e62585c4368cb9fa3877dd21ff0f23d3ddd91ef1323c1e669d56991c4048c7549485ad8c92842ebf5393c80ff3dbf00468a4de6 WHIRLPOOL 633e87b3dc1d067592ae1b7ee9f0bc8b6fe288457a505dc1d018007a791cd927966969afb936a340b58eabcdca04063c982a8b3e089dc05dfc33aebdbdbc27f4
 EBUILD netbeans-nb-9999_p20160108.ebuild 4111 SHA256 4f26d5e7847051f7bb02e0b8e8c67f483c4f405f683714c8f5613af748513a7e SHA512 75c8dea4e0df38d80f94a52117d54a06621d545681956287cfb23746f0384462bcbe5b272643014f18586cbb9001ee853679ca25e0f23d476ef78f700d091cf8 WHIRLPOOL 5e762a34b0eab5072d7d6ecfdefe94851e981a48b9764f6ac09a75eafeb9f5b60a5cc763a078c020e8551fd7e41ed300d889b337ddfdfde15c8a23741f6969ac
 EBUILD netbeans-nb-9999_p20160111.ebuild 4111 SHA256 bf3596d4b39073e985748910fcce8ee7a3f6ce63cac8e206a1fd33071a809263 SHA512 26afbc618f8d19f6db3a2ba633836ae58caa89e261903d8124f42a768c9c0c3e431149e5b1eda4002c9a24630d553ffd98449459428a73500d01523263f411a4 WHIRLPOOL 800f5b7bf794f5f7001e1eacb2e911b62343895c4c141504599f3f5e70ef0331a59279d75aa44f3c7430cf88db4a24a16f1e2ca63e5013d8b118551065726f1a

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20151229.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20151229.ebuild
deleted file mode 100644
index 5b7b9bd..0000000
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20151229.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2015 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/2015-12-29_00-02-04/zip/netbeans-trunk-nightly-201512290002-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 94fde35..c89af5f 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-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
 DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
@@ -24,7 +23,6 @@ DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9a
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 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_p20151229.ebuild 4418 SHA256 b0288009fdc8ee4de26b7312434ece060f10567bde810d647baf43550d540d4f SHA512 72f3467694ddd7dc867c4c447404c5353c6b1168e52ac3b5216a16f5adf3789e364b7fbd5b4708e9e8d2e93ac2eaef1ffeb307bd58b5eeb669446bef7d5ff059 WHIRLPOOL e304add104734712933de3fcbaf494fcf358e28e467b0fa7f18883ed2fcea717d1ee36dba3a5c6ea7b0b90952a6419889ff6d0ba9c366a983fe50c3afd5f901c
 EBUILD netbeans-php-9999_p20160104.ebuild 4418 SHA256 08d408fbba6d43b353b2f53f9e16eeeeb3b449ec5da875bd1d88261f87405b7a SHA512 47aea35c7a21d931b57a75e97578a42dd4e8c34406ccff8b62c32be569618cfdaa78342202b7b0d34334b3abefd8276bd4d90d92bebf5697935dbfafe7f2ee90 WHIRLPOOL d61e370b17ab86c73d5a1087cb415cbbe925bef4ab27e5fa5ef7f3b4841a015f903d73d4796817ec2ed14856b30dc1f5db65caf3d58335707e5934cd61e10e53
 EBUILD netbeans-php-9999_p20160108.ebuild 4418 SHA256 c3ac87d1cfa4d64dd6c89bf2d38e36922c753588f343e241e9ada0a5b1509d24 SHA512 3fa73ee72855fa3d8dded8a9aa8be6ede38f31950112e7d59013074449fe042b01bc425834c7259afd922cd5d99ec2ed5260c57125c2f5ab752543fce72bb5ba WHIRLPOOL eac696a5e1404ce10a41d058816b2f656aa68997823ab563ba51da9fdd3712ed196de038bbe88c2a31f656061a05347f9163d6790608617d0fa8cf475d785beb
 EBUILD netbeans-php-9999_p20160111.ebuild 4418 SHA256 b422382d085f00464ebd8013437eb7737343a757cb4a04a858ff9f6bfcf1f00b SHA512 8718b38349556090538ec1b0714f2c346e1b9ef56263c6b47784a5702449ba3fa121e5a203d715fbda70553bc12ad2d4e0095474b21e5b1d15b975f041b5e1eb WHIRLPOOL 846fb26ef76c5b2a1b7617f64faad1693fc3360d832c9262ae055935c358c65757e4db643f2ac60ad0515f73e9f3ce2e9bb5a91c8441becb77810e9f05601755

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20151229.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20151229.ebuild
deleted file mode 100644
index 4eac1e6..0000000
--- a/dev-java/netbeans-php/netbeans-php-9999_p20151229.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2015 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/2015-12-29_00-02-04/zip/netbeans-trunk-nightly-201512290002-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 3c2ff15..1b499d6 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-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
 DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
@@ -37,7 +36,6 @@ DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9a
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 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_p20151229.ebuild 9360 SHA256 6abd4f200c6d3edcc5c66df3ed68a6725565ff7aacfad514e45ac13b156f50ac SHA512 5f76c40f20e8fb8828e190548db2bdcf977f642dbef6bca11f7b12c5624e33f7cf8dced1db751613ed6c3dc5e93279a0eebd519b62f7c0230a4abb36537d88d1 WHIRLPOOL 2d2888db6bfb144051d7e943b154b783f8a5039886ce1861e8b7f3982420c940a32fb7731b5edf30a177e6214ae9fd134f39a633d90821e824186b09c809547b
 EBUILD netbeans-platform-9999_p20160104.ebuild 9360 SHA256 dbe0927dd378235a4e5d2c1a80e1dce1e18f2ed930f8a61886fd4fa715ec3a4d SHA512 2fa60726a78b3d387bbd3a201dc40c3c50a35a6da7e4f94a8e1e2fa22b94ef66b8b3883365c29e205c04a01c6cb3dfad235e22796d869bac335da5e757e939b2 WHIRLPOOL 6a7c552b0c82c1fd6854682f874e60beaeadacdcaf3fd22b3b1ae5009c3ef610de4bdb1433ae47d132eb15d74714f5a18ed7850ee119a7d221e6e2cffd8c2da0
 EBUILD netbeans-platform-9999_p20160108.ebuild 9360 SHA256 d2a8a154699e83687f87795375e5e1e9d4eeacb4e74027220ddc5f48c3c826e9 SHA512 c25d4073ac52080ad78bd6ec82732fea120d4d5ac8483e4302c0f7c766796b87efa0ef83c270d812656238b72ff187700f283c16795e392a4726f15dd29a01ea WHIRLPOOL 28c729eb7cb088df965df5c739042197d681de831e151399aec69bab7808e70cb531ae607423a34ec8773d18411a35c3c23390868b2fbe2632ea080da95731df
 EBUILD netbeans-platform-9999_p20160111.ebuild 9360 SHA256 ee44a5257c5b5c9fdfe3ebd7b38079b0f055b5db406f9208b71e583c45742290 SHA512 1abcb6b890fa0771189598b9c0350780150b372f6a9aa07632d6c58b8464c8892e4ff49cc942c94391f80f73bfd8b38cec7d1c1a87e4552d2a1704e1826a4f19 WHIRLPOOL 708d892213ab9821c7d8fc83bf508c192308df295699fea24a94bc4468d2375517ddb3c672b18dd02051d24784fe12a95449f4f6225d86a4ddf1489f8da71b99

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20151229.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20151229.ebuild
deleted file mode 100644
index 9bda2ec..0000000
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20151229.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2015 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/2015-12-29_00-02-04/zip/netbeans-trunk-nightly-201512290002-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 c7ae956..f91e11c 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-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
 DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
@@ -20,7 +19,6 @@ DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9a
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 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_p20151229.ebuild 3472 SHA256 ebca38f2b4c1822b284a0a1d7592afb0a6f632f4e04fb7170aaa77c1beaf4635 SHA512 8e78b04568a2a635149ddc79fdc914f6bb4edff42556d126b356f90abfd1decc5c16e081b71b2524194756a5147f908f4a56ad6c914b3cd861af7396bc6e2bba WHIRLPOOL 59004107286634479d2ebffaa83e86edbc5c2d1b8c0f301f1609fa87eacc259fa3f76c4206e944fb4ae80c431d214c375dc165dc090143bdfb0c69d9b6ea9fc0
 EBUILD netbeans-profiler-9999_p20160104.ebuild 3472 SHA256 dd029b7ae4365dfef7c8779dbea31a273118bcfa1b2e3e96f55e3a9c78caba36 SHA512 e5e44865b0d67ac5b78ac6faf95441ec7cc7ce38923048c65e07fa91c38f8739bfce78be900e887b189690b9390ca099f68add9269f11dd4d1b4e96769f65e80 WHIRLPOOL 8211c224d29751e32ae94c22c66a32f5985ec8388743c43ff8100d5a0a5295f1448eaa500deab9f891843c8220c54ee1e773fae8899d33b4c90c91e6be056a44
 EBUILD netbeans-profiler-9999_p20160108.ebuild 3472 SHA256 dce9b6d9b9d65ecc15b7e08a391b5209676f4faede24dfa02dc025a3d4ab3c5f SHA512 db0877681b5c37791189542cc616d49203fb377a0050fb73127035ddecc55ee7f2d090e905c560268d011b8ddc12b2efa1046f5e05e3fab1278484161678e063 WHIRLPOOL 9b4c40ed7cd9ffb8ac8b3f7a4d5bbad77dd54243f87df6243fc2546dfc9e5114767bbd8eda8061283bf4534581365dc6ec86d2f99fad8656e2b87de1c9dec4d2
 EBUILD netbeans-profiler-9999_p20160111.ebuild 3472 SHA256 eb063ae4bb16a18103f598d470aa14c7fe5c27f47567194eb198fddaedcbe5b5 SHA512 17991fa2b67149c2892c8218aef01bdc1d5b1462d8715e959814a950f64d17176efe1c6a082af58d90d1e8e188d6ccff61156d52b3ac7c037dd4f5d2abab62fd WHIRLPOOL 2a11634a4227d5981a99821c99d1970abf67423dec0eba41cbda0c05a212d8bcfafd8f4bb6053c5f382c3492dd60f590cde0d7ff5cf2c0d039713766a2e8ba0e

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20151229.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20151229.ebuild
deleted file mode 100644
index 22b6ce7..0000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20151229.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2015 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/2015-12-29_00-02-04/zip/netbeans-trunk-nightly-201512290002-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 2b5ea72..dfcdf2f 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-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
 DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
@@ -35,7 +34,6 @@ DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9a
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 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_p20151229.ebuild 5280 SHA256 10543ccc3733dad581b7fe62c979919cf8804770fcdd0e5b417a1a1bbf8de039 SHA512 6ae9b2f9835f3e8ee3db3416c45928ad559ce5929ced94b007244326ea1a88453a87c01fc1443aa14cc59b8b9ef3d66433cd6d5973cabb03ff2c3eec95f2063a WHIRLPOOL 268e5da422f0414d26f145b50b4ab71fd11bb6ebe2ff7c9a51bb0b9af311aba55e35dc9129d00425237f1548cf17e1b8a3d21ec133865864e0d1484f96da8eec
 EBUILD netbeans-webcommon-9999_p20160104.ebuild 5280 SHA256 8b6cba663a851e4f552223c9cddd9beecdcb2b2ddfa873c777368e4d303f1a7b SHA512 b41607612f133ce80472864b4350e1f1bbfb8057180038cae421e1214950a201dbd69e5757ba1ea2937df68fb400dfe70443a001095db0a9446abf0cd9a5370f WHIRLPOOL de759519558037f98e171c71e8deea939a8144c035d9e21e39590a9dd512631fa22511f068be80fb71cc02d7fe1b7dc4561a73cc3376503fc662bf0c7f12557d
 EBUILD netbeans-webcommon-9999_p20160108.ebuild 5280 SHA256 0dd5d66c0533ae34634cbf3f7bb170490ee66e53958e5f71c623a9d0aa6b9954 SHA512 4f3a7a89ef58828f561f195f0c59bcd38600d5ecbc2e1d6be0509b57963c566cf240cfb631dbeca36451faebb3c6502aafae89559b326ecc9aa08d035580f9a9 WHIRLPOOL 8ca9815d403868f9da5f2f1a17f75515d8bb547c982d1e5c2210de16cdeebfa2b4dfc3bb27e53b5ae7c26b414e832f724e0b34450288451b92549b6a09a6f33c
 EBUILD netbeans-webcommon-9999_p20160111.ebuild 5280 SHA256 7ac164f96f7a03759df519ac86a5300f5c4b1d9e942fd47f0ab395c53d1bb142 SHA512 604d168c22b7b15720c90aea05bd58f7ce6674973bc6ba6c236835854c30a5f9a510e020c046ff6a8a4b31c9458ed408914882bb01f027b1d1eec9f6f31fce84 WHIRLPOOL c4ca3602705c20bb494d5d2849bcce323cc3eba4e1774853695a34f72a31c813a78d66c5b0c2c9430e82a3d2aae733d8e2f8d19910a6124dc91c65b91bd76915

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20151229.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20151229.ebuild
deleted file mode 100644
index f5abf70..0000000
--- a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20151229.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2015 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/2015-12-29_00-02-04/zip/netbeans-trunk-nightly-201512290002-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 57577a9..1b7bc71 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-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
 DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
@@ -20,7 +19,6 @@ DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9a
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 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_p20151229.ebuild 2721 SHA256 f1b6448004d210974d8ae5410d2302bf456ed4316a7b4077d71712eaca7af507 SHA512 8f8dadc568c9c91c8a5c2578b77e207938648ffe298752798067de5ef9f9ccdf3bb977bb4833a02dcfa27e2960359a4c233aaf2611aefac19f04c973f52fdf98 WHIRLPOOL c4531e92ace3df09845281bf102d92e44c01ec4b04a8861dfcfe5323835c95b91368f003481d16834d36c95f78f297f51e31d83bc2df6bf77af8331687614fd8
 EBUILD netbeans-websvccommon-9999_p20160104.ebuild 2721 SHA256 1859840a6fe758cc115b174961d79887638a3c360e0835718151f4a800a6dbee SHA512 80d0a30a980b99bf6536a605ffbdebf7b2c2625482110006864b37a4b2d99988d58eab8c320b7010e3284a342ea11f5808e7d6c3d097460afd74d6aa118830a3 WHIRLPOOL 01e2adf818de5ee27041ccd2392797de927ed145cf2e56084ee36da19c7fd181b194f24792e26f96f5ef0244a72ee9c1b809d89d595a0f98daf8024197c93d0d
 EBUILD netbeans-websvccommon-9999_p20160108.ebuild 2721 SHA256 f987affbdbcda640f214df4c9d6a7d0a37f444029574defed75cd0846ec16db8 SHA512 9a98d910cb152a0134734f568646cb19610686e6c500c7742afee243cb2de0d7c0f0d4a302048a0f186ee3672d692e679c53bbd2ddad337e349b3913dbfeccdc WHIRLPOOL 2408f28d35dbda995c4d2357874bc60906c57240a37ad1429ac27423ce88450ce0de02204c12d641de475037aae47a3b5ab5df66ac7b4b65fe4c46cb5422fac0
 EBUILD netbeans-websvccommon-9999_p20160111.ebuild 2721 SHA256 e9d1f3e2b0e84da15edd1cc9668be983d4d1fdf683cb1eef766eae94af3edb4d SHA512 3adf6ba01dcb9491b31f6c3bbcde535c543696b3c7c773d5037ce36941b6ee152640a766156c625da8b7dccd122186ef6e6f62731bf113ca487a383bc0eaf406 WHIRLPOOL 0e2668771a3a6344b259aec6d1b99b54bc44780dccb7d51c410c6262d4ff508f397c786c868dbf2ea994174c6fd4202680e79cf57dc2808a4f26dc4b80b6d610

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151229.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151229.ebuild
deleted file mode 100644
index d9c3033..0000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151229.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2015 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/2015-12-29_00-02-04/zip/netbeans-trunk-nightly-201512290002-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 18ff671..fd7e22b 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-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
 DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
@@ -23,7 +22,6 @@ DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9a
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 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_p20151229.ebuild 6938 SHA256 48434dc7c4f72cc32f2789541b85cb842a0024a58a3db7b01c011b551956c487 SHA512 48cee46971986b6bd7afeb22728ac5b750a95bd9d22063c3d87763aa562e3663e4a72bb9af568f5270036221481ed1a0e9660cddab6fa434aae2c8e7e8e8dca6 WHIRLPOOL c4da5b86f86667626f0bd37bb385c5c364f372fff3e408b68eb31b641179e2ccff35765ff5969a27602651acac51e97c9347e6d22f98afab548d3ed58a148175
 EBUILD netbeans-9999_p20160104.ebuild 6938 SHA256 1135be98d1f27e9b9878f3f8c3b1f45f376812992c33ef10f65f0816e8527b8b SHA512 f2c130e0a405cc12d8deac7c1fe15870f6e59228d06cfa54dc794d75b48465d97ab6b181c81bb8a1aad8634b97eacca5e1776ff767d3ec6fdfdfab2b4b299b7e WHIRLPOOL 64318e8fa604d8e307d2f5c7f01fc8a8b447d9e78af4e86ec0608b56c966c35a3654fda021a2695efe76c825ccf58fbcfc6495897c5a5e3e6a97f759e5ceab91
 EBUILD netbeans-9999_p20160108.ebuild 6938 SHA256 d88c1b351d2832fea3b58e9c5b7a40aed4dbb73cc0d68d4810792fa497b9e94f SHA512 cffb502d84ae2cd7ca0c35f09200484b95614f1bfcf65148faa7b7cffb7221ab517e61be9d075c1d791b90fabb3ff599f7fb7414ea50b25a8cfed0ff17145292 WHIRLPOOL 6053108db25b04b69cbc6fa42df8d99ac417fae17e011fe0ff75349099dc37e1feb73e2a0a31a36a1eeb41c936f5792eff906514c4f4ce6daf46d2dd546b49ae
 EBUILD netbeans-9999_p20160111.ebuild 6938 SHA256 be09bdb58187f8166ce4cd09484de01053547ed6f20fdbff36ae2832f1b058da SHA512 2f2b7d23e93243d2d0beaf572938ab44afe0367f753e326b8c639a6f1bcb7a245fae75a35e678a9f58531c565e1371ac24eb25d32dbe31b4db4ceea1017c2f79 WHIRLPOOL 86e02e132c7529cb435b245a88ac5fe38988c81b9169bb23ab5ae5b2dca1463b7d639f080710671595c2803a2d926053a208162d793dc62f41143b720ddcc720

diff --git a/dev-util/netbeans/netbeans-9999_p20151229.ebuild b/dev-util/netbeans/netbeans-9999_p20151229.ebuild
deleted file mode 100644
index c4c3b25..0000000
--- a/dev-util/netbeans/netbeans-9999_p20151229.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2015 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/2015-12-29_00-02-04/zip/netbeans-trunk-nightly-201512290002-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
-}