public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-apisupport/, dev-java/netbeans-nb/, dev-java/netbeans-groovy/, ...
@ 2016-02-08 11:57 Miroslav Šulc
  0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2016-02-08 11:57 UTC (permalink / raw
  To: gentoo-commits

commit:     72403c09f6174bc431a7b908cf7b24f2fee8f456
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  8 09:43:33 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Feb  8 09:43:33 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=72403c09

netbeans: removed obsolete ebuilds

Package-Manager: portage-2.2.27

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 2288dac..833f274 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-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
 DIST netbeans-trunk-nightly-201601120002-src.zip 209484230 SHA256 f2a06a7012a1744d78981c8b24607263aca1548b3ae245c2fe1e26e2f616b376 SHA512 47e23368bce1de6e5a2cfaa442983172d053cb934153219608c0d68f2f6f7ed3de38852fc9146837240868a1850d152655606832fa6ae53c242e84aa0f91f7b0 WHIRLPOOL fe1755aacff101c021d046dc57b08f65ba01c2d45e4d9203cafad957dec4845b6aa78473896f59bc1e4e1e7e8a39d79e89678512bfd2a9a9d81dc014bbeef145
@@ -23,7 +22,6 @@ DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
 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_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
 EBUILD netbeans-apisupport-9999_p20160112.ebuild 3384 SHA256 ca269d43ce67c9a10cd44107f555221bf4eea08377e542cd4d3788baeb3a6f55 SHA512 55a2b42504adb548bc2815c8cd59cce979c8ff6ab2a4ef6901d0fcfe866cd0fe67722a1774aefe255cb0791921b9793c7923e78d14e0b312591e39c69dd3df87 WHIRLPOOL dd9b89c26eeb8083294f199d5b75506c7859724f723b3ad437725bbad3c334787e96d648797fa6eb334b0cb726595bf0d535353edaf70b4f194cb4c7e07d928b

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160104.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160104.ebuild
deleted file mode 100644
index 7d71196..0000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160104.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/2016-01-04_00-02-04/zip/netbeans-trunk-nightly-201601040002-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 48ba21d..e667e6d 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-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
 DIST netbeans-trunk-nightly-201601120002-src.zip 209484230 SHA256 f2a06a7012a1744d78981c8b24607263aca1548b3ae245c2fe1e26e2f616b376 SHA512 47e23368bce1de6e5a2cfaa442983172d053cb934153219608c0d68f2f6f7ed3de38852fc9146837240868a1850d152655606832fa6ae53c242e84aa0f91f7b0 WHIRLPOOL fe1755aacff101c021d046dc57b08f65ba01c2d45e4d9203cafad957dec4845b6aa78473896f59bc1e4e1e7e8a39d79e89678512bfd2a9a9d81dc014bbeef145
@@ -37,7 +36,6 @@ DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
 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_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
 EBUILD netbeans-cnd-9999_p20160112.ebuild 4790 SHA256 1fbfd96156c9522dbfd6c79b640e9815e806daa0c9a1a4dd89f0f78d56169fad SHA512 eb74f002f48c216eb71f0930f83308aca4916a4c7d37b8e61010e871d251852b7f49a72c490185f4f8dfa4e874376b8664696dcf58244a690c6dbe2a421d6e71 WHIRLPOOL b12d0d9ca23df687fdf8a1e9f07bdd5a2ee1adf7499e3740f90e3e9db42568053a05b8735aa84b827ad2a1deb5d4a8ff92748d69697cac2bbbddc4f833451e32

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160104.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160104.ebuild
deleted file mode 100644
index b1d3a0d..0000000
--- a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160104.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/2016-01-04_00-02-04/zip/netbeans-trunk-nightly-201601040002-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 da3166c..6adf74d 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-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
 DIST netbeans-trunk-nightly-201601120002-src.zip 209484230 SHA256 f2a06a7012a1744d78981c8b24607263aca1548b3ae245c2fe1e26e2f616b376 SHA512 47e23368bce1de6e5a2cfaa442983172d053cb934153219608c0d68f2f6f7ed3de38852fc9146837240868a1850d152655606832fa6ae53c242e84aa0f91f7b0 WHIRLPOOL fe1755aacff101c021d046dc57b08f65ba01c2d45e4d9203cafad957dec4845b6aa78473896f59bc1e4e1e7e8a39d79e89678512bfd2a9a9d81dc014bbeef145
@@ -29,7 +28,6 @@ DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
 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_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
 EBUILD netbeans-dlight-9999_p20160112.ebuild 2968 SHA256 5120dec115f488aa365063919a767fcd0fede87011cbf15d26dd695ec0ab4a5c SHA512 ecd4e636248302f0d6069fd0cd2768a9f26304ba000eae0fb710ab61181386439a0953f364dc619463d22c6444f80263dc4d146a1bc7a99847c445b3568a9cb8 WHIRLPOOL 8d152d1dddcede42885d73e741093e3ad57439f49169d5c9b4420ac795e239d2221c9526eec2147a0982552bb390028db97bcfc7e0f9a244bbcb10d29cb39ff7

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160104.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160104.ebuild
deleted file mode 100644
index d87fa47..0000000
--- a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160104.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/2016-01-04_00-02-04/zip/netbeans-trunk-nightly-201601040002-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 d82723d..4c56365 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-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
 DIST netbeans-trunk-nightly-201601120002-src.zip 209484230 SHA256 f2a06a7012a1744d78981c8b24607263aca1548b3ae245c2fe1e26e2f616b376 SHA512 47e23368bce1de6e5a2cfaa442983172d053cb934153219608c0d68f2f6f7ed3de38852fc9146837240868a1850d152655606832fa6ae53c242e84aa0f91f7b0 WHIRLPOOL fe1755aacff101c021d046dc57b08f65ba01c2d45e4d9203cafad957dec4845b6aa78473896f59bc1e4e1e7e8a39d79e89678512bfd2a9a9d81dc014bbeef145
@@ -55,7 +54,6 @@ DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
 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_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
 EBUILD netbeans-enterprise-9999_p20160112.ebuild 15825 SHA256 0d6162c64e90ef21936a6de191e36df916504a251f8cf32ff20deb94a3afac31 SHA512 ccc0ef6fe707037c15b153fd1271cc442c339896a2b83e831fa55540607dff3fa405bc8470ca1573c9a3d1f62e1279f623b9ee0eb3335fbf2432becaa0b53f8e WHIRLPOOL 10f76ecbbe94a8c19ac0d85da2763114bdd9fa34284b0d2708957eb17508be1f91da4ee3ffcc2512b03f5f7efc9d7f0c99fc63c3ebfa5b1dbcbb2bf3b54efc5d

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160104.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160104.ebuild
deleted file mode 100644
index ed08a10..0000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160104.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/2016-01-04_00-02-04/zip/netbeans-trunk-nightly-201601040002-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 56c2a76..a4ff68b 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-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
 DIST netbeans-trunk-nightly-201601120002-src.zip 209484230 SHA256 f2a06a7012a1744d78981c8b24607263aca1548b3ae245c2fe1e26e2f616b376 SHA512 47e23368bce1de6e5a2cfaa442983172d053cb934153219608c0d68f2f6f7ed3de38852fc9146837240868a1850d152655606832fa6ae53c242e84aa0f91f7b0 WHIRLPOOL fe1755aacff101c021d046dc57b08f65ba01c2d45e4d9203cafad957dec4845b6aa78473896f59bc1e4e1e7e8a39d79e89678512bfd2a9a9d81dc014bbeef145
@@ -23,7 +22,6 @@ DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
 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_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
 EBUILD netbeans-ergonomics-9999_p20160112.ebuild 2913 SHA256 5d08856a4a078a1ea82d175149ad16033e6f369993ce7d964886a8af0cb47891 SHA512 78c3aaf2e683fc9fe3efdf61b65443c1c0582c9576738f9ad0261ea7b7745d7da878d77a1a8b7bcafd986cecbbfcf6f5e0da9a200cc61b0d487afa778cf61c43 WHIRLPOOL 4006cfac5753c42df04ecffc0eeb708fb8a10e9ea7aecc64205ad655be4f3236ef54195b60e988022e76edb888118803ba071b4aba11f43fb9c5ca19e7533af3

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160104.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160104.ebuild
deleted file mode 100644
index 25f9446..0000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160104.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/2016-01-04_00-02-04/zip/netbeans-trunk-nightly-201601040002-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 01c5447..b359ca2 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-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
 DIST netbeans-trunk-nightly-201601120002-src.zip 209484230 SHA256 f2a06a7012a1744d78981c8b24607263aca1548b3ae245c2fe1e26e2f616b376 SHA512 47e23368bce1de6e5a2cfaa442983172d053cb934153219608c0d68f2f6f7ed3de38852fc9146837240868a1850d152655606832fa6ae53c242e84aa0f91f7b0 WHIRLPOOL fe1755aacff101c021d046dc57b08f65ba01c2d45e4d9203cafad957dec4845b6aa78473896f59bc1e4e1e7e8a39d79e89678512bfd2a9a9d81dc014bbeef145
@@ -25,7 +24,6 @@ DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
 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_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
 EBUILD netbeans-extide-9999_p20160112.ebuild 3377 SHA256 2c2ebff2035d8655743d89174d589e429eede0fcb4dbc2fdae69cd9bf9291d79 SHA512 6ceb859949691db63c51da914402e816683c530d1cfe302933a2e9d66ed1adb580f7941d7c0ba0b20b6e11c113cb0dbabf1d0dc8bc4b8b68c6185f1c35dcb5fb WHIRLPOOL f7d134e9aa1d1efe372bd706c3a3d15504ac52e3d568d6bf128eb6c08ee0d0cb67f2c1313e3c20f7658c0e30b50a4f096d907f93991fe9a24badc2492042a810

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160104.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160104.ebuild
deleted file mode 100644
index 3871831..0000000
--- a/dev-java/netbeans-extide/netbeans-extide-9999_p20160104.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/2016-01-04_00-02-04/zip/netbeans-trunk-nightly-201601040002-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 e87f0aa..c07795e 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-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
 DIST netbeans-trunk-nightly-201601120002-src.zip 209484230 SHA256 f2a06a7012a1744d78981c8b24607263aca1548b3ae245c2fe1e26e2f616b376 SHA512 47e23368bce1de6e5a2cfaa442983172d053cb934153219608c0d68f2f6f7ed3de38852fc9146837240868a1850d152655606832fa6ae53c242e84aa0f91f7b0 WHIRLPOOL fe1755aacff101c021d046dc57b08f65ba01c2d45e4d9203cafad957dec4845b6aa78473896f59bc1e4e1e7e8a39d79e89678512bfd2a9a9d81dc014bbeef145
@@ -25,7 +24,6 @@ DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
 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_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
 EBUILD netbeans-groovy-9999_p20160112.ebuild 3416 SHA256 b887807280c17115e850026513134ce42ce464f6346160a338e1878a759a2698 SHA512 903b088337594e405dccfcaf142e3fe41552ea0feb55526dd1c379b14e9f8d22d1223ff233402f913a7d0df2320752cdeb22360c2b6d7340f3a818ea4bfc0f58 WHIRLPOOL 37a8e44739edba79cd2838763287f05e8b1e671ce47320722a79ba820904144ed6c1c08272c5638932175aa248ece439e04aeb0c4f4e4ff43baacbfd9f03ab32

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160104.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160104.ebuild
deleted file mode 100644
index f78a5f7..0000000
--- a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160104.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/2016-01-04_00-02-04/zip/netbeans-trunk-nightly-201601040002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/01730F61E9C9E59FD1B814371265334D7BE0B8D2-groovy-all-2.4.5.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.groovy -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r14-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/01730F61E9C9E59FD1B814371265334D7BE0B8D2-groovy-all-2.4.5.jar libs.groovy/external/groovy-all-2.4.5.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r14-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/groovy >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/groovy$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/groovy
-}

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 706de28..172d0a1 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-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
 DIST netbeans-trunk-nightly-201601120002-src.zip 209484230 SHA256 f2a06a7012a1744d78981c8b24607263aca1548b3ae245c2fe1e26e2f616b376 SHA512 47e23368bce1de6e5a2cfaa442983172d053cb934153219608c0d68f2f6f7ed3de38852fc9146837240868a1850d152655606832fa6ae53c242e84aa0f91f7b0 WHIRLPOOL fe1755aacff101c021d046dc57b08f65ba01c2d45e4d9203cafad957dec4845b6aa78473896f59bc1e4e1e7e8a39d79e89678512bfd2a9a9d81dc014bbeef145
@@ -28,7 +27,6 @@ DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
 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_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
 EBUILD netbeans-harness-9999_p20160112.ebuild 4126 SHA256 003f98354208b4a661ab84e57b8fd4cc1a7983d91e6f41d79f53b3f13553e60b SHA512 86a18e836fe67bf9d45b64710f7aef35b1a49510fcf796ef10860f89c41fe5034f47f84512510dab9dabdcac787b1d5aaf3ea8d036fdf103afb3ee9e30d860ed WHIRLPOOL e6d9dbcaaa350524e769b583969e7d2fcea756c879de06ecc67ff4a3881df48eed277de0aa3b34f202e70ebf2d5de42965092d9deaeafc2b34cc410da3bf0efd

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160104.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160104.ebuild
deleted file mode 100644
index d523ad1..0000000
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20160104.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/2016-01-04_00-02-04/zip/netbeans-trunk-nightly-201601040002-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 76fcd91..d3052e6 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-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
 DIST netbeans-trunk-nightly-201601120002-src.zip 209484230 SHA256 f2a06a7012a1744d78981c8b24607263aca1548b3ae245c2fe1e26e2f616b376 SHA512 47e23368bce1de6e5a2cfaa442983172d053cb934153219608c0d68f2f6f7ed3de38852fc9146837240868a1850d152655606832fa6ae53c242e84aa0f91f7b0 WHIRLPOOL fe1755aacff101c021d046dc57b08f65ba01c2d45e4d9203cafad957dec4845b6aa78473896f59bc1e4e1e7e8a39d79e89678512bfd2a9a9d81dc014bbeef145
@@ -156,7 +155,6 @@ DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
 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_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
 EBUILD netbeans-ide-9999_p20160112.ebuild 30832 SHA256 ceb6a88f1cef20ed0969065a7c7939e9570ffc28a6ad72cfa54a95afd875c418 SHA512 e84c099bfcb436527c625edd9e3d01cbfcd28b523d84508e84811513a2cb4b6eb6a2766b02a891c58b97b8fdd31753e4562f9979e2a9506c53868cf36ab7651b WHIRLPOOL 7ef7453a5b8c86455c153729a82e8041fb134ed080639470e959738d27a4a2a7ed116429c02fec6c90678838472f1d448261ebd057214f7b193a0b4ce5f06f35

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160104.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160104.ebuild
deleted file mode 100644
index b4c0f34..0000000
--- a/dev-java/netbeans-ide/netbeans-ide-9999_p20160104.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/2016-01-04_00-02-04/zip/netbeans-trunk-nightly-201601040002-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 473cfad..3288806 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-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
 DIST netbeans-trunk-nightly-201601120002-src.zip 209484230 SHA256 f2a06a7012a1744d78981c8b24607263aca1548b3ae245c2fe1e26e2f616b376 SHA512 47e23368bce1de6e5a2cfaa442983172d053cb934153219608c0d68f2f6f7ed3de38852fc9146837240868a1850d152655606832fa6ae53c242e84aa0f91f7b0 WHIRLPOOL fe1755aacff101c021d046dc57b08f65ba01c2d45e4d9203cafad957dec4845b6aa78473896f59bc1e4e1e7e8a39d79e89678512bfd2a9a9d81dc014bbeef145
@@ -54,7 +53,6 @@ DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1
 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_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
 EBUILD netbeans-java-9999_p20160112.ebuild 14930 SHA256 0e1985b385188808004aa6549d18f1b112338ff6dc10a5384240623b47acd0c6 SHA512 69121782d0681877873b59ff516778700d1d2bfbb09d4dbf7aefac7c50fac06b4711c944ad97ceab60a691fdb59d85234c3edce1cc89e8bf2a4ae35353180355 WHIRLPOOL 5e8b050f53226496bcaeca6dd6fbb275b928dc9111164345536a528f1ac27902760828483f09b62c614729a3a51168f927e4321f43d50e19d1052c3888a6edaf

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160104.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160104.ebuild
deleted file mode 100644
index 2d561bf..0000000
--- a/dev-java/netbeans-java/netbeans-java-9999_p20160104.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/2016-01-04_00-02-04/zip/netbeans-trunk-nightly-201601040002-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 9c714d7..5c77a00 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-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
 DIST netbeans-trunk-nightly-201601120002-src.zip 209484230 SHA256 f2a06a7012a1744d78981c8b24607263aca1548b3ae245c2fe1e26e2f616b376 SHA512 47e23368bce1de6e5a2cfaa442983172d053cb934153219608c0d68f2f6f7ed3de38852fc9146837240868a1850d152655606832fa6ae53c242e84aa0f91f7b0 WHIRLPOOL fe1755aacff101c021d046dc57b08f65ba01c2d45e4d9203cafad957dec4845b6aa78473896f59bc1e4e1e7e8a39d79e89678512bfd2a9a9d81dc014bbeef145
@@ -26,7 +25,6 @@ DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
 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_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
 EBUILD netbeans-javacard-9999_p20160112.ebuild 4971 SHA256 a394e6f267c47d345ac7edb2591744b71141837c8d3a4a25b14ed8cde362c1d7 SHA512 a57b2de99a828f2eddf7cfaf98ba5b8d79207b0f7a69c7314bdb6122a5ffba20087242dd97e3343f59dd87d625091b5341269bc9761b52f5676af8b127c06378 WHIRLPOOL d72f003984cf2b33a80e148dbad5b92f7a4af439569344356a643840d9f0153d0f3fb9229b05ecd809e50156f2f0cbd6b3480069621cc858f2c4f90e5679f522

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160104.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160104.ebuild
deleted file mode 100644
index 9a30b6e..0000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160104.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/2016-01-04_00-02-04/zip/netbeans-trunk-nightly-201601040002-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 ace10ce..c37a42c 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-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
 DIST netbeans-trunk-nightly-201601120002-src.zip 209484230 SHA256 f2a06a7012a1744d78981c8b24607263aca1548b3ae245c2fe1e26e2f616b376 SHA512 47e23368bce1de6e5a2cfaa442983172d053cb934153219608c0d68f2f6f7ed3de38852fc9146837240868a1850d152655606832fa6ae53c242e84aa0f91f7b0 WHIRLPOOL fe1755aacff101c021d046dc57b08f65ba01c2d45e4d9203cafad957dec4845b6aa78473896f59bc1e4e1e7e8a39d79e89678512bfd2a9a9d81dc014bbeef145
