public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-javacard/, dev-java/netbeans-websvccommon/, ...
@ 2016-01-27 10:53 Miroslav Šulc
  0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2016-01-27 10:53 UTC (permalink / raw
  To: gentoo-commits

commit:     c0fddfbbe44d3c28066fe3cce0a2e3db48d1409e
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 27 09:50:44 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Jan 27 09:50:44 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=c0fddfbb

netbeans: removed obsolete ebuilds

Package-Manager: portage-2.2.27

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 273f281..03e4b6e 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-201512220002-src.zip 209402924 SHA256 b5e8e38ef4b58ef873c9efd9b808b864d255b2a1adeda86a74d5dd09df36d692 SHA512 a12e5fc9f7c784ee50549e4000924f32e0707fe3e978bfeb7a4078c242a3ee7e4f462271c638611b1d3eafb24dbdb9e40eaf3a638cd729032e8b6d65cf92028c WHIRLPOOL b4dbbd6c23414c53e58634a3be977d3f794b4bbf69341c18aa2e00442da09f38bb6bd7a8cc4998ce51f55b3a04293dcbef2e31d620d96a31a59722007c520b2d
 DIST netbeans-trunk-nightly-201512270002-src.zip 209403445 SHA256 0fd5aaa4cd11df3c1d34e643edcfff1446f2a18598e65713cde0de3aeee13c51 SHA512 cf02bc9cdd614cde4ce42355d44f4b6c55747abdcdd7f6312273904a50032c98103fa65e6055987f471be269fd148ff7afbd6c2879ae573671419cca9acccc0d WHIRLPOOL 8e6b80230c7c94d6962dbf79529b537001850b56fb67377be7f409214ae6600544d9a182ea534afa32dd9a90e25f6868f57b5ab0d1a50f1ca25d7ee92027061d
 DIST netbeans-trunk-nightly-201512280002-src.zip 209403445 SHA256 0fc2fb9260022cc65b3c71873d6af76003f66255d8680c32ab1e8f05e4f98a59 SHA512 4120c251249e225ace1a97aae9f66caa782dc728e0659336222748af816601a74d0ccaa703fee4deaa9f27ede486df60f39e418c70c4aeb7f88fd409b00e018d WHIRLPOOL 83daeeffbcc97c771f38a7fd8d0407c00543d57468897d78bc6d19ad7fdca22ec47f884d9cfe91a3654db6703659456ed2082825a3fc533858c7b7a7a3e2c261
 DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
@@ -18,7 +17,6 @@ DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818c
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 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_p20151222.ebuild 3384 SHA256 54bed9d03f2968e2f49adf2a0409347f00e9bc9538e68667e046d905c75670e8 SHA512 b7986519debfea711765fd1088a6abb516e53d629f1e245dcd20432c65400cb363d7dbaec8354baf99232b8a48468cb6214d73062d316a9f6a852c5268a41680 WHIRLPOOL cf3d5f3d3af86e77126627fd59ae4aabfca1a64c3ad15985ac8e9769bd7ca3176ccdaafa19ff832f966a7a41c6654fab35835f60f9d5a4ab03b8c1a6f549a7fb
 EBUILD netbeans-apisupport-9999_p20151227.ebuild 3384 SHA256 f4d0807734340891e1b6c2c06189687041d80e698f357524b7db280581414194 SHA512 95cbdec3cee2c2f1e24988ed89c996ebbc6d6290b77157898f754e03bda1e1e64332af6ccdbd325e60ad1922a4d5c037a4fb4493868bde92530de26aaf5f0496 WHIRLPOOL 21db809b3100306762c70c7d8590cf01b95b1709db1ff33e2cec26ea1346cbafa04a0453bc7c470c34d7e374526bb392fd3a26271b67cae712d166072c95a34b
 EBUILD netbeans-apisupport-9999_p20151228.ebuild 3384 SHA256 bdae8f084ad92159fae393d4e7f9bf90bea2ef111afb63fcb9e772db009fa2f3 SHA512 32329e86052f8a04a5746cc66138627969b5f05fe6e1860d95e6768adaf1d881a5c638f977bee1931da8d21fa49c404d71175e3755e6701daecf4fec6c19691a WHIRLPOOL f7221f3273be73a6fa87990c10a2c4b60bc9f36d5c1befa3a584543ace228de84276672754e65885b4ac3d3e33c4cf8c830202e933826ef79bfb598467c2bc72
 EBUILD netbeans-apisupport-9999_p20151229.ebuild 3384 SHA256 a9e8aca349720d3269ba2d112180084112ea2ee7184043e7a9c31dbded2a894c SHA512 a3aeebd561b2e88ae1712e955a797a9e949646758ff5ac66a58dc432d9082270bdf72c866b7c76d767b6febc0ca636805ca82445e58641685d668cb44c20f8e8 WHIRLPOOL 24d00d4c926f4080ef38f75e8e93ef19b4fa0bef2155bd633e6b02f99613db07d74125a18e511eaebd10cb324d2f4b78f36377fd5ccef4384b81fb066cd84fcc

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20151222.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20151222.ebuild
deleted file mode 100644
index d6e1400..0000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20151222.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans API Support Cluster"
-HOMEPAGE="http://netbeans.org/projects/apisupport"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-12-22_00-02-04/zip/netbeans-trunk-nightly-201512220002-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 2eabb25..5a9d41d 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -16,7 +16,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-201512220002-src.zip 209402924 SHA256 b5e8e38ef4b58ef873c9efd9b808b864d255b2a1adeda86a74d5dd09df36d692 SHA512 a12e5fc9f7c784ee50549e4000924f32e0707fe3e978bfeb7a4078c242a3ee7e4f462271c638611b1d3eafb24dbdb9e40eaf3a638cd729032e8b6d65cf92028c WHIRLPOOL b4dbbd6c23414c53e58634a3be977d3f794b4bbf69341c18aa2e00442da09f38bb6bd7a8cc4998ce51f55b3a04293dcbef2e31d620d96a31a59722007c520b2d
 DIST netbeans-trunk-nightly-201512270002-src.zip 209403445 SHA256 0fd5aaa4cd11df3c1d34e643edcfff1446f2a18598e65713cde0de3aeee13c51 SHA512 cf02bc9cdd614cde4ce42355d44f4b6c55747abdcdd7f6312273904a50032c98103fa65e6055987f471be269fd148ff7afbd6c2879ae573671419cca9acccc0d WHIRLPOOL 8e6b80230c7c94d6962dbf79529b537001850b56fb67377be7f409214ae6600544d9a182ea534afa32dd9a90e25f6868f57b5ab0d1a50f1ca25d7ee92027061d
 DIST netbeans-trunk-nightly-201512280002-src.zip 209403445 SHA256 0fc2fb9260022cc65b3c71873d6af76003f66255d8680c32ab1e8f05e4f98a59 SHA512 4120c251249e225ace1a97aae9f66caa782dc728e0659336222748af816601a74d0ccaa703fee4deaa9f27ede486df60f39e418c70c4aeb7f88fd409b00e018d WHIRLPOOL 83daeeffbcc97c771f38a7fd8d0407c00543d57468897d78bc6d19ad7fdca22ec47f884d9cfe91a3654db6703659456ed2082825a3fc533858c7b7a7a3e2c261
 DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
@@ -31,7 +30,6 @@ DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818c
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 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_p20151222.ebuild 4790 SHA256 bf399004993e9da788eb70a413330e82bbdd2bb03a192cc2b04ea02229889702 SHA512 616c71fc22e75c8b95b1d69ae2bd7c206bcd428f960763f65649fa671f76c201dc422b82499317089caf423c9bb8ed5a9cee27bd5d6cddf0736c40e868dc633b WHIRLPOOL 74e496951120a3e123aae4ad80cfad411b8c385a602591a6bbedfb7069977a1a6344412b5b1e230dfc421291a5f8aa7d78e13c632fb222ed175e50f35bc80412
 EBUILD netbeans-cnd-9999_p20151227.ebuild 4790 SHA256 e60757cf9e8f608e86ec7a1c278359055b9a5d2dfe89b4de13c1c2ad5b7fa44a SHA512 8470efe6b862946fab6b45a0fa34298cc23774d3b7f163817a56ab1557816042f94b4779059b5eeccb445bd41918af9e907ec1d57b9635c3aa9c8876e752418e WHIRLPOOL 121a7d5d706ad54861f1d01fead09a02ff8a4c1c40dfe20dc611ba5a82c3b59a337c0e4a28ae72c17ad45db11c30037085dc91c6500ad0078368f80e352c8635
 EBUILD netbeans-cnd-9999_p20151228.ebuild 4790 SHA256 e89eb5fe8a8d7ac2864d2bb9cd015446d176d4fe9bf9256c68bb0e90b9f7742d SHA512 3f28db2a7de5328da70eb50c6ae133962667878fdaab9f2dcd382ce22aa996551d259b008afd0605dd5b987ed8ff64eabb8fb3a9ac2a4159da88e56538f6e353 WHIRLPOOL f019f06e53372789f818f00f1a216db072adf1216edfd3dcc82937282b3074255d0ddd9b4db1203ee0398dff2bd549fd22f3e4eb4ed3d9a1a60d26e35377083a
 EBUILD netbeans-cnd-9999_p20151229.ebuild 4790 SHA256 40e984d3e7b16b22d2287dca20a7a19605f5ddc8db4048fa93459625dcd4c22e SHA512 01130cdd859af8a9af42940077931b3d1b71382ab406de5e566f305210f21c1c99e67d957c8f7007103388cea621db54958bd519ed56734fff8e813c6cf18e92 WHIRLPOOL 2495372543e121638a7a42718a37b9eb8ab8b6e2677a44921f0ab9f261075f455e223da621ef59a25f178ddfa63206bbc19aef908417d078bfd29f2e13697f50

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20151222.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20151222.ebuild
deleted file mode 100644
index 12d36c0..0000000
--- a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20151222.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans CND Cluster"
-HOMEPAGE="http://netbeans.org/projects/cnd"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-12-22_00-02-04/zip/netbeans-trunk-nightly-201512220002-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 a045941..0032316 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/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-201512220002-src.zip 209402924 SHA256 b5e8e38ef4b58ef873c9efd9b808b864d255b2a1adeda86a74d5dd09df36d692 SHA512 a12e5fc9f7c784ee50549e4000924f32e0707fe3e978bfeb7a4078c242a3ee7e4f462271c638611b1d3eafb24dbdb9e40eaf3a638cd729032e8b6d65cf92028c WHIRLPOOL b4dbbd6c23414c53e58634a3be977d3f794b4bbf69341c18aa2e00442da09f38bb6bd7a8cc4998ce51f55b3a04293dcbef2e31d620d96a31a59722007c520b2d
 DIST netbeans-trunk-nightly-201512270002-src.zip 209403445 SHA256 0fd5aaa4cd11df3c1d34e643edcfff1446f2a18598e65713cde0de3aeee13c51 SHA512 cf02bc9cdd614cde4ce42355d44f4b6c55747abdcdd7f6312273904a50032c98103fa65e6055987f471be269fd148ff7afbd6c2879ae573671419cca9acccc0d WHIRLPOOL 8e6b80230c7c94d6962dbf79529b537001850b56fb67377be7f409214ae6600544d9a182ea534afa32dd9a90e25f6868f57b5ab0d1a50f1ca25d7ee92027061d
 DIST netbeans-trunk-nightly-201512280002-src.zip 209403445 SHA256 0fc2fb9260022cc65b3c71873d6af76003f66255d8680c32ab1e8f05e4f98a59 SHA512 4120c251249e225ace1a97aae9f66caa782dc728e0659336222748af816601a74d0ccaa703fee4deaa9f27ede486df60f39e418c70c4aeb7f88fd409b00e018d WHIRLPOOL 83daeeffbcc97c771f38a7fd8d0407c00543d57468897d78bc6d19ad7fdca22ec47f884d9cfe91a3654db6703659456ed2082825a3fc533858c7b7a7a3e2c261
 DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
@@ -23,7 +22,6 @@ DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818c
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 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_p20151222.ebuild 2968 SHA256 8cec4173e907dee2b89a8e931a43c28cabea28ad797d4694e757001edb4c09ee SHA512 ba00b9647dbf07f95cee2f3205df2061b1a726d97eb2dbea6be838e9fd7c4ca67d39bb0e8968dfdb1090fe6757a8c18e72bad7abb9d61fbf1b18bd29f8096580 WHIRLPOOL d3544c2a2275a638a47ffb2ef59be27329345c5f26a362a2e1981cf950f0973cd57babb52e07b8b06a5e81695a601b44aa79fd1200a34009fd38e4747e7088ce
 EBUILD netbeans-dlight-9999_p20151227.ebuild 2968 SHA256 7e2117dc503c270bdf2676e014fab49ffdda344b45b7c63b6599aafc9e97ce85 SHA512 76269acac2489de4fef6f017c1c4367e3e31c995f4f0f2f1b5d298b012549a71252e79edf07c5cc7509654d8d6a53e032e3ae3232cfbfc96c202c41975c5b81f WHIRLPOOL d295f98efd1520ade381a3e157d420de0e213ca42b7099601964dfac84b49f63d23d2b144ea5a8b83e3990753f2b380d08dd58813687f909ad433ec88bd067ea
 EBUILD netbeans-dlight-9999_p20151228.ebuild 2968 SHA256 cec386cca4df21af230f12ccdb8724a569e8cb6bb45b9983b1ac4e022a387ce2 SHA512 b6c6e44359edd1509972d85f2622b4c277f258077574bb1175b984181996d7f13b13730e2cb3379438a7bb5025fad6693952505730958f1412c5fe88941f11f8 WHIRLPOOL b7220873dc61c86b758869b32d078369f34da8f8f499521a46f31dbc9d7b3b809e920eee35a285451b1f86c6f411aeb872bbdb871446fd66bafb493dc4873890
 EBUILD netbeans-dlight-9999_p20151229.ebuild 2968 SHA256 850bfd5b4c690305c784f03103eb6546fe8c9d8580e06f145ffe2d5e04688df5 SHA512 c3df9e2f1d1ce75cdc0cd9374dc8fbb0b6430cce225b3ec40c36a2116f7940a10ba4a72a52cd2aec276727abb1cee47e7528f3d3ffde7151a5e76687f766fad2 WHIRLPOOL 3454d360a63354a2f66a2f0111689ea4480008d1b812dd286c54f46c8e40f4aeb01a144d820a3c79261d89997398639140b3c275be323a1514893e24142a2743

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20151222.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20151222.ebuild
deleted file mode 100644
index 438e48a..0000000
--- a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20151222.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans D-Light Cluster"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-12-22_00-02-04/zip/netbeans-trunk-nightly-201512220002-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 bdc2a06..d2684b1 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-201512220002-src.zip 209402924 SHA256 b5e8e38ef4b58ef873c9efd9b808b864d255b2a1adeda86a74d5dd09df36d692 SHA512 a12e5fc9f7c784ee50549e4000924f32e0707fe3e978bfeb7a4078c242a3ee7e4f462271c638611b1d3eafb24dbdb9e40eaf3a638cd729032e8b6d65cf92028c WHIRLPOOL b4dbbd6c23414c53e58634a3be977d3f794b4bbf69341c18aa2e00442da09f38bb6bd7a8cc4998ce51f55b3a04293dcbef2e31d620d96a31a59722007c520b2d
 DIST netbeans-trunk-nightly-201512270002-src.zip 209403445 SHA256 0fd5aaa4cd11df3c1d34e643edcfff1446f2a18598e65713cde0de3aeee13c51 SHA512 cf02bc9cdd614cde4ce42355d44f4b6c55747abdcdd7f6312273904a50032c98103fa65e6055987f471be269fd148ff7afbd6c2879ae573671419cca9acccc0d WHIRLPOOL 8e6b80230c7c94d6962dbf79529b537001850b56fb67377be7f409214ae6600544d9a182ea534afa32dd9a90e25f6868f57b5ab0d1a50f1ca25d7ee92027061d
 DIST netbeans-trunk-nightly-201512280002-src.zip 209403445 SHA256 0fc2fb9260022cc65b3c71873d6af76003f66255d8680c32ab1e8f05e4f98a59 SHA512 4120c251249e225ace1a97aae9f66caa782dc728e0659336222748af816601a74d0ccaa703fee4deaa9f27ede486df60f39e418c70c4aeb7f88fd409b00e018d WHIRLPOOL 83daeeffbcc97c771f38a7fd8d0407c00543d57468897d78bc6d19ad7fdca22ec47f884d9cfe91a3654db6703659456ed2082825a3fc533858c7b7a7a3e2c261
 DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
@@ -50,7 +49,6 @@ DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818c
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 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_p20151222.ebuild 15825 SHA256 4474d884cbb69090b8db64f7864c470d60b43701c415f11c6022823b0e12b16a SHA512 ba3f4035edd13bf0ab49047d13a63a3d0af4a6b0c8477fbdf375b8bd2d6a37c26a16d994b1b4fc66fb3f673d9686e4416fe4c333be182d3174cd59727203f46d WHIRLPOOL 7bcbafa044366e293d53d4a79b08566dfef070379fa4d3c0cd218d5338a63570f9753e086776f264b30113a3732b72204f3f3396fc37e9035c15760738a8b051
 EBUILD netbeans-enterprise-9999_p20151227.ebuild 15825 SHA256 50322f40f59e6123d80978638957c11fdadca2b5513d895359701ebf2c084159 SHA512 321eba517f3295f05162603c3735efe36f0b54e38b6aa0860a40ac68e93657b1b0965aab4739a56fc939fd1293ad55f903404b54718bfa83c8666a0819edd9b6 WHIRLPOOL 6d1e8f3ea996ecabcc6f29000e71e706e866eb7961a9bfd65d266c9674b044ad019f0fdee39521a54eeaa25c6d8cbfa37101c4dc5adf5e8f3c9158f59d3cf26e
 EBUILD netbeans-enterprise-9999_p20151228.ebuild 15825 SHA256 439801953f275e517818ab3bf54bea3fdc764dd090ad838bf409e0536b6f1f77 SHA512 fc98395c6a068aed97d0d8032b64827a6dc0188a3fe712466d16e6576ec711521a502c4bf21547c1d2a1c539b5884b1cf2de7cf8c99e388c376a87ebcce3a9e7 WHIRLPOOL 2467da2e733d19135d7bd664ac3f04834310b3f62f8bea668877ad4eff49dc4e5026724f2e6e662d0fc559f9f32eed7f534d75e471af62d5c0e993f60d83fd50
 EBUILD netbeans-enterprise-9999_p20151229.ebuild 15825 SHA256 b4258d1dc8bef26206ca4cf7ab15af9c2b8d5a299495add2dc32b86789a62d2c SHA512 434ee298b4ca4e8808b979f59eea633c3778d3778949b39497ce2378b3a034dc52dc3d75619b1217dd081a574acfa3a9d6f0e53e0da3b4037da6938eab190db7 WHIRLPOOL d9e2f2e6905213cd8446bedbf5f65995fc0fa0a2279cc54fbbf238c26faf2c613d29b1b9dcaae9d9070c1ccf5ea5237e8fbba08fc1265e3a97f7797236154670

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151222.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151222.ebuild
deleted file mode 100644
index c65517f..0000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151222.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Enterprise cluster"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-12-22_00-02-04/zip/netbeans-trunk-nightly-201512220002-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 20aba0a..da3d787 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-201512220002-src.zip 209402924 SHA256 b5e8e38ef4b58ef873c9efd9b808b864d255b2a1adeda86a74d5dd09df36d692 SHA512 a12e5fc9f7c784ee50549e4000924f32e0707fe3e978bfeb7a4078c242a3ee7e4f462271c638611b1d3eafb24dbdb9e40eaf3a638cd729032e8b6d65cf92028c WHIRLPOOL b4dbbd6c23414c53e58634a3be977d3f794b4bbf69341c18aa2e00442da09f38bb6bd7a8cc4998ce51f55b3a04293dcbef2e31d620d96a31a59722007c520b2d
 DIST netbeans-trunk-nightly-201512270002-src.zip 209403445 SHA256 0fd5aaa4cd11df3c1d34e643edcfff1446f2a18598e65713cde0de3aeee13c51 SHA512 cf02bc9cdd614cde4ce42355d44f4b6c55747abdcdd7f6312273904a50032c98103fa65e6055987f471be269fd148ff7afbd6c2879ae573671419cca9acccc0d WHIRLPOOL 8e6b80230c7c94d6962dbf79529b537001850b56fb67377be7f409214ae6600544d9a182ea534afa32dd9a90e25f6868f57b5ab0d1a50f1ca25d7ee92027061d
 DIST netbeans-trunk-nightly-201512280002-src.zip 209403445 SHA256 0fc2fb9260022cc65b3c71873d6af76003f66255d8680c32ab1e8f05e4f98a59 SHA512 4120c251249e225ace1a97aae9f66caa782dc728e0659336222748af816601a74d0ccaa703fee4deaa9f27ede486df60f39e418c70c4aeb7f88fd409b00e018d WHIRLPOOL 83daeeffbcc97c771f38a7fd8d0407c00543d57468897d78bc6d19ad7fdca22ec47f884d9cfe91a3654db6703659456ed2082825a3fc533858c7b7a7a3e2c261
 DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
@@ -18,7 +17,6 @@ DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818c
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 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_p20151222.ebuild 2913 SHA256 df0b5adf1d6e3d0852a0a05f7e789b268d1e558bb481dd901e7dd99eed75bd03 SHA512 d24f14a9b91c802ffb7e318c81d89ff82d28899fb3a39d0eca97f9510168891bcbce9c9795ba557f5c03bd9dbc9c45b23fb87ddb4650c155a23e22ad767e77ec WHIRLPOOL 2729b92362ba84ecb38eba22a8192b96793a71d871bc049f3a982683f480a84466714bd3aab9ae28a66d4d2c43d88dc68aa93ec6da613c9703fab94ec0c849db
 EBUILD netbeans-ergonomics-9999_p20151227.ebuild 2913 SHA256 72c88f64698c17caea459e10cf4749d07fb5a221c6f60b249b39c21e65ccd240 SHA512 1beec8b54cf0ccf4695e414155210a21269e062b9dbb332b3564691434f448e1cb795d4309cc50cd7c7c8e6e1c60f6d376fca512bfe271839c40e38b6cb36dcf WHIRLPOOL 528b0cb78c2e4eefd3c78fc740150253208879a58de656106e580340523cc6a5ca9401e335e9c42b171b61a1220724dd32e51a730efbb3918c8268a1acc001e3
 EBUILD netbeans-ergonomics-9999_p20151228.ebuild 2913 SHA256 cb438680562e0413957341a6dbaf0ce575906e742a1f7106aee50a4683af7181 SHA512 c4a075f7ed37f97dc624b0c5cfc1b720c7109065c8537aa0c68c8273824029fe2376d665319d968d9295f089665f53a15869cd48b070c0ae3750fb03484f87fe WHIRLPOOL f839ec3e5ee69c0c1df7ea36feda740892247b1f197a7d0ab8b89b7a945278c9d6fa669deeefae2b32ec54d2585dafaacbbef03639d7ce9cfa7b79d03872cb60
 EBUILD netbeans-ergonomics-9999_p20151229.ebuild 2913 SHA256 659462872eb193d863de274e70b3c2f9833fd09aa92ba11a7a98ece702ab665d SHA512 f270f7bc01575ec00d7eae54d1ee9fb02ef49509404b0ab6f66e3bfd373d406b98f164b3e04cc1c499e76cc064a59f03aabad9d8a0e45d6aec57cfb010c53799 WHIRLPOOL 80f9fe9e2100b3a44c0a9c246f89a6d7cf3a7f0d40853316b01bc31b819c038ad48ef8972ce2c7bdc2aa33e6b59fe5d023553eeacd4e51b4d77271269740fd4a

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20151222.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20151222.ebuild
deleted file mode 100644
index 5a7dc0b..0000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20151222.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Ergonomics Cluster"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-12-22_00-02-04/zip/netbeans-trunk-nightly-201512220002-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 924ebe1..769e0e2 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-201512220002-src.zip 209402924 SHA256 b5e8e38ef4b58ef873c9efd9b808b864d255b2a1adeda86a74d5dd09df36d692 SHA512 a12e5fc9f7c784ee50549e4000924f32e0707fe3e978bfeb7a4078c242a3ee7e4f462271c638611b1d3eafb24dbdb9e40eaf3a638cd729032e8b6d65cf92028c WHIRLPOOL b4dbbd6c23414c53e58634a3be977d3f794b4bbf69341c18aa2e00442da09f38bb6bd7a8cc4998ce51f55b3a04293dcbef2e31d620d96a31a59722007c520b2d
 DIST netbeans-trunk-nightly-201512270002-src.zip 209403445 SHA256 0fd5aaa4cd11df3c1d34e643edcfff1446f2a18598e65713cde0de3aeee13c51 SHA512 cf02bc9cdd614cde4ce42355d44f4b6c55747abdcdd7f6312273904a50032c98103fa65e6055987f471be269fd148ff7afbd6c2879ae573671419cca9acccc0d WHIRLPOOL 8e6b80230c7c94d6962dbf79529b537001850b56fb67377be7f409214ae6600544d9a182ea534afa32dd9a90e25f6868f57b5ab0d1a50f1ca25d7ee92027061d
 DIST netbeans-trunk-nightly-201512280002-src.zip 209403445 SHA256 0fc2fb9260022cc65b3c71873d6af76003f66255d8680c32ab1e8f05e4f98a59 SHA512 4120c251249e225ace1a97aae9f66caa782dc728e0659336222748af816601a74d0ccaa703fee4deaa9f27ede486df60f39e418c70c4aeb7f88fd409b00e018d WHIRLPOOL 83daeeffbcc97c771f38a7fd8d0407c00543d57468897d78bc6d19ad7fdca22ec47f884d9cfe91a3654db6703659456ed2082825a3fc533858c7b7a7a3e2c261
 DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
@@ -20,7 +19,6 @@ DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818c
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 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_p20151222.ebuild 3377 SHA256 b60b7ef38abbe4dfeef24437847e2c2e5bfa24608c9c50f18a53836cb544a029 SHA512 429cb655de933b13ce374e86ca6ca3d6d5438902bfdcc2112f6984a2ef62da1f67efc77677b8a1fbadfea6dc3cc25bc559bc1a0a78c6308c3da785514f23ca50 WHIRLPOOL b6e2e036f6f67fd3575387f575a071f1f41d36806b066287ecff1205ac826e4fafc114a96bbf04290a1ec0aef9112504f092d7e0f5e7ed024a1a42f1afd740e1
 EBUILD netbeans-extide-9999_p20151227.ebuild 3377 SHA256 dbfefdcce029ac7fa3580aca47e768b5630d37352395d025544426d6fba27d1f SHA512 1dda4727ac1d4a2dfa0112058c4a89afd7a2bbfd98cedf44cd4d00a473e8250cd8e38adcb47e9e81d3c9a7c861edde9fb990fffbaa0c715e624eb082880df6cb WHIRLPOOL 02413c9c70cf8f06433ff3eb4bde10e6794b052ec2c02e9d71d9d1a0d13e8bf138badb81dba327a3e75a0647fb189c403c146dc9956d240c27b634e252c114d8
 EBUILD netbeans-extide-9999_p20151228.ebuild 3377 SHA256 fd592e5bee7642b12a3a5da2953d05219686d81aa20cbdeaa2516252cad21b95 SHA512 0f630218579355280ec0465b7773a2654c089da2f5dfcc8d85be0b6f20271966bc0b2eaf15911c25841c858d30470fbfd57178c58be96e9b626147218d463063 WHIRLPOOL 82b58fdc8058923f22b1246c635949aae6e5765c04dcc6b5fcb6938cbc18cde69b0db5cefb7cdba5b09592f65be59d60aaf4666d89640e54dd291f9c2b76dbf2
 EBUILD netbeans-extide-9999_p20151229.ebuild 3377 SHA256 7031c0f8bf48bbaebffe6292961f8232147e830e8f415ce1b374c6e6d90a83d0 SHA512 e87e332e2ccc09d085a85f8b04fb5bcc87c5b1fb05df15b462aaa059b495445c827b6a62be90152eb32b53ad24321a906238a7ecc99a4514a08ad3958d2e6738 WHIRLPOOL 1851185f16dc912805cc2f82846a16fe6e0b709bbc25b1a11e0967e858039c30f91a291a092ce55f4651e8e499692bef14563e4dbda9dd2f9d2464007230b1a0

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20151222.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20151222.ebuild
deleted file mode 100644
index 143a49c..0000000
--- a/dev-java/netbeans-extide/netbeans-extide-9999_p20151222.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans ExtIDE Cluster"
-HOMEPAGE="http://netbeans.org/projects/ide"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-12-22_00-02-04/zip/netbeans-trunk-nightly-201512220002-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 21c9deb..8d9cfff 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-201512220002-src.zip 209402924 SHA256 b5e8e38ef4b58ef873c9efd9b808b864d255b2a1adeda86a74d5dd09df36d692 SHA512 a12e5fc9f7c784ee50549e4000924f32e0707fe3e978bfeb7a4078c242a3ee7e4f462271c638611b1d3eafb24dbdb9e40eaf3a638cd729032e8b6d65cf92028c WHIRLPOOL b4dbbd6c23414c53e58634a3be977d3f794b4bbf69341c18aa2e00442da09f38bb6bd7a8cc4998ce51f55b3a04293dcbef2e31d620d96a31a59722007c520b2d
 DIST netbeans-trunk-nightly-201512270002-src.zip 209403445 SHA256 0fd5aaa4cd11df3c1d34e643edcfff1446f2a18598e65713cde0de3aeee13c51 SHA512 cf02bc9cdd614cde4ce42355d44f4b6c55747abdcdd7f6312273904a50032c98103fa65e6055987f471be269fd148ff7afbd6c2879ae573671419cca9acccc0d WHIRLPOOL 8e6b80230c7c94d6962dbf79529b537001850b56fb67377be7f409214ae6600544d9a182ea534afa32dd9a90e25f6868f57b5ab0d1a50f1ca25d7ee92027061d
 DIST netbeans-trunk-nightly-201512280002-src.zip 209403445 SHA256 0fc2fb9260022cc65b3c71873d6af76003f66255d8680c32ab1e8f05e4f98a59 SHA512 4120c251249e225ace1a97aae9f66caa782dc728e0659336222748af816601a74d0ccaa703fee4deaa9f27ede486df60f39e418c70c4aeb7f88fd409b00e018d WHIRLPOOL 83daeeffbcc97c771f38a7fd8d0407c00543d57468897d78bc6d19ad7fdca22ec47f884d9cfe91a3654db6703659456ed2082825a3fc533858c7b7a7a3e2c261
 DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
@@ -20,7 +19,6 @@ DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818c
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 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_p20151222.ebuild 3416 SHA256 4ac474c82eb9453f87e6a09c525eae9015b810bdaac28dc97f234d8eb00ef2f5 SHA512 4ed005da85db596e15a9cea3c857d92b39ce59e813dc8c47b684834fb02d0e47396aa15b0495871751727c2ad6b5396cc586c8080e16f7186f90d1beaebc5ca4 WHIRLPOOL a769aadd0706e3e3e3651cdeb31e46a1286cfa1f0f4aa15c047ad742ae434e37058c7bdbf84e990daa01903648bc807d1b26e14ed9a053d9f3419c5fdbd6b53b
 EBUILD netbeans-groovy-9999_p20151227.ebuild 3416 SHA256 dcaa3b66511c6d688a5c3a5e4cd81910e5abe1d843af07e654fe19cc550f3b96 SHA512 f0e2442f659acb00476e4abfc08a98104cc19d3192fe9621232194a74f9af967647107b708154721ab9c517f9c3541ae974a7ed0ba1ffa1cde0fdb8e8a4d33ff WHIRLPOOL 3246ba95639a74d3a6dc077d0023ad4fff8d205f03e6e444533bdff6a149c5a50447787b9911c5aec9e8b0e44055b63f336a9b4ce805f2ba422ff01be3b49707
 EBUILD netbeans-groovy-9999_p20151228.ebuild 3416 SHA256 48a5cde3b4b37154dcdeff6c9321d4d2b0b89429fb80cdfb07215b3e15235b4c SHA512 9a15acf5a922e08113fdaf554358d5437bfd0d2ff4a9f8b660e3fb7e149d84466e1e34ed4f727b04c3fc1ef8681ee2b0ef89c496c6fc0c115811be7b8ff5a978 WHIRLPOOL 4b114fa7d5446fc9bedf04cfa9ea9078e0ad4113d60c7311feb313b9073acce26dad608b9258694b320d2fabb720dc94cc6f6095b883cad8e3bf0343dcb21a00
 EBUILD netbeans-groovy-9999_p20151229.ebuild 3416 SHA256 9ed0bd8bc7d926fd57aa49b6b5ebdda503b5e84031862b68561e49c17fd851a0 SHA512 dfa061673936bb2a6ae4c034d6d58846e3e9546adaff9916ed8bfea7eb838105b11ff000d018bdc75c90a243c29e51e41de21e83b92c16d2e7d02cd8e05e0643 WHIRLPOOL f4dc8105d0030ed389f77c02cf8c72d0e8252c7068fa7eb663b368e70e641651abbaac614d813b1f496f21960c9f962159578f0cbd52ed9186689b9a4448a8c8

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

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 2a4ec94..20dea48 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-201512220002-src.zip 209402924 SHA256 b5e8e38ef4b58ef873c9efd9b808b864d255b2a1adeda86a74d5dd09df36d692 SHA512 a12e5fc9f7c784ee50549e4000924f32e0707fe3e978bfeb7a4078c242a3ee7e4f462271c638611b1d3eafb24dbdb9e40eaf3a638cd729032e8b6d65cf92028c WHIRLPOOL b4dbbd6c23414c53e58634a3be977d3f794b4bbf69341c18aa2e00442da09f38bb6bd7a8cc4998ce51f55b3a04293dcbef2e31d620d96a31a59722007c520b2d
 DIST netbeans-trunk-nightly-201512270002-src.zip 209403445 SHA256 0fd5aaa4cd11df3c1d34e643edcfff1446f2a18598e65713cde0de3aeee13c51 SHA512 cf02bc9cdd614cde4ce42355d44f4b6c55747abdcdd7f6312273904a50032c98103fa65e6055987f471be269fd148ff7afbd6c2879ae573671419cca9acccc0d WHIRLPOOL 8e6b80230c7c94d6962dbf79529b537001850b56fb67377be7f409214ae6600544d9a182ea534afa32dd9a90e25f6868f57b5ab0d1a50f1ca25d7ee92027061d
 DIST netbeans-trunk-nightly-201512280002-src.zip 209403445 SHA256 0fc2fb9260022cc65b3c71873d6af76003f66255d8680c32ab1e8f05e4f98a59 SHA512 4120c251249e225ace1a97aae9f66caa782dc728e0659336222748af816601a74d0ccaa703fee4deaa9f27ede486df60f39e418c70c4aeb7f88fd409b00e018d WHIRLPOOL 83daeeffbcc97c771f38a7fd8d0407c00543d57468897d78bc6d19ad7fdca22ec47f884d9cfe91a3654db6703659456ed2082825a3fc533858c7b7a7a3e2c261
 DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
@@ -23,7 +22,6 @@ DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818c
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 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_p20151222.ebuild 4126 SHA256 e46854c8898d0f98fe136d27fbe9516819a80f5cae33f3a614c224acf5075f1f SHA512 47419c3d62ee5fc683f17393dd0f17546ada50a172ae9af39e8735d0ec2ed9469f21534b4ee5e35f717f2080011bc4a9c4b7cd366d8bbf4c33bdfe8c588bc38d WHIRLPOOL 8c2e868945fe24bd22f7491d2db63324dba391125909a8e9e86ccbe6b5997afd79e284472b60751b95f0c099a515ee9220c602492d45d9ead65e6133c4dc45dd
 EBUILD netbeans-harness-9999_p20151227.ebuild 4126 SHA256 3c082015e8bf472ee3c978e7f2311e06be0c847b7c86831bb0adf1cb88168bcf SHA512 8eca6857ae5864bfb4830c24f29dfba2dcb7e612bf211f37972a6ddb7894056604015bc32a3f4a25286eb593973e8ec76ae90a9750684d8728195e1df3c04019 WHIRLPOOL eac3f06af19c919ce8140610b246554c4c23e2c927fccacf626201118e54505953721f6f32ff98ca5394353e3fea7838c1021f9ce74725f8a256d20b117a7ffb
 EBUILD netbeans-harness-9999_p20151228.ebuild 4126 SHA256 e3c23aac6b0696876b45b5175679f7695668cb5c36ef32ccdb2dd329064ad948 SHA512 c81fa1aafba6c7155e49612e16d9b244ab43cedb0154546b0812f756319f0bda4e0acc40f3c0b42b02b4969d109094559a5dc41bc490b9263596a80965c15d6b WHIRLPOOL f484f2ea18c4b93c322d6f1c21cfdd02a15dac5400576cb6fbeb85b3724b3d92c6767dfb4485744d694f6f8482c851bf2f4b48cbd3a32bb74e13afd7262e6526
 EBUILD netbeans-harness-9999_p20151229.ebuild 4126 SHA256 83fa7c63e708281a8f71121aedb75bf00031151e337442dc5a875755734730c7 SHA512 07b253f8136ec18d0df12556cd76b1c8eec5c4658401ee20a7f836c43860e4dc29609a2ae8edc1296fa3c09353c899f044293771c5cd0c2d9720f9a14a996cb3 WHIRLPOOL b22324479779826bfa201f7095ad4a80bd065089e1bca95ad542aaeae44e32a1e5d89a97a7c76fc82e10d2502291049977b2f8d16c6689a2178f7e0bbb37e330

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20151222.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20151222.ebuild
deleted file mode 100644
index 75fdc84..0000000
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20151222.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Harness"
-HOMEPAGE="http://netbeans.org/features/platform/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-12-22_00-02-04/zip/netbeans-trunk-nightly-201512220002-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 a19236c..a49742b 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-201512220002-src.zip 209402924 SHA256 b5e8e38ef4b58ef873c9efd9b808b864d255b2a1adeda86a74d5dd09df36d692 SHA512 a12e5fc9f7c784ee50549e4000924f32e0707fe3e978bfeb7a4078c242a3ee7e4f462271c638611b1d3eafb24dbdb9e40eaf3a638cd729032e8b6d65cf92028c WHIRLPOOL b4dbbd6c23414c53e58634a3be977d3f794b4bbf69341c18aa2e00442da09f38bb6bd7a8cc4998ce51f55b3a04293dcbef2e31d620d96a31a59722007c520b2d
 DIST netbeans-trunk-nightly-201512270002-src.zip 209403445 SHA256 0fd5aaa4cd11df3c1d34e643edcfff1446f2a18598e65713cde0de3aeee13c51 SHA512 cf02bc9cdd614cde4ce42355d44f4b6c55747abdcdd7f6312273904a50032c98103fa65e6055987f471be269fd148ff7afbd6c2879ae573671419cca9acccc0d WHIRLPOOL 8e6b80230c7c94d6962dbf79529b537001850b56fb67377be7f409214ae6600544d9a182ea534afa32dd9a90e25f6868f57b5ab0d1a50f1ca25d7ee92027061d
 DIST netbeans-trunk-nightly-201512280002-src.zip 209403445 SHA256 0fc2fb9260022cc65b3c71873d6af76003f66255d8680c32ab1e8f05e4f98a59 SHA512 4120c251249e225ace1a97aae9f66caa782dc728e0659336222748af816601a74d0ccaa703fee4deaa9f27ede486df60f39e418c70c4aeb7f88fd409b00e018d WHIRLPOOL 83daeeffbcc97c771f38a7fd8d0407c00543d57468897d78bc6d19ad7fdca22ec47f884d9cfe91a3654db6703659456ed2082825a3fc533858c7b7a7a3e2c261
 DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
@@ -151,7 +150,6 @@ DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818c
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 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_p20151222.ebuild 30832 SHA256 68a9d75eea8b829d8d9930ca12305938bd64bc8cb4204dcbd4c2372e56b9940d SHA512 0532c8c327457d59dad9b639fd8f52860526063ac18c73b88334141100173a7f9414f14c50d1d7af3bc3ffd21da297ed821c820f0054a84d9a78c0f322c71dd4 WHIRLPOOL f796fd7195d3ce476c11079f631be468544ff695e4ec976277a93ab16c441a0c35af664585f0277b976204d1b881743d2b5b4e96bde38cf934c33c7727254281
 EBUILD netbeans-ide-9999_p20151227.ebuild 30832 SHA256 22ad021df23b7fbb66b091d1601a5afe56c65b8bb8f4fdbc378af68368339459 SHA512 2947268782f167bc22e823637a44244d0a849316efbd831fd8813541a7cbf01ef6095594837e7526b3735858264938ba9a35f98541618ae668f96e15406f4939 WHIRLPOOL 63897bd19b8d5372e1c5b812223fd991e9e0594c241bace28d4fb045c04c8c62f47213173d648b69b6bd05cd3085ca21c4d2dae460bf70d291f09c6cd57fe67b
 EBUILD netbeans-ide-9999_p20151228.ebuild 30832 SHA256 4d0770d2b56d22594d15cd6bf8e7d82510c7b712ebb70f1c2596c982445dd176 SHA512 5d54cb08bf49fafbdf7c00f00cdf1d8c9f8b091a3381d0c1856e7034b8fce6ad5e99b316ee3174932ef71dc993dff67e7aa3038a2d4bdfdc458dd47783a87a32 WHIRLPOOL c900e486318cfb3d53abd9a6a3eb50f5ef8d89cacf6455b98c4a7cd39332629afe3df785f907cdfaad0fa9e842793a0f4d87a61f11109e16a9266940e9921837
 EBUILD netbeans-ide-9999_p20151229.ebuild 30832 SHA256 343c5ea332b85d9773ef3f71d381d3dd3958f5975557de8f6c19f55ffe2cc44b SHA512 d575c83bff68fbfccd27862e5a3c166c427b1b5f0dbd52f10801d2654527801a807d0a692a780d29582c733cd873b8707cc076d7756adecec2e32ec31fdb4f00 WHIRLPOOL 74a477b12d37c9834d3f186b88ca1a9cbee175eee7e7e59527a7955c8d2922afbe80a17498f8d405dd0c8c80a03f052d84d9ebe9467ec8c4a21a9fab50aadfe4

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20151222.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20151222.ebuild
deleted file mode 100644
index 478547f..0000000
--- a/dev-java/netbeans-ide/netbeans-ide-9999_p20151222.ebuild
+++ /dev/null
@@ -1,384 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans IDE Cluster"
-HOMEPAGE="http://netbeans.org/projects/ide"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-12-22_00-02-04/zip/netbeans-trunk-nightly-201512220002-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 cb02dc7..4d8d05e 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-201512220002-src.zip 209402924 SHA256 b5e8e38ef4b58ef873c9efd9b808b864d255b2a1adeda86a74d5dd09df36d692 SHA512 a12e5fc9f7c784ee50549e4000924f32e0707fe3e978bfeb7a4078c242a3ee7e4f462271c638611b1d3eafb24dbdb9e40eaf3a638cd729032e8b6d65cf92028c WHIRLPOOL b4dbbd6c23414c53e58634a3be977d3f794b4bbf69341c18aa2e00442da09f38bb6bd7a8cc4998ce51f55b3a04293dcbef2e31d620d96a31a59722007c520b2d
 DIST netbeans-trunk-nightly-201512270002-src.zip 209403445 SHA256 0fd5aaa4cd11df3c1d34e643edcfff1446f2a18598e65713cde0de3aeee13c51 SHA512 cf02bc9cdd614cde4ce42355d44f4b6c55747abdcdd7f6312273904a50032c98103fa65e6055987f471be269fd148ff7afbd6c2879ae573671419cca9acccc0d WHIRLPOOL 8e6b80230c7c94d6962dbf79529b537001850b56fb67377be7f409214ae6600544d9a182ea534afa32dd9a90e25f6868f57b5ab0d1a50f1ca25d7ee92027061d
 DIST netbeans-trunk-nightly-201512280002-src.zip 209403445 SHA256 0fc2fb9260022cc65b3c71873d6af76003f66255d8680c32ab1e8f05e4f98a59 SHA512 4120c251249e225ace1a97aae9f66caa782dc728e0659336222748af816601a74d0ccaa703fee4deaa9f27ede486df60f39e418c70c4aeb7f88fd409b00e018d WHIRLPOOL 83daeeffbcc97c771f38a7fd8d0407c00543d57468897d78bc6d19ad7fdca22ec47f884d9cfe91a3654db6703659456ed2082825a3fc533858c7b7a7a3e2c261
 DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
@@ -49,7 +48,6 @@ DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671
 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_p20151222.ebuild 14930 SHA256 77f6b148bef4bc6357e0bda393671c15f0a69828526360173f3ceeb79ac719e9 SHA512 8f920318c2c34d8b4092ead258d29cfa34c8650428f4f37243d9acb887888bde0ff1031f73d9ec4ba7bb37de0b972b8ff1ce767325bdf88f3d5d91cc9c0cd9d5 WHIRLPOOL 38c3afe3f4bc6c423debe0a4d565cfc7994f7149958bf45093cdbb5844041bb5d714f6fb421b9131ba7ce75a6c2771249342bf53dc77f38c52016c73ce43a161
 EBUILD netbeans-java-9999_p20151227.ebuild 14930 SHA256 ede1ae8585f88416315847b9ba0071aa994782b68b139e28cf377c174a8dd66a SHA512 7bc745d4c73d4e8d92e5f61b90eb7b16b508565c170ccc6fb950e2a99780e42faf6115509d6cbc123544a9389867777731d2e124869e8d7dd804931934bac54c WHIRLPOOL dee5ab55632d5355ce199bff74bf170f1dafba08bb08340b3139323d9f84638bda16c3d54d96598fc1a1369316cd5cbd83322ba5126f67de8cf77f9ad28e2308
 EBUILD netbeans-java-9999_p20151228.ebuild 14930 SHA256 ea7e3719aa92a4e983da961cd31c7b5a7a9c8a9825a923e652ada09f60889227 SHA512 6d4fbe129331545c8476f47ebacb71507528d1e0938f579002786cbff918bdc4835e634f1ead322d19dca9bae118f139edb93175adead32a56fcd683c0c875e5 WHIRLPOOL b52f46f4145f6bae990a0ffa5dd6f88ec7e548cf31c09b47da74011679d50afde1863513a111d3532c40be2298aeda5a5cb555f0a6965eb164975bbd152edb9b
 EBUILD netbeans-java-9999_p20151229.ebuild 14930 SHA256 27f166d19b52e9ca7c9e8833b234a3d2e024c14f4e79f458db1ae8695895aad5 SHA512 da55f7945bde1ffdf5c933f5ff9830b389cb1c4c3d9fe9634bc64476fee963d977a2711e44db2256499710cbf37454080002367c8159be3fa712206e823a0682 WHIRLPOOL cc771102b6a515bae8681542eeefcef695d12af27e6fa86a6abf10021cbdccc07ab36e963bdd93fd5e5383b24cb6a0c6905f198b87332764fc4f938f27712b0e

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20151222.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20151222.ebuild
deleted file mode 100644
index ee93ca6..0000000
--- a/dev-java/netbeans-java/netbeans-java-9999_p20151222.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-# Maven cannot be unbundled because it depends on exact maven version and exact content of maven directory
-
-DESCRIPTION="Netbeans Java Cluster"
-HOMEPAGE="http://netbeans.org/projects/java"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-12-22_00-02-04/zip/netbeans-trunk-nightly-201512220002-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 7449fb8..20b5fb5 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-201512220002-src.zip 209402924 SHA256 b5e8e38ef4b58ef873c9efd9b808b864d255b2a1adeda86a74d5dd09df36d692 SHA512 a12e5fc9f7c784ee50549e4000924f32e0707fe3e978bfeb7a4078c242a3ee7e4f462271c638611b1d3eafb24dbdb9e40eaf3a638cd729032e8b6d65cf92028c WHIRLPOOL b4dbbd6c23414c53e58634a3be977d3f794b4bbf69341c18aa2e00442da09f38bb6bd7a8cc4998ce51f55b3a04293dcbef2e31d620d96a31a59722007c520b2d
 DIST netbeans-trunk-nightly-201512270002-src.zip 209403445 SHA256 0fd5aaa4cd11df3c1d34e643edcfff1446f2a18598e65713cde0de3aeee13c51 SHA512 cf02bc9cdd614cde4ce42355d44f4b6c55747abdcdd7f6312273904a50032c98103fa65e6055987f471be269fd148ff7afbd6c2879ae573671419cca9acccc0d WHIRLPOOL 8e6b80230c7c94d6962dbf79529b537001850b56fb67377be7f409214ae6600544d9a182ea534afa32dd9a90e25f6868f57b5ab0d1a50f1ca25d7ee92027061d
 DIST netbeans-trunk-nightly-201512280002-src.zip 209403445 SHA256 0fc2fb9260022cc65b3c71873d6af76003f66255d8680c32ab1e8f05e4f98a59 SHA512 4120c251249e225ace1a97aae9f66caa782dc728e0659336222748af816601a74d0ccaa703fee4deaa9f27ede486df60f39e418c70c4aeb7f88fd409b00e018d WHIRLPOOL 83daeeffbcc97c771f38a7fd8d0407c00543d57468897d78bc6d19ad7fdca22ec47f884d9cfe91a3654db6703659456ed2082825a3fc533858c7b7a7a3e2c261
 DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
@@ -21,7 +20,6 @@ DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818c
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 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_p20151222.ebuild 4971 SHA256 1e9c16de057085b869a9410e10eb70ca2dfff109d6bc5abf7bb11ad9a2fb0dd2 SHA512 d1944550fe05027750cf869d36508339b5cb82849e176bf2dbbee39315b9c60c868f32ed7aef02e2143ba382a4c86ddf3aa143a8fca417ce2598984bb8c21646 WHIRLPOOL f39e6d8318c92f7a17bbec13f9c2a42858c4df6d7df17987df9a53157b117607c53f8a0a72cc42d4d46b86d3b4181fb3f86c58d2cc74f444005944ed8dfdcf71
 EBUILD netbeans-javacard-9999_p20151227.ebuild 4971 SHA256 e8fd11e68ed1f801709c76c1f81f4262af595ef19840107466ce60ce9fd068f5 SHA512 27e79a346c4519a3b0516de05899f0be9284ae83655ec6719baee3f69efa5208fdb0e22314e80291203204ff1e218fdb69f511d00f899d4afa8219b22d179a00 WHIRLPOOL 30201f253b215b8bca4db3e020cce6c1da78ad90e7a8feb87727699c01c4adb42642401de40fd2f360cf078355c5e29a415e83415589f2bfcdc524edb16699c0
 EBUILD netbeans-javacard-9999_p20151228.ebuild 4971 SHA256 3d0be589a984af9162a5d488c95f6b261c6354946f63f014602151c91c167c76 SHA512 a15fedbea85db01f1607e46b1b820ca52dc910a89735c95fdcc1dd3fdad7eb78c5c17dc5b50b0741e1c3a3d9d262bd16090b27ac04c985b0392d375d2c5db26c WHIRLPOOL 53f5c0e76cb9feec9b727192846b9d0c49d19708d56e5b1f8e3eb530a48ac756376d8f0ef2b791131c01888075fa927ca51c7fb5f798b5a928e7943699ae3104
 EBUILD netbeans-javacard-9999_p20151229.ebuild 4971 SHA256 cd7446cd9564c50fb7b34a3c41fdc4a02c745d20b32e77f76804de7f678d9932 SHA512 eb381b9c038d298eb8c1f1ac0a9ca417fc6e03d64e3e9ec71c675b05468a4bcbc15407ad41566e3ec00eec27721659165353cd2ebda9315ab8fa5507cdc1b07a WHIRLPOOL f2176499facbab5125dad58816090dba17cb3ea07b6871b2da905517cce6f26a0d590d6524a2c10d9684ecc60c19e23d1c3b13d8298fe3f58d7f60da48a1064e

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151222.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151222.ebuild
deleted file mode 100644
index 93b59f0..0000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151222.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans JavaCard Cluster"
-HOMEPAGE="http://netbeans.org/projects/javacard"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-12-22_00-02-04/zip/netbeans-trunk-nightly-201512220002-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 2ad28c0..88d6df4 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-201512220002-src.zip 209402924 SHA256 b5e8e38ef4b58ef873c9efd9b808b864d255b2a1adeda86a74d5dd09df36d692 SHA512 a12e5fc9f7c784ee50549e4000924f32e0707fe3e978bfeb7a4078c242a3ee7e4f462271c638611b1d3eafb24dbdb9e40eaf3a638cd729032e8b6d65cf92028c WHIRLPOOL b4dbbd6c23414c53e58634a3be977d3f794b4bbf69341c18aa2e00442da09f38bb6bd7a8cc4998ce51f55b3a04293dcbef2e31d620d96a31a59722007c520b2d
 DIST netbeans-trunk-nightly-201512270002-src.zip 209403445 SHA256 0fd5aaa4cd11df3c1d34e643edcfff1446f2a18598e65713cde0de3aeee13c51 SHA512 cf02bc9cdd614cde4ce42355d44f4b6c55747abdcdd7f6312273904a50032c98103fa65e6055987f471be269fd148ff7afbd6c2879ae573671419cca9acccc0d WHIRLPOOL 8e6b80230c7c94d6962dbf79529b537001850b56fb67377be7f409214ae6600544d9a182ea534afa32dd9a90e25f6868f57b5ab0d1a50f1ca25d7ee92027061d
 DIST netbeans-trunk-nightly-201512280002-src.zip 209403445 SHA256 0fc2fb9260022cc65b3c71873d6af76003f66255d8680c32ab1e8f05e4f98a59 SHA512 4120c251249e225ace1a97aae9f66caa782dc728e0659336222748af816601a74d0ccaa703fee4deaa9f27ede486df60f39e418c70c4aeb7f88fd409b00e018d WHIRLPOOL 83daeeffbcc97c771f38a7fd8d0407c00543d57468897d78bc6d19ad7fdca22ec47f884d9cfe91a3654db6703659456ed2082825a3fc533858c7b7a7a3e2c261
 DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
@@ -19,7 +18,6 @@ DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818c
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 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_p20151222.ebuild 6293 SHA256 276951e5e7625cfaee618c0363b9270cbe8232c7570aee38b4f925e9d2ee64d2 SHA512 795e17cbcbed1821777ba7ee5e4fe202ab9a9ab9f8aaf0e32e9e24947588e30b3d685c117fc075994d64b99dd795e82c56585a9ccbf22973c1a34209948c1b49 WHIRLPOOL a3f1fc9dc6f74aceac32c4c88ce3dd3168d91af90e47ebad11a2c9d507442148e37a8b41a611a0953ca582be5a2cad14af9b95ab20dd5106c14003efae2769e0
 EBUILD netbeans-javadoc-9999_p20151227.ebuild 6293 SHA256 410d802b17d32ad0cda8c7ffab492ee3081755a458592fc984498f4abaf26772 SHA512 73437fdd3e1ddf83f877fbb9308dd6aa0dcd07593c8172b4e6c7db9a3d916c73ad11556a9d01f7158beb1dee952e59e4cf28879fdc4aff799522ba404b8e6383 WHIRLPOOL d3b6baa98db88c84e7e043e4a49d34ffe50bfd6136dbdf1c13e229e54e1b0f005a020dbd78bfae21141b4142e75a4da26850fbfe2c3ba3150ac872291de1a043
 EBUILD netbeans-javadoc-9999_p20151228.ebuild 6293 SHA256 18f43b62a199084ca2c5917feb62198956c4e8f12b28dafc1b6039534b7a09c4 SHA512 9480a62aa3e87b66163a2f9cf2ef7546aaf53e22c69385f014968fb451f17e124e0b724969699db20e4a5cf0fceea5b1f901cbaad844660437634cf67554ad5e WHIRLPOOL 64cb6795896bfe27074a183535772a2e960172303c63521eefa54821c717806d7f5e9803a5c9a08fb3580629f516e31a1035c1036a11d711c4a000e6e94320d0
 EBUILD netbeans-javadoc-9999_p20151229.ebuild 6293 SHA256 572525c079b0c8c8a5f547dbe77f22230b5eae8f46410f3e2c8c5b2d87721a69 SHA512 0b67494c2317aae103b194aecdac9f766063cda39f78007ed4edbd5d961bf8f5dd402b7293802acedfadbd7b926c66d28330e4ad077ecd242d216b2cf8da2526 WHIRLPOOL d4fb602fc6291779eab2259e33498559a2604ad68960c30d863964323e9b44c1533ab10a2c1e3f440fc37bc59819649bb53cd6e4b111987d4ef9f5de12bdcfc8

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20151222.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20151222.ebuild
deleted file mode 100644
index 3ff9e64..0000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20151222.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans JavaDocs"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-12-22_00-02-04/zip/netbeans-trunk-nightly-201512220002-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 ea2488b..6235bda 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-201512220002-src.zip 209402924 SHA256 b5e8e38ef4b58ef873c9efd9b808b864d255b2a1adeda86a74d5dd09df36d692 SHA512 a12e5fc9f7c784ee50549e4000924f32e0707fe3e978bfeb7a4078c242a3ee7e4f462271c638611b1d3eafb24dbdb9e40eaf3a638cd729032e8b6d65cf92028c WHIRLPOOL b4dbbd6c23414c53e58634a3be977d3f794b4bbf69341c18aa2e00442da09f38bb6bd7a8cc4998ce51f55b3a04293dcbef2e31d620d96a31a59722007c520b2d
 DIST netbeans-trunk-nightly-201512270002-src.zip 209403445 SHA256 0fd5aaa4cd11df3c1d34e643edcfff1446f2a18598e65713cde0de3aeee13c51 SHA512 cf02bc9cdd614cde4ce42355d44f4b6c55747abdcdd7f6312273904a50032c98103fa65e6055987f471be269fd148ff7afbd6c2879ae573671419cca9acccc0d WHIRLPOOL 8e6b80230c7c94d6962dbf79529b537001850b56fb67377be7f409214ae6600544d9a182ea534afa32dd9a90e25f6868f57b5ab0d1a50f1ca25d7ee92027061d
 DIST netbeans-trunk-nightly-201512280002-src.zip 209403445 SHA256 0fc2fb9260022cc65b3c71873d6af76003f66255d8680c32ab1e8f05e4f98a59 SHA512 4120c251249e225ace1a97aae9f66caa782dc728e0659336222748af816601a74d0ccaa703fee4deaa9f27ede486df60f39e418c70c4aeb7f88fd409b00e018d WHIRLPOOL 83daeeffbcc97c771f38a7fd8d0407c00543d57468897d78bc6d19ad7fdca22ec47f884d9cfe91a3654db6703659456ed2082825a3fc533858c7b7a7a3e2c261
 DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
@@ -26,7 +25,6 @@ DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818c
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 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_p20151222.ebuild 4717 SHA256 45eb836237b50c0e953834ee2971ea1d36c067e17e761e233f59adc7392f668c SHA512 99bb68374bdf9adcf0c221461b4801e503020d269d7089154224cdab305737fafc3f217862360f421c56159c05fb05eae42e9f50c0f5e19d34dd8788c6e03057 WHIRLPOOL 65f3a6db60c3308c88b99c731df8e2abfb591e1cbadb5efc83f6fdbc38881edd97aa724f37b21fb5633932b54b9c7d36a78e231f1383f4ef6aa1bc8b1a130f7d
 EBUILD netbeans-javafx-9999_p20151227.ebuild 4717 SHA256 a11dfa5caa201e06a43c41b9fc46db4d307cd917a491027e7cdec86da76d52e6 SHA512 75b23ba48f6b55476e81234f3111a94678d54629e948ddb2dd775cc993d3be0c7e556f37b35e5795292aa774954aeaf800d1f2794084aa534c7fb3f064b52e70 WHIRLPOOL 54997139380c1dcebd32fa38474407060c132b5a8aba6e56425c138fc186980fc59f2a5212c4c8845a9f1e47a0b317b7586586167ce1bf4f616ed1274c7dbba9
 EBUILD netbeans-javafx-9999_p20151228.ebuild 4717 SHA256 6b477e0473baf54a9e409ab4f28c0e53394079f597fd5eb087ce62f805feb774 SHA512 69b2ebf1c642612dae0ff244ef6466f06bcca99c9a66943a05b9db0b12299c00cbf223d59133881623185e848e903b4902ca6b6cc706c76f8b13337e1ae5af43 WHIRLPOOL ec347aa03abd4b744e7e2e1c05b3eadf9cd4a7da0c97a785666757236951795f4d6b502d2f8cad9f08179658e0c1ff866b6792192f9256a11d1a39e10992b183
 EBUILD netbeans-javafx-9999_p20151229.ebuild 4717 SHA256 8469b0a41e25ad8cd23f44f47e9c2b6db741625466f8023f235703c5bea2c4ef SHA512 b8c78104924823e265da7775a9d5cf8d10a77cdd735a9c0e86a328fb3916be5bd42160a63350977c10b96e730cb0c50c8c30cd2f477c5768aea56fa21af616cc WHIRLPOOL c1a76a0a40bf1b49908df6f85690413d490d743d150c6f5e993629f17014657bf2f82a982aa33405f6e12f49ebe4e56fda798314a8c518945d6d6713e2718126

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20151222.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20151222.ebuild
deleted file mode 100644
index c8aa4da..0000000
--- a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20151222.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans JavaFX Cluster"
-HOMEPAGE="http://netbeans.org/projects/javafx"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-12-22_00-02-04/zip/netbeans-trunk-nightly-201512220002-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 e442883..fb87f1d 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-201512220002-src.zip 209402924 SHA256 b5e8e38ef4b58ef873c9efd9b808b864d255b2a1adeda86a74d5dd09df36d692 SHA512 a12e5fc9f7c784ee50549e4000924f32e0707fe3e978bfeb7a4078c242a3ee7e4f462271c638611b1d3eafb24dbdb9e40eaf3a638cd729032e8b6d65cf92028c WHIRLPOOL b4dbbd6c23414c53e58634a3be977d3f794b4bbf69341c18aa2e00442da09f38bb6bd7a8cc4998ce51f55b3a04293dcbef2e31d620d96a31a59722007c520b2d
 DIST netbeans-trunk-nightly-201512270002-src.zip 209403445 SHA256 0fd5aaa4cd11df3c1d34e643edcfff1446f2a18598e65713cde0de3aeee13c51 SHA512 cf02bc9cdd614cde4ce42355d44f4b6c55747abdcdd7f6312273904a50032c98103fa65e6055987f471be269fd148ff7afbd6c2879ae573671419cca9acccc0d WHIRLPOOL 8e6b80230c7c94d6962dbf79529b537001850b56fb67377be7f409214ae6600544d9a182ea534afa32dd9a90e25f6868f57b5ab0d1a50f1ca25d7ee92027061d
 DIST netbeans-trunk-nightly-201512280002-src.zip 209403445 SHA256 0fc2fb9260022cc65b3c71873d6af76003f66255d8680c32ab1e8f05e4f98a59 SHA512 4120c251249e225ace1a97aae9f66caa782dc728e0659336222748af816601a74d0ccaa703fee4deaa9f27ede486df60f39e418c70c4aeb7f88fd409b00e018d WHIRLPOOL 83daeeffbcc97c771f38a7fd8d0407c00543d57468897d78bc6d19ad7fdca22ec47f884d9cfe91a3654db6703659456ed2082825a3fc533858c7b7a7a3e2c261
 DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
@@ -18,7 +17,6 @@ DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818c
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 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_p20151222.ebuild 4412 SHA256 b3fc6665de4cfcb069ae48819ffeedb3a1a029ddcfb41e0dc329b51add0a9132 SHA512 29a9ddbef4ee2335b5b4ebd8c3f8cd8e318bf0c5b5d1820c16d79b869985e38ad06eefdef4e87061f4134e8aa1af9b9b54d7605149c111da330cc091af9c1379 WHIRLPOOL fe0908510c408708aa377cc1a5c340e65aa23ccbd9718c42e3093438677b1f853f4531897d3c0516d90909dd723a0531a324a3235b3374abcc6ac50790e3a2ef
 EBUILD netbeans-mobility-9999_p20151227.ebuild 4412 SHA256 1efa30408bc2c80dc4a1e436ef79138216617d70520769ccbe39cb27f9ea331e SHA512 2fafa80c31f5225be41971528b5483ee92155733799c39d604f6a2b72b947563e18ea863b5c22b486cedcc950fbbde0b971cefa6f639774bc4980d01345d1c15 WHIRLPOOL 51db13f48661039c0c678762c6c113fcef7249f9caf1f881bd243b79172df85077b07fba9013bcafa938e3a1583d36e530dbf8218d6bfc088b0942f496f61a7a
 EBUILD netbeans-mobility-9999_p20151228.ebuild 4412 SHA256 53fdd047a751f1a032a036b75b3dc84db3aa3f7231be9e0d36385043b8a49061 SHA512 41a416d31e691810dd01f94fb25b839ce2b6aa043c63a06d022a8e2958b5315a87c5528d84a97abdfc5910c7fefe6af38bf94776b87090901a9ac0c31a0e01f7 WHIRLPOOL 1982e0117676b8a41f25edf9ff9401271a7183cc7048340069d4dfcde8283181c957ffad6b138894276bc79e78cbf8f46dafddd00e17d726ba846fec7e08e55f
 EBUILD netbeans-mobility-9999_p20151229.ebuild 4412 SHA256 8bc4de3868b8f53ccbb7ab4445fdf027712dea92b8e7ed4587bc159e6bb56097 SHA512 056ee42f1ab26d6e1d463caaa52cbf967fabbd19248a49f358d7e445b0b40f57e65a5f982350bbe9c199188f768c4437fd02fb3f5b917069b96e3c783ab93e7f WHIRLPOOL b1bd9b1ba3f62a8e22e66b592108217a763dedb96ab3cd6b2b078d7849ce411e6eb35500bc1b2181859c2c6f646098c7e6b34c59dbb6ff5405b3f74799ecc474

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20151222.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20151222.ebuild
deleted file mode 100644
index aba4cc1..0000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20151222.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Mobility Cluster"
-HOMEPAGE="http://netbeans.org/features/platform/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-12-22_00-02-04/zip/netbeans-trunk-nightly-201512220002-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 13942ed..adf8dad 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-201512220002-src.zip 209402924 SHA256 b5e8e38ef4b58ef873c9efd9b808b864d255b2a1adeda86a74d5dd09df36d692 SHA512 a12e5fc9f7c784ee50549e4000924f32e0707fe3e978bfeb7a4078c242a3ee7e4f462271c638611b1d3eafb24dbdb9e40eaf3a638cd729032e8b6d65cf92028c WHIRLPOOL b4dbbd6c23414c53e58634a3be977d3f794b4bbf69341c18aa2e00442da09f38bb6bd7a8cc4998ce51f55b3a04293dcbef2e31d620d96a31a59722007c520b2d
 DIST netbeans-trunk-nightly-201512270002-src.zip 209403445 SHA256 0fd5aaa4cd11df3c1d34e643edcfff1446f2a18598e65713cde0de3aeee13c51 SHA512 cf02bc9cdd614cde4ce42355d44f4b6c55747abdcdd7f6312273904a50032c98103fa65e6055987f471be269fd148ff7afbd6c2879ae573671419cca9acccc0d WHIRLPOOL 8e6b80230c7c94d6962dbf79529b537001850b56fb67377be7f409214ae6600544d9a182ea534afa32dd9a90e25f6868f57b5ab0d1a50f1ca25d7ee92027061d
 DIST netbeans-trunk-nightly-201512280002-src.zip 209403445 SHA256 0fc2fb9260022cc65b3c71873d6af76003f66255d8680c32ab1e8f05e4f98a59 SHA512 4120c251249e225ace1a97aae9f66caa782dc728e0659336222748af816601a74d0ccaa703fee4deaa9f27ede486df60f39e418c70c4aeb7f88fd409b00e018d WHIRLPOOL 83daeeffbcc97c771f38a7fd8d0407c00543d57468897d78bc6d19ad7fdca22ec47f884d9cfe91a3654db6703659456ed2082825a3fc533858c7b7a7a3e2c261
 DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
@@ -21,7 +20,6 @@ DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818c
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 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_p20151222.ebuild 4111 SHA256 a5ff21240271bc5ab168441485d85cdd53af83de27955cf80d853b56503f233e SHA512 faa39c0a5c5da2840df9427178e77a5ca9bc5923e7f6f3cf41dbb34d367af2d22fc649e516b5740def62474383e4666102f31a0685372e5ddd79be0a21bdc2d7 WHIRLPOOL 2e2ad5afada77714917bf1d54aea6450676151fc233516c2fd1d0d87ad228daa26c3477ed1bf6b3ff09538ac4d88fd0ebfd71c58382e8dfbd281c1c357647176
 EBUILD netbeans-nb-9999_p20151227.ebuild 4111 SHA256 fc3d123e7b9e88fc2c107f230fadedaaedabfcde7db08f2a441d71e7191cda2f SHA512 eb435285a0065337041d860fe49af9f462302d740e4da1519885e80d156f213b4b031508d8167d47289d77cd8bc1e6f7e46357bf91c988c35543ce66017dcebf WHIRLPOOL 3f44b98c0ce3e80ffe54ad602b6c636968f7af42e249e5ece8dfdc0067f6399d93efc9d38d0e92e3ac729b9b2c9ba42f4dcc4b35789bcc539d757f38fe0b92e7
 EBUILD netbeans-nb-9999_p20151228.ebuild 4111 SHA256 ad3f99ebad9825beded6ca7443eb3ba8f68c3fc77f72264199b0e361f69da1da SHA512 f2fc0efbbb113e5a05108e19b0376ed2bbad80ab7a232fe86f5c7dbc3087f0e5c2bb91c9360276cb3517bcf0f3cdff93fce252b86fcd8e2659cca3ea4ff6494e WHIRLPOOL e6d0b4fdc4fbe368ef5f72fdbe4e91d37c468ec1b8579f93fc6ef711e835c41c5e759abd02e8d218dbfb9e6b2f9e37cfd1009c1f8efa6444b1106e4d8561a061
 EBUILD netbeans-nb-9999_p20151229.ebuild 4111 SHA256 307405ecf0b1996504856035f6d74cb8b4ccac7f433e343ebad0815b87c9901b SHA512 6a4e483e4007790a22bff6f31dfd4d11aed0f899b25c6527e197dd71d779ee2a9e7743d5deb41c9c35d8c11b0b495c086107f5ac5c9091edaf7bd9fdf1cef0dc WHIRLPOOL bb287d8a383384df7e65c8c4bee205598540a0711d725d0e71fa04da7b4afcff728c3f585c7f5c5416a9030e64117b0b76a46beb3ddfeea4a44ea4d2dfb23ac6

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20151222.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20151222.ebuild
deleted file mode 100644
index 9a42d7d..0000000
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20151222.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans IDE Branding"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-12-22_00-02-04/zip/netbeans-trunk-nightly-201512220002-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 bf0d4c0..fb445b0 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-201512220002-src.zip 209402924 SHA256 b5e8e38ef4b58ef873c9efd9b808b864d255b2a1adeda86a74d5dd09df36d692 SHA512 a12e5fc9f7c784ee50549e4000924f32e0707fe3e978bfeb7a4078c242a3ee7e4f462271c638611b1d3eafb24dbdb9e40eaf3a638cd729032e8b6d65cf92028c WHIRLPOOL b4dbbd6c23414c53e58634a3be977d3f794b4bbf69341c18aa2e00442da09f38bb6bd7a8cc4998ce51f55b3a04293dcbef2e31d620d96a31a59722007c520b2d
 DIST netbeans-trunk-nightly-201512270002-src.zip 209403445 SHA256 0fd5aaa4cd11df3c1d34e643edcfff1446f2a18598e65713cde0de3aeee13c51 SHA512 cf02bc9cdd614cde4ce42355d44f4b6c55747abdcdd7f6312273904a50032c98103fa65e6055987f471be269fd148ff7afbd6c2879ae573671419cca9acccc0d WHIRLPOOL 8e6b80230c7c94d6962dbf79529b537001850b56fb67377be7f409214ae6600544d9a182ea534afa32dd9a90e25f6868f57b5ab0d1a50f1ca25d7ee92027061d
 DIST netbeans-trunk-nightly-201512280002-src.zip 209403445 SHA256 0fc2fb9260022cc65b3c71873d6af76003f66255d8680c32ab1e8f05e4f98a59 SHA512 4120c251249e225ace1a97aae9f66caa782dc728e0659336222748af816601a74d0ccaa703fee4deaa9f27ede486df60f39e418c70c4aeb7f88fd409b00e018d WHIRLPOOL 83daeeffbcc97c771f38a7fd8d0407c00543d57468897d78bc6d19ad7fdca22ec47f884d9cfe91a3654db6703659456ed2082825a3fc533858c7b7a7a3e2c261
 DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
@@ -22,7 +21,6 @@ DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818c
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 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_p20151222.ebuild 4418 SHA256 e64220b4d5f6c29bce62d39c0bd5d273cb6a30da4084a1de7eda9871e061e98a SHA512 0a05bf9daf32a6218e4bd781568db5e9d1cadaf67f8a092415ebc46a98e771400ddd2933dd6607b3447b7d9a47d4d0a53b4f5f3147ab6a90e7bdb8dbf201c740 WHIRLPOOL 6cdc03d84de1d81f2cbdf00baef86a5ccc6a8019e11b5797434362c746ff897f9babb83ed9f19489a508711714d4689091b3f89cc5c60f59228db5690c22282d
 EBUILD netbeans-php-9999_p20151227.ebuild 4418 SHA256 36c60d7b180b7b266619f2019d52a61c73cb496bb4181e4440dadb71a87a9780 SHA512 a95ac69f8b54c14f2c7b123cf9f0b2b8b4b96acaa85e85c2b9e735b23b0eb1078a19d805327d73905805e31c252af8f4236bd90cde1c7e14effbac8f2de1899d WHIRLPOOL c0c9c382e8290999b56080d2de5ce055482e89c2d7cdcae3e4fbe8ead6ddc1c0e97cd0a552dfbed11ac46ba92392728c12307d8eb610e8d8ec10442142969df2
 EBUILD netbeans-php-9999_p20151228.ebuild 4418 SHA256 87f4af0d87441be4dc327166cda7c8bf0af1a139ea3edb3abf50fbf4fe4d74d0 SHA512 e488918fbfd5a193c82c50f57f136f57155700300a27a64f0ddda88255bdb1570a648b57b48d49515c459076bef3d789ce49ab523f452a726c60902ec2100419 WHIRLPOOL a0005b0772bded8ae390825bac5ebb6df5d52c591961cb9c8f3e089da72001e665050523028e4cd65eb65a326de605b0069c4c185073341a6cbb8e2bd55709a5
 EBUILD netbeans-php-9999_p20151229.ebuild 4418 SHA256 b0288009fdc8ee4de26b7312434ece060f10567bde810d647baf43550d540d4f SHA512 72f3467694ddd7dc867c4c447404c5353c6b1168e52ac3b5216a16f5adf3789e364b7fbd5b4708e9e8d2e93ac2eaef1ffeb307bd58b5eeb669446bef7d5ff059 WHIRLPOOL e304add104734712933de3fcbaf494fcf358e28e467b0fa7f18883ed2fcea717d1ee36dba3a5c6ea7b0b90952a6419889ff6d0ba9c366a983fe50c3afd5f901c

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20151222.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20151222.ebuild
deleted file mode 100644
index 1ead831..0000000
--- a/dev-java/netbeans-php/netbeans-php-9999_p20151222.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans PHP Cluster"
-HOMEPAGE="http://netbeans.org/projects/php"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-12-22_00-02-04/zip/netbeans-trunk-nightly-201512220002-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 62283bb..918851f 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-201512220002-src.zip 209402924 SHA256 b5e8e38ef4b58ef873c9efd9b808b864d255b2a1adeda86a74d5dd09df36d692 SHA512 a12e5fc9f7c784ee50549e4000924f32e0707fe3e978bfeb7a4078c242a3ee7e4f462271c638611b1d3eafb24dbdb9e40eaf3a638cd729032e8b6d65cf92028c WHIRLPOOL b4dbbd6c23414c53e58634a3be977d3f794b4bbf69341c18aa2e00442da09f38bb6bd7a8cc4998ce51f55b3a04293dcbef2e31d620d96a31a59722007c520b2d
 DIST netbeans-trunk-nightly-201512270002-src.zip 209403445 SHA256 0fd5aaa4cd11df3c1d34e643edcfff1446f2a18598e65713cde0de3aeee13c51 SHA512 cf02bc9cdd614cde4ce42355d44f4b6c55747abdcdd7f6312273904a50032c98103fa65e6055987f471be269fd148ff7afbd6c2879ae573671419cca9acccc0d WHIRLPOOL 8e6b80230c7c94d6962dbf79529b537001850b56fb67377be7f409214ae6600544d9a182ea534afa32dd9a90e25f6868f57b5ab0d1a50f1ca25d7ee92027061d
 DIST netbeans-trunk-nightly-201512280002-src.zip 209403445 SHA256 0fc2fb9260022cc65b3c71873d6af76003f66255d8680c32ab1e8f05e4f98a59 SHA512 4120c251249e225ace1a97aae9f66caa782dc728e0659336222748af816601a74d0ccaa703fee4deaa9f27ede486df60f39e418c70c4aeb7f88fd409b00e018d WHIRLPOOL 83daeeffbcc97c771f38a7fd8d0407c00543d57468897d78bc6d19ad7fdca22ec47f884d9cfe91a3654db6703659456ed2082825a3fc533858c7b7a7a3e2c261
 DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
@@ -35,7 +34,6 @@ DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818c
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 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_p20151222.ebuild 9360 SHA256 d9c1748758d00463dee6497a5b61f71d350a2b70940817961c1a84878be10967 SHA512 7394f850b6f463158bb684c53f248a9bfe10fb0272635d51334a5397254dfd12c553ee9840bde6fefca91b4758712c89a127e7b5895c3b96956276791d4481a9 WHIRLPOOL bcebe5f027b86af7be69b3ed4718fc251cd69153fd63f98b0dd2c654d9fc04e7827cce5c0e8a7adac55371f5fa71afde30db323f8bdad9950f85cee59030cc5c
 EBUILD netbeans-platform-9999_p20151227.ebuild 9360 SHA256 176a494fc85646e58b413b9e05a826550b327fba6654ab6d544ef2d76eca9bf7 SHA512 559c49ff94f0a2eac1e8d061761fae76cee55e46426d266a6b169eac6f794789e2a7a982d5fb3ddd89b48f63fe1bba0852f1f7e71f2f3fafee0154c3aa60e423 WHIRLPOOL 8b9437c420b0bb8237c593490034938c5d70b43b3834d2db9f3387f1661ea1fe1bb4a254766125028fabf7b11b1ce8e70ba47d0df702b17f5f7110f9d7ab8a7f
 EBUILD netbeans-platform-9999_p20151228.ebuild 9360 SHA256 a41e76d7d4c208d09f0469df16f717f3404c53ee519745cac4b105475476651b SHA512 836d694013d9078665f5808ce8d70f249048b55ae93437b91a6b5f1320b333113256556909475c20806f586ef022733d0447258388e78cfd771dd1ef6a6e70f5 WHIRLPOOL 8600031af9df56d4f53556a66a53cb7d6ab0a7200906cd374e5b77ccc4909aee521e4236112a5e3c9c3cea144f8e48233d7aaabaa296ed772ee74a1528b26257
 EBUILD netbeans-platform-9999_p20151229.ebuild 9360 SHA256 6abd4f200c6d3edcc5c66df3ed68a6725565ff7aacfad514e45ac13b156f50ac SHA512 5f76c40f20e8fb8828e190548db2bdcf977f642dbef6bca11f7b12c5624e33f7cf8dced1db751613ed6c3dc5e93279a0eebd519b62f7c0230a4abb36537d88d1 WHIRLPOOL 2d2888db6bfb144051d7e943b154b783f8a5039886ce1861e8b7f3982420c940a32fb7731b5edf30a177e6214ae9fd134f39a633d90821e824186b09c809547b

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20151222.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20151222.ebuild
deleted file mode 100644
index 0b99ab9..0000000
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20151222.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Platform"
-HOMEPAGE="http://netbeans.org/features/platform/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-12-22_00-02-04/zip/netbeans-trunk-nightly-201512220002-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 98570c2..285482f 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-201512220002-src.zip 209402924 SHA256 b5e8e38ef4b58ef873c9efd9b808b864d255b2a1adeda86a74d5dd09df36d692 SHA512 a12e5fc9f7c784ee50549e4000924f32e0707fe3e978bfeb7a4078c242a3ee7e4f462271c638611b1d3eafb24dbdb9e40eaf3a638cd729032e8b6d65cf92028c WHIRLPOOL b4dbbd6c23414c53e58634a3be977d3f794b4bbf69341c18aa2e00442da09f38bb6bd7a8cc4998ce51f55b3a04293dcbef2e31d620d96a31a59722007c520b2d
 DIST netbeans-trunk-nightly-201512270002-src.zip 209403445 SHA256 0fd5aaa4cd11df3c1d34e643edcfff1446f2a18598e65713cde0de3aeee13c51 SHA512 cf02bc9cdd614cde4ce42355d44f4b6c55747abdcdd7f6312273904a50032c98103fa65e6055987f471be269fd148ff7afbd6c2879ae573671419cca9acccc0d WHIRLPOOL 8e6b80230c7c94d6962dbf79529b537001850b56fb67377be7f409214ae6600544d9a182ea534afa32dd9a90e25f6868f57b5ab0d1a50f1ca25d7ee92027061d
 DIST netbeans-trunk-nightly-201512280002-src.zip 209403445 SHA256 0fc2fb9260022cc65b3c71873d6af76003f66255d8680c32ab1e8f05e4f98a59 SHA512 4120c251249e225ace1a97aae9f66caa782dc728e0659336222748af816601a74d0ccaa703fee4deaa9f27ede486df60f39e418c70c4aeb7f88fd409b00e018d WHIRLPOOL 83daeeffbcc97c771f38a7fd8d0407c00543d57468897d78bc6d19ad7fdca22ec47f884d9cfe91a3654db6703659456ed2082825a3fc533858c7b7a7a3e2c261
 DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
@@ -18,7 +17,6 @@ DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818c
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 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_p20151222.ebuild 3472 SHA256 dd7acf77f4b5bbd66a99841dd26fc03e5a1b36762207a6d3c7ad91aa8eba3605 SHA512 b36a549d1014d568d996bc4952db906c02a543bfb8c704598a68858e30dc4ceb486d22719e4b83b5b13a73d11752b958e70270470a21c0d029adcee8553e33ae WHIRLPOOL 970c4183e22e8370a741687c7ccf9d288267e81d37b9aa64780a5a074218e545029972a461d08b4e798660b81bc67db8a1019ca2818dfbbf43371cc91b987734
 EBUILD netbeans-profiler-9999_p20151227.ebuild 3472 SHA256 1fed370f526e8a9f72cf619864c585ee74f3bf47167d9334938b18c3a018258a SHA512 608ee819f01e1a43d0b29d7de48bdf05c7766863270a9897e9d660662d7b46defecc7ade47477085772936354baf60453bdccc878dcb9ff90cb7bb4513b13561 WHIRLPOOL 451218c78630ecc4b8ec55a37b1ba8d5d16a9d2f76db5187b30135b061eca7dfa31aec078e237ed4e6633d6024cd0185ed5bc8c1909ad8b418a7dcf33f683b0f
 EBUILD netbeans-profiler-9999_p20151228.ebuild 3472 SHA256 2665a9255a705422b339c9473e51299fcee5a356937508d7290af6a54d3f8c6b SHA512 e1683e4043a191e55f09277819b2420a722a045903c2c073cdf30582fb212b3e120a763fa3c07772b0a99e7fdf6329f213d430dba7dd2ed753172e06e7e8d792 WHIRLPOOL 953c5ca66f96043137a16e2da24f12bb6ac921c356bce3a81477ec1c1cc59e729b10991d5d4a6b2908897a476f0096c7eeaba296a8449e2d45f3b92145e0dc22
 EBUILD netbeans-profiler-9999_p20151229.ebuild 3472 SHA256 ebca38f2b4c1822b284a0a1d7592afb0a6f632f4e04fb7170aaa77c1beaf4635 SHA512 8e78b04568a2a635149ddc79fdc914f6bb4edff42556d126b356f90abfd1decc5c16e081b71b2524194756a5147f908f4a56ad6c914b3cd861af7396bc6e2bba WHIRLPOOL 59004107286634479d2ebffaa83e86edbc5c2d1b8c0f301f1609fa87eacc259fa3f76c4206e944fb4ae80c431d214c375dc165dc090143bdfb0c69d9b6ea9fc0

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20151222.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20151222.ebuild
deleted file mode 100644
index ada6746..0000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20151222.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Profiler Cluster"
-HOMEPAGE="http://netbeans.org/projects/profiler"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-12-22_00-02-04/zip/netbeans-trunk-nightly-201512220002-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 8b2cce8..9b88361 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-201512220002-src.zip 209402924 SHA256 b5e8e38ef4b58ef873c9efd9b808b864d255b2a1adeda86a74d5dd09df36d692 SHA512 a12e5fc9f7c784ee50549e4000924f32e0707fe3e978bfeb7a4078c242a3ee7e4f462271c638611b1d3eafb24dbdb9e40eaf3a638cd729032e8b6d65cf92028c WHIRLPOOL b4dbbd6c23414c53e58634a3be977d3f794b4bbf69341c18aa2e00442da09f38bb6bd7a8cc4998ce51f55b3a04293dcbef2e31d620d96a31a59722007c520b2d
 DIST netbeans-trunk-nightly-201512270002-src.zip 209403445 SHA256 0fd5aaa4cd11df3c1d34e643edcfff1446f2a18598e65713cde0de3aeee13c51 SHA512 cf02bc9cdd614cde4ce42355d44f4b6c55747abdcdd7f6312273904a50032c98103fa65e6055987f471be269fd148ff7afbd6c2879ae573671419cca9acccc0d WHIRLPOOL 8e6b80230c7c94d6962dbf79529b537001850b56fb67377be7f409214ae6600544d9a182ea534afa32dd9a90e25f6868f57b5ab0d1a50f1ca25d7ee92027061d
 DIST netbeans-trunk-nightly-201512280002-src.zip 209403445 SHA256 0fc2fb9260022cc65b3c71873d6af76003f66255d8680c32ab1e8f05e4f98a59 SHA512 4120c251249e225ace1a97aae9f66caa782dc728e0659336222748af816601a74d0ccaa703fee4deaa9f27ede486df60f39e418c70c4aeb7f88fd409b00e018d WHIRLPOOL 83daeeffbcc97c771f38a7fd8d0407c00543d57468897d78bc6d19ad7fdca22ec47f884d9cfe91a3654db6703659456ed2082825a3fc533858c7b7a7a3e2c261
 DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
@@ -33,7 +32,6 @@ DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818c
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 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_p20151222.ebuild 5280 SHA256 c51bad534ba0f7fba1622a86172ee20233f0ba7d592ea31a2ecc0fe2b1c11716 SHA512 22b47c3c8937c364dc5768d2765c67940e14311754be10ec3e1069ba9859fd21248c671e1c7c965aee413eedbdde50ae52b7b444619da8a0aad6c81ab86a3bb2 WHIRLPOOL a9a8bef565a5ad80f0953abdad35ddbd8d1896f4f280c00184eb919254649ede7a3292884533bf7433b9fc97410a26bae8b7976521d93a6459e4a106bf8eaa68
 EBUILD netbeans-webcommon-9999_p20151227.ebuild 5280 SHA256 ad7b0e5911b24bff85bb9ef9f96ca3b38969bed8daf8494d4ab54952668457f2 SHA512 95bf419ad99408b00687733c230e0c80c367be68a646304f204b0653e33e02d1a960cf4b74d4100dd7b675c69d18fbe4ef0a449c6e4b42f200d4b4476dafa357 WHIRLPOOL e35f5bcd5f200799a2b18e546b354fc88f0bbc6ee9c6830511d30e6f88899ccc804c450621d77b0fd455a28093ee5311d4c54998f6f06b98ad845e365fbbc98f
 EBUILD netbeans-webcommon-9999_p20151228.ebuild 5280 SHA256 bb296bc66955847fc9964feb9469ff5d842072f467fa2307f81e9c6bd245d80e SHA512 950be6aab25139dcdf04958ab446791ae55684560a731bb0fa75d2f6c91af8e04fa693223ab92dd5b8eb2895d62201929df906157422ada21c920db7c759d6e0 WHIRLPOOL 9430d0cc16d0b8102fc8d1def2af567a27a6c4f1521dbaaa6b8d0bceca378515a1ab0bc27fe8fbacc6b1f5c429f3b2f806b5a67fd015bcd9409a3a7e422ce421
 EBUILD netbeans-webcommon-9999_p20151229.ebuild 5280 SHA256 10543ccc3733dad581b7fe62c979919cf8804770fcdd0e5b417a1a1bbf8de039 SHA512 6ae9b2f9835f3e8ee3db3416c45928ad559ce5929ced94b007244326ea1a88453a87c01fc1443aa14cc59b8b9ef3d66433cd6d5973cabb03ff2c3eec95f2063a WHIRLPOOL 268e5da422f0414d26f145b50b4ab71fd11bb6ebe2ff7c9a51bb0b9af311aba55e35dc9129d00425237f1548cf17e1b8a3d21ec133865864e0d1484f96da8eec

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20151222.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20151222.ebuild
deleted file mode 100644
index 650c958..0000000
--- a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20151222.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Web Services Cluster"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-12-22_00-02-04/zip/netbeans-trunk-nightly-201512220002-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/9D29F2A9722C91A403F32971E97DD0E49E97B02E-libiDeviceNativeBinding.dylib
-	http://hg.netbeans.org/binaries/9F0D0D95F57E73C0110FA023813A4F9756D543B1-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/D05B7274396C8EED185207399B6D0400DE347DB7-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}"/9D29F2A9722C91A403F32971E97DD0E49E97B02E-libiDeviceNativeBinding.dylib cordova.platforms.ios/external/libiDeviceNativeBinding.dylib || die
-	ln -s "${DISTDIR}"/9F0D0D95F57E73C0110FA023813A4F9756D543B1-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}"/D05B7274396C8EED185207399B6D0400DE347DB7-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 c0f93c6..330d3f4 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-201512220002-src.zip 209402924 SHA256 b5e8e38ef4b58ef873c9efd9b808b864d255b2a1adeda86a74d5dd09df36d692 SHA512 a12e5fc9f7c784ee50549e4000924f32e0707fe3e978bfeb7a4078c242a3ee7e4f462271c638611b1d3eafb24dbdb9e40eaf3a638cd729032e8b6d65cf92028c WHIRLPOOL b4dbbd6c23414c53e58634a3be977d3f794b4bbf69341c18aa2e00442da09f38bb6bd7a8cc4998ce51f55b3a04293dcbef2e31d620d96a31a59722007c520b2d
 DIST netbeans-trunk-nightly-201512270002-src.zip 209403445 SHA256 0fd5aaa4cd11df3c1d34e643edcfff1446f2a18598e65713cde0de3aeee13c51 SHA512 cf02bc9cdd614cde4ce42355d44f4b6c55747abdcdd7f6312273904a50032c98103fa65e6055987f471be269fd148ff7afbd6c2879ae573671419cca9acccc0d WHIRLPOOL 8e6b80230c7c94d6962dbf79529b537001850b56fb67377be7f409214ae6600544d9a182ea534afa32dd9a90e25f6868f57b5ab0d1a50f1ca25d7ee92027061d
 DIST netbeans-trunk-nightly-201512280002-src.zip 209403445 SHA256 0fc2fb9260022cc65b3c71873d6af76003f66255d8680c32ab1e8f05e4f98a59 SHA512 4120c251249e225ace1a97aae9f66caa782dc728e0659336222748af816601a74d0ccaa703fee4deaa9f27ede486df60f39e418c70c4aeb7f88fd409b00e018d WHIRLPOOL 83daeeffbcc97c771f38a7fd8d0407c00543d57468897d78bc6d19ad7fdca22ec47f884d9cfe91a3654db6703659456ed2082825a3fc533858c7b7a7a3e2c261
 DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
@@ -18,7 +17,6 @@ DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818c
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 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_p20151222.ebuild 2721 SHA256 55d57c805461ee5e44a8cd8ecaa5da6fbcc8683d51ba701557da14c1767354c5 SHA512 647d90c46f2eafaf89eeaf449e007f3d27b6fac820b994fe06cf269301c583bc8ea4dc64ed9c06aef7eb877fcc88538c04c5930b06085abc7214e4eb05b012e7 WHIRLPOOL bcc79b2157238183f5263c45846abfcae9680618fc8e6b1ffca95c024dece31c7f917af032394299b9dfbde851314e60230ebd2242079f17fa5bc35fb92921ee
 EBUILD netbeans-websvccommon-9999_p20151227.ebuild 2721 SHA256 8dbde4d7e95fa7e02a140db3b3d27a68456e6dd660b5da0efc072551f9262eec SHA512 5af48fa2d97cbbda79e1be891ea704c89abed3dfd66572c921174f561f4a534e9e46d48aeb84cc74b92d2ec2d021b86d7e116e9823c95aaf3fc16273d2bf99cd WHIRLPOOL 43cc9db56e92136bf59a3acaf90e16d87fb986347453761712377fc05968a86e38f0493749cd291d7026f062638ebe8f96b0c0edfb8bd6d635bdfe4384e2f6ce
 EBUILD netbeans-websvccommon-9999_p20151228.ebuild 2721 SHA256 e59ba17e3566feb5c32f8c82e729d2cae5d256bf0759a20880dfe2af471be243 SHA512 7180db53ad07d5321897877cafd3739ab261cd9cf29b4c7e7da9f91e60d310e00fa694d4628b3c3b55c817bb0053b519c01b12b5e2fc6f6290d540da51be3a2f WHIRLPOOL aba6846a4e01bd0221553862df0868a536ee36f7106cc71edb6cfdd10004e9ff096a599f04b99a0bc5d6d458d97945be69db2225dbcbd773ef66cc1cf4e2a527
 EBUILD netbeans-websvccommon-9999_p20151229.ebuild 2721 SHA256 f1b6448004d210974d8ae5410d2302bf456ed4316a7b4077d71712eaca7af507 SHA512 8f8dadc568c9c91c8a5c2578b77e207938648ffe298752798067de5ef9f9ccdf3bb977bb4833a02dcfa27e2960359a4c233aaf2611aefac19f04c973f52fdf98 WHIRLPOOL c4531e92ace3df09845281bf102d92e44c01ec4b04a8861dfcfe5323835c95b91368f003481d16834d36c95f78f297f51e31d83bc2df6bf77af8331687614fd8

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151222.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151222.ebuild
deleted file mode 100644
index b4fe114..0000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151222.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Web Services Common Cluster"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-12-22_00-02-04/zip/netbeans-trunk-nightly-201512220002-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 c31a3da..f51cc18 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-201512220002-src.zip 209402924 SHA256 b5e8e38ef4b58ef873c9efd9b808b864d255b2a1adeda86a74d5dd09df36d692 SHA512 a12e5fc9f7c784ee50549e4000924f32e0707fe3e978bfeb7a4078c242a3ee7e4f462271c638611b1d3eafb24dbdb9e40eaf3a638cd729032e8b6d65cf92028c WHIRLPOOL b4dbbd6c23414c53e58634a3be977d3f794b4bbf69341c18aa2e00442da09f38bb6bd7a8cc4998ce51f55b3a04293dcbef2e31d620d96a31a59722007c520b2d
 DIST netbeans-trunk-nightly-201512270002-src.zip 209403445 SHA256 0fd5aaa4cd11df3c1d34e643edcfff1446f2a18598e65713cde0de3aeee13c51 SHA512 cf02bc9cdd614cde4ce42355d44f4b6c55747abdcdd7f6312273904a50032c98103fa65e6055987f471be269fd148ff7afbd6c2879ae573671419cca9acccc0d WHIRLPOOL 8e6b80230c7c94d6962dbf79529b537001850b56fb67377be7f409214ae6600544d9a182ea534afa32dd9a90e25f6868f57b5ab0d1a50f1ca25d7ee92027061d
 DIST netbeans-trunk-nightly-201512280002-src.zip 209403445 SHA256 0fc2fb9260022cc65b3c71873d6af76003f66255d8680c32ab1e8f05e4f98a59 SHA512 4120c251249e225ace1a97aae9f66caa782dc728e0659336222748af816601a74d0ccaa703fee4deaa9f27ede486df60f39e418c70c4aeb7f88fd409b00e018d WHIRLPOOL 83daeeffbcc97c771f38a7fd8d0407c00543d57468897d78bc6d19ad7fdca22ec47f884d9cfe91a3654db6703659456ed2082825a3fc533858c7b7a7a3e2c261
 DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
@@ -21,7 +20,6 @@ DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818c
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 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_p20151222.ebuild 6938 SHA256 80505df2c58d6ae10f83a19b41fcdd040ef420eb0129ab483ba83a9b4b19da46 SHA512 c704e0e0c631f335eceb4438e2565dac8a2ce704330f4dcee36d4704b5b9d9663d5cc957947731bb4c38afea51519ea359b8df4e351cab62245e20769ff7aac4 WHIRLPOOL 225cbc25c0f760935b318539a1df0921461089955d5bb27fa6848c7b28dbe410db7145de775adcb124ccd8d9ec65aeb1bbbd77181ab83f1a90d81611fd13c058
 EBUILD netbeans-9999_p20151227.ebuild 6938 SHA256 cb3df7e642b1002a72c8c3c2ce804c598b225e833dfa74077c15ded20d2b3771 SHA512 d7595ac56b9f6a87d06aab09589393ef3d1d6ff7103792c679e81516f98d13b6e073b695bb4ffc1f88c00e9293824012d37ec215c63965f685a395254c58d1fa WHIRLPOOL f239fe06c7c7254a23cb3d909dd67c6d50b28448aafd6e1a9eabf5e0dd1ab839e1567e1d29b9c986d01e04c9a4bd07a76e0e12a28e1a270d4ee15fb2e9c6e8f3
 EBUILD netbeans-9999_p20151228.ebuild 6938 SHA256 95f484fbe564ddef8f3589b16af6c0e68edf966df53619c46c38cf13a5158343 SHA512 055adb7dd70686471be8cb170aee6c8454bca6be602c2014ad9a45fce58d666df58cb9bbb691fc07360160a0b9aac369f53e57d1abc5bea35bc9c80c499789e6 WHIRLPOOL 82366f9c9d923422597fcece064a6eb68258d527c09de55a103f578c897c5c999b4b3cb8fa879d41b47e123326089fa49d9f4ed3bf278826296fbfb91b86fa60
 EBUILD netbeans-9999_p20151229.ebuild 6938 SHA256 48434dc7c4f72cc32f2789541b85cb842a0024a58a3db7b01c011b551956c487 SHA512 48cee46971986b6bd7afeb22728ac5b750a95bd9d22063c3d87763aa562e3663e4a72bb9af568f5270036221481ed1a0e9660cddab6fa434aae2c8e7e8e8dca6 WHIRLPOOL c4da5b86f86667626f0bd37bb385c5c364f372fff3e408b68eb31b641179e2ccff35765ff5969a27602651acac51e97c9347e6d22f98afab548d3ed58a148175

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


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

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-javacard/, dev-java/netbeans-websvccommon/, ...
@ 2016-02-14  9:27 Miroslav Šulc
  0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2016-02-14  9:27 UTC (permalink / raw
  To: gentoo-commits

commit:     090e6ea358c209c280a2ae064281af53d6459322
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 14 09:27:08 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 09:27:08 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=090e6ea3

netbeans: bumped to the latest nightly sources

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 1a60b37..d75c723 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201602100002-src.zip 209617536 SHA256 e3ded1537a0041
 DIST netbeans-trunk-nightly-201602110002-src.zip 209640470 SHA256 631a7eaf189159858a9a68610b569d050a1b415091068b05a4b99f2f6341ccc2 SHA512 abbf79593aeadec3c678ef27e90e9e3cca6349640a486338d76a97eb12557aaec426646942fba4e97fe5e62fd84f390a813f978df1c5a107f5f60b297acefd71 WHIRLPOOL 2543bc7214823b6e061c29beaf895f1c34a1a51f80276e1022d0a7824ecb725ba1669333f7823954ddc689f07f48944f503c4d74b89c0eaf004e713bfafa068b
 DIST netbeans-trunk-nightly-201602120002-src.zip 209659016 SHA256 d64bb61be92947939476ff606719578b8aa4d6eedfe10b01e123acd9a0978f61 SHA512 111a1562cb8652fa40896c1bfe3f5a83b38786b2b58191af86cc975414f8d76e7657ffabc600de97930090621591199429ec5e7b3c2d69fbe2542cc172042eaf WHIRLPOOL dcdd5411d3f8badf6805fb3bb0ed631083b678600b565c3216ab9ca3e76a36f4e7f39da48214fecefa8a79fbc775bcb88fff3040e503ad0e72379acc572287e5
 DIST netbeans-trunk-nightly-201602130002-src.zip 209667550 SHA256 0709efad4e00ff13999707c19665af39f1100fa4cb91c49d12fc1cce461395e4 SHA512 c52ca30fcebd5fb2d5fad3432189100f3a95a0b13ac1ecb4b7e711bb6ab49a26c9f7e374757a17369a5d8c4785ec7e5f125078dc2b88ee137fcd0e2d15838710 WHIRLPOOL 4db8529afaa742f708c090da04f8f8cdc6b4c190a9993501ac45cdea5574e7b1909e0ae8a9958205faefa7d08b63f259c5addc8285ee714b1e196fdbdef33190
+DIST netbeans-trunk-nightly-201602140002-src.zip 209669684 SHA256 be43475a61235e79ef5fdb6348c4c0b91a0220f4604e0c5e60983207b89beaa4 SHA512 40df5c2eb08965291ce043d6d6109a3db7033d66195cfef110e5737275070c9c5c1f7e275fdba53583448acc5d094feb51aa266a4b8b869291e539d7cdd66a26 WHIRLPOOL 0087d75b832537662e7ce2d59cdb291c6c2824856abd2233264e206d0afbff2299a3ec77b9cbd3d6238abc45efcab3849518ef2a1a392323bfd3300f196c98c6
 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_p20160112.ebuild 3384 SHA256 ca269d43ce67c9a10cd44107f555221bf4eea08377e542cd4d3788baeb3a6f55 SHA512 55a2b42504adb548bc2815c8cd59cce979c8ff6ab2a4ef6901d0fcfe866cd0fe67722a1774aefe255cb0791921b9793c7923e78d14e0b312591e39c69dd3df87 WHIRLPOOL dd9b89c26eeb8083294f199d5b75506c7859724f723b3ad437725bbad3c334787e96d648797fa6eb334b0cb726595bf0d535353edaf70b4f194cb4c7e07d928b
@@ -47,4 +48,5 @@ EBUILD netbeans-apisupport-9999_p20160210.ebuild 3384 SHA256 8bb6080839933c7fb68
 EBUILD netbeans-apisupport-9999_p20160211.ebuild 3384 SHA256 0a2a5bcf422aaca87064efc829670a99fe30eeb010b2e3c6f5d443fd1a85833f SHA512 06c83a3a170616ce3674519d435322365b8094873ce00c5b8d61932e35dc9a55cc319152ed811f0b9943605fe9e651920b1cb2f863a5090f446996da1691d5db WHIRLPOOL aae318a0394e7913e25e26b0f55ba2be91244d25720498b2d19bda80088cde91f82fadbe99c0f6bd2df5b2101d69f4cb06ca2b0eaab4701c43fcf4bc590b1f25
 EBUILD netbeans-apisupport-9999_p20160212.ebuild 3384 SHA256 63d0492019703293db977da05f799a026cd260108502dfcc938cf2c43650faf4 SHA512 624811ed1e58f98579a81b6f474c2c2a19a8acd4debbb8716824d151b7729e94ad09b5866ded95e1042e692edb04086025b7425f3ee16ff0f1c1738f2fdc2cae WHIRLPOOL 9eb4d697b10e04c872607bc220d2db9423cd03089820d797043411c3a69cc9d006522f7decd4a2c895d7403dd519c4609a480b7ccad8e100870cf7d3b03ec735
 EBUILD netbeans-apisupport-9999_p20160213.ebuild 3384 SHA256 8e3f6fcb36be6fb904dce462b9499d562f74fc869966687542889251caa34b23 SHA512 22a740acd7f4648bfaf7ef435ead3344a667d84a46527eaa0c21f5cac989a85e9c75069e873fbdc6405f783be9fec4f2442b864812c12b6ff773e823c4889a29 WHIRLPOOL b3b66f42d50aa6cb51825abb3d1096ba002edfda9487cd94426016d61b5ab62ab669f95b70e463c3d2b3a4da08172c7085f36ae47815c7ab732c89657a1849a8
+EBUILD netbeans-apisupport-9999_p20160214.ebuild 3384 SHA256 10254d21964c50d3d8f5200b72c97e692fd3dd0bb4aacf045bc9d147cc856099 SHA512 e03a596addbdc85ec1122f0c21289b234d9d4b16902a82841a1d8b458e6fec1426db553d4f13c4610738a0beb151e8da7873d54da95cbb4654b4bfacea41cb44 WHIRLPOOL 790daf2c74e8852fde1cd59d6501a0dfce400268f7bd7f8d645d9a4b414a80d80af3b9dd7f1af49806b4b718db3b817b54a6f16342fc8dc56cba759a96f8838f
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160214.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160214.ebuild
new file mode 100644
index 0000000..db81c55
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160214.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-14_00-02-15/zip/netbeans-trunk-nightly-201602140002-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 aa08e38..adfd77c 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -37,6 +37,7 @@ DIST netbeans-trunk-nightly-201602100002-src.zip 209617536 SHA256 e3ded1537a0041
 DIST netbeans-trunk-nightly-201602110002-src.zip 209640470 SHA256 631a7eaf189159858a9a68610b569d050a1b415091068b05a4b99f2f6341ccc2 SHA512 abbf79593aeadec3c678ef27e90e9e3cca6349640a486338d76a97eb12557aaec426646942fba4e97fe5e62fd84f390a813f978df1c5a107f5f60b297acefd71 WHIRLPOOL 2543bc7214823b6e061c29beaf895f1c34a1a51f80276e1022d0a7824ecb725ba1669333f7823954ddc689f07f48944f503c4d74b89c0eaf004e713bfafa068b
 DIST netbeans-trunk-nightly-201602120002-src.zip 209659016 SHA256 d64bb61be92947939476ff606719578b8aa4d6eedfe10b01e123acd9a0978f61 SHA512 111a1562cb8652fa40896c1bfe3f5a83b38786b2b58191af86cc975414f8d76e7657ffabc600de97930090621591199429ec5e7b3c2d69fbe2542cc172042eaf WHIRLPOOL dcdd5411d3f8badf6805fb3bb0ed631083b678600b565c3216ab9ca3e76a36f4e7f39da48214fecefa8a79fbc775bcb88fff3040e503ad0e72379acc572287e5
 DIST netbeans-trunk-nightly-201602130002-src.zip 209667550 SHA256 0709efad4e00ff13999707c19665af39f1100fa4cb91c49d12fc1cce461395e4 SHA512 c52ca30fcebd5fb2d5fad3432189100f3a95a0b13ac1ecb4b7e711bb6ab49a26c9f7e374757a17369a5d8c4785ec7e5f125078dc2b88ee137fcd0e2d15838710 WHIRLPOOL 4db8529afaa742f708c090da04f8f8cdc6b4c190a9993501ac45cdea5574e7b1909e0ae8a9958205faefa7d08b63f259c5addc8285ee714b1e196fdbdef33190
+DIST netbeans-trunk-nightly-201602140002-src.zip 209669684 SHA256 be43475a61235e79ef5fdb6348c4c0b91a0220f4604e0c5e60983207b89beaa4 SHA512 40df5c2eb08965291ce043d6d6109a3db7033d66195cfef110e5737275070c9c5c1f7e275fdba53583448acc5d094feb51aa266a4b8b869291e539d7cdd66a26 WHIRLPOOL 0087d75b832537662e7ce2d59cdb291c6c2824856abd2233264e206d0afbff2299a3ec77b9cbd3d6238abc45efcab3849518ef2a1a392323bfd3300f196c98c6
 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_p20160112.ebuild 4790 SHA256 1fbfd96156c9522dbfd6c79b640e9815e806daa0c9a1a4dd89f0f78d56169fad SHA512 eb74f002f48c216eb71f0930f83308aca4916a4c7d37b8e61010e871d251852b7f49a72c490185f4f8dfa4e874376b8664696dcf58244a690c6dbe2a421d6e71 WHIRLPOOL b12d0d9ca23df687fdf8a1e9f07bdd5a2ee1adf7499e3740f90e3e9db42568053a05b8735aa84b827ad2a1deb5d4a8ff92748d69697cac2bbbddc4f833451e32
@@ -60,4 +61,5 @@ EBUILD netbeans-cnd-9999_p20160210.ebuild 4790 SHA256 e7669a6a819c662c61b3046e2c
 EBUILD netbeans-cnd-9999_p20160211.ebuild 4790 SHA256 1085bf83ff74058eb5c64aecef2e8132dc48ed9f05b713412264d005d50cb35a SHA512 3ce4bb1550a840e9932dc0e6a3b0db759b40acdf782d3fb13ec0dcc5cc6a51e1ad57acedeec92c34abf6b32e730d5f951ef35b2d04c91107d520520a94ebdb49 WHIRLPOOL 0a2eb17b90f4bd8bcd4e41f0dc744a9ec7919343cc10be9b787299cde1cdfd70cff7e18e936dee466553a3c9d4e97b1b93d2e2c8c85038b3f31887533d7f3a10
 EBUILD netbeans-cnd-9999_p20160212.ebuild 4790 SHA256 de95f640bd6e519073c4b48f1dfa7ee187ce870520c82b37a35c23f07d638fa0 SHA512 2914e32df4e71e9731882449d538d3217036ab082eda0defeb0bec01fe307db660fc5490bb4d0838286ad9f2c2bc3918b769845158fbdc5fca54758b57620151 WHIRLPOOL be76a4a98adcb4d5ad2d109ff14dec58ed52d1e63f60a55b7bf9f4eb6be42016df26e76bb078e9d9c026e89d07ad8e9260fd445630036add53ef9cc7a61e510a
 EBUILD netbeans-cnd-9999_p20160213.ebuild 4790 SHA256 81b3248a0a6f489b576d866c41a94fde29aba2cee8eef48d9999bcc419c46567 SHA512 023e76f9038fa4bb4e4cba4c660871f6de226dd57de21188efaf42079f535e7c5cdc6347013d4eda9a93bbe4de6aa71103c665525c0bbc2f2cce969a0382190c WHIRLPOOL 6490e17796d5d8cb4b8b559266048525cb3b823a91f67fd964538f77917e9cd75dd6d05114df50b480f457876154e53fd665e1ef50ff9f11f3c004ae8fc619f4
+EBUILD netbeans-cnd-9999_p20160214.ebuild 4790 SHA256 6e5413fd0882afaf1afc3ea9a4fed1d8c4b3ce137e7891e9bacdbf3abddf42db SHA512 9cea6b829022fee61325c53d64ec09733cdddd29dae6a14148f1436fcab9253128300958a8065fc8acdc694b49789d845dfa2b43978b85c776e56c3c6af1efab WHIRLPOOL d461ce6c401c3f37b852ea582cda82390914830d0c8040f1a4181e2163fbdf1b84c4d6417b97e9de3e8a32a9b8ccc8992dfdb4c072a3d73ca17c72d0d5245a3a
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160214.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160214.ebuild
new file mode 100644
index 0000000..d16a7f8
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160214.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-14_00-02-15/zip/netbeans-trunk-nightly-201602140002-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 ea82666..171e18e 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201602100002-src.zip 209617536 SHA256 e3ded1537a0041
 DIST netbeans-trunk-nightly-201602110002-src.zip 209640470 SHA256 631a7eaf189159858a9a68610b569d050a1b415091068b05a4b99f2f6341ccc2 SHA512 abbf79593aeadec3c678ef27e90e9e3cca6349640a486338d76a97eb12557aaec426646942fba4e97fe5e62fd84f390a813f978df1c5a107f5f60b297acefd71 WHIRLPOOL 2543bc7214823b6e061c29beaf895f1c34a1a51f80276e1022d0a7824ecb725ba1669333f7823954ddc689f07f48944f503c4d74b89c0eaf004e713bfafa068b
 DIST netbeans-trunk-nightly-201602120002-src.zip 209659016 SHA256 d64bb61be92947939476ff606719578b8aa4d6eedfe10b01e123acd9a0978f61 SHA512 111a1562cb8652fa40896c1bfe3f5a83b38786b2b58191af86cc975414f8d76e7657ffabc600de97930090621591199429ec5e7b3c2d69fbe2542cc172042eaf WHIRLPOOL dcdd5411d3f8badf6805fb3bb0ed631083b678600b565c3216ab9ca3e76a36f4e7f39da48214fecefa8a79fbc775bcb88fff3040e503ad0e72379acc572287e5
 DIST netbeans-trunk-nightly-201602130002-src.zip 209667550 SHA256 0709efad4e00ff13999707c19665af39f1100fa4cb91c49d12fc1cce461395e4 SHA512 c52ca30fcebd5fb2d5fad3432189100f3a95a0b13ac1ecb4b7e711bb6ab49a26c9f7e374757a17369a5d8c4785ec7e5f125078dc2b88ee137fcd0e2d15838710 WHIRLPOOL 4db8529afaa742f708c090da04f8f8cdc6b4c190a9993501ac45cdea5574e7b1909e0ae8a9958205faefa7d08b63f259c5addc8285ee714b1e196fdbdef33190
+DIST netbeans-trunk-nightly-201602140002-src.zip 209669684 SHA256 be43475a61235e79ef5fdb6348c4c0b91a0220f4604e0c5e60983207b89beaa4 SHA512 40df5c2eb08965291ce043d6d6109a3db7033d66195cfef110e5737275070c9c5c1f7e275fdba53583448acc5d094feb51aa266a4b8b869291e539d7cdd66a26 WHIRLPOOL 0087d75b832537662e7ce2d59cdb291c6c2824856abd2233264e206d0afbff2299a3ec77b9cbd3d6238abc45efcab3849518ef2a1a392323bfd3300f196c98c6
 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_p20160112.ebuild 2968 SHA256 5120dec115f488aa365063919a767fcd0fede87011cbf15d26dd695ec0ab4a5c SHA512 ecd4e636248302f0d6069fd0cd2768a9f26304ba000eae0fb710ab61181386439a0953f364dc619463d22c6444f80263dc4d146a1bc7a99847c445b3568a9cb8 WHIRLPOOL 8d152d1dddcede42885d73e741093e3ad57439f49169d5c9b4420ac795e239d2221c9526eec2147a0982552bb390028db97bcfc7e0f9a244bbcb10d29cb39ff7
@@ -52,4 +53,5 @@ EBUILD netbeans-dlight-9999_p20160210.ebuild 2968 SHA256 7e14c33eaa2f59b4e3c2dc3
 EBUILD netbeans-dlight-9999_p20160211.ebuild 2968 SHA256 e490da126b6370a01c166e680c7461e6cd50e5dd8df05ec792492c41593de94d SHA512 203b9a61796804d847214d2afe866f1fb7e7384d1b3eb1260f11a3decf191f07438036f9d524a68bf548a659c84f4664e8754672aacf99aec88f226044989fa4 WHIRLPOOL 0481b5cbaf3b0f5416563d13f8fd8d21b3971838c946d265a073971a5a9669f9758f895faa605326382426c55e1e6ee3c2157945846a3360c07df949a3643a0b
 EBUILD netbeans-dlight-9999_p20160212.ebuild 2968 SHA256 12cd25728bc76c5e1116002adb4b93291011e80999cc6b62913e0cb8b4261adc SHA512 cd4be855aab3bb8325f6aed839b7463a970d5fb69529e989c323d93305df584e3e8eb908023ebc69dbc757b6e9cd239b75e600ff76ebd595e706cbee51dc47fe WHIRLPOOL 57b4cf6e230c200e5831843f710bfa31e60065c16a91981eb937197f467e6bcc07023aa48c018f10d776d33cd9dcfd56857b729ba9d9337953a729d552af11b2
 EBUILD netbeans-dlight-9999_p20160213.ebuild 2968 SHA256 b0b2114df4f91b9683ce73b49783b10776af77aec3a5a0564c599badf5ecdb26 SHA512 581836e62ec240043d2c02febbbdf27ef00c0ebb8a8d717f2a83e9bfd1fe71bce1066be40c833aa42e3f85089c47d61d93a0ed31e1c0d3995d08b243347e94c4 WHIRLPOOL 5ec48095cb1bd6c8f42d5ec695505c9b23081883474a5810d793bf8e654bf91671c7efcf89f19db9d98a6c71782c6a44cc1e49b2d008b834dc8495b235aa783e
+EBUILD netbeans-dlight-9999_p20160214.ebuild 2968 SHA256 14375fd394b7f51e0316db468f2567f4ec302b90159ae5b89f2fb3eb46757614 SHA512 1be4d258963da4e960a19dd2f1badf3d150349863d45768262104efa79bc1a346d81080519f368dd87d0dd040d1f6f5c273b1bf3a88f5ce9689b61de35885d8c WHIRLPOOL 3a396e986d7fc080c509130396168798af4427540fd809caa9006ef36fa1eb6ef8e81f7574583e6fb300f7803a35cacded8a8a222c646bd7e20043002252b038
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160214.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160214.ebuild
new file mode 100644
index 0000000..e090037
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160214.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-14_00-02-15/zip/netbeans-trunk-nightly-201602140002-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 405b383..6d2a366 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -56,6 +56,7 @@ DIST netbeans-trunk-nightly-201602100002-src.zip 209617536 SHA256 e3ded1537a0041
 DIST netbeans-trunk-nightly-201602110002-src.zip 209640470 SHA256 631a7eaf189159858a9a68610b569d050a1b415091068b05a4b99f2f6341ccc2 SHA512 abbf79593aeadec3c678ef27e90e9e3cca6349640a486338d76a97eb12557aaec426646942fba4e97fe5e62fd84f390a813f978df1c5a107f5f60b297acefd71 WHIRLPOOL 2543bc7214823b6e061c29beaf895f1c34a1a51f80276e1022d0a7824ecb725ba1669333f7823954ddc689f07f48944f503c4d74b89c0eaf004e713bfafa068b
 DIST netbeans-trunk-nightly-201602120002-src.zip 209659016 SHA256 d64bb61be92947939476ff606719578b8aa4d6eedfe10b01e123acd9a0978f61 SHA512 111a1562cb8652fa40896c1bfe3f5a83b38786b2b58191af86cc975414f8d76e7657ffabc600de97930090621591199429ec5e7b3c2d69fbe2542cc172042eaf WHIRLPOOL dcdd5411d3f8badf6805fb3bb0ed631083b678600b565c3216ab9ca3e76a36f4e7f39da48214fecefa8a79fbc775bcb88fff3040e503ad0e72379acc572287e5
 DIST netbeans-trunk-nightly-201602130002-src.zip 209667550 SHA256 0709efad4e00ff13999707c19665af39f1100fa4cb91c49d12fc1cce461395e4 SHA512 c52ca30fcebd5fb2d5fad3432189100f3a95a0b13ac1ecb4b7e711bb6ab49a26c9f7e374757a17369a5d8c4785ec7e5f125078dc2b88ee137fcd0e2d15838710 WHIRLPOOL 4db8529afaa742f708c090da04f8f8cdc6b4c190a9993501ac45cdea5574e7b1909e0ae8a9958205faefa7d08b63f259c5addc8285ee714b1e196fdbdef33190
+DIST netbeans-trunk-nightly-201602140002-src.zip 209669684 SHA256 be43475a61235e79ef5fdb6348c4c0b91a0220f4604e0c5e60983207b89beaa4 SHA512 40df5c2eb08965291ce043d6d6109a3db7033d66195cfef110e5737275070c9c5c1f7e275fdba53583448acc5d094feb51aa266a4b8b869291e539d7cdd66a26 WHIRLPOOL 0087d75b832537662e7ce2d59cdb291c6c2824856abd2233264e206d0afbff2299a3ec77b9cbd3d6238abc45efcab3849518ef2a1a392323bfd3300f196c98c6
 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_p20160112.ebuild 15825 SHA256 0d6162c64e90ef21936a6de191e36df916504a251f8cf32ff20deb94a3afac31 SHA512 ccc0ef6fe707037c15b153fd1271cc442c339896a2b83e831fa55540607dff3fa405bc8470ca1573c9a3d1f62e1279f623b9ee0eb3335fbf2432becaa0b53f8e WHIRLPOOL 10f76ecbbe94a8c19ac0d85da2763114bdd9fa34284b0d2708957eb17508be1f91da4ee3ffcc2512b03f5f7efc9d7f0c99fc63c3ebfa5b1dbcbb2bf3b54efc5d
@@ -79,4 +80,5 @@ EBUILD netbeans-enterprise-9999_p20160210.ebuild 15825 SHA256 6224a403437b1e02d0
 EBUILD netbeans-enterprise-9999_p20160211.ebuild 15825 SHA256 aa10ee1f8b1fde053aefab8270e6d605dbc7e3bdf29291ccc2c34f5ac93adaff SHA512 72b43dc2effb5cfd92902a21c9ffb1df7d22ab27bb3e3dbc01aabefed382cb699522e18d153c9b56240246cdad5ff0e3dc5f59e80cdaa319a4499b72ac3c588d WHIRLPOOL a341777a253cd75e45e628096180d59b8e3c980ab99dd3208e70509844d2e599c86f845a69d538a8bc2e8d2ac51c1d254f23645fce7b0c683a0dd733fd8b1243
 EBUILD netbeans-enterprise-9999_p20160212.ebuild 15825 SHA256 5a5487a4701171358c28f13ae87e3f8cc6c9d8965cf951a457c061cb680702f8 SHA512 6aa685f780b76ab6e1016b84e51e34273e373076b1d944180de0d667302e07c23222a4a18ea557e5f5420e5c112b55ed367452b65a9848a5b5cd0e07daab1d33 WHIRLPOOL 0264b10a8db078da37e2db0a93b72b1a72103dcd4668d59959c1fb10705242d5b500ac8c05c2e34fd63fd04b6b84e8020cf7d92370392bd780685ce5732caf65
 EBUILD netbeans-enterprise-9999_p20160213.ebuild 15825 SHA256 65818b33e9730d8e04867c222c8b3232bed8d2a50f9e628ac80f181b5b3d95ba SHA512 bf935a373061e84a7259a3ec9c4cd4778ee6fb1cc65809ba6844479b179d99fe43fc40f3ffd6f02380c6738e77440de5c5674f5b1d7ef3e048bbd9ca77aae66c WHIRLPOOL 940c5b9a636f972af150148a39bdc998bcd19ab584cbd5cd2c1c7d97c76e486f8368e9c1049a18b2d8e10d4d5dffbc0373e3bc44b37d653415824b035ffbaf97
+EBUILD netbeans-enterprise-9999_p20160214.ebuild 15825 SHA256 e0a5ed112f2dbdcf44f7e80f54e322762115aa09cfcc6a9a65b24f00f6273d1b SHA512 8a5ab7ca1f75ffb37328fe5e4b57005d3f0530aff63d5b9d2613ef82c57da154b46c12f7ced52279b6d6d81a71ec6e37dadcbf7d21ef792888937e374becde3b WHIRLPOOL ac51f999192e0801a724ecd4dcb828a6e2b0d83a813b0159949e0692535c23af16d1e30f528fa7c375d589edf1546c4a09ae1d33d74fdb360d75c56a8fb40025
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160214.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160214.ebuild
new file mode 100644
index 0000000..7b16d6a
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160214.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-14_00-02-15/zip/netbeans-trunk-nightly-201602140002-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 cade569..124655e 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201602100002-src.zip 209617536 SHA256 e3ded1537a0041
 DIST netbeans-trunk-nightly-201602110002-src.zip 209640470 SHA256 631a7eaf189159858a9a68610b569d050a1b415091068b05a4b99f2f6341ccc2 SHA512 abbf79593aeadec3c678ef27e90e9e3cca6349640a486338d76a97eb12557aaec426646942fba4e97fe5e62fd84f390a813f978df1c5a107f5f60b297acefd71 WHIRLPOOL 2543bc7214823b6e061c29beaf895f1c34a1a51f80276e1022d0a7824ecb725ba1669333f7823954ddc689f07f48944f503c4d74b89c0eaf004e713bfafa068b
 DIST netbeans-trunk-nightly-201602120002-src.zip 209659016 SHA256 d64bb61be92947939476ff606719578b8aa4d6eedfe10b01e123acd9a0978f61 SHA512 111a1562cb8652fa40896c1bfe3f5a83b38786b2b58191af86cc975414f8d76e7657ffabc600de97930090621591199429ec5e7b3c2d69fbe2542cc172042eaf WHIRLPOOL dcdd5411d3f8badf6805fb3bb0ed631083b678600b565c3216ab9ca3e76a36f4e7f39da48214fecefa8a79fbc775bcb88fff3040e503ad0e72379acc572287e5
 DIST netbeans-trunk-nightly-201602130002-src.zip 209667550 SHA256 0709efad4e00ff13999707c19665af39f1100fa4cb91c49d12fc1cce461395e4 SHA512 c52ca30fcebd5fb2d5fad3432189100f3a95a0b13ac1ecb4b7e711bb6ab49a26c9f7e374757a17369a5d8c4785ec7e5f125078dc2b88ee137fcd0e2d15838710 WHIRLPOOL 4db8529afaa742f708c090da04f8f8cdc6b4c190a9993501ac45cdea5574e7b1909e0ae8a9958205faefa7d08b63f259c5addc8285ee714b1e196fdbdef33190
+DIST netbeans-trunk-nightly-201602140002-src.zip 209669684 SHA256 be43475a61235e79ef5fdb6348c4c0b91a0220f4604e0c5e60983207b89beaa4 SHA512 40df5c2eb08965291ce043d6d6109a3db7033d66195cfef110e5737275070c9c5c1f7e275fdba53583448acc5d094feb51aa266a4b8b869291e539d7cdd66a26 WHIRLPOOL 0087d75b832537662e7ce2d59cdb291c6c2824856abd2233264e206d0afbff2299a3ec77b9cbd3d6238abc45efcab3849518ef2a1a392323bfd3300f196c98c6
 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_p20160112.ebuild 2913 SHA256 5d08856a4a078a1ea82d175149ad16033e6f369993ce7d964886a8af0cb47891 SHA512 78c3aaf2e683fc9fe3efdf61b65443c1c0582c9576738f9ad0261ea7b7745d7da878d77a1a8b7bcafd986cecbbfcf6f5e0da9a200cc61b0d487afa778cf61c43 WHIRLPOOL 4006cfac5753c42df04ecffc0eeb708fb8a10e9ea7aecc64205ad655be4f3236ef54195b60e988022e76edb888118803ba071b4aba11f43fb9c5ca19e7533af3
@@ -47,4 +48,5 @@ EBUILD netbeans-ergonomics-9999_p20160210.ebuild 2913 SHA256 a7a6010adf0f70e1f1d
 EBUILD netbeans-ergonomics-9999_p20160211.ebuild 2913 SHA256 4067e323a8c2fa4434120567587848a6aab1c0826e07484fdaf12e743a671c8c SHA512 c0aef02560e0f099f679230e73ca145f8dac586aac3ac8f1b4c3973c9bfd022ad7f9700de85a42eef805fb4bd807027bdd47e913cf6fea129f031c545979ae66 WHIRLPOOL 11e7060bfdee0fc1a2d45bd1a23c9c10cff9d9e339aebac08e9d5f32acb1bce28ece7b101db677789306f33848bfdcaa5391f75d5485a8202571c779acc18e11
 EBUILD netbeans-ergonomics-9999_p20160212.ebuild 2913 SHA256 5ab1baf3108fc889e3c11816e5478c7f5249c10a1d9745bdaaa87f6d6c6a9752 SHA512 6267f192bf7c0e0d10d5f322d4f94a775a319f4252707b8543990a9feef71209283c95410d4be7ec35ccfbeedc3359c4d7fcb30ea5827da0a692ceb5532bd246 WHIRLPOOL 3d3f3d4c4160cc264c6ad72f0dd0b0b129018a691cfcf9645eef1b67421de22b81b9784eeb87946787980948caf5e98a99275a720e1358c88d6a578cd77ef43f
 EBUILD netbeans-ergonomics-9999_p20160213.ebuild 2913 SHA256 482af7e85a326c7798239f8edc3d2d48ab99496585870642a005f85644e85cc2 SHA512 dca7fc847a9e21f42d535df5541ce26d5430ec64fc6c12e5fb1ae2ba5078cb856d11e3e0bffb006732248b8d4a47b82b94301def3548e7c2bc51783bd70a65d8 WHIRLPOOL 1117d710600e05c3f0a12d0614a891b9f4bef9bab328775077ca4a6c6c42285ed49f64d508d0a02646a3fb5afb467a7401bc76bb96157df33d7114ef81f9e2cc
+EBUILD netbeans-ergonomics-9999_p20160214.ebuild 2913 SHA256 0a71c2f54c28490a147ec9226b41ab7f2c0abe606049434dbf02c3ec29fb7afe SHA512 c4e0f82ba993bd57526789903c6d73348fc07bbd7b1581afcdd11d906289b8c8c86fa655f5edb9913f4296fd5beb1066b2bddae820d5d75fc4afe5bebf181ac3 WHIRLPOOL 4773c63491ea63d2136a4dae3684c335cc32b176a33e1ff291f2ab5e674b3655be4a266fec05c7549057c69b04d05310c315be949e995811eafaa7987169493f
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160214.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160214.ebuild
new file mode 100644
index 0000000..c28ffb2
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160214.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-14_00-02-15/zip/netbeans-trunk-nightly-201602140002-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 d997ab8..c6b0479 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201602100002-src.zip 209617536 SHA256 e3ded1537a0041
 DIST netbeans-trunk-nightly-201602110002-src.zip 209640470 SHA256 631a7eaf189159858a9a68610b569d050a1b415091068b05a4b99f2f6341ccc2 SHA512 abbf79593aeadec3c678ef27e90e9e3cca6349640a486338d76a97eb12557aaec426646942fba4e97fe5e62fd84f390a813f978df1c5a107f5f60b297acefd71 WHIRLPOOL 2543bc7214823b6e061c29beaf895f1c34a1a51f80276e1022d0a7824ecb725ba1669333f7823954ddc689f07f48944f503c4d74b89c0eaf004e713bfafa068b
 DIST netbeans-trunk-nightly-201602120002-src.zip 209659016 SHA256 d64bb61be92947939476ff606719578b8aa4d6eedfe10b01e123acd9a0978f61 SHA512 111a1562cb8652fa40896c1bfe3f5a83b38786b2b58191af86cc975414f8d76e7657ffabc600de97930090621591199429ec5e7b3c2d69fbe2542cc172042eaf WHIRLPOOL dcdd5411d3f8badf6805fb3bb0ed631083b678600b565c3216ab9ca3e76a36f4e7f39da48214fecefa8a79fbc775bcb88fff3040e503ad0e72379acc572287e5
 DIST netbeans-trunk-nightly-201602130002-src.zip 209667550 SHA256 0709efad4e00ff13999707c19665af39f1100fa4cb91c49d12fc1cce461395e4 SHA512 c52ca30fcebd5fb2d5fad3432189100f3a95a0b13ac1ecb4b7e711bb6ab49a26c9f7e374757a17369a5d8c4785ec7e5f125078dc2b88ee137fcd0e2d15838710 WHIRLPOOL 4db8529afaa742f708c090da04f8f8cdc6b4c190a9993501ac45cdea5574e7b1909e0ae8a9958205faefa7d08b63f259c5addc8285ee714b1e196fdbdef33190
+DIST netbeans-trunk-nightly-201602140002-src.zip 209669684 SHA256 be43475a61235e79ef5fdb6348c4c0b91a0220f4604e0c5e60983207b89beaa4 SHA512 40df5c2eb08965291ce043d6d6109a3db7033d66195cfef110e5737275070c9c5c1f7e275fdba53583448acc5d094feb51aa266a4b8b869291e539d7cdd66a26 WHIRLPOOL 0087d75b832537662e7ce2d59cdb291c6c2824856abd2233264e206d0afbff2299a3ec77b9cbd3d6238abc45efcab3849518ef2a1a392323bfd3300f196c98c6
 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_p20160112.ebuild 3377 SHA256 2c2ebff2035d8655743d89174d589e429eede0fcb4dbc2fdae69cd9bf9291d79 SHA512 6ceb859949691db63c51da914402e816683c530d1cfe302933a2e9d66ed1adb580f7941d7c0ba0b20b6e11c113cb0dbabf1d0dc8bc4b8b68c6185f1c35dcb5fb WHIRLPOOL f7d134e9aa1d1efe372bd706c3a3d15504ac52e3d568d6bf128eb6c08ee0d0cb67f2c1313e3c20f7658c0e30b50a4f096d907f93991fe9a24badc2492042a810
@@ -49,4 +50,5 @@ EBUILD netbeans-extide-9999_p20160210.ebuild 3377 SHA256 238a8fa1a9f3e41cb968956
 EBUILD netbeans-extide-9999_p20160211.ebuild 3377 SHA256 dfb02886c611b09bbb50148b33b7d50aa7c8c81966cca90871db0a252017d744 SHA512 02afb11210313755f7386ee6ccbd404a54979c370ec0f062621e9a88f8fbf321d2e1c76cf4199f7eee5e04857f82a8163df74bc25db30f5a1ccb951a2bd27e01 WHIRLPOOL 0fb13ef6bb74b6686dac6271672da9c1c3c9bebb0985c262763d83b52cf758c06fcbc1b44632c201ed9590b549909c15899b8faab10832470754c3226cf260f6
 EBUILD netbeans-extide-9999_p20160212.ebuild 3377 SHA256 0773e5a88dfe07754df7cfd5b555b0cbac5745fa8bb8a6cdfecee154a6697408 SHA512 29e06335a07cef7f18d5206331ea5e6cf9e3bba635d8e34fed1f507eadde10eadba1e78403e2c427db81aae446aaca1dcea9ff7a2592503ad44ed645aae0ede4 WHIRLPOOL 4ac7da8804c3dcdfe02062b949542621c1fcedfaedcf267ae293d4b781abe097c911005b7f8160f47f59d95cbf75209a5da9ef2ccb0a61e9ff6386ea089823c6
 EBUILD netbeans-extide-9999_p20160213.ebuild 3377 SHA256 754eff958114c375a7824c79d594f26ff29428179dcf6922f921595761cc5f2c SHA512 49d8f9e01e0f7b74fc4626500715567c5b146df4e29a8eb359d7a838e13dc9d6a5c46970e5bfa2aea16db730eeea1e7e80beb70fce00f6b3eb086afeb94c87b3 WHIRLPOOL 82b3b6e4df007fe65503e522b90b82724cf62009fda05d4fa89b51fe9bb78c647a39c7f85afb66fb1d1d1815cad7cf8c32bdc68d5175704ebf3fd0224c613b11
+EBUILD netbeans-extide-9999_p20160214.ebuild 3377 SHA256 8a8a2abea383508ce20c9def63ede5aa9c5344200401d3f41e2a2d8c1d05db53 SHA512 f21e034f011fb0f95dc299032ee9b2a5126f6b66f0c43d1b64b4c3d66e2bca4eb38992a33d97cd295ba67d0f7ce4f29555908a47e42b33c858a66930ba707c45 WHIRLPOOL 317918bf21bd4274fd1787af7507e8691cee3d5c842f6f27fd751072d98813d8fece30feedcc7f261fefd5b9c8b214dd8af8aa364dabde9607a8111d005c64cc
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160214.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160214.ebuild
new file mode 100644
index 0000000..c1efc9c
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20160214.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-14_00-02-15/zip/netbeans-trunk-nightly-201602140002-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 fed2e6e..eb89769 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201602100002-src.zip 209617536 SHA256 e3ded1537a0041
 DIST netbeans-trunk-nightly-201602110002-src.zip 209640470 SHA256 631a7eaf189159858a9a68610b569d050a1b415091068b05a4b99f2f6341ccc2 SHA512 abbf79593aeadec3c678ef27e90e9e3cca6349640a486338d76a97eb12557aaec426646942fba4e97fe5e62fd84f390a813f978df1c5a107f5f60b297acefd71 WHIRLPOOL 2543bc7214823b6e061c29beaf895f1c34a1a51f80276e1022d0a7824ecb725ba1669333f7823954ddc689f07f48944f503c4d74b89c0eaf004e713bfafa068b
 DIST netbeans-trunk-nightly-201602120002-src.zip 209659016 SHA256 d64bb61be92947939476ff606719578b8aa4d6eedfe10b01e123acd9a0978f61 SHA512 111a1562cb8652fa40896c1bfe3f5a83b38786b2b58191af86cc975414f8d76e7657ffabc600de97930090621591199429ec5e7b3c2d69fbe2542cc172042eaf WHIRLPOOL dcdd5411d3f8badf6805fb3bb0ed631083b678600b565c3216ab9ca3e76a36f4e7f39da48214fecefa8a79fbc775bcb88fff3040e503ad0e72379acc572287e5
 DIST netbeans-trunk-nightly-201602130002-src.zip 209667550 SHA256 0709efad4e00ff13999707c19665af39f1100fa4cb91c49d12fc1cce461395e4 SHA512 c52ca30fcebd5fb2d5fad3432189100f3a95a0b13ac1ecb4b7e711bb6ab49a26c9f7e374757a17369a5d8c4785ec7e5f125078dc2b88ee137fcd0e2d15838710 WHIRLPOOL 4db8529afaa742f708c090da04f8f8cdc6b4c190a9993501ac45cdea5574e7b1909e0ae8a9958205faefa7d08b63f259c5addc8285ee714b1e196fdbdef33190
+DIST netbeans-trunk-nightly-201602140002-src.zip 209669684 SHA256 be43475a61235e79ef5fdb6348c4c0b91a0220f4604e0c5e60983207b89beaa4 SHA512 40df5c2eb08965291ce043d6d6109a3db7033d66195cfef110e5737275070c9c5c1f7e275fdba53583448acc5d094feb51aa266a4b8b869291e539d7cdd66a26 WHIRLPOOL 0087d75b832537662e7ce2d59cdb291c6c2824856abd2233264e206d0afbff2299a3ec77b9cbd3d6238abc45efcab3849518ef2a1a392323bfd3300f196c98c6
 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_p20160112.ebuild 3416 SHA256 b887807280c17115e850026513134ce42ce464f6346160a338e1878a759a2698 SHA512 903b088337594e405dccfcaf142e3fe41552ea0feb55526dd1c379b14e9f8d22d1223ff233402f913a7d0df2320752cdeb22360c2b6d7340f3a818ea4bfc0f58 WHIRLPOOL 37a8e44739edba79cd2838763287f05e8b1e671ce47320722a79ba820904144ed6c1c08272c5638932175aa248ece439e04aeb0c4f4e4ff43baacbfd9f03ab32
@@ -49,4 +50,5 @@ EBUILD netbeans-groovy-9999_p20160210.ebuild 3416 SHA256 8497f7cf720eeba2452de70
 EBUILD netbeans-groovy-9999_p20160211.ebuild 3416 SHA256 6161e49b0cf1784fba0bf183adeb20721f708069d645405e31b9bfd2a0e47645 SHA512 9d25b3854707ae755b222c90a44fdaaf861f19d862a326cdc533b35ba4a7c32bbae33e7ce9f3a566f2c16099b2f395300c1337114ac7225009ae5274f3a23301 WHIRLPOOL cf27fe5fa8a1b15ae6c8541e1bfb98ca8abda8052d1268a486030514de6a8628c65337bde8bfb691c4c849aeceb0e432224dcec1e99a95959617c8deebc0def1
 EBUILD netbeans-groovy-9999_p20160212.ebuild 3416 SHA256 40158c6cd5b5531440fb8848c37efd048e91990a155526a9d6775fc63e805d70 SHA512 a01f36178e33143610425b0481ecd28f9c5c4012229e93d00789c1d74ec9d1dd49b291592e2e92733a403537ff85ad245550fd7552e513a72635908ebfcc40d5 WHIRLPOOL 19c0fc2a8c66a878db12b8d28a54a0ea56959e48ab1eb535cf5a5c453cf8f291e6927255efe35d704aca4f7adb08389bba835e7a9c60fe79b29047ad191d026a
 EBUILD netbeans-groovy-9999_p20160213.ebuild 3416 SHA256 ee4698e2881f66c492440426238e32e441f7bb7945732a4425f7d2b9a9f5f4e0 SHA512 f6d093da87b22d9526936b333321396fe2c6b87da85ab8261d72df3dc683f674527f5b2100a565a783252fa1b2284a6f0ad442042eb89b9ea436b6f265d53a1a WHIRLPOOL 0f93f17c82bd4a2ef6ff1293e19f50d7d162b1275abe0c561eeee1f29ce6f7df38dbacfa0968b317e2bad877608060fc37d866e1eaee30f9cc67421b94aefb79
+EBUILD netbeans-groovy-9999_p20160214.ebuild 3416 SHA256 2e70244f4c5998a5378ee580f45ee328be55f6fe47d1d4cd03aa3e1d1003ee6d SHA512 2f5fd351ae1095141dace1c689c17984c1f37b14c80ef66052e24c4995a9d814351008e3ea0f80056fdc1c2e0a914b7e95fc31a8a55b5ac780f26d868b157137 WHIRLPOOL e1c4b525b454800bdb377e507b58a0a3959cde9ea18aa296426ae37fe07cd2cbae6c43fd840b5f7f2f8988c0c6629aee89d9c3a9878a251cb7c359d00049338b
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160214.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160214.ebuild
new file mode 100644
index 0000000..72177ee
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160214.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-14_00-02-15/zip/netbeans-trunk-nightly-201602140002-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 5c6a75d..c25ac31 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201602100002-src.zip 209617536 SHA256 e3ded1537a0041
 DIST netbeans-trunk-nightly-201602110002-src.zip 209640470 SHA256 631a7eaf189159858a9a68610b569d050a1b415091068b05a4b99f2f6341ccc2 SHA512 abbf79593aeadec3c678ef27e90e9e3cca6349640a486338d76a97eb12557aaec426646942fba4e97fe5e62fd84f390a813f978df1c5a107f5f60b297acefd71 WHIRLPOOL 2543bc7214823b6e061c29beaf895f1c34a1a51f80276e1022d0a7824ecb725ba1669333f7823954ddc689f07f48944f503c4d74b89c0eaf004e713bfafa068b
 DIST netbeans-trunk-nightly-201602120002-src.zip 209659016 SHA256 d64bb61be92947939476ff606719578b8aa4d6eedfe10b01e123acd9a0978f61 SHA512 111a1562cb8652fa40896c1bfe3f5a83b38786b2b58191af86cc975414f8d76e7657ffabc600de97930090621591199429ec5e7b3c2d69fbe2542cc172042eaf WHIRLPOOL dcdd5411d3f8badf6805fb3bb0ed631083b678600b565c3216ab9ca3e76a36f4e7f39da48214fecefa8a79fbc775bcb88fff3040e503ad0e72379acc572287e5
 DIST netbeans-trunk-nightly-201602130002-src.zip 209667550 SHA256 0709efad4e00ff13999707c19665af39f1100fa4cb91c49d12fc1cce461395e4 SHA512 c52ca30fcebd5fb2d5fad3432189100f3a95a0b13ac1ecb4b7e711bb6ab49a26c9f7e374757a17369a5d8c4785ec7e5f125078dc2b88ee137fcd0e2d15838710 WHIRLPOOL 4db8529afaa742f708c090da04f8f8cdc6b4c190a9993501ac45cdea5574e7b1909e0ae8a9958205faefa7d08b63f259c5addc8285ee714b1e196fdbdef33190
+DIST netbeans-trunk-nightly-201602140002-src.zip 209669684 SHA256 be43475a61235e79ef5fdb6348c4c0b91a0220f4604e0c5e60983207b89beaa4 SHA512 40df5c2eb08965291ce043d6d6109a3db7033d66195cfef110e5737275070c9c5c1f7e275fdba53583448acc5d094feb51aa266a4b8b869291e539d7cdd66a26 WHIRLPOOL 0087d75b832537662e7ce2d59cdb291c6c2824856abd2233264e206d0afbff2299a3ec77b9cbd3d6238abc45efcab3849518ef2a1a392323bfd3300f196c98c6
 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_p20160112.ebuild 4126 SHA256 003f98354208b4a661ab84e57b8fd4cc1a7983d91e6f41d79f53b3f13553e60b SHA512 86a18e836fe67bf9d45b64710f7aef35b1a49510fcf796ef10860f89c41fe5034f47f84512510dab9dabdcac787b1d5aaf3ea8d036fdf103afb3ee9e30d860ed WHIRLPOOL e6d9dbcaaa350524e769b583969e7d2fcea756c879de06ecc67ff4a3881df48eed277de0aa3b34f202e70ebf2d5de42965092d9deaeafc2b34cc410da3bf0efd
@@ -52,4 +53,5 @@ EBUILD netbeans-harness-9999_p20160210.ebuild 4126 SHA256 ca8330cfa6bb3ffcd764be
 EBUILD netbeans-harness-9999_p20160211.ebuild 4126 SHA256 47242a019b58e5928f00b20670bca7992d0d37973346508eb42186ef1d3ee4d7 SHA512 4332a6e34caecb40af1f246d136aeb6ccfd68657943bd753bde607cf01285641ff539ab7090822c99de0788216d74d76b6bdd1a85a4ad0be1a2ca9fe23c231d0 WHIRLPOOL 6c5d8cc5673bf3f9ea02c796f40de5b78f5d218e6e290bceeba1243563db2681020bfe0bc5ed82bb6395b01e556eb86233e0337c86887a8af4f16af67984a532
 EBUILD netbeans-harness-9999_p20160212.ebuild 4126 SHA256 f47d73df08c1b5259f65d253e26d2f1950012830c2850166894fc368c10d98b2 SHA512 e801ff2cf27e0fb2ecd2fc092e996d28911eac3e49988bc2d8d65d592e5536d095aa2b83736ef777670ac1dfce99c13581d3f657bd9638cc05aa2d6882084c95 WHIRLPOOL 19d1b2f5801cda716f5c60600b6af92ec17848fb05c29e9fa5966b0d474605cb47c502fa63dbdc88694539fa1a1417273e3755f91b470df1a75c6122db32182b
 EBUILD netbeans-harness-9999_p20160213.ebuild 4126 SHA256 d4d6492d176fb353597d4b3e7833bdefe26f44652bbe39d04b026d303250d84d SHA512 06ce0e0bb5df7c75d324ed67a97ce877876edced8db8fc8d92f7c487159d708a014ef3859b0881a3f1532a3997ad4c4c26840ef4923473f9e669c63b64e5658b WHIRLPOOL 6372f16dd5803d21798afda6320f6c55ab821249b6b0d1357eedaa3b80770b367a2e60a0d4f3af0650f772defc7924317ea5f45587a66938a3fcffb5b6aa21ae
+EBUILD netbeans-harness-9999_p20160214.ebuild 4126 SHA256 8d835659039b5ea568cf8ade85937e98e59e177ae8a96a5d705de6ba5427cb81 SHA512 c04cc63a8483291a583c0298b5ccf5350acc1393460a4d376ae48fc529ab7a1b1c87da5c2f5fd6fba5598e74224c49fe3f62405ecab76ff0347a4d49363b3ed3 WHIRLPOOL 30dda2d093d4edc18f1bbfd802b2441b194ad370aec5d9f1a5504de758bafa33f99b665f8290f2f50867ed1dfb0a82e7b4063247b83de840382e7f2035b162ae
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160214.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160214.ebuild
new file mode 100644
index 0000000..be16811
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20160214.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-14_00-02-15/zip/netbeans-trunk-nightly-201602140002-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 4dba7cb..0675656 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -157,6 +157,7 @@ DIST netbeans-trunk-nightly-201602100002-src.zip 209617536 SHA256 e3ded1537a0041
 DIST netbeans-trunk-nightly-201602110002-src.zip 209640470 SHA256 631a7eaf189159858a9a68610b569d050a1b415091068b05a4b99f2f6341ccc2 SHA512 abbf79593aeadec3c678ef27e90e9e3cca6349640a486338d76a97eb12557aaec426646942fba4e97fe5e62fd84f390a813f978df1c5a107f5f60b297acefd71 WHIRLPOOL 2543bc7214823b6e061c29beaf895f1c34a1a51f80276e1022d0a7824ecb725ba1669333f7823954ddc689f07f48944f503c4d74b89c0eaf004e713bfafa068b
 DIST netbeans-trunk-nightly-201602120002-src.zip 209659016 SHA256 d64bb61be92947939476ff606719578b8aa4d6eedfe10b01e123acd9a0978f61 SHA512 111a1562cb8652fa40896c1bfe3f5a83b38786b2b58191af86cc975414f8d76e7657ffabc600de97930090621591199429ec5e7b3c2d69fbe2542cc172042eaf WHIRLPOOL dcdd5411d3f8badf6805fb3bb0ed631083b678600b565c3216ab9ca3e76a36f4e7f39da48214fecefa8a79fbc775bcb88fff3040e503ad0e72379acc572287e5
 DIST netbeans-trunk-nightly-201602130002-src.zip 209667550 SHA256 0709efad4e00ff13999707c19665af39f1100fa4cb91c49d12fc1cce461395e4 SHA512 c52ca30fcebd5fb2d5fad3432189100f3a95a0b13ac1ecb4b7e711bb6ab49a26c9f7e374757a17369a5d8c4785ec7e5f125078dc2b88ee137fcd0e2d15838710 WHIRLPOOL 4db8529afaa742f708c090da04f8f8cdc6b4c190a9993501ac45cdea5574e7b1909e0ae8a9958205faefa7d08b63f259c5addc8285ee714b1e196fdbdef33190
+DIST netbeans-trunk-nightly-201602140002-src.zip 209669684 SHA256 be43475a61235e79ef5fdb6348c4c0b91a0220f4604e0c5e60983207b89beaa4 SHA512 40df5c2eb08965291ce043d6d6109a3db7033d66195cfef110e5737275070c9c5c1f7e275fdba53583448acc5d094feb51aa266a4b8b869291e539d7cdd66a26 WHIRLPOOL 0087d75b832537662e7ce2d59cdb291c6c2824856abd2233264e206d0afbff2299a3ec77b9cbd3d6238abc45efcab3849518ef2a1a392323bfd3300f196c98c6
 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_p20160112.ebuild 30832 SHA256 ceb6a88f1cef20ed0969065a7c7939e9570ffc28a6ad72cfa54a95afd875c418 SHA512 e84c099bfcb436527c625edd9e3d01cbfcd28b523d84508e84811513a2cb4b6eb6a2766b02a891c58b97b8fdd31753e4562f9979e2a9506c53868cf36ab7651b WHIRLPOOL 7ef7453a5b8c86455c153729a82e8041fb134ed080639470e959738d27a4a2a7ed116429c02fec6c90678838472f1d448261ebd057214f7b193a0b4ce5f06f35
@@ -180,4 +181,5 @@ EBUILD netbeans-ide-9999_p20160210.ebuild 30238 SHA256 42a80f4d46650bfb5133ff55e
 EBUILD netbeans-ide-9999_p20160211.ebuild 30238 SHA256 5e0bd05c22e498df0cccfda97cf5bbfe08ee778a4b352887ae899c3bf2797857 SHA512 f02daad1f7b51566ae3df3234e944daa744f05c6236214e19684069d67bcce81895b299e7abb9f2d95ae4c52e13fd7ce4dba398762b3c5c38674150aa4dc9667 WHIRLPOOL 8f37c6db64a3c9814b50c59e780ef84a11eba184d9f272330b65f9e96924b00ca4106402740cd6ba2ba99cdb9363efcae5aa107e41e1c92519ba3c85b4249adf
 EBUILD netbeans-ide-9999_p20160212.ebuild 30238 SHA256 ed88defec0bad0ac7ce8796b638108cabecc3ca507f323c45157cdb39fa3cf78 SHA512 053f9153b82de9ef3af3f6add954cbceaf507f24beb0de049121b0a0c910c91b9a24b8c678162c8c671cdc90ce14980032a15fdd6f162fbbbe0c2597ffba0d9e WHIRLPOOL d11f69c83a8ca903429c245c318bf1a00cd5b045921d5b32885cd6f3dc1f0f7304c53f1d4b482f146b6f3392ddcdcfbade2125749c4c5f7eed32618aab85dc6e
 EBUILD netbeans-ide-9999_p20160213.ebuild 30238 SHA256 e8a5053bfdbf8eb6d83232f340273d80f7d65fc4cbecb166b3d87cca70792a2b SHA512 663997e9e8ba7dc339c3e50417e645f93f441a956444c102b84c1472cec4bd9ffde7143eb7257200626f586b9bdf11f342fe2b4c9637fba4ce08887d224b2c8c WHIRLPOOL 8a4e09c99978e4141739d09332e80a2e61105cf8ea7a5444bffdd17ad5fdfcb02b7e58e4bf54042a537ed67a000793432e7854cf6dd1f6613258526b206e1f67
+EBUILD netbeans-ide-9999_p20160214.ebuild 30238 SHA256 8847255b73ed3b6db076b21246cc53e8108b2a3bc0866704596798d8e7f5661b SHA512 8ea5d6a6c3ec5cca17d2dc9fa25d254169a41242f5f52de3c6baed5f1883f2c129057ddae92a51b33c0d7b1f883dec325a237ac4ff60d4a1de642801621113d7 WHIRLPOOL b23afa926798e106d2be008441254b0b318f6de28ed751b9c7128da49cb8e2668701d8cd587d0ec235cab8bb48d1b1e4a2ed164d0c73793fe6238266bbb9de6f
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160214.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160214.ebuild
new file mode 100644
index 0000000..72dbcbf
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20160214.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-14_00-02-15/zip/netbeans-trunk-nightly-201602140002-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 0127da4..b468c36 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -53,6 +53,7 @@ DIST netbeans-trunk-nightly-201602100002-src.zip 209617536 SHA256 e3ded1537a0041
 DIST netbeans-trunk-nightly-201602110002-src.zip 209640470 SHA256 631a7eaf189159858a9a68610b569d050a1b415091068b05a4b99f2f6341ccc2 SHA512 abbf79593aeadec3c678ef27e90e9e3cca6349640a486338d76a97eb12557aaec426646942fba4e97fe5e62fd84f390a813f978df1c5a107f5f60b297acefd71 WHIRLPOOL 2543bc7214823b6e061c29beaf895f1c34a1a51f80276e1022d0a7824ecb725ba1669333f7823954ddc689f07f48944f503c4d74b89c0eaf004e713bfafa068b
 DIST netbeans-trunk-nightly-201602120002-src.zip 209659016 SHA256 d64bb61be92947939476ff606719578b8aa4d6eedfe10b01e123acd9a0978f61 SHA512 111a1562cb8652fa40896c1bfe3f5a83b38786b2b58191af86cc975414f8d76e7657ffabc600de97930090621591199429ec5e7b3c2d69fbe2542cc172042eaf WHIRLPOOL dcdd5411d3f8badf6805fb3bb0ed631083b678600b565c3216ab9ca3e76a36f4e7f39da48214fecefa8a79fbc775bcb88fff3040e503ad0e72379acc572287e5
 DIST netbeans-trunk-nightly-201602130002-src.zip 209667550 SHA256 0709efad4e00ff13999707c19665af39f1100fa4cb91c49d12fc1cce461395e4 SHA512 c52ca30fcebd5fb2d5fad3432189100f3a95a0b13ac1ecb4b7e711bb6ab49a26c9f7e374757a17369a5d8c4785ec7e5f125078dc2b88ee137fcd0e2d15838710 WHIRLPOOL 4db8529afaa742f708c090da04f8f8cdc6b4c190a9993501ac45cdea5574e7b1909e0ae8a9958205faefa7d08b63f259c5addc8285ee714b1e196fdbdef33190
+DIST netbeans-trunk-nightly-201602140002-src.zip 209669684 SHA256 be43475a61235e79ef5fdb6348c4c0b91a0220f4604e0c5e60983207b89beaa4 SHA512 40df5c2eb08965291ce043d6d6109a3db7033d66195cfef110e5737275070c9c5c1f7e275fdba53583448acc5d094feb51aa266a4b8b869291e539d7cdd66a26 WHIRLPOOL 0087d75b832537662e7ce2d59cdb291c6c2824856abd2233264e206d0afbff2299a3ec77b9cbd3d6238abc45efcab3849518ef2a1a392323bfd3300f196c98c6
 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
@@ -77,4 +78,5 @@ EBUILD netbeans-java-9999_p20160210.ebuild 14930 SHA256 6fa9cdbd63d13f3ce1534223
 EBUILD netbeans-java-9999_p20160211.ebuild 14930 SHA256 b363b3cbd854107f28f6d017b2f52ecef59992cb4aa6fb23232f984047d630cc SHA512 c5d119dafd91e764943af293fa0706777e8fb736d50572fafcbe37bdeacd8f85e1522037a89d8cc6d12d44cc9ce93f19fbee69e000665686e7c54d90c50c87bd WHIRLPOOL 58535ab610f7b4f7c887a26ba372ff6cf9d5fed7e6a5728ea929eaef3fe2a6fad74bc903e90402fd014e1d7ca91c31400feb51d3ee6aa33f1d20dce845b7fc37
 EBUILD netbeans-java-9999_p20160212.ebuild 14930 SHA256 e56f084bb808dba86803297fd4b9cbf1cbc26544c291401ced2a95c0199c4c23 SHA512 88352ad06c3f288691efe2b515477ca70b9fb438e71a072b2e06ea2f3899c85d432c66bed0d0f839a60f01b390f8a0b03c43c1bb9d554bf3832e8216ee1c3879 WHIRLPOOL fe8bb40a4e5e7b61a97f06ef5524b5463ca8cf9f010eb6bdcce58d4c767ff272a4e3dd2b755803ad6ac2676ca1922739edb1175e2f34a17d1738d2a566328645
 EBUILD netbeans-java-9999_p20160213.ebuild 14930 SHA256 bd6b9ac8b8530a15ca737e9ad452c728e9bb12bf37f0829c287fe8c2343c05ff SHA512 79db6e40c2bb077eee1adb35419331257e2d679c1171dc444b0f2b8df75e88d2911ff7f7a1f7ed8e354dfbd1447e8f4b8dc580275dd399375b63b06fc9af4481 WHIRLPOOL 08e6313606a098eef78422b9d407222fe551fb6d8f4d9bb0bd17bdbbe814bc3f630a8f771dd32025c8c6575919d93ed40bb49bf0f5edac898bc5fb7154e9b846
+EBUILD netbeans-java-9999_p20160214.ebuild 14930 SHA256 af0f75ead3b31af6f3bc9513ecd354bb2311a3883e910fb156f5eae8f71cf6f2 SHA512 90c1fdbad4850dffd535aedde945ea206548e64f11c0c196c36af9c24f060bc6b6d768475fbbdc8b130f1da9f8167e908e82b33e94d1e0fc3dbacd2b2abbf364 WHIRLPOOL 26c2a05dfa68dc634ce0c05e1c42315b41570f20287dd40bf6d873d744d9d440cd3e826917fb12b5b8f00ce7e5a4b489adc247489ddda2ce9f251d4643c4801c
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160214.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160214.ebuild
new file mode 100644
index 0000000..5351638
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20160214.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-14_00-02-15/zip/netbeans-trunk-nightly-201602140002-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 44a67b7..ad6d7bc 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201602100002-src.zip 209617536 SHA256 e3ded1537a0041
 DIST netbeans-trunk-nightly-201602110002-src.zip 209640470 SHA256 631a7eaf189159858a9a68610b569d050a1b415091068b05a4b99f2f6341ccc2 SHA512 abbf79593aeadec3c678ef27e90e9e3cca6349640a486338d76a97eb12557aaec426646942fba4e97fe5e62fd84f390a813f978df1c5a107f5f60b297acefd71 WHIRLPOOL 2543bc7214823b6e061c29beaf895f1c34a1a51f80276e1022d0a7824ecb725ba1669333f7823954ddc689f07f48944f503c4d74b89c0eaf004e713bfafa068b
 DIST netbeans-trunk-nightly-201602120002-src.zip 209659016 SHA256 d64bb61be92947939476ff606719578b8aa4d6eedfe10b01e123acd9a0978f61 SHA512 111a1562cb8652fa40896c1bfe3f5a83b38786b2b58191af86cc975414f8d76e7657ffabc600de97930090621591199429ec5e7b3c2d69fbe2542cc172042eaf WHIRLPOOL dcdd5411d3f8badf6805fb3bb0ed631083b678600b565c3216ab9ca3e76a36f4e7f39da48214fecefa8a79fbc775bcb88fff3040e503ad0e72379acc572287e5
 DIST netbeans-trunk-nightly-201602130002-src.zip 209667550 SHA256 0709efad4e00ff13999707c19665af39f1100fa4cb91c49d12fc1cce461395e4 SHA512 c52ca30fcebd5fb2d5fad3432189100f3a95a0b13ac1ecb4b7e711bb6ab49a26c9f7e374757a17369a5d8c4785ec7e5f125078dc2b88ee137fcd0e2d15838710 WHIRLPOOL 4db8529afaa742f708c090da04f8f8cdc6b4c190a9993501ac45cdea5574e7b1909e0ae8a9958205faefa7d08b63f259c5addc8285ee714b1e196fdbdef33190
+DIST netbeans-trunk-nightly-201602140002-src.zip 209669684 SHA256 be43475a61235e79ef5fdb6348c4c0b91a0220f4604e0c5e60983207b89beaa4 SHA512 40df5c2eb08965291ce043d6d6109a3db7033d66195cfef110e5737275070c9c5c1f7e275fdba53583448acc5d094feb51aa266a4b8b869291e539d7cdd66a26 WHIRLPOOL 0087d75b832537662e7ce2d59cdb291c6c2824856abd2233264e206d0afbff2299a3ec77b9cbd3d6238abc45efcab3849518ef2a1a392323bfd3300f196c98c6
 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_p20160112.ebuild 4971 SHA256 a394e6f267c47d345ac7edb2591744b71141837c8d3a4a25b14ed8cde362c1d7 SHA512 a57b2de99a828f2eddf7cfaf98ba5b8d79207b0f7a69c7314bdb6122a5ffba20087242dd97e3343f59dd87d625091b5341269bc9761b52f5676af8b127c06378 WHIRLPOOL d72f003984cf2b33a80e148dbad5b92f7a4af439569344356a643840d9f0153d0f3fb9229b05ecd809e50156f2f0cbd6b3480069621cc858f2c4f90e5679f522
@@ -50,4 +51,5 @@ EBUILD netbeans-javacard-9999_p20160210.ebuild 4971 SHA256 588a51484a7ee09c7a34e
 EBUILD netbeans-javacard-9999_p20160211.ebuild 4971 SHA256 2b73262e2380a90dbb12f28b7ebaaec57c8ba45d3b9d9d10538626f119fc312d SHA512 36c344940c57832f7d2c5f237b9205dd560d10c7ab5becd27616a1608fb1877cda18c8ce2a02ad404a19b1892eef6817f56ae1f27b4206bee025b17cbab7922a WHIRLPOOL b207ed80f1fd2a0fe865b3f7013ba1f12799e686c452b2cc5bb69b4912921c7b8d05130aaf3ce7ffd1927ec1d796734b8337499b93dd3bfa2cb1977fcb1d9a13
 EBUILD netbeans-javacard-9999_p20160212.ebuild 4971 SHA256 1669d3e18c9bb7bd21259ee7a0ec7c598613d0eb2347a5f2d5a977abf24f6791 SHA512 fbe3cd747aa682b3e9a21d98b7fedb7f5e9161041cc8a85e9491e0ee44079f6963454541e85c29710020099bcd5c8e94ab7157186235d07d90628a8463ad26ab WHIRLPOOL 9fa48c7557d799c3f608f33fc3e66aacd0130a7ac21fd2ec95c2fc3efc609d6283abd5661938c4c095a9965c399a6ae63ccd5e9e17eac221290f975df2ec3215
 EBUILD netbeans-javacard-9999_p20160213.ebuild 4971 SHA256 8d40ba84345c4d93550deac1f684b4b2bbdd0c6d42485f243f5084d1a76ade11 SHA512 2f5d7d4fbe70bcb819289e94a7ad2a5f39ab7f6ad5147b502fe5037155037a074bb04dec9336ce1201e71f83b726d549950ffaeb36711ab3957c6b9fa7906f5f WHIRLPOOL 439aa657917c2ba8fa45df2d29abac80ca9a9dd6f612550e7fb2d5d6df662627c3dc501dc3126ad81c97bec78b62f8d94f20deed23894aa3ed2363bd8155131c
+EBUILD netbeans-javacard-9999_p20160214.ebuild 4971 SHA256 8dffd1c646f02f6f1598d5caee54be542cffc76a42d839d5c62c14883cef46ca SHA512 e90611d05afd4855f3358168e597422a29f3a5225a3b997c3b7843197b5798422096ae8cf5a33a935f9c885eba248afcdea43708fb3d807bc938e3771680b4d8 WHIRLPOOL aea90e65aaaae33b1cbee2c2a5ae69a9f6e6c94f76e6791573f35552f5007ed40a6856fe0a1c23c17733f1f22755291a78acf0e5285ab7985a1443beb4d330e3
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160214.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160214.ebuild
new file mode 100644
index 0000000..8d9f2dd
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160214.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-14_00-02-15/zip/netbeans-trunk-nightly-201602140002-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 a0ecfe0..491cb82 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201602100002-src.zip 209617536 SHA256 e3ded1537a0041
 DIST netbeans-trunk-nightly-201602110002-src.zip 209640470 SHA256 631a7eaf189159858a9a68610b569d050a1b415091068b05a4b99f2f6341ccc2 SHA512 abbf79593aeadec3c678ef27e90e9e3cca6349640a486338d76a97eb12557aaec426646942fba4e97fe5e62fd84f390a813f978df1c5a107f5f60b297acefd71 WHIRLPOOL 2543bc7214823b6e061c29beaf895f1c34a1a51f80276e1022d0a7824ecb725ba1669333f7823954ddc689f07f48944f503c4d74b89c0eaf004e713bfafa068b
 DIST netbeans-trunk-nightly-201602120002-src.zip 209659016 SHA256 d64bb61be92947939476ff606719578b8aa4d6eedfe10b01e123acd9a0978f61 SHA512 111a1562cb8652fa40896c1bfe3f5a83b38786b2b58191af86cc975414f8d76e7657ffabc600de97930090621591199429ec5e7b3c2d69fbe2542cc172042eaf WHIRLPOOL dcdd5411d3f8badf6805fb3bb0ed631083b678600b565c3216ab9ca3e76a36f4e7f39da48214fecefa8a79fbc775bcb88fff3040e503ad0e72379acc572287e5
 DIST netbeans-trunk-nightly-201602130002-src.zip 209667550 SHA256 0709efad4e00ff13999707c19665af39f1100fa4cb91c49d12fc1cce461395e4 SHA512 c52ca30fcebd5fb2d5fad3432189100f3a95a0b13ac1ecb4b7e711bb6ab49a26c9f7e374757a17369a5d8c4785ec7e5f125078dc2b88ee137fcd0e2d15838710 WHIRLPOOL 4db8529afaa742f708c090da04f8f8cdc6b4c190a9993501ac45cdea5574e7b1909e0ae8a9958205faefa7d08b63f259c5addc8285ee714b1e196fdbdef33190
+DIST netbeans-trunk-nightly-201602140002-src.zip 209669684 SHA256 be43475a61235e79ef5fdb6348c4c0b91a0220f4604e0c5e60983207b89beaa4 SHA512 40df5c2eb08965291ce043d6d6109a3db7033d66195cfef110e5737275070c9c5c1f7e275fdba53583448acc5d094feb51aa266a4b8b869291e539d7cdd66a26 WHIRLPOOL 0087d75b832537662e7ce2d59cdb291c6c2824856abd2233264e206d0afbff2299a3ec77b9cbd3d6238abc45efcab3849518ef2a1a392323bfd3300f196c98c6
 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_p20160112.ebuild 6293 SHA256 7e8368779c2bd305460f09fa106460140f756861a13348d7e1ed18f262cc7d21 SHA512 0bc2f004325466b3bc016c0cba37cf4091ece1c993cb9b1a7af365f29938e73c78800edd6e27c8b9cf30a818600cce321e330bf23e6616ff74815b9f75236595 WHIRLPOOL 2437c8b5d3de5e542b57318fdb090c3774c2256053de1bf9dfa9596a41b37bffd928bbc67ee4971f0e9a26a4830751ba98df334c7914b0ab8b75f3bcdcc87979
@@ -48,4 +49,5 @@ EBUILD netbeans-javadoc-9999_p20160210.ebuild 6293 SHA256 15f2c32fc269a12e200312
 EBUILD netbeans-javadoc-9999_p20160211.ebuild 6293 SHA256 74d6b4a903c8162ed2228b289e935bb967951b18cd9df981b539635a34c10d8e SHA512 755039f3612c1f6bd62c176113b7d7dc0da4bfe1063430c3af839138ab2816421dd2bb0835a17a190c04438fb2074e6a5ea538c94c5ab4a57b144e250d5b66b1 WHIRLPOOL 2b4fcb4e6626efe4fbc3901b86e543d9f6683cd2c3c01c14b175713317858d771d58ee09a21136a9c30a0a921c13a83cc032ac140ec0d8c35f0af9a2cb7035b0
 EBUILD netbeans-javadoc-9999_p20160212.ebuild 6293 SHA256 1d4c59ab978277129498d26959753ff1a2d041147b3446d4e72fd08032e355dd SHA512 8350b556ee681e8f1903e5a32e33f7a1fdc8789aadc226f72f1c49a36acae2101ab77db3e4848517f6e16182921cdc6310cdd1a5a5efcf98c4c8e4a89510b851 WHIRLPOOL ef58c3b6ae725d5193a60fc7b08bec5a999e6469e362a73856bfcf763f79f122c455c84ccd87909b7b61aebdcd226d69fe01c4832180ba20b7525028354825cb
 EBUILD netbeans-javadoc-9999_p20160213.ebuild 6293 SHA256 f17d967d08a9d363f20c8c7b3ccd1e4e7fc6e0b33230985120af97965ee92244 SHA512 dac4abe90bc537ca7dfdfc2816fd12dc80e69ad0883740d3dd40d8ec511df93a1f52623c7cadef5292320fb8e8ea3caf9e1d8d882c84ba0b3b2236c875dd8e43 WHIRLPOOL ee9b65900be6940aaa2bbef019b5ac135b548cf9b39e48084d556f1101e721cdd1d3eed37ea70c1421dbf594c3571f61cea609de72e4ccf97f0f5e9e6ffb0be4
+EBUILD netbeans-javadoc-9999_p20160214.ebuild 6293 SHA256 17a480ccf9bae458384e87e212808e6cf69e13833a7a1513bb429da82e8d6d39 SHA512 64cf0bfc5bc20f2833e853bd0806676d2153d435085ff8649d8d794cf3c09b27713eb68e8170c818375226d8ca76ac6fe8241cae7d492657a9eba487e872025c WHIRLPOOL e51c966f5959e1cb9ab0898b29f05b3369bc6bdcad336ea237c3c39424ba40f7b587dcbe84d44e86d51fed012608e318e3f6af608b1248d9a42df705861c5006
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160214.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160214.ebuild
new file mode 100644
index 0000000..d71b8a5
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160214.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-14_00-02-15/zip/netbeans-trunk-nightly-201602140002-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 6737ea7..e6667c2 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201602100002-src.zip 209617536 SHA256 e3ded1537a0041
 DIST netbeans-trunk-nightly-201602110002-src.zip 209640470 SHA256 631a7eaf189159858a9a68610b569d050a1b415091068b05a4b99f2f6341ccc2 SHA512 abbf79593aeadec3c678ef27e90e9e3cca6349640a486338d76a97eb12557aaec426646942fba4e97fe5e62fd84f390a813f978df1c5a107f5f60b297acefd71 WHIRLPOOL 2543bc7214823b6e061c29beaf895f1c34a1a51f80276e1022d0a7824ecb725ba1669333f7823954ddc689f07f48944f503c4d74b89c0eaf004e713bfafa068b
 DIST netbeans-trunk-nightly-201602120002-src.zip 209659016 SHA256 d64bb61be92947939476ff606719578b8aa4d6eedfe10b01e123acd9a0978f61 SHA512 111a1562cb8652fa40896c1bfe3f5a83b38786b2b58191af86cc975414f8d76e7657ffabc600de97930090621591199429ec5e7b3c2d69fbe2542cc172042eaf WHIRLPOOL dcdd5411d3f8badf6805fb3bb0ed631083b678600b565c3216ab9ca3e76a36f4e7f39da48214fecefa8a79fbc775bcb88fff3040e503ad0e72379acc572287e5
 DIST netbeans-trunk-nightly-201602130002-src.zip 209667550 SHA256 0709efad4e00ff13999707c19665af39f1100fa4cb91c49d12fc1cce461395e4 SHA512 c52ca30fcebd5fb2d5fad3432189100f3a95a0b13ac1ecb4b7e711bb6ab49a26c9f7e374757a17369a5d8c4785ec7e5f125078dc2b88ee137fcd0e2d15838710 WHIRLPOOL 4db8529afaa742f708c090da04f8f8cdc6b4c190a9993501ac45cdea5574e7b1909e0ae8a9958205faefa7d08b63f259c5addc8285ee714b1e196fdbdef33190
+DIST netbeans-trunk-nightly-201602140002-src.zip 209669684 SHA256 be43475a61235e79ef5fdb6348c4c0b91a0220f4604e0c5e60983207b89beaa4 SHA512 40df5c2eb08965291ce043d6d6109a3db7033d66195cfef110e5737275070c9c5c1f7e275fdba53583448acc5d094feb51aa266a4b8b869291e539d7cdd66a26 WHIRLPOOL 0087d75b832537662e7ce2d59cdb291c6c2824856abd2233264e206d0afbff2299a3ec77b9cbd3d6238abc45efcab3849518ef2a1a392323bfd3300f196c98c6
 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_p20160112.ebuild 4717 SHA256 982630456f940a9b3c9653503cfcad93b1b52088d06c646aeb48f8248cf9c866 SHA512 3094371f4d0925702822f7990e11abe55a1e20f5370f05efb3abd74ed282dfd04dbdeb739f476132f4207cff28c107aaf6ea98c6714097937358c09ba7e75d4d WHIRLPOOL efcfe1658aa355c23c2809e44e96af1e3eb5e3911651740e40c146738865d43fcae4015c238500a227ce8b1e80a25807aca0f712d2935ee15af0538e89dc7041
@@ -55,4 +56,5 @@ EBUILD netbeans-javafx-9999_p20160210.ebuild 4717 SHA256 db3c8506e7b6cb26c6d9981
 EBUILD netbeans-javafx-9999_p20160211.ebuild 4717 SHA256 259c2d90c30b79be4cbc3c39c10585f6503e01b247b5f630be37f6b1801e7635 SHA512 a4cd128087a6cbd45bb34fe12baf63106c82d40367217fb42c7377e9cd59823e2cc9579b50be58f0ccc92d14cfb3e9e2050e5a3bc708a0fb51666f6c08c464c7 WHIRLPOOL 69c16e609dcf0da407fd49bd3f99e361ebbfa16fe69434ac7622015d244a0b4de7eff44635c28ab42392790ccb7b858ab5dac9bbfaa190aec93ff5ea7cb7ffc3
 EBUILD netbeans-javafx-9999_p20160212.ebuild 4717 SHA256 f7adfd7149de59c94ed711d1e3aa577aa5fec5c8fe9e8d683adb95bca1b5520f SHA512 cb712bac2b02007a331c1345fccb04f8225cec2bf89f60b814cfb6534f37579125cc539ad690eab7a890c95d14b1a12e23624b1422e6c79c39067f0d5e845a1b WHIRLPOOL 88408f5bfd1d77eff6afb00d3e0ba2e33dda172cc1a0646fc0b4667ede43b54e4555e2a914c7153431a9f542d7e78163fe50e3af6b7030e44d46c8b1b729ce11
 EBUILD netbeans-javafx-9999_p20160213.ebuild 4717 SHA256 24721bd4fcaa7ab4f7b3813278e6284fef1dd2b05bfa05364877949bc30bb969 SHA512 fc41aa3bb4d140e0a2c29e851fce9f5f68c7966e2f991c00652f5badf20127cdd72f7b1ef5164b5d409bd462387960060e4fb17d39d80cbb97cc61043cd8f8ab WHIRLPOOL ceeea6c6e58abd24bc461cca114b8a2e4aaaf91032475c6a186795dc3a7af315153f844ffee45f612fbc16dc8b8919bcf15693bbf703fe47e69bd88c9a8299fa
+EBUILD netbeans-javafx-9999_p20160214.ebuild 4717 SHA256 6abcccd46dc86fa361c2f58c81b2346939afb79ef71a9543b01148a5e5c19bb6 SHA512 08f267845f080530e8d5b4d711747516b95ce4e06ddee42c0951805e113afdb7efb5482797d5467f0c6a2d8d532b08b7e6929006449b385d3254ca972e43600c WHIRLPOOL a01140320164483cba1a6e93499536d50ae15b28e48af704f11bf66276de4e3c5918a94c70e975973b145ad58bf93b668c61ef451789ff6417124e2b04f52867
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160214.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160214.ebuild
new file mode 100644
index 0000000..fc33a7e
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160214.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-14_00-02-15/zip/netbeans-trunk-nightly-201602140002-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 5353afd..0aeb138 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201602100002-src.zip 209617536 SHA256 e3ded1537a0041
 DIST netbeans-trunk-nightly-201602110002-src.zip 209640470 SHA256 631a7eaf189159858a9a68610b569d050a1b415091068b05a4b99f2f6341ccc2 SHA512 abbf79593aeadec3c678ef27e90e9e3cca6349640a486338d76a97eb12557aaec426646942fba4e97fe5e62fd84f390a813f978df1c5a107f5f60b297acefd71 WHIRLPOOL 2543bc7214823b6e061c29beaf895f1c34a1a51f80276e1022d0a7824ecb725ba1669333f7823954ddc689f07f48944f503c4d74b89c0eaf004e713bfafa068b
 DIST netbeans-trunk-nightly-201602120002-src.zip 209659016 SHA256 d64bb61be92947939476ff606719578b8aa4d6eedfe10b01e123acd9a0978f61 SHA512 111a1562cb8652fa40896c1bfe3f5a83b38786b2b58191af86cc975414f8d76e7657ffabc600de97930090621591199429ec5e7b3c2d69fbe2542cc172042eaf WHIRLPOOL dcdd5411d3f8badf6805fb3bb0ed631083b678600b565c3216ab9ca3e76a36f4e7f39da48214fecefa8a79fbc775bcb88fff3040e503ad0e72379acc572287e5
 DIST netbeans-trunk-nightly-201602130002-src.zip 209667550 SHA256 0709efad4e00ff13999707c19665af39f1100fa4cb91c49d12fc1cce461395e4 SHA512 c52ca30fcebd5fb2d5fad3432189100f3a95a0b13ac1ecb4b7e711bb6ab49a26c9f7e374757a17369a5d8c4785ec7e5f125078dc2b88ee137fcd0e2d15838710 WHIRLPOOL 4db8529afaa742f708c090da04f8f8cdc6b4c190a9993501ac45cdea5574e7b1909e0ae8a9958205faefa7d08b63f259c5addc8285ee714b1e196fdbdef33190
+DIST netbeans-trunk-nightly-201602140002-src.zip 209669684 SHA256 be43475a61235e79ef5fdb6348c4c0b91a0220f4604e0c5e60983207b89beaa4 SHA512 40df5c2eb08965291ce043d6d6109a3db7033d66195cfef110e5737275070c9c5c1f7e275fdba53583448acc5d094feb51aa266a4b8b869291e539d7cdd66a26 WHIRLPOOL 0087d75b832537662e7ce2d59cdb291c6c2824856abd2233264e206d0afbff2299a3ec77b9cbd3d6238abc45efcab3849518ef2a1a392323bfd3300f196c98c6
 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_p20160112.ebuild 4412 SHA256 cdadf540aa0c316af2afd1dffd356cfe8d0058a7726a3d26e96e2f4495832981 SHA512 f077a926454800280b9937e4a5e3849b16347ae86579ca3d2f20e2ba67b474f861bfbf8648234eec3d84729c89de4d9ba696f21cf01fbf881e4808539bcd7e6a WHIRLPOOL 45d1cfd49be0f74a4c3487cb7524a5a88c1036567da9c1377d9be0f98279e1f1039222bbd96b3699bf451f8ccf247c9f914bd96547d3ce654b15a2fb61b0a1e4
@@ -47,4 +48,5 @@ EBUILD netbeans-mobility-9999_p20160210.ebuild 4412 SHA256 d6e814ca152fa1d24681c
 EBUILD netbeans-mobility-9999_p20160211.ebuild 4412 SHA256 55ce0ba69ef85f41040bca250ed25fe42cd2b217d62ac0aac03f0d39f63c3983 SHA512 09706ce7f4bb893a7dff58e769d50eefb22dce4ba2f4529e8f5fba0ad6e823d99728b976b5a912ecde48600dd7ed2e0e1f6bb87b6243f03d3ab849c428bb871e WHIRLPOOL 551b7cf5820ea53c74562b47fd2b6b5c0196b19ad63b783ec7c10759be076cc2b8400cfd60f4c77a07d004a793ec7957c5da347909f83fee296a9729991f71bb
 EBUILD netbeans-mobility-9999_p20160212.ebuild 4412 SHA256 3534ffe3b0e52a8d67d44b8770157f2946bbfd374dbed963dfddb5a2698a4ad6 SHA512 b5eb14786f708f544283d64cda2dcee8a36c1b12cae8607f382dc0c74e5f9769a75b008162a050d4ac23e42a598da830d6c9c2e1d28a5fd0bf0e9a5e54851b54 WHIRLPOOL 450afe33ec8d7bb111b9d7fcc1b3abb987a5f2bc8cbcea27b15d3a66e7d7377a101cff80c8b4d7e0ce8a4c6607e2022694cc8ac5110d97cbc6a0d965784e135c
 EBUILD netbeans-mobility-9999_p20160213.ebuild 4412 SHA256 97e0eecaf099f99c9fc8ebf00603bcf1f26a4f024d589a2147433be2414f4915 SHA512 430d8cf7354a526dd205b23f224ffbf1d6aedb4dffa013176218fcd7bb56a41f44296f523735ebd2f79074b24912601599a4b1d54a993a1a49970164a247ac1f WHIRLPOOL e277d498d2431d7a2d3c92b420d7f4bf49c7a47e8e0e5976fcee852d3f1054f2e68c3f01c113259334affa2275f8c0f73c307ed8507da4e1ec32f4bdfb344e8e
+EBUILD netbeans-mobility-9999_p20160214.ebuild 4412 SHA256 07e9dcca23bb159008501f62f0fe6243da10f1986bda8ce61d4bd1d5937dd38d SHA512 fd34538088cc74121a9823b35efba9fdff9b86114a7dfa853ab642e85b0c9053cce8c7f7adffcf7b5f7e6625cf7b57d93c3d9b50b1d7ebb464847db7839ae73f WHIRLPOOL c906556d58952d65fa33cb99fe97651f206ea0906c9858561ab110b807f552dc95711921590474d847788ae0654968a6aa432408edb38b22dc4057645ba6a2de
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160214.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160214.ebuild
new file mode 100644
index 0000000..d5d7c28
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160214.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-14_00-02-15/zip/netbeans-trunk-nightly-201602140002-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 ffeea7e..d91f5df 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201602100002-src.zip 209617536 SHA256 e3ded1537a0041
 DIST netbeans-trunk-nightly-201602110002-src.zip 209640470 SHA256 631a7eaf189159858a9a68610b569d050a1b415091068b05a4b99f2f6341ccc2 SHA512 abbf79593aeadec3c678ef27e90e9e3cca6349640a486338d76a97eb12557aaec426646942fba4e97fe5e62fd84f390a813f978df1c5a107f5f60b297acefd71 WHIRLPOOL 2543bc7214823b6e061c29beaf895f1c34a1a51f80276e1022d0a7824ecb725ba1669333f7823954ddc689f07f48944f503c4d74b89c0eaf004e713bfafa068b
 DIST netbeans-trunk-nightly-201602120002-src.zip 209659016 SHA256 d64bb61be92947939476ff606719578b8aa4d6eedfe10b01e123acd9a0978f61 SHA512 111a1562cb8652fa40896c1bfe3f5a83b38786b2b58191af86cc975414f8d76e7657ffabc600de97930090621591199429ec5e7b3c2d69fbe2542cc172042eaf WHIRLPOOL dcdd5411d3f8badf6805fb3bb0ed631083b678600b565c3216ab9ca3e76a36f4e7f39da48214fecefa8a79fbc775bcb88fff3040e503ad0e72379acc572287e5
 DIST netbeans-trunk-nightly-201602130002-src.zip 209667550 SHA256 0709efad4e00ff13999707c19665af39f1100fa4cb91c49d12fc1cce461395e4 SHA512 c52ca30fcebd5fb2d5fad3432189100f3a95a0b13ac1ecb4b7e711bb6ab49a26c9f7e374757a17369a5d8c4785ec7e5f125078dc2b88ee137fcd0e2d15838710 WHIRLPOOL 4db8529afaa742f708c090da04f8f8cdc6b4c190a9993501ac45cdea5574e7b1909e0ae8a9958205faefa7d08b63f259c5addc8285ee714b1e196fdbdef33190
+DIST netbeans-trunk-nightly-201602140002-src.zip 209669684 SHA256 be43475a61235e79ef5fdb6348c4c0b91a0220f4604e0c5e60983207b89beaa4 SHA512 40df5c2eb08965291ce043d6d6109a3db7033d66195cfef110e5737275070c9c5c1f7e275fdba53583448acc5d094feb51aa266a4b8b869291e539d7cdd66a26 WHIRLPOOL 0087d75b832537662e7ce2d59cdb291c6c2824856abd2233264e206d0afbff2299a3ec77b9cbd3d6238abc45efcab3849518ef2a1a392323bfd3300f196c98c6
 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_p20160112.ebuild 4111 SHA256 d943c47450b369ad255008ec45c9c69c7b289c246ea95eef20da9d31e2b3a70a SHA512 46b0be43e13b246a06edadd8479fdd98a7d3b75da9e847e9ef17a420b78958dc2e16750fe7d88aa27ae82403efd90d330a8a14fc1c57b426b712df151ca50fba WHIRLPOOL 7e5a5cbb9f91b612e40797b5073c23f39f5ce1e391765a0cd60bbaeac87a948a76fbe368206eb90ecfa4aa1909149f7348865dab690b668398ce17445ec0691b
@@ -50,4 +51,5 @@ EBUILD netbeans-nb-9999_p20160210.ebuild 4111 SHA256 b14b345085ebc5f695c6ddf1f8a
 EBUILD netbeans-nb-9999_p20160211.ebuild 4111 SHA256 e6aa83c3a37ea7943e5c7ff56b5ce6b531f5a55c03797380c47973ceda8cbbc3 SHA512 71d4bb788ada65ca08665edb16f0ae7a02d9d6f1941fb9f1bbade6f6fae62fee7e834f53cc25881f52202715369c692a77f5690cf2f004d9367ff2519f69948f WHIRLPOOL c8a8c111d7c48a2185dfd3fa8bc984ccd85e2f5050189ec128bbda2de810b0c3fa8ca202733cae6638b2ec14bdb6da6840a2ec4de76a82aa29e838cc85e820f2
 EBUILD netbeans-nb-9999_p20160212.ebuild 4111 SHA256 bfc0087d792c67c4a7ae860f732a1c80b92a71c6a5144d8241b60749a9d10496 SHA512 c00615e4aeb7b06df62a3a5a2eea1092f2f4ec114a8245c07c2a06cb103016b2eec44636c4427464b41025dc95a6499755350e712ca21d63c860a8a7259d2a01 WHIRLPOOL 3d95a66e8fffc8769b80834e42a3f8ba9e70f29924452776aaf48f131fed7a249b7535dbc42467ce25d5b5494d270b57cb569d523787bde51b2ea663115603d5
 EBUILD netbeans-nb-9999_p20160213.ebuild 4111 SHA256 5b3115ecafe74a74ef6a1d61ea99f258c9e7e0917c12ded98fc14f982a2d783c SHA512 cc42cb6efe6784439d560786385c48af6c6c1f4ca85ca8f164f2b5318ed82d22e71f8381ff3876eda3a3419ab4f2361b5bfa25bd1a72deb71d417f44a9c00551 WHIRLPOOL 7bc189cd2de91c6c28cab7ad7b52fa6080c285e29417460da532b9038a3d4637a5db4355ae87cd709a13368cc7e049a171a64b92caa0fd8f3986a05c120b0fdd
+EBUILD netbeans-nb-9999_p20160214.ebuild 4111 SHA256 64d84f1430b6dcafff52a98b32ce35fc13a2c9f493dcd267b05c58341febe2b1 SHA512 bea4f9ebf84f90de80691f92a108d0eb6237ed0814c2119f1b00618cc5d3eab7290152fd2d184dff347057ce817d13e5eec23541f6f1b79c29c1baebe7869436 WHIRLPOOL 0bfa17689b06eb9449f0803315bfbda1aa5813c1e87c3a8fa75d31f3598e70ec23bff2c9510b6d3fc322a4a3ba3fd5572e90389de0a2608549a8f1c583094254
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160214.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160214.ebuild
new file mode 100644
index 0000000..835d7bd
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20160214.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-14_00-02-15/zip/netbeans-trunk-nightly-201602140002-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 61e993e..743589e 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201602100002-src.zip 209617536 SHA256 e3ded1537a0041
 DIST netbeans-trunk-nightly-201602110002-src.zip 209640470 SHA256 631a7eaf189159858a9a68610b569d050a1b415091068b05a4b99f2f6341ccc2 SHA512 abbf79593aeadec3c678ef27e90e9e3cca6349640a486338d76a97eb12557aaec426646942fba4e97fe5e62fd84f390a813f978df1c5a107f5f60b297acefd71 WHIRLPOOL 2543bc7214823b6e061c29beaf895f1c34a1a51f80276e1022d0a7824ecb725ba1669333f7823954ddc689f07f48944f503c4d74b89c0eaf004e713bfafa068b
 DIST netbeans-trunk-nightly-201602120002-src.zip 209659016 SHA256 d64bb61be92947939476ff606719578b8aa4d6eedfe10b01e123acd9a0978f61 SHA512 111a1562cb8652fa40896c1bfe3f5a83b38786b2b58191af86cc975414f8d76e7657ffabc600de97930090621591199429ec5e7b3c2d69fbe2542cc172042eaf WHIRLPOOL dcdd5411d3f8badf6805fb3bb0ed631083b678600b565c3216ab9ca3e76a36f4e7f39da48214fecefa8a79fbc775bcb88fff3040e503ad0e72379acc572287e5
 DIST netbeans-trunk-nightly-201602130002-src.zip 209667550 SHA256 0709efad4e00ff13999707c19665af39f1100fa4cb91c49d12fc1cce461395e4 SHA512 c52ca30fcebd5fb2d5fad3432189100f3a95a0b13ac1ecb4b7e711bb6ab49a26c9f7e374757a17369a5d8c4785ec7e5f125078dc2b88ee137fcd0e2d15838710 WHIRLPOOL 4db8529afaa742f708c090da04f8f8cdc6b4c190a9993501ac45cdea5574e7b1909e0ae8a9958205faefa7d08b63f259c5addc8285ee714b1e196fdbdef33190
+DIST netbeans-trunk-nightly-201602140002-src.zip 209669684 SHA256 be43475a61235e79ef5fdb6348c4c0b91a0220f4604e0c5e60983207b89beaa4 SHA512 40df5c2eb08965291ce043d6d6109a3db7033d66195cfef110e5737275070c9c5c1f7e275fdba53583448acc5d094feb51aa266a4b8b869291e539d7cdd66a26 WHIRLPOOL 0087d75b832537662e7ce2d59cdb291c6c2824856abd2233264e206d0afbff2299a3ec77b9cbd3d6238abc45efcab3849518ef2a1a392323bfd3300f196c98c6
 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_p20160112.ebuild 4418 SHA256 584ac53aea13aa089a386e43aba0fdfd608615313dfed71c21ec8f636671c93c SHA512 a50e799741ba50529b192f47b7ba564aa53f143897ad56d37d5450f91aca2e9c6449f6ad4efe33f2d7e6ebf79506ab161cd4cd1daee4b92857072c5fa8150f1e WHIRLPOOL 51bd3748dda55e5d70fb28a61447b769acd28b13c621fe51616d22a8644252ff5901305293c77b426b1ff559cf7aa7d21f5d421b339028c0230be657efd02b46
@@ -51,4 +52,5 @@ EBUILD netbeans-php-9999_p20160210.ebuild 4418 SHA256 c5995163e2014aa596498b475e
 EBUILD netbeans-php-9999_p20160211.ebuild 4418 SHA256 437ca854f600ba63dd48963c39f91aed9cb4192efc2ba93db1e18b080ca71cbc SHA512 58adbaf66deaddb5011d60b4bad81a03f7b43ee8bd1867561d0b848692b7f001dad0691903d504b5b53e210fb91800b4d4f5877729f0e5fda77ac80747467a46 WHIRLPOOL 08e5e78f92aa091c8ac7a5230b2c3fcd6f1a6eafde28a9f7e1942f769eeb110c3b7ba469bb452d70919ec825487ce8270896538b62f36a7c1102a82e88460e36
 EBUILD netbeans-php-9999_p20160212.ebuild 4418 SHA256 2543397a088f23249ab951bc3e5e408c51c790af46fba00946fcec05f09c2a73 SHA512 63399f7d1c59ca0bffbc87f9ec1dae5cdc4e3a657b6c2428e705f286760cd95bb43663c4a5be85d7a65759d6bca00395d5c269832650120d9b9e23239c88d516 WHIRLPOOL f5498188d6c41635c72474552d9cd9d41b57d6c30649e0753eb507c97b6c5de4bdaee5d9d48413406b7cd314d930b10e3e54a10f4399236e8455129af68ca0bb
 EBUILD netbeans-php-9999_p20160213.ebuild 4418 SHA256 887c4c6ccf50c7f4392900c3707836fb8981ba5eb901c2838bac56361231cf4c SHA512 c9474afaab574e259293915fca78711e4e5736bc36daf0aa45d61a38f952ef8ab8ff9cb8d92f728f6d7d81d1d74b65fdd3df83c19ec746b46c98c586cfc786af WHIRLPOOL 6e4dd3e62646310c0ba3294012dbf1aba128d423d6b35fce4e8d4a153cf8bd3431b9eea5e1ad85e448aa0eae6ddfb7e004e9052ee3932f454160482246937297
+EBUILD netbeans-php-9999_p20160214.ebuild 4418 SHA256 f226bab825390dd3b0f9f9d76cdd5dd60ac85185144d1e3128e038686bee5bb3 SHA512 6960257b77b03eb7f554a9cf198ea5da3a28d184c0a91062ee8e0aeb7ee9be82b79b6a57ad1a70b0e15c1b5ff6a4fbd7204af20a9398be6796237183d25c0426 WHIRLPOOL fbd603712fe5620f644a58b3d4f995a065623a600a7e701abec872c5f8c44e17163358fb5590c393cb1789130f48ebaf3c340856fc5422e23f872671e3b53712
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160214.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160214.ebuild
new file mode 100644
index 0000000..38988af
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20160214.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-14_00-02-15/zip/netbeans-trunk-nightly-201602140002-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 43bdd25..c96f08b 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -41,6 +41,7 @@ DIST netbeans-trunk-nightly-201602100002-src.zip 209617536 SHA256 e3ded1537a0041
 DIST netbeans-trunk-nightly-201602110002-src.zip 209640470 SHA256 631a7eaf189159858a9a68610b569d050a1b415091068b05a4b99f2f6341ccc2 SHA512 abbf79593aeadec3c678ef27e90e9e3cca6349640a486338d76a97eb12557aaec426646942fba4e97fe5e62fd84f390a813f978df1c5a107f5f60b297acefd71 WHIRLPOOL 2543bc7214823b6e061c29beaf895f1c34a1a51f80276e1022d0a7824ecb725ba1669333f7823954ddc689f07f48944f503c4d74b89c0eaf004e713bfafa068b
 DIST netbeans-trunk-nightly-201602120002-src.zip 209659016 SHA256 d64bb61be92947939476ff606719578b8aa4d6eedfe10b01e123acd9a0978f61 SHA512 111a1562cb8652fa40896c1bfe3f5a83b38786b2b58191af86cc975414f8d76e7657ffabc600de97930090621591199429ec5e7b3c2d69fbe2542cc172042eaf WHIRLPOOL dcdd5411d3f8badf6805fb3bb0ed631083b678600b565c3216ab9ca3e76a36f4e7f39da48214fecefa8a79fbc775bcb88fff3040e503ad0e72379acc572287e5
 DIST netbeans-trunk-nightly-201602130002-src.zip 209667550 SHA256 0709efad4e00ff13999707c19665af39f1100fa4cb91c49d12fc1cce461395e4 SHA512 c52ca30fcebd5fb2d5fad3432189100f3a95a0b13ac1ecb4b7e711bb6ab49a26c9f7e374757a17369a5d8c4785ec7e5f125078dc2b88ee137fcd0e2d15838710 WHIRLPOOL 4db8529afaa742f708c090da04f8f8cdc6b4c190a9993501ac45cdea5574e7b1909e0ae8a9958205faefa7d08b63f259c5addc8285ee714b1e196fdbdef33190
+DIST netbeans-trunk-nightly-201602140002-src.zip 209669684 SHA256 be43475a61235e79ef5fdb6348c4c0b91a0220f4604e0c5e60983207b89beaa4 SHA512 40df5c2eb08965291ce043d6d6109a3db7033d66195cfef110e5737275070c9c5c1f7e275fdba53583448acc5d094feb51aa266a4b8b869291e539d7cdd66a26 WHIRLPOOL 0087d75b832537662e7ce2d59cdb291c6c2824856abd2233264e206d0afbff2299a3ec77b9cbd3d6238abc45efcab3849518ef2a1a392323bfd3300f196c98c6
 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_p20160112.ebuild 9360 SHA256 e1568d88dc48d8564ed633c9869e509cfb7730f6d076a0636189d5f2f346c871 SHA512 918aa87f06955672e1ce2a00ca8319b7ab401e8f72b5584f94570b3fb4938be03af3990f4a4e2577d717e53ff6a3c6c2c8d882241d38fe6075239e451b3e84a4 WHIRLPOOL 06e9090abc2852ceeef6e822159e76835e5029e309cb547956436841b6744765f84e6b9a84a0223b532229abb0e418146b59301cf90c5bdfb6155824a6adacb4
@@ -64,4 +65,5 @@ EBUILD netbeans-platform-9999_p20160210.ebuild 9360 SHA256 0080d91acc8867dd6b50e
 EBUILD netbeans-platform-9999_p20160211.ebuild 9360 SHA256 b353c0e1f2ca4dfd2f65db3442cac980d0901e2cf67bff6772eb353406c53f4d SHA512 297a106fd6d35eef2fa0c721046fdad1233bf1b0f602d1161119c98e1a05fb00a81c8e908b0c58b9aa6acb7721ae785b1061b0d1b2ac1c4da4d3d15c357dded3 WHIRLPOOL 8ffe6f99449b5bc3da7f010bda7ddc949b3ff68c90aa1d28fdd6639d148c332743536514713b1352c94c5e908f9247ff0d6801b1f0e0eab00d2bf073acca52ee
 EBUILD netbeans-platform-9999_p20160212.ebuild 9360 SHA256 6a086ce0567fd806e0c020d79f34fcb9b86fb80716aac9db3a938492af2ff790 SHA512 a3ec5e5a5522af3b3ecae534b87092bbf4c4667195f7a7d9a25ce9be1e04e225328ef9ab02f5009cfea0aa8a20b384cc398c2566c9816bd5cdfd66c0a7724a30 WHIRLPOOL 08ababf09e1269d2e49605a926c85d5ee736a589e46597c8df295ef58cef3efc2ba379db42f2bd7e3dce905d21c53f475ecd2b3804a28e2f56f70d4bab69743e
 EBUILD netbeans-platform-9999_p20160213.ebuild 9360 SHA256 f3e86f309cc017aac873880285f32f5f738485e8d42650a26a92fdd45705ed16 SHA512 e35823621cea7fddf4f3873c8bcd1218019b6ca0650b7400466535bfc99707bd25b7e0998dabfe697ebc125b62bb69fe7cca110b03412353115c93f00eedb415 WHIRLPOOL 17bc659e8e735d315310a9161ab92e8b116e27d7f78fd794f330516290a29c3a6153f0ea5146cbea503da93ceab7f3a903cc733c735287f385fb7ac3f72a435f
+EBUILD netbeans-platform-9999_p20160214.ebuild 9360 SHA256 93d8d0deca5b74f46dc134b7d242ffb0dd040e412587d51f5acdb820bea62047 SHA512 209b5fe8a14133bca44aede8fb46a26753ccdee89c10b7dff518a3f7c792b6eb79a9199b09999b1b231479ba068c6d22da75084141b19b2ad009a61332b5a691 WHIRLPOOL d161d8fb76d98e9a2a787b38aab5862fb5996d2e21c78144bd81198822f4526af80d1939f657573326d7d6d2a779882f2aef44aa049f18e475f3271c9b9e4117
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160214.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160214.ebuild
new file mode 100644
index 0000000..4e45d07
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20160214.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-14_00-02-15/zip/netbeans-trunk-nightly-201602140002-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 e96a951..7699690 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201602100002-src.zip 209617536 SHA256 e3ded1537a0041
 DIST netbeans-trunk-nightly-201602110002-src.zip 209640470 SHA256 631a7eaf189159858a9a68610b569d050a1b415091068b05a4b99f2f6341ccc2 SHA512 abbf79593aeadec3c678ef27e90e9e3cca6349640a486338d76a97eb12557aaec426646942fba4e97fe5e62fd84f390a813f978df1c5a107f5f60b297acefd71 WHIRLPOOL 2543bc7214823b6e061c29beaf895f1c34a1a51f80276e1022d0a7824ecb725ba1669333f7823954ddc689f07f48944f503c4d74b89c0eaf004e713bfafa068b
 DIST netbeans-trunk-nightly-201602120002-src.zip 209659016 SHA256 d64bb61be92947939476ff606719578b8aa4d6eedfe10b01e123acd9a0978f61 SHA512 111a1562cb8652fa40896c1bfe3f5a83b38786b2b58191af86cc975414f8d76e7657ffabc600de97930090621591199429ec5e7b3c2d69fbe2542cc172042eaf WHIRLPOOL dcdd5411d3f8badf6805fb3bb0ed631083b678600b565c3216ab9ca3e76a36f4e7f39da48214fecefa8a79fbc775bcb88fff3040e503ad0e72379acc572287e5
 DIST netbeans-trunk-nightly-201602130002-src.zip 209667550 SHA256 0709efad4e00ff13999707c19665af39f1100fa4cb91c49d12fc1cce461395e4 SHA512 c52ca30fcebd5fb2d5fad3432189100f3a95a0b13ac1ecb4b7e711bb6ab49a26c9f7e374757a17369a5d8c4785ec7e5f125078dc2b88ee137fcd0e2d15838710 WHIRLPOOL 4db8529afaa742f708c090da04f8f8cdc6b4c190a9993501ac45cdea5574e7b1909e0ae8a9958205faefa7d08b63f259c5addc8285ee714b1e196fdbdef33190
+DIST netbeans-trunk-nightly-201602140002-src.zip 209669684 SHA256 be43475a61235e79ef5fdb6348c4c0b91a0220f4604e0c5e60983207b89beaa4 SHA512 40df5c2eb08965291ce043d6d6109a3db7033d66195cfef110e5737275070c9c5c1f7e275fdba53583448acc5d094feb51aa266a4b8b869291e539d7cdd66a26 WHIRLPOOL 0087d75b832537662e7ce2d59cdb291c6c2824856abd2233264e206d0afbff2299a3ec77b9cbd3d6238abc45efcab3849518ef2a1a392323bfd3300f196c98c6
 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_p20160112.ebuild 3472 SHA256 c0f113da2cb18c9befd0e628cc7780e9f7fb1b016dbf9dba3065214ed00b93ba SHA512 ee6e9edb031772d776a7cf3b12eaf420d138f3fb9e926f92505d153f44d0064b1b11a6a104f948e070828b4dd2a14cc59a1f40d82c68ad66e4442aeee1972eec WHIRLPOOL 5da84523f9269c022d328040ffb9283100d829d1798149295396d81d6a732b7ccdb9956f3afb1d1387ef0842f3cb831e2c9a9018eecab94c6aec06f1bb407fbb
@@ -47,4 +48,5 @@ EBUILD netbeans-profiler-9999_p20160210.ebuild 3472 SHA256 c29cb8c559b3bef00ac15
 EBUILD netbeans-profiler-9999_p20160211.ebuild 3472 SHA256 76d15e77d0871b894e0f0526ef34141c7bb3723ce355f2e84c1bb0312365949a SHA512 bc85ee487124d64b550db6e218cbf5f56471a2f171df576447541f6d7df21fc91240b5427e200e3cfb65b769266fd91300b831b4784ee5d6791909d9baf4b181 WHIRLPOOL 31a7501ddf95f6c5d4db24d470489b257c23c846a2f508193c6ba124aad9cffe7953c3b1c8ca75bd728e0de5923823d8bc5f744dec90050368c643f7e4461e50
 EBUILD netbeans-profiler-9999_p20160212.ebuild 3472 SHA256 36a1cfb2fa34fb35945ae28c192d7cad778a6395998e9c76a79d811120dafac4 SHA512 81367b65433073142cad849a0144edd566aa054dee42961fc6169d761149ef16e030c02b0fac7c8f46596fb49e2a0d23d89c3bbdf15c7d42c7a9f8d93d486de5 WHIRLPOOL 77a3125fe17a000bb5244e23b1850522d5baab3bb9882e7fd91d59b6bf8325866df4f9cd17ea8a411598c82a0801b3f061f256ee0aa7384d7648af7c872958b9
 EBUILD netbeans-profiler-9999_p20160213.ebuild 3472 SHA256 f439e6fc8dfba2f2e754a4dee07c514e2928fa596652c5e92eaedbf06b33502e SHA512 d166982caabac7651581aa5a64a45fc39a33b6003633ac6395ad36707ead00eef55acf23f60c0476fa8a0a19cb69b8d6e8db27bcd9eebe3a6dfd127eb624f79e WHIRLPOOL 95d5c7093bd0d7b505f9c4090e3b5f7121e25a66fa247926d4c3be91fa2b70b90729cee0c2f990bf6d1b5db04015ffad8af8d0a14b3e4c2f0fcea0c854897d35
+EBUILD netbeans-profiler-9999_p20160214.ebuild 3472 SHA256 872334da5c7f4979976c259b8e5cdfb8e6439d8f255c5441eb0b6c54ae543a65 SHA512 f243ac96f50fd8626f99c985d8bd3cf20a518f26c071a212e6b96aecdc809757e5ad1593a7dd539374a129e1bdab1532b34841e2f17acb54fc39c95a3a096b61 WHIRLPOOL 2a15dd23d9cc2d34ae7e6e0171a7068c5ce247481b90994bf102e15de96249d10ad05b577287799af13b56cc9c31eb08b6f7aa690af414bc1aa58f25b7bc1dd3
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160214.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160214.ebuild
new file mode 100644
index 0000000..295f220
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160214.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-14_00-02-15/zip/netbeans-trunk-nightly-201602140002-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 0d14f68..f164d75 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201602100002-src.zip 209617536 SHA256 e3ded1537a0041
 DIST netbeans-trunk-nightly-201602110002-src.zip 209640470 SHA256 631a7eaf189159858a9a68610b569d050a1b415091068b05a4b99f2f6341ccc2 SHA512 abbf79593aeadec3c678ef27e90e9e3cca6349640a486338d76a97eb12557aaec426646942fba4e97fe5e62fd84f390a813f978df1c5a107f5f60b297acefd71 WHIRLPOOL 2543bc7214823b6e061c29beaf895f1c34a1a51f80276e1022d0a7824ecb725ba1669333f7823954ddc689f07f48944f503c4d74b89c0eaf004e713bfafa068b
 DIST netbeans-trunk-nightly-201602120002-src.zip 209659016 SHA256 d64bb61be92947939476ff606719578b8aa4d6eedfe10b01e123acd9a0978f61 SHA512 111a1562cb8652fa40896c1bfe3f5a83b38786b2b58191af86cc975414f8d76e7657ffabc600de97930090621591199429ec5e7b3c2d69fbe2542cc172042eaf WHIRLPOOL dcdd5411d3f8badf6805fb3bb0ed631083b678600b565c3216ab9ca3e76a36f4e7f39da48214fecefa8a79fbc775bcb88fff3040e503ad0e72379acc572287e5
 DIST netbeans-trunk-nightly-201602130002-src.zip 209667550 SHA256 0709efad4e00ff13999707c19665af39f1100fa4cb91c49d12fc1cce461395e4 SHA512 c52ca30fcebd5fb2d5fad3432189100f3a95a0b13ac1ecb4b7e711bb6ab49a26c9f7e374757a17369a5d8c4785ec7e5f125078dc2b88ee137fcd0e2d15838710 WHIRLPOOL 4db8529afaa742f708c090da04f8f8cdc6b4c190a9993501ac45cdea5574e7b1909e0ae8a9958205faefa7d08b63f259c5addc8285ee714b1e196fdbdef33190
+DIST netbeans-trunk-nightly-201602140002-src.zip 209669684 SHA256 be43475a61235e79ef5fdb6348c4c0b91a0220f4604e0c5e60983207b89beaa4 SHA512 40df5c2eb08965291ce043d6d6109a3db7033d66195cfef110e5737275070c9c5c1f7e275fdba53583448acc5d094feb51aa266a4b8b869291e539d7cdd66a26 WHIRLPOOL 0087d75b832537662e7ce2d59cdb291c6c2824856abd2233264e206d0afbff2299a3ec77b9cbd3d6238abc45efcab3849518ef2a1a392323bfd3300f196c98c6
 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_p20160112.ebuild 5280 SHA256 2706a495b44cb9a0c8600f21782829b3e2ac664f14847fc14df1b749270de17c SHA512 163bac19a3d10f6bf3e79d6ee6beb20325f3a66f1170d8084972a923b2ecb5743c26b45ea9f71fcbf54f7970fd8f34c76b891aef0b5e109d6f8f406beb532ce0 WHIRLPOOL 9f1aff6b0f0aaa53e899a6202847a4f7056621ca901c310bf7638e5f673a12d031ce0d3e92ac64c36278ea6966fc45542257e553b0174a937584a5a40d6022d4
@@ -62,4 +63,5 @@ EBUILD netbeans-webcommon-9999_p20160210.ebuild 5280 SHA256 d450fd549361ee18dc10
 EBUILD netbeans-webcommon-9999_p20160211.ebuild 5280 SHA256 f58b5863768ad7cfb5c50bdd739142379154e47117a196ddf78bae4f68f696b5 SHA512 1448fee79d4f90524c82f10ada35dec0639fb39555601a9f2aa062d49bc0e9d890c49de5e6fb6144ec1f7ed38f20e1d9da8133cdc27bdd01cf054d177c3c0d9b WHIRLPOOL 61090a215896e1620aee6d017ecaa224195f7b0a12734c0a0518f9437e6132f18307f90a1130340dbc7e5672587420c2e5afa499bd0ebeb393978fa4b9ab9953
 EBUILD netbeans-webcommon-9999_p20160212.ebuild 5280 SHA256 bf1bd6a83533a7e4f09f70ba0926dc8f9508b35c9f65d34a4a3c9833ac119ad6 SHA512 8daa6d05f01c9e2ce15c46c0da2b3e0c774113ffac11305bf4b6e179366803ec36be3643bfa1f8e9e2066dfc1406c48272c393a7880bd629df8129ad95047d42 WHIRLPOOL 3baf896c7e2060741832c83420642dbcdc369c085ce5a4290f4616bfd76c1ff50dc8301a0e1d58b71fb979d872950de5e0ccb5ab9a3ea06c9ac68d23fc1fdd18
 EBUILD netbeans-webcommon-9999_p20160213.ebuild 5280 SHA256 67bf78b2a995908643d8e4d4394c2de7d71df17f1c3bd97528eef39dd56a934e SHA512 4ec407e2cc2aa3bdc0e975ffb69c467e6caf3b49bb2bd262817ae9d35d283af3aad9d4d8fe46b3e8f876c30691e733e0d71532825f5bd6721a02e5dd5477f767 WHIRLPOOL 463d86e04639a914d5b8301c161aa49dfbf08cd6c7cadb9196ab69b425fdd3112db810026d9f0a79d689be9b95692ac6f361b1eeb28d9ebe67f7728a816860a9
+EBUILD netbeans-webcommon-9999_p20160214.ebuild 5280 SHA256 f57545bcde8380392188361718a25e6179226db80e41ee00c18d9abf0317be41 SHA512 3686d8d2da33d241c297b61023c464cb3d6a2a825e9786baa5cfa1fdd77456e3a3bb8f9422a5937700f5616f89c91d5cda24f494e7a4916b4425d24f19873dfb WHIRLPOOL 844b23235943e64a8959fef0f5d55c390a5f8777d9aa23b1bbee27f28a56100f68d35c1330fd769eddd55da97ef5eb8f9f15324aaa0c564d57e5dd819be766c1
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160214.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160214.ebuild
new file mode 100644
index 0000000..30a0e79
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160214.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-14_00-02-15/zip/netbeans-trunk-nightly-201602140002-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 8a1c7f7..a84f281 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201602100002-src.zip 209617536 SHA256 e3ded1537a0041
 DIST netbeans-trunk-nightly-201602110002-src.zip 209640470 SHA256 631a7eaf189159858a9a68610b569d050a1b415091068b05a4b99f2f6341ccc2 SHA512 abbf79593aeadec3c678ef27e90e9e3cca6349640a486338d76a97eb12557aaec426646942fba4e97fe5e62fd84f390a813f978df1c5a107f5f60b297acefd71 WHIRLPOOL 2543bc7214823b6e061c29beaf895f1c34a1a51f80276e1022d0a7824ecb725ba1669333f7823954ddc689f07f48944f503c4d74b89c0eaf004e713bfafa068b
 DIST netbeans-trunk-nightly-201602120002-src.zip 209659016 SHA256 d64bb61be92947939476ff606719578b8aa4d6eedfe10b01e123acd9a0978f61 SHA512 111a1562cb8652fa40896c1bfe3f5a83b38786b2b58191af86cc975414f8d76e7657ffabc600de97930090621591199429ec5e7b3c2d69fbe2542cc172042eaf WHIRLPOOL dcdd5411d3f8badf6805fb3bb0ed631083b678600b565c3216ab9ca3e76a36f4e7f39da48214fecefa8a79fbc775bcb88fff3040e503ad0e72379acc572287e5
 DIST netbeans-trunk-nightly-201602130002-src.zip 209667550 SHA256 0709efad4e00ff13999707c19665af39f1100fa4cb91c49d12fc1cce461395e4 SHA512 c52ca30fcebd5fb2d5fad3432189100f3a95a0b13ac1ecb4b7e711bb6ab49a26c9f7e374757a17369a5d8c4785ec7e5f125078dc2b88ee137fcd0e2d15838710 WHIRLPOOL 4db8529afaa742f708c090da04f8f8cdc6b4c190a9993501ac45cdea5574e7b1909e0ae8a9958205faefa7d08b63f259c5addc8285ee714b1e196fdbdef33190
+DIST netbeans-trunk-nightly-201602140002-src.zip 209669684 SHA256 be43475a61235e79ef5fdb6348c4c0b91a0220f4604e0c5e60983207b89beaa4 SHA512 40df5c2eb08965291ce043d6d6109a3db7033d66195cfef110e5737275070c9c5c1f7e275fdba53583448acc5d094feb51aa266a4b8b869291e539d7cdd66a26 WHIRLPOOL 0087d75b832537662e7ce2d59cdb291c6c2824856abd2233264e206d0afbff2299a3ec77b9cbd3d6238abc45efcab3849518ef2a1a392323bfd3300f196c98c6
 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_p20160112.ebuild 2721 SHA256 bd8f08a8338d38f8e759fa2fd311ff5e84866a36af495476bd7c58a918543852 SHA512 04cce33310092c1053655d25296e5d01ae5142f8aeb14d41063d7a9ca017337ecf9689929dd21480818aa918b380c17505de494a394c7537406ae46ce66fe861 WHIRLPOOL 6e26e805d480b5d960e4300fa33b36536420c34263ffc1083580ddf10d29ed65fef03da405a05c1ebe92bccf959be0dcf439c482956179e0c0dac4be6a7d6e83
@@ -47,4 +48,5 @@ EBUILD netbeans-websvccommon-9999_p20160210.ebuild 2721 SHA256 0f8193b5361a38fff
 EBUILD netbeans-websvccommon-9999_p20160211.ebuild 2721 SHA256 0c2b6c53c30368c591bed2498cdb6ee8101af72d6724c20e3fe51b520be1119f SHA512 73caf01b0aaf61275939248fa2f02ede8ec685c879c4b9407b53d99033d7a6977bac66de790b0a370a73fbb3cda5efe40e76f5a4e6ad80886fbc5f24271e6838 WHIRLPOOL 6ffe8cde395d10a14f82e09b7f607f3121bbc274c926393b8ca4945f1ca11efef1cbfe4aac8ac1608a73feaa98a5eeec45f7e136a89d017eb8109c44ed3f122b
 EBUILD netbeans-websvccommon-9999_p20160212.ebuild 2721 SHA256 544c543f9441e8726fa9ff008fc7ed183eb28ddbedd3238ed0dde5730e3d6c30 SHA512 f19a07a0243afe837c257f9c471699cd39a471e77ca6005f00721fec6599db80e58f58103f44214896f7b31e70dc62aee0d2a4ed1b6dc3280feb89f5dcc9bb32 WHIRLPOOL 9863c0ed2606d777933018e2b64595b005185f740ed5ec645ddfa6cb013230e0c88cffdfeeb808f3bf763728731263c71dfed0967a2615f0779ebed4b5c14d88
 EBUILD netbeans-websvccommon-9999_p20160213.ebuild 2721 SHA256 f291e88e3fa57d892069f9d5bd8213feb0e27cb622f0b28f742b0d56178cf733 SHA512 108d9441f3938a159777184bdf8a00a33849d771be2290ba79a2f80018d1e1ec66a3e2a0ea59fa0a6d87e0f43b973d74798a789a8df035ae348e842309181d32 WHIRLPOOL 9005380c28db426fd61b159fdd0346db30dc1415d7182a1383437b7d9b2b088d898cff35bee190948f43ac14acb1d5f46e80e38eb966fa08ed4ca375abdeccaf
+EBUILD netbeans-websvccommon-9999_p20160214.ebuild 2721 SHA256 f115180862925f781a15570e658f9f867c735e83cffc0facb6850a5b712fb8d3 SHA512 6e7d9b4fec888a4dc4b8bfe3cafd0cade715657af45a24fc0736dd27057eae82ba29c4955b6f105afc6e1c2beb2144d20b1ea1dccfc1831f07c724099a1b7267 WHIRLPOOL 4beb4a6733d77d505b748c78f74689e161677a01df29333cfb52356d32c6bb9dcfad6a06753fe8800230585469d2eabdf2a89f5b3f6cb0b11142aedf3d677964
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160214.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160214.ebuild
new file mode 100644
index 0000000..70ca066
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160214.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-14_00-02-15/zip/netbeans-trunk-nightly-201602140002-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 4aed89e..3aa0df6 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201602100002-src.zip 209617536 SHA256 e3ded1537a0041
 DIST netbeans-trunk-nightly-201602110002-src.zip 209640470 SHA256 631a7eaf189159858a9a68610b569d050a1b415091068b05a4b99f2f6341ccc2 SHA512 abbf79593aeadec3c678ef27e90e9e3cca6349640a486338d76a97eb12557aaec426646942fba4e97fe5e62fd84f390a813f978df1c5a107f5f60b297acefd71 WHIRLPOOL 2543bc7214823b6e061c29beaf895f1c34a1a51f80276e1022d0a7824ecb725ba1669333f7823954ddc689f07f48944f503c4d74b89c0eaf004e713bfafa068b
 DIST netbeans-trunk-nightly-201602120002-src.zip 209659016 SHA256 d64bb61be92947939476ff606719578b8aa4d6eedfe10b01e123acd9a0978f61 SHA512 111a1562cb8652fa40896c1bfe3f5a83b38786b2b58191af86cc975414f8d76e7657ffabc600de97930090621591199429ec5e7b3c2d69fbe2542cc172042eaf WHIRLPOOL dcdd5411d3f8badf6805fb3bb0ed631083b678600b565c3216ab9ca3e76a36f4e7f39da48214fecefa8a79fbc775bcb88fff3040e503ad0e72379acc572287e5
 DIST netbeans-trunk-nightly-201602130002-src.zip 209667550 SHA256 0709efad4e00ff13999707c19665af39f1100fa4cb91c49d12fc1cce461395e4 SHA512 c52ca30fcebd5fb2d5fad3432189100f3a95a0b13ac1ecb4b7e711bb6ab49a26c9f7e374757a17369a5d8c4785ec7e5f125078dc2b88ee137fcd0e2d15838710 WHIRLPOOL 4db8529afaa742f708c090da04f8f8cdc6b4c190a9993501ac45cdea5574e7b1909e0ae8a9958205faefa7d08b63f259c5addc8285ee714b1e196fdbdef33190
+DIST netbeans-trunk-nightly-201602140002-src.zip 209669684 SHA256 be43475a61235e79ef5fdb6348c4c0b91a0220f4604e0c5e60983207b89beaa4 SHA512 40df5c2eb08965291ce043d6d6109a3db7033d66195cfef110e5737275070c9c5c1f7e275fdba53583448acc5d094feb51aa266a4b8b869291e539d7cdd66a26 WHIRLPOOL 0087d75b832537662e7ce2d59cdb291c6c2824856abd2233264e206d0afbff2299a3ec77b9cbd3d6238abc45efcab3849518ef2a1a392323bfd3300f196c98c6
 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_p20160112.ebuild 6938 SHA256 4d0654dd362063692c1549ea2594783116166d9b69731d7a758288189b732942 SHA512 fef1cdf2fd16f10eb60f9e7feb45df5ebd530991af1a7d2866a3b45b5c30254266d6661e6e6e9d4e45ace31fa0a70a85b046ca5c75205b66343e32dbe51eafe5 WHIRLPOOL 5a7f7fb3e1de305656cfa532fd5acf87c05efdd7686aedff3351479c363fd841873c738a77a97f1dd3f0213d493ed3f8e4d1e976737ca04fdbb7ed18150b3268
@@ -50,4 +51,5 @@ EBUILD netbeans-9999_p20160210.ebuild 6939 SHA256 bbce866a1d44ce14a9a9773a750204
 EBUILD netbeans-9999_p20160211.ebuild 6939 SHA256 b39bd9903018482ed78e9198343d58704a18e5d755e2430ae257d5afae19e1dd SHA512 bdc25e2fb6f2f12fb29361f4d695c59059ef4d72bd5ca58e882dce8cbd469aa252a5ba5d39e6b38cbbecc938e664fdf9c41d4cf5f07c65236e99ff4ba4063721 WHIRLPOOL e645cd4a43541de4649389d4f4e6496ac735190d1c619b811e54a93a69cf66b18758106643e9fd14a905c6cb302d3a9b371cd2199a2010c57e13c7f7b312520b
 EBUILD netbeans-9999_p20160212.ebuild 6939 SHA256 ccf381374a22bb5029913352c82bff6576ee723ce4a5e7646fa7630dfcfeb5d2 SHA512 d462b16fdf37676e5747b03fc13f0ed236479023a08d7a7c56767220d923d8000d211dfa557a93c69d47bcd6e78ec409dd6f711457cad413ee1916fa9c4766e3 WHIRLPOOL f0896ae1d6889cfe4f2ab1248606d2f3edaeaf3f1d3dd1c75400d4f0a33e4ca75d2a38052a7ded2f183f9101172692a53c39646dc901287254a653de1482b278
 EBUILD netbeans-9999_p20160213.ebuild 6939 SHA256 96b661099f15b8604b2944f50775d2dcf0dc7fd320906ca93e525454a48fa62c SHA512 2747dbbfe39f3aa5e5b6fd80dbab5bfa42636fb3ecd62462a9884042cdef36a485ce4c2ab849ef834f30d281aa559f4f62ea314a0710b8a8ff0ad247a8d62170 WHIRLPOOL 48ab6d878f59e593590d023566859e6a76185b6d9205d1b381c2fb2c80dd0806928fb0bd75e759eadc95f6de2a835e9cc4d9cc7386399f95c5987763eac2f6b1
+EBUILD netbeans-9999_p20160214.ebuild 6939 SHA256 0b93539e8b58460f83822077aa43be8dfd8e4af9eb41c4ce7d3609e5a529d927 SHA512 57cd13f2645562381f9fd8f4e214679feab5650fe4dcda35ecd8a766d3badba3d360457b52279ed91dd7db892c2794f1ee688a75596e4037f0a3ea72ea17d6d7 WHIRLPOOL 38481a51223e188eb64949a3aafb6bbf76a1564d2070115b86a2def7dc2fad9affc7805ac4f89bdd9b21e1e54c0ffe4ed97ac5b317f6d372ce43402025e675d0
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

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


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

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-javacard/, dev-java/netbeans-websvccommon/, ...
@ 2016-07-04 17:08 Miroslav Šulc
  0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2016-07-04 17:08 UTC (permalink / raw
  To: gentoo-commits

commit:     991984308a9c1747b8f6b0c03433d531a4013ada
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  4 17:07:29 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Jul  4 17:07:29 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=99198430

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.3.0

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index db68ff3..e3d2199 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ff
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
+DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 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_p20160606.ebuild 3384 SHA256 d9d7fda88e50276b0be653e8931833dc18269751b51b4a96e2d1d01dca5c375e SHA512 f8eaf39c28beafeeb7a6bc281c5c0efcf50f1c757ee3d43642cc57d23761514531898a8e64b7cbbc669fd06a20aa8ca92d4eafe6c49bd63ab5ee5c0d643a7a57 WHIRLPOOL 8e00aabb160f1ffaccd8dbdfa70bb4816ec9ae00a89868bfec2a491d20e6f468477a3a9e5d228f542a37b10f53dff3e28c4582e7b2d1ac144fff5c9ec7381ae6
@@ -49,4 +50,5 @@ EBUILD netbeans-apisupport-9999_p20160629.ebuild 3384 SHA256 3fdfcf8f51c94feebff
 EBUILD netbeans-apisupport-9999_p20160630.ebuild 3384 SHA256 c0b6d124da980cd4d2a690a2029b260f2147a12e827b957a9f2608090635a6cb SHA512 43f13339305c6b25df318a6f9754cdd1d847f952a3176b80f46c8883e4bb5a55a9c8695472267792e926f0f883e1670cd27865cffc622fab3d8d59498905273b WHIRLPOOL f4430df4b3bf4d26f5257e9f35274cd9644ca940a38ea5cbfcee03efe71fd64e25f45363a0c039e6de984788d8669828ab89d8348c5fbc40cbef2daee6257c64
 EBUILD netbeans-apisupport-9999_p20160701.ebuild 3384 SHA256 23ddf90569b909e034103f3833b095c9b80aa2ddf369b8447e48c837fc615e8e SHA512 d32cdc40e4e928572805643841606f69e5517e8e010561b36c50dc6890524bed236ca442d8718149ff6dcd65e7c8412ed4bdfbb228e663e1eba4197c79c53953 WHIRLPOOL 18a0b2e081835ab23b41e2da27e91b4b217f80deb3b8f4e4b2e01470219d1b2f46ff43164d016ca214d2b9f5d1fcfdb8d3f32297e1b078edbeb86667a015a3c2
 EBUILD netbeans-apisupport-9999_p20160703.ebuild 3384 SHA256 9ef07c0f89d66838dfb548c6aec4c06f78e8efdac91b65190f9a8e7bde75202b SHA512 cefea52998b294738ce78e05888329400a6fa819551b294692cd571ce67c3b82538b3911dfef80541a76c61ff7769f2dbe5b62bc8be570f4eedc0a5f3d051b44 WHIRLPOOL 56ae1c90226179dc70b09ef10553b91f847b5100dad310458e903bd087fbf96f1fcc77b0661738462e207a0f0db2af02cdd989c5a83d41d58bbb40bbed8d1230
+EBUILD netbeans-apisupport-9999_p20160704.ebuild 3384 SHA256 951ab1c28c6b76a5d18cfd1b50bbb1771fe21d594464a28a1c029fc4c99ed4bc SHA512 fa8a3098a038f03709a0f3919b9ae60c73336198def27515643a2345e215c180531f984a47183959ff7f6998529fa12a8ed0570972da633979547ad35ed7d421 WHIRLPOOL 36398dc5715a9ed007b5a76193989a54a5bacd24c6f1f69668d3c17c0fcfb46869b0430049fa472665c69522d16beb2fee06d400166cb10c443ba0b9a5ec5398
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160704.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160704.ebuild
new file mode 100644
index 0000000..0c4690a
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160704.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-07-04_00-02-33/zip/netbeans-trunk-nightly-201607040002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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-r16-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-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 91e0c75..31770dd 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ff
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
+DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 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_p20160606.ebuild 4790 SHA256 57c9d72c05eef78cdff0f3084cad23820153076a6630c64f72f8e29905d87cbf SHA512 5582bbc5a5e359e0bba7b7f9c72b15dfcd41a1d5ad0ae68c92e1a497a296b73139cbf0241bfb6309a6e527aea04f35d5e56b7f4da985942860b7377325fc2308 WHIRLPOOL 8091e8b0c30579d851d67db49fab63f5a4fd84624ecb7d25a3fa127a48c792a5c7a5823eb8fdc912e095eb009c42eec3a23fe40523699fe2e69e0d901a6d7755
@@ -62,4 +63,5 @@ EBUILD netbeans-cnd-9999_p20160629.ebuild 4790 SHA256 3947dba3a41d59419448c10217
 EBUILD netbeans-cnd-9999_p20160630.ebuild 4790 SHA256 4fbd1088c37f203ef0bcf1fff49366a6d8fc6865ac02afe0bebebf8a84403332 SHA512 f2b297e1abe3a6987109384d2317d541320f25a125026dca43dc5b8041725c4821ef1d8df585c01fed6d35940cc64d2e5eb2e005f8d2502cbc47f18dacdc71f5 WHIRLPOOL a485f8b5b39f034af07dd830ef01f746c7a7fd8a2cc33bc910e2e26b2ba6d4325ecc73c51637d251a754dc79b945f4d4f115edb6829efb06889221f132c76944
 EBUILD netbeans-cnd-9999_p20160701.ebuild 4790 SHA256 2408eb3f64253d3f307d2c423a8a161a6bfbc900aeadda0f277d60c2ad56762e SHA512 7c7f8739a628fa9a76cf835c7a535bb02dc20fefff441085e98be115c4bfd70a68027f414f574a8691dd67847d177af11446830a329c42c99fde9f890e433bc6 WHIRLPOOL da6455a33ea8a7022491ff6b2bc4b07a58e1d811b8a6e7ecf199085bbef0185f7a515beb1f8b14335f7b4e6ec8f44f00893f3c1be371ade69b3fdfd181b16b00
 EBUILD netbeans-cnd-9999_p20160703.ebuild 4790 SHA256 c523d0fd4053d15b0aa5856d69931bf91fd6306a014c3e6fb873d8e021ab532d SHA512 c22035a8e6454480721278965d03513dc1f50e28df959c55355d14ddab8a395c0c3e9e76070e93abb733c4a52ee593102d4df374eac9705193ac28cb15dd40a9 WHIRLPOOL 958a194633e5c13deb8ddbb7e04c38d8f962e894a7fcc177612128f63150d5529469a44fe6006b310850282134b989007cf357f4dccceaee2900bff9eb3ff829
+EBUILD netbeans-cnd-9999_p20160704.ebuild 4790 SHA256 ee2e074ab100f5cdbbf9581ae6eff719f119d4685071eeeeee56f43e9d08398d SHA512 8e7908f351f3bb750cddc471670d18cc54bedec4592b1f18568b098f9b47b1970b6b7dd7751f5fac013a413ceb19ca139daa3c5222a2119196091add96436352 WHIRLPOOL 3a9bf321a4b34dac9e6584bb1485091f17255e6fadb78ab8576797ccbc13290d5b0967af2ed519a242e8794b2aba0e909916e5ea91fe84d3bd3b9392614807a2
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160704.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160704.ebuild
new file mode 100644
index 0000000..5c2129e
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160704.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-07-04_00-02-33/zip/netbeans-trunk-nightly-201607040002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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/5F62670605D036468D158D3D02FDCC6FBAB5D20F-clank_0.3.6.zip
+	http://hg.netbeans.org/binaries/43A82EB3CE61B9B0B1C60586C7D84729BD5BE3E0-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-r16-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}"/5F62670605D036468D158D3D02FDCC6FBAB5D20F-clank_0.3.6.zip libs.clank/external/clank_0.3.6.zip || die
+	ln -s "${DISTDIR}"/43A82EB3CE61B9B0B1C60586C7D84729BD5BE3E0-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-r16-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.2.2.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 041eb5d..141056b 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ff
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
+DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 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_p20160606.ebuild 2968 SHA256 eace9f04be0c3ab093f5a8452f762e0c7fd3ddb4bb9778a5fa6a3beb95763474 SHA512 7889d109855cbcafcdca41ced2097993fb0b014647a1ac2cbd53bd3771bbe8e31f9c64fbc7fafebde89d8a8cfd2cddbfae3e143a49b27bf98d55d5a2bbfc74fc WHIRLPOOL 67b57d267edd0f50bd81ef44a33d2cf988a44be405487a840552775b937831b0dd4d466ecc8a4b09c473ef1cdb4bfd3b349e6d6a92ac034bb83c162b30e21733
@@ -52,4 +53,5 @@ EBUILD netbeans-dlight-9999_p20160629.ebuild 2968 SHA256 9c6a5702731dd8d67223462
 EBUILD netbeans-dlight-9999_p20160630.ebuild 2968 SHA256 151f88f9c269e103fe3a319810e477c10414b25f772c39150055779ae1e5013c SHA512 8108cca35d437cf6a0f790e8b404ecce4a7194ac07b47e246dd0e1d69e5ef409bbc6a7effb16d72f3afd3774aeef329d7ddf96dba20535b072d022ec14d53bb3 WHIRLPOOL 3f1086fd3be26688fa97dec41e0e9bcbda0d662bcaefe9c8738aa39d9a8ca1024273ce87eb5f7d2c4c3ff9a1473255cf39b3abe12a7838d9f6bc54ca38328014
 EBUILD netbeans-dlight-9999_p20160701.ebuild 2968 SHA256 c42d40f303a188eb4eab79422cebd86d57380ad3055bba40519cc673fd04fc93 SHA512 5d19b80f6599808ac4b1d228b3e51d294ba2f8a10a78bf8671ee7aaf5c6cef1210019c573ae3ab4c821c0da6571200cb9c175c12b2142f601dc219045c827857 WHIRLPOOL 1f89275128b17e0733ab61dab34e9ce032e7e215ed93e9681d9a145e986cd8b33459e808fe7cc776eaeaa6e3eddf71d6ee6dddf293ed0c91d3c10850ccedfa07
 EBUILD netbeans-dlight-9999_p20160703.ebuild 2968 SHA256 a3d7fd8c65576aa6946f5c2fa1c83f20a1ea9f35d232612d73f76767dbaef2cb SHA512 6e57b9195beedb5f0d3ffcbdb92d96247ac8f5453319739a0e8849167d28746b1e2889210a969ab716c6f269e52f3d4ce64acf4e19338268fe3c441838394f54 WHIRLPOOL 34f19128334048599fb0331e306679aa1c47fdfb55f757b8e7063a02dcf061f8182e7015afa6ce6a2f5bc04e918d9b7d6550ea32ddbd7cd99d7ede6981415cbb
+EBUILD netbeans-dlight-9999_p20160704.ebuild 2968 SHA256 b69ef07eb1aac09251cca079445d47a644e78a035f30ce084995c352619c14c4 SHA512 944dd7a7aa278a6657fe7783b7800d37286b07f8eb4f42253565dcb9ce41257fc3178b606b5687b00815f80252afd6cf86f936f7653d4b0ef9602bc60d2ed44b WHIRLPOOL 9625e043c7547f9d5d9add96ac797b25767e4e73c4fbdea423af8418b0a82670a0d5651fbcb26ff087febd9b360e2155ad5894cd4c5894f97e981d491ed80756
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160704.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160704.ebuild
new file mode 100644
index 0000000..1de7649
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160704.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-07-04_00-02-33/zip/netbeans-trunk-nightly-201607040002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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-r16-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-r16-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 61e746f..fb4ae32 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -57,6 +57,7 @@ DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ff
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
+DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 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_p20160606.ebuild 15825 SHA256 b56d5e6e816cee9c0d13690b3e152e3c39abba39af6522fa3d42449f26e029ae SHA512 438781fd2724bd860af2d7b19ff014eea74dc465f74aa9c91b532cf7437d180837fdd1c050072b880f6cca0a6d5b3af61bc707088bd59eba7d5138bac5ffc44b WHIRLPOOL f4d91c86dab32f57c3bfcd00b81897442cd6eb7025b609633a112e5e919e381f9f3e518f0f77b1f1a58668874ad30a5711a785250c8d2a32338209480375f524
@@ -81,4 +82,5 @@ EBUILD netbeans-enterprise-9999_p20160629.ebuild 15825 SHA256 11f57bfcb0e6c75c5b
 EBUILD netbeans-enterprise-9999_p20160630.ebuild 15825 SHA256 bc6797d11f7ae5c6fa0733383639e2009ede80a1e0cd3b97b4ce432a340a598c SHA512 1b0d67dc1cb7a7b7a5d5072fbf48f6be0e35538d488e97a79b07a9a3ac8265d7113c0c6f97886c624c56089fa050a21962e8ba35f6f1b4b944e62a60688b8b67 WHIRLPOOL f0701486928212650fe3e287e6460999a109d913cb8b35b9e6262a3e6b2e90e7ed8ee35b16cbd68499dab3f82a3b8837e9b4dedd5424e4b5b54b0b018a575bac
 EBUILD netbeans-enterprise-9999_p20160701.ebuild 15825 SHA256 972d11302e41244601dc8bf7b9a7de574fe7d7536f87c507e79077c367314e45 SHA512 36c7a9637ae9c73de230cb361efa06c85262ba2d4d9dc68cc9c2bcdaf35826d664f05aafb38ebc0792d89e15e88ef72519bbe832ce38c9519c1dbc4d59e85d70 WHIRLPOOL 5b4cf8f2b40c641a44ab8b6590d5128fc264d9881d618eab5ad5ad8158a436cafd731cb0083e82ffe7e9750681d53d5f528a730a0763df67fd2ea9e373b4c9b9
 EBUILD netbeans-enterprise-9999_p20160703.ebuild 15825 SHA256 ebba0ae1b9d43156670aa6c9b7ff17338e8ff65b5b82c9c4df23eee53f11b7e8 SHA512 2d65e67bde091ce23acf3c2667f33671910b37b9ed44276bc5ed0f115abfe455e2c70fb8609bc7c05353ef0bed2c9b82bdd2d19d9971100467cb2b9476890311 WHIRLPOOL ade8544202c9f120b147a5ad8a87e67a7932d756dfa5e436d528d4a83bbe61181c0bc3276e3026f7fb5117f9ceddae343bf08cf666e5f19ccce32b5da485ac9e
+EBUILD netbeans-enterprise-9999_p20160704.ebuild 15825 SHA256 46d7aab48f8a7b87117fa6f4fa2200c2861caf900e9a7a6921ebaf26dcca9160 SHA512 3dc8fa6c55c1bf6b44211445ed1825a08c7359ab50738f4251e8ac731430c589563893344473c2f9b28d521b2426a0bb760ec6228400c757f8a85f8a46b53758 WHIRLPOOL 4908e88bd3626eff5a1ad17300d7cfc36bb1e7d260c4025c379f2738dc9f78a3fa37d1001273cefc4ae248dd2be4a74b90a9de54ccbedf38bb2ec9acc6afd903
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160704.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160704.ebuild
new file mode 100644
index 0000000..8c6070e
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160704.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-07-04_00-02-33/zip/netbeans-trunk-nightly-201607040002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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-r16-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-r16-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 88f187d..d0b3a7d 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ff
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
+DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 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_p20160606.ebuild 2913 SHA256 8c4b3cfe1d285065e964f1959f27688b5e55e8030ca2c0536db76dcdb95c0572 SHA512 04665163417286cd5de14b523db4e00598216505c7afa4522a6cbe493083520a11ca90002008459e43e75d5011df07f9eaf1b3b364d414fa5a62916c8ca1324c WHIRLPOOL 891401c30e52345432e72d42444df079d4d8b871cfdaf1c9f3b5744cc23c3dfa4380be62c68e4b24086ab3a3e55c06b9c638162124f9e9016823bba7bda3925d
@@ -49,4 +50,5 @@ EBUILD netbeans-ergonomics-9999_p20160629.ebuild 2913 SHA256 13940f982e267ed2694
 EBUILD netbeans-ergonomics-9999_p20160630.ebuild 2913 SHA256 d1f52c185611e0203dba0b6653d18805a93cd83cecc09bc90a95467f325f3d37 SHA512 f4b30de29908f98adf987f70ce6ae99879ce0c625b65719652a89db32cc38670878041e4089a108fda8ccb1e6c7c99280383d1687aec8d6da120625547f5c2a1 WHIRLPOOL d81aea7642c1c197b7ce214a9784c31d10cca10dabe7111babe3afeb48837b4a91e168bae55b6f50633281a312abda514226e3ba2533707c0d7db1ab259f14c2
 EBUILD netbeans-ergonomics-9999_p20160701.ebuild 2913 SHA256 3a18a7f12e35e887afffb69d4949102032578c10cfd865d1ba4e76368abae25b SHA512 635b3424c39000343302fbf4e07d48f1275b42c6ae24e4ce41be3f1f5f3752df92e5b963e066d8fd087f2330dd4f079bdbaa6caf6a75bdfe9eef6fd9fe1fc7e3 WHIRLPOOL f0d27ec9b86089d603cab707736ffb77948ce8f0094813314f25e82c7fe94936f74385f9d611c4c44d44c8f2436ef06ec661d62a48e9f5f73872da065d5f14ef
 EBUILD netbeans-ergonomics-9999_p20160703.ebuild 2913 SHA256 a8cddebb47cbb92c07787e2506db7b33ad55505993bfa07f2596617c2e634b56 SHA512 5e785b2b13e9f16754bf422a970205677cddc0c561c178be22ac248f0d5df18deb4419162e5fa6b72bb1733b0705079a86253d78f966f191d9b8d7e798a0be60 WHIRLPOOL 9064f8ad43d0b7fa5ec62ace7089b709b39b199b22a3d04357c4a98fe3019142beb4744753ea3c03a246386423ca8dd83b25d99049c9045da9bc21049f11eb3c
+EBUILD netbeans-ergonomics-9999_p20160704.ebuild 2913 SHA256 e5ded9a6fbbeaa0c1a641401c9e8f3420e2e837455178eedd5e5a2ed9416d169 SHA512 e3bd8a5677d7406bd9d059c068d93aeeadd217b62af32817d70517f7931c8e1a2a47abd59099519dc71353cbdf9e029ab731382c2b5643b9f3562de81fea1a4d WHIRLPOOL 7a6fdcaeac3cfea9ebc6952d49513159028d3c939cb8112132e7f25572b75d639921272798608ce109666e186405d33d16c6cf3af51407e6002ded0f50ae2df9
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160704.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160704.ebuild
new file mode 100644
index 0000000..d003714
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160704.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-07-04_00-02-33/zip/netbeans-trunk-nightly-201607040002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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-r16-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-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 37835d9..0aba827 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ff
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
+DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 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_p20160606.ebuild 3377 SHA256 24df61ba752a163f83a487f6ad0ef51b155c99a08b98e2c779176ff58878a6e7 SHA512 26e48ccfef92a981c2684cc54ff7a62cc9be8dbf2a3685c4fa51d1264e4337941048212b096d807dbcb4f33601ba0853f930795a379c242c6b89dbd35c17e4f7 WHIRLPOOL be01cb203f35bd0a8fbc11d80876c5e98859f470397b539d25786feac1a57d5024d12fd224a9e1268775f7062603c7112a8d06fe426a79490b0653bd023125ef
@@ -53,4 +54,5 @@ EBUILD netbeans-extide-9999_p20160629.ebuild 3377 SHA256 3170816d19c52c4655d6659
 EBUILD netbeans-extide-9999_p20160630.ebuild 3377 SHA256 0d3c6af9a0e8161b3fa0b9b60c262ab5117d719f885486bdc4e2081dadbf63c5 SHA512 930b68b6f394bf920db722250619530be4deab7d175df5093d1f44b98633d4c31772567ef3944210f66fda68723d53e9e256a095a13f643bd468ba88204c3d93 WHIRLPOOL 2abaee375b4b3896b2732b5f7efdcdf97bc2170f21849cc720adf9e66154c2c33bde50553cce66889b951fe03b3ceb9bd00b25717b92ce9c27e40b9ea7f69041
 EBUILD netbeans-extide-9999_p20160701.ebuild 3377 SHA256 ccc4f9c6cb22ffd678ef66f6b60aea2717f8bfa18abf5c51da28c8a72e76236c SHA512 c9ee93605a215518e4f0b68e007cb78f7767913fb4d4b39f2468aef3d0d9cc06578f388f6c9431e105b0f72a1219742838da04c1b80e5b04e015b98f23f63dad WHIRLPOOL 71bdc5a14c664d4344b57e408ee55a0ccd83d06cf70f61a266841f740ee37195a9fb2104a2b574a625fa29c660530919d27209638eb817e94c23ea75c67c0270
 EBUILD netbeans-extide-9999_p20160703.ebuild 3377 SHA256 e5778092a56ee97249f69a2b6626912dd2b3a54791a1814cc79fe5671c34ab88 SHA512 e814e1301fc09e306f8039aeb0617e63485d3f7aecdaf1a4065e400315273bfb30d8e0dfcd72e125ba77c7eed90f3d39b789bf27711d7c7d1e494470495cf972 WHIRLPOOL ba2d34d7c3eb0e66a46e78bb83febab9bd93a050db572b44306ad8cfa78a6f85895efab6361fa18961cec78aaa91fb4b457906e15b4a909460407d4b3ebe1f21
+EBUILD netbeans-extide-9999_p20160704.ebuild 3377 SHA256 b41d519ead2f743826abeb29d9d7a03529bc044641f922ee5f9e8943e7b81aa5 SHA512 be900848494382cb149df6cd636bde246fc2e5165491ae8408569f8f15b5fadfae35e23306367d179b749950c34cf3c49535703ac9cf0b6ff9355d979857f042 WHIRLPOOL ba1ad53e16ae58014f22d68c6acf4d7ac09bdfe2b4e1e78e8175143abee95f19c81798df8eea4a6103589ccd499ac316ada5bf3cc3c50646305dbd609ab9800a
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160704.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160704.ebuild
new file mode 100644
index 0000000..f806ef3
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20160704.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-07-04_00-02-33/zip/netbeans-trunk-nightly-201607040002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip
+	http://hg.netbeans.org/binaries/545E2B7AB1BD579CC76E3836055877982C5CD0C6-ant-misc-1.9.7.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-r16-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip o.apache.tools.ant.module/external/ant-libs-1.9.7.zip || die
+	ln -s "${DISTDIR}"/545E2B7AB1BD579CC76E3836055877982C5CD0C6-ant-misc-1.9.7.zip o.apache.tools.ant.module/external/ant-misc-1.9.7.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-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 ae243d7..72ad81a 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ff
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
+DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 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_p20160606.ebuild 3416 SHA256 f981750d39c645681123d280a3088da72805bb6368a631b2e577467ef62d3ed0 SHA512 0cb3b37b346e3fa445a4095a6b069030c6be2d2d58a9fc3b245fe5de67d8d0272f66585db68f63b61469fced31feacaf74648513714b0244a6efe6917a41406b WHIRLPOOL e0933ea494c7d95a1da450f10198e4a4d2ed520e1eaa53e75446b99efa8fa29ba22d7ce349944901f57c5a7e2e643b219a57e0338f988140af9bdae25b7a2522
@@ -51,4 +52,5 @@ EBUILD netbeans-groovy-9999_p20160629.ebuild 3416 SHA256 b9a83d04dd6f79e5ad9aa01
 EBUILD netbeans-groovy-9999_p20160630.ebuild 3416 SHA256 9ef9707035ebefaca0a3ec2c8aa6bdb934e77456ef96a97eaaaebe82ecaeb172 SHA512 a3920b6427d5cc808034ccaea68ec67c599d6369c99276c0341be7640b71761041cbdd4f3a62a3317ef4da638a32b8bac1238cc197e53f6401797b7a3a8e15a3 WHIRLPOOL 03b8c56d92f037ca96a7e90849533638d03172149745f0d0a680e43ecdc6f172102622561b2662377f355a5a16348c025b87ab5a8a1b444dbf4d39cc5a768b56
 EBUILD netbeans-groovy-9999_p20160701.ebuild 3416 SHA256 ea0bbd8112d5bf8d41e44b5bc43a1d9444ed551a37cc0618000e502a0c0aea9d SHA512 ec83732bdfdd2d2974f492048f746d2ebcf359a601d3c2714d744901395fcc2c11704698bea7beeda7062c063eefec1cae2f13ef307d168dd34c15b0e2831e7d WHIRLPOOL af3d6b95378cca5c6b8d0ecdfbe3ae74e1a9fc57e9ec7543f7f621628df15aa24b67b6a667e573ffbb2951423a01fb36adc3dd8802672b1ce417d1c05c1bcef0
 EBUILD netbeans-groovy-9999_p20160703.ebuild 3416 SHA256 9a87e96c45b2e84bded618fb60efb9f3f03533d816b018a8465671f64e68bc91 SHA512 032d10f214d938e42e4c7b724d69104c18ef4936d0e2c1ca87db56a6b0521e4142a4fc977ac9f92825e80741255a672ce54b53b23559297f2698e0f03fa0bff7 WHIRLPOOL cb9567751982b71596658d356eafc1f83b37a618aa4341809699b7399430169ed0980ea641be8e370a459b468b2a23000449850fba6626065526dc4b9712a7da
+EBUILD netbeans-groovy-9999_p20160704.ebuild 3416 SHA256 7a6dce76ab4e8b02e7a52d48938e58d2d3f2c403df2d198087739c7905b78250 SHA512 9d25bfe4a37d0d9a7b1370121f7848ee20114a03197f47a24a68da7654d695042da18b5847df567ac2a17136358589b4dadec8afa54b1a499bf25cab1feb2c48 WHIRLPOOL 1b3f764d3a0ce32fa7442b1efca3356b2060085fdecee160c68baa61d5bcab6ad95c6e1d4abc57887ee75a61c888dabd1db43de79bc8304efe83f7c43088b8c8
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160704.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160704.ebuild
new file mode 100644
index 0000000..d775f79
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160704.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-07-04_00-02-33/zip/netbeans-trunk-nightly-201607040002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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-r16-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-r16-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 dc4e847..803ed14 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ff
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
+DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 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_p20160606.ebuild 4126 SHA256 514ff520724dcf59dfea147a31def444cb4cb30e251255033d62fabc45f2ae16 SHA512 fa631be9abfe034f89c499891e35243a65bc09c4d72cf4d2c3c73ef8c5f96273088001219490922e889cb0486ae351d294000f2415fb0ecb8b10315f1b6d8bc4 WHIRLPOOL 5c43ee95fe05ea6d33b61adeb87a93441c4eb5cb58c7b3e0d9b47008ebe856f12cd27d2f9da9f358b56b15923173831c4c941aedd1fcbe74450ba2acdec52cea
@@ -54,4 +55,5 @@ EBUILD netbeans-harness-9999_p20160629.ebuild 4126 SHA256 34ca6fef3595b72a03737a
 EBUILD netbeans-harness-9999_p20160630.ebuild 4126 SHA256 1e20afd829afbee3b5383b89eb72c5f8d2cb5434b8ae07d69a35e2ef62766fb2 SHA512 680bfad181ae0dd712d628b778e4b5a1127ec47ff5b420dffd89719a43251dd0bbee2759f1f2026d04b75bff36a268a81d61b1215ace2a10b6acc50dd6a7a75e WHIRLPOOL 36b1bc8e8f1d97a2dc9888bb607979882a1e2dae6b08c585fa85beba0447ee2eda06e2384f3b01c0e81d8499c385c56e43f09e52fbb8fb882d5be8be5661a343
 EBUILD netbeans-harness-9999_p20160701.ebuild 4126 SHA256 556fb4c378f146091a5449097c6898309dc7e95890009f162e69e058cda113a0 SHA512 99d11f7e1e61d132dcc4693cb65b4921dc907cf8a0b9489beb11510f879e3d102c79608f37ffffce185c198c2dfb99318f37f4e0ee10f0af305e478feba69ee9 WHIRLPOOL a8c8c124e58b393e864c2ed054891333d6141b170e3b40abd87cdfe7ef42763b47bd7f748ac9b98d1a2646697eb3f401433d2f5d96ce96144addd30c4a7e51fa
 EBUILD netbeans-harness-9999_p20160703.ebuild 4126 SHA256 c8400f90fccb787acd82b32c2cc5652a8a09bef4de6fe3cdd5f5ec5be81f748c SHA512 742a0349c4807583eba67794fd6e31ea03f9d9b95e85c8b4ce9c22429e00ec3ef8c47af2e886508ae76d539d5eb16c1f90208c9a27c36c65b594d81bcbcd9d5c WHIRLPOOL 1ca2e87c03f82dca264f233c0dc2627260e96f48dc4ab31672232f98381a503c4c5f73aab01ad650a8116f565e05764866e5e98664a8d013fc30b18588dad098
+EBUILD netbeans-harness-9999_p20160704.ebuild 4126 SHA256 ba5fc6010a900721db190dbff3693a5e7272ea3da6d13a9cb069e6d02aff0d29 SHA512 99f72ddb2fac98eeb40dcffe478cbb84dd022e20e399ee728fb7e46d3e5132341cc5e6b2eedbe1afd77086397e7661814ee22e112642d6dd9aa3d62b9a664277 WHIRLPOOL 14980a150ccb49cd482d99e1ff369a40ea80a16ec626b662fdb3c5ac62a96a13c73142fadd52b0c1e2a1cc4b3e5b6df1e2097b8d89e5258180cb1d841564fc82
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160704.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160704.ebuild
new file mode 100644
index 0000000..591dee5
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20160704.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-07-04_00-02-33/zip/netbeans-trunk-nightly-201607040002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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-r16-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-r16-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 f704f64..639e67b 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -165,6 +165,7 @@ DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ff
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
+DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 EBUILD netbeans-ide-8.0.2-r2.ebuild 29330 SHA256 4822cbe26fc19685164c35d69e75bc20578ca8a5ce3394fe97bde6acc721fd2d SHA512 552f35cb1aa5429beb70c72a0cd2a3aa3a006f5870ec4084e88632a39e2ccdc05d0b2b15a87f26c72cdffb3c9a6fa0a124a8d501edeef9aa9580396922071e8d WHIRLPOOL 4c9bce3ca21d5ae61ef9392b9282c2dff9de7f82f2e83d2944a2906ca2180ef0ffab59489bdbb6afc7ba88d5143d77b47a0cf6b219a5a4d385b68afcacd3fe6d
 EBUILD netbeans-ide-8.1-r2.ebuild 30301 SHA256 892f20531352d85b5b72b1c85352eefa444917b515b0b564f04c4f91d1e654f9 SHA512 50af4873fd3ea7755b0d33b086be7e07766b6c009a46ec3954a67a1da9930378bcf9da6d18b7e60078b31af4b36ccf060f22378a8ef26b3829ccf30a529dd023 WHIRLPOOL 1024af16e7cae7f4728dd37f88031be33253b7c62548a095d3e827abeccb6c183d34ce312bd1a0f808f0d107aff217e4b81b7a17eecc6842e1d914d7061df2c9
 EBUILD netbeans-ide-9999_p20160606.ebuild 30761 SHA256 54a5c2805a74eaf0c623c98ad090b2b7d78254f42dd2f44b58dc8bbd99420436 SHA512 37064a64ce85aea7efc242357fd50bb6b648a13b60ebc6cb1cc417156fde75a0df083e0943be291b692ca8083e0b5e469c366ee792c7139ac59f7622430223eb WHIRLPOOL 967b9db8bd4d6b8a53c47126c2bb0ec1d8ee0c8916a796d38979ec47f9d616a1ea97c1c161abd88e9b622456491bdf018574ebebd83d504c47a1dca4102bf90b
@@ -189,4 +190,5 @@ EBUILD netbeans-ide-9999_p20160629.ebuild 29867 SHA256 760997dd43b5afbea24aeb513
 EBUILD netbeans-ide-9999_p20160630.ebuild 29867 SHA256 4430d70cb7fa21c71b8ca406cf82ffab4608487e74ab3d45e09ddaec795a15a2 SHA512 f23eef33aaf47f0e71722965280dc742dea2502d9a91f224a16541c70851a5352603bda4657257f9e7071bc6940c34c6d37bf3e53c12e16db5cd2bb54e2aa13b WHIRLPOOL 24189670d441eb2a8aefb0c35a1af63ae030873eb373fa12183e5c2b127bf7d3cd933df19d14b8d65fb8dd58bf08a51ca133b01202f9b48a2a07da4e61fffdb7
 EBUILD netbeans-ide-9999_p20160701.ebuild 29867 SHA256 dd31ada77eb33d9ec31d6b157bc0e47b73a2c3821d4aa8797bfff8cdff853d0c SHA512 4183db5276dd53946121d309fdf0696e011bf52939161819117aea6afd2b25a735559920205636ad1c5754da4c10f0e874ba2f29942ea84d82e706b7b752ca02 WHIRLPOOL 3884a49c0303bc1e77a50d772c22018601d17b51db51b28c361ce71e431e8e343e1157696b1cc31b7d5aee2b45d2362a9189c9df7e71ddf749048c77d7e532ce
 EBUILD netbeans-ide-9999_p20160703.ebuild 29867 SHA256 265ef7ad1ee6240dc6c2e5fcc4dea1155d39df0dc9391c5b573d01da21814b48 SHA512 405e47c936863bbec00114957ea083ad07a2b9abebe75f6593fb03f3dda8e20319659f44088d8eef0acba1ec1f9e2bc89b6c616a58ec25e90230b120f87ebac7 WHIRLPOOL 13076fd6cfbd2be66bd1c383c62dd31e6a479811d518f15c463f2d805f829e76263ac31bca29086de1b2374aa2d8b280a4c35223f8658b234cb606e834d7a3f9
+EBUILD netbeans-ide-9999_p20160704.ebuild 29867 SHA256 cc9a9f0fd9cb88725e3fbe3c05081742a46e041f2d5ef4158594ab80db062317 SHA512 6724660509905200323ae61e340825c17772a4e94952fe0442e5352adf1595bb54c239562131af4a40b3afa06ceef5c2b43f3e4ebe02161d7e7449a69ea994e3 WHIRLPOOL 44ecc0bd24800e7641044f8d14c87b5e46081371957ecc1fec095706a2f7749eb26223fe65dcd4bcfffff387696594a21330ab75479c0e938386c841e7adc1d0
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160704.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160704.ebuild
new file mode 100644
index 0000000..0933e29
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20160704.ebuild
@@ -0,0 +1,374 @@
+# 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-07-04_00-02-33/zip/netbeans-trunk-nightly-201607040002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
+	http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
+	http://hg.netbeans.org/binaries/DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.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/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/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/825DC870D1D423E347F4F8229A211A2C297BB15D-org.eclipse.mylyn.wikitext.markdown.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/17C0C8D6DEBF5EBE734881C131888D8088BD9E7D-org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.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/DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8-svnClientAdapter-javahl-1.10.12.jar
+	http://hg.netbeans.org/binaries/C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8-svnClientAdapter-main-1.10.12.jar
+	http://hg.netbeans.org/binaries/AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8-svnClientAdapter-svnkit-1.10.12.jar
+	http://hg.netbeans.org/binaries/5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.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/15ACB06E2E3A70FC188782BA51369CA81ACFE860-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/antlr:4
+	dev-java/commons-compress:0
+	dev-java/commons-httpclient:3
+	dev-java/commons-logging:0
+	dev-java/icu4j:55
+	dev-java/iso-relax:0
+	dev-java/jdbc-mysql:0
+	dev-java/jdbc-postgresql:0
+	>=dev-java/jsch-0.1.46:0
+	>=dev-java/json-simple-1.1:0
+	dev-java/jsr173:0
+	dev-java/jvyamlb:0
+	dev-java/log4j:0
+	dev-java/lucene:3.5
+	dev-java/rhino:1.6
+	dev-java/saxon:9
+	dev-java/smack:2.2
+	dev-java/sun-jaf:0
+	dev-java/tomcat-servlet-api:2.2
+	dev-java/ws-commons-util:0
+	dev-java/xerces:2"
+#	dev-vcs/subversion>=1.8.4:0[java] missing from the tree
+#	app-text/jing:0 our version is probably too old
+#	dev-java/commons-io:1 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/commons-lang:2.1 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/freemarker:2.3
+#	dev-java/guava:15 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/ini4j:0 our version is too old
+#	dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours
+#	dev-java/jzlib:0 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/trilead-ssh2:0 in overlay
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	dev-java/commons-codec:0
+	${CDEPEND}
+	dev-java/javacc:0
+	dev-java/javahelp:0
+	dev-java/jna: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-r16-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}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
+	ln -s "${DISTDIR}"/DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.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}"/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}"/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}"/825DC870D1D423E347F4F8229A211A2C297BB15D-org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.markdown.core/external/org.eclipse.mylyn.wikitext.markdown.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}"/17C0C8D6DEBF5EBE734881C131888D8088BD9E7D-org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.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}"/DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8-svnClientAdapter-javahl-1.10.12.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.10.12.jar || die
+	ln -s "${DISTDIR}"/C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8-svnClientAdapter-main-1.10.12.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.10.12.jar || die
+	ln -s "${DISTDIR}"/AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8-svnClientAdapter-svnkit-1.10.12.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.10.12.jar || die
+	ln -s "${DISTDIR}"/5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.jar libs.svnClientAdapter.javahl/external/svnjavahl-1.9.3.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}"/15ACB06E2E3A70FC188782BA51369CA81ACFE860-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-r16-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 c.jcraft.jsch/external jsch jsch.jar jsch-0.1.53.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
+	java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar
+	java-pkg_jar-from --into html.parser/external icu4j-55 icu4j.jar icu4j-4_4_2.jar
+	java-pkg_jar-from --into html.validation/external iso-relax iso-relax.jar isorelax.jar
+	java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
+	java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.antlr4.runtime/external antlr-4 antlr-runtime.jar antlr-runtime-4.5.3.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 --build-only --into libs.jna/external jna jna.jar jna-4.2.2.jar
+	java-pkg_jar-from --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.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
+
+	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-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 antlr-runtime-4.5.3.jar && java-pkg_jar-from --into "${instdir}" antlr-4 antlr-runtime.jar antlr-runtime-4.5.3.jar
+	rm commons-compress-1.8.1.jar && java-pkg_jar-from --into "${instdir}" commons-compress commons-compress.jar commons-compress-1.8.1.jar
+	# rm freemarker-2.3.19.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.19.jar || die
+	rm icu4j-4_4_2.jar && java-pkg_jar-from --into "${instdir}" icu4j-55 icu4j.jar icu4j-4_4_2.jar
+	rm isorelax.jar && java-pkg_jar-from --into "${instdir}" iso-relax iso-relax.jar isorelax.jar
+	rm json-simple-1.1.1.jar && java-pkg_jar-from --into "${instdir}" json-simple json-simple.jar json-simple-1.1.1.jar
+	rm jvyamlb-0.2.7.jar && java-pkg_jar-from --into "${instdir}" jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
+	rm log4j-1.2.15.jar && java-pkg_jar-from --into "${instdir}" log4j log4j.jar log4j-1.2.15.jar
+	rm lucene-core-3.5.0.jar && java-pkg_jar-from --into "${instdir}" lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
+	rm mysql-connector-java-5.1.23-bin.jar && java-pkg_jar-from --into "${instdir}" jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
+	rm postgresql-9.2-1002.jdbc4.jar && java-pkg_jar-from --into "${instdir}" jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
+	rm saxon9B.jar && java-pkg_jar-from --into "${instdir}" saxon-9 saxon.jar saxon9B.jar
+	rm servlet-2.2.jar && java-pkg_jar-from --into "${instdir}" tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
+	rm smack.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smack.jar
+	rm smackx.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smackx.jar
+	# rm svnjavahl.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl.jar || die
+	rm xerces-2.8.0.jar && java-pkg_jar-from --into "${instdir}" xerces-2 xercesImpl.jar xerces-2.8.0.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb
+	pushd "${instdir}" >/dev/null || die
+	rm activation.jar && java-pkg_jar-from --into "${instdir}" sun-jaf activation.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb/api
+	pushd "${instdir}" >/dev/null || die
+	rm jsr173_1.0_api.jar && java-pkg_jar-from --into "${instdir}" jsr173 jsr173.jar jsr173_1.0_api.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ide
+}

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 28e9697..147d72e 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -65,6 +65,7 @@ DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ff
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
+DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 EBUILD netbeans-java-8.0.2-r4.ebuild 13298 SHA256 d4172dfdec5afecb1cd099e18a21aa872c7822bff40b192b5f4ec4d35e6e0ef8 SHA512 48ae6f7141117fbf58123ded750d76f2e7311211a6be3b62bd491349817460da11f781ec5694da91584315547c32008f568fac3bfb406dbdb5ed7fd825ff694e WHIRLPOOL 73fb68aec003707c14b2b390c2de80f24e1e5413cf7e16cf7e661af47c908e2d559214580379e45e21d316767987ac906b5a119a61ae39f03c3d01dafad49b7c
 EBUILD netbeans-java-8.1-r2.ebuild 14814 SHA256 1f49212c90fcaa9a6483f19bb60c963520f20aa08c2a509aa19cc7fda12e4564 SHA512 2d6b225f5d32f0ce1801124808b0cc2101f16a703540877c4818be06694742cfa262c3a2e7018761254f9244a7992eb7fe9bc15cdb20f6f4cb83958789c0ef42 WHIRLPOOL 8557163a46ea91a47efec3c272b8a8a0f2acbf9eaa8f6c280d0ddaac6dd8b2185f06716ab12ebf76fb87fe6c05ab1a14bfd281875ebef586f1304d2162e5f2dc
 EBUILD netbeans-java-9999_p20160606.ebuild 15656 SHA256 8151a2aa93a3ff2b85ff81bc3c32d8f1ea246ef79db2d4d1baba50947a9bf92b SHA512 8db63e9607e14374a58026ea5f6bc65427f497882a246cf1aca39fecec3db29fab50ff293d19eec67c57471fc9495b55516a11b73a177d7b3ad4d8e4a3bd3f19 WHIRLPOOL 2b54787bbfe8137293daf93df1250a206eb4fc83d91f29fe57a577ad88ae32db2d1ce58aef6f4e4364bc72341077ccb9a2e76feb6fce050a1d8773393f74fb38
@@ -89,4 +90,5 @@ EBUILD netbeans-java-9999_p20160629.ebuild 15656 SHA256 94b39fc264595d8874ad8ac4
 EBUILD netbeans-java-9999_p20160630.ebuild 15656 SHA256 e8c32ea6da188a35c907c524a58461fc42937cfb3fe2bbe73c39c13da831c2ae SHA512 4e391402d049f4920413f6dfd2cea54eeca5fca7678f0c1c835e640a7b51dc72d5b1baef15f9394797e07f679d24d2dcc734ba61c7250295171b55222b817685 WHIRLPOOL 19330ffec1177c233bfbc4c264d8b5d896b5f993afe3696f5c9a645d66e554056a54261af923e1fdee36b8426bdaadb93c756efef4701de3f507fe93fcc6fd7d
 EBUILD netbeans-java-9999_p20160701.ebuild 15656 SHA256 be7e4a2b002f9a878926a201eac8916ebb017b922149f8aba594c7b4c2cf1e14 SHA512 12d10a6db2cb9d188adc32876c2c3097eba5a8bc68eeaf0227bcbfa4e0d94efa81772b1371a95f59cdd042e1cb44a8f7a09d457a24841c88cd96b4ab031a7f06 WHIRLPOOL 598ba41ef173aa4a2edd32725f96b0d46676566bdd25d6f7cb60ce70343056e76d242e04de77c4f3e463d081d84d32e44cc47cb13f1c33461b50f1c5e1d4edf1
 EBUILD netbeans-java-9999_p20160703.ebuild 15656 SHA256 3fcc256725c5a332ccf91636fd739d1c0204ebe0f190398b0883ebee90c84382 SHA512 939cf64a8876801042af05a6e893d912b00db49d02ea3ca00ae14d3fc6a9f072eab0414f71ce1a0c63cf6499f19b89b3d9d34eadc4f95c20658c5c74a5bdaac6 WHIRLPOOL 05fd8e9b26a5eed4bfc53210599971c6283ecddcb486483c02e470e423785f0a5c30477c991152cbaa31cd082e5086f3994bded84a3c126deab63eba139e993e
+EBUILD netbeans-java-9999_p20160704.ebuild 15656 SHA256 85d002b3150e9944ebf7a268b0d31c5cb1bb5302d5513a08c5ca81a29c84815a SHA512 baf8c2924e9630e6d5ee2612310221318c915bd73ed26583dd35e527ed133bc913f7ecc7adab990284f39779ff905dfba40a5160b4603bfec3a198281449b333 WHIRLPOOL d97ae3b11a6539883aa6e1765885abf2dc6ff6309542881cd7300496655b0c24619499b37c7b5da109fde8916e229d7b8fe802039297686fd3044951d41a3ae3
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160704.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160704.ebuild
new file mode 100644
index 0000000..8825775
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20160704.ebuild
@@ -0,0 +1,280 @@
+# 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-07-04_00-02-33/zip/netbeans-trunk-nightly-201607040002-src.zip"
+# jarjar-1.4 contains also asm libraries
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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/D803BEB75E912EB3C2F2E042B808AC0263C066DC-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/BFCC4C322190D6E3DD2FA9F191C0359D380D87C5-wagon-file-2.10.jar
+	http://hg.netbeans.org/binaries/4EF309C09ABB5F8B2D0C6A4010205DB185729CDC-wagon-http-2.10-shaded.jar
+	http://hg.netbeans.org/binaries/3B96251214DF697E902C849EB0B4A0EFA2CD1A53-wagon-http-shared-2.10.jar
+	http://hg.netbeans.org/binaries/0CD9CDDE3F56BB5250D87C54592F04CBC24F03BF-wagon-provider-api-2.10.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-r16-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}"/D803BEB75E912EB3C2F2E042B808AC0263C066DC-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}"/BFCC4C322190D6E3DD2FA9F191C0359D380D87C5-wagon-file-2.10.jar maven.embedder/external/wagon-file-2.10.jar || die
+	ln -s "${DISTDIR}"/4EF309C09ABB5F8B2D0C6A4010205DB185729CDC-wagon-http-2.10-shaded.jar maven.embedder/external/wagon-http-2.10-shaded.jar || die
+	ln -s "${DISTDIR}"/3B96251214DF697E902C849EB0B4A0EFA2CD1A53-wagon-http-shared-2.10.jar maven.embedder/external/wagon-http-shared-2.10.jar || die
+	ln -s "${DISTDIR}"/0CD9CDDE3F56BB5250D87C54592F04CBC24F03BF-wagon-provider-api-2.10.jar maven.embedder/external/wagon-provider-api-2.10.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-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 6fada65..691e69c 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ff
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
+DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 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_p20160606.ebuild 4971 SHA256 beceef4ac87abbcba45128f7294fac9307b266562b6068407e0ad4dd502c07d0 SHA512 b408ebb34f66a02cfd884b588e7913429fd8a77b182649c05bbde5c275b6e5211703787c024f3e61764b87c5b7d920f3301dde494a1def17e4ded9ed289e5fa2 WHIRLPOOL b382e352d546d903b60a0dfc9a80cbf18b0caa31d48b49b8685047405bfc6e347ad805413f23c84a5013b974d211d6eb306a81dc9c6c2304add3b28b15530af8
@@ -52,4 +53,5 @@ EBUILD netbeans-javacard-9999_p20160629.ebuild 4971 SHA256 4dd26a24283478bb99d31
 EBUILD netbeans-javacard-9999_p20160630.ebuild 4971 SHA256 c91aa9f5cf3d3be652368a7b839a544141e58e69f2b08b4620c1e702187660cf SHA512 2224a4a2d6c13d954aaf50afa9d04adf90fb108bc91213963dce7919c17146a9178a431669a34b0423890238c1bddb5d11b880b30f5624ab2be9cbec52ba2168 WHIRLPOOL 38ff77cb87c27a75af1e665a4ad977b124bc49656a7ff140b7b734f070fe0fe947577ea4915601fc2d096c52a33a13cdbc6319ab80438d9b384dfb0fb2e1cb29
 EBUILD netbeans-javacard-9999_p20160701.ebuild 4971 SHA256 ca20c7b1f0f49e4d72f14aeb8c0656eba4e601fdb19f33da9067b7e62acbdbd0 SHA512 c86db0f8f1915a20fdcf9e697e7af5c62a7a4740e25cb31a82aa7159814faaa90d8f1c7aab8392f3dcd9110d8942d8ce866bae0c8764b6aa4b7c43c64134010f WHIRLPOOL e6d299bbfe786f30fd8a640be8bbf5f3ff3ffa3b3a290fe334982c820ac464915e69909b43eb4c6b49f585cd04bc50f3c9e4dc4b1389d93eb8192ce24a04c15f
 EBUILD netbeans-javacard-9999_p20160703.ebuild 4971 SHA256 f382fb5dba85a7e23a10bf5dc162731d08e94a9497940f7c51fe7334748866b3 SHA512 2a458415a39adddee753bed5fface315b91464ba63af0fda5480cb78f02a54e4ff516ba45ffe8707ebaa2eadaef4657e2b1307090ef1a70c34ca1510cc8578d6 WHIRLPOOL e7f9d81d57bcbb8c4602baba11a185c941cb29408b77f9d65980702aadcd63d5aa81cd67b234fd10f2e4b6cd5051afe6ae548df60671b0a2302457cc1f5b7b4e
+EBUILD netbeans-javacard-9999_p20160704.ebuild 4971 SHA256 a16c5985a556ef75e6cfd42f0da8d55e71a14e405948749798d19b5022dc0c7b SHA512 dcb91d9399cdd3b282cb2c2a0d4ce712f216ab4012261e61fb71b212fbacb6af7025f75efa115283952c49c5da56f132ea0ded604fe99469019d747ccfca0846 WHIRLPOOL ac4eab54534988d1fd33edf3bfc7c7c7dd80cf488b9e7b02c48687ecc663c67023b27a2a2b77c9f7fdc4b92125b34b1ba5a191756107a5de779d037e6a5226a3
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160704.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160704.ebuild
new file mode 100644
index 0000000..d6a6ebd
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160704.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-07-04_00-02-33/zip/netbeans-trunk-nightly-201607040002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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-r16-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-r16-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 16e9891..e850de4 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ff
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
+DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 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_p20160606.ebuild 6293 SHA256 e64e678fe3060c2ffbb9c0bca362a47b2369091cf9c1a72aca14c29f7678ef5a SHA512 c725dce07d30be36cf628287b1b9f6850ca8bca63bb0896be4376303c6f8583d887baa4f8ecc6dbd8748b8ec272af182ec34a79dc217be6a044b1adc77c6e0b1 WHIRLPOOL e42566df691b3ee4afa2cdf1fc0387ee1617e856a8eaa52a7a6179d17df4b824d6cfaffdf8488eeaf77f801260db4bc5f2e7a73f8d1f042cd4b90563b2865fd3
@@ -51,4 +52,5 @@ EBUILD netbeans-javadoc-9999_p20160629.ebuild 6293 SHA256 9e8876f9264bc95d99ac05
 EBUILD netbeans-javadoc-9999_p20160630.ebuild 6293 SHA256 c4d9d977a855f64423f0ad73f72b2a3a43fe3b06a5cd6bf165bc3a727af55316 SHA512 600a7ca4c423837031fcbf7cd3bc5437d0b5e286e52f5f70a457e281432b3dcfa9719053752850103818746ee1a615ab25e9021cdfe58bd9c8364c64efca8f74 WHIRLPOOL 83b6d4ebe0918323150a3d609894c3cba34c58ddafd8f04481bdeaadedb654765520583870af7c989dc07f19430980bf42d9f6be36d72ad5c21d2ff5413edd7e
 EBUILD netbeans-javadoc-9999_p20160701.ebuild 6293 SHA256 e8545a0e790c537c163bc273e7dd33f76acfa7ff9bb9738ebd7c430b12b2b0fe SHA512 9de182fb4b3f72b2a7444f199c002769601be156792836b5096eb289cafa2c1ad3fd27538f35e97e5b4685bed872209d5eb1242ea84b26b7c307a09725a6a484 WHIRLPOOL 1b82a54dd811f83d89ca4bb80a773ab173f70b636354c2bc7682185a6f0e3aebcb95b86412f64bc7261c4c2a9a729bcaba81ec28577a2e161abcd025fb6e4788
 EBUILD netbeans-javadoc-9999_p20160703.ebuild 6293 SHA256 3e194cbce3e198089acd9fd63e737a36c74491d1f1d6b8ad81488c10f4aaf321 SHA512 6ec6169eb87ff1806f5cc244fd38c3b3d64be2e81937a2e3ce7a3d5d8dffb41c10f5a9a0ef9f2d9dbf2fc3b7892211e13def453be4a3ad54fa83307aaa45f1f2 WHIRLPOOL 10cc937c6d4d909346cf2da1e01cff86d5e4b31d14a3eaf4a01e253880c62b944559c31ad5478e82648196eb561aa752cc2edf57c3302cd3a6e874abe4bb7fee
+EBUILD netbeans-javadoc-9999_p20160704.ebuild 6293 SHA256 facd790a162faf661027444b75b5668b36b153cf73a42e9925f700dce9395c03 SHA512 f30c8ef1ee8ce2ff7fb3c13c2cd60d3b18ff81fadc2ea51e08237ff92088b24ac155515535a609473beae40dc6f09c3b8f968176e00147e5a66e27f8e57be717 WHIRLPOOL de51200b96ba0d00d419f764cb50f58112c3e6a25ef03d48abb17ce41575cbad02429c9364c83181bc304c75daa518ef5517d671217fbea0ef7aa841c4cdf7e8
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160704.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160704.ebuild
new file mode 100644
index 0000000..17b2574
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160704.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-07-04_00-02-33/zip/netbeans-trunk-nightly-201607040002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.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-r16-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip o.apache.tools.ant.module/external/ant-libs-1.9.7.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-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 3c8998a..36e247b 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ff
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
+DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 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_p20160606.ebuild 4717 SHA256 654924b3685971f7acc5a59206e8f7f3d0ab8553ed7d2c061a06a99950e431af SHA512 61418be02ef17789176484606ab42a664529780fee1f05b06436a14a7817496d68677e1825771356b00b1e6e92114e60291efcee3efaba3f8223328fb667cf5d WHIRLPOOL d81cbddcb1df0504a09c3ac24ea05a75cce22f56062ca099cb73183470c041556fb00618972b91f8810e41a28e35d9f02610145f780f130957d2385414d48600
@@ -57,4 +58,5 @@ EBUILD netbeans-javafx-9999_p20160629.ebuild 4717 SHA256 bc5e4d8cdeefc3dfae713e5
 EBUILD netbeans-javafx-9999_p20160630.ebuild 4717 SHA256 6edabee784826f7c2d071397b7247faa325fddbac560f9601f79b87067263466 SHA512 63ddc4a2f48745b7be67f6ba0575792833e596fdbfa39fc8f49a301bb8ce4866346bf72d1f7f1bc1d79df43da58217ca7bdf00dfd09294ffa74b578998ebdb7d WHIRLPOOL 5e432f9205528ffebbbc105997b2f15df264491b9e4a3b31794166b21a921822b063541eab502eac05844f15b38bcfbd3dee7d38cccb2eafd705a0cde6eb4863
 EBUILD netbeans-javafx-9999_p20160701.ebuild 4717 SHA256 073a4aa3261480f4ccaf57e6f5379a86c3ad20f8b282b1263b6ccece556773c1 SHA512 aca1cab07c16d19d5cf127d6aaf32594d35550510347020c89d988e344d6836fb4b68496cf7dd19b441c666d328aa8ed0895bbca98d3f5b9265e13478ed5695a WHIRLPOOL 6380e563ffcb7e47bdcdcd00c4386b9b6d3eeca8e0be9f4c555ba199fff29b4dce242c49570e984a262ae256d50cc42a06c55ce8d9a7d2b1fa5d04daa6f3e15e
 EBUILD netbeans-javafx-9999_p20160703.ebuild 4717 SHA256 4bb1e976a5430af00fee9eadbee17860ea212e8440706762d95e9a05f925f529 SHA512 2ceedc57b817476c1742eb2a544ed51c0d5fb9d88790f5afe03f9fd619bc869a2b99654213100b230467ff75a0767bfd82a198c7a02d868db7a03a341e446e45 WHIRLPOOL 4ad1a6d03c3134552671c3b0e584f8dffba27f148460bab2add640bfb245f585605451fa4c7905768840fc16a590c1b8a27f7049004f2dc164d67e669573c1e3
+EBUILD netbeans-javafx-9999_p20160704.ebuild 4717 SHA256 ba15b86def3276e7cc7393aabb6b30bcf459e8606e062c64dc0a957b52b9ecfd SHA512 44a826bca25d4ed92b8c7257fd07583dd7784c9a1a80a99d1056b2d952c56d53e27427e84613b8bef659d3116ac20b7f3690789aec0ffaa4990e8e9ee3ed179a WHIRLPOOL 50e2d803a4d4ec68590b8f1990ea1912e4ebca811c5c55fc0a61d220d1190d6d19f067fb9b81a1e4aa65094443d49569603f86582c263926bd438902f5b90818
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160704.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160704.ebuild
new file mode 100644
index 0000000..03bf2aa
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160704.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-07-04_00-02-33/zip/netbeans-trunk-nightly-201607040002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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-r16-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-r16-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 f8bbc33..826f0d2 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ff
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
+DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 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_p20160606.ebuild 4412 SHA256 e1ca74ce252f1feba95a8b88d262ae1eb577b0f8586e27f657306e0d7bd2f2bf SHA512 896307af7e958ff257322f1f65e5f1ffdd999ea24be7458df22d68e868e18052854059a65bd56ed541b9bf9fbcf5372e92365cfd887e846308bd9c0e08f36f4f WHIRLPOOL 166ac944fb10a1c753696e68f03d0c4f34709792b9bfaffbbf6124d0583d7c1c0b5aa35998480e96b43b6982684676e3df8e8813a1f9bd2b409c46c120e0b3f1
@@ -49,4 +50,5 @@ EBUILD netbeans-mobility-9999_p20160629.ebuild 4412 SHA256 648e2262c5bbb91513d39
 EBUILD netbeans-mobility-9999_p20160630.ebuild 4412 SHA256 e32b041292bf8e4bc05873c668f64aca27078eb053592d1da441202e9703113b SHA512 7a278d841edf7d34b004f2ecd335ace3bc7a9ff3df4a2510b35db0a92c908672d17a8c12cb2b8a81962275453d89f4022ea75e9a1fe9f63dc6bdf6ed2167b71d WHIRLPOOL 10daf018f5277004fca61c9dc68eb029332f2f6967461e2ea636d0b046993cd2e2426c303675b0c16a5aaae7d7c764a0bce3f9fbee5fc5c20d6aeb1f428451b6
 EBUILD netbeans-mobility-9999_p20160701.ebuild 4412 SHA256 0e7dc45b843f10c2b39d47ff65d37093bf1615a5a5182d61f7f0e4c00428988b SHA512 54b00648496dde999076b408cb327679c175ab755d8e009b2ae58de6909472dcd5b21384e3badbaf757f78aca904728ec7e8725df38e3db704a7a087e27f8c43 WHIRLPOOL ce27785a1b6d36f3702222401d632c46649b0520694798ec76233760080b765c31771db17a0bc4ecac544975fb71d524ed06d1b1b37df843dfc17ad854afca96
 EBUILD netbeans-mobility-9999_p20160703.ebuild 4412 SHA256 cd7979651af160dbd8814d4484dd0119c6633ceca956b8ee3bc245b1ac9ea29f SHA512 9083589ecb98032772051ccd29606810fe1888bc084c11ee833f43a4c2729b5135d08465f80aea7b911681fe134550ceae7feff305c7de140603a10cfc9323b0 WHIRLPOOL 0c6dbe0d65570bf85717687e215412de5a17269661284d52791c56b921f517aa3b00fb26ca4a5960dca6fc059ab95d676ba4c810d0d1f112439905191ee28a0d
+EBUILD netbeans-mobility-9999_p20160704.ebuild 4412 SHA256 8166ed2971b3111b7851c73425907f7c54a00fd1385ca2faea0907141b640c46 SHA512 fb9bb5e8e9e63dd969f7d0b96ae0290e29cbe92cd90372865917acc13297c935e06e97998092a0cc65a7590881ec776eb75b4605bffa796bcaeec9ef8b43ded9 WHIRLPOOL 7c2a27497595d2ed82a6cca087306b7d2080c297839d90e210598cb9ec2b7daa407bc8b2c144605a654b095a89611cc57b90767f12f02917d94481ffd986e13b
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160704.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160704.ebuild
new file mode 100644
index 0000000..feab85f
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160704.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-07-04_00-02-33/zip/netbeans-trunk-nightly-201607040002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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-r16-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-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 46f99fb..ae1846b 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ff
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
+DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 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_p20160606.ebuild 4111 SHA256 70b15b899bc4fd8e8add5cc0d2bfaa48cdddf360a0efb399d504fd5c86926451 SHA512 b4330dd0bc0c907e55c2b00e5d4722b664d833d66c408d60b76c9f35dc6ce896b418271ed95fd8c2b83c9c4c6df759fea438bab7e203f99e7127810356490375 WHIRLPOOL baa1a26dbc6499b96349dadd33467ec2752be83a8458d95cf0894b750601edd36acddee6141bbbe8eb1e95d4ada17ff3900273cf45b2cb02b7b8e95c89455620
@@ -52,4 +53,5 @@ EBUILD netbeans-nb-9999_p20160629.ebuild 4111 SHA256 44b08b44dc2978d1df916fb0396
 EBUILD netbeans-nb-9999_p20160630.ebuild 4111 SHA256 25848c805cee3d0cdf442978db8376fcb147ebbe4dd7b3806d709c64093c15c1 SHA512 d72896f92f985d35f0f21c72ad710b381243ecf5ffaba7a3d47f0e93b27656368cb6a51b5576a1e8545a0553a82fb9e6f89fbe98defaae7a5c6eacf26e81fdfa WHIRLPOOL 7e0e162afc6d40c89fa96dc2edd6785d1e4d2b96b1b71e16420e890f636f33d54dcabc7e82e387b3beceb1cc9e87305960e8cac4e332a72ec24637912f10af02
 EBUILD netbeans-nb-9999_p20160701.ebuild 4111 SHA256 362d6a095e1c257ba1666b31df4bfb23fdc8d4f8088f7908ec113ded940940cf SHA512 98937edd208e7a88a4a80ccbf2f7b856c6a7fd53ff1c58280aaf52864bd0c321696a054b92613e94aefe664eaa58e562936546bf8bd484a80d4a7da3643d31ad WHIRLPOOL 1038f5c84e1a0fd07bae5b17b447cfdfec91bc210bc925ddf14b0fa2378e3a64b29c43d3c5703f3e7a9a341aaa513778c767a4ced152196737b3dcdd80fa3cae
 EBUILD netbeans-nb-9999_p20160703.ebuild 4111 SHA256 297453e28beff4fdbc4846cca69092b1f81c57184ce1fa0326aa2cc1f290c9e1 SHA512 2140c0a32f09a44477bbe141b3e45da3178709d8e15214c1b4bf2f146251304f03229168f43975e39278343be8a16e756a56dff318ac2563dc6401d81a95edd3 WHIRLPOOL 90d6c9dbf5b7770d84f19d71e1794d8ba716993e71a6447e2db483f1048b73209e257c525c81f1695128035fbe8529bddb21ddce6ca0dbd586a219704c68df2a
+EBUILD netbeans-nb-9999_p20160704.ebuild 4111 SHA256 e2a1051b907b8d24a2db073f53741bafe90be2456f76d6b98c6db81219606486 SHA512 f87e748974287662c73ea951b9e100a806af65877c6b5271b04f2b3afa328ddc2f42768a18f9a74701a5c9e9c42cc52dc87cee623fbfdcebaae6df9053c71d0e WHIRLPOOL 1fe3f3425bd650b2b22d946f887a0cb77255e84a8897fa37a4d388247ea2ed4602cc1ad88f8e68a2a3fea97870ec809ed34a1275da38b2a9c0fd11cbfd57f208
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160704.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160704.ebuild
new file mode 100644
index 0000000..9f02c26
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20160704.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-07-04_00-02-33/zip/netbeans-trunk-nightly-201607040002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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-r16-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-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 56589db..27a86fc 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ff
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
+DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 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_p20160606.ebuild 4418 SHA256 bfb5b207aee5d8c75f0343bbbc674270b99d38a2cb740625c3378bda3d4ea3dc SHA512 7635ea777cd143f8b57aeca840939f6636cf34ac8ecaca0866db7f14e25de554190b780dbfa336bf43979e9c2dc57d74341491a2697ae7e54682f81cb251d2b0 WHIRLPOOL c3f786e48e55978b6637b49710973efe12481cb7082d9693d351d06f4f7df91eaf4fd0fc5dbec5484189d506cdca5795b2d812f241943ddde6c3f744db9feb08
@@ -54,4 +55,5 @@ EBUILD netbeans-php-9999_p20160629.ebuild 4418 SHA256 11d47be338b1ca237c468a5fe3
 EBUILD netbeans-php-9999_p20160630.ebuild 4418 SHA256 6010aaf38fd8362861f9b806c2b64677b04dfa1c58d9ec66883b8538acef6d40 SHA512 383ce987bfd97089a1b378a29444677d9af8cf7a76c3cf2eeca7c2dd9efe4df14ace107815aaac7cd6e48c7e7533491415e5374c79a061fdfed24deea4498d60 WHIRLPOOL b9b0f59d8ad9057582008479ee1e512cc654088a1e7ad41b001510dc65c0c128bc32b2ec9b377da3f2649c87e6bf49d943176c6bd68145325e22fbcc8af304ee
 EBUILD netbeans-php-9999_p20160701.ebuild 4418 SHA256 01223f49ba6b96b258d2c7e7c502b168f12b2edf2e0e8af7fdacdf4446796136 SHA512 5b8e985e1c5e443c345ff621b38810ec1626aed1fc28aa4dfb6d7f4fdd7cd8b493346666bcb69fdd2539ed6fdd0ed73a3cfdab744eaa723f22203dadf8f8e540 WHIRLPOOL d2ef1262516dc9b42cd3ac6a2ccf01a526c67cd1988bd44fbf55c0db909d5f4da92dc19d790e67e0ff912b8ad350ad8cd97ac92ab32c8c812362c71dd97b9736
 EBUILD netbeans-php-9999_p20160703.ebuild 4418 SHA256 91a9b546b3a4937c422ed37561448532723d56f17389789c3688e42ebb350e26 SHA512 b038ce6d0ebfa1e8129791955c5b877c10086d2a63777f58cdfa6a0f1824ca331fa263dd34f44e8f014a095ab432d0122703c18bc9437e491c22b7f318b5390b WHIRLPOOL 00dad5a18eb93a723bdab010da55fa30ae4b39545e1a35316f2f82a8a1fc5fb20c30b1195dc803b1af2e153c785fcc0305ca2f9c93e1c1fea66a1914e3d82be3
+EBUILD netbeans-php-9999_p20160704.ebuild 4418 SHA256 00d1ed6228d6465df71e721b11bc4cfe46eb5bc00458cbaf138959147b52b361 SHA512 84d6c119ff17db2f4e5027ab7bb9ac0e617c7e5855de53643a3e1e63425f36abd076f11300ba0d01616a28872288c6f4a40fe070dd515956c8d6f80282ffd360 WHIRLPOOL 4c6521587826815e05baa69796029404fc2d5a88bed3f7eae969f7f7bfe34e6ec7992ea9260fbbf8d992b7d813e1b5dfaa4f2866fdd320f48023ddc3d2b8ba52
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160704.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160704.ebuild
new file mode 100644
index 0000000..95d14f4
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20160704.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-07-04_00-02-33/zip/netbeans-trunk-nightly-201607040002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip
+	http://hg.netbeans.org/binaries/472A52636BE09823B4E5F707071B31FB990A7375-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-r16-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}"/472A52636BE09823B4E5F707071B31FB990A7375-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-r16-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 a635459..726a561 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -51,6 +51,7 @@ DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ff
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
+DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 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_p20160606.ebuild 9520 SHA256 044800ebb01df778ead5d4e05e05e6c0dd5faf3a172d3c7b0681ab12d9dd7eb6 SHA512 e4cd8819042ab15906ebda8e92314091e09ef7b0a3f1b538310af34739c94217033a76707a71def3debdb0b45f832b2b107357a443be4e2b00b103990a9256b5 WHIRLPOOL 80d65b32865a339937332ba0afe75c2b481bcde562f7ec40ace207d39b007e2eda423afb0de34a24237cd10182d06b027d1ac91f3e65bb0ba12e581557655f8f
@@ -75,4 +76,5 @@ EBUILD netbeans-platform-9999_p20160629.ebuild 9520 SHA256 0bf3526d550909a3f9395
 EBUILD netbeans-platform-9999_p20160630.ebuild 9520 SHA256 8d27a23a3f18d02205b602f815c308a4c8246ce753be78be741857c76ad3513f SHA512 298b1e8e8f31a0e84daeb1edfac9db9a6b6c51e1605a224600a7a6f6c8b775467469cc9d526ff2b5f6660501eefd8bab4a5741a8a431bc1d677b9280e05dc037 WHIRLPOOL 9fecf9a6b5eddd1c9f152073c2323bf70b59ecb506df9ed524d0a0b84da320d96e9cd209342b4b29a56bc82a1ebd5ef1027f10817b0d5a0dd4bcb6d4fa5df9b0
 EBUILD netbeans-platform-9999_p20160701.ebuild 9520 SHA256 ffd5c1ab67582e5447635fbea6628fded4bd4538ae0132f23355bb6c02b18f6f SHA512 16312c828596ddea8f21d1d03f94c2e7628bdfdfd22aad8292a475b8da1193573cf72ab919d28bb65d96920a96b2ea766aa431afbc8660d831ef1addc8e460ba WHIRLPOOL 72252feff38fe227f5001ab9fc55fb173ac921da30f81f2c4457c82f9c09166a1711f9bba1cd4efd34aff6f755c9e05344eba2b603dc2744aebc4338c817c3a8
 EBUILD netbeans-platform-9999_p20160703.ebuild 9520 SHA256 3b04e535b26734284dd6fcfb8d2a153ba4cdfbc91620b124fc0341d33683d38c SHA512 e94afff5df96eeaf18f6ca825cccb6f45b6c7700e12fc1e3e5781691aeb41e9b159ad350d8722152663869ae4c65e148b3123db3602fcf7a359a50d16943dbeb WHIRLPOOL 3caea5b25594ca14313ee25cd6fbac9f9c3184df22d2b5fbd11b738d09d4f8765f462296f8af5617f764b6e76e9e72c5aea4dd4e0bcff6288fe79a0900682755
+EBUILD netbeans-platform-9999_p20160704.ebuild 9520 SHA256 9a48a158cdeb133516fd4f7b041626608d58d100ea529cef8af2b7dffa762865 SHA512 32e05bc7776eddeb2b539811d37c03579c7d93adcbb8ba72777948d37df471451e95b5eff6378b57510af33f3e5865b6397cb4657a6b8bb7079f7856eb3387e4 WHIRLPOOL 906d81b0de79c2e3e053204d1847cbe43ec3e306a1c5dd728bd47e7f52da18352d274de03dcb59de53f20ffd73d0805f95d1fe76e797241b4df833d396775ea8
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160704.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160704.ebuild
new file mode 100644
index 0000000..ebabfff
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20160704.ebuild
@@ -0,0 +1,167 @@
+# 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-07-04_00-02-33/zip/netbeans-trunk-nightly-201607040002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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/771CDCA0A3F2F3CE818E20CC2D707A3592422485-ko4j-1.3.jar
+	http://hg.netbeans.org/binaries/A3085BAA78C8EE7F55081E70C79ABE04CA38CE93-net.java.html-1.3.jar
+	http://hg.netbeans.org/binaries/7FC91530F4395FA0D58F9539F3B40858E766BFA3-net.java.html.boot-1.3.jar
+	http://hg.netbeans.org/binaries/5C992BAEC0111EE293BD44173140A9D8EC860765-net.java.html.boot.fx-1.3.jar
+	http://hg.netbeans.org/binaries/BF6C9BB0FFB78A6B846ECAEB880C460D883B4F72-net.java.html.boot.script-1.3.jar
+	http://hg.netbeans.org/binaries/10E4214A89082C70FCF9F721953001C0932037BA-net.java.html.geo-1.3.jar
+	http://hg.netbeans.org/binaries/D97314CE1869DD3B8B8942256A70673E2991C9DD-net.java.html.json-1.3.jar
+	http://hg.netbeans.org/binaries/6BDCE8349F83CD02F2942D4FBFA86A81A129F42A-net.java.html.sound-1.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
+	http://hg.netbeans.org/binaries/CEC2829EC391CB404AD32EB2D08F879C418B745B-xhr4j-1.3.jar"
+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-r16-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}"/771CDCA0A3F2F3CE818E20CC2D707A3592422485-ko4j-1.3.jar o.n.html.ko4j/external/ko4j-1.3.jar || die
+	ln -s "${DISTDIR}"/A3085BAA78C8EE7F55081E70C79ABE04CA38CE93-net.java.html-1.3.jar net.java.html/external/net.java.html-1.3.jar || die
+	ln -s "${DISTDIR}"/7FC91530F4395FA0D58F9539F3B40858E766BFA3-net.java.html.boot-1.3.jar net.java.html.boot/external/net.java.html.boot-1.3.jar || die
+	ln -s "${DISTDIR}"/5C992BAEC0111EE293BD44173140A9D8EC860765-net.java.html.boot.fx-1.3.jar net.java.html.boot.fx/external/net.java.html.boot.fx-1.3.jar || die
+	ln -s "${DISTDIR}"/BF6C9BB0FFB78A6B846ECAEB880C460D883B4F72-net.java.html.boot.script-1.3.jar net.java.html.boot.script/external/net.java.html.boot.script-1.3.jar || die
+	ln -s "${DISTDIR}"/10E4214A89082C70FCF9F721953001C0932037BA-net.java.html.geo-1.3.jar net.java.html.geo/external/net.java.html.geo-1.3.jar || die
+	ln -s "${DISTDIR}"/D97314CE1869DD3B8B8942256A70673E2991C9DD-net.java.html.json-1.3.jar net.java.html.json/external/net.java.html.json-1.3.jar || die
+	ln -s "${DISTDIR}"/6BDCE8349F83CD02F2942D4FBFA86A81A129F42A-net.java.html.sound-1.3.jar net.java.html.sound/external/net.java.html.sound-1.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
+	ln -s "${DISTDIR}"/CEC2829EC391CB404AD32EB2D08F879C418B745B-xhr4j-1.3.jar o.n.html.xhr4j/external/xhr4j-1.3.jar || 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-r16-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 javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.jna/external jna jna.jar jna-4.2.2.jar
+	java-pkg_jar-from --into libs.jna.platform/external jna platform.jar jna-platform-4.2.2.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.2.2.jar && java-pkg_jar-from --into "${instdir}" jna jna.jar jna-4.2.2.jar
+	rm jna-platform-4.2.2.jar && java-pkg_jar-from --into "${instdir}" jna platform.jar jna-platform-4.2.2.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 0fe0526..fc7ad5a 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ff
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
+DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 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_p20160606.ebuild 3472 SHA256 ab6942ae90acf230d05a564c4d33730cdf4feeae669729bb0bf50743e27f0383 SHA512 38c96a84403b45a52f1a7b7844447376a0dec6d36ffc36485a802e26bd17611c38ce855e08ce69e350b7b45b2945e2821b5cc5bf5a66615a81be07147c927982 WHIRLPOOL 8ab6257be14ecefb7dad28ad6803917dc44ff7f0c2f4ebb31aa848fdb076210de11e585e58060326c4f16fdc2f7c555f220168572a999e04da279e9213e350ab
@@ -49,4 +50,5 @@ EBUILD netbeans-profiler-9999_p20160629.ebuild 3472 SHA256 400f9c8fd8d2ac203576d
 EBUILD netbeans-profiler-9999_p20160630.ebuild 3472 SHA256 99b2aabe6c38e44e9da1223f800bc2264bd27716b3325696d851669aa02e4327 SHA512 b34a95550e7c81284e89aa6a4db42ce9375eda58749a1c4ab4b16af17d859624be96667fbccc5e00d7311a84804b7a2f512e1fc56488c1753603f5c97053b13b WHIRLPOOL d047fa55173d99b94048e3e7b87d4d421ab8255f898e36112daa7e2e7c01de44c245b261e8cadf75ca9319b1f0acd9850ec4bf8f22067f21ca472610816dcc71
 EBUILD netbeans-profiler-9999_p20160701.ebuild 3472 SHA256 b003e864b0d1b28e937959eb1922f8b000e2cd0c1ccb7a31d84cce81b705bf20 SHA512 c9999b8c8552f22e957f0c25c9b07a9c759f824c02a623f27d69132fd98281d3c6f133fbb089170216792a6aa1e101e50d644e77da99253e88840a080832b4a8 WHIRLPOOL e7348d82b438e95ee58ecdfad13b85de3f82115e4157454fd40f0195e8e39ff41b66ad85b54d43aaa114f335cce526fd4c603e102019b0bbc98ab71f6c5d99a4
 EBUILD netbeans-profiler-9999_p20160703.ebuild 3472 SHA256 c3274064fec10aa0458581ae124143dcdfa5f380c3f166e1e83b833595cdf895 SHA512 eb37cf0163d9032e43a3bcfe14f94ef7b0d0c7dd4dfc1452e7b85f8491203559980f83e359317b233fecb1d48c85b82b24a6a7395768f577cf9b0058d3231136 WHIRLPOOL ecfda57e947224e486c3118d1c2b035f6e0ca23e29f69a9af311268b80001d8e28bf84c13a3d053c122afc98a05e23343f725e1f81f556e4cd2f7f867e24ec78
+EBUILD netbeans-profiler-9999_p20160704.ebuild 3472 SHA256 a1af52990353646259df8954ce56388655a96796153e0731b14ec6cddd47ecfa SHA512 04e27a0ac592d4a5b52cf07584cb29d93f1a7e8834f29026661b711e4683d9716260916f3658eb42ba1ee7444962ed5fc57d838a8b78ad8558d09661ddd63476 WHIRLPOOL df399c80001ab63c840b3503cc7e209225464423f15cdca9f6b253034fa935656f81beb5727d0378aebf76054ff1a30d2f009faaacf1327d89bb6117efd1967b
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160704.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160704.ebuild
new file mode 100644
index 0000000..e9329b2
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160704.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-07-04_00-02-33/zip/netbeans-trunk-nightly-201607040002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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-r16-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-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 c0ba80c..7cba2ec 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -49,6 +49,7 @@ DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ff
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
+DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 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_p20160606.ebuild 5343 SHA256 3a18ef09edf6901a4e4c54d71341ab236c4f0711bce63bfc9e13997bf2a40eee SHA512 4fd4540fb289084b81c4ba7350c028afdb2178ed02734b948fd15ef2be8ee4c0b7a8b60d7717c0fd8d65fde44f8b69fa0925520b2867302d9a09e32af5181315 WHIRLPOOL f43a4287a80324b01c4b191b390c040b4bf4ae66ab6ddafe3c3dc8f35ea4ad357789cba9fb243010b8cc3769377342d32be0106eebebdda8744d070008653b3c
@@ -73,4 +74,5 @@ EBUILD netbeans-webcommon-9999_p20160629.ebuild 6242 SHA256 26fa0c9759e3ecca0517
 EBUILD netbeans-webcommon-9999_p20160630.ebuild 6242 SHA256 9c217ac02417695459edba8050d2360bd5f1e0f085f8706d0ad2a1807c82aaa3 SHA512 be4ecd6cc59e877398f96bfdceb17048e3f4c69fc03fa6e896646b25d84a998736294e9f2c6cc82d3d3964f1ecfd9fa2f6defaa60227df28c3590d918abd6874 WHIRLPOOL 3cd416e9664794e970e23af2d9fcd9b3fae05667d5ed7ece7b794cb4abf89dc1d34e4718dc97717a718ed0a41cc8e1b8b6749ec91e638e773f215efe93e7c56b
 EBUILD netbeans-webcommon-9999_p20160701.ebuild 6242 SHA256 0c39818df923716655598daac17daf8a191217bb24783b8fe1ed45898a32d76a SHA512 669f6ea6473c4e92bd2e99ff7d108a173f4458c497e061438995e7ec0699ce363ff9fa56bce0d01983ea0e12f800fde337b6237860c48b2fb2b75c54e3e9af7d WHIRLPOOL 7e239f05594127725b00f5c1619465cfc183ff36c0b6da96497b97d28c1129cb5efae1b265183bccc7f8cd64a56d3e337ab7f86837f6684f062f0169a578c3e0
 EBUILD netbeans-webcommon-9999_p20160703.ebuild 6242 SHA256 5ae26a642e641d0e8d3989b2441cd87b985652885d101b6cdb0f959d981c8f03 SHA512 1a435a50e5251660a77ea77153dbc5c559076bb4a4a48acd75a99b499c2430a58a4357acf377664b508b947b51df1c9f4aa65c065b49f1376040d4c185da0ea0 WHIRLPOOL 1e39fa9140d6021c592f3ac4f0106f6a0e698485b5a06e705e056b9008e3f6df0b231ec5ba1cbd8fdfe0ee34a3356153fa66bfa77e9d6c6c5b82959bf0542e6f
+EBUILD netbeans-webcommon-9999_p20160704.ebuild 6242 SHA256 27158da014ce1d4f743b6ab16058ba1abb528b05b512075e5d34b061237be00e SHA512 1a56881a912a67fdb6691b36c596fc72667134a788b668e3278235006815c4869a2b55755de24d9ad73c8c783a093a5d9f0ab4fb9ceccd8bf6dd7bf8fc0b56e3 WHIRLPOOL 1e69d63511f223746da904e1c97cc392991b78d02b6b7439a85c5296ae82df9c78da4b4fd93df8869d463b171ad7cc684a4dbe763922110aa40126be228f9466
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160704.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160704.ebuild
new file mode 100644
index 0000000..6f86203
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160704.ebuild
@@ -0,0 +1,132 @@
+# 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-07-04_00-02-33/zip/netbeans-trunk-nightly-201607040002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/2E7B73D8CB88351034507A6E365AEAF76FE6FD5C-com.oracle.js.parser.jar
+	http://hg.netbeans.org/binaries/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar
+	http://hg.netbeans.org/binaries/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim
+	http://hg.netbeans.org/binaries/C8EEAB10E4539BEAF97476EBA252BD4B40377FA9-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/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/CA8F6968FED0BE20E786C70CF9B603F4D7B66C68-ojetdocs-2_0_0.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
+	dev-java/jna: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-r16-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/2E7B73D8CB88351034507A6E365AEAF76FE6FD5C-com.oracle.js.parser.jar libs.nashorn/external/com.oracle.js.parser.jar || 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}"/C8EEAB10E4539BEAF97476EBA252BD4B40377FA9-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}"/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}"/CA8F6968FED0BE20E786C70CF9B603F4D7B66C68-ojetdocs-2_0_0.zip html.ojet/external/ojetdocs-2_0_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-r16-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.2.2.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 09534a5..c660343 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ff
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
+DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 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_p20160606.ebuild 2721 SHA256 ecfeb506a4a1d704063d16534434eaaacd7380ec250448001f26b8ae03660be9 SHA512 525662a4f3e748a56dc65f9523d1aad183121b9a43d574cb5f721af320efde68ea685dcfac8866be22eae29890937b2cd9ce7a9ec03ca77b92a465a31009da9f WHIRLPOOL a350856c30916841b819c5317e6413f68572377ec17742910153b93a5e24aed297862031b5fc1e7656d1563affefffdd31213dd47bae2b01849e430f1e3fa9b1
@@ -49,4 +50,5 @@ EBUILD netbeans-websvccommon-9999_p20160629.ebuild 2721 SHA256 31b16740d9c5b5f0d
 EBUILD netbeans-websvccommon-9999_p20160630.ebuild 2721 SHA256 23de0fdebdd2cd62dc0d9ef58e18b6d62947ff0c03862ed021f0a2cc48a79684 SHA512 8816743ee02fc3c919e7bfd2409ecad37de6bbbc95ae81baf20fb68234d86c1cef52111446ba5be8e15a2f284c4ec96f152776d3a98f8124a4c61dbd7452ca05 WHIRLPOOL 27088983c59a56537825676f026a8fdd597213fe676e7a76613a63d98c8b5f3f0408d11f702cdc5222bbc23cc9b240320a3dd7c98bb72224b658a6d7dcc9d97b
 EBUILD netbeans-websvccommon-9999_p20160701.ebuild 2721 SHA256 cf027c12663df0a41c36419e8433517530be2d0ca4e8d8d49316aae88529eb43 SHA512 1359eb7cd6bd6c3bdbd4c4e70de12ab00c2c42df6cc253d52102fe2d39281c7c486d5de1305ad4739823b3f3d28fa2bb76b4d2cef4db92cfbf4bfd462c96c04b WHIRLPOOL 0ed8e01e9d265e3d82aab748575f6aa7e2c2cfa062ed7d0d0b64e66f24418183f4cd2fe46e762a52bb26a7038e7afa52cdd1a542dbd0e8103ccf8cb6b7c4a7f9
 EBUILD netbeans-websvccommon-9999_p20160703.ebuild 2721 SHA256 ebe2d8daac903b630639b7a1d6fc6e14a0acfbc93a13f8699ac6fc2c0aecbc0c SHA512 9e46365580e115131e85632eea0a24c80e84abe12581f3c8d96d07853b6d1f29736ea8235fe4455facd2597f62d9dc552a2af213520ded892dbf8bbfb3f9e5ef WHIRLPOOL fb48e0d44c677b3b7efae2d9f27f41d16b96543f8266ee4b6a4c7737f3d38fc0c3e05d2f8609af589924a4ff32bd2fc0b28cb0efc4a24f90e8b1a9132b710f8b
+EBUILD netbeans-websvccommon-9999_p20160704.ebuild 2721 SHA256 ff9eba591e89477f019a53dc4b82784c1173abcf508fddd51ca69367a038857d SHA512 ce9dc4e8e5c24fbfd6b6628736c094c337acab0d2adc1a878c575f3731755d975b209c4f670eb66da75e1853681110d4b2273d8e8b1d3b2a493530e2452a954f WHIRLPOOL 1f22220757c374f5e32e3d9e6edfa79c928ccf80cd9b0e658b1b582456ffac4c31bdcc252a2e6b2fef508329f7f58bc5a16dd3067da3360e5853065724a9df20
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160704.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160704.ebuild
new file mode 100644
index 0000000..cc808a1
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160704.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-07-04_00-02-33/zip/netbeans-trunk-nightly-201607040002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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-r16-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-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 adc91fe..807fa14 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ff
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
+DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 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_p20160606.ebuild 6939 SHA256 24f08ce080db26b4b6c53547e843a8314879ff51d2480cd98e3ef1d9c1b273d9 SHA512 56f9fceed1491c48e02a9da8860a756fc7f38af248b293bb749a462b89b24be9b425acd575def82ff4999473b8137e7d61733fc2e5dae9736c87e5a390aba031 WHIRLPOOL 02e2ab66cf4d7cd75c18475b5ee5edffb29909f1f57950526385abb4310b8bcb5293b1dc8a35a5b3d746903beb7b4c88b2823524d9926f09ef82748a3081c456
@@ -52,4 +53,5 @@ EBUILD netbeans-9999_p20160629.ebuild 6939 SHA256 7d7a99cae16080f9451ebfa095406a
 EBUILD netbeans-9999_p20160630.ebuild 6939 SHA256 f5fd58e599cce28a31bbfef0cdd0439e4e9ca2b77e3ad24a2b5aedf03fcc6253 SHA512 f80a07e8255c519770edb3cc7059b6a74411960912fde261004cc09e3bb74fbeedcf4d17e5681cad4054ec977270e3b04796f420ea11667f1c60e60cb775ee36 WHIRLPOOL 97f51865187c7815cca18869c9067c31990eafe1ea314465e830704812e44ea4b263ab387bf4fd470bf0d44f091a6f71e2ea6e710f4235492c6960b733b9be25
 EBUILD netbeans-9999_p20160701.ebuild 6939 SHA256 d0d49ec67a9a634dbd210d5f3348d586a14feeecda8b8acaf9340d4446228645 SHA512 8e30e5b71bf1079b504235bf356c7cc6fcc7e0383eed94982a759252fd5aa6e0517876ba5da24709250259a8ce14e03029753113b0a24bc6bbf85d44d14b0d5c WHIRLPOOL b4752d5d37423c339bd1108c8513a20c72d2eb57c3374419e7559e4e52f41d8df760902cb95cb19709753ad734805b78a29afab56bfc573acae35e54de3bf012
 EBUILD netbeans-9999_p20160703.ebuild 6939 SHA256 bb32d89b2b352baf8a90c945f3ac328150ddac7dddde75788fe2ac963020dbeb SHA512 74a1c4728cb4b47dae8ede7c107229eed7f80d0403ddcc9f111001c295791bed1c167d4bf34859c5edaa163333060e71e5c8bac00d458356e62ee1b97db3645b WHIRLPOOL 6e8faa9164f5d078ee3555898afc148ec4ae5a1b5c279cc31f6e0be6d7656b170e5b6e67a4346294978c541129845f2f2843a0935e1fa5eaae08cb6cfe4fd17c
+EBUILD netbeans-9999_p20160704.ebuild 6939 SHA256 dfeca6651d8e2a47638bc7f8c1bb686d699102731932461367f4e3c5dc5dac9d SHA512 a9e442c6851df0e2d71355cb84c941933238884ca2d2248a05e45c14ee0551bd0a51a9a5598acc98b62ad38f8d4fcdad75fa2294610724061a58ae7276405a2d WHIRLPOOL 5c52ca7550d1b26b1b7ef9413b554688c0dddc7fb12847e56730f7751e8ccf68e42a4b3f53e9adacfd90a78cd1c7209aff9cba26b5246c38f5527558140c120b
 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834

diff --git a/dev-util/netbeans/netbeans-9999_p20160704.ebuild b/dev-util/netbeans/netbeans-9999_p20160704.ebuild
new file mode 100644
index 0000000..86d2969
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20160704.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-07-04_00-02-33/zip/netbeans-trunk-nightly-201607040002-src.zip"
+PATCHES_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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-r16-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-r16-build.xml.patch
+
+		# Support for custom patches
+		if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+			local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+			if [ -n "${files}" ] ; then
+				einfo "Applying custom patches:"
+
+				for file in ${files} ; do
+					epatch "${file}"
+				done
+			fi
+		fi
+
+		einfo "Symlinking external libraries..."
+		java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	fi
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	if [ -n "${NBLOCALES}" ] ; then
+		einfo "Compiling support for locales: ${NBLOCALES}"
+		eant -f nbbuild/build.xml bootstrap || die
+		eant -Dlocales=${NBLOCALES} -Ddist.dir=../nbbuild/netbeans -Dnbms.dir="" -Dnbms.dist.dir="" \
+			-Dpermit.jdk7.builds=true -f l10n/build.xml build || die
+	fi
+}
+
+src_install() {
+	if [ -n "${NBLOCALES}" ] ; then
+		pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+		for cluster in apisupport cnd dlight enterprise ergonomics groovy harness ide java javacard javafx mobility php platform profiler webcommon websvccommon ; do
+			if [ -d "${cluster}" ] ; then
+				insinto /usr/share/netbeans-${cluster}-${SLOT}
+				doins -r ${cluster}/*
+			fi
+		done
+
+		if [ -d nb ] ; then
+			insinto /usr/share/netbeans-nb-${SLOT}/nb
+			doins -r nb/*
+		fi
+
+		popd >/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	if [ -n "${NBLOCALES}" ] ; then
+		einfo "Netbeans automatically starts with the locale you have set in your user profile, if"
+		einfo "the locale is built for Netbeans."
+		einfo "If you want to force specific locale, use --locale argument, for example:"
+		einfo "${PN}-${SLOT} --locale de"
+		einfo "${PN}-${SLOT} --locale pt:BR"
+	fi
+
+	if use linguas_ar ; then
+		einfo
+		einfo "You selected Arabic locale so you can choose either ar:EG or ar:SA variant."
+	fi
+
+	if use linguas_es ; then
+		einfo
+		einfo "You selected Spanish locale so you can choose either es or es:CO variant."
+	fi
+
+	if use linguas_id_ID ; then
+		einfo
+		einfo "You selected Indonesian locale which has locale code in:ID in Netbeans."
+	fi
+}


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

end of thread, other threads:[~2016-07-04 17:08 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-14  9:27 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-javacard/, dev-java/netbeans-websvccommon/, Miroslav Šulc
  -- strict thread matches above, loose matches on Subject: below --
2016-07-04 17:08 Miroslav Šulc
2016-01-27 10:53 Miroslav Šulc

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