@@ -24,7 +23,6 @@ DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
 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_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
 EBUILD netbeans-javadoc-9999_p20160112.ebuild 6293 SHA256 7e8368779c2bd305460f09fa106460140f756861a13348d7e1ed18f262cc7d21 SHA512 0bc2f004325466b3bc016c0cba37cf4091ece1c993cb9b1a7af365f29938e73c78800edd6e27c8b9cf30a818600cce321e330bf23e6616ff74815b9f75236595 WHIRLPOOL 2437c8b5d3de5e542b57318fdb090c3774c2256053de1bf9dfa9596a41b37bffd928bbc67ee4971f0e9a26a4830751ba98df334c7914b0ab8b75f3bcdcc87979

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160104.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160104.ebuild
deleted file mode 100644
index 2902420..0000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160104.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/2016-01-04_00-02-04/zip/netbeans-trunk-nightly-201601040002-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 f75ca3e..c3c3141 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-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
 DIST netbeans-trunk-nightly-201601120002-src.zip 209484230 SHA256 f2a06a7012a1744d78981c8b24607263aca1548b3ae245c2fe1e26e2f616b376 SHA512 47e23368bce1de6e5a2cfaa442983172d053cb934153219608c0d68f2f6f7ed3de38852fc9146837240868a1850d152655606832fa6ae53c242e84aa0f91f7b0 WHIRLPOOL fe1755aacff101c021d046dc57b08f65ba01c2d45e4d9203cafad957dec4845b6aa78473896f59bc1e4e1e7e8a39d79e89678512bfd2a9a9d81dc014bbeef145
@@ -31,7 +30,6 @@ DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
 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_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
 EBUILD netbeans-javafx-9999_p20160112.ebuild 4717 SHA256 982630456f940a9b3c9653503cfcad93b1b52088d06c646aeb48f8248cf9c866 SHA512 3094371f4d0925702822f7990e11abe55a1e20f5370f05efb3abd74ed282dfd04dbdeb739f476132f4207cff28c107aaf6ea98c6714097937358c09ba7e75d4d WHIRLPOOL efcfe1658aa355c23c2809e44e96af1e3eb5e3911651740e40c146738865d43fcae4015c238500a227ce8b1e80a25807aca0f712d2935ee15af0538e89dc7041

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160104.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160104.ebuild
deleted file mode 100644
index 796b118..0000000
--- a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160104.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/2016-01-04_00-02-04/zip/netbeans-trunk-nightly-201601040002-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 3a0ea5f..8dc0117 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-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
 DIST netbeans-trunk-nightly-201601120002-src.zip 209484230 SHA256 f2a06a7012a1744d78981c8b24607263aca1548b3ae245c2fe1e26e2f616b376 SHA512 47e23368bce1de6e5a2cfaa442983172d053cb934153219608c0d68f2f6f7ed3de38852fc9146837240868a1850d152655606832fa6ae53c242e84aa0f91f7b0 WHIRLPOOL fe1755aacff101c021d046dc57b08f65ba01c2d45e4d9203cafad957dec4845b6aa78473896f59bc1e4e1e7e8a39d79e89678512bfd2a9a9d81dc014bbeef145
@@ -23,7 +22,6 @@ DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
 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_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
 EBUILD netbeans-mobility-9999_p20160112.ebuild 4412 SHA256 cdadf540aa0c316af2afd1dffd356cfe8d0058a7726a3d26e96e2f4495832981 SHA512 f077a926454800280b9937e4a5e3849b16347ae86579ca3d2f20e2ba67b474f861bfbf8648234eec3d84729c89de4d9ba696f21cf01fbf881e4808539bcd7e6a WHIRLPOOL 45d1cfd49be0f74a4c3487cb7524a5a88c1036567da9c1377d9be0f98279e1f1039222bbd96b3699bf451f8ccf247c9f914bd96547d3ce654b15a2fb61b0a1e4

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160104.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160104.ebuild
deleted file mode 100644
index eaeb801..0000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160104.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/2016-01-04_00-02-04/zip/netbeans-trunk-nightly-201601040002-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 2c3c8d2..557cfc5 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-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
 DIST netbeans-trunk-nightly-201601120002-src.zip 209484230 SHA256 f2a06a7012a1744d78981c8b24607263aca1548b3ae245c2fe1e26e2f616b376 SHA512 47e23368bce1de6e5a2cfaa442983172d053cb934153219608c0d68f2f6f7ed3de38852fc9146837240868a1850d152655606832fa6ae53c242e84aa0f91f7b0 WHIRLPOOL fe1755aacff101c021d046dc57b08f65ba01c2d45e4d9203cafad957dec4845b6aa78473896f59bc1e4e1e7e8a39d79e89678512bfd2a9a9d81dc014bbeef145
@@ -26,7 +25,6 @@ DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
 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_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
 EBUILD netbeans-nb-9999_p20160112.ebuild 4111 SHA256 d943c47450b369ad255008ec45c9c69c7b289c246ea95eef20da9d31e2b3a70a SHA512 46b0be43e13b246a06edadd8479fdd98a7d3b75da9e847e9ef17a420b78958dc2e16750fe7d88aa27ae82403efd90d330a8a14fc1c57b426b712df151ca50fba WHIRLPOOL 7e5a5cbb9f91b612e40797b5073c23f39f5ce1e391765a0cd60bbaeac87a948a76fbe368206eb90ecfa4aa1909149f7348865dab690b668398ce17445ec0691b

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160104.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160104.ebuild
deleted file mode 100644
index da43efc..0000000
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20160104.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/2016-01-04_00-02-04/zip/netbeans-trunk-nightly-201601040002-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 7a55c05..b15bd05 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-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
 DIST netbeans-trunk-nightly-201601120002-src.zip 209484230 SHA256 f2a06a7012a1744d78981c8b24607263aca1548b3ae245c2fe1e26e2f616b376 SHA512 47e23368bce1de6e5a2cfaa442983172d053cb934153219608c0d68f2f6f7ed3de38852fc9146837240868a1850d152655606832fa6ae53c242e84aa0f91f7b0 WHIRLPOOL fe1755aacff101c021d046dc57b08f65ba01c2d45e4d9203cafad957dec4845b6aa78473896f59bc1e4e1e7e8a39d79e89678512bfd2a9a9d81dc014bbeef145
@@ -27,7 +26,6 @@ DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
 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_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
 EBUILD netbeans-php-9999_p20160112.ebuild 4418 SHA256 584ac53aea13aa089a386e43aba0fdfd608615313dfed71c21ec8f636671c93c SHA512 a50e799741ba50529b192f47b7ba564aa53f143897ad56d37d5450f91aca2e9c6449f6ad4efe33f2d7e6ebf79506ab161cd4cd1daee4b92857072c5fa8150f1e WHIRLPOOL 51bd3748dda55e5d70fb28a61447b769acd28b13c621fe51616d22a8644252ff5901305293c77b426b1ff559cf7aa7d21f5d421b339028c0230be657efd02b46

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160104.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160104.ebuild
deleted file mode 100644
index 43bd861..0000000
--- a/dev-java/netbeans-php/netbeans-php-9999_p20160104.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/2016-01-04_00-02-04/zip/netbeans-trunk-nightly-201601040002-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 084c193..f7aa4bd 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-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
 DIST netbeans-trunk-nightly-201601120002-src.zip 209484230 SHA256 f2a06a7012a1744d78981c8b24607263aca1548b3ae245c2fe1e26e2f616b376 SHA512 47e23368bce1de6e5a2cfaa442983172d053cb934153219608c0d68f2f6f7ed3de38852fc9146837240868a1850d152655606832fa6ae53c242e84aa0f91f7b0 WHIRLPOOL fe1755aacff101c021d046dc57b08f65ba01c2d45e4d9203cafad957dec4845b6aa78473896f59bc1e4e1e7e8a39d79e89678512bfd2a9a9d81dc014bbeef145
@@ -40,7 +39,6 @@ DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
 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_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
 EBUILD netbeans-platform-9999_p20160112.ebuild 9360 SHA256 e1568d88dc48d8564ed633c9869e509cfb7730f6d076a0636189d5f2f346c871 SHA512 918aa87f06955672e1ce2a00ca8319b7ab401e8f72b5584f94570b3fb4938be03af3990f4a4e2577d717e53ff6a3c6c2c8d882241d38fe6075239e451b3e84a4 WHIRLPOOL 06e9090abc2852ceeef6e822159e76835e5029e309cb547956436841b6744765f84e6b9a84a0223b532229abb0e418146b59301cf90c5bdfb6155824a6adacb4

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160104.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160104.ebuild
deleted file mode 100644
index 22f6f78..0000000
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20160104.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/2016-01-04_00-02-04/zip/netbeans-trunk-nightly-201601040002-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 2b81874..082e9eb 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-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
 DIST netbeans-trunk-nightly-201601120002-src.zip 209484230 SHA256 f2a06a7012a1744d78981c8b24607263aca1548b3ae245c2fe1e26e2f616b376 SHA512 47e23368bce1de6e5a2cfaa442983172d053cb934153219608c0d68f2f6f7ed3de38852fc9146837240868a1850d152655606832fa6ae53c242e84aa0f91f7b0 WHIRLPOOL fe1755aacff101c021d046dc57b08f65ba01c2d45e4d9203cafad957dec4845b6aa78473896f59bc1e4e1e7e8a39d79e89678512bfd2a9a9d81dc014bbeef145
@@ -23,7 +22,6 @@ DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
 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_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
 EBUILD netbeans-profiler-9999_p20160112.ebuild 3472 SHA256 c0f113da2cb18c9befd0e628cc7780e9f7fb1b016dbf9dba3065214ed00b93ba SHA512 ee6e9edb031772d776a7cf3b12eaf420d138f3fb9e926f92505d153f44d0064b1b11a6a104f948e070828b4dd2a14cc59a1f40d82c68ad66e4442aeee1972eec WHIRLPOOL 5da84523f9269c022d328040ffb9283100d829d1798149295396d81d6a732b7ccdb9956f3afb1d1387ef0842f3cb831e2c9a9018eecab94c6aec06f1bb407fbb

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160104.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160104.ebuild
deleted file mode 100644
index 1eadf0f..0000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160104.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/2016-01-04_00-02-04/zip/netbeans-trunk-nightly-201601040002-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 875d720..d159dee 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-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
 DIST netbeans-trunk-nightly-201601120002-src.zip 209484230 SHA256 f2a06a7012a1744d78981c8b24607263aca1548b3ae245c2fe1e26e2f616b376 SHA512 47e23368bce1de6e5a2cfaa442983172d053cb934153219608c0d68f2f6f7ed3de38852fc9146837240868a1850d152655606832fa6ae53c242e84aa0f91f7b0 WHIRLPOOL fe1755aacff101c021d046dc57b08f65ba01c2d45e4d9203cafad957dec4845b6aa78473896f59bc1e4e1e7e8a39d79e89678512bfd2a9a9d81dc014bbeef145
@@ -38,7 +37,6 @@ DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
 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_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
 EBUILD netbeans-webcommon-9999_p20160112.ebuild 5280 SHA256 2706a495b44cb9a0c8600f21782829b3e2ac664f14847fc14df1b749270de17c SHA512 163bac19a3d10f6bf3e79d6ee6beb20325f3a66f1170d8084972a923b2ecb5743c26b45ea9f71fcbf54f7970fd8f34c76b891aef0b5e109d6f8f406beb532ce0 WHIRLPOOL 9f1aff6b0f0aaa53e899a6202847a4f7056621ca901c310bf7638e5f673a12d031ce0d3e92ac64c36278ea6966fc45542257e553b0174a937584a5a40d6022d4

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160104.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160104.ebuild
deleted file mode 100644
index 7be04a0..0000000
--- a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160104.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/2016-01-04_00-02-04/zip/netbeans-trunk-nightly-201601040002-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 7a868fa..b34a052 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-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
 DIST netbeans-trunk-nightly-201601120002-src.zip 209484230 SHA256 f2a06a7012a1744d78981c8b24607263aca1548b3ae245c2fe1e26e2f616b376 SHA512 47e23368bce1de6e5a2cfaa442983172d053cb934153219608c0d68f2f6f7ed3de38852fc9146837240868a1850d152655606832fa6ae53c242e84aa0f91f7b0 WHIRLPOOL fe1755aacff101c021d046dc57b08f65ba01c2d45e4d9203cafad957dec4845b6aa78473896f59bc1e4e1e7e8a39d79e89678512bfd2a9a9d81dc014bbeef145
@@ -23,7 +22,6 @@ DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
 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_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
 EBUILD netbeans-websvccommon-9999_p20160112.ebuild 2721 SHA256 bd8f08a8338d38f8e759fa2fd311ff5e84866a36af495476bd7c58a918543852 SHA512 04cce33310092c1053655d25296e5d01ae5142f8aeb14d41063d7a9ca017337ecf9689929dd21480818aa918b380c17505de494a394c7537406ae46ce66fe861 WHIRLPOOL 6e26e805d480b5d960e4300fa33b36536420c34263ffc1083580ddf10d29ed65fef03da405a05c1ebe92bccf959be0dcf439c482956179e0c0dac4be6a7d6e83

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160104.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160104.ebuild
deleted file mode 100644
index 5254959..0000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160104.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/2016-01-04_00-02-04/zip/netbeans-trunk-nightly-201601040002-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 0f24d71..a8ba3e1 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-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
 DIST netbeans-trunk-nightly-201601120002-src.zip 209484230 SHA256 f2a06a7012a1744d78981c8b24607263aca1548b3ae245c2fe1e26e2f616b376 SHA512 47e23368bce1de6e5a2cfaa442983172d053cb934153219608c0d68f2f6f7ed3de38852fc9146837240868a1850d152655606832fa6ae53c242e84aa0f91f7b0 WHIRLPOOL fe1755aacff101c021d046dc57b08f65ba01c2d45e4d9203cafad957dec4845b6aa78473896f59bc1e4e1e7e8a39d79e89678512bfd2a9a9d81dc014bbeef145
@@ -26,7 +25,6 @@ DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
 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_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
 EBUILD netbeans-9999_p20160112.ebuild 6938 SHA256 4d0654dd362063692c1549ea2594783116166d9b69731d7a758288189b732942 SHA512 fef1cdf2fd16f10eb60f9e7feb45df5ebd530991af1a7d2866a3b45b5c30254266d6661e6e6e9d4e45ace31fa0a70a85b046ca5c75205b66343e32dbe51eafe5 WHIRLPOOL 5a7f7fb3e1de305656cfa532fd5acf87c05efdd7686aedff3351479c363fd841873c738a77a97f1dd3f0213d493ed3f8e4d1e976737ca04fdbb7ed18150b3268

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


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

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-apisupport/, dev-java/netbeans-nb/, dev-java/netbeans-groovy/, ...
@ 2016-02-08 11:57 Miroslav Šulc
  0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2016-02-08 11:57 UTC (permalink / raw
  To: gentoo-commits

commit:     66eab9ced4b831f8f957adba0ae6e87e5f2c5406
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  8 11:57:03 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Feb  8 11:57:03 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=66eab9ce

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.2.27

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 833f274..4ff3d1e 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -20,6 +20,7 @@ DIST netbeans-trunk-nightly-201602020002-src.zip 209598146 SHA256 0b1707c46f0d9b
 DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232d1b71f43142523a79fd0627b569bde6039141810334c7bab27 SHA512 46ab55b9253c04ba2c807531b723a00eeac73af33d2dd0efca6c7db595aca0e0811725b37603148b82a59bb324bfa88f7de56cddd312b2ba2cf28db604fcff67 WHIRLPOOL 84775701a651db0b540ab9aa86835d44d81544ccd11879c189018fd781d73662b2411f8212d33754001fb4b598f784b74bfcef6819fd034683cbe624a697e7f3
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
+DIST netbeans-trunk-nightly-201602080002-src.zip 209611236 SHA256 4d951395dbf396fd41d43efb30f19b7482eccc19969c479d91576ab0bf7662f3 SHA512 2f4e76cb78bf06a6290e291a1663c2931e53d08abb56356eb3e4e6443eb79e2261e77caa10d6fef70e3f7c8cf7b9772e0036a58781a8e11c22503e76d70abfad WHIRLPOOL b063ead0d9beee28352e03e499d891efe4f06ba8c739576b253f825e7559e9f0f98951162e10be48da86c0c1b0432ea18fcace727a7bff34aa4e07bd2543b6bc
 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_p20160108.ebuild 3384 SHA256 d8dc22131998f889bcca0e7b4e6d43b3ec298135e386d7f06883b5aa10c71c9c SHA512 289bae2cd42d587b2721a2e43d887055dd4f292b127b8f1a1424525fb42e755140968ad0c1c5a69cd15d989a5efe63c8cbe5c32a1babf705cd4288552ceba274 WHIRLPOOL 16169c9745087e1e7a336db58321bb406c9e9ad2ca69c3d860e9d74815c323116197db668c62d37189252806b3fc60f72c48c77e53ae0cd96acef6c349fd819c
@@ -39,4 +40,5 @@ EBUILD netbeans-apisupport-9999_p20160202.ebuild 3384 SHA256 f1bb8534e0d531e8561
 EBUILD netbeans-apisupport-9999_p20160203.ebuild 3384 SHA256 22e7421d319eb975b86c9c848e9af668f7f7c70ffffaf7ea8596ba1ca6a06850 SHA512 bed277c8ff7f693bc834b38d80ba7f2d8aeca8917e38aae91a3dc45e2b5acab6237726eba1f4fc6e5fc95bf62f26df5778cdd44ad2eb724bb9b3dc294cf50470 WHIRLPOOL 157a2ce99f4ce71c4c9959eccab899affec8c890255d96780344568213c59aeb0c22a51afd38e4655af87689da384bd3e7be1b5a0aeaa7bc395f69eac41ce4fd
 EBUILD netbeans-apisupport-9999_p20160204.ebuild 3384 SHA256 62c662c5fee46e2f93f4ee0f49371575131b06f19015dff393b00ecd1d6e2e40 SHA512 0d132752086073ca18233c851f33bc26cfcdcd1a5f50bde71298ffd7fc8833f91e40bf945a6b9a1821ef3b54684a921a6b96022a4203ac7087d2fcb6a8f66841 WHIRLPOOL fab8805e9862cd70299d4a42cb016cab2680850a8b5da5d7751e69f1c5810151219e6b302b1771b72e46212dce07c71e6126578c908c16ed4882b45bfd1b4774
 EBUILD netbeans-apisupport-9999_p20160205.ebuild 3384 SHA256 227cb78f8576f57d6055844a25340ed07cd5e67764937868309951ecc71bef13 SHA512 c204dc4a248a337a30bb0600db6e4dba9a47f916c32c93f8cdafa1542dcb99df64b9b6f0a0a64d86a1d072e8d5f7effa321e6762da9cca7ad6a1e8ce0cba998e WHIRLPOOL fa35e801e8f77f614165d897a2bc93099e39e6b7a85f38151ca4e11bb0b3e232b31f59250f60e445439406e7af7ae16d51d47d21b455659cbb40fd8017ef11df
+EBUILD netbeans-apisupport-9999_p20160208.ebuild 3384 SHA256 1378de92b48edb8c503b2e7402542b57b5dcf5fad13f54824ba37ec4d360c69d SHA512 a51384567dc74108ebcdfc04b33367721088f6d176c67510856998d16577b63dff470b3aba0e00d80703d3115c59529102aa412da154465f2d97258af0aa84c1 WHIRLPOOL 68083e1b331a9f87c1e408214181d7494c786dfcac9a64076ee561854f3e90bd1cdc011bbc042b79cd8a561ac770b175733c5d4900b0d9e60b12291eef0e2888
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160208.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160208.ebuild
new file mode 100644
index 0000000..32956c6
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160208.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans API Support Cluster"
+HOMEPAGE="http://netbeans.org/projects/apisupport"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-02-08_00-02-15/zip/netbeans-trunk-nightly-201602080002-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 e667e6d..ec7b54e 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201602020002-src.zip 209598146 SHA256 0b1707c46f0d9b
 DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232d1b71f43142523a79fd0627b569bde6039141810334c7bab27 SHA512 46ab55b9253c04ba2c807531b723a00eeac73af33d2dd0efca6c7db595aca0e0811725b37603148b82a59bb324bfa88f7de56cddd312b2ba2cf28db604fcff67 WHIRLPOOL 84775701a651db0b540ab9aa86835d44d81544ccd11879c189018fd781d73662b2411f8212d33754001fb4b598f784b74bfcef6819fd034683cbe624a697e7f3
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
+DIST netbeans-trunk-nightly-201602080002-src.zip 209611236 SHA256 4d951395dbf396fd41d43efb30f19b7482eccc19969c479d91576ab0bf7662f3 SHA512 2f4e76cb78bf06a6290e291a1663c2931e53d08abb56356eb3e4e6443eb79e2261e77caa10d6fef70e3f7c8cf7b9772e0036a58781a8e11c22503e76d70abfad WHIRLPOOL b063ead0d9beee28352e03e499d891efe4f06ba8c739576b253f825e7559e9f0f98951162e10be48da86c0c1b0432ea18fcace727a7bff34aa4e07bd2543b6bc
 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_p20160108.ebuild 4790 SHA256 0e7eabbd12b9f3326d5b5cb240535e7ce9fcb916f2826f078ccac8a70b0b89d1 SHA512 bbeeae09cdfc68ef09452e0793b82aa259d5548663334d42c105da1ff76eb2169d57e3aa3857808b8fe3841c55466efc8c946db431612984bbe5ecb8f82ce751 WHIRLPOOL 07a7d7aebd2bd08fd1167cc9d00657a01987f328e44c7659936b6ab862d4b6ecdb015e3044a44b991545fc6634b75a76dd087ea38b986466f393f5f5b40e77c3
@@ -53,4 +54,5 @@ EBUILD netbeans-cnd-9999_p20160202.ebuild 4790 SHA256 7b9f26149811aa0c929756f1f7
 EBUILD netbeans-cnd-9999_p20160203.ebuild 4790 SHA256 a84980c76aab918bdef5926a687529157108e0350053ff7454ea5e3cabf1772d SHA512 8468bec6196534c2d50a35aabb195e27eec9ecd5ce865ce7c00a6c1c6e807d2ee966acb9e7545687bc2020ab0bb466a9bb125301362ec8dcfa8f1a6b4f9fd67c WHIRLPOOL 7e748cdfc61bdf26932e1957e173b4937a27df173aaa3a5b328693c717e37e2a6d634493ea08982dba5699987543dbd6d98db16adf3784a08a6877f81d55347d
 EBUILD netbeans-cnd-9999_p20160204.ebuild 4790 SHA256 69f584edf1482f4cf4bc11d9b5177728340fd4e08acf28a0b2537124c655e77b SHA512 6a80766fcc07a8b7ff46d909d5d5a9f65407c7683366d7dfe0893dae92aaa1705d8f6edf23d08c29b09a5c585147151e0dc56fc86822f80fa008e3444942bf53 WHIRLPOOL 6ec5772493f0aac9ab26960ac948aee50f88b988f360716f49348640a654efc959a9361ad38a4e50f2e10a28e4ed2d854f0086af96d3672f73564ba6bc16562e
 EBUILD netbeans-cnd-9999_p20160205.ebuild 4790 SHA256 66dfeaeec56d6033f3103acdbe76672c406524d47262264654961e62befda5df SHA512 163713dee358566daa29c76d73626525d23750eed0965d07f3c0f0d828908b3c8a8123b3d9d143825e9a553d0bd71e24893b5efbcf162683b1cb3a3a4ff4a8d9 WHIRLPOOL cde5795c3b576971302a1cfc6ce26254be9f063acc093d2240bec6c7534cbe83d50a55c97cd190a88715892a04e03d23a0d3215fc2879db1911bab07a35a471c
+EBUILD netbeans-cnd-9999_p20160208.ebuild 4790 SHA256 10059c6d4e5eff0f93ba4e3b2a36540044316f6cf4dfd914962b4842d81fab33 SHA512 7b4b07a06249736c9fd42405b320a3dcbd2a93901a62b82102f10d6ccd8f62fc98b45009a437fb37edcc41800da7f45050c6fcf8460054827435d32937b3fee1 WHIRLPOOL 0353a46ccee672c4b7551ecca06cee74116c00c0d05295b09fcbebea97b1eb025f13d5fc3b7d186c15ef52f45338fdf3c3e9553fc5a5adaed501af61f5868afe
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160208.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160208.ebuild
new file mode 100644
index 0000000..19fdb34
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160208.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans CND Cluster"
+HOMEPAGE="http://netbeans.org/projects/cnd"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-02-08_00-02-15/zip/netbeans-trunk-nightly-201602080002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar
+	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
+	http://hg.netbeans.org/binaries/147687C3E91A8E448305A946A9D585F0DB544465-clank_0.3.6.zip
+	http://hg.netbeans.org/binaries/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip
+	http://hg.netbeans.org/binaries/E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip
+	http://hg.netbeans.org/binaries/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+# These files are for remote development and debugging
+QA_PREBUILT="usr/share/netbeans-cnd-${SLOT}/bin/*"
+
+CDEPEND="~dev-java/netbeans-dlight-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	>=dev-java/jna-3.4.0
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.cnd -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar libs.antlr3.devel/external/antlr-3.4.jar || die
+	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
+	ln -s "${DISTDIR}"/147687C3E91A8E448305A946A9D585F0DB544465-clank_0.3.6.zip libs.clank/external/clank_0.3.6.zip || die
+	ln -s "${DISTDIR}"/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip cnd.discovery/external/cnd-build-trace-1.0.zip || die
+	ln -s "${DISTDIR}"/E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip cnd.remote/external/cnd-rfs-1.0.zip || die
+	ln -s "${DISTDIR}"/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip cnd.modelimpl/external/open-fortran-parser-0.7.1.2.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.jna/external jna jna.jar jna-4.1.0.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-dlight-${SLOT} dlight || die
+	cat /usr/share/netbeans-dlight-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.dlight.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/cnd >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/cnd$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	fperms 755 bin/dorun.sh
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/cnd
+}

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 6adf74d..47e8d5e 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201602020002-src.zip 209598146 SHA256 0b1707c46f0d9b
 DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232d1b71f43142523a79fd0627b569bde6039141810334c7bab27 SHA512 46ab55b9253c04ba2c807531b723a00eeac73af33d2dd0efca6c7db595aca0e0811725b37603148b82a59bb324bfa88f7de56cddd312b2ba2cf28db604fcff67 WHIRLPOOL 84775701a651db0b540ab9aa86835d44d81544ccd11879c189018fd781d73662b2411f8212d33754001fb4b598f784b74bfcef6819fd034683cbe624a697e7f3
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
+DIST netbeans-trunk-nightly-201602080002-src.zip 209611236 SHA256 4d951395dbf396fd41d43efb30f19b7482eccc19969c479d91576ab0bf7662f3 SHA512 2f4e76cb78bf06a6290e291a1663c2931e53d08abb56356eb3e4e6443eb79e2261e77caa10d6fef70e3f7c8cf7b9772e0036a58781a8e11c22503e76d70abfad WHIRLPOOL b063ead0d9beee28352e03e499d891efe4f06ba8c739576b253f825e7559e9f0f98951162e10be48da86c0c1b0432ea18fcace727a7bff34aa4e07bd2543b6bc
 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_p20160108.ebuild 2968 SHA256 27f08dfec6e4bb02cbef6a9979b444f0dd74688ac3c44177fdf5444f2909a3bd SHA512 29864e22f61edc575e0bf79687f1857ac57bdd92d185ec72a79418204ef37a62c5f23e3880295445417ebb39c38905952a43f5c3df20196b0e22b3a26469bb2e WHIRLPOOL 6d02dae9d9cfbb27abdde72759982c089f6c6d2426062e215577ac77dada0a5c2e373c417a7517097a75c45e1d9cb6a09664d109d7033c67c92e59c68cc1f8f3
@@ -45,4 +46,5 @@ EBUILD netbeans-dlight-9999_p20160202.ebuild 2968 SHA256 aae7f714a3a843422a2f3b9
 EBUILD netbeans-dlight-9999_p20160203.ebuild 2968 SHA256 271a111780f6f2d942fa13d0acaa55d5555958524ac0a36604980e6f291686f0 SHA512 1cbc553f71d7ce1fa9fce8b3a9fba90b4fe451d641cc8524a2f78de06a3ec59572ee8c9501edc8df0047c1c40eedce250e5e912d54bbdd57eeb55b5d3f04cccd WHIRLPOOL dab32fa280d1ffcc0823cf6775d34bf9d37cbccbf9997f009f4dcddffb6b5f2a7ab54f95da0d4ed3a3b966a7066af566eb9e96f9550ce84165b8e23b8372ef55
 EBUILD netbeans-dlight-9999_p20160204.ebuild 2968 SHA256 0a6627c5c04ce5b80ffb78b9d7741ea1244e0cba07ab2c965d6311629aea1f43 SHA512 32fa80ab23393f8cb7199e3107b9ea2f9d9e4e0f382ba41eafc9801866277f4a40e976c22e6df03bf9dd01611e8a8f066f5e0cf6b51ba6121e4c6036da1ae713 WHIRLPOOL 0cf3aedc58b7e91e776d6c72edae4ecdda368e37f9b499731bfe71c40b9828c04ae13ab24523401e0944f31296f9bc828a65a02f166ad0413e9b99a8c9715abb
 EBUILD netbeans-dlight-9999_p20160205.ebuild 2968 SHA256 4884bb61299b8a1aa0b6ff45036074a3f34241e509b60f0b89fd6ec7c4818cda SHA512 4b0e41751d2884e8fb8efd14292d7beee709734a146536f0c8260a5e70b315c5f97f0c2ae0fd5401f73d690fbf4b8628f4108cb3114fe1c58ee28f1326e9e1a9 WHIRLPOOL 0a7fa09bb0ee90d0760bf9016b79685ac3d5d1f7ab25d50c9f37e6df26c434a45c37bfd77ad3655032ae5bcff0f9d321e156dc0657bc03efad86c6cafbaf78ec
+EBUILD netbeans-dlight-9999_p20160208.ebuild 2968 SHA256 a243072b9f90966f865db8bd54e33b940a214aca22f62a22c38f444fa43bd6bf SHA512 7e1cfe66c395a0ef51dc11c0ff5f19edc81a73f71f864d299ecfa635ccd1705b7ef26888ecd8cd1be45058b3cf20c462040b6ee8e1c5dd0cdf1c2e8cba4690d1 WHIRLPOOL d768542cadfb5bb08267f9af1f200f00a65f3e9298bc343eeb94b8190e67a466674347119d48ace874d2415ad9488d0fd28f1bc8e091ceab262b8364bb7775f5
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 4c56365..21d2b92 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -52,6 +52,7 @@ DIST netbeans-trunk-nightly-201602020002-src.zip 209598146 SHA256 0b1707c46f0d9b
 DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232d1b71f43142523a79fd0627b569bde6039141810334c7bab27 SHA512 46ab55b9253c04ba2c807531b723a00eeac73af33d2dd0efca6c7db595aca0e0811725b37603148b82a59bb324bfa88f7de56cddd312b2ba2cf28db604fcff67 WHIRLPOOL 84775701a651db0b540ab9aa86835d44d81544ccd11879c189018fd781d73662b2411f8212d33754001fb4b598f784b74bfcef6819fd034683cbe624a697e7f3
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
+DIST netbeans-trunk-nightly-201602080002-src.zip 209611236 SHA256 4d951395dbf396fd41d43efb30f19b7482eccc19969c479d91576ab0bf7662f3 SHA512 2f4e76cb78bf06a6290e291a1663c2931e53d08abb56356eb3e4e6443eb79e2261e77caa10d6fef70e3f7c8cf7b9772e0036a58781a8e11c22503e76d70abfad WHIRLPOOL b063ead0d9beee28352e03e499d891efe4f06ba8c739576b253f825e7559e9f0f98951162e10be48da86c0c1b0432ea18fcace727a7bff34aa4e07bd2543b6bc
 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_p20160108.ebuild 15825 SHA256 f34cb390190dc60d95784f28d943de98fbfe42eb32bab20cb7c964046295005a SHA512 d265877a76712c6a7a2589a93b90fae87d8bfc1c12aa4a5a9518cbcf366582751c993e47149df924add26d68e348d442f87903d3ec9a60246cc681f70898c8a6 WHIRLPOOL eadca79074ee37848e20e99cdd32b8f87452679899b1f0dabfad79ddc7cfdb1814ffd7a5268a9c1e459d7f0c2eeb821e21c35832750fa02914e5892222b0f2dc
@@ -71,4 +72,5 @@ EBUILD netbeans-enterprise-9999_p20160202.ebuild 15825 SHA256 f9991dee022215a40b
 EBUILD netbeans-enterprise-9999_p20160203.ebuild 15825 SHA256 5af735a23461a6c42445554e7f71e30d4905ffb11b8d977bc8721da6006eafd6 SHA512 e53cf3ccecfca82558a2cbec469265cf2da610a8f292c37128099978d8a90db524d25c0548c03b4d2885a56e868d82bac16c6b02a04d8ce5db05562972baf3c5 WHIRLPOOL 2a25c2e3e22f43004589ceb111b4a9ba13e816213d431c99643e4e5c05021d08f7753a803bd8d4a39c1b93a96e67c0899d51acbac6c56e19ae46a246a5c40693
 EBUILD netbeans-enterprise-9999_p20160204.ebuild 15825 SHA256 23a9b0bfcd6b28c1b37d0426ec09f19b9934ac44a69c1d4da75ccca5fc25351c SHA512 993ade5e5d3f5d5f75356362738b48c94a4c0f065b4a8c3001a0bdc53f753108ed8faf35bff8d27eec279420db7dcadf7b08ff01b24ee2b8e46802fe9d85cca6 WHIRLPOOL 475091111c581f06ac4e5e4f9749c0b5b01f8de287c1e9ae1a3166d8fb6269985ed93dede057d2f013a707583fb2f7c603cb038c0fdf991c94b934e8a06b1e60
 EBUILD netbeans-enterprise-9999_p20160205.ebuild 15825 SHA256 d056da86e6bf4b8339f195903582640a5c304ab389ef73f317c85360067a77ef SHA512 da045a906c28619065c10f99fe94103535aff5fda023f29fb6cc02a4d2bf10d133f4ddb4f89f146b2cafc93d07a9637bba1354fea7d809af647f296ee9103b85 WHIRLPOOL 38d3c05e1734f375698276e0ff9868f84a1d12b79307329b308af9eee9b5f99bcd92baab4dff91b218a73ba84c7e26c1c179900b18e5537c8c7a7ff017817c39
+EBUILD netbeans-enterprise-9999_p20160208.ebuild 15825 SHA256 ef9d6adb1c161dc79a20bdbb356a772fab2dcfc45728c5b71cb504fcf744fd7f SHA512 ac89c0d915587de9777d6755a94aaf358cad3489f00e92c47eb4afb1113b9e73d4179f8180c142ce5b6ff1637b3c74137d33ce6a9a6d141fdc31368367162724 WHIRLPOOL 4735d8a7814825d6cd9476859c3b19c6f7a021d4b4cf566b7a1b49d4abdae4527d9d50e1521b199fa5e62db7bde55395154ee8d96e4aa4a5472555f6d3c0ec77
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160208.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160208.ebuild
new file mode 100644
index 0000000..bbfffb7
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160208.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Enterprise cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-02-08_00-02-15/zip/netbeans-trunk-nightly-201602080002-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 a4ff68b..043bbac 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -20,6 +20,7 @@ DIST netbeans-trunk-nightly-201602020002-src.zip 209598146 SHA256 0b1707c46f0d9b
 DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232d1b71f43142523a79fd0627b569bde6039141810334c7bab27 SHA512 46ab55b9253c04ba2c807531b723a00eeac73af33d2dd0efca6c7db595aca0e0811725b37603148b82a59bb324bfa88f7de56cddd312b2ba2cf28db604fcff67 WHIRLPOOL 84775701a651db0b540ab9aa86835d44d81544ccd11879c189018fd781d73662b2411f8212d33754001fb4b598f784b74bfcef6819fd034683cbe624a697e7f3
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
+DIST netbeans-trunk-nightly-201602080002-src.zip 209611236 SHA256 4d951395dbf396fd41d43efb30f19b7482eccc19969c479d91576ab0bf7662f3 SHA512 2f4e76cb78bf06a6290e291a1663c2931e53d08abb56356eb3e4e6443eb79e2261e77caa10d6fef70e3f7c8cf7b9772e0036a58781a8e11c22503e76d70abfad WHIRLPOOL b063ead0d9beee28352e03e499d891efe4f06ba8c739576b253f825e7559e9f0f98951162e10be48da86c0c1b0432ea18fcace727a7bff34aa4e07bd2543b6bc
 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_p20160108.ebuild 2913 SHA256 4b1afd1b178c6d867c94d6e686561d8c72aeea70feecbacf6fbc6c886ed1c7f1 SHA512 d17c41b2d1750183086c0abbf2da232145102c0f875ae89c840aca85ec670b496e82d46c9558d701f93370998ee6c46eaabcb0eca29274e0d8993f7ae932e80e WHIRLPOOL f339153c2791b78dfa2cc16c208c79de5f66a99b184fcc420ba741b12f6e104334fdfc7de5371834b8d56b75929f498641c56196a307c3e7895e1bb2c3f197ed
@@ -39,4 +40,5 @@ EBUILD netbeans-ergonomics-9999_p20160202.ebuild 2913 SHA256 1889b61cb3189753c38
 EBUILD netbeans-ergonomics-9999_p20160203.ebuild 2913 SHA256 4882eb60280bd7fa5c0fa602ac1196ef78e9b64253e9c052ca5204de2e38fcb0 SHA512 a966390d5ba253a3c67dceb20e9b142319e83dcf2f352cff45a7bb35af04e4df85a4d926241c72c08bf12b236d2823258e36c5bdd101fd1233f97028687fb8a5 WHIRLPOOL bab60fcf209d6daa93cc11150d56396cb18d1867fc351a0b5f940d9a521e4fc1a094d063d17c151497df6aabe084c37c9237b8c93b44da6502987fe16a8ccfab
 EBUILD netbeans-ergonomics-9999_p20160204.ebuild 2913 SHA256 36cbc3ac545d5851d512a733bdb2d6fad919aac006ca7b4b54119962049b5751 SHA512 ee48db487dbda967f3a06aec98496c7164a8ba8c4a66b4ed1f904a91d086490a232de55f5e83893b0b7bc5cbd8f4fdf4b7bdf5cf300344f229dcef636170da01 WHIRLPOOL 32954110b0447df394b67a9be29ef20576f1a7bcf9518e6a6b0aba8b7aed846573e925ce87f2410ced7f79de6f6f9daa68b92159f427cf4c29cba229e0a0f453
 EBUILD netbeans-ergonomics-9999_p20160205.ebuild 2913 SHA256 fa3959db858909e6eaca5df59bd146f2e3aedc8767b88f75350f27ce917605e1 SHA512 c726714a18301fe7be7c2470f10e3084c7cb952f3feb052afbab2faa3cd00315694e1da717d78e6d94757be48c0da4166bac1db01aa8a560c0f60a17229e466d WHIRLPOOL 5dd3ce235b39454e9b0d4cf0a76f4178c178ad4a1fde56cfb901cb2a8739b85b2dbc836a88733c16bbdc27e96985e88039851a7519c144adbceef434a9c87157
+EBUILD netbeans-ergonomics-9999_p20160208.ebuild 2913 SHA256 a79d254239bc61531f33cb08878440482ceb9dd1c5296061430cf16f6e290d1e SHA512 128cab4b6d825c6f68824b6e058c5fb4f043b3acbb8c9106698c22698bc8f4b85ec18cdb624fc30b01972250a7ed3f429e39f85bacef5f2a8454657ed363132f WHIRLPOOL 6f42f2812e4a72f4ae2d2751c1dd3924e57eeefb79650ed1e2d4fa8965be7fa248fc7102a119eb7f91b68774da873c2196769ff55e32715756da51b0b7ddb68d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160208.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160208.ebuild
new file mode 100644
index 0000000..b025b4f
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160208.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Ergonomics Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-02-08_00-02-15/zip/netbeans-trunk-nightly-201602080002-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 b359ca2..f6fdd6b 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -22,6 +22,7 @@ DIST netbeans-trunk-nightly-201602020002-src.zip 209598146 SHA256 0b1707c46f0d9b
 DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232d1b71f43142523a79fd0627b569bde6039141810334c7bab27 SHA512 46ab55b9253c04ba2c807531b723a00eeac73af33d2dd0efca6c7db595aca0e0811725b37603148b82a59bb324bfa88f7de56cddd312b2ba2cf28db604fcff67 WHIRLPOOL 84775701a651db0b540ab9aa86835d44d81544ccd11879c189018fd781d73662b2411f8212d33754001fb4b598f784b74bfcef6819fd034683cbe624a697e7f3
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
+DIST netbeans-trunk-nightly-201602080002-src.zip 209611236 SHA256 4d951395dbf396fd41d43efb30f19b7482eccc19969c479d91576ab0bf7662f3 SHA512 2f4e76cb78bf06a6290e291a1663c2931e53d08abb56356eb3e4e6443eb79e2261e77caa10d6fef70e3f7c8cf7b9772e0036a58781a8e11c22503e76d70abfad WHIRLPOOL b063ead0d9beee28352e03e499d891efe4f06ba8c739576b253f825e7559e9f0f98951162e10be48da86c0c1b0432ea18fcace727a7bff34aa4e07bd2543b6bc
 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_p20160108.ebuild 3377 SHA256 c6676bf6c5ac323a20fafbb6d798413ae7aa982a414873a654ef73365af9c225 SHA512 ed177424f7ad0ecec26071d7c9669198de81aca39d3c0de233220db59b3264fb46756efb77ee791fc9ceb7c8dc31cd7ec4521514fdb7ed411250c5e7060fbf21 WHIRLPOOL 295756c0ae5eaf4f9055ef9f5e02bb3449375fd9564f1288e621d666e82828ae5e20097de5a2bce379214aa6e463cdf46bd4099627361e80d327601ab99eafce
@@ -41,4 +42,5 @@ EBUILD netbeans-extide-9999_p20160202.ebuild 3377 SHA256 668d7fdc82a52c51bc550a2
 EBUILD netbeans-extide-9999_p20160203.ebuild 3377 SHA256 2e4af3d79f8fe001b6f96a6eaf90baeeab1abd682f6e9ccc119601b3f40bcfd4 SHA512 3776dce886242cc3e55b263baebe58cd5e596f94d71d37dc9b0d656b9432caa69c8d4c4b8670613f54b21e85dff9445f106116a39572989a796d84c9628c6b8d WHIRLPOOL 02986f5db041f67f9f1e21daf45ea7022ac210a185b69833a7e4d3782d80db80cef1d292bc68589c3670911fe83cfe027732415abba18da06ea64baa3c40c212
 EBUILD netbeans-extide-9999_p20160204.ebuild 3377 SHA256 08b7349b773d4a3a02dc209c7ab34a38a9150e158e552fbbd1c3fe2bac561c21 SHA512 f995df55c0fb48fb3fc0c36ca531d98a34dd3ceef836ad049d5b6f56864c73a2087536eff61d4c9856513f9e52a9e789c0de41eea38b9efa83fe3812ff5a574c WHIRLPOOL 55f7829c1c344444a71198bda3594390812fc3d910cf38297aeac819b04add79c7b46b2ca9179274872d9886dfabf1eef5932557ec8da47089346758c21e3fbb
 EBUILD netbeans-extide-9999_p20160205.ebuild 3377 SHA256 aef9f0e2166fc9fddb900349108b6f738215a6f0e2f512b8ec3b6a241a574134 SHA512 579e2f6cd3ebecf9136256ef5325059d1f0cf6461cc776cca55c519e46dfa61f0ee309874453e72da899b8cf00d1334ef4fa20e025716ab4c75074430b0d4cc5 WHIRLPOOL d4f2cf5cf7f5f5cc5ef1f278d1597efcee2ce40977295abe791978b30898a0feebc009397d6a81d9383e5400d508ce7dfb22d33ee45d4a725a1a7ae156bac29f
+EBUILD netbeans-extide-9999_p20160208.ebuild 3377 SHA256 e68b21ab89a817687343cd977b2592bbca641ec8a023ff4dd8d0c1915c96173d SHA512 fdcb86a0ced309c433019dd799cc58f8d085a7f4dbf831fb7312967c217f7aa181d92c6297d7a7d36b9102b2a1d0afbe2aa6d03f5b1a7173281c54341127523a WHIRLPOOL 34c8c50a0185a50f454534161f2d833122fb801e283057f2df634638e6a4374377bc08f88fb00be27a9d4e939b9b300082b67ffa5f816d5b726a0c190703b6ea
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160208.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160208.ebuild
new file mode 100644
index 0000000..c3a5057
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20160208.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans ExtIDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-02-08_00-02-15/zip/netbeans-trunk-nightly-201602080002-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 c07795e..26ce93d 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -22,6 +22,7 @@ DIST netbeans-trunk-nightly-201602020002-src.zip 209598146 SHA256 0b1707c46f0d9b
 DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232d1b71f43142523a79fd0627b569bde6039141810334c7bab27 SHA512 46ab55b9253c04ba2c807531b723a00eeac73af33d2dd0efca6c7db595aca0e0811725b37603148b82a59bb324bfa88f7de56cddd312b2ba2cf28db604fcff67 WHIRLPOOL 84775701a651db0b540ab9aa86835d44d81544ccd11879c189018fd781d73662b2411f8212d33754001fb4b598f784b74bfcef6819fd034683cbe624a697e7f3
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
+DIST netbeans-trunk-nightly-201602080002-src.zip 209611236 SHA256 4d951395dbf396fd41d43efb30f19b7482eccc19969c479d91576ab0bf7662f3 SHA512 2f4e76cb78bf06a6290e291a1663c2931e53d08abb56356eb3e4e6443eb79e2261e77caa10d6fef70e3f7c8cf7b9772e0036a58781a8e11c22503e76d70abfad WHIRLPOOL b063ead0d9beee28352e03e499d891efe4f06ba8c739576b253f825e7559e9f0f98951162e10be48da86c0c1b0432ea18fcace727a7bff34aa4e07bd2543b6bc
 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_p20160108.ebuild 3416 SHA256 1c3253d2ff2f80bf8eefeda33cc6f75c7b9125ab3d4a294f646a3b2cebcd514a SHA512 e5d33196531e963597cc7c95dbf742eb4bd2ad1f83f3f2375ec10347a018bdb98403a7eae760956a8379327db5ad81c95051d28f8cfabe4b39da4aff3aec8219 WHIRLPOOL 64739e7e3f824eb4a0a17c786810f501949c5e80e47d09df46319d2e3dbb151faae19a2a3a229c82d1cbd762088932f9bf603bdf57a1510574f10fc4794a1993
@@ -41,4 +42,5 @@ EBUILD netbeans-groovy-9999_p20160202.ebuild 3416 SHA256 0de5f39ee5d07794ad1937b
 EBUILD netbeans-groovy-9999_p20160203.ebuild 3416 SHA256 cbf5d747825772663fbaf4ee474ff1d90cc1531651080430f6c26a183e271607 SHA512 123e7639f80bb364710a264de4560454ebe524fde01899fff4ec84a12bdef6b0e02b2ecf2eec66381127f03b0572f2fc846e0b5f77ab1a5b5763f599a5f509ef WHIRLPOOL e2819e23c7ac314ccc695e3b38d732e57bb104854f479f740af0f1006d4721728c99870a17b1e019f00a37bbedcfa45fd89c6ef5d8bf3a789f6b1d46af8903ac
 EBUILD netbeans-groovy-9999_p20160204.ebuild 3416 SHA256 56e8dfc4347210e20fd127b70c0ec318d034c386f29f5a11126002c95045c272 SHA512 a6366e27ebf0de777a69bb2acd52f7f16c49c34741f77e08a84666e1fbb90412feb70655ddfbb86744266356ba705afdc8e430e46d007f6eec9d50ffe33a321a WHIRLPOOL a19ae714d1415cfa17f344da200c08ac504a32c0e29e21380b0e7a6c5060fbd38ac17a7391b23c6a99486470ab7478c7c24766fedd7307197235c868f7c6adf2
 EBUILD netbeans-groovy-9999_p20160205.ebuild 3416 SHA256 9d7347fc6afdb39776b3a443aee5070b9c07577deaa18f81d883e46b499e6b30 SHA512 274f84204561f44c3ac9d292f31e4132fd8ffebc30e5bb0be9815ff4e336f1aecd046e65afbec2bd9a008d6b173f45c5402d8550262457ad3418c4c5b9a96740 WHIRLPOOL 623024680dfbf3fa8c9bd5736e132519dcac063b0a9c624c51debde79212f1f0a17bb323cca72008d5370528e0be77f9ce757a3924d7d30021854395ace9c5a4
+EBUILD netbeans-groovy-9999_p20160208.ebuild 3416 SHA256 191162afb5a236fbc34384cbd62e32c22c8a7ce93f6adf2423914e9a33742d6c SHA512 9cd17fee4b0fae482f8c8f89adef20131209a8dfdcc8ef89f67bc21640cdf09c60b07b85706216c48706f03a7e2f6395d8c7b5eee2388f59d759d46c5bfc2c43 WHIRLPOOL afde310148332fd647b924287692b4b0d7e0dd348df8ad478bf26f127206351e0eac09b8688c9c096bfd4075204e4df0527b6cf4b98f4049692ccb7150b52f10
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 172d0a1..95bad16 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201602020002-src.zip 209598146 SHA256 0b1707c46f0d9b
 DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232d1b71f43142523a79fd0627b569bde6039141810334c7bab27 SHA512 46ab55b9253c04ba2c807531b723a00eeac73af33d2dd0efca6c7db595aca0e0811725b37603148b82a59bb324bfa88f7de56cddd312b2ba2cf28db604fcff67 WHIRLPOOL 84775701a651db0b540ab9aa86835d44d81544ccd11879c189018fd781d73662b2411f8212d33754001fb4b598f784b74bfcef6819fd034683cbe624a697e7f3
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
+DIST netbeans-trunk-nightly-201602080002-src.zip 209611236 SHA256 4d951395dbf396fd41d43efb30f19b7482eccc19969c479d91576ab0bf7662f3 SHA512 2f4e76cb78bf06a6290e291a1663c2931e53d08abb56356eb3e4e6443eb79e2261e77caa10d6fef70e3f7c8cf7b9772e0036a58781a8e11c22503e76d70abfad WHIRLPOOL b063ead0d9beee28352e03e499d891efe4f06ba8c739576b253f825e7559e9f0f98951162e10be48da86c0c1b0432ea18fcace727a7bff34aa4e07bd2543b6bc
 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_p20160108.ebuild 4126 SHA256 ac9e052d58e0ef821f2030484f576bfb1778f31e0fbb4295f23cea5de0ae444a SHA512 994bef755ff15e22e2334f1f3fc6a095cfb6a1cfaedfe19ff5ce4932283bc3f2b356d6462d984730f66c002c3fb62fadc6821d80a12ef3a05935e326b42e7c64 WHIRLPOOL 94abc87b3a66da8a3b36e39cd1c34497a3196b88a83679ea230e2d963cab984dbdfb15c799096995cc809ee56c90562eb9f08feeb3a1cf66b540e73b7c88df0c
@@ -44,4 +45,5 @@ EBUILD netbeans-harness-9999_p20160202.ebuild 4126 SHA256 97de1490febd34da2a72a2
 EBUILD netbeans-harness-9999_p20160203.ebuild 4126 SHA256 c01600cf3c56cb0adc6830e3156ce6e20776c6d0053bd76f2965eae9746f4675 SHA512 0651f8321aafd51f7f08b4b345c90e5e90c7f1d49931dad6533b5541c847923ed6ea0fadd0722e978189bc878821097959f6f418b15a7f7908342ef47d069208 WHIRLPOOL 37030fddce70dbdbb926eb58848eb2c0e4b5c7da72db40092836e46d3713c83dd1b5c5afa14187ddeb8354e58e984b4534dff9c66b2ae777329e3bc53f6d3660
 EBUILD netbeans-harness-9999_p20160204.ebuild 4126 SHA256 d52552c9a50a8cf824bd434a115f32221de25ae243a2f8943dd2039a105a3e1b SHA512 51dfd9bef54d4b2a7f52439ccd48c7ebd883890fe5a3f05e63f0a064d56d3d4e50f4c6ca1ce9be2e610f6e20a22cf880f958f6295e0324b511c5f9b62a30b7a6 WHIRLPOOL a95192e40581f8ce5b1a7a9f7d5fbeb38c9b720e025936e506842745c265e9e269133b633e3e70fe61ee11a4ed46a7ebf13dc6aa439af082ec9cf88ba1a35dd5
 EBUILD netbeans-harness-9999_p20160205.ebuild 4126 SHA256 67987e11ba6903fd362367b1413e7d8162f64d67553de9fc67533364aa5b901b SHA512 97bf210ab201fe4e6d17669d791becaa87ae07b83be9d38766557bbe842a4c789331d6203d295163267c24620d2ac0e6a6f068c2fde3dacc88b6ad3610fb30fe WHIRLPOOL fc9d8916e2c262400b36d3d3e9b7f2375a5a28d6fc096219a5f8212335f16f6510cda2e850aa8413d4793a93b62fb25b192206c9bf1a20ea5a565ff680e3fc80
+EBUILD netbeans-harness-9999_p20160208.ebuild 4126 SHA256 71caeda56f3e314a9eb9a39ec372bf22163189a539644d59fdabaae4b87d6b32 SHA512 61b0f748003e7023c4d41e2249c2527c93e54d1f2f7821be6617b95192b80590d958265fdc74cc52153098a1e6331b7abbb46b9ca40e084a2ec356f1f589037e WHIRLPOOL 48bceb1128918aa2d8c5cc19d4c157183fe714270f93fdaa75db75890a0ca195dc9a2347c3c550dfd43e142f1920ea38149feeb88e2b32bb823727fbad656b07
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160208.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160208.ebuild
new file mode 100644
index 0000000..6531727
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20160208.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Harness"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-02-08_00-02-15/zip/netbeans-trunk-nightly-201602080002-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 d3052e6..d9492c5 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -153,6 +153,7 @@ DIST netbeans-trunk-nightly-201602020002-src.zip 209598146 SHA256 0b1707c46f0d9b
 DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232d1b71f43142523a79fd0627b569bde6039141810334c7bab27 SHA512 46ab55b9253c04ba2c807531b723a00eeac73af33d2dd0efca6c7db595aca0e0811725b37603148b82a59bb324bfa88f7de56cddd312b2ba2cf28db604fcff67 WHIRLPOOL 84775701a651db0b540ab9aa86835d44d81544ccd11879c189018fd781d73662b2411f8212d33754001fb4b598f784b74bfcef6819fd034683cbe624a697e7f3
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
+DIST netbeans-trunk-nightly-201602080002-src.zip 209611236 SHA256 4d951395dbf396fd41d43efb30f19b7482eccc19969c479d91576ab0bf7662f3 SHA512 2f4e76cb78bf06a6290e291a1663c2931e53d08abb56356eb3e4e6443eb79e2261e77caa10d6fef70e3f7c8cf7b9772e0036a58781a8e11c22503e76d70abfad WHIRLPOOL b063ead0d9beee28352e03e499d891efe4f06ba8c739576b253f825e7559e9f0f98951162e10be48da86c0c1b0432ea18fcace727a7bff34aa4e07bd2543b6bc
 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_p20160108.ebuild 30832 SHA256 0bc7c27b36ed19cfecdc744c24bf8633dde7a8de5b8596574a7b78609ce36352 SHA512 e67bbf338bd6328655489d258d1dc0ffc1b60e11f911dd02216bab41da337d03f79cac52832a6fd89c0d342913c4873a5d4511017266702ce8d81dcfa9c737a5 WHIRLPOOL 6418d332c041ff069b3009e7cdb7d7e9027b8710ab9780f82616aaf685eb5651ad65bb27c494d439d2f2bb16b1646078eb5f0c9c906c9238ac719a3e86cf8da5
@@ -172,4 +173,5 @@ EBUILD netbeans-ide-9999_p20160202.ebuild 30238 SHA256 cddccda31e664f611582c30cb
 EBUILD netbeans-ide-9999_p20160203.ebuild 30238 SHA256 45b6e65b641ef76bd673f34d1805fa1ad3554b0290bd0e773e7319e268715c5d SHA512 70f1c1b72b75e91972c5537e1d3ed402e92402adf8793890b65f4f520513547dae5ebc8d634dc737d1d033d2951d91ada003d3a0e520e72eb7d4f36891dc79e2 WHIRLPOOL 6d5f2c8a46fe2b6e27c29e91f59b54d7402aa8ef4c94ff3626125f6091cb18469f975fa9ffb178020c8091838491df7c636c3777d9f0bced093437e035cc8dc6
 EBUILD netbeans-ide-9999_p20160204.ebuild 30238 SHA256 d27a4bed3dbfef8d93a530d582314901236639dc84d055a46b2d00264a184d0b SHA512 4f19ba1e45c50ee40de6f77f5d6dc0ce6764fce0a425e52c4596c082a731bad7a76b77d31982c0fd5d5a78ef72691a6314c496f9eb7bfbfd8e161185f9c8d489 WHIRLPOOL e2e03dd0dc0790a80610721e38f684fc14fc106f7dda66b61df602af54fcc2455ef659c1d8db1a02fc73ffae0196f201b807a4c87c44afe819d7b44db83798c5
 EBUILD netbeans-ide-9999_p20160205.ebuild 30238 SHA256 c206f70f1e8766eeaa00088a9986fdab567c990703db987633d9ea2e94bb6a58 SHA512 3869ac5ddceae25d1da5aeaa8003276b7e9f3bf50abdb714c4f1d4bdef777becac3cacd5238d3c6518e308b172101336955b1f0829f032a943f07cfa365de562 WHIRLPOOL f7ad1b1e3d9fd264aeaf3d40f36e16d0cb9cc17ff4214cdce2199bd5c833f64bf0654b7035021e1d2f5a5a0317603f571d84ec04b9e04ccac0862f404bdc0467
+EBUILD netbeans-ide-9999_p20160208.ebuild 30238 SHA256 85100d877859f47db65ea5961af679a32608def41a8c5237c090c4d1de4361fd SHA512 6f65dab1ddf19e5b9303ac141a4f8e10cb4f054defdade85e7288a840bf929704bf0f54f4999c0aa88a9fac33908c4e94cdaa3d762e601be3fc4f54a9702b9fa WHIRLPOOL 0409884fa587d8ea6737d51e2526e2cb9e3752068410256239067eac90297f7c63b69b50573f79d74b9f1d1be3e1ab226e4f5987850f5fbb1615365862d7e5a1
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 3288806..924fa87 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -50,6 +50,7 @@ DIST netbeans-trunk-nightly-201602020002-src.zip 209598146 SHA256 0b1707c46f0d9b
 DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232d1b71f43142523a79fd0627b569bde6039141810334c7bab27 SHA512 46ab55b9253c04ba2c807531b723a00eeac73af33d2dd0efca6c7db595aca0e0811725b37603148b82a59bb324bfa88f7de56cddd312b2ba2cf28db604fcff67 WHIRLPOOL 84775701a651db0b540ab9aa86835d44d81544ccd11879c189018fd781d73662b2411f8212d33754001fb4b598f784b74bfcef6819fd034683cbe624a697e7f3
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
+DIST netbeans-trunk-nightly-201602080002-src.zip 209611236 SHA256 4d951395dbf396fd41d43efb30f19b7482eccc19969c479d91576ab0bf7662f3 SHA512 2f4e76cb78bf06a6290e291a1663c2931e53d08abb56356eb3e4e6443eb79e2261e77caa10d6fef70e3f7c8cf7b9772e0036a58781a8e11c22503e76d70abfad WHIRLPOOL b063ead0d9beee28352e03e499d891efe4f06ba8c739576b253f825e7559e9f0f98951162e10be48da86c0c1b0432ea18fcace727a7bff34aa4e07bd2543b6bc
 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
@@ -70,4 +71,5 @@ EBUILD netbeans-java-9999_p20160202.ebuild 14930 SHA256 38a72a1cbd9d2f3c94a62b52
 EBUILD netbeans-java-9999_p20160203.ebuild 14930 SHA256 2f751c07b663c0413bd8c1f3a81443dd0e5ffba79f50a7821563492b1cbc4321 SHA512 01b81f9d6c983e70ffdb749b194faae839e14eae49a6954bcf6a660cab6c910f37e2b3a1efe8e7ed3d9d02971fd7521922f7859116527912cbe8b23ff9b01ddf WHIRLPOOL ce6b3e5ea24ce1084a77eb0624ea20fa9f837ce39743f9b259cb25c1456ac94f6f235a0249d3480403ee3d6404adbe14d8a5d105848c77dbb48f2ddfc411ce8f
 EBUILD netbeans-java-9999_p20160204.ebuild 14930 SHA256 087db72f622177dc8a775716e84fa5d1038f1d9be443461da6432f73629b34e3 SHA512 99345436338e6908d4b28f84fc58145138ce610b89be902db4f45bcaf492bd7bd580136f5dd8b06862082159d9d56c36fc3fdfc7f1a76b37aa3f3c9c7992c241 WHIRLPOOL 681fe5156562e15bc046ee0df5f5a322726584a8f6bc7e0ea07e489815a38f8a36a2f8e95fbb4b9552510ab88f3cedcab4bf2504546df594ff79b8cfae16638d
 EBUILD netbeans-java-9999_p20160205.ebuild 14930 SHA256 0af7972d562fe4a577e2fdaa94fd5b28a03de7818d2970faf10c0850972b9c0e SHA512 c31fe56634dfa103a6b5c8e2098a767e9dcc09817ed4f1a76fe0870bfff17602f8f38188ad25434cf6426a3596c8e902f506ea3cfa18979dd7700058ecb1f668 WHIRLPOOL 63b55dc0dc06c709093199375c9faa0724ec8f63f2e15ee75eceb89390de3a2afd9e6cc694731a0142f19cd7ab491a9e503adfd6a93fbdb466a72ed9b7e00aa8
+EBUILD netbeans-java-9999_p20160208.ebuild 14930 SHA256 f73dfeebd9f397a4f083d5a562489a945382ef3323338ef8b87dfce83247e13e SHA512 24c44bba612715f27f2c66aaf2aa87f6613e96af0b8314bd7883a59a631d1667af35e3188342865e351e42a4e1c73e04a0fec1b840d86bd9fdd09a81e472d6f4 WHIRLPOOL bac5d1f1fac2518faa38b0190f1c6497005733f1ed209ebe03f7cbe74da284f4e8979321f921ff8920c43a454e7e39401c32054f18ef4ff197d4c162f4448d43
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160208.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160208.ebuild
new file mode 100644
index 0000000..e4312dd
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20160208.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+# Maven cannot be unbundled because it depends on exact maven version and exact content of maven directory
+
+DESCRIPTION="Netbeans Java Cluster"
+HOMEPAGE="http://netbeans.org/projects/java"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-02-08_00-02-15/zip/netbeans-trunk-nightly-201602080002-src.zip"
+# jarjar-1.4 contains also asm libraries
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar
+	http://hg.netbeans.org/binaries/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip
+	http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
+	http://hg.netbeans.org/binaries/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar
+	http://hg.netbeans.org/binaries/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip
+	http://hg.netbeans.org/binaries/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar
+	http://hg.netbeans.org/binaries/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar
+	http://hg.netbeans.org/binaries/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar
+	http://hg.netbeans.org/binaries/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar
+	http://hg.netbeans.org/binaries/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip
+	http://hg.netbeans.org/binaries/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip
+	http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip
+	http://hg.netbeans.org/binaries/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip
+	http://hg.netbeans.org/binaries/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar
+	http://hg.netbeans.org/binaries/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar
+	http://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar
+	http://hg.netbeans.org/binaries/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar
+	http://hg.netbeans.org/binaries/37781101C4BAF40437CA4D1A16149647B4082F3B-nb-javac-impl.jar
+	http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
+	http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar
+	http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip
+	http://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip
+	http://hg.netbeans.org/binaries/B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/beansbinding:0
+	dev-java/cglib:3
+	dev-java/jdom:0"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/json-simple:0
+	dev-java/junit:4"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}
+	dev-java/absolutelayout:0
+	>=dev-java/antlr-2.7.7-r7:0
+	dev-java/c3p0:0
+	dev-java/commons-cli:1
+	dev-java/commons-collections:0
+	dev-java/dom4j:1
+	dev-java/fastinfoset:0
+	dev-java/glassfish-transaction-api:0
+	dev-java/javassist:3
+	dev-java/jboss-logging:0
+	dev-java/jsr67:0
+	dev-java/jsr181:0
+	>=dev-java/jtidy-1:0
+	dev-java/log4j:0
+	dev-java/mimepull:0
+	dev-java/oracle-javamail:0
+	dev-java/saaj:0
+	dev-java/slf4j-api:0
+	dev-java/slf4j-log4j12:0
+	dev-java/slf4j-simple:0
+	dev-java/stax-ex:0
+	dev-java/stax2-api:0
+	dev-java/xmlstreambuffer:0"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.java -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+pkg_pretend() {
+	local die_now=""
+
+	if [ -d /usr/share/netbeans-java-${SLOT}/ant ]; then
+		if [ -n "$(find /usr/share/netbeans-java-${SLOT}/ant -type l)" ]; then
+			eerror "Please remove following symlinks and run emerge again:"
+			find /usr/share/netbeans-java-${SLOT}/ant -type l
+			die_now="1"
+		fi
+	fi
+
+	if [ -L /usr/share/netbeans-java-${SLOT}/maven ]; then
+		if [ -z "${die_now}" ]; then
+			eerror "Please remove following symlinks and run emerge again:"
+		fi
+
+		echo "/usr/share/netbeans-java-${SLOT}/maven"
+		die_now="1"
+	fi
+
+	if [ -n "${die_now}" ]; then
+		die "Symlinks exist"
+	fi
+}
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar maven/external/aether-api-1.0.2.v20150114.jar || die
+	ln -s "${DISTDIR}"/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip maven.embedder/external/apache-maven-3.0.5-bin.zip || die
+	ln -s "${DISTDIR}"/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip o.jdesktop.beansbinding/external/beansbinding-1.2.1-doc.zip || die
+	ln -s "${DISTDIR}"/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar j2ee.eclipselink/external/eclipselink.jar || die
+	ln -s "${DISTDIR}"/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip hibernate4lib/external/hibernate-release-4.3.1-lib.zip || die
+	ln -s "${DISTDIR}"/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar maven.indexer/external/indexer-artifact-5.1.1.jar || die
+	ln -s "${DISTDIR}"/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar maven.indexer/external/indexer-core-5.1.1-patched.jar || die
+	ln -s "${DISTDIR}"/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar maven/external/jarjar-1.4.jar || die
+	ln -s "${DISTDIR}"/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar j2ee.eclipselink/external/javax.persistence_2.1.0.v201304241213.jar || die
+	ln -s "${DISTDIR}"/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip websvc.jaxws21/external/jaxws-2.2.6.zip || die
+	ln -s "${DISTDIR}"/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip websvc.jaxws21api/external/jaxws-2.2.6-api.zip || die
+	ln -s "${DISTDIR}"/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip websvc.jaxws21/external/jaxws-api-doc.zip || die
+	ln -s "${DISTDIR}"/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip j2ee.eclipselink/external/JPAjavadocs04032013.zip || die
+	ln -s "${DISTDIR}"/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar maven.indexer/external/lucene-core-3.6.2.jar || die
+	ln -s "${DISTDIR}"/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar maven.indexer/external/lucene-highlighter-3.6.2.jar || die
+	ln -s "${DISTDIR}"/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar maven.embedder/external/maven-dependency-tree-2.0.jar || die
+	ln -s "${DISTDIR}"/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
+	ln -s "${DISTDIR}"/37781101C4BAF40437CA4D1A16149647B4082F3B-nb-javac-impl.jar libs.javacimpl/external/nb-javac-impl.jar || die
+	ln -s "${DISTDIR}"/CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.jar maven/external/netbeans-cos.jar || die
+	ln -s "${DISTDIR}"/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar || die
+	ln -s "${DISTDIR}"/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselinkmodelgen/external/org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar || die
+	ln -s "${DISTDIR}"/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip libs.springframework/external/spring-framework-3.2.7.RELEASE.zip || die
+	ln -s "${DISTDIR}"/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip libs.springframework/external/spring-framework-4.0.1.RELEASE.zip || die
+	ln -s "${DISTDIR}"/B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.jar maven.embedder/external/wagon-http-2.8-shaded.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.cglib/external cglib-3 cglib.jar cglib-2.2.jar
+	java-pkg_jar-from --build-only --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+	java-pkg_jar-from --into maven.embedder/external jdom jdom.jar jdom-1.0.jar
+	java-pkg_jar-from --into o.jdesktop.beansbinding/external beansbinding beansbinding.jar beansbinding-1.2.1.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/java >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+	grep -E "/java$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	chmod 755 "${D}"/${INSTALL_DIR}/maven/bin/mvn* || die
+	rm -fr "${D}"/${INSTALL_DIR}/maven/bin/*.bat || die
+
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/maven/lib
+	pushd "${instdir}" >/dev/null || die
+	rm commons-cli-1.2.jar && java-pkg_jar-from --into "${instdir}" commons-cli-1 commons-cli.jar commons-cli-1.2.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext
+	pushd "${instdir}" >/dev/null || die
+	rm AbsoluteLayout.jar  && java-pkg_jar-from --into "${instdir}" absolutelayout absolutelayout.jar AbsoluteLayout.jar
+	rm beansbinding-1.2.1.jar && java-pkg_jar-from --into "${instdir}" beansbinding beansbinding.jar beansbinding-1.2.1.jar
+	rm cglib-2.2.jar && java-pkg_jar-from --into "${instdir}" cglib-3 cglib.jar cglib-2.2.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/hibernate4
+	pushd "${instdir}" >/dev/null || die
+	rm antlr-2.7.7.jar && java-pkg_jar-from --into "${instdir}" antlr antlr.jar antlr-2.7.7.jar
+	rm c3p0-0.9.2.1.jar && java-pkg_jar-from --into "${instdir}" c3p0 c3p0.jar c3p0-0.9.2.1.jar
+	rm cglib-2.2.jar && java-pkg_jar-from --into "${instdir}" cglib-3 cglib.jar cglib-2.2.jar
+	rm commons-collections-3.2.1.jar && java-pkg_jar-from --into "${instdir}" commons-collections commons-collections.jar commons-collections-3.2.1.jar
+	rm dom4j-1.6.1.jar && java-pkg_jar-from --into "${instdir}" dom4j-1 dom4j.jar dom4j-1.6.1.jar
+	rm javassist-3.18.1-GA.jar && java-pkg_jar-from --into "${instdir}" javassist-3 javassist.jar javassist-3.18.1-GA.jar
+	rm jboss-logging-3.1.3.GA.jar && java-pkg_jar-from --into "${instdir}" jboss-logging jboss-logging.jar jboss-logging-3.1.3.GA.jar
+	rm jboss-transaction-api_1.2_spec-1.0.0.Final.jar && java-pkg_jar-from --into "${instdir}" glassfish-transaction-api jta.jar jboss-transaction-api_1.2_spec-1.0.0.Final.jar
+	rm jtidy-r8-20060801.jar && java-pkg_jar-from --into "${instdir}" jtidy jtidy.jar jtidy-r8-20060801.jar
+	rm log4j-1.2.12.jar && java-pkg_jar-from --into "${instdir}" log4j log4j.jar log4j-1.2.12.jar
+	rm slf4j-api-1.6.1.jar && java-pkg_jar-from --into "${instdir}" slf4j-api slf4j-api.jar slf4j-api-1.6.1.jar
+	rm slf4j-log4j12-1.6.1.jar && java-pkg_jar-from --into "${instdir}" slf4j-log4j12 slf4j-log4j12.jar slf4j-log4j12-1.6.1.jar
+	rm slf4j-simple-1.6.1.jar && java-pkg_jar-from --into "${instdir}" slf4j-simple slf4j-simple.jar slf4j-simple-1.6.1.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxws22
+	pushd "${instdir}" >/dev/null || die
+	rm FastInfoset.jar && java-pkg_jar-from --into "${instdir}" fastinfoset fastinfoset.jar FastInfoset.jar
+	rm javax.mail_1.4.jar && java-pkg_jar-from --into "${instdir}" oracle-javamail mail.jar javax.mail_1.4.jar
+	rm mimepull.jar && java-pkg_jar-from --into "${instdir}" mimepull mimepull.jar
+	rm saaj-impl.jar && java-pkg_jar-from --into "${instdir}" saaj saaj.jar saaj-impl.jar
+	rm stax-ex.jar && java-pkg_jar-from --into "${instdir}" stax-ex stax-ex.jar
+	rm stax2-api.jar && java-pkg_jar-from --into "${instdir}" stax2-api stax2-api.jar
+	rm streambuffer.jar && java-pkg_jar-from --into "${instdir}" xmlstreambuffer xmlstreambuffer.jar streambuffer.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxws22/api
+	pushd "${instdir}" >/dev/null || die
+	rm jsr181-api.jar && java-pkg_jar-from --into "${instdir}" jsr181 jsr181.jar jsr181-api.jar
+	rm saaj-api.jar && java-pkg_jar-from --into "${instdir}" jsr67 jsr67.jar saaj-api.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/maven
+	pushd "${instdir}" >/dev/null || die
+	rm jdom-1.0.jar && java-pkg_jar-from --into "${instdir}" jdom jdom.jar jdom-1.0.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java
+}

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 5c77a00..765be23 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201602020002-src.zip 209598146 SHA256 0b1707c46f0d9b
 DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232d1b71f43142523a79fd0627b569bde6039141810334c7bab27 SHA512 46ab55b9253c04ba2c807531b723a00eeac73af33d2dd0efca6c7db595aca0e0811725b37603148b82a59bb324bfa88f7de56cddd312b2ba2cf28db604fcff67 WHIRLPOOL 84775701a651db0b540ab9aa86835d44d81544ccd11879c189018fd781d73662b2411f8212d33754001fb4b598f784b74bfcef6819fd034683cbe624a697e7f3
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
+DIST netbeans-trunk-nightly-201602080002-src.zip 209611236 SHA256 4d951395dbf396fd41d43efb30f19b7482eccc19969c479d91576ab0bf7662f3 SHA512 2f4e76cb78bf06a6290e291a1663c2931e53d08abb56356eb3e4e6443eb79e2261e77caa10d6fef70e3f7c8cf7b9772e0036a58781a8e11c22503e76d70abfad WHIRLPOOL b063ead0d9beee28352e03e499d891efe4f06ba8c739576b253f825e7559e9f0f98951162e10be48da86c0c1b0432ea18fcace727a7bff34aa4e07bd2543b6bc
 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_p20160108.ebuild 4971 SHA256 5799211de058e7e9aa1ea0949e6ff80bee1a79ca44af0fa4ba898cac1a5e30d8 SHA512 6a679c0a705c6ce077667f142f0f0c1a45df29630a956d5068e4b874552075ad1d2188c8fb4c99f41268e432988811eb47f3b7deb1c3da2280f04d7d636faa0a WHIRLPOOL 6ac05574f1fd269a1c39e4bc9f4d3c15132ccc69f903d76b8e1b127a8d05861ad6d802be6599794949ed823d97f7995e19d3eca429173c00d5cde8559a102d51
@@ -42,4 +43,5 @@ EBUILD netbeans-javacard-9999_p20160202.ebuild 4971 SHA256 0a78b432aeb1148bab949
 EBUILD netbeans-javacard-9999_p20160203.ebuild 4971 SHA256 bcd39258455539171c15ced281e943708c02d0a4dc113de3440dc5a678e763b0 SHA512 2b95b6d11330d9dd25fc59c157bae775064606bc47a8f62d9c4c69fd21567f22a7800d66c09987761b8717839cf86c4bb56b3a07658f6496156efeb2519c29de WHIRLPOOL 1141ff929866cd1475404330adef2dffb83b76ceeae1917e2ff811dc4901617f9a264e63100350207eb38a8d4a8c5794e65166fb623655372d5b06cfd1584d8e
 EBUILD netbeans-javacard-9999_p20160204.ebuild 4971 SHA256 e1456bc550d560b86475e36e9828ad514c26848f646caf1b289c6e90cd10bbe6 SHA512 3df9fe2a5bfa51365bfcc63739eeea92742d1e22f3e9d3e65f65e086556a5670a12663411dc4e0e25f093d41ca40e0613b82bea81407215fddb3132e8229dc14 WHIRLPOOL 65ebe30b488ed04a64fa46668e0fee0fa464e1f04a64d2fbf8ff7c894bb8c12f20ef944707c5752c7a76b5d024f7008e20c8771336b75182502748b54d0a7bec
 EBUILD netbeans-javacard-9999_p20160205.ebuild 4971 SHA256 6c6c30c7d203125e21477e30fa6fbf9b79d832b49e322f9a2faebe0297666268 SHA512 0440d86b49615938c745e6699cc54c96c8a97978663b9a20a703455a06a83ce70c08ee1aba8dc171c68827c887a9e1b04307bd2087619bd63cc63cc2de59660f WHIRLPOOL ff793d42d36dba2c4aa9c3e1aaf737d6d9b660dc7ab4294bb4d21d23396ad7f55297dd689192b2d2c59a22c71295ecaa2cee7eddb19043c7a888623369720a17
+EBUILD netbeans-javacard-9999_p20160208.ebuild 4971 SHA256 5384618d023f6931d445bbf0b0e6c2cde68db26e51a285aa1b546bf90b82b4de SHA512 6a4282938dd96ef529dc2c2a4be6f510647069a42b088bf8f6974643599ed4b2eebcabce81fd858b4fc5444b4635ed76e0be504486986084d5dd1a0e6a47fc40 WHIRLPOOL 6a9eca53bace424f19202745890ad95b27926112d7b8f23781c8e54bc99a976a0906d83e74d1a549844ef936ba75d1e5f17d53192d9e0aec12f704f39269a649
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160208.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160208.ebuild
new file mode 100644
index 0000000..299dced
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160208.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaCard Cluster"
+HOMEPAGE="http://netbeans.org/projects/javacard"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-02-08_00-02-15/zip/netbeans-trunk-nightly-201602080002-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 c37a42c..493e9ad 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -21,6 +21,7 @@ DIST netbeans-trunk-nightly-201602020002-src.zip 209598146 SHA256 0b1707c46f0d9b
 DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232d1b71f43142523a79fd0627b569bde6039141810334c7bab27 SHA512 46ab55b9253c04ba2c807531b723a00eeac73af33d2dd0efca6c7db595aca0e0811725b37603148b82a59bb324bfa88f7de56cddd312b2ba2cf28db604fcff67 WHIRLPOOL 84775701a651db0b540ab9aa86835d44d81544ccd11879c189018fd781d73662b2411f8212d33754001fb4b598f784b74bfcef6819fd034683cbe624a697e7f3
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
+DIST netbeans-trunk-nightly-201602080002-src.zip 209611236 SHA256 4d951395dbf396fd41d43efb30f19b7482eccc19969c479d91576ab0bf7662f3 SHA512 2f4e76cb78bf06a6290e291a1663c2931e53d08abb56356eb3e4e6443eb79e2261e77caa10d6fef70e3f7c8cf7b9772e0036a58781a8e11c22503e76d70abfad WHIRLPOOL b063ead0d9beee28352e03e499d891efe4f06ba8c739576b253f825e7559e9f0f98951162e10be48da86c0c1b0432ea18fcace727a7bff34aa4e07bd2543b6bc
 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_p20160108.ebuild 6293 SHA256 a312c7663133df8311244766d7cd28afb67ac3538647b5c7837bfb99c687e705 SHA512 c6e180bf67cf1f968f97bf083451401faa3d87c772ed4a82c07aec3c0ca612c28bf461adc5536b0a26ed876c441b79d1042bb28cc6c0a0e746edf7d821290c0a WHIRLPOOL bf9d0727e6b5dbe79b5530469cb40ce8eb38b62e50326cb6fb1b1346de7ef2db49600805c86a4c67864bf50fbdcb8e2b9ca5972a1ad8ee0d7bf70317250079bb
@@ -40,4 +41,5 @@ EBUILD netbeans-javadoc-9999_p20160202.ebuild 6293 SHA256 7e31b61b47d03dc3a14933
 EBUILD netbeans-javadoc-9999_p20160203.ebuild 6293 SHA256 5c9c707695f13b739a022caf52bd313246b62bba71a9a8d77247106c2da40d85 SHA512 e8220e09efcbe51e97b8ec0163a979dac46e2c60fd34c6e3c23782d6d3d75fcc5fdb20286a25e1680494a995c5672d1e006068f2ed92b11294bb1c3a2b42dd4a WHIRLPOOL f7a01c6c640ffbc8ef7560cce2fab88b6ddb0d723df06b5f2164e4c3993ea2e9d2c00b35402249db474199bf86d210553e648c956fa826b4bd06595ef999e53f
 EBUILD netbeans-javadoc-9999_p20160204.ebuild 6293 SHA256 52b4fe09eeb978ea56c21a8921093118399adbff4f14b89ff910fc29ff96ded7 SHA512 ae629ad596d30fba7300eee3da34ba9117173186ef1be78c2e5f50787e001c61259b5b6c275adf24cf95f79081a62125f2182085b68a28207eb88dfadb6565dc WHIRLPOOL 841ecbc5bb4c3c2b6605ea1acf3292edd16edaa0f18ccc52388439c7e5e111dfa3b3d3e9e4aab8e9f04516f88d42873b768a0db507126d2301e7766dd24c14c5
 EBUILD netbeans-javadoc-9999_p20160205.ebuild 6293 SHA256 524444c5d9d3de298d018328bbc7ab3bcd7cdce01bc1e9f5e8f14729dbdd283b SHA512 ff115dd944b1d7a921eb982e52bd99bbc09ab8b145000911650f37d9e34a2ea016f6fd3e8a2967ebe974730a71c61ec919d118cc29aa94acf34372007526baea WHIRLPOOL aafd7942d991de417f86fd98f17e5f85aaa3ab9eb9a51b7412d8d354d58a881aa1ab91bb70432fd5b62ad0fe9c16300ea34aeb4d83cf96685ac12d70b44dddff
+EBUILD netbeans-javadoc-9999_p20160208.ebuild 6293 SHA256 9766a3ab1f9e131bd504fff7859182658b2ef769b47fc89b6f1b0a9b3655c483 SHA512 fee974fd22553d42e183ead0db8e850ed004eee8fa3e35fe1806a92d14a90b837775b17a2c7cee3a9d51afb9bf06a3ca9d1903c3161d876dcc4ef5fa53a678d7 WHIRLPOOL 35eca8fab57b1860a08c983bf96b812760c3b6e5e80ab524436f92f00f34118a380dd692d0940ba6714e5ab71f652e689ac6ad3929f99a2a40ae9465b25124d4
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160208.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160208.ebuild
new file mode 100644
index 0000000..70a7f68
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160208.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaDocs"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-02-08_00-02-15/zip/netbeans-trunk-nightly-201602080002-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 c3c3141..cb8c2fe 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201602020002-src.zip 209598146 SHA256 0b1707c46f0d9b
 DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232d1b71f43142523a79fd0627b569bde6039141810334c7bab27 SHA512 46ab55b9253c04ba2c807531b723a00eeac73af33d2dd0efca6c7db595aca0e0811725b37603148b82a59bb324bfa88f7de56cddd312b2ba2cf28db604fcff67 WHIRLPOOL 84775701a651db0b540ab9aa86835d44d81544ccd11879c189018fd781d73662b2411f8212d33754001fb4b598f784b74bfcef6819fd034683cbe624a697e7f3
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
+DIST netbeans-trunk-nightly-201602080002-src.zip 209611236 SHA256 4d951395dbf396fd41d43efb30f19b7482eccc19969c479d91576ab0bf7662f3 SHA512 2f4e76cb78bf06a6290e291a1663c2931e53d08abb56356eb3e4e6443eb79e2261e77caa10d6fef70e3f7c8cf7b9772e0036a58781a8e11c22503e76d70abfad WHIRLPOOL b063ead0d9beee28352e03e499d891efe4f06ba8c739576b253f825e7559e9f0f98951162e10be48da86c0c1b0432ea18fcace727a7bff34aa4e07bd2543b6bc
 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_p20160108.ebuild 4717 SHA256 e9b5ad69533d04f102b9d6f892e7f0173706f42aa130e075b4e4770f5131b11f SHA512 c7467a586e8cc74f08f36bb8b9a77beb96abe13a0841438cfc8bed174663ea5949ff6da202130c961b2c52e654c502812f79615455d93f3e5727e4cf93e60b7e WHIRLPOOL 24ebe2a5f4b1160a4157423fd277fc4f5222378c022422b5874f65d9346598ec2ee252105042b1e297830418f975b311a7f8efdbecac5f0c83e903c0d7bfe5d1
@@ -47,4 +48,5 @@ EBUILD netbeans-javafx-9999_p20160202.ebuild 4717 SHA256 3d43880ed47b5e7b5a2e153
 EBUILD netbeans-javafx-9999_p20160203.ebuild 4717 SHA256 a2e1b09dd033d29cd5819c422f7d3f75e3be1733c7db4534f2ddf5d69ce0304f SHA512 4436846211cacbed77b0b4ebc73533e4f3124ea980919e4e6cc6d0b9bf8a8c88950ebec5ae1f43f3591959ad565d10801341ed4e7164f7327c507624228a1534 WHIRLPOOL 2e3dbd52cdbcde1e8d457b9a28b607189b96f401b6bf17938ab557383949d2903e475b82580ed92753d6e0453e063aa956865a0249d49f9b5a9e1cadf0373db9
 EBUILD netbeans-javafx-9999_p20160204.ebuild 4717 SHA256 37886081275fe7a67ee945f372547b5f8ec1f7055421fe3438cac315291a7480 SHA512 20c6002ebb34f3fc4e97f799dd4cd04f87dbf30a031f8b6ee68edd7ed3f14eeaa52d8955d66b1bda5f969d26b7ec159a20a492939d66d3da0abc57af6afc383a WHIRLPOOL 9f773764ae4d3691e1541b48a72fe2d8eab257f8b5bef7524bf07ff2b131622c8d45beac9d4f966bbdc6dfcbf9615836f4f1c1098763e40a5b90b3d69dd7e8ba
 EBUILD netbeans-javafx-9999_p20160205.ebuild 4717 SHA256 925e5ced9c1b99722db087e36b54f8e24869e36cabdf7b59cdc9e52b319b0b68 SHA512 fa045b63c7225d4c0df7837c26cb94acea5eb2cb2e1ee1e97a4ad52a19f03610cd10002c714bd2798029b59bd970813ac42f852b24f157fdbc50a9dbe3e09084 WHIRLPOOL 622c806dc1e4e9e17e6e8d71a826ac53f4b8129acaad286eb5b678480dd1b2636417a9d632fb62379d12f1ff538aa32fb019035dc2e061df391b782c8c6d1c9a
+EBUILD netbeans-javafx-9999_p20160208.ebuild 4717 SHA256 715393e87f8cc90fb576d958dd8602f0a5b0e061fdc0640700799f910386a74b SHA512 66e78494f98154ee7f28d8880fc0fa00791fb3135372dafa622d08564da666235f86bd92b8b3045351093660a3ec9f46fd2617a5bb15cff8754293d4c7155bd8 WHIRLPOOL 2ffbd014733f9c9f8b1ddd37932025e44c4bda7136bff8df8260b66d73120b2e2f2b8b2410672c8ae2238d82f6f2060aaa43734b1f886cafbddeaebf3f8c18ce
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160208.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160208.ebuild
new file mode 100644
index 0000000..f6a1794
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160208.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaFX Cluster"
+HOMEPAGE="http://netbeans.org/projects/javafx"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-02-08_00-02-15/zip/netbeans-trunk-nightly-201602080002-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 8dc0117..c5f956c 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -20,6 +20,7 @@ DIST netbeans-trunk-nightly-201602020002-src.zip 209598146 SHA256 0b1707c46f0d9b
 DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232d1b71f43142523a79fd0627b569bde6039141810334c7bab27 SHA512 46ab55b9253c04ba2c807531b723a00eeac73af33d2dd0efca6c7db595aca0e0811725b37603148b82a59bb324bfa88f7de56cddd312b2ba2cf28db604fcff67 WHIRLPOOL 84775701a651db0b540ab9aa86835d44d81544ccd11879c189018fd781d73662b2411f8212d33754001fb4b598f784b74bfcef6819fd034683cbe624a697e7f3
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
+DIST netbeans-trunk-nightly-201602080002-src.zip 209611236 SHA256 4d951395dbf396fd41d43efb30f19b7482eccc19969c479d91576ab0bf7662f3 SHA512 2f4e76cb78bf06a6290e291a1663c2931e53d08abb56356eb3e4e6443eb79e2261e77caa10d6fef70e3f7c8cf7b9772e0036a58781a8e11c22503e76d70abfad WHIRLPOOL b063ead0d9beee28352e03e499d891efe4f06ba8c739576b253f825e7559e9f0f98951162e10be48da86c0c1b0432ea18fcace727a7bff34aa4e07bd2543b6bc
 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_p20160108.ebuild 4412 SHA256 0b1cd91916939bca6cfb06178757f831625fed434675393a0687069911f1d2f8 SHA512 88764fb80fe99833b24543b2f5580d34d4fe2aba444aab8b1f2384c880f71fc02389456e877461ca96b544a29b3416201d9664a81ee68d5e67e47fcb3c2f7b08 WHIRLPOOL 979ff013bbf69c720157df10c49bce1e453ad42f706b5ac78bb3ef06b5891dba345f906c002506ae46924c23038c807effd318c5acf20c2f2a459b539ab53ca1
@@ -39,4 +40,5 @@ EBUILD netbeans-mobility-9999_p20160202.ebuild 4412 SHA256 442d6cb306c08f5fb8486
 EBUILD netbeans-mobility-9999_p20160203.ebuild 4412 SHA256 91d25a672c7301c9879e9d6f4ad2bccabe9f0c0d8004f013d344e5472a116bb4 SHA512 5eb22d769ee79dfdb2b79523b113c5028fe1726b8e209040df714a9e5962b5e649e58aad3593bcbeddd13cef112a3d3fa65f0c67f5ad40e96c453635ffb3897c WHIRLPOOL 49be135a04d786894b0f5424b37bf14a43d8c3aab9a62197f0fff99961dc8e15a6a51db9293e64b2df4cb2ba613cba6b6edf6938961f572e5b5e22a657dc94a3
 EBUILD netbeans-mobility-9999_p20160204.ebuild 4412 SHA256 77b7056f05a10b097a438114c85eaef6fed8fdb329885e37e214b0117cbe0806 SHA512 cc80379c048335fb6dda529802bbe4f204659e286c287c0bd8419853b07362498c83a09e8c49ad311bc8fd943c1afa9d35fa09b2c88ec6f076a2fe6f23faa6b0 WHIRLPOOL 2cb88c599d212f830ca675ee3940628eb0bc77e581201cde2403f9fae5a96608400f166ff883888ff35b9abab673e71fa273e2cad02cdeb0268984a589a0e71c
 EBUILD netbeans-mobility-9999_p20160205.ebuild 4412 SHA256 f63defac13d101fb6671ca3d69c0d5973be294e439b1d8f842e93af3e499f7eb SHA512 2ad416b000612dc0df79e71be2fa21f232488388dfd0dc64fc1565bc44de4678b2561b4fd817a0cf503070b02e1d0487ee2ce8d03a443b94127a536af4f3c112 WHIRLPOOL ca9422df53aa9dad6bedf89789191e23bc31a2c776c803cae82526a774fc59d927c6d1e54962cd8fbbe5f3692c9865031cf97ea007c6fa94c8bbfcb536abe616
+EBUILD netbeans-mobility-9999_p20160208.ebuild 4412 SHA256 c81cf96d97641b2b1a8b6c30f008643316957c84bdc7020b7bc0b4789843d92d SHA512 72839ef2359c89389154d40b9cb5b307702287dc36e9aa0c51a70d11bd5a7d0d6d5d09a3816346f982148ac5d91de563cbbbb840bd2af0a377236a9f5e49bc79 WHIRLPOOL 86ed205a76ee831f3285793b9a2e6267542b903a372f8af1d4dc5308b278b01536e790ca91c488c08c2454ce589798ca6cc67a7b0397566a5bd534d4c953feee
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160208.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160208.ebuild
new file mode 100644
index 0000000..f70af05
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160208.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Mobility Cluster"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-02-08_00-02-15/zip/netbeans-trunk-nightly-201602080002-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 557cfc5..2efe3b4 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201602020002-src.zip 209598146 SHA256 0b1707c46f0d9b
 DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232d1b71f43142523a79fd0627b569bde6039141810334c7bab27 SHA512 46ab55b9253c04ba2c807531b723a00eeac73af33d2dd0efca6c7db595aca0e0811725b37603148b82a59bb324bfa88f7de56cddd312b2ba2cf28db604fcff67 WHIRLPOOL 84775701a651db0b540ab9aa86835d44d81544ccd11879c189018fd781d73662b2411f8212d33754001fb4b598f784b74bfcef6819fd034683cbe624a697e7f3
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
+DIST netbeans-trunk-nightly-201602080002-src.zip 209611236 SHA256 4d951395dbf396fd41d43efb30f19b7482eccc19969c479d91576ab0bf7662f3 SHA512 2f4e76cb78bf06a6290e291a1663c2931e53d08abb56356eb3e4e6443eb79e2261e77caa10d6fef70e3f7c8cf7b9772e0036a58781a8e11c22503e76d70abfad WHIRLPOOL b063ead0d9beee28352e03e499d891efe4f06ba8c739576b253f825e7559e9f0f98951162e10be48da86c0c1b0432ea18fcace727a7bff34aa4e07bd2543b6bc
 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_p20160108.ebuild 4111 SHA256 4f26d5e7847051f7bb02e0b8e8c67f483c4f405f683714c8f5613af748513a7e SHA512 75c8dea4e0df38d80f94a52117d54a06621d545681956287cfb23746f0384462bcbe5b272643014f18586cbb9001ee853679ca25e0f23d476ef78f700d091cf8 WHIRLPOOL 5e762a34b0eab5072d7d6ecfdefe94851e981a48b9764f6ac09a75eafeb9f5b60a5cc763a078c020e8551fd7e41ed300d889b337ddfdfde15c8a23741f6969ac
@@ -42,4 +43,5 @@ EBUILD netbeans-nb-9999_p20160202.ebuild 4111 SHA256 7e054ad3b03907226b6943c044b
 EBUILD netbeans-nb-9999_p20160203.ebuild 4111 SHA256 ac504e5220f34cf0a0bbcfe9664ecdb9365e8f8724cc3c3c43fd4e9365bccb35 SHA512 0cc068ec1ac64b15622d946828a7fd1e13d28f6070dddd57fe5dc96a9553d3b5e42972b2c86934bf2c1f529ee1db6086bc04980bd462b8162451dd75c2c54ff2 WHIRLPOOL 804df7a65d55067e56903b4ac52a5fd488fab28be84d6c4367df53a5c38e88ec05b67082bff15c8809f389b1cb6ab194068fd31c626ed0df0878e88ef5d5824c
 EBUILD netbeans-nb-9999_p20160204.ebuild 4111 SHA256 05c1b57b99f8e6f3bc8532bde6a08f5311ec9015abaee1a7f93e79fbcabbbc6d SHA512 d1cc225dd1418e2f3efb4cded2b61081f785f90e35405537931ce9c8a6e37ee834fd8a584494d0e5d9d330a07942253cc6fab158c9bcaed98b0b54fd00949c1c WHIRLPOOL ba349e4b640b7f3143a480a6eca2338b8d1496fb3d23b56d7382dcaa358273cdba548938db69df2020827bf5e91c89201aee88108acdfb518e137cd54839e91a
 EBUILD netbeans-nb-9999_p20160205.ebuild 4111 SHA256 5448fe4d43a7c61f8c509ab56c240187151fe739e63c1210135e22778dd6c005 SHA512 36abaa95fa2accef66329874edb5c3316f0ae163ca8c590472916f909fd340e184a57bc201303e8081f797ccb04d4490b42a860cda2c4bea5a45cd92c0addaf4 WHIRLPOOL ed228b80c89746c3b6991e7e9ed3eee5a5ffcc0473cae9b96bf72f5955256d6bb76c874fa7360f916ac0a0cbcb28ddc58356d6498422b38178bb7b4bc6dbe6d3
+EBUILD netbeans-nb-9999_p20160208.ebuild 4111 SHA256 f50152ab9a2b57e7d48633aeabb4a49150c98f9afaee19191162672e4513ffd1 SHA512 46a5ab59d7a2489014968c3c79d66a22a4909d30642fe868c7ed381300f3b43bb7ecca4c6c85ee4f8d2244fe68b5f9948a36f642e325c76223c9c256703069bf WHIRLPOOL 346bce19ca96a093666de5c64417805f15c3c75a10b4bb209d389685a54c8526f631024f6d3c9de8681aa2e977135a6aba17b91dae064d2378cb33701aa67bec
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160208.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160208.ebuild
new file mode 100644
index 0000000..958b998
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20160208.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Branding"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-02-08_00-02-15/zip/netbeans-trunk-nightly-201602080002-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 b15bd05..c260741 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201602020002-src.zip 209598146 SHA256 0b1707c46f0d9b
 DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232d1b71f43142523a79fd0627b569bde6039141810334c7bab27 SHA512 46ab55b9253c04ba2c807531b723a00eeac73af33d2dd0efca6c7db595aca0e0811725b37603148b82a59bb324bfa88f7de56cddd312b2ba2cf28db604fcff67 WHIRLPOOL 84775701a651db0b540ab9aa86835d44d81544ccd11879c189018fd781d73662b2411f8212d33754001fb4b598f784b74bfcef6819fd034683cbe624a697e7f3
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
+DIST netbeans-trunk-nightly-201602080002-src.zip 209611236 SHA256 4d951395dbf396fd41d43efb30f19b7482eccc19969c479d91576ab0bf7662f3 SHA512 2f4e76cb78bf06a6290e291a1663c2931e53d08abb56356eb3e4e6443eb79e2261e77caa10d6fef70e3f7c8cf7b9772e0036a58781a8e11c22503e76d70abfad WHIRLPOOL b063ead0d9beee28352e03e499d891efe4f06ba8c739576b253f825e7559e9f0f98951162e10be48da86c0c1b0432ea18fcace727a7bff34aa4e07bd2543b6bc
 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_p20160108.ebuild 4418 SHA256 c3ac87d1cfa4d64dd6c89bf2d38e36922c753588f343e241e9ada0a5b1509d24 SHA512 3fa73ee72855fa3d8dded8a9aa8be6ede38f31950112e7d59013074449fe042b01bc425834c7259afd922cd5d99ec2ed5260c57125c2f5ab752543fce72bb5ba WHIRLPOOL eac696a5e1404ce10a41d058816b2f656aa68997823ab563ba51da9fdd3712ed196de038bbe88c2a31f656061a05347f9163d6790608617d0fa8cf475d785beb
@@ -43,4 +44,5 @@ EBUILD netbeans-php-9999_p20160202.ebuild 4418 SHA256 0239cf5f2c7ba4209529c92c3b
 EBUILD netbeans-php-9999_p20160203.ebuild 4418 SHA256 263569ba2d7f4c6cb6ff6fcc0d61f5fd511c63fad70f0a7ed35524aa144ba091 SHA512 9a0414bf34ac26a9cf35d93b9aeb3622ac979f12d814565ba8b7ba62a75d5accfc27ecab025c3372ad0ec950eee29dd5d6563598984e4134180539f49176d918 WHIRLPOOL cb746d95abee9cad2408c91b0254b879356acb48c0e18eae85063448040943d7b3cab7d26217fb66e6152ecef75badd396fe74d9490af3318db6bf1660d18e6a
 EBUILD netbeans-php-9999_p20160204.ebuild 4418 SHA256 0ef6bb16c8c4d3e68601323a1e6749a028451deb5bcdc8ad78685f1412378ea8 SHA512 e4205c41422a475f7b20f90ffdf16bf852069315ac7d6539bfe696b0098cc5a2217c364bf67540e251da9445424df5aa34e0ea669e8eba89182042652e422801 WHIRLPOOL 27eab580350f55a8cdf8e3676b098e2a7ed803a3d4493a5b177955492e44e113a619b709c58c8e0eb990193eb1bd7aba5182b5b0e2cdf9bd07ca2e637de81797
 EBUILD netbeans-php-9999_p20160205.ebuild 4418 SHA256 1a88747c9e59a86c3b732cff619c97e442732c5c88f1090eb8811cc59a6ed320 SHA512 260867fec559ae1e8d12ff75413c6b4b107401244aa1e82d67e6a28312618eed2e4587b7f0a71aa7557918478be2c55bdf69e0940e350b7eaf2cad934f5d675b WHIRLPOOL f56e11da5937abec3fa3a0c0e643dba101f8c896bd5c95fb54dcb466c4e2f9b2d7e6387ea0efca807210e3f49fc3a89f5e176b5d0ef5ab39de9782b0c106baf9
+EBUILD netbeans-php-9999_p20160208.ebuild 4418 SHA256 2cc00a3df6e981411323aa3cd289600b7e44afc14ca0e9a5cf869cfe4d1d75f2 SHA512 576529ed5945d720b23b123c13dce8940edea877f5e1c79e08b629f46ebc681fba5d3bf6bdfce732c8f1acc6b4545c927134f15f26fb65a6fa8244faeb1d7837 WHIRLPOOL 82c83c19e40704364e0f3fe90280b0fa42b973612d47c06afebc56766ee311c83395ac8543aa4acfdb2041d3453f8460cd37bddb7765e09ee6573b6c6c9900e3
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160208.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160208.ebuild
new file mode 100644
index 0000000..a5b184a
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20160208.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans PHP Cluster"
+HOMEPAGE="http://netbeans.org/projects/php"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-02-08_00-02-15/zip/netbeans-trunk-nightly-201602080002-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 f7aa4bd..e52d79b 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -37,6 +37,7 @@ DIST netbeans-trunk-nightly-201602020002-src.zip 209598146 SHA256 0b1707c46f0d9b
 DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232d1b71f43142523a79fd0627b569bde6039141810334c7bab27 SHA512 46ab55b9253c04ba2c807531b723a00eeac73af33d2dd0efca6c7db595aca0e0811725b37603148b82a59bb324bfa88f7de56cddd312b2ba2cf28db604fcff67 WHIRLPOOL 84775701a651db0b540ab9aa86835d44d81544ccd11879c189018fd781d73662b2411f8212d33754001fb4b598f784b74bfcef6819fd034683cbe624a697e7f3
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
+DIST netbeans-trunk-nightly-201602080002-src.zip 209611236 SHA256 4d951395dbf396fd41d43efb30f19b7482eccc19969c479d91576ab0bf7662f3 SHA512 2f4e76cb78bf06a6290e291a1663c2931e53d08abb56356eb3e4e6443eb79e2261e77caa10d6fef70e3f7c8cf7b9772e0036a58781a8e11c22503e76d70abfad WHIRLPOOL b063ead0d9beee28352e03e499d891efe4f06ba8c739576b253f825e7559e9f0f98951162e10be48da86c0c1b0432ea18fcace727a7bff34aa4e07bd2543b6bc
 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_p20160108.ebuild 9360 SHA256 d2a8a154699e83687f87795375e5e1e9d4eeacb4e74027220ddc5f48c3c826e9 SHA512 c25d4073ac52080ad78bd6ec82732fea120d4d5ac8483e4302c0f7c766796b87efa0ef83c270d812656238b72ff187700f283c16795e392a4726f15dd29a01ea WHIRLPOOL 28c729eb7cb088df965df5c739042197d681de831e151399aec69bab7808e70cb531ae607423a34ec8773d18411a35c3c23390868b2fbe2632ea080da95731df
@@ -56,4 +57,5 @@ EBUILD netbeans-platform-9999_p20160202.ebuild 9360 SHA256 82447df03d19e72c1842e
 EBUILD netbeans-platform-9999_p20160203.ebuild 9360 SHA256 454751cf761337f1f6aec2efcc643e95f8e7dd7c317b2ecad4de6e40ae388d06 SHA512 718dd3c5cec70fb9c1dcd0fca014b6066812b8be27e351848ae1bfe95db09793144ed99e5dd0f8e47c427e14d4a96ebe879288d7155ff98546a8b87160a0241d WHIRLPOOL c5676bfaab4d35f4511e401a46f981bde4660ac655bd8bed6654bebb5856c8306b63ad7322710c6f0bf58a5c54aeebb18d334d9a9c35304a89e11b341f3beb1d
 EBUILD netbeans-platform-9999_p20160204.ebuild 9360 SHA256 9164a33bb78f0a410d068e1d200eb383be996a01b65da993d66c5702e059e9a7 SHA512 ad43c41337764ecc4dfb0f043fe95eecb0e3d8494ce16f2c425ff96a483047d531f892d5aa8819aa0fab1d8f2c3c13a87611ac7210e363875227ed2404c44d49 WHIRLPOOL fb5d959de8ef000ff60ebbbbe4e7dc2a9d4989fe94afd8b01f02bc202822cdcfd53c5802fda21b456f3b6350bccbede6e56fc3ce5f7427ebba961aa4b9529d3d
 EBUILD netbeans-platform-9999_p20160205.ebuild 9360 SHA256 16f8e4d4f71957e7b815ad84e7fc296018d8e0599429aa1113e565d1e275cc5c SHA512 5ec7cd25348b4205a3d55d2c056d02f78ca139a26b8b3151626b26ff30480cc8069389b5544225279a300dc3442af7ee207f88cba26f1cf9bdedf17e65b3e30f WHIRLPOOL 05a6f8452eaa7f7c33247a539f752c0d4988501212bf5c2314491031c6f289b026c505ba6433b9a53b8414c53775cbcc1772df4994dd5f60c984271adc7383fd
+EBUILD netbeans-platform-9999_p20160208.ebuild 9360 SHA256 46aca5c07ea8f0ac91eeba9e69d487d9e7e2ce15361559a217cbd8293adbf82f SHA512 d4c44b8a6d62be833a643a9ef08adfff13d3dd8ea4f2c9029b42838de2de24d6a6f29d1992b91231f81ea4aca142776d4a0e10449bb004d0b80290916e42d740 WHIRLPOOL 7f6d12052c93dcd19d71426b9479ea8530c84eb522268960465966df87d38d983b0850909c33b3f923c63d737d877ba58cbc37cd6662363b68f5e4605d9ee0d8
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160208.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160208.ebuild
new file mode 100644
index 0000000..baf891b
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20160208.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Platform"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-02-08_00-02-15/zip/netbeans-trunk-nightly-201602080002-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 082e9eb..8df56f6 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -20,6 +20,7 @@ DIST netbeans-trunk-nightly-201602020002-src.zip 209598146 SHA256 0b1707c46f0d9b
 DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232d1b71f43142523a79fd0627b569bde6039141810334c7bab27 SHA512 46ab55b9253c04ba2c807531b723a00eeac73af33d2dd0efca6c7db595aca0e0811725b37603148b82a59bb324bfa88f7de56cddd312b2ba2cf28db604fcff67 WHIRLPOOL 84775701a651db0b540ab9aa86835d44d81544ccd11879c189018fd781d73662b2411f8212d33754001fb4b598f784b74bfcef6819fd034683cbe624a697e7f3
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
+DIST netbeans-trunk-nightly-201602080002-src.zip 209611236 SHA256 4d951395dbf396fd41d43efb30f19b7482eccc19969c479d91576ab0bf7662f3 SHA512 2f4e76cb78bf06a6290e291a1663c2931e53d08abb56356eb3e4e6443eb79e2261e77caa10d6fef70e3f7c8cf7b9772e0036a58781a8e11c22503e76d70abfad WHIRLPOOL b063ead0d9beee28352e03e499d891efe4f06ba8c739576b253f825e7559e9f0f98951162e10be48da86c0c1b0432ea18fcace727a7bff34aa4e07bd2543b6bc
 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_p20160108.ebuild 3472 SHA256 dce9b6d9b9d65ecc15b7e08a391b5209676f4faede24dfa02dc025a3d4ab3c5f SHA512 db0877681b5c37791189542cc616d49203fb377a0050fb73127035ddecc55ee7f2d090e905c560268d011b8ddc12b2efa1046f5e05e3fab1278484161678e063 WHIRLPOOL 9b4c40ed7cd9ffb8ac8b3f7a4d5bbad77dd54243f87df6243fc2546dfc9e5114767bbd8eda8061283bf4534581365dc6ec86d2f99fad8656e2b87de1c9dec4d2
@@ -39,4 +40,5 @@ EBUILD netbeans-profiler-9999_p20160202.ebuild 3472 SHA256 dfb97d125ba0b69cba2d5
 EBUILD netbeans-profiler-9999_p20160203.ebuild 3472 SHA256 c1bfca18ca82904b70eb27a91f0f175adb78ca98e8f2b65ea4caf42ea08d8c32 SHA512 2c8a9b99a0ae795d744946c5b687743f74b68eda0c7ccbfbaace37cbc4df443943e60b6fa2697b7c4d45ca17a9200fb4420307e895b32b9026d8b7fc2f9eeb07 WHIRLPOOL 6d723463b8349db5ec8ddc14cf51c9772c7544dac451fb2b52a8cf1664dbc199a694bd5e9522e26fc9d3e3ff5bb99b0cdea6dcf5040f4883b690a5e5bfadd637
 EBUILD netbeans-profiler-9999_p20160204.ebuild 3472 SHA256 83bc4d60299d042ae913b6d824ff74f05de6f371bedc0acb3fc98323ef2333a5 SHA512 b08cc9b67e7bff6bec5681b6d5160b9c5210f820b9e6016efae4a75eae39d90cc5dc6fc60caffddab534a455353a241f753148dc9814c63d1858fb1d3ba5280f WHIRLPOOL 2aa727c60f4f89e81f32f7af23f5f6474bef24b07f0a95e07cb58cd8030d92cef266a7e55f3b27610aab2f0b956089dc9c97f82468e36c497e50b4452ee8e66c
 EBUILD netbeans-profiler-9999_p20160205.ebuild 3472 SHA256 1355fa4b9448c07435f56cfd7847599b4b062aa016681bc824aa770944a0dd71 SHA512 8a3bbf6ebca5f30466a68ae450a0206499321396ae65c319618afe42c984f0cbdbe3383a25be730138071dd845c0d5bdf81bc12d19e00ecad731a081c735b08f WHIRLPOOL d73d0df3d97caea76335f509e942d52f92921fdb0af497f3d7757a6de76af33a4e6a7cc26a47a63f917acd72726a03891a4c03b4a0ae562555104ca0a1ea648f
+EBUILD netbeans-profiler-9999_p20160208.ebuild 3472 SHA256 6d22270b34bbd646fb37d1d6c02cf8f40203baf3e3520ba2e80e99a5b85ab94d SHA512 05d8b281bd463bc50ecda6b41269e125e0cb5cc73d9abc6a57fb14f4de052a6001a50b3506b40084b4dde5af10446242a394bfe9d2e546416ada9aa35a3e773b WHIRLPOOL b0f122c35db6635bd6135182e35dd9649e0f45a2821431194e12913ed21675a4fcd1464665023d2f9eda1df05d5badbc43c7d7037eb29f99961fa575e75fb7dc
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160208.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160208.ebuild
new file mode 100644
index 0000000..bb0225e
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160208.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Profiler Cluster"
+HOMEPAGE="http://netbeans.org/projects/profiler"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-02-08_00-02-15/zip/netbeans-trunk-nightly-201602080002-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 d159dee..92059b9 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201602020002-src.zip 209598146 SHA256 0b1707c46f0d9b
 DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232d1b71f43142523a79fd0627b569bde6039141810334c7bab27 SHA512 46ab55b9253c04ba2c807531b723a00eeac73af33d2dd0efca6c7db595aca0e0811725b37603148b82a59bb324bfa88f7de56cddd312b2ba2cf28db604fcff67 WHIRLPOOL 84775701a651db0b540ab9aa86835d44d81544ccd11879c189018fd781d73662b2411f8212d33754001fb4b598f784b74bfcef6819fd034683cbe624a697e7f3
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
+DIST netbeans-trunk-nightly-201602080002-src.zip 209611236 SHA256 4d951395dbf396fd41d43efb30f19b7482eccc19969c479d91576ab0bf7662f3 SHA512 2f4e76cb78bf06a6290e291a1663c2931e53d08abb56356eb3e4e6443eb79e2261e77caa10d6fef70e3f7c8cf7b9772e0036a58781a8e11c22503e76d70abfad WHIRLPOOL b063ead0d9beee28352e03e499d891efe4f06ba8c739576b253f825e7559e9f0f98951162e10be48da86c0c1b0432ea18fcace727a7bff34aa4e07bd2543b6bc
 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_p20160108.ebuild 5280 SHA256 0dd5d66c0533ae34634cbf3f7bb170490ee66e53958e5f71c623a9d0aa6b9954 SHA512 4f3a7a89ef58828f561f195f0c59bcd38600d5ecbc2e1d6be0509b57963c566cf240cfb631dbeca36451faebb3c6502aafae89559b326ecc9aa08d035580f9a9 WHIRLPOOL 8ca9815d403868f9da5f2f1a17f75515d8bb547c982d1e5c2210de16cdeebfa2b4dfc3bb27e53b5ae7c26b414e832f724e0b34450288451b92549b6a09a6f33c
@@ -54,4 +55,5 @@ EBUILD netbeans-webcommon-9999_p20160202.ebuild 5280 SHA256 e51a2f4904a2e6c4ed2c
 EBUILD netbeans-webcommon-9999_p20160203.ebuild 5280 SHA256 49240052283865eafc006568b2c9f116ca9ee62417ba9abada5435365922c1d3 SHA512 be26c27f1db8d1be500cc58c24b6ea69316bf097e3ee40da26c5e7be427cfbac28dd84ec6ef2dbe2a8fb149fa122cac64fb49af033f99bcc24d2cc6b3427c0a7 WHIRLPOOL 747f7217f3af53a9cf677de51bdc16175667b0870f83aa86814fdacde12bfa6be0b1147827cac215a2e0b7176a54139f8e4cdf36067f5ad410d920de2727f539
 EBUILD netbeans-webcommon-9999_p20160204.ebuild 5280 SHA256 b7e52fa271999978dbbdad26e0d68a922514a7a55bcb7044bf4bf892532c43a1 SHA512 c54ec71d2ff6cb3d501ee4a3e1db15d2f701023cbe000b9764f826c40a9a7c0191c71e38ada726516885a01eb805e5a09f83e59ec54a7609f79e2dba1495da45 WHIRLPOOL 7a37448315f9d3b3ddf8d15ab50b3d645f39a3a72614593eb7caccac2a9fe2bd31b49ac4bf110afcd1dced21c049a630a89a9eb05bce8227752ea6d70817b163
 EBUILD netbeans-webcommon-9999_p20160205.ebuild 5280 SHA256 3f6cf4a67ecd8b9947ebbfaaec250e237f2b0a30b16e25015346e3abd16cb4f0 SHA512 121b8d0a568946f154f3f79a159699683a835c4d75a351e1ff22d3407c786ca811d550eebd5a701a38d8c729aa4647ec1876bd673d82984b0d749229c41c8bd1 WHIRLPOOL ec2d98cb78886db8f11d9391e8a501aa47a9c3e705ab9ac98fa87df00bdd3bcff640718e325e5cff31df0224ce1972feda2bc2a4bd24f0b44a1f296d9e4945d2
+EBUILD netbeans-webcommon-9999_p20160208.ebuild 5280 SHA256 57d79803ae8e27b4b87f790ca9e81e46eb9d11ded09eafb09b6f365a318772cf SHA512 745f9970176c23aa5e68a2628daea97ca927014e8467a0fb2a4053978763059459d434005076b6519d564aff80dc8633e04fe307f963c06152270ce44bf975df WHIRLPOOL 11f5a976e04cb1e5de58abbe0031cd26692a3c37eea75ec38ecbc66af5a3c75ff03ce19ec1fab555e09de077656479ba95e520ecb4ea62b8964e2d281830f1e8
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160208.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160208.ebuild
new file mode 100644
index 0000000..33d523d
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160208.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-02-08_00-02-15/zip/netbeans-trunk-nightly-201602080002-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 b34a052..9717fec 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -20,6 +20,7 @@ DIST netbeans-trunk-nightly-201602020002-src.zip 209598146 SHA256 0b1707c46f0d9b
 DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232d1b71f43142523a79fd0627b569bde6039141810334c7bab27 SHA512 46ab55b9253c04ba2c807531b723a00eeac73af33d2dd0efca6c7db595aca0e0811725b37603148b82a59bb324bfa88f7de56cddd312b2ba2cf28db604fcff67 WHIRLPOOL 84775701a651db0b540ab9aa86835d44d81544ccd11879c189018fd781d73662b2411f8212d33754001fb4b598f784b74bfcef6819fd034683cbe624a697e7f3
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
+DIST netbeans-trunk-nightly-201602080002-src.zip 209611236 SHA256 4d951395dbf396fd41d43efb30f19b7482eccc19969c479d91576ab0bf7662f3 SHA512 2f4e76cb78bf06a6290e291a1663c2931e53d08abb56356eb3e4e6443eb79e2261e77caa10d6fef70e3f7c8cf7b9772e0036a58781a8e11c22503e76d70abfad WHIRLPOOL b063ead0d9beee28352e03e499d891efe4f06ba8c739576b253f825e7559e9f0f98951162e10be48da86c0c1b0432ea18fcace727a7bff34aa4e07bd2543b6bc
 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_p20160108.ebuild 2721 SHA256 f987affbdbcda640f214df4c9d6a7d0a37f444029574defed75cd0846ec16db8 SHA512 9a98d910cb152a0134734f568646cb19610686e6c500c7742afee243cb2de0d7c0f0d4a302048a0f186ee3672d692e679c53bbd2ddad337e349b3913dbfeccdc WHIRLPOOL 2408f28d35dbda995c4d2357874bc60906c57240a37ad1429ac27423ce88450ce0de02204c12d641de475037aae47a3b5ab5df66ac7b4b65fe4c46cb5422fac0
@@ -39,4 +40,5 @@ EBUILD netbeans-websvccommon-9999_p20160202.ebuild 2721 SHA256 fe533092ed87eb2c4
 EBUILD netbeans-websvccommon-9999_p20160203.ebuild 2721 SHA256 84c859d9f30b1712f4bb4113c7ccd025ad01ceb569674351a313082a489569ec SHA512 38269bf918bc9edc0f5858badd34db0e4166b84f7ef59dc1eed6d3d4e39beb715efaee165e2c89cb99cdaa559047ee2828b7e292673794d4a35998317010f5d7 WHIRLPOOL 20911ea5c5eef526d5573accdd2bc0a1f28d540f65b9268dd1da0671157a99438d0046dc1894600a7bc6b4dc8a36c4b35e16faac284648d8b05f2e7688d653b9
 EBUILD netbeans-websvccommon-9999_p20160204.ebuild 2721 SHA256 fe7b289eaac77dd9951fb1365ce6b831b50f12734a31c8546bed0f78c6827696 SHA512 0ac4702e243ed9ee35b70c255dc865f8fe678c30dcc94eae4013ce8ea031c7c3a44f34c28d85ed76a45c710cfae65e0b6742e12f41b011329abd20a1ad660cb2 WHIRLPOOL d3ef19dffc04ccf6514e69e8b7a6c34b9bb407f0d5808fe80b9ce5645922e7b92ad2ea825cfc564d8a9c5ae19fa19f8d9db20b43d8c8ccc9924727ac1280a0c7
 EBUILD netbeans-websvccommon-9999_p20160205.ebuild 2721 SHA256 34fcd53aa16be3f52f920f9440646c4c50f12f8e665517ba3f81006b12b948bb SHA512 67d95d9f68fff68a672c0fa21ee22cf54b1e548ce060414d6dd65138cb4762991c8f9cf8d5ccaa4e6eabc71879932311e48968fadf3dca389b78cd0975819584 WHIRLPOOL 63dd4e4ebf27e00763e3e023bfa548cff524b26cb2dc4e30bc107d83ef98ab5346e9fb4f10177f71118af2ba24566790e1f237d6e774e5d9271ee4590891ae07
+EBUILD netbeans-websvccommon-9999_p20160208.ebuild 2721 SHA256 49924310e7b7100bc196f1c4173284a60684e30c9be59d6765f983a48bc9a79c SHA512 ac982a2a67e2a4c16ce42baa1f4c81c2e774e3cc593175831a1b7d83d926cae339007308bd06967d4684abf898e95e7c157c4372994d905efc5b15341ed06f7d WHIRLPOOL 6cec7f5e4a15d1d465558eb052ad75536cc6e6aef9b9a1154e268c2592fdfb79720270ee69f089cebd4905a671f4962fb487ce385afacb73175fa070c172d6af
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160208.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160208.ebuild
new file mode 100644
index 0000000..c380b8e
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160208.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Common Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-02-08_00-02-15/zip/netbeans-trunk-nightly-201602080002-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 a8ba3e1..4257c83 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201602020002-src.zip 209598146 SHA256 0b1707c46f0d9b
 DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 DIST netbeans-trunk-nightly-201602040002-src.zip 209610685 SHA256 6c89d9092b1232d1b71f43142523a79fd0627b569bde6039141810334c7bab27 SHA512 46ab55b9253c04ba2c807531b723a00eeac73af33d2dd0efca6c7db595aca0e0811725b37603148b82a59bb324bfa88f7de56cddd312b2ba2cf28db604fcff67 WHIRLPOOL 84775701a651db0b540ab9aa86835d44d81544ccd11879c189018fd781d73662b2411f8212d33754001fb4b598f784b74bfcef6819fd034683cbe624a697e7f3
 DIST netbeans-trunk-nightly-201602050002-src.zip 209612124 SHA256 cb52b01a7d47f1abc4c933dfe84b9ea775c179f906be2866b24e7bf6fd295260 SHA512 98b79f0af35ca5dca3068ff42678709c738b6df9d31678f263efe9378b8e0429d42b7cb9dde6f4f64108336347df54a86c0085d71243e7488da18e1c0b5b7983 WHIRLPOOL bf09e950e2874cf441c95827400c579dc8b11852bd7d154554d1c4149dd2839f078037bf0802faa7a81e59b336347c92deaf86306d246fa5148ddb0abf5468cb
+DIST netbeans-trunk-nightly-201602080002-src.zip 209611236 SHA256 4d951395dbf396fd41d43efb30f19b7482eccc19969c479d91576ab0bf7662f3 SHA512 2f4e76cb78bf06a6290e291a1663c2931e53d08abb56356eb3e4e6443eb79e2261e77caa10d6fef70e3f7c8cf7b9772e0036a58781a8e11c22503e76d70abfad WHIRLPOOL b063ead0d9beee28352e03e499d891efe4f06ba8c739576b253f825e7559e9f0f98951162e10be48da86c0c1b0432ea18fcace727a7bff34aa4e07bd2543b6bc
 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_p20160108.ebuild 6938 SHA256 d88c1b351d2832fea3b58e9c5b7a40aed4dbb73cc0d68d4810792fa497b9e94f SHA512 cffb502d84ae2cd7ca0c35f09200484b95614f1bfcf65148faa7b7cffb7221ab517e61be9d075c1d791b90fabb3ff599f7fb7414ea50b25a8cfed0ff17145292 WHIRLPOOL 6053108db25b04b69cbc6fa42df8d99ac417fae17e011fe0ff75349099dc37e1feb73e2a0a31a36a1eeb41c936f5792eff906514c4f4ce6daf46d2dd546b49ae
@@ -42,4 +43,5 @@ EBUILD netbeans-9999_p20160202.ebuild 6939 SHA256 add4eb27e204a26b2ddbf2ef6db56d
 EBUILD netbeans-9999_p20160203.ebuild 6939 SHA256 263ff831228d62c03a08345b5f5a201bcf1e7f150ba2a463ece4607aa0d4b0d7 SHA512 2162d28c8b2dc586ad6e99f76ea0ee921a5c99ab269e6c160373ce7a0c918c73545e0cc5bdcc77e263a78b942f26aabea831cda5fca472c1f00df22e1e2749be WHIRLPOOL 57ae46f70efe07679a3950644839d8ccef9cd7dcd8a90a1552fdb118ee567abc40a9583a714a7b51d28f40fe45ff464ce94e4df0516075629bc27dca3c0d4105
 EBUILD netbeans-9999_p20160204.ebuild 6939 SHA256 f5ffafa6bc643cf357cfd9cbff27cc3158c1867a80055506078bfcc884b5ef02 SHA512 c746d17600fef56be26813bfc12c8ea6dca41fa9ab374357e86fc46b9c2388a0d4a0d80a38cb6143ec1ddebb7972c4f6dd6e6c6ad96e0051e68daaa3e5d2a33f WHIRLPOOL 1cbbc4db7444464d1d9171e95b729513102ef34a4a7d18960f730c13e75c7788cd5288bc6015028e08f2e1b4f59ca5201f80eb7b27e5ac2fdf78ff856d281a48
 EBUILD netbeans-9999_p20160205.ebuild 6939 SHA256 efff901f97e4013e351f9097f95619225b4098fa81e82538e92ab5cc0fa16b36 SHA512 768600f9ba885dd0f3841e8db72d78ef4b02046f8c29caf908b514dae208ed7adf8dbda2d057928dd9709754603747a5f74b71de45b51ab1ab38f7a7c2280ea6 WHIRLPOOL e62664a221ded2c9b9396158592365f13b0f2e246f326d8168890f36cec1e525b20399f63022b138b27d97c8e081f293c3c8cc654a47e560784346177804721f
+EBUILD netbeans-9999_p20160208.ebuild 6939 SHA256 4a8027e9ad93f2896c1a5318123feb995e082e3d1301054dceeeb4d3f797893c SHA512 1043e79cd6bd786ce2994b193a79478b439554cb8e32fd79eb570e84284d7f787de578821a93b41e2a00207e250133aa03f1df2e7fce8dc4b4e84ceb02443cf2 WHIRLPOOL e9535232b65d43e8b7a81c6c047063e91f585dceca5d8b35c8900c332278478486c9afa74367821ed921949f4722e69da13067c7145e03c4a111d17dfcbd839b
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

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


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

end of thread, other threads:[~2016-02-08 11:57 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-08 11:57 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-apisupport/, dev-java/netbeans-nb/, dev-java/netbeans-groovy/, Miroslav Šulc
  -- strict thread matches above, loose matches on Subject: below --
2016-02-08 11:57 Miroslav Šulc

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