public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-platform/, dev-java/netbeans-javafx/, ...
@ 2015-08-21  8:45 Miroslav Šulc
  0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2015-08-21  8:45 UTC (permalink / raw
  To: gentoo-commits

commit:     dbe1c54c591f88acdb46020b773695913115004e
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 21 08:45:18 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Aug 21 08:45:18 2015 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=dbe1c54c

netbeans: bumped to the latest sources

 dev-java/netbeans-apisupport/ChangeLog             |   6 +
 dev-java/netbeans-apisupport/Manifest              |   4 +-
 .../netbeans-apisupport-9999_p20150821.ebuild      | 111 ++++++
 dev-java/netbeans-cnd/ChangeLog                    |   6 +
 dev-java/netbeans-cnd/Manifest                     |   4 +-
 .../netbeans-cnd-9999_p20150821.ebuild             | 127 +++++++
 dev-java/netbeans-dlight/ChangeLog                 |   6 +
 dev-java/netbeans-dlight/Manifest                  |   4 +-
 .../netbeans-dlight-9999_p20150821.ebuild          | 101 ++++++
 dev-java/netbeans-enterprise/ChangeLog             |   6 +
 dev-java/netbeans-enterprise/Manifest              |   4 +-
 .../netbeans-enterprise-9999_p20150821.ebuild      | 266 +++++++++++++++
 dev-java/netbeans-ergonomics/ChangeLog             |   6 +
 dev-java/netbeans-ergonomics/Manifest              |   4 +-
 .../netbeans-ergonomics-9999_p20150821.ebuild      | 101 ++++++
 dev-java/netbeans-extide/ChangeLog                 |   6 +
 dev-java/netbeans-extide/Manifest                  |   4 +-
 .../netbeans-extide-9999_p20150821.ebuild          | 108 ++++++
 dev-java/netbeans-groovy/ChangeLog                 |   6 +
 dev-java/netbeans-groovy/Manifest                  |   4 +-
 .../netbeans-groovy-9999_p20150821.ebuild          | 111 ++++++
 dev-java/netbeans-harness/ChangeLog                |   6 +
 dev-java/netbeans-harness/Manifest                 |   4 +-
 .../netbeans-harness-9999_p20150821.ebuild         | 114 +++++++
 dev-java/netbeans-ide/ChangeLog                    |   6 +
 dev-java/netbeans-ide/Manifest                     |   4 +-
 .../netbeans-ide-9999_p20150821.ebuild             | 377 +++++++++++++++++++++
 dev-java/netbeans-java/ChangeLog                   |   6 +
 dev-java/netbeans-java/Manifest                    |   4 +-
 .../netbeans-java-9999_p20150821.ebuild            | 273 +++++++++++++++
 dev-java/netbeans-javacard/ChangeLog               |   6 +
 dev-java/netbeans-javacard/Manifest                |   4 +-
 .../netbeans-javacard-9999_p20150821.ebuild        | 134 ++++++++
 dev-java/netbeans-javadoc/ChangeLog                |   6 +
 dev-java/netbeans-javadoc/Manifest                 |   4 +-
 .../netbeans-javadoc-9999_p20150821.ebuild         | 168 +++++++++
 dev-java/netbeans-javafx/ChangeLog                 |   6 +
 dev-java/netbeans-javafx/Manifest                  |   4 +-
 .../netbeans-javafx-9999_p20150821.ebuild          | 124 +++++++
 dev-java/netbeans-mobility/ChangeLog               |   6 +
 dev-java/netbeans-mobility/Manifest                |   4 +-
 .../netbeans-mobility-9999_p20150821.ebuild        | 126 +++++++
 dev-java/netbeans-nb/ChangeLog                     |   6 +
 dev-java/netbeans-nb/Manifest                      |   4 +-
 .../netbeans-nb/netbeans-nb-9999_p20150821.ebuild  | 148 ++++++++
 dev-java/netbeans-php/ChangeLog                    |   6 +
 dev-java/netbeans-php/Manifest                     |   4 +-
 .../netbeans-php-9999_p20150821.ebuild             | 127 +++++++
 dev-java/netbeans-platform/ChangeLog               |   6 +
 dev-java/netbeans-platform/Manifest                |   4 +-
 .../netbeans-platform-9999_p20150821.ebuild        | 166 +++++++++
 dev-java/netbeans-profiler/ChangeLog               |   6 +
 dev-java/netbeans-profiler/Manifest                |   4 +-
 .../netbeans-profiler-9999_p20150821.ebuild        | 121 +++++++
 dev-java/netbeans-webcommon/ChangeLog              |   6 +
 dev-java/netbeans-webcommon/Manifest               |   4 +-
 .../netbeans-webcommon-9999_p20150821.ebuild       | 123 +++++++
 dev-java/netbeans-websvccommon/ChangeLog           |   6 +
 dev-java/netbeans-websvccommon/Manifest            |   4 +-
 .../netbeans-websvccommon-9999_p20150821.ebuild    |  94 +++++
 dev-util/netbeans/ChangeLog                        |   6 +
 dev-util/netbeans/Manifest                         |   4 +-
 dev-util/netbeans/netbeans-9999_p20150821.ebuild   | 264 +++++++++++++++
 63 files changed, 3473 insertions(+), 21 deletions(-)

diff --git a/dev-java/netbeans-apisupport/ChangeLog b/dev-java/netbeans-apisupport/ChangeLog
index c2e1eab..f941a7d 100644
--- a/dev-java/netbeans-apisupport/ChangeLog
+++ b/dev-java/netbeans-apisupport/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-apisupport-9999_p20150821 (21 Aug 2015)
+
+  21 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-apisupport-9999_p20150821.ebuild:
+  updated to the latest sources
+
 *netbeans-apisupport-9999_p20150820 (20 Aug 2015)
 
   20 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index b780f7a..96a1e77 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -37,6 +37,7 @@ DIST netbeans-trunk-nightly-201508170002-src.zip 208816661 SHA256 899384675fce61
 DIST netbeans-trunk-nightly-201508180002-src.zip 208817240 SHA256 b497e33ddf10398e677b60713e4f8a54f4588dcc633c23841501857c8da5a12d SHA512 725cad02fafd38794cd93d0b1d0ebe01f14c2db6e0d0c21edcf3172406f4fe7ec6ebdae666c84c80c9c943340cdf13f82603f794508d3055a6135a67b6b156ed WHIRLPOOL f7f027bfee7467131e34b90f05f4e46a6aab8c2206cf87e7025267e15f8b6d3ce96e7838687bc53caaf39c60607f0cb17fe1f6bfdb5ad53ecaa529c972c2ae17
 DIST netbeans-trunk-nightly-201508190002-src.zip 208817531 SHA256 6594e5c2181ff7dfcf7eab3c7551571ea8e4cc6f3eb3f196a2b3b4bd7f394745 SHA512 84b4d1f1e77f1a4e2d97c14e2400381ce0d926dae2659cf38bbd4d2b7ae619d479ac1d73900f6d9cf10981b85982f7f19c00662974179e48cc4efb6e3481a82a WHIRLPOOL 7decfaa30422c8c588e8cfb65cd654119c3f80b60ffe3226074e5a1775648154a26a5ef267bd98f0a7720b107a0046b040652379bb6dd4a837d000863098ecd5
 DIST netbeans-trunk-nightly-201508200002-src.zip 208799494 SHA256 81de2b1f44baa32ffb769676ba38edab57124533bda1bb1dcda18b9be5dcb7c2 SHA512 1c68dbcff6bcfeb3566823749b57ce95c2de6a97333573897d78f5f6bc7fcfe2c06a2ff7805bfabea9dc9f60d9e5021d4c3d5aa720004d796caf3b163fb1699d WHIRLPOOL cc8344fb52507294d00071f967abdc5b77fcd37fd3989b81d0efdb7d35c0eca4349f86769f2a09915a72565e399852c40f21eaab89fb6a7c66a58960ecfefc39
+DIST netbeans-trunk-nightly-201508210002-src.zip 208800734 SHA256 c85c1f8027b3b9b03bbcc6743bb508899bc9050058c112f060d73daa544bbde6 SHA512 d8a3cbbc3f671d52bb5edcd2722c9ef847cdc160aecb4a9ee3283c2f64d82284c820c39a68e2aff2e7c3cd24fac618c1d3c48207b8323aa06f92524d0ab3a185 WHIRLPOOL b8938d9102fff59c5cc4f35db839492bbd1b1249d4e9c8da9eb4b2167c1e14d8906d49ba2bc9d301331e25d855b798883ee5f7aa51a5f00b272f55adae5339b3
 EBUILD netbeans-apisupport-7.0.1.ebuild 3134 SHA256 41c32033c9945a39c0aebb6b0271767031d53a47e5c8365d9e3a7c86712e24cd SHA512 dd4bdde9574a87b46b02fd7204b1e90394bd87dc572dfa015b601203b026b35571f20323db834a310f90aefe6e4a822044b0d71d535a7351137219b50ecb2aa8 WHIRLPOOL f3721521a33b337d7dc24d6b49b0b2fe723f5ec446a5a4befb085051140a41bfd2d3081876e9f02f8b9932a3a0997b92211cd964fe372e40b42813df5db5170e
 EBUILD netbeans-apisupport-7.1.2.ebuild 3143 SHA256 cf24048c0ecca98a7d6371624bb0ddfb78663bead073d515a7c84229dbec00a8 SHA512 ec44c263e786210fd64c9ebb253bc9d4fc34d3be9493157dad06007c19734672bfd767765c003393d1e5cc6755fd5d1eda956b00c2092e98592a73ec1af4e729 WHIRLPOOL d619c304a994a2b818d892fb6315d092588f2ebf95e566f7a909f92daf21bb368a28c4e1af876ae585980dc82996e62aba30b12c41461103c23620a215480b76
 EBUILD netbeans-apisupport-7.2.ebuild 3126 SHA256 b0d64795b8403a932e3e20721a116c755c4de66fc36f7191476fcb4a226bad13 SHA512 cea062a72a8e75a9c2fe91c323f83d542a70149336360e1c41479f401fcae5ead6a301c8a7d5704d5beb27f7810b5d1e3cff0196cce7a26890a001c570179f6a WHIRLPOOL c286f4e4d3a02cbeb1a6e13b2005dc5435a6e9ec026a98fcc00bb83222014b800cd83f437c69352b48d16bdf442a6c7ebbed6aff86f10b3c5e6cdfb7edd9e184
@@ -68,5 +69,6 @@ EBUILD netbeans-apisupport-9999_p20150817.ebuild 3390 SHA256 7a1629683731117bb23
 EBUILD netbeans-apisupport-9999_p20150818.ebuild 3390 SHA256 54ffc668849a41a809f1b1baf8f436feffad19325ea1bc8f09fab0288af77c06 SHA512 67708933180dc4f6eadcde45a2f9f19c4780fc63caae56b344c4c0bba14c18735002af6f36191ef3aea8d08459b42a306538ac816fc0e4c6fc54bb7ae59fb339 WHIRLPOOL 683b1667c7f95fa4c729b7e1fe6bb1df571feb0fd87974013ba1c012978b718a519873e53ebb583991b68a90f18cb14f31719b76be4521f10ef5a4cf338189c9
 EBUILD netbeans-apisupport-9999_p20150819.ebuild 3390 SHA256 b29a30c9e29ce22a7079e9abd9e986d47635faf0aeb6e8392a50f904b28875b8 SHA512 14198814a46ec60ae51a43a9d10f270659cc1dbf50ebec99656393ce1c419047d395fadae7153a5a23fed9c03d8fecc5f33e5b26e00fd75650df581a91fed66a WHIRLPOOL 629ba3afb0bb1e449ee85bcc0fa1c8f8d7d5bb581b5b4fa69c993dc709d41f41a62611850fa609db2ece9715eca503206de61a5be03edd6ae97560b67bc05bfa
 EBUILD netbeans-apisupport-9999_p20150820.ebuild 3390 SHA256 c28f2078faf2e34aa69e4d2e0a34f9b6950d79d087d024bf98268d5386f94895 SHA512 c379f85216eb1b2dfd47f02e415743d013f998fdacee11c6689ad69b6d1d677d89bc25d2ca13a66afa43dbdcda0fedb4345ff953ec40d79ad74a063ee7a2eac8 WHIRLPOOL ba83a67ee5460df7ee6011b05235dfe168aa7096dd681f7700cec94bf63f7423c1eedbd941476cba34080e6054485b9569780de4d7e0a0f0c64b398abc96f336
-MISC ChangeLog 184231 SHA256 75e23bcd9e7930456e242900c1dc61fd31148a35d6ed66db2cbb602c59c206c7 SHA512 31f0370b4929f4434af0bd1782e61213df9dfbe49634d777f089d4df96c0bdbf205f4cf00d2f715a87cd2c11b74c0f0e1e8978f2a3975fa734b128bf7b40e3ee WHIRLPOOL a955d14f2c9a9baacfbdc654b92e6570f128bedd24920e0fd82d8e476b8638565c3acd7e5d7a72c7a0838317a5c9e30fcbf89b49f92a0721c444fb9de7f8f9c0
+EBUILD netbeans-apisupport-9999_p20150821.ebuild 3390 SHA256 31b3f93c2304f0259e5e9039d32979bc6baa5ed058697e59164a2bab4b7701eb SHA512 c7afbf12d5e6c98e86eb3c2069fa321c3bf94a4521bdcad9e5ec11d2fa54b7bc65b60d81f8ecffbf6333d7ad34f539edc351ad861c9bb9e2d7ad013948f60355 WHIRLPOOL 5935978fbf458b8e190fae5dc84fb99fb8bc90a0dd08281f46e0e9433054c14fdc4401a5243fb00f239ccefd2d1cfd9141218a697bcd81c088fd207d6f0af7b7
+MISC ChangeLog 184413 SHA256 63f7bbbb708298ed2beee5dd2208a7c72ba949124eaa8b0aed929a044e492fcc SHA512 a3179ced5d2aa7d864625d758c0d27fe3d2e6699a0b199417b59c2ea9af38e5b6b6c825a35078842eda8bc278c0d77786346fdaa3fc9d41f0a4a2754120a5e98 WHIRLPOOL 9837bca02da1804d6dc4626d50531bc51d9c0610bb5d1d097f885414157410bd934e2753cc6aed49b0e57baaf432b58b3308d8a763d6480bebd88d68a2ef0232
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150821.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150821.ebuild
new file mode 100644
index 0000000..57a4a00
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150821.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-21_00-02-28/zip/netbeans-trunk-nightly-201508210002-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/ChangeLog b/dev-java/netbeans-cnd/ChangeLog
index 758a622..c21147f 100644
--- a/dev-java/netbeans-cnd/ChangeLog
+++ b/dev-java/netbeans-cnd/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-cnd-9999_p20150821 (21 Aug 2015)
+
+  21 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-cnd-9999_p20150821.ebuild:
+  updated to the latest sources
+
 *netbeans-cnd-9999_p20150820 (20 Aug 2015)
 
   20 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index 9011739..ef7015e 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -61,6 +61,7 @@ DIST netbeans-trunk-nightly-201508170002-src.zip 208816661 SHA256 899384675fce61
 DIST netbeans-trunk-nightly-201508180002-src.zip 208817240 SHA256 b497e33ddf10398e677b60713e4f8a54f4588dcc633c23841501857c8da5a12d SHA512 725cad02fafd38794cd93d0b1d0ebe01f14c2db6e0d0c21edcf3172406f4fe7ec6ebdae666c84c80c9c943340cdf13f82603f794508d3055a6135a67b6b156ed WHIRLPOOL f7f027bfee7467131e34b90f05f4e46a6aab8c2206cf87e7025267e15f8b6d3ce96e7838687bc53caaf39c60607f0cb17fe1f6bfdb5ad53ecaa529c972c2ae17
 DIST netbeans-trunk-nightly-201508190002-src.zip 208817531 SHA256 6594e5c2181ff7dfcf7eab3c7551571ea8e4cc6f3eb3f196a2b3b4bd7f394745 SHA512 84b4d1f1e77f1a4e2d97c14e2400381ce0d926dae2659cf38bbd4d2b7ae619d479ac1d73900f6d9cf10981b85982f7f19c00662974179e48cc4efb6e3481a82a WHIRLPOOL 7decfaa30422c8c588e8cfb65cd654119c3f80b60ffe3226074e5a1775648154a26a5ef267bd98f0a7720b107a0046b040652379bb6dd4a837d000863098ecd5
 DIST netbeans-trunk-nightly-201508200002-src.zip 208799494 SHA256 81de2b1f44baa32ffb769676ba38edab57124533bda1bb1dcda18b9be5dcb7c2 SHA512 1c68dbcff6bcfeb3566823749b57ce95c2de6a97333573897d78f5f6bc7fcfe2c06a2ff7805bfabea9dc9f60d9e5021d4c3d5aa720004d796caf3b163fb1699d WHIRLPOOL cc8344fb52507294d00071f967abdc5b77fcd37fd3989b81d0efdb7d35c0eca4349f86769f2a09915a72565e399852c40f21eaab89fb6a7c66a58960ecfefc39
+DIST netbeans-trunk-nightly-201508210002-src.zip 208800734 SHA256 c85c1f8027b3b9b03bbcc6743bb508899bc9050058c112f060d73daa544bbde6 SHA512 d8a3cbbc3f671d52bb5edcd2722c9ef847cdc160aecb4a9ee3283c2f64d82284c820c39a68e2aff2e7c3cd24fac618c1d3c48207b8323aa06f92524d0ab3a185 WHIRLPOOL b8938d9102fff59c5cc4f35db839492bbd1b1249d4e9c8da9eb4b2167c1e14d8906d49ba2bc9d301331e25d855b798883ee5f7aa51a5f00b272f55adae5339b3
 EBUILD netbeans-cnd-7.0.1.ebuild 4602 SHA256 1336b76de715719ef59a3601dd5ad3b24992f58096f874f0e37935ec0d088d8e SHA512 38745c3ad6364198516ebb64002185fd05c34dee75acdb3933221d772177d5d6fcda853bb63991f0d071b21079fdab0c090db93e59cddd8daeb8f8d571a18a41 WHIRLPOOL cc196275289a01c1168b8c2710e0be0c2483cc86dc47b8fb3383ce1141f7bc11565e2b2feb95436cf448c09aaac7ee8c8804316ce6782d8853c0742367c0963a
 EBUILD netbeans-cnd-7.1.2.ebuild 4218 SHA256 6c80020e4204226274f4a24413dad8bf134f5beb7aee4ecc53d6b4d709093bb2 SHA512 299c07f5e5d930045e8c8ef3d04009beee7035daa2022a803e6dcb16b380096bbf5014c2d684094705d06b4608afcf6925266ef609a483a86452b03505dcb67c WHIRLPOOL 6d6c8bddf3490282b9134315f9bc94ff55675160056fa4c98c302a59d943a9cb38f23ffb9ca313c82061d84d0ae86898ce72d16756d41c468737e319e68f06ce
 EBUILD netbeans-cnd-7.2.ebuild 4201 SHA256 0f77a1a343d437e2eb1236722b27b2f2f03901ecc1afde29e1d38e54aef7c81d SHA512 b5fc985d1280ab900cb5125691a0ff99bab075ff5e93ded9af256310a7dcbea87a28a52ba383875caa24fd0ff28bc8dff4fc0fa0242987a673fdc729f7234b58 WHIRLPOOL 19e79dc426fb05ffb48ff9b13de3bab40f483b6dd9d79514e8f819029c278ee47a09c9531b5b4dba2014f805d502e66745f3355e2932e24e0dd9b5e3e273d2c2
@@ -92,5 +93,6 @@ EBUILD netbeans-cnd-9999_p20150817.ebuild 4796 SHA256 518ed7733d17cc566851e9cb23
 EBUILD netbeans-cnd-9999_p20150818.ebuild 4796 SHA256 e5058100f10f2aaf9b988cc9dbbba08a58323d4ae2ed5268d91eb108faf31fd8 SHA512 c367f8b4e8f7ab20efd7e868de77d46b282fa2baa479b61a0cb05646ba3742857ca474a412f545ddedb1ad5202f4de9c951f07065b321efa0873394235756f27 WHIRLPOOL a12517832ed846384dcc7ae5bd4ae2a3b3e7e76d1420be8eb8075d65463a01a5abe94fb2b4482269957d080730aedd2eb8c1897f71c15b664eba4e6bbf959477
 EBUILD netbeans-cnd-9999_p20150819.ebuild 4796 SHA256 a9199e224db704e23d618597440c02100fa4cd2649ac81a2861713a958c6573c SHA512 e01cc4ecb78a0a290cd5bbf311af906904e45d3202d1ff267d44cf96f4f3b45becd71e7b28d3715006e9a739cfc4ecfaa10648105a9c3e6e0d54761e682828c0 WHIRLPOOL 1469a655305a6f8a0b1dac677352448ef9253fad43b001f3346524efcd92145451741b3a5724c498cf8c1bfb4c9e891b0b1b9f5d94fad0cfe3b64f082c879fa9
 EBUILD netbeans-cnd-9999_p20150820.ebuild 4796 SHA256 156f6905d06c2b0a90185db910171896811726b94be34b116eb7a95d63b324e4 SHA512 06cc4ab95cdb08600b3aea002187d272818c4d5ff98f45e3201d659d728f359e45e79feb7806ff76cb51cf121ebe40d1c61adaa29ba0197368e2cef9b197a712 WHIRLPOOL 2115a23d9634ff4ec0355f03961b742c52cd5244465057adcf07195347db0ec335857ccfe4d0e37451a689339c0b66b502e979a73440271819cc17d4046e56a5
-MISC ChangeLog 168100 SHA256 a89a3a9b1d8a3698e022b861848caee77db3d9c1a4baa445d013b0fb4fd5b120 SHA512 8e3a215f9f712c970b886a3115202b6d9467bb35d245068cacbc15be1210b7b63d7f8f485ec91e14e58cbed5f630d164973fbe775197c4de8a23679c047e6ddf WHIRLPOOL 80a501109127fa968515b556608a08027762bcee65cb1b253476a231d4fe170dfea9e3fda2777b8c7dd76240bc8fcd7dbe7a31ecfe24fc0392f18a54744fbf75
+EBUILD netbeans-cnd-9999_p20150821.ebuild 4796 SHA256 27b93d128b00e74b2ce35c748c2dfbe9579a1c3bd1225e2ba2bfb4464c1bc674 SHA512 d42add7b1af05c407eaba501fc526aaa0b8f07163ae6d6837259a6d074605c89e213f9a2f5460eb841fb7fc1b5de49e4c57153be21a5027dc525ff80ea8b410c WHIRLPOOL ce893299d2ab72f0a65a7c0a7749b2b2e499bedad271585bd05c008ea87b716e0401ee6ce09148fa920a2a11d4acf3c92545edfb9b7b7c8e07c986cb1b084391
+MISC ChangeLog 168268 SHA256 f0b8cf2a2ffcf92a43c6d6855a838999a53e57e72b96bbe28ce06ab7161ddbd7 SHA512 4b3bab07f3a9f6728978171263acdbc507b42a2cc5d343880f01b2e70f61c395b680a3f74259b6bc7fec386dfc97a7c0fd703de83166f2effb65dc97aadd1bd5 WHIRLPOOL c520a193ef668c713a28b5395793a1c86bfa2ad79fe542a322f41190098a48fee0fcc864b041d5f9061d7b311211139d7a9653a7cc72c3930118faa8e7cafc9d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150821.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150821.ebuild
new file mode 100644
index 0000000..f25f59c
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150821.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-21_00-02-28/zip/netbeans-trunk-nightly-201508210002-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/05D079C8352DA7A77245577B4FE3E55DC7390D87-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}"/05D079C8352DA7A77245577B4FE3E55DC7390D87-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/ChangeLog b/dev-java/netbeans-dlight/ChangeLog
index af598b6..afcc98e 100644
--- a/dev-java/netbeans-dlight/ChangeLog
+++ b/dev-java/netbeans-dlight/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-dlight-9999_p20150821 (21 Aug 2015)
+
+  21 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-dlight-9999_p20150821.ebuild:
+  updated to the latest sources
+
 *netbeans-dlight-9999_p20150820 (20 Aug 2015)
 
   20 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 8e35a0e..c381b40 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -44,6 +44,7 @@ DIST netbeans-trunk-nightly-201508170002-src.zip 208816661 SHA256 899384675fce61
 DIST netbeans-trunk-nightly-201508180002-src.zip 208817240 SHA256 b497e33ddf10398e677b60713e4f8a54f4588dcc633c23841501857c8da5a12d SHA512 725cad02fafd38794cd93d0b1d0ebe01f14c2db6e0d0c21edcf3172406f4fe7ec6ebdae666c84c80c9c943340cdf13f82603f794508d3055a6135a67b6b156ed WHIRLPOOL f7f027bfee7467131e34b90f05f4e46a6aab8c2206cf87e7025267e15f8b6d3ce96e7838687bc53caaf39c60607f0cb17fe1f6bfdb5ad53ecaa529c972c2ae17
 DIST netbeans-trunk-nightly-201508190002-src.zip 208817531 SHA256 6594e5c2181ff7dfcf7eab3c7551571ea8e4cc6f3eb3f196a2b3b4bd7f394745 SHA512 84b4d1f1e77f1a4e2d97c14e2400381ce0d926dae2659cf38bbd4d2b7ae619d479ac1d73900f6d9cf10981b85982f7f19c00662974179e48cc4efb6e3481a82a WHIRLPOOL 7decfaa30422c8c588e8cfb65cd654119c3f80b60ffe3226074e5a1775648154a26a5ef267bd98f0a7720b107a0046b040652379bb6dd4a837d000863098ecd5
 DIST netbeans-trunk-nightly-201508200002-src.zip 208799494 SHA256 81de2b1f44baa32ffb769676ba38edab57124533bda1bb1dcda18b9be5dcb7c2 SHA512 1c68dbcff6bcfeb3566823749b57ce95c2de6a97333573897d78f5f6bc7fcfe2c06a2ff7805bfabea9dc9f60d9e5021d4c3d5aa720004d796caf3b163fb1699d WHIRLPOOL cc8344fb52507294d00071f967abdc5b77fcd37fd3989b81d0efdb7d35c0eca4349f86769f2a09915a72565e399852c40f21eaab89fb6a7c66a58960ecfefc39
+DIST netbeans-trunk-nightly-201508210002-src.zip 208800734 SHA256 c85c1f8027b3b9b03bbcc6743bb508899bc9050058c112f060d73daa544bbde6 SHA512 d8a3cbbc3f671d52bb5edcd2722c9ef847cdc160aecb4a9ee3283c2f64d82284c820c39a68e2aff2e7c3cd24fac618c1d3c48207b8323aa06f92524d0ab3a185 WHIRLPOOL b8938d9102fff59c5cc4f35db839492bbd1b1249d4e9c8da9eb4b2167c1e14d8906d49ba2bc9d301331e25d855b798883ee5f7aa51a5f00b272f55adae5339b3
 EBUILD netbeans-dlight-7.0.1.ebuild 3624 SHA256 499a9303a1972ee89dfa2685e1dc1e4511c7531ff3b29caadd1136ba25dee82e SHA512 ad60adc5d64f93d03e27170311ce7bd0a6952c8b41cdc51385f8efc9140593201064d162b3130bff7a003570de11963d375d3676476115b1129ac74632d4a227 WHIRLPOOL d68dcdba50b2565d40e1adc484b51c1ed0171c2fcf99fbee08a221e6d9767f96d161d45eda612eb4c4d62e0db6826e2cd124b83e11ee2f7c9bfb6a440ec6821d
 EBUILD netbeans-dlight-7.1.2.ebuild 2935 SHA256 dc7d110b80174b1baeaca9c005e2cc9167540f186c7794067cfb45d335251b9a SHA512 7dc2db63ee40a3e64375eb49e669c54f88cc532d7ac8c7320329f8378a3be15ebc4536208ea2975c7fe4a9b3f2ac60d0ec5b8c9a9da392587fb04838f101e0ec WHIRLPOOL 1801653d9e146eba02642dbdb0a39c235a40e5d3d5ac8d4d5b8d2a570aa62330638355ee8df76693db177c58bbf31271342215c70d7e198e4b6bd905984ed9c7
 EBUILD netbeans-dlight-7.2.ebuild 2650 SHA256 9b0c0049b7cf6894cd44327c3697d4ddfb0dba2aebd6aabc1821b550932cd69d SHA512 0584c2a1cc65193673bded284c454b430fa3f5774c33d704922977d25ed26bf88d090670e330299c85ada2e897e5f124ae9f635a6f8be7d7fd10740482df7eae WHIRLPOOL 1c27b0c84a34865cb8a84062127f49aefcd245fa16fb825d7ee57d24c3f5841935242c16b3250319078762ce4e8aa5bc8dbd8dbe497b39af8e027b9e39ee585f
@@ -75,5 +76,6 @@ EBUILD netbeans-dlight-9999_p20150817.ebuild 2995 SHA256 edfb91942c28a80f9bc51ff
 EBUILD netbeans-dlight-9999_p20150818.ebuild 2995 SHA256 e956018e6ea80f7e91b7747b8eaf42731f989bcd3b82639f720936f144e30124 SHA512 b1c6758a89da4380f89c8d93471e917a7701063528eeaaea2f5981be3c8750a147291bad7eb0bb98a54a78d6cb191fcbdb3d409b5210b0d3b3f700fcacc65c83 WHIRLPOOL 60ac71546446268af441999c263883cced3da266bc1d977b43d6bcf948d30c09084379ca99ac63d209e3e08b7efe48bebc7fd2b2063fb3affaf426a662f0946a
 EBUILD netbeans-dlight-9999_p20150819.ebuild 2995 SHA256 391b185359f7f97d0a51430a6538449e9b9215c88988ba88d6097adc3d7718a6 SHA512 3d74d62681a309c7dbe90f78c380d849d80792b7af4bf64f7c63ad8f32d90aecfd4e6f0f866e4e22d5236f7e8e20b52fdfa45fd515daa75bdf246ca71a930d91 WHIRLPOOL 85943e58bed8c9f4a3c524b1dc131c97bccd5933030163d40bd45f3b457b9168a846785a8c664e29283a23ff70d5fe87e2d76d54693909cb989d3ad940a0e383
 EBUILD netbeans-dlight-9999_p20150820.ebuild 2995 SHA256 8404588bf0f20627559e1b43e9f6c8718e7f2798eb15b2237b532b99b378093d SHA512 500ee4749d9ef5d73195d78203caf4ec8e6780a85be35deea17b1de389fce8211956e39d0a3b95536c54102215aa81af5dc4b3923e772cee6ea75fa9e282f0d0 WHIRLPOOL 6853ff408a0c907762cfaa4cb387172ec9f7266cd9af59edba5c157b3dffa6e524ce1236658eafede1c4e3fd81ac7aebf034799be25d9ec6a39044bf87edd482
-MISC ChangeLog 175472 SHA256 74c80ffbf84ffa6f905d3c31f517c3e921ecf68085e6f0252daff0d4afcef801 SHA512 0edb0650acc78b9588273ceebe475cdd4bbf935f9b8dfbdc51f150c51d9ee9fd9bf4b60be7b546810c0b09271085bd512c43f931cff3bf43c22eb6f895f0bce5 WHIRLPOOL 4dbb1c1efd84d15b93240f3bf255f5425b8a10e0f52d18745395de8ab0adddcfcbcd9c4f080654474f06dbb01a2ed66ae6ea6b3ea54c72eeec95555c1bebc0bb
+EBUILD netbeans-dlight-9999_p20150821.ebuild 2995 SHA256 b6ba7b4bcc22f51b3dfb34290484c9e5d0f027b6eab7094384dc62421f860ee3 SHA512 f41b3039d7fac4cb5aaa32a6968ee8f605b95d3a14ea9ac1b110edcb48daadd15fd35406edd8bf612bf0353725c6390ac70df26c968fee85ec48891a7a97310b WHIRLPOOL 3e18a7d156ce90748cacd8e4f0faf45f3b67ddaa3cd988da0e49599495cbbaa2b3e4d6004b165ac86e19e428b5971b24f6d1ab5ed5d3cb60ace63e9c2be634bc
+MISC ChangeLog 175646 SHA256 00bfaa99045670f7824cc1920fd1fccbc68db9acd9148a6e7369de98ec65d30b SHA512 fcc45c3edd7601f42d13c794c87822fa2c2189074de1204c1500339620f36e9ff452a55c86eb52504ae263006e75668aec30c8020e0a1c81172102f4e0adae3f WHIRLPOOL e4705c1cf3f3d939d3877c06de7cb41aa40718bfc0e0bc2a74af413e21499369da5067bb047d936a2c190131a7c4099ecbf27060b7bfa302a4f03003d6ff92f1
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150821.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150821.ebuild
new file mode 100644
index 0000000..0686bf5
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150821.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-21_00-02-28/zip/netbeans-trunk-nightly-201508210002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/6396ED8427E5068B5331C0A3A03A2235135D6D75-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}"/6396ED8427E5068B5331C0A3A03A2235135D6D75-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/ChangeLog b/dev-java/netbeans-enterprise/ChangeLog
index 203384e..2e401bf 100644
--- a/dev-java/netbeans-enterprise/ChangeLog
+++ b/dev-java/netbeans-enterprise/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-enterprise-9999_p20150821 (21 Aug 2015)
+
+  21 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-enterprise-9999_p20150821.ebuild:
+  updated to the latest sources
+
 *netbeans-enterprise-9999_p20150820 (20 Aug 2015)
 
   20 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 18af136..53268fe 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -126,6 +126,7 @@ DIST netbeans-trunk-nightly-201508170002-src.zip 208816661 SHA256 899384675fce61
 DIST netbeans-trunk-nightly-201508180002-src.zip 208817240 SHA256 b497e33ddf10398e677b60713e4f8a54f4588dcc633c23841501857c8da5a12d SHA512 725cad02fafd38794cd93d0b1d0ebe01f14c2db6e0d0c21edcf3172406f4fe7ec6ebdae666c84c80c9c943340cdf13f82603f794508d3055a6135a67b6b156ed WHIRLPOOL f7f027bfee7467131e34b90f05f4e46a6aab8c2206cf87e7025267e15f8b6d3ce96e7838687bc53caaf39c60607f0cb17fe1f6bfdb5ad53ecaa529c972c2ae17
 DIST netbeans-trunk-nightly-201508190002-src.zip 208817531 SHA256 6594e5c2181ff7dfcf7eab3c7551571ea8e4cc6f3eb3f196a2b3b4bd7f394745 SHA512 84b4d1f1e77f1a4e2d97c14e2400381ce0d926dae2659cf38bbd4d2b7ae619d479ac1d73900f6d9cf10981b85982f7f19c00662974179e48cc4efb6e3481a82a WHIRLPOOL 7decfaa30422c8c588e8cfb65cd654119c3f80b60ffe3226074e5a1775648154a26a5ef267bd98f0a7720b107a0046b040652379bb6dd4a837d000863098ecd5
 DIST netbeans-trunk-nightly-201508200002-src.zip 208799494 SHA256 81de2b1f44baa32ffb769676ba38edab57124533bda1bb1dcda18b9be5dcb7c2 SHA512 1c68dbcff6bcfeb3566823749b57ce95c2de6a97333573897d78f5f6bc7fcfe2c06a2ff7805bfabea9dc9f60d9e5021d4c3d5aa720004d796caf3b163fb1699d WHIRLPOOL cc8344fb52507294d00071f967abdc5b77fcd37fd3989b81d0efdb7d35c0eca4349f86769f2a09915a72565e399852c40f21eaab89fb6a7c66a58960ecfefc39
+DIST netbeans-trunk-nightly-201508210002-src.zip 208800734 SHA256 c85c1f8027b3b9b03bbcc6743bb508899bc9050058c112f060d73daa544bbde6 SHA512 d8a3cbbc3f671d52bb5edcd2722c9ef847cdc160aecb4a9ee3283c2f64d82284c820c39a68e2aff2e7c3cd24fac618c1d3c48207b8323aa06f92524d0ab3a185 WHIRLPOOL b8938d9102fff59c5cc4f35db839492bbd1b1249d4e9c8da9eb4b2167c1e14d8906d49ba2bc9d301331e25d855b798883ee5f7aa51a5f00b272f55adae5339b3
 EBUILD netbeans-enterprise-7.0.1.ebuild 16338 SHA256 03ea08daaf5d4c5592937929bac33b4af3bac00a23f2167a7ef7b3c172a72abe SHA512 4d24162c7920b9a1c65e6c6753900ead387a4941c2db98b522631bb09889c281bce048a74e2e584f8b5732cfaad1d7125e0cfd37aa2dc81fe85160b0e123ccd8 WHIRLPOOL 35eb648c37cb6e59aca7969c1074c2c280814529aa7ec3c3191b0d3f2a92fa24e1a8d981f343e4217fff52f6100b4884b970df734c45145759889aa6e6661ff2
 EBUILD netbeans-enterprise-7.1.2.ebuild 18060 SHA256 f63721b8ce5e1afbc58f783348f66f1e3501be519a1c9c1287ef860acc64ceda SHA512 2ca89ec8f89f106a284136d4d0ed52fe3bcf49c650d56ded6e62306c531e5e41f62b8aa923cb544842cf6e34e5f433fecb278bc1515abac987e2d00fb68ffa26 WHIRLPOOL 879067d72285aa6c7273e84ddc3dfef7d09c7cb9f9a6c279fddfbd3eea6439dea053d3c648fcd56d47ef2292db14d101307eb1aa8b3081dfcdbc3dac4d0c3ed9
 EBUILD netbeans-enterprise-7.2.ebuild 17752 SHA256 2f46916df731fe33c5d4626ae580a77686c392932a3388f755324bc3184bd636 SHA512 3543d033b971108fa2b8e6633ed640e812a83b34807e1cb5a69d425823d1fec1c13ecba3cc36fa4504fbfd6297e7eff1ecabe07d01725d9f13c99ffd70d220ba WHIRLPOOL 512753153bbf714ae3fbf9c580f350234d88bd5ce5690e7bc0fadd1c355bd38c2a5c1e9adb7993c3678d759661bbfb1654b0630e3535a2fb9198742fa7fd2c1e
@@ -157,5 +158,6 @@ EBUILD netbeans-enterprise-9999_p20150817.ebuild 15937 SHA256 7d0438fc6673423f55
 EBUILD netbeans-enterprise-9999_p20150818.ebuild 15937 SHA256 c482566b94bfc2d3eaa161b6672cbb3261fdb73b975b1078d692913413d1ea3a SHA512 7be4f11b5ecaa12f3e5770c74a76417e47d15bc1a9654a6da0af46f7000e3eed39051729ce5695cae09e5c74c3fc6d0746bd1e468c7748f132b7796eeda29898 WHIRLPOOL 37c7f85e6d2fc36495f6211ebc8977bd8c055c1eee284187f2917ab49b12692bfbfe707cd8281b9d9b6c260595964ec121c7b72f72ed5f51fbb10a9365ead4bf
 EBUILD netbeans-enterprise-9999_p20150819.ebuild 15937 SHA256 f0ea1f11d183591bbfc0b2979ba12d5195e2ed800ce239e16d45be67522dfd61 SHA512 4b32d692560e37776662652335154519bed3d4b07c8b997cfc82afbf1027d219bbccdc1ae2646fb72c014aee1ae5afc23aaae2451ad2d534170e768436aeee15 WHIRLPOOL 6ae2343294f79ad2647f4eaa654307b4aedbc44e90ee624b1c54fab835fa9934683bb0ee9127830cb82a132d0a6d40eed457dc31b0aabc6f5d2f01f081c2e469
 EBUILD netbeans-enterprise-9999_p20150820.ebuild 15937 SHA256 bc44ebaa8843bde2d2c54d83b64dcc340d9aa4cd1b6504979b996374be0fe055 SHA512 d421322cf09f7de40028fa7354c9b9d1b000d5eb89da46e4fed3ab7c8031049666b387d54d6b3ce44f086fa95a9146273c1f654870e2a5c0ab228c180aa80317 WHIRLPOOL 5f917c892500877f6485e307536293cfc78dd3b7ecc7514efc19e53a1c37de48a49c20adb5b010ec6d1bd963f7550870fa8f766fa775b02445432165cf764cb0
-MISC ChangeLog 184870 SHA256 e9068f8a65908995cc0bdc572a397ee3871825349f44676ed806a3b696ea7393 SHA512 70711c8bed1b66a1faf679f66fa2a1738356bd26a1ea79b3833747925f49ba33e14a44f2ef43971393dd1d06e9e88d786571cca48d606a861ece7e9d5fd2083b WHIRLPOOL ec923007467d76fb54a9580e3283ff8d16ad08efdf7a7da83b94beed2703ba8e7db4950af496f1b33c883aa6882cb64e511c47e58e10528ecc161559065dd3b0
+EBUILD netbeans-enterprise-9999_p20150821.ebuild 15937 SHA256 9fed836d93cf06b91ce39285837586a99046ee94fad849e4edfb66958dc64697 SHA512 673834f3edcd889729d9f3f70b4437228f8b3502778e880af1aafc7b264f0b960f66d73abeb08ce0a1b9fade3e293370986d12cab62c2bc288155083ca8b8ae6 WHIRLPOOL 43cccc11bf2d933dc1236e8bdb8b2b07a8c897ffca88d7113c0c5b2dc4cba901b8580760bbceda3bef3839dcd0c8de20aa75a157abb6b0436f21481c99a46a78
+MISC ChangeLog 185052 SHA256 6daf2842f0b543b4ba12b29dc48d5a21af62f872b8cdaf3a4a552f9c3dce5dd7 SHA512 79ef950978759089aca0eabfaf9e30c7ff284308661c1bd666915bef68594d9782c960e4a3b0dcd6a78cc0b14a06aeb607d4971d9e2a288c617833fe1b0c9d78 WHIRLPOOL ff833597ca19dbbd393a3985e10e2f3d420175c7ac8de2b04787d370314ca47669aa30c1de4c28d714738e3ef1ba7f075d700d97f934ee47243c1477ce55e96e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150821.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150821.ebuild
new file mode 100644
index 0000000..a367ff3
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150821.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-21_00-02-28/zip/netbeans-trunk-nightly-201508210002-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"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/jsr181:0
+	>=dev-java/junit-4.4:4
+	dev-java/tomcat-servlet-api:2.3"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}
+	dev-java/antlr:0[java]
+	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 --build-only --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=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-fileupload-1.3.jar && dosym /usr/share/commons-fileupload/lib/commons-fileupload.jar ${instdir}/commons-fileupload-1.3.jar || die
+	rm jsr88javax.jar && dosym /usr/share/glassfish-deployment-api-1.2/lib/glassfish-deployment-api.jar ${instdir}/jsr88javax.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/aws-sdk
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-codec-1.3.jar && dosym /usr/share/commons-codec/lib/commons-codec.jar ${instdir}/commons-codec-1.3.jar || die
+	rm commons-logging-1.1.1.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.1.1.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/javaee7-endorsed
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jersey2/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm cglib-2.2.0-b21.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.0-b21.jar || die
+	rm guava-14.0.1.jar && dosym /usr/share/guava-14/lib/guava.jar ${instdir}/guava-14.0.1.jar || die
+	rm org.osgi.core-4.2.0.jar && dosym /usr/share/osgi-core-api/lib/osgi-core-api.jar ${instdir}/org.osgi.core-4.2.0.jar || die
+	rm persistence-api-1.0.jar && dosym /usr/share/glassfish-persistence/lib/glassfish-persistence.jar ${instdir}/persistence-api-1.0.jar || die
+	rm validation-api-1.1.0.Final.jar && dosym /usr/share/validation-api-1.0/lib/validation-api.jar ${instdir}/validation-api-1.1.0.Final.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jsf-1_2
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-beanutils.jar && dosym /usr/share/commons-beanutils-1.7/lib/commons-beanutils.jar ${instdir}/commons-beanutils.jar || die
+	rm commons-collections.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections.jar || die
+	rm commons-digester.jar && dosym /usr/share/commons-digester/lib/commons-digester.jar ${instdir}/commons-digester.jar || die
+	rm commons-logging.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/struts
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm antlr-2.7.2.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.2.jar || die
+	rm bsf-2.3.0.jar && dosym /usr/share/bsf-2.3/lib/bsf.jar ${instdir}/bsf-2.3.0.jar || die
+	rm commons-beanutils-1.8.0.jar && dosym /usr/share/commons-beanutils-1.7/lib/commons-beanutils.jar ${instdir}/commons-beanutils-1.8.0.jar || die
+	rm commons-digester-1.8.jar && dosym /usr/share/commons-digester/lib/commons-digester.jar ${instdir}/commons-digester-1.8.jar || die
+	rm commons-fileupload-1.1.1.jar && dosym /usr/share/commons-fileupload/lib/commons-fileupload.jar ${instdir}/commons-fileupload-1.1.1.jar || die
+	rm commons-io-1.1.jar && dosym /usr/share/commons-io-1/lib/commons-io.jar ${instdir}/commons-io-1.1.jar || die
+	rm commons-logging-1.0.4.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.0.4.jar || die
+	rm commons-validator-1.3.1.jar && dosym /usr/share/commons-validator/lib/commons-validator.jar ${instdir}/commons-validator-1.3.1.jar || die
+	rm oro-2.0.8.jar && dosym /usr/share/jakarta-oro-2.0/lib/jakarta-oro.jar ${instdir}/oro-2.0.8.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/enterprise
+}

diff --git a/dev-java/netbeans-ergonomics/ChangeLog b/dev-java/netbeans-ergonomics/ChangeLog
index 6198ef1..287559c 100644
--- a/dev-java/netbeans-ergonomics/ChangeLog
+++ b/dev-java/netbeans-ergonomics/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-ergonomics-9999_p20150821 (21 Aug 2015)
+
+  21 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ergonomics-9999_p20150821.ebuild:
+  updated to the latest sources
+
 *netbeans-ergonomics-9999_p20150820 (20 Aug 2015)
 
   20 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index d160aee..106d47b 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -37,6 +37,7 @@ DIST netbeans-trunk-nightly-201508170002-src.zip 208816661 SHA256 899384675fce61
 DIST netbeans-trunk-nightly-201508180002-src.zip 208817240 SHA256 b497e33ddf10398e677b60713e4f8a54f4588dcc633c23841501857c8da5a12d SHA512 725cad02fafd38794cd93d0b1d0ebe01f14c2db6e0d0c21edcf3172406f4fe7ec6ebdae666c84c80c9c943340cdf13f82603f794508d3055a6135a67b6b156ed WHIRLPOOL f7f027bfee7467131e34b90f05f4e46a6aab8c2206cf87e7025267e15f8b6d3ce96e7838687bc53caaf39c60607f0cb17fe1f6bfdb5ad53ecaa529c972c2ae17
 DIST netbeans-trunk-nightly-201508190002-src.zip 208817531 SHA256 6594e5c2181ff7dfcf7eab3c7551571ea8e4cc6f3eb3f196a2b3b4bd7f394745 SHA512 84b4d1f1e77f1a4e2d97c14e2400381ce0d926dae2659cf38bbd4d2b7ae619d479ac1d73900f6d9cf10981b85982f7f19c00662974179e48cc4efb6e3481a82a WHIRLPOOL 7decfaa30422c8c588e8cfb65cd654119c3f80b60ffe3226074e5a1775648154a26a5ef267bd98f0a7720b107a0046b040652379bb6dd4a837d000863098ecd5
 DIST netbeans-trunk-nightly-201508200002-src.zip 208799494 SHA256 81de2b1f44baa32ffb769676ba38edab57124533bda1bb1dcda18b9be5dcb7c2 SHA512 1c68dbcff6bcfeb3566823749b57ce95c2de6a97333573897d78f5f6bc7fcfe2c06a2ff7805bfabea9dc9f60d9e5021d4c3d5aa720004d796caf3b163fb1699d WHIRLPOOL cc8344fb52507294d00071f967abdc5b77fcd37fd3989b81d0efdb7d35c0eca4349f86769f2a09915a72565e399852c40f21eaab89fb6a7c66a58960ecfefc39
+DIST netbeans-trunk-nightly-201508210002-src.zip 208800734 SHA256 c85c1f8027b3b9b03bbcc6743bb508899bc9050058c112f060d73daa544bbde6 SHA512 d8a3cbbc3f671d52bb5edcd2722c9ef847cdc160aecb4a9ee3283c2f64d82284c820c39a68e2aff2e7c3cd24fac618c1d3c48207b8323aa06f92524d0ab3a185 WHIRLPOOL b8938d9102fff59c5cc4f35db839492bbd1b1249d4e9c8da9eb4b2167c1e14d8906d49ba2bc9d301331e25d855b798883ee5f7aa51a5f00b272f55adae5339b3
 EBUILD netbeans-ergonomics-7.0.1.ebuild 2884 SHA256 e8e4a785fc11b6d0d3c722826761581b8c9c779c5460dc7d1487b3154f4402ab SHA512 3ba2810e650726f48fbdb1bc0c58b6ee1e7d9d29d4be3b27c00bc981b773f26d979fd90154184276e044eafd1d4d8940b47d6f0f58589f9cff7fbadef5fbb05f WHIRLPOOL 5fab7fe6492f91bd0e97a8a95c0652266d771e9b60957e16ce6ff683c1e38081372151cd8c7bea44ee1f1dd7bf435f8b00b9a1a23e4c6106c990794c6093ba10
 EBUILD netbeans-ergonomics-7.1.2.ebuild 2893 SHA256 cd56250980429160b8fa9deb17f15050d016394d5fdef19bf772cf29988c86d8 SHA512 32d4556218791a32efb8cf8ec8303f7e8f27bfb03b97af0c66cee717563c7e02fcd9e350b0425ec0cec28ab09865d4815aba1471ee958e05e7c42e421a7f71c2 WHIRLPOOL 318c8528c2338c1e2f6e342c263be52753fa74c9ac934b0ee60fe0fff2146e86d1761fef8eaeca8eab844709bea2196fbe181fad1f689a9d5b9994da3271b4db
 EBUILD netbeans-ergonomics-7.2.ebuild 2876 SHA256 ca7184ac24c255941c4ec3e686c4237ef0af4be7242c44417fa799813083515e SHA512 c6537bedf2fed4ea914c74a208124fe692af837ab2c81c98b8aa0347cb9d5af496378a8c042437facced26d3b42b101225dfa8b81dfc3d6ec4e3e5613e359f72 WHIRLPOOL c7e4c08ace118690f454dbf6a9040bff3e7013c646947fd02b05bca2b4d802393b6eca3234c6228f8e4df4da1ed193ecfd93c848038e4dd9ae3f50959692aa15
@@ -68,5 +69,6 @@ EBUILD netbeans-ergonomics-9999_p20150817.ebuild 2919 SHA256 f2afdb6006b68adde7e
 EBUILD netbeans-ergonomics-9999_p20150818.ebuild 2919 SHA256 3dd9409c708a052dfd6354502d714b2af7ce43ec16817112c51f13eda1d57d8a SHA512 9a8fcecf8e234fa60bcaf97b8ed28fbb9cf4a07a57057c99c9a212164c12b905d17a3a8d8cba05e14fc5d079a644b0cd4b249d3b85c92a2a96222580069384b4 WHIRLPOOL adc2f1339868a74e70ad716e15c831e01d294faab3adb9d25bb8d95963337a1e30c231b01ec0c345f69b008fddc37661d0e062f0a5dc730ae7e6a4e34a178212
 EBUILD netbeans-ergonomics-9999_p20150819.ebuild 2919 SHA256 23ac51ba17da7a9cb106572e53563681cf783c81974ae44c4fa077d3f2d9814a SHA512 bbe04a8bd8cb4b9385dc9f2f03f43be3d8d79f1acc834b97645534476d2146b255256ef39458735848f56e2821eb4ac418cdf15cb3803f4058f2373582a66d86 WHIRLPOOL 5f1f53b116c0e732879d36cad8f8f560efbdf01efd0f5c8816621e725e6107ee9abbd6c622e4fd345c6756b7c6e65bfb61d08c014d30061b491e6af6826673e0
 EBUILD netbeans-ergonomics-9999_p20150820.ebuild 2919 SHA256 00e570c73babfca6711fae50e7e3f4baec62402c198da3b935c9046f3fa02d2c SHA512 a5b935f4dda3c968c00cdd9a7978b9489a0a54149e5e8b107a97a5eff61d39c589f609443c76d4959d1044c09ac8b4af24aef7e984a32a1395b1e0233b804850 WHIRLPOOL 1f787170e7601fed6a00a4995bb736ff9ecdadab0a2908f11a3e958091346bb8ed15d01d338c1a35093c7d78ccf9a40e117ec73fc404dffb1023af3771cd7d1f
-MISC ChangeLog 184231 SHA256 6a13d95b02f15616f1f34363e563677b392e366588b6f8324d5c609bcc2c3968 SHA512 4e21d12997685827bd2f655b44bac6157cbe4964099f542bf2bd4e26dd3d4fc1c9250464a1a0835e33910b3b5753682b71c0f59dd21237230aa431478147ec75 WHIRLPOOL cf0833cd962ebe5c5fe8287a2ff5d0f94d0403021d654846e3ddea44ad6036505a6ca47345431ba3b81741e4549f27f3ff48c710c5139f32e0fe496c94b588d5
+EBUILD netbeans-ergonomics-9999_p20150821.ebuild 2919 SHA256 435aa4ff4a64808abda4f9eeb6b616fe3196b04ca4f222f19fd9486577179ddd SHA512 78b0b602c3d8ab9aa76a0fef005310a1236c976ab9eea5ca610ae234f78fa8739ae41c22c464b9ed4ceef32ab20cb73e3885ab7843a4f3e27dc8f3e68a2641f9 WHIRLPOOL a7dfa405c395ead7d416064a2d80bfec18cfd7670b59867e41b87c0fd9277046ec0ddee69090764e67732b7087137b51b58217e67e1765918e7fc7ac65905ecb
+MISC ChangeLog 184413 SHA256 44344704d2149b820b0ab5180fcfc252e0121f8f88c8a582012856bf116bf0e4 SHA512 e78996fe33bf6ab212feca70ae97e32e56fbba0c57b0405303f7a811f62c60c7ce4a24c1aca6bb0ccdd433ad8d868397521d68b8747d9e2d72f8cf193cbfc7e6 WHIRLPOOL 6e60a7b5c6c038b88eb0d136d2d458c3f73ed0339b734cfa39d3f4acfefeaa082cfb793a9c6a6b6c8cde359ec8b1dd8f238eb5b335e20dcecf898b720bc406b0
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150821.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150821.ebuild
new file mode 100644
index 0000000..7d96c10
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150821.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-21_00-02-28/zip/netbeans-trunk-nightly-201508210002-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/ChangeLog b/dev-java/netbeans-extide/ChangeLog
index a938800..6800d09 100644
--- a/dev-java/netbeans-extide/ChangeLog
+++ b/dev-java/netbeans-extide/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-extide-9999_p20150821 (21 Aug 2015)
+
+  21 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-extide-9999_p20150821.ebuild:
+  updated to the latest sources
+
 *netbeans-extide-9999_p20150820 (20 Aug 2015)
 
   20 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index d200355..2b28162 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201508170002-src.zip 208816661 SHA256 899384675fce61
 DIST netbeans-trunk-nightly-201508180002-src.zip 208817240 SHA256 b497e33ddf10398e677b60713e4f8a54f4588dcc633c23841501857c8da5a12d SHA512 725cad02fafd38794cd93d0b1d0ebe01f14c2db6e0d0c21edcf3172406f4fe7ec6ebdae666c84c80c9c943340cdf13f82603f794508d3055a6135a67b6b156ed WHIRLPOOL f7f027bfee7467131e34b90f05f4e46a6aab8c2206cf87e7025267e15f8b6d3ce96e7838687bc53caaf39c60607f0cb17fe1f6bfdb5ad53ecaa529c972c2ae17
 DIST netbeans-trunk-nightly-201508190002-src.zip 208817531 SHA256 6594e5c2181ff7dfcf7eab3c7551571ea8e4cc6f3eb3f196a2b3b4bd7f394745 SHA512 84b4d1f1e77f1a4e2d97c14e2400381ce0d926dae2659cf38bbd4d2b7ae619d479ac1d73900f6d9cf10981b85982f7f19c00662974179e48cc4efb6e3481a82a WHIRLPOOL 7decfaa30422c8c588e8cfb65cd654119c3f80b60ffe3226074e5a1775648154a26a5ef267bd98f0a7720b107a0046b040652379bb6dd4a837d000863098ecd5
 DIST netbeans-trunk-nightly-201508200002-src.zip 208799494 SHA256 81de2b1f44baa32ffb769676ba38edab57124533bda1bb1dcda18b9be5dcb7c2 SHA512 1c68dbcff6bcfeb3566823749b57ce95c2de6a97333573897d78f5f6bc7fcfe2c06a2ff7805bfabea9dc9f60d9e5021d4c3d5aa720004d796caf3b163fb1699d WHIRLPOOL cc8344fb52507294d00071f967abdc5b77fcd37fd3989b81d0efdb7d35c0eca4349f86769f2a09915a72565e399852c40f21eaab89fb6a7c66a58960ecfefc39
+DIST netbeans-trunk-nightly-201508210002-src.zip 208800734 SHA256 c85c1f8027b3b9b03bbcc6743bb508899bc9050058c112f060d73daa544bbde6 SHA512 d8a3cbbc3f671d52bb5edcd2722c9ef847cdc160aecb4a9ee3283c2f64d82284c820c39a68e2aff2e7c3cd24fac618c1d3c48207b8323aa06f92524d0ab3a185 WHIRLPOOL b8938d9102fff59c5cc4f35db839492bbd1b1249d4e9c8da9eb4b2167c1e14d8906d49ba2bc9d301331e25d855b798883ee5f7aa51a5f00b272f55adae5339b3
 EBUILD netbeans-extide-7.4.ebuild 3311 SHA256 8585e0b9eac3b9bb35d5b5e0152936f84708a824d76831930a3dfd3d196556b0 SHA512 19eceec7a634923b4712eb277a1ff9900a2eb4d9ac0a2c699175333c263f0c02baaf24eb30bd7919444f5c9df751186689b2d4359ca1c88dca02884d7c18c3cd WHIRLPOOL e64509f198c4d09851f98d5bd2ddd5b469b0a7c0f3122f391c17833e5d6d77b7a6c2fd9e942e34f2df42047504ad40593f97af9b2898450e769c7b012355c316
 EBUILD netbeans-extide-8.0.2.ebuild 3313 SHA256 d147df43b8e55de81e0429604a2497a82861864ae50fbb85368a3070e1c266c9 SHA512 8f2722ce12c1582ca6e9ed348fcb37b9969585037b5432e592e5dd6ef4b3e49c58783da5fe20f088bee07514e3b42de7aa36607900b285c32c4b91fa218df90c WHIRLPOOL 0fb074484787a5e0e688dc734efe027ff6dfd082dd63bc9bccc612f915fbbe33a4f93db6c43d345abc9c191e22ec196aada1e889d1240968916d54c69497a2d6
 EBUILD netbeans-extide-8.0.ebuild 3305 SHA256 b2d57e2e2d92760ead3d383fe4dd5b4fb9fc2807a9b58c6f40b44fc24072b8bb SHA512 6e7f12758188a564ef6b5cf8b0ffdf79e30d1021172d10f215d04e727bc4001e4385fd0961a26a6bb42638089e0919b1d4628a13ba11a3deac94d4693c7210d5 WHIRLPOOL adac8461de43669b7bb98ea8920c0a2944837211a37503b957221149d4b91c4bd92b6db160191990b838c474495c65f62c8a4bb9fdbcaa371b4648a335b1afa9
@@ -62,5 +63,6 @@ EBUILD netbeans-extide-9999_p20150817.ebuild 3383 SHA256 a187a476cd5a429a37f212b
 EBUILD netbeans-extide-9999_p20150818.ebuild 3383 SHA256 b98b3f8f5c0f264f99f2459fbcbd04bac82cf855b75dc180a8fc7b35cda25ec0 SHA512 e82c869ea24cdc80bd22c4faae561920a08abe38c460c79dbf8ee5b3934db78ac6a08ed47a9c263044325780aa2797ff50978528eb54b83f4e3c9db6b37dc896 WHIRLPOOL 518b4d2d2c6e0534ee2449d8443a5e1d881b83f3d40362d3fa0e9078f6594f39620b3198f8ff0cc44e95e109c2d16e21bd6fc304fc6406986dd5328633d0b702
 EBUILD netbeans-extide-9999_p20150819.ebuild 3383 SHA256 81dfd6d1efc37ee35457bcf9a0079cce81bbeee57184fbbd66cc5f84770bc0b5 SHA512 a0789c9850679eb9f18eaeece582156b36b167cbcac61c393729cb597dba49e43b03f49144f534e4831e894971a69a78998de1454c9e9ba74cbc880cf753ae9d WHIRLPOOL 2b86388e439bc5939b3593a4c44f404cb207203d3a8c3f028cafb41e96caeaca1cf00bb0a5636ff40b639d07a354d1a7b8f6961c39dc5b07c79f19fa562241ca
 EBUILD netbeans-extide-9999_p20150820.ebuild 3383 SHA256 81402164752ff7675de036aed2c49a46ce930865895063c585643c71d06c3d30 SHA512 63407b82c9fed62fb7acb109995235d1e14a4f5531353586c03afc5ac4bde2ca5a47509a83437d10e598b234d5eae73b505239f592b1b262c3a2f58e8efac7fd WHIRLPOOL 54c928d60595cd9c4fc4247ff9169b4a276b15a07a7710bd8bccd74d2f57a27561e98e582441ee2d13f5dd2546371f96f581492018798a441ab04145b0e51b8f
-MISC ChangeLog 107382 SHA256 efae09a50ea139fb7060657043662d4277d71fde6a055e3e959ec2f6f960aa96 SHA512 350d00c5b8e4e227b295a7ef4d6e5d19b12b0b763af44849e3eac2b58d05968f686a59302aa29191ad6879f26b3dfb9cd5b92b79fb9e7da067b333f7d56f3186 WHIRLPOOL 3b203a6f3ee06ce0b43025a002f046f9f005f8a1f2f3bdfa7cb2a2ac78ff59115709b1dbaa41ffd56e985bdecb996a4cdd33624e9f312614c10477488660706f
+EBUILD netbeans-extide-9999_p20150821.ebuild 3383 SHA256 9d44f31ea00706ad35ec0ddf492b6b2a0ec6601f3e4017974a0ea6f6500c866e SHA512 c2db9642efad731b1c8e2eabfb072927a7afb62e3216d70cda3fa9137eab18adf8e2ae2b9939c56ab2aafa821ea4775ce29c454b10f653c7c7e0237ad060f131 WHIRLPOOL 46dbbd1e3f4d625ca823c33e4462e2ea7a53367a2d5a74b0f99effc622b87ad6c327888c5fe241609cab9c3630a6ba9a4055cb9483431095de8b4af55a24e2ff
+MISC ChangeLog 107556 SHA256 c4dc2f82b1754d5fa3267ef76896b4512e81ee89fdc2306555cb138f1e997c6b SHA512 7764f37499d45f14c13b3158fd0cbb08cea4a9617c7f0506d06a1a70d210e96a5244b371000e5a1a9ee685bd80faaf3a69cffbafbce78ef0110ca513e54eae84 WHIRLPOOL f6bf990900d7ee66dd05c1fd9172ceba49742b848ebd56053f57aea1a7ffc84c612a7b0bfc282b15e7fcf3d7b234072c54783208c92af7546d9974527d340214
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20150821.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20150821.ebuild
new file mode 100644
index 0000000..34292b2
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20150821.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-21_00-02-28/zip/netbeans-trunk-nightly-201508210002-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/ChangeLog b/dev-java/netbeans-groovy/ChangeLog
index 43f4125..11adfd5 100644
--- a/dev-java/netbeans-groovy/ChangeLog
+++ b/dev-java/netbeans-groovy/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-groovy-9999_p20150821 (21 Aug 2015)
+
+  21 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-groovy-9999_p20150821.ebuild:
+  updated to the latest sources
+
 *netbeans-groovy-9999_p20150820 (20 Aug 2015)
 
   20 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 3d02956..f23bbb6 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -41,6 +41,7 @@ DIST netbeans-trunk-nightly-201508170002-src.zip 208816661 SHA256 899384675fce61
 DIST netbeans-trunk-nightly-201508180002-src.zip 208817240 SHA256 b497e33ddf10398e677b60713e4f8a54f4588dcc633c23841501857c8da5a12d SHA512 725cad02fafd38794cd93d0b1d0ebe01f14c2db6e0d0c21edcf3172406f4fe7ec6ebdae666c84c80c9c943340cdf13f82603f794508d3055a6135a67b6b156ed WHIRLPOOL f7f027bfee7467131e34b90f05f4e46a6aab8c2206cf87e7025267e15f8b6d3ce96e7838687bc53caaf39c60607f0cb17fe1f6bfdb5ad53ecaa529c972c2ae17
 DIST netbeans-trunk-nightly-201508190002-src.zip 208817531 SHA256 6594e5c2181ff7dfcf7eab3c7551571ea8e4cc6f3eb3f196a2b3b4bd7f394745 SHA512 84b4d1f1e77f1a4e2d97c14e2400381ce0d926dae2659cf38bbd4d2b7ae619d479ac1d73900f6d9cf10981b85982f7f19c00662974179e48cc4efb6e3481a82a WHIRLPOOL 7decfaa30422c8c588e8cfb65cd654119c3f80b60ffe3226074e5a1775648154a26a5ef267bd98f0a7720b107a0046b040652379bb6dd4a837d000863098ecd5
 DIST netbeans-trunk-nightly-201508200002-src.zip 208799494 SHA256 81de2b1f44baa32ffb769676ba38edab57124533bda1bb1dcda18b9be5dcb7c2 SHA512 1c68dbcff6bcfeb3566823749b57ce95c2de6a97333573897d78f5f6bc7fcfe2c06a2ff7805bfabea9dc9f60d9e5021d4c3d5aa720004d796caf3b163fb1699d WHIRLPOOL cc8344fb52507294d00071f967abdc5b77fcd37fd3989b81d0efdb7d35c0eca4349f86769f2a09915a72565e399852c40f21eaab89fb6a7c66a58960ecfefc39
+DIST netbeans-trunk-nightly-201508210002-src.zip 208800734 SHA256 c85c1f8027b3b9b03bbcc6743bb508899bc9050058c112f060d73daa544bbde6 SHA512 d8a3cbbc3f671d52bb5edcd2722c9ef847cdc160aecb4a9ee3283c2f64d82284c820c39a68e2aff2e7c3cd24fac618c1d3c48207b8323aa06f92524d0ab3a185 WHIRLPOOL b8938d9102fff59c5cc4f35db839492bbd1b1249d4e9c8da9eb4b2167c1e14d8906d49ba2bc9d301331e25d855b798883ee5f7aa51a5f00b272f55adae5339b3
 EBUILD netbeans-groovy-7.0.1.ebuild 3296 SHA256 29c3d304eca5999e78550fd715dbcbef9d15639d4e4f17fa0e45a46803080729 SHA512 43a0ddb43354bb3c0b8e29004ab547da508662d037b0006dfd24250c49470ddc0384bfffb6423f1e3eeaca98410c5de8b314a69970189306869a16380ab098a1 WHIRLPOOL bf626cecf6dec0c51e7e0b95ac4ff26a795e44a5dabd25719eeb2244742d96d33cb20ebbd9a68728dc27d28b8e558a7e2a3ee318c2e4fde234e0b5e8d32e6a58
 EBUILD netbeans-groovy-7.1.2.ebuild 3305 SHA256 1e00f335b8cc1e90deec3c3251629ba699286b25be5b6945d135d271004dc34b SHA512 3a1d67d02054478ed15e11789292fcce3fcfd343b8feebde5e07a9463c380c644310603a3f9f984e8071b0b097075809dce423b888e1f2aed316cb90a562d20e WHIRLPOOL a790c1e186c4d1949de6b4dd975b929c132e3e7b7c455c7867bd1445f59fb6ace72b5c9adf09d0c6079718fdc6c34a0c5f0c9c437517b55b7ae109ce3e20b064
 EBUILD netbeans-groovy-7.2.ebuild 3160 SHA256 6d709b7cc07d7ebb59c3ede0a19c9890ca3230144d7f455cf24d984ac2f633b0 SHA512 e30c8d58165b87a39a356f8b813c593910cd2c247de41420369fee21157c2f2881db34612711f77c9ecd9501aa6d7235ab7bc41d4092be1e68fab778c16d8288 WHIRLPOOL 4a6495ca077f3c374105b25698c8251aaa89daf56c2749bdc73867b0ea1ae404cfc7b2a8b435ef7b19f00aee8128be051c04d6a24fb631379fbe98d6854a507b
@@ -72,5 +73,6 @@ EBUILD netbeans-groovy-9999_p20150817.ebuild 3422 SHA256 502ebc84a6b6f01ac9a52c9
 EBUILD netbeans-groovy-9999_p20150818.ebuild 3422 SHA256 8c9372121900975fdc4bd8bc8fc0ad7d3103c2a2520f1c0fc918f45abd1e206e SHA512 b17fd7b52bfdf68503c673ab7bc1f50e20885d6a1801049b62ee835c301f53dd933d50b12078a4d06d1af1cf9995a93f9982c1f945653c51f364e3e6089cfe5d WHIRLPOOL 6169cd01ea246ad971d56eb13dfa1daa7fea7bb3dee4aaa3d78d446ddfaa19efdffbff57fdbf7aa71e0fc4555d5300cf689160fc376fe338ff72cad3b51014fb
 EBUILD netbeans-groovy-9999_p20150819.ebuild 3422 SHA256 632ae3b01af54e5167cf1be4adec3cbc771e8c1f8d4a3111c0a228516436a7af SHA512 265bb16355ce74bd0d5a9837eaeb058fbc8befac9d3681f504eec70fbe8351cb6ba4900ab1285db133efcb5ef94d668a97b1194463cf8b7b1b0329dd2f24db11 WHIRLPOOL 87c51462889b58d141205632e453d86044aee1cedef6d91105933c45e6a53f3ae5665646d585411409dec7c6574baf1148d14acf4a0c39272bee9c7e6df66a2f
 EBUILD netbeans-groovy-9999_p20150820.ebuild 3422 SHA256 982c95ace4df4eed18baf2afafdf837aac07b1a1b976ea645f5766afe96f7945 SHA512 80a719344a5763fbb44fe25207d563ce3a5a3df59d14e2ea25f575e53106384825495cef31252f6bced65156ff87779e7c5b9f637bfee9d0b929d26253c0b652 WHIRLPOOL 9acd106f6112a114dc18bfb74f7a0f84cbcea534897cb24821632e70f8f8022427e06c7cfe832395d5d7af9dac3d0b275ac9918b5bcc50f9423cc02ce7bdb8ba
-MISC ChangeLog 175362 SHA256 2aeab0c27d4587dcd177b39d2d761413249edf6b320440847f8e072b1575d5be SHA512 bc00f7a779d28ce10460c2f65582f7740c923eed0b61c68b328131658c5890138a852a043c1d3deb4689e2c647de2b95aaec6f862a2028f5e7b7df27fa89d63f WHIRLPOOL 5914a421eade72aed63390581f6cfadde1b835ca11083d4fe51dbda84f63f54c17d826fa4c8bbecccade604500b0e3cbc66ca31a073e45271f39575a6137ce54
+EBUILD netbeans-groovy-9999_p20150821.ebuild 3422 SHA256 66fcc10c9306b8b173fdea73c4e199c0cd831f12252adc17ea683f4af3939acd SHA512 be78f90babe12bfa337353d1f3b11c7031bcb221a340e799841064f770fe3342e414ebdd729ac6635a4891b518db7910a18f7904b496e16041a416f54171690c WHIRLPOOL 32ddef956b685d638524baa91bbd85c9ba4745d122c02b56455791b703dbfbfa8a16044598795d4c77662c4f7b2258294c88f013b5e79fd877816bdafcea71c1
+MISC ChangeLog 175536 SHA256 2ff05292a3347d7ac16a30bc8d6e79b9ab17137d0f304b93a18b4ec3186a97d8 SHA512 18bba9d9bbd60721f6165ed16828d9f96fd7694ace47c6dadf1fee8a6057baf40cb671d337c33fd27959cf66caf4345b70a09b306e3fae531f41bbafcc6c3896 WHIRLPOOL dba5316c198bcc3c630028caa90aa6fb86d36723cd6d543c5fd2a1d7fb29deebb2415aedb495bee747f186e85caec8b4aafc284d999ebed7776ca9983f56f9d7
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150821.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150821.ebuild
new file mode 100644
index 0000000..41871ee
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150821.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-21_00-02-28/zip/netbeans-trunk-nightly-201508210002-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/ChangeLog b/dev-java/netbeans-harness/ChangeLog
index ba8c458..bd67f16 100644
--- a/dev-java/netbeans-harness/ChangeLog
+++ b/dev-java/netbeans-harness/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-harness-9999_p20150821 (21 Aug 2015)
+
+  21 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-harness-9999_p20150821.ebuild:
+  updated to the latest sources
+
 *netbeans-harness-9999_p20150820 (20 Aug 2015)
 
   20 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index ffc3cce..44366b0 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -43,6 +43,7 @@ DIST netbeans-trunk-nightly-201508170002-src.zip 208816661 SHA256 899384675fce61
 DIST netbeans-trunk-nightly-201508180002-src.zip 208817240 SHA256 b497e33ddf10398e677b60713e4f8a54f4588dcc633c23841501857c8da5a12d SHA512 725cad02fafd38794cd93d0b1d0ebe01f14c2db6e0d0c21edcf3172406f4fe7ec6ebdae666c84c80c9c943340cdf13f82603f794508d3055a6135a67b6b156ed WHIRLPOOL f7f027bfee7467131e34b90f05f4e46a6aab8c2206cf87e7025267e15f8b6d3ce96e7838687bc53caaf39c60607f0cb17fe1f6bfdb5ad53ecaa529c972c2ae17
 DIST netbeans-trunk-nightly-201508190002-src.zip 208817531 SHA256 6594e5c2181ff7dfcf7eab3c7551571ea8e4cc6f3eb3f196a2b3b4bd7f394745 SHA512 84b4d1f1e77f1a4e2d97c14e2400381ce0d926dae2659cf38bbd4d2b7ae619d479ac1d73900f6d9cf10981b85982f7f19c00662974179e48cc4efb6e3481a82a WHIRLPOOL 7decfaa30422c8c588e8cfb65cd654119c3f80b60ffe3226074e5a1775648154a26a5ef267bd98f0a7720b107a0046b040652379bb6dd4a837d000863098ecd5
 DIST netbeans-trunk-nightly-201508200002-src.zip 208799494 SHA256 81de2b1f44baa32ffb769676ba38edab57124533bda1bb1dcda18b9be5dcb7c2 SHA512 1c68dbcff6bcfeb3566823749b57ce95c2de6a97333573897d78f5f6bc7fcfe2c06a2ff7805bfabea9dc9f60d9e5021d4c3d5aa720004d796caf3b163fb1699d WHIRLPOOL cc8344fb52507294d00071f967abdc5b77fcd37fd3989b81d0efdb7d35c0eca4349f86769f2a09915a72565e399852c40f21eaab89fb6a7c66a58960ecfefc39
+DIST netbeans-trunk-nightly-201508210002-src.zip 208800734 SHA256 c85c1f8027b3b9b03bbcc6743bb508899bc9050058c112f060d73daa544bbde6 SHA512 d8a3cbbc3f671d52bb5edcd2722c9ef847cdc160aecb4a9ee3283c2f64d82284c820c39a68e2aff2e7c3cd24fac618c1d3c48207b8323aa06f92524d0ab3a185 WHIRLPOOL b8938d9102fff59c5cc4f35db839492bbd1b1249d4e9c8da9eb4b2167c1e14d8906d49ba2bc9d301331e25d855b798883ee5f7aa51a5f00b272f55adae5339b3
 EBUILD netbeans-harness-7.0.1.ebuild 3579 SHA256 f4d09cb7bd5e8485caf75a3020ddb8102d3ea326878ac384ef4aecb011a1f6a5 SHA512 390c26b4a3dbc81ad1ef210b3ea668926398cb38ea13fa37dceb6782b4478b1ceb7a49e9db300f691fb8b31c21c56b25f4c3237c0890f0c637ca45f596c88294 WHIRLPOOL ae1e34af6dd61c30f645f39a825b6235e3eb1f9a42dd23431225513733209a2eb225a741b75342f827a4be0ffbf41b9786a6a6430051f543c321abe3c20da6bd
 EBUILD netbeans-harness-7.1.2.ebuild 3587 SHA256 e0adc470109009641bf48569623bf0fc51a400ac1ba686475c7dae1a5b561c96 SHA512 e4157a6b294c17fd7430802b33253d473120dc16173557e0d7840078f4043a383d5e3672af64f124509e54cc85d590abfa4375f181a32ab8b49e976cb6613cea WHIRLPOOL 423a5844a2c55ea99db4ac78e1c605a55a04f634601c0ac054e739c0ab4a3e9c765778dbd81ccf4a1e50e9d9e4cc29ecfad2ec64b483197927f434b67cd4d773
 EBUILD netbeans-harness-7.2.ebuild 3421 SHA256 47a5281d140b47e0235592c58657a9065d1827175ccca7d0c73fd81e90710090 SHA512 403fd1f49e11b27ef8002c4066fc911dbeadcccc7adddcdded86c6cd95e8bddaf0603c0ccafd0e91ef31a0909508deab1eb326e98e621bcbae7304413acca291 WHIRLPOOL fe3c5f95a606db39861a80201c185cb5a25e2d80698ac78ff724587b54e859f861b834b89aa79aac22f2c5da700532eaafae67fbcc33259ee07d578ba5c7f9ee
@@ -74,5 +75,6 @@ EBUILD netbeans-harness-9999_p20150817.ebuild 4131 SHA256 1434b8f940667d85db1a2a
 EBUILD netbeans-harness-9999_p20150818.ebuild 4131 SHA256 a95b7cdadaea6c635e6f7a547c460c0807f9c03f93a65ad45f90dc4a5daef983 SHA512 5b0574b07d000362aeed286b936455215935f38601d109438733f4bf504948d0ec01f740ae634e62b71c339852c3b7d8b2eddfc3cc74956ec3d2408133c9a986 WHIRLPOOL 59952a98aad62890c507e267b815e51d20f62d2236c0991956e52002ab6c9c76c9e4f81f68f773e900072dd6dd434d90a0d6a924d5d933c6a760a4b6ae775f8f
 EBUILD netbeans-harness-9999_p20150819.ebuild 4131 SHA256 65d7dfbe3d83ce708dbfe6ca5ee1ab836acb2503035c90bbb9075a17ccf3ceee SHA512 82e9242c4e747fc2d30109495bac5bfcd79ad08e8767e63014ed4941eb36d48bd4b9f29cac6cc9f89364f859dbdaefd73684c0450539949ae952f7947b24b641 WHIRLPOOL 71c191bed845bd411eebe8b93d828858f53f48a6edc3a01bc96ec3b1a01066d4117eaea7d9c7c41508dcb47c30950e418b1c7dc67e2636598b2a809d1915210c
 EBUILD netbeans-harness-9999_p20150820.ebuild 4131 SHA256 3100a435fea79e2c34a31df5235a2aa92f6629f9209291c61eb21e19f6c8daab SHA512 722200b14fb244e6b0344bdb6e36eae9b76c20878aa8397e1a245c07e2b9b5f580a7f8e81f4cf4b8e3c61919b38926b75f1a8d57cafcaeabbca8320e0cae48c8 WHIRLPOOL 3b923ba8388a5127a2cfa892cc8025cee4afab55aa9969a56022962b75d31c41fe76e13213668855d78c343154c264ac2a11dceed5a9f53d08bb9a240345bedb
-MISC ChangeLog 177608 SHA256 9a2c2860b8735e6d81c9399c34a82a5dddbdf2a26211faec8787111b6d8ddfda SHA512 538ab708bae4bbb349a0dccea1ba94489ef14afe4bef55ee1104397f4d52bc70f05aa8c4a83461094e9484de9d5514e0991b405ad4684c071a5a54fea2d67c64 WHIRLPOOL 9e45e8c28a269055d60ea106dd93bfc5222b061b70fac3edea77e14f1cc718eba9d1855681d1c9b416a2291c5ffd27108332311262f98f1ef3080ba2e3366e2b
+EBUILD netbeans-harness-9999_p20150821.ebuild 4131 SHA256 fbec067a3a91109661e584d957356b94a5c2ade36c454c83f223dec31061a9ee SHA512 3b23ec931c89a7804fee07b134dc500185a210b6486aa0d21538382062411dafb27796b1b9380a5d5eb6dd2d8f0d68d0694b737d7aa040b159b1a42d50353f8b WHIRLPOOL dfdf8ffa501d87a9b8f5ccf3daf84dbc1f458dd14720c88f97168973477a5794c090780b0579f0f01f6bf595ae2b39243c7c5ce2f4d8d51a6c35bffc79a29c1c
+MISC ChangeLog 177784 SHA256 259aa3b7c2a28c2a2ad4536fb955c8396ae52d0b77a2f8ed5d2ad7cccb04d2e4 SHA512 8bc52cc6dfba82d55a59f8c9c0c5c94722127bb97eba5037b914233071941653376fa8b3575cdf504ac920268891bf9957f8cfe4f8d2a699e6caa8feb473e198 WHIRLPOOL 4686a757a747e5e1d8e5dc4e259cb478725a66fff0b5efcbcbf333661afabc9a4599fc73a07d0f071a1b6c2efd0ac0bbd3763d8d455c21fc6fb4eb2f2728e034
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20150821.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20150821.ebuild
new file mode 100644
index 0000000..c9ffb64
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20150821.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-21_00-02-28/zip/netbeans-trunk-nightly-201508210002-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=${INSTALL_DIR}/antlib
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsearch-2.0_05.jar && dosym /usr/share/javahelp/lib/jsearch.jar ${instdir}/jsearch-2.0_05.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/harness
+}

diff --git a/dev-java/netbeans-ide/ChangeLog b/dev-java/netbeans-ide/ChangeLog
index c7679a5..d75d42e 100644
--- a/dev-java/netbeans-ide/ChangeLog
+++ b/dev-java/netbeans-ide/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-ide-9999_p20150821 (21 Aug 2015)
+
+  21 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ide-9999_p20150821.ebuild:
+  updated to the latest sources
+
 *netbeans-ide-9999_p20150820 (20 Aug 2015)
 
   20 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 259e966..6878dbe 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -248,6 +248,7 @@ DIST netbeans-trunk-nightly-201508170002-src.zip 208816661 SHA256 899384675fce61
 DIST netbeans-trunk-nightly-201508180002-src.zip 208817240 SHA256 b497e33ddf10398e677b60713e4f8a54f4588dcc633c23841501857c8da5a12d SHA512 725cad02fafd38794cd93d0b1d0ebe01f14c2db6e0d0c21edcf3172406f4fe7ec6ebdae666c84c80c9c943340cdf13f82603f794508d3055a6135a67b6b156ed WHIRLPOOL f7f027bfee7467131e34b90f05f4e46a6aab8c2206cf87e7025267e15f8b6d3ce96e7838687bc53caaf39c60607f0cb17fe1f6bfdb5ad53ecaa529c972c2ae17
 DIST netbeans-trunk-nightly-201508190002-src.zip 208817531 SHA256 6594e5c2181ff7dfcf7eab3c7551571ea8e4cc6f3eb3f196a2b3b4bd7f394745 SHA512 84b4d1f1e77f1a4e2d97c14e2400381ce0d926dae2659cf38bbd4d2b7ae619d479ac1d73900f6d9cf10981b85982f7f19c00662974179e48cc4efb6e3481a82a WHIRLPOOL 7decfaa30422c8c588e8cfb65cd654119c3f80b60ffe3226074e5a1775648154a26a5ef267bd98f0a7720b107a0046b040652379bb6dd4a837d000863098ecd5
 DIST netbeans-trunk-nightly-201508200002-src.zip 208799494 SHA256 81de2b1f44baa32ffb769676ba38edab57124533bda1bb1dcda18b9be5dcb7c2 SHA512 1c68dbcff6bcfeb3566823749b57ce95c2de6a97333573897d78f5f6bc7fcfe2c06a2ff7805bfabea9dc9f60d9e5021d4c3d5aa720004d796caf3b163fb1699d WHIRLPOOL cc8344fb52507294d00071f967abdc5b77fcd37fd3989b81d0efdb7d35c0eca4349f86769f2a09915a72565e399852c40f21eaab89fb6a7c66a58960ecfefc39
+DIST netbeans-trunk-nightly-201508210002-src.zip 208800734 SHA256 c85c1f8027b3b9b03bbcc6743bb508899bc9050058c112f060d73daa544bbde6 SHA512 d8a3cbbc3f671d52bb5edcd2722c9ef847cdc160aecb4a9ee3283c2f64d82284c820c39a68e2aff2e7c3cd24fac618c1d3c48207b8323aa06f92524d0ab3a185 WHIRLPOOL b8938d9102fff59c5cc4f35db839492bbd1b1249d4e9c8da9eb4b2167c1e14d8906d49ba2bc9d301331e25d855b798883ee5f7aa51a5f00b272f55adae5339b3
 EBUILD netbeans-ide-7.0.1.ebuild 22653 SHA256 4c1b3e46e2a6cb89d902c7f4fe6ad9306cbd0c9463a514e87d4c6ec019dc0356 SHA512 5dd526a85a70720686c612efb3aa5602c395111d507b91ae4db04c5814b27bafd1480ab7e44e1148b7412f768543110ff58abdf676de303cd3be9d87b87bd373 WHIRLPOOL abaedc56df115c6050ad7824929ee959ba1669fc1f3f9d4cd1eb9f9f948a608828621f46aeedd0b6062c85b1ad4481d12f952a504559e52c110ff37b88ae0d72
 EBUILD netbeans-ide-7.1.2-r1.ebuild 26831 SHA256 2643a4435aa093e292a2728583d8ffbf213dac6a13dad8e47029ed13a2478493 SHA512 5ba14c7b820f2daae788588ae2fdebdc8af6bb870d6ed56adcc2d43810e5dbd2ea21ae639e6b864d6d0b1e69c9aa4f86dfb15e99eb4a170434aadf0109ad876a WHIRLPOOL c9367735f073f9fcf6bb992b6d481aaea1ebe8526907cb6366d432a3f47a0c4d76bc9224206e0e512708dfe896b465878a2a1ad68836c7cd9b51a3a4efa2aecc
 EBUILD netbeans-ide-7.1.2.ebuild 26834 SHA256 1e57e60a1a00b4530f917319b5d8eef915b9669b9dd3ab82b5afabe171d8959a SHA512 4242265c0783a87c028f955425c86596038aa477e3256ff8ba244220a573486bb7f2e47b07b3c94fbef07940a3b32c313a1320b58656a67cb15a490e7307b1ca WHIRLPOOL 1e23b1e4370292500f154527ecd7a0e7ca315ee73588806413f630355677ee8fe9318a0e672b5f6ad60f829c0a5579b37eedbd737bc8ec154aba9f59c53bd337
@@ -281,5 +282,6 @@ EBUILD netbeans-ide-9999_p20150817.ebuild 30340 SHA256 202da7da39c9ce0fc28a84113
 EBUILD netbeans-ide-9999_p20150818.ebuild 30340 SHA256 dbf42f1076a10ceb0b9e74f0f93c6e63235a7331a04880821444a2751eaa3935 SHA512 7cd37e60aeeeaa44d569a3795abcfd3be6f003e6b26ff7d615900603d732e7bd54a020c5d46ac3a7fdc7d46981df4579727e6a72b05296e5eb673af6a39a1e8c WHIRLPOOL 5f1d5f25ead9c584ab22d13d4aeb1ae6b811a22a58ac83e1a134e8f06d665a03854da3f4b951c647006c822e06885b38164ca6d6bfd595696ada1adb46d5246d
 EBUILD netbeans-ide-9999_p20150819.ebuild 30340 SHA256 ac8bfcec41b5c0af5477d9e0a8627824eb93209a790821b0e18065bd6ec4f053 SHA512 6f8f4f393cc241e1e254ac77c67b8273f25342c90044da4d373ce9db61288eae7eb58d7634f28276a0d63dae06a25997f834ac9c7e0cb8e9f117d57f2fd34d38 WHIRLPOOL 0947fa2748d86b7527f24b6d1128d52ade5922a1c8572f96ecf6dfec33ea96301260e272d19968581809808667db45ca539fd25b673dcb26090ab5fbef6b2441
 EBUILD netbeans-ide-9999_p20150820.ebuild 30340 SHA256 f2a3cafa2c2d545558e40c6db7a6d40efeadf319daf2e12e143e3adc422d9a23 SHA512 6f5916ef58fe9c6ef46248eb0f9d29460c3c4de5e070018de98688f73b9eb6b4125a3485fb49fe6fd657ba4e4f7e8108b0a2c5d16d7c55c063eac8e5b66dc62a WHIRLPOOL 0e0eb750418c41d7bfd68da23c3ed5bd282d384956269989abad57fad036850d20798b9a6a89feb70c2445349b21c385ef20ebf4c1f118c6b9904f8d9b716d3f
-MISC ChangeLog 169022 SHA256 2fe6f1eaf60c359c355311a74eacd4c47b949b2a07f7b5410c21682460df86b0 SHA512 2be063caab9e135515cfc5db1774b91e203b0d749f8df44e182ed7727bd9b91af7aa005ad459c1e2755a5357cd04d856462df7a622b09f9f58ebfa0c508a5dbb WHIRLPOOL 4d4cdfdb41157477fb09a5e2b0e4ea169c17ec1f14068ad6f68218d29c2603b34d4ee8fe9dea94d7262f3f1f7af4d5eee12803912f56d14f28c9018994e8417c
+EBUILD netbeans-ide-9999_p20150821.ebuild 30340 SHA256 8733237500f2791768b073f634360423a3c8f69a971518c57cce0c9331c191f8 SHA512 d4e6b9bedbccd87345b07e1b680cd129dbce1f9ae94f9b2865358abd10267bf08657f54648d4cea0c3c4db5ff29f1d050cf60a1b92f79de8d642b444149fc887 WHIRLPOOL 8f6b99001e1c2b66a4d0864fb797ede676fc48644c947ee37cb0cd788577d2724114af70b8bbddecbfabd01d645565ad34690ab99e947af2af696ccb6edebda6
+MISC ChangeLog 169190 SHA256 ed9b8b58fd841c486b7ac52ca11ae37723df731345566e51f18dc0a85ce39f8e SHA512 27c9c4682ca613164b42206334b0c8b81de17756931f41f29861187b69eac5881933ad4167b03f8eb34ef12e277bb4dbcd0e43a6b9c590e14506e49adcc2def6 WHIRLPOOL 30ffb2e0df676f43eefe597c27622597658368b597ea8877057d729f8e97aa75d27d54960bfa784d6b593859011af69a99eb1ccb38e5bed83e03a2c5edd043e4
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20150821.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20150821.ebuild
new file mode 100644
index 0000000..dfbfaf0
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20150821.ebuild
@@ -0,0 +1,377 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-21_00-02-28/zip/netbeans-trunk-nightly-201508210002-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/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/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
+	http://hg.netbeans.org/binaries/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar
+	http://hg.netbeans.org/binaries/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-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/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/F27BF427BE72709F3094BF76ECA8C5A2B9AC6DA9-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar
+	http://hg.netbeans.org/binaries/9BC512C5BB9A9F5276B9E8672F6B30AD0BD97D88-org.eclipse.core.jobs-3.5.101_nosignature.jar
+	http://hg.netbeans.org/binaries/105DC9A1A93E6EA9A6CD368AD12897B1F247D6AE-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar
+	http://hg.netbeans.org/binaries/E99C3C29A90F8AB29078A38CF8EBC3860249640C-org.eclipse.core.runtime-3.7.0_nosignature.jar
+	http://hg.netbeans.org/binaries/84FC6D443CD0816FA87093B6B7AD6876ADFC4207-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar
+	http://hg.netbeans.org/binaries/74069BFD03B2C66A9EBB4370C0B8064E3F5B6594-org.eclipse.equinox.app-1.3.100_nosignature.jar
+	http://hg.netbeans.org/binaries/A7953EEE9D4D7CD896C7D0AD6D21902E6259979B-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar
+	http://hg.netbeans.org/binaries/3FB169C95F095B70F05B96BE9496DA63FAE7F707-org.eclipse.equinox.preferences-3.4.2_nosignature.jar
+	http://hg.netbeans.org/binaries/CD5919A707EB6B5C1FC29964C8EF5E2CF3F5A3D4-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar
+	http://hg.netbeans.org/binaries/A4634373DC60650C49CC98AEA2090889F7ADC68F-org.eclipse.equinox.security-1.1.1_nosignature.jar
+	http://hg.netbeans.org/binaries/278049664FFA5447191BD5FE96B0B62B0CFD15D1-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/9039A0C1FA0E56CB56A1A192908814478FA747C5-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/DAA45A7EE529A7532F5DC08625A5A3E81DB2D4CB-org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar
+	http://hg.netbeans.org/binaries/F5AC8FBA216A8C52F319EC2CB455B44FFD734B38-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar
+	http://hg.netbeans.org/binaries/B43E7CE55F0DECA3BE1A6E695A3E3ABC6D62567F-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar
+	http://hg.netbeans.org/binaries/1B9CBEC0FCB47C279519E52D360199C24EC99B01-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar
+	http://hg.netbeans.org/binaries/6B0A6E9F9179E314944E4ADB831A9D6FCADED3DC-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar
+	http://hg.netbeans.org/binaries/B28B8EE777232102471EA5334FD70E20851845DD-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar
+	http://hg.netbeans.org/binaries/24A15BD37950663933CC4975EE6E518BEB2C28A3-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar
+	http://hg.netbeans.org/binaries/01CD242F06F6F7E4E61C9E05ABBE07318E501D51-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar
+	http://hg.netbeans.org/binaries/75928E4368CA748131A6767BA1A97D9DA643C306-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar
+	http://hg.netbeans.org/binaries/8307A44D3F150F1BB317532097A0C7D125C00F2D-org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar
+	http://hg.netbeans.org/binaries/E90EF50215FFD23928B3308DC76A17B7DADE5F33-processtreekiller-1.0.5.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-httpclient:3
+	dev-java/commons-lang:2.1
+	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/jzlib: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/freemarker:2.3
+#	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/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}"/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}"/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}"/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-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}"/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}"/F27BF427BE72709F3094BF76ECA8C5A2B9AC6DA9-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}"/9BC512C5BB9A9F5276B9E8672F6B30AD0BD97D88-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}"/105DC9A1A93E6EA9A6CD368AD12897B1F247D6AE-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}"/E99C3C29A90F8AB29078A38CF8EBC3860249640C-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}"/84FC6D443CD0816FA87093B6B7AD6876ADFC4207-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}"/74069BFD03B2C66A9EBB4370C0B8064E3F5B6594-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}"/A7953EEE9D4D7CD896C7D0AD6D21902E6259979B-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}"/3FB169C95F095B70F05B96BE9496DA63FAE7F707-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}"/CD5919A707EB6B5C1FC29964C8EF5E2CF3F5A3D4-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}"/A4634373DC60650C49CC98AEA2090889F7ADC68F-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}"/278049664FFA5447191BD5FE96B0B62B0CFD15D1-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}"/9039A0C1FA0E56CB56A1A192908814478FA747C5-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}"/DAA45A7EE529A7532F5DC08625A5A3E81DB2D4CB-org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar || die
+	ln -s "${DISTDIR}"/F5AC8FBA216A8C52F319EC2CB455B44FFD734B38-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar || die
+	ln -s "${DISTDIR}"/B43E7CE55F0DECA3BE1A6E695A3E3ABC6D62567F-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar || die
+	ln -s "${DISTDIR}"/1B9CBEC0FCB47C279519E52D360199C24EC99B01-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar || die
+	ln -s "${DISTDIR}"/6B0A6E9F9179E314944E4ADB831A9D6FCADED3DC-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar || die
+	ln -s "${DISTDIR}"/B28B8EE777232102471EA5334FD70E20851845DD-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar || die
+	ln -s "${DISTDIR}"/24A15BD37950663933CC4975EE6E518BEB2C28A3-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar || die
+	ln -s "${DISTDIR}"/01CD242F06F6F7E4E61C9E05ABBE07318E501D51-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar || die
+	ln -s "${DISTDIR}"/75928E4368CA748131A6767BA1A97D9DA643C306-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.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}"/E90EF50215FFD23928B3308DC76A17B7DADE5F33-processtreekiller-1.0.5.jar extexecution.process/external/processtreekiller-1.0.5.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.51.jar
+	java-pkg_jar-from --into c.jcraft.jzlib/external jzlib jzlib.jar jzlib-1.0.7.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.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.lang/external commons-lang-2.1 commons-lang.jar commons-lang-2.4.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=${INSTALL_DIR}/modules
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm com-jcraft-jsch.jar && dosym /usr/share/jsch/lib/jsch.jar ${instdir}/com-jcraft-jsch.jar || die
+	rm com-jcraft-jzlib.jar && dosym /usr/share/jzlib/lib/jzlib.jar ${instdir}/com-jcraft-jzlib.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	# 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 && dosym /usr/share/icu4j-4.4/lib/icu4j.jar ${instdir}/icu4j-4_4_2.jar || die
+	rm isorelax.jar && dosym /usr/share/iso-relax/lib/isorelax.jar ${instdir}/isorelax.jar || die
+	rm json-simple-1.1.1.jar && dosym /usr/share/json-simple/lib/json-simple.jar ${instdir}/json-simple-1.1.1.jar || die
+	rm jvyamlb-0.2.7.jar && dosym /usr/share/jvyamlb/lib/jvyamlb.jar ${instdir}/jvyamlb-0.2.7.jar || die
+	rm log4j-1.2.15.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.15.jar || die
+	rm lucene-core-3.5.0.jar && dosym /usr/share/lucene-3.5/lib/lucene-core.jar ${instdir}/lucene-core-3.5.0.jar || die
+	rm mysql-connector-java-5.1.23-bin.jar && dosym /usr/share/jdbc-mysql/lib/jdbc-mysql.jar ${instdir}/mysql-connector-java-5.1.23-bin.jar || die
+	rm postgresql-9.2-1002.jdbc4.jar && dosym /usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar ${instdir}/postgresql-9.2-1002.jdbc4.jar || die
+	rm saxon9B.jar && dosym /usr/share/saxon-9/lib/saxon.jar ${instdir}/saxon9B.jar || die
+	rm servlet-2.2.jar && dosym /usr/share/tomcat-servlet-api-2.2/lib/servlet.jar ${instdir}/servlet-2.2.jar || die
+	rm smack.jar && dosym /usr/share/smack-2.2/lib/smack.jar ${instdir}/smack.jar || die
+	rm smackx.jar && dosym /usr/share/smack-2.2/lib/smackx.jar ${instdir}/smackx.jar || die
+	# rm svnjavahl.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl.jar || die
+	rm xerces-2.8.0.jar && dosym /usr/share/xerces-2/lib/xercesImpl.jar ${instdir}/xerces-2.8.0.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxb
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm activation.jar && dosym /usr/share/sun-jaf/lib/activation.jar ${instdir}/activation.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxb/api
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsr173_1.0_api.jar && dosym /usr/share/jsr173/lib/jsr173.jar ${instdir}/jsr173_1.0_api.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ide
+}

diff --git a/dev-java/netbeans-java/ChangeLog b/dev-java/netbeans-java/ChangeLog
index 6eba303..8ebc31c 100644
--- a/dev-java/netbeans-java/ChangeLog
+++ b/dev-java/netbeans-java/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-java-9999_p20150821 (21 Aug 2015)
+
+  21 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-java-9999_p20150821.ebuild:
+  updated to the latest sources
+
 *netbeans-java-9999_p20150820 (20 Aug 2015)
 
   20 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 21eff9c..2069746 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -123,6 +123,7 @@ DIST netbeans-trunk-nightly-201508170002-src.zip 208816661 SHA256 899384675fce61
 DIST netbeans-trunk-nightly-201508180002-src.zip 208817240 SHA256 b497e33ddf10398e677b60713e4f8a54f4588dcc633c23841501857c8da5a12d SHA512 725cad02fafd38794cd93d0b1d0ebe01f14c2db6e0d0c21edcf3172406f4fe7ec6ebdae666c84c80c9c943340cdf13f82603f794508d3055a6135a67b6b156ed WHIRLPOOL f7f027bfee7467131e34b90f05f4e46a6aab8c2206cf87e7025267e15f8b6d3ce96e7838687bc53caaf39c60607f0cb17fe1f6bfdb5ad53ecaa529c972c2ae17
 DIST netbeans-trunk-nightly-201508190002-src.zip 208817531 SHA256 6594e5c2181ff7dfcf7eab3c7551571ea8e4cc6f3eb3f196a2b3b4bd7f394745 SHA512 84b4d1f1e77f1a4e2d97c14e2400381ce0d926dae2659cf38bbd4d2b7ae619d479ac1d73900f6d9cf10981b85982f7f19c00662974179e48cc4efb6e3481a82a WHIRLPOOL 7decfaa30422c8c588e8cfb65cd654119c3f80b60ffe3226074e5a1775648154a26a5ef267bd98f0a7720b107a0046b040652379bb6dd4a837d000863098ecd5
 DIST netbeans-trunk-nightly-201508200002-src.zip 208799494 SHA256 81de2b1f44baa32ffb769676ba38edab57124533bda1bb1dcda18b9be5dcb7c2 SHA512 1c68dbcff6bcfeb3566823749b57ce95c2de6a97333573897d78f5f6bc7fcfe2c06a2ff7805bfabea9dc9f60d9e5021d4c3d5aa720004d796caf3b163fb1699d WHIRLPOOL cc8344fb52507294d00071f967abdc5b77fcd37fd3989b81d0efdb7d35c0eca4349f86769f2a09915a72565e399852c40f21eaab89fb6a7c66a58960ecfefc39
+DIST netbeans-trunk-nightly-201508210002-src.zip 208800734 SHA256 c85c1f8027b3b9b03bbcc6743bb508899bc9050058c112f060d73daa544bbde6 SHA512 d8a3cbbc3f671d52bb5edcd2722c9ef847cdc160aecb4a9ee3283c2f64d82284c820c39a68e2aff2e7c3cd24fac618c1d3c48207b8323aa06f92524d0ab3a185 WHIRLPOOL b8938d9102fff59c5cc4f35db839492bbd1b1249d4e9c8da9eb4b2167c1e14d8906d49ba2bc9d301331e25d855b798883ee5f7aa51a5f00b272f55adae5339b3
 EBUILD netbeans-java-7.0.1-r2.ebuild 14932 SHA256 3d8eeb5c3aea368c5064e83e9519b2982a3d0f999db11344ba33605f46f865b0 SHA512 0c99037f44aa968f357724650189fe0f6fc89496fbf73f6c5a9bcd589afa5af4974f058a8eea2b6a97e1884f4cabba8b5ecf0214b7e840870358f0e55abbc595 WHIRLPOOL 4c1ccada62d0c8883033500ead9586e5bfcd360e6030b3d8368b0b16b9ed01cc03d3c3d5888de437a16d5382b5fe9ec7c02f3e200c3c19bc9a43f011f32d3a68
 EBUILD netbeans-java-7.1.2-r1.ebuild 14936 SHA256 6082d8d5022e011e7aa9d4ff92bf9a144a4f733b879127552c0ca55566b0f18c SHA512 c03a674b6d93a4261bff40ad9aaad6fa9bc0451d6017aeb51f14c42113cc2ff12f84ff5a6cc01c01b43c7ce1b4d885da5c9cb4c0e13601c8ff780eb140060ac6 WHIRLPOOL d32f06a7bd7d4924f14fcb2ed67fd2f5a1766087e4f46ed77d12d472c4c133eef5431d75a709da1abcf8b8cff5afef303dd57e82e4022651a7278076502300d6
 EBUILD netbeans-java-7.2.ebuild 12206 SHA256 da05f74f2c02e4aac745dcf1be75069cc7070f241d063c19c40465e139ac135f SHA512 62be228321e175ad03c2a7d9270065445ba9e1ca08a1a51927027ddbc78aa43a0c57c6b4193add993764235068c7128655f2f12e00fcd17fbac807334f2483c6 WHIRLPOOL 5f518535df8a5f1e1e4f0bc5c845ca063317221c619c3e8928c89a4f2bb30be5a03838f5a610bcda58959d535e4fb152f92f4edd780bcd423918b448d7ddf2e1
@@ -157,5 +158,6 @@ EBUILD netbeans-java-9999_p20150817.ebuild 14824 SHA256 044fe0c1cbaae87efc68027c
 EBUILD netbeans-java-9999_p20150818.ebuild 14824 SHA256 7c7254783513cc6413cf0e505979660a537a836cdcdab78ddcc63e2bc5a980a2 SHA512 9e535a6432dab43de4b5301df55d7ad5b79f4a2fff68f1db3f798696ac6c986e505510d183fcc19b2bf309d176bd54fa14a5b894525b0fb8f3ec1b25ee632a84 WHIRLPOOL 81cbd59bea4a3e1c11e4cd4f7eb9b8c705007e29e11e29ccbaf9d7d0daa2dea51ea73da5d6f66c2116739de4275ce63e1b806a604aca7c6448b7263dfdcfc3e0
 EBUILD netbeans-java-9999_p20150819.ebuild 14824 SHA256 81421966c3836e92f7a147f32c4a5d81ddeaf15a18d9389a129cf6a8485b3e10 SHA512 78e03e1aa9d0fb7e6f335289fca4920f015d8fc6585e122f84bb844c3c7f289a6bfaca77e32484b38863bd6875682cf7c382c0dc3c76250ea5dd5a1290a88f0b WHIRLPOOL bac21947d47b2e378083dfa9a54569bff1ead2d815736e622a6edac4c927e918ea79fa821538a88910097921971a80e85f3368fc5811e1eeae3748f2acb3ab06
 EBUILD netbeans-java-9999_p20150820.ebuild 14824 SHA256 26bfacfe731bbb607e8434574df66acb995c713cb2189e482f47b09aa319f166 SHA512 8de80663d88de24d1b5d4296afdbde59d24fa323c13725d38852fe2788b3be374e2d119a0bdeac60e2a7ec4fe8e7771c48d1fbe65802b4dc336aeac3e2a29dda WHIRLPOOL 5fd17e5bb1f1b469f2e2c42673b1fd779ba98d1a1b3f8b706ba8ffc4abf6089fb3e1fbbf55afb70ff75cfb3be92b08860a67c8b975b42b4efd0a43ca42aad243
-MISC ChangeLog 172533 SHA256 ecf44e5607514d925f7706fd5dd217f74c0e299e894a110809200ff99b4248a1 SHA512 2eac3933a529aee8120427295f776e610b869106f46448d7b95a07a89720fd4d964d74eeae8ff3a5b4d30990ddbd3e60bce09eb21dd03be9d5aa1ddeb930e7f1 WHIRLPOOL 3ee5a21ae4e1e56f558de8129204a418ff243fd6f116e50265c5f8194955b34961a5299c1bbab8ce69a95c53365efe1f24b575d2d293d710818982bd76bb7a40
+EBUILD netbeans-java-9999_p20150821.ebuild 14824 SHA256 237dcd04c4f91fc0960ee8c7f9e5200bc104f492737d8a7e56e495fe0eff6710 SHA512 bf1ca37d0a14082b763dba1452b1862d76fb33939c7d6f416f6f35bc2cb9097d97da5ae588fccefa9c4412074372b12454e09bccea8afcd8e0a0f30a47d4a511 WHIRLPOOL 9c9dfa689d773c156e2613fdddd39b5b533b832320526de9c77796a27c38a5a1193ba64a72210d11db822a66e83350156209cc99534ae51662544ee996610fd4
+MISC ChangeLog 172703 SHA256 c701f9da9e99a3b9b059b5dbe8647e87eae48045e0bf5055573ce9eee53d9e86 SHA512 33c5b708a6b90fe5c8bc9b1e650cae848bdef1c2cc094023df98412d2a8390e0c656c51f2f9efb278a9e6d8f83d3432348b53a8af32dc92c02c0030cc23b97c0 WHIRLPOOL efc3de6218db809db2cedac0a8eeda1574249d7d0031723b0b0a0bc3304687095b30fb04ce24f7f3f612f5adb8f59f909c9d02412ae9ff89a0549aae734f07dc
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20150821.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20150821.ebuild
new file mode 100644
index 0000000..d098d15
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20150821.ebuild
@@ -0,0 +1,273 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-21_00-02-28/zip/netbeans-trunk-nightly-201508210002-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/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/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar
+	http://hg.netbeans.org/binaries/0961DD1A0DFEED0B1196FFFFF76FC3E3B5B9358B-nb-javac-impl.jar
+	http://hg.netbeans.org/binaries/CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.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:0[java]
+	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: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}"/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}"/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
+	ln -s "${DISTDIR}"/0961DD1A0DFEED0B1196FFFFF76FC3E3B5B9358B-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=/${INSTALL_DIR}/maven/lib
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-cli-1.2.jar && dosym /usr/share/commons-cli-1/lib/commons-cli.jar ${instdir}/commons-cli-1.2.jar || die
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm AbsoluteLayout.jar  && dosym /usr/share/absolutelayout/lib/absolutelayout.jar ${instdir}/AbsoluteLayout.jar || die
+	rm beansbinding-1.2.1.jar && dosym /usr/share/beansbinding/lib/beansbinding.jar ${instdir}/beansbinding-1.2.1.jar || die
+	rm cglib-2.2.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/hibernate4
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm antlr-2.7.7.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.7.jar || die
+	rm c3p0-0.9.2.1.jar && dosym /usr/share/c3p0/lib/c3p0.jar ${instdir}/c3p0-0.9.2.1.jar || die
+	rm cglib-2.2.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
+	rm commons-collections-3.2.1.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections-3.2.1.jar || die
+	rm dom4j-1.6.1.jar && dosym /usr/share/dom4j-1/lib/dom4j.jar ${instdir}/dom4j-1.6.1.jar || die
+	rm javassist-3.18.1-GA.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist-3.18.1-GA.jar || die
+	rm jboss-logging-3.1.3.GA.jar && dosym /usr/share/jboss-logging/lib/jboss-logging.jar ${instdir}/jboss-logging-3.1.3.GA.jar || die
+	rm jboss-transaction-api_1.2_spec-1.0.0.Final.jar && dosym /usr/share/glassfish-transaction-api/lib/jta.jar ${instdir}/jboss-transaction-api_1.2_spec-1.0.0.Final.jar || die
+	rm jtidy-r8-20060801.jar && dosym /usr/share/jtidy/lib/Tidy.jar ${instdir}/jtidy-r8-20060801.jar || die
+	rm log4j-1.2.12.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.12.jar || die
+	rm slf4j-api-1.6.1.jar && dosym /usr/share/slf4j-api/lib/slf4j-api.jar ${instdir}/slf4j-api-1.6.1.jar || die
+	rm slf4j-log4j12-1.6.1.jar && dosym /usr/share/slf4j-log4j12/lib/slf4j-log4j12.jar ${instdir}/slf4j-log4j12-1.6.1.jar || die
+	rm slf4j-simple-1.6.1.jar && dosym /usr/share/slf4j-simple/lib/slf4j-simple.jar ${instdir}/slf4j-simple-1.6.1.jar || die
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext/jaxws22
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm FastInfoset.jar && dosym /usr/share/fastinfoset/lib/fastinfoset.jar ${instdir}/FastInfoset.jar || die
+	rm javax.mail_1.4.jar && dosym /usr/share/oracle-javamail/lib/mail.jar ${instdir}/javax.mail_1.4.jar || die
+	rm mimepull.jar && dosym /usr/share/mimepull/lib/mimepull.jar ${instdir}/mimepull.jar || die
+	rm saaj-impl.jar && dosym /usr/share/saaj/lib/saaj.jar ${instdir}/saaj-impl.jar || die
+	rm stax-ex.jar && dosym /usr/share/stax-ex/lib/stax-ex.jar ${instdir}/stax-ex.jar || die
+	rm stax2-api.jar && dosym /usr/share/stax2-api/lib/stax2-api.jar ${instdir}/stax2-api.jar || die
+	rm streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/xmlstreambuffer.jar ${instdir}/streambuffer.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxws22/api
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
+	rm saaj-api.jar && dosym /usr/share/jsr67/lib/jsr67.jar ${instdir}/saaj-api.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/maven
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jdom-1.0.jar && dosym /usr/share/jdom/lib/jdom.jar ${instdir}/jdom-1.0.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java
+}

diff --git a/dev-java/netbeans-javacard/ChangeLog b/dev-java/netbeans-javacard/ChangeLog
index 87273b3..2052a5d 100644
--- a/dev-java/netbeans-javacard/ChangeLog
+++ b/dev-java/netbeans-javacard/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javacard-9999_p20150821 (21 Aug 2015)
+
+  21 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javacard-9999_p20150821.ebuild:
+  updated to the latest sources
+
 *netbeans-javacard-9999_p20150820 (20 Aug 2015)
 
   20 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index a3b90ba..c2d2f8d 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -40,6 +40,7 @@ DIST netbeans-trunk-nightly-201508170002-src.zip 208816661 SHA256 899384675fce61
 DIST netbeans-trunk-nightly-201508180002-src.zip 208817240 SHA256 b497e33ddf10398e677b60713e4f8a54f4588dcc633c23841501857c8da5a12d SHA512 725cad02fafd38794cd93d0b1d0ebe01f14c2db6e0d0c21edcf3172406f4fe7ec6ebdae666c84c80c9c943340cdf13f82603f794508d3055a6135a67b6b156ed WHIRLPOOL f7f027bfee7467131e34b90f05f4e46a6aab8c2206cf87e7025267e15f8b6d3ce96e7838687bc53caaf39c60607f0cb17fe1f6bfdb5ad53ecaa529c972c2ae17
 DIST netbeans-trunk-nightly-201508190002-src.zip 208817531 SHA256 6594e5c2181ff7dfcf7eab3c7551571ea8e4cc6f3eb3f196a2b3b4bd7f394745 SHA512 84b4d1f1e77f1a4e2d97c14e2400381ce0d926dae2659cf38bbd4d2b7ae619d479ac1d73900f6d9cf10981b85982f7f19c00662974179e48cc4efb6e3481a82a WHIRLPOOL 7decfaa30422c8c588e8cfb65cd654119c3f80b60ffe3226074e5a1775648154a26a5ef267bd98f0a7720b107a0046b040652379bb6dd4a837d000863098ecd5
 DIST netbeans-trunk-nightly-201508200002-src.zip 208799494 SHA256 81de2b1f44baa32ffb769676ba38edab57124533bda1bb1dcda18b9be5dcb7c2 SHA512 1c68dbcff6bcfeb3566823749b57ce95c2de6a97333573897d78f5f6bc7fcfe2c06a2ff7805bfabea9dc9f60d9e5021d4c3d5aa720004d796caf3b163fb1699d WHIRLPOOL cc8344fb52507294d00071f967abdc5b77fcd37fd3989b81d0efdb7d35c0eca4349f86769f2a09915a72565e399852c40f21eaab89fb6a7c66a58960ecfefc39
+DIST netbeans-trunk-nightly-201508210002-src.zip 208800734 SHA256 c85c1f8027b3b9b03bbcc6743bb508899bc9050058c112f060d73daa544bbde6 SHA512 d8a3cbbc3f671d52bb5edcd2722c9ef847cdc160aecb4a9ee3283c2f64d82284c820c39a68e2aff2e7c3cd24fac618c1d3c48207b8323aa06f92524d0ab3a185 WHIRLPOOL b8938d9102fff59c5cc4f35db839492bbd1b1249d4e9c8da9eb4b2167c1e14d8906d49ba2bc9d301331e25d855b798883ee5f7aa51a5f00b272f55adae5339b3
 EBUILD netbeans-javacard-7.0.1.ebuild 4961 SHA256 566bc7e3275c97d0fe3d68c843b53aee641548ec39a8143aebd56d248da3c32c SHA512 5973c8d4254943473209b0881c0fbe40ac6b61563d508e58adc248dd40c8c2d6b742bd6c1667ee11fb404f9d2e62f08a8e4d822a2a3db9fccab254f73828c3b0 WHIRLPOOL fd1e08943ce754a2abfe8c8b83954399287500ce574a46fe0d76f94b300fd2a5978957f94a3ac1d85781330248a46fefacfbae25db95669c3de910145ef96424
 EBUILD netbeans-javacard-7.1.2.ebuild 4970 SHA256 15ff13152b140edaa549ea6515949d99cdb2a4656918566179836ab2277f01b8 SHA512 b7e52b477f6ba645084034eb27e848fb48361351937fc45455bf4b7d74acbdd257427ec589286f0edc71cc98c8cdb114e55988b6d3dc92143e13f407e3b45a52 WHIRLPOOL 85ab6dc2c230ea89fd19d7602ac24e3d2b0f226590998e6a6e277c24ef60a7e86874f7e95e90921d255e84f05e04ad1998ee7361b4d26c6f14828076792a933c
 EBUILD netbeans-javacard-7.2.ebuild 4718 SHA256 d173c848e825b342a52073ba16b7784016f92124d4bc3b5ad8beebb7a7dda772 SHA512 019183c236c59ec2b961445c49643c6da0b376048f1be1d58677a753890bcb03db126f6441221c7572a74fe45c4c27aeee4acb38db620f9203ad04ae8ff2c426 WHIRLPOOL f2a10183045edd22ef4419b630cedafc093b326eb593178a0f50e8d82ebb25ab732fb8c561d49969073d9fce551c5b9150fb1900b49458ed53f0234baa29a78e
@@ -71,5 +72,6 @@ EBUILD netbeans-javacard-9999_p20150817.ebuild 4982 SHA256 2d92cc821fa0ad5ea937f
 EBUILD netbeans-javacard-9999_p20150818.ebuild 4982 SHA256 b69ab63c03a07a173cd69a029cd32e5cff27ffee6be8e0730c18e3c10d1795a4 SHA512 95b3a8ad5aaca58030793efd452b0e0dbae09a3f9626b7bdafaec092691f095c93bab33b6ce6552dcae44d065f8368e4299309ed3c264593f6f8d967338639e7 WHIRLPOOL f1b14a3196e262ee7affc807964603e9f8521c15bbe0e92d3db44b970d18fd2eefb4a83090e31e8afa15987e4ec33c166abe084fe288fab479ee988945560eaf
 EBUILD netbeans-javacard-9999_p20150819.ebuild 4982 SHA256 7a2ddddf10176df20096b54799d7bd13fb9412ecce1c618874ec95fb0c71805c SHA512 6329b4046d5448cefcdb91a6b25d5374f51d404acd5c7f9fc003ad2a48a4af5335cb793874ff6d1704858a7b46b015fdad05f9241310f018102586b97bdc13f2 WHIRLPOOL 474155c9fd37d0e4371c83131fb3a07dd2e553145115b8f0b1f6db962540b1c8aa66d22924537aa4bc165835bc84d64411ce1dae20789a45e7e2267be1cdfe3e
 EBUILD netbeans-javacard-9999_p20150820.ebuild 4982 SHA256 189e89f79b90858465627a2a32a6b031b2f83773a39849c0884c46adc3c69d5f SHA512 0bf1d3ad9519b7925d193e2f6d264ad70c5a893f51b5a763845ce50d99039884c55d6bf2c538e964e9896bc0f24cf174a31029b949b306614af08a5f0759bd0e WHIRLPOOL fbaba9cca66226ac95ea3b74fd6492b8317a3d9d2ba669f95f1e9941a1155e55bba5c51e66b722f49ebb77006fec48cf78dce2b2a56ad97139a6e8504082549d
-MISC ChangeLog 179854 SHA256 2a13854d2c7bfaaa95802c6a9f2d9849131e90e5c481240d01ae907d25ddd12d SHA512 eda58de46abcaca4d64f201b8c6e973eb673874764976f7c263091353f9a634c8439b42e09954f042e06edf65d9e5780e1f57938553e69b64a59b8f18686cf5b WHIRLPOOL f0a8b48b6e6fd25cda9cf6ed23d48f7441badaf10954ef800de00011af712515517f7c228a97818dbc6e6ecdb55c2b8f844dee7d8d826ab42795e9f86df82f0c
+EBUILD netbeans-javacard-9999_p20150821.ebuild 4982 SHA256 dc225fda9a7804d300fdcef402d12d9cc278c3958dced1d1c00eab75683cec3c SHA512 70dedd954c2d88d543e750744eaa486f1271c2e3fdc0a3bf6ffac22a44228464e8c7a942178127ea6ff74a15835f7c75c275a2f54a88b3f4e0dbaa24abfb84e6 WHIRLPOOL b941babddf8c297311364735098c7eb48d246e799d03cb75232401c20ac5580339eda27033167ef846962bd3fbaa51b70577b93615f24a5cf057c9cc05598b55
+MISC ChangeLog 180032 SHA256 8c5bcf83308f85a451e324cb309113db454ad3365990aa5646b775fc4da60807 SHA512 bd425cfe74a561ced48d6362a9f52347f15ec7bba8a94034756f1a9aa22706e566d604b8d1864db342579d0bfffd4db6df2eecc39c5d7f7e5932ea9d03e1d42c WHIRLPOOL 885bec1fa4158917e36702a5a672a32c88f06bd5faeb33fa127638e3d8152f9bf035c632cbb2eed48ce4ff28e2ff1b682fee4d9d4a12e74e5b24050e395e7c1e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150821.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150821.ebuild
new file mode 100644
index 0000000..1719193
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150821.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-21_00-02-28/zip/netbeans-trunk-nightly-201508210002-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=${INSTALL_DIR}/JCDK3.0.2_ConnectedEdition/lib
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm ant-contrib-1.0b3.jar && dosym /usr/share/ant-contrib/lib/ant-contrib.jar ${instdir}/ant-contrib-1.0b3.jar || die
+	rm asm-all-3.1.jar && dosym /usr/share/asm-3/lib/asm.jar ${instdir}/asm-all-3.1.jar || die
+	rm bcel-5.2.jar && dosym /usr/share/bcel/lib/bcel.jar ${instdir}/bcel-5.2.jar || die
+	rm commons-cli-1.0.jar && dosym /usr/share/commons-cli-1/lib/commons-cli.jar ${instdir}/commons-cli-1.0.jar || die
+	rm commons-codec-1.3.jar && dosym /usr/share/commons-codec/lib/commons-codec.jar ${instdir}/commons-codec-1.3.jar || die
+	rm commons-httpclient-3.0.jar && dosym /usr/share/commons-httpclient-3/lib/commons-httpclient.jar ${instdir}/commons-httpclient-3.0.jar || die
+	rm commons-logging-1.1.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.1.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/javacard
+}

diff --git a/dev-java/netbeans-javadoc/ChangeLog b/dev-java/netbeans-javadoc/ChangeLog
index 9e00dea..428cc24 100644
--- a/dev-java/netbeans-javadoc/ChangeLog
+++ b/dev-java/netbeans-javadoc/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javadoc-9999_p20150821 (21 Aug 2015)
+
+  21 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javadoc-9999_p20150821.ebuild:
+  updated to the latest sources
+
 *netbeans-javadoc-9999_p20150820 (20 Aug 2015)
 
   20 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index 3c06a1b..a4d2463 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -43,6 +43,7 @@ DIST netbeans-trunk-nightly-201508170002-src.zip 208816661 SHA256 899384675fce61
 DIST netbeans-trunk-nightly-201508180002-src.zip 208817240 SHA256 b497e33ddf10398e677b60713e4f8a54f4588dcc633c23841501857c8da5a12d SHA512 725cad02fafd38794cd93d0b1d0ebe01f14c2db6e0d0c21edcf3172406f4fe7ec6ebdae666c84c80c9c943340cdf13f82603f794508d3055a6135a67b6b156ed WHIRLPOOL f7f027bfee7467131e34b90f05f4e46a6aab8c2206cf87e7025267e15f8b6d3ce96e7838687bc53caaf39c60607f0cb17fe1f6bfdb5ad53ecaa529c972c2ae17
 DIST netbeans-trunk-nightly-201508190002-src.zip 208817531 SHA256 6594e5c2181ff7dfcf7eab3c7551571ea8e4cc6f3eb3f196a2b3b4bd7f394745 SHA512 84b4d1f1e77f1a4e2d97c14e2400381ce0d926dae2659cf38bbd4d2b7ae619d479ac1d73900f6d9cf10981b85982f7f19c00662974179e48cc4efb6e3481a82a WHIRLPOOL 7decfaa30422c8c588e8cfb65cd654119c3f80b60ffe3226074e5a1775648154a26a5ef267bd98f0a7720b107a0046b040652379bb6dd4a837d000863098ecd5
 DIST netbeans-trunk-nightly-201508200002-src.zip 208799494 SHA256 81de2b1f44baa32ffb769676ba38edab57124533bda1bb1dcda18b9be5dcb7c2 SHA512 1c68dbcff6bcfeb3566823749b57ce95c2de6a97333573897d78f5f6bc7fcfe2c06a2ff7805bfabea9dc9f60d9e5021d4c3d5aa720004d796caf3b163fb1699d WHIRLPOOL cc8344fb52507294d00071f967abdc5b77fcd37fd3989b81d0efdb7d35c0eca4349f86769f2a09915a72565e399852c40f21eaab89fb6a7c66a58960ecfefc39
+DIST netbeans-trunk-nightly-201508210002-src.zip 208800734 SHA256 c85c1f8027b3b9b03bbcc6743bb508899bc9050058c112f060d73daa544bbde6 SHA512 d8a3cbbc3f671d52bb5edcd2722c9ef847cdc160aecb4a9ee3283c2f64d82284c820c39a68e2aff2e7c3cd24fac618c1d3c48207b8323aa06f92524d0ab3a185 WHIRLPOOL b8938d9102fff59c5cc4f35db839492bbd1b1249d4e9c8da9eb4b2167c1e14d8906d49ba2bc9d301331e25d855b798883ee5f7aa51a5f00b272f55adae5339b3
 EBUILD netbeans-javadoc-7.0.1.ebuild 5814 SHA256 68531c51838c95012830f5ae09e2386ea3179c2b31bfd5191f67993e3b3dbe2f SHA512 3bfe0ecc46f371d2553b031a5699229fb874dad1e94415635558b7d46b6764c31337d03444753e687b19a7c0976c68cb72007ccc82df7d1e5848a81f241f80c3 WHIRLPOOL 6571f7a73c262b3b67407840523b79eecc14bad9678cff05fb32a2811049158400870de51bbcef97ecb3f18f8ff59f965bdca8e788918d53822b92e2f20f75f5
 EBUILD netbeans-javadoc-7.1.2.ebuild 5855 SHA256 af28efb956ac3b7147e254ca3083dfaab11b84ea42e20677ebdd18aa29ff87e0 SHA512 ee06c552782170b51cfe70d603792b4240aef6064ba0a5074f394701a43285ed1e4030f539622c616be3175dab013e791c1a3a1193ad379193f5fa3e92eefa40 WHIRLPOOL dfcc63d6c9fcf094e2998ce1c08e29b4d4acbefbe9bea6498c2e28f84576f628da50164a1e0ab3ff5528720fe54cae71f2f5e6f84aedca5b639f13053464e6c1
 EBUILD netbeans-javadoc-7.2.ebuild 5805 SHA256 20d01deae745a7e8d84ffe55ca63ad74342bd8528c0dd15a20aac6570a1a83e3 SHA512 3947f1ab3efc236b8faa14736406ee3e537bbdbe377ea1bbd4f1eafa06a36d2863f8700dc7c84e6c8501abdf130a78e87ad6a0f52c5172bf0ab52f288617bc86 WHIRLPOOL 8301cce0679ed5f68a09e2e968ab2ba0955547f438758b042a04744539324fd79d83d853dfb8b48421f6dac616362cf1a9dd2a0e0ff8763dc2e12a470d16b95f
@@ -74,5 +75,6 @@ EBUILD netbeans-javadoc-9999_p20150817.ebuild 6234 SHA256 cd0b4e37291c2aaec368b2
 EBUILD netbeans-javadoc-9999_p20150818.ebuild 6234 SHA256 b49b91e6191d348c377f9b0bc7180323523588b0b515581e6bbdb8ca9f0bf38d SHA512 4afd4ea3c2b07fa3d43ee87a38e8bfb17187a8b927ce7abff9a3a96315d9b24f092f23d562a233199c4be0ada97db817aae087acec46db076e075ea24c2ea260 WHIRLPOOL 7bfe2320ecae22d24893d71dce07d61c9b55360fad6a6e02a61c92cc6d000b2a0ad2d4ad5071e03d667e6168b4df180982e6dae07b126d1dc32ad41f8afa6d4b
 EBUILD netbeans-javadoc-9999_p20150819.ebuild 6234 SHA256 9a4d900e292a8b3777b6f7bc4655d09c08d25058ee3e7b4a5e41377004fd66f7 SHA512 29b0fc98def5d67b970717ba1d6325014a6d49757d4ee9ee29f51be1f6536418a7955deadca6c109246f4fe63fd7387a34e7a316a89865b973015215f1d9a8d1 WHIRLPOOL 2b0f78c67656320c2e5c3e4bee9c0956daa56f93412dba900f3e9e5c9b429887a4174c6759c1cf230ca73ae4083e5c8cf403e244cbcbd4bfcdd469176b352be4
 EBUILD netbeans-javadoc-9999_p20150820.ebuild 6234 SHA256 006843b32fff1b817e6a910f839dfd4ab778d8234fe88e24d151c826501697ba SHA512 e8b45072c496d80182b3cfb6887d7bd7df64bcaf7e57d94b597fe8ec6bda864246269eccb88980088f4d25a1d532cd81a7d25888b395f04b79bd129b1c505993 WHIRLPOOL 4cc2415a0eb5ccfdbc41afa7f27db3a5840e5e2b7dbb70f7a30be356c22d337bf1fa8e64c513f70e3118204373801a6368d7a402517dc984dd34c15af9a1f758
-MISC ChangeLog 177434 SHA256 0687f77fbbd48834e2119a2595586a4988e46d3ab7baa081cbfe93da4cca9714 SHA512 60cab8a8958c8f50cf3b1056aad50e631b3ab17b0acf8d146198aaa7cda2f103d9f10f1c0aa35f0b1431118e0eeef74425a8e7b639726bc7f143a399b2ec1d9e WHIRLPOOL d2f9388b77891dfdc42f0a055202b0fdda7234594168737c9d7c46232d47dc5553870bf60bd3a6b556767cb9e4255028a8be88fd58be754c2a168f51228d9995
+EBUILD netbeans-javadoc-9999_p20150821.ebuild 6234 SHA256 92cd97a21814051a80856e7ad47bde96d9168aba4684a59d6bf0ff4b38265e36 SHA512 4ca5235d696a295f0b2a96f89eef81613a924d5d2e049db94c53e1ef7943954619b10ecbf9ef35974758ce15524cc4bdec8f9dc55e158eb9cb129ebf560e45c4 WHIRLPOOL 6ff984a28e18c85d53bca0a4a9acca4224f004c15353dc314a62d48a3146a91d278cad99aab64ab435813298a0c4274f3bab5a28cdadd1936c02dcf297ca5703
+MISC ChangeLog 177610 SHA256 eb2e6b24d7ef33ce94df22e6d589e3dca97b61fd513430a3719cc1c2d92cd8c3 SHA512 cc168b5b6fb33a780f3b2e9e554f65dd629750a2b78757e96b6caacdffbc10d239995170211b93103ff0d64dae03ffcfb1b755691cdc620c6567e1838c0985c3 WHIRLPOOL 89604bbe3243dfe65b7932e55cdec1e44215601d5c00c5a27f7bc1a632fedf2be10470c44df97de07d9853081a499a87c5ed53fbeb034064fc5ea2a8dd9732e6
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150821.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150821.ebuild
new file mode 100644
index 0000000..a713ec7
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150821.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-21_00-02-28/zip/netbeans-trunk-nightly-201508210002-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 other jdks do not contain jre/lib/ext/jfxrt.jar
+DEPEND="dev-java/oracle-jdk-bin:1.7
+	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.7"
+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 -f nbbuild/build.xml bootstrap || die
+	ANT_OPTS="-Xmx1536m" eant -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/ChangeLog b/dev-java/netbeans-javafx/ChangeLog
index 5620740..a6d9238 100644
--- a/dev-java/netbeans-javafx/ChangeLog
+++ b/dev-java/netbeans-javafx/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javafx-9999_p20150821 (21 Aug 2015)
+
+  21 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javafx-9999_p20150821.ebuild:
+  updated to the latest sources
+
 *netbeans-javafx-9999_p20150820 (20 Aug 2015)
 
   20 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index efdcf52..76d2007 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -43,6 +43,7 @@ DIST netbeans-trunk-nightly-201508170002-src.zip 208816661 SHA256 899384675fce61
 DIST netbeans-trunk-nightly-201508180002-src.zip 208817240 SHA256 b497e33ddf10398e677b60713e4f8a54f4588dcc633c23841501857c8da5a12d SHA512 725cad02fafd38794cd93d0b1d0ebe01f14c2db6e0d0c21edcf3172406f4fe7ec6ebdae666c84c80c9c943340cdf13f82603f794508d3055a6135a67b6b156ed WHIRLPOOL f7f027bfee7467131e34b90f05f4e46a6aab8c2206cf87e7025267e15f8b6d3ce96e7838687bc53caaf39c60607f0cb17fe1f6bfdb5ad53ecaa529c972c2ae17
 DIST netbeans-trunk-nightly-201508190002-src.zip 208817531 SHA256 6594e5c2181ff7dfcf7eab3c7551571ea8e4cc6f3eb3f196a2b3b4bd7f394745 SHA512 84b4d1f1e77f1a4e2d97c14e2400381ce0d926dae2659cf38bbd4d2b7ae619d479ac1d73900f6d9cf10981b85982f7f19c00662974179e48cc4efb6e3481a82a WHIRLPOOL 7decfaa30422c8c588e8cfb65cd654119c3f80b60ffe3226074e5a1775648154a26a5ef267bd98f0a7720b107a0046b040652379bb6dd4a837d000863098ecd5
 DIST netbeans-trunk-nightly-201508200002-src.zip 208799494 SHA256 81de2b1f44baa32ffb769676ba38edab57124533bda1bb1dcda18b9be5dcb7c2 SHA512 1c68dbcff6bcfeb3566823749b57ce95c2de6a97333573897d78f5f6bc7fcfe2c06a2ff7805bfabea9dc9f60d9e5021d4c3d5aa720004d796caf3b163fb1699d WHIRLPOOL cc8344fb52507294d00071f967abdc5b77fcd37fd3989b81d0efdb7d35c0eca4349f86769f2a09915a72565e399852c40f21eaab89fb6a7c66a58960ecfefc39
+DIST netbeans-trunk-nightly-201508210002-src.zip 208800734 SHA256 c85c1f8027b3b9b03bbcc6743bb508899bc9050058c112f060d73daa544bbde6 SHA512 d8a3cbbc3f671d52bb5edcd2722c9ef847cdc160aecb4a9ee3283c2f64d82284c820c39a68e2aff2e7c3cd24fac618c1d3c48207b8323aa06f92524d0ab3a185 WHIRLPOOL b8938d9102fff59c5cc4f35db839492bbd1b1249d4e9c8da9eb4b2167c1e14d8906d49ba2bc9d301331e25d855b798883ee5f7aa51a5f00b272f55adae5339b3
 EBUILD netbeans-javafx-7.1.2.ebuild 3593 SHA256 76a29b37765000745794e6ae20c6b8528d8637507a257ffef3bef2ce648f05cc SHA512 a04618bda036e6652c7208f90a4dd91e07e75b85243580263f6ec846425ab907a87c318117990d4e8d9044bcd7a0ca8b63bc32bdd0d84e5373a10e67a77b79c0 WHIRLPOOL 11acad585f7315ae6b4edd53c764167567a948cb0e2037d95f2f4de34765909b71d095540c054f4cef3ba70224d294b42720536566e445cbdd06ebf2ad903841
 EBUILD netbeans-javafx-7.2.ebuild 3576 SHA256 3441b901a5074013351bc6c7ba6c424455e2affe52e448f2cfac0058c82345e2 SHA512 ee384d6e4ac767ade82b5d337d7a1c5d2b463c15a7596d91e1a850b37349f88d7867a0ffa11a118c48e2ed463f38dcfa791ec42b3fe85ea1e6bf7c4b27f9b073 WHIRLPOOL 15c7d20f2caa39c6cfcba2f846736754b049483f135ac90ced399672932a6a73467f0b4016550c3b2d8583be20d1467486f5652111893ec16111095a3e9c941c
 EBUILD netbeans-javafx-7.3.ebuild 4476 SHA256 9f268a852d45f37f9d22c3bb58d36be17f438e4b4cb5105d88ac4404731facb3 SHA512 3fa0e48e949d0df0a4404c04379623529f73ff15259f4164fddd10afb9faa046ceed16aac1a7b14728af89bf3a4ed7037638fb7e7e932a64cc71e84f7ecaa44a WHIRLPOOL 0395ca679fa41610c61dceb6ac018d7a76b62c08ca740de2fa2d98523f8e5f840a2d0a8c357b674d171841f93d980b536a671a1f12b5261d402c03b691ac6504
@@ -73,5 +74,6 @@ EBUILD netbeans-javafx-9999_p20150817.ebuild 4723 SHA256 d9a0de5a8912319a6d445b9
 EBUILD netbeans-javafx-9999_p20150818.ebuild 4723 SHA256 7117783d497b2caf50c7b6fd6a86a6ec59110eb9af2b1844191c32020afade5d SHA512 7e54111b4e4d225bea8522458a3c63d42529f941e2948c771c780bdce86823f224b4fcaa10a307cfd88cdbeec260b80cd691071427e67bfe5777691b40cff30f WHIRLPOOL 184050ca2ed183920048a0b3254769649c8fc0147c0c512bb34fe3311e53bc79886e1a0387c07d07121001b392186e25870343817906fba592cfa883a65822f5
 EBUILD netbeans-javafx-9999_p20150819.ebuild 4723 SHA256 4f11177f0f8681a1dd9788f1314c4409b306d2636a5ccfdc7c70f589f159844b SHA512 8f4a89e1b959944a1baed237b0a57290c3125b3d1de5e6f352aec8a8d00ac2258226f4939e9a2879feebaaf89cad6679b535c9f031a9745211117db6d5c8e819 WHIRLPOOL e45d9ec491ed9c96a9f90be84c3b9b3d978d1b02e30f5012d658b961d8d929bc84b1f06e7c67a087689a3a98c45347e29ad987e77759686efadbc1d4f395b638
 EBUILD netbeans-javafx-9999_p20150820.ebuild 4723 SHA256 e2b8e32baa1c4b230dc0e9c536143cc1a47fbf17643cba6488d370745afa756f SHA512 2601f5727b8bf7918f4fb36affb0c0ff2ad1007622a29254b0676d179dea0e5f81b44369aa630b16bb72d0c9b66aa47fbdfbc70c084102dac24f5bad4db461f4 WHIRLPOOL 53c9b8824c95bdd28c2ddf0130181203858344dbceadb15d5f4d19bfbc1b2b7e86013fdfc9aabff50d941bcd2825bd5ad68fd91ccd33e5e394c99486f5a438b6
-MISC ChangeLog 161881 SHA256 66f226665ff82988fefa68df236722d19a19f7e0f3afc2e3f512a7dbfa84720e SHA512 baaec5ea77733667e3e529b38003dfeb39034d423be34cd9875c4e6826d671d95bd04004736e3b5c7b4dec441b94fd6d194b6a4c214b091236ab40b66cc99551 WHIRLPOOL 228d0dbaa2d5e6b4cedcc554cc37f4e8738b241bb2ac8e0124fd192c3f7ba8ad84285118148ef4d04f1772587d1f1e483ab28449afbf302aa6a6738212dcb669
+EBUILD netbeans-javafx-9999_p20150821.ebuild 4723 SHA256 34aa5f7eda021f576fe2232602301c1945c325e1194ed238b6d363d13645d1f6 SHA512 de4ca7b8f056cfc46eea3bdb48593601c5efecae956121e193058bff60db2d46994bb80cd681cf26335c18dbb06e67d9e834f3c3b7762c0c28202d1dc8cd86cc WHIRLPOOL dc5db27b106fbba4e44d0928cc0d9244c264fbcd39afdec6b13e824e1c0db77cbb42e8837cf8c7e4d8492fb28b1747650867c29cfef561d27bcca2155ce13bb0
+MISC ChangeLog 162055 SHA256 9bc3aabd024f110c008485bc5e3f29af9e83756aa4345ed5c4204881865d4822 SHA512 775fc1d87a63e4d7bb3d0a0e7b352bafb8b560ef3aaa183bd2710faa5c5f91e81c72b8a376e867c2348297a3cbafcf15f427fa94858b61bf988a10b87a2776c0 WHIRLPOOL 59003146f9773751b22c57f2b08c2f4ba37370dcadaf65b9724732e941fd52154d2f9474f101514bf61e9529ec46aced2aaf3d4008737c44f205e7b6397ab0e8
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150821.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150821.ebuild
new file mode 100644
index 0000000..0b90893
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150821.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-21_00-02-28/zip/netbeans-trunk-nightly-201508210002-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/B2EB2006BCDB022420BDB4C2D596564539C65699-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}"/B2EB2006BCDB022420BDB4C2D596564539C65699-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/ChangeLog b/dev-java/netbeans-mobility/ChangeLog
index 0195e15..6ef5473 100644
--- a/dev-java/netbeans-mobility/ChangeLog
+++ b/dev-java/netbeans-mobility/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-mobility-9999_p20150821 (21 Aug 2015)
+
+  21 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-mobility-9999_p20150821.ebuild:
+  updated to the latest sources
+
 *netbeans-mobility-9999_p20150820 (20 Aug 2015)
 
   20 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 73f4058..788df24 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -46,6 +46,7 @@ DIST netbeans-trunk-nightly-201508170002-src.zip 208816661 SHA256 899384675fce61
 DIST netbeans-trunk-nightly-201508180002-src.zip 208817240 SHA256 b497e33ddf10398e677b60713e4f8a54f4588dcc633c23841501857c8da5a12d SHA512 725cad02fafd38794cd93d0b1d0ebe01f14c2db6e0d0c21edcf3172406f4fe7ec6ebdae666c84c80c9c943340cdf13f82603f794508d3055a6135a67b6b156ed WHIRLPOOL f7f027bfee7467131e34b90f05f4e46a6aab8c2206cf87e7025267e15f8b6d3ce96e7838687bc53caaf39c60607f0cb17fe1f6bfdb5ad53ecaa529c972c2ae17
 DIST netbeans-trunk-nightly-201508190002-src.zip 208817531 SHA256 6594e5c2181ff7dfcf7eab3c7551571ea8e4cc6f3eb3f196a2b3b4bd7f394745 SHA512 84b4d1f1e77f1a4e2d97c14e2400381ce0d926dae2659cf38bbd4d2b7ae619d479ac1d73900f6d9cf10981b85982f7f19c00662974179e48cc4efb6e3481a82a WHIRLPOOL 7decfaa30422c8c588e8cfb65cd654119c3f80b60ffe3226074e5a1775648154a26a5ef267bd98f0a7720b107a0046b040652379bb6dd4a837d000863098ecd5
 DIST netbeans-trunk-nightly-201508200002-src.zip 208799494 SHA256 81de2b1f44baa32ffb769676ba38edab57124533bda1bb1dcda18b9be5dcb7c2 SHA512 1c68dbcff6bcfeb3566823749b57ce95c2de6a97333573897d78f5f6bc7fcfe2c06a2ff7805bfabea9dc9f60d9e5021d4c3d5aa720004d796caf3b163fb1699d WHIRLPOOL cc8344fb52507294d00071f967abdc5b77fcd37fd3989b81d0efdb7d35c0eca4349f86769f2a09915a72565e399852c40f21eaab89fb6a7c66a58960ecfefc39
+DIST netbeans-trunk-nightly-201508210002-src.zip 208800734 SHA256 c85c1f8027b3b9b03bbcc6743bb508899bc9050058c112f060d73daa544bbde6 SHA512 d8a3cbbc3f671d52bb5edcd2722c9ef847cdc160aecb4a9ee3283c2f64d82284c820c39a68e2aff2e7c3cd24fac618c1d3c48207b8323aa06f92524d0ab3a185 WHIRLPOOL b8938d9102fff59c5cc4f35db839492bbd1b1249d4e9c8da9eb4b2167c1e14d8906d49ba2bc9d301331e25d855b798883ee5f7aa51a5f00b272f55adae5339b3
 EBUILD netbeans-mobility-7.0.1.ebuild 8655 SHA256 992e214ff2926e2f0db623d96b717bf8f8e4ceb47e96e69b3c6b8f67d6a8d130 SHA512 d51bc003f4b637cfe71c9f49a96427e535596542ac195a9621bc4f92c04a6f720a87fac6eb267732f869ba105f263d9d36f848b54a89c734b6a68a78ed323808 WHIRLPOOL 515da7153b12c3b5779cfad16e3800b4d26ba4b174027d9a7b06a26754fad065751c7eda137ba6199315d024a322d59e7ea39a1b2f4244ea75b30770ac505791
 EBUILD netbeans-mobility-7.1.2.ebuild 7543 SHA256 bb3f1245ad68133798fa507f06dd1ffbc1d55f6ba38f4cccc29ff0240e5b5f22 SHA512 41f663977a0716c5449db597d5f90054717ff3579a9137a910d1943d3e0b39379c34c0d9aa9c98d231037a042074c8ecf5fc62c018cd7cd5e8680734ff854c51 WHIRLPOOL c3c6feb41ce3df356f617ca80530673ac653cdf50da0aead00518854d0850d6420333529aa6591e15ddd4053249191fcb47100c5f39a804352722e54f802bae4
 EBUILD netbeans-mobility-7.2.ebuild 6571 SHA256 58af97ca9a6adc56fa6abe91777a1ac35a3a9b7d68af1e73c23a45dc5631abb2 SHA512 ac42c3a3daa7d55c9c13d1c99dd6880d5d99741f80cfceb683da27e30c70d6228d9434571f2405d0dbbf27d2203e3f877da6347794b07b98331edd1631d3a69d WHIRLPOOL 5a6af3cbcd08180dcdf708a038f3119faacb9c78532b4bb1945c7260fb0a8232af57745e41a73311fafffe185c969e0c88ac34970caab7708313f53417695374
@@ -77,5 +78,6 @@ EBUILD netbeans-mobility-9999_p20150817.ebuild 4418 SHA256 691cc58e539c0c0a7ad83
 EBUILD netbeans-mobility-9999_p20150818.ebuild 4418 SHA256 a2c520b371270ebbd8edec60fde7be3bd78fa8f85e27e79a9ce8910cb0707451 SHA512 cb06a096305da16aee49314d1399797615460710654b067f31db6bb1aa5dfdeb062bb61c8db2bb3fcbfa83b4ee4ff33cf9af6e1b240d86f6c86a8ce83048f777 WHIRLPOOL 55cf51f19d8f50b5d0aed942a87bfb0b9ae49fda7a0a6ca0867841c1dcc4a467a1a7964bb9cd7562127cb1404167609511c4f74e1c4426311208c9df4f62da08
 EBUILD netbeans-mobility-9999_p20150819.ebuild 4418 SHA256 dfe3f4e82227de8d8e956a3720da8662b41e232052702e85e27173a3ff8b44ee SHA512 0c1fec331018aff990f2208902e52fb1010b2847c0265c61c07c464b7af7a86e9f4a3a2538a55e1cbdfb81f983dfe1b7a7a713b0702d67d5491da8d2da6302fa WHIRLPOOL 0e8770c6526b7a6e0bced9871c85df876ed24e4bbec99ac3dd29112db9522d01105aa6899af20e9f0ba8d6b94f36207cf821a59dcf3b3f979685a9ee7e07583b
 EBUILD netbeans-mobility-9999_p20150820.ebuild 4418 SHA256 0b5399cc1dda0566be0ee7b0c2e567491d226119a98a00a97e1c7f4b70cdd2ed SHA512 59d9ff373d59c7fcb1ca446d65077b2caefa6293917d11797f8c14940ad0d7f32ac994f44121eecf227fb590f5ff1655a01d1dc7f7ed551583383356cd5edde5 WHIRLPOOL 51d2a5449978d57c2f830b8ffc544d13d5e87e68b9550199108c4f22de3ff59a9f7e7a0e9fb8916f6d5d18e76b33047bf46875505801ab1e828f1b7ba41495dd
-MISC ChangeLog 179995 SHA256 0b4c8687d1cdbe903c10083143e7c1437fc3d562b98364fd77b278329af634f7 SHA512 6b63e0cd00ec8913c25c42dad0c7b051803205329271b9cccf72995b72929d765099f9882bb84399a2e57ff48a0816c77b3e000560712c2860ce84846c9e4aba WHIRLPOOL aad2c898aef113919e3641ac2d2b7eb783c1ec3ee8fa01a542af1f1243aeb4abd5218efe52570313859359558d57c57c7e3f6460e145248b16f4b8fb2532a690
+EBUILD netbeans-mobility-9999_p20150821.ebuild 4418 SHA256 c6ebab7d381720432608e382c95279a6cf53a72f5bc72c2b3fd68aada8d9df0c SHA512 f015c3c90f2f8bc82646fe974631f013a772bc3612a5831a5c4cf92b83b99a8a6d7929548a5c18d7eb8f62f6c22c99f755934edeceaac71e65f4b6f142f9d9ed WHIRLPOOL 73d620e7a228e7211b3774d84c5468dd9ac0967d1f46872f8267bae2ffabc09353c0de3edcc13e41691ed3ee604de4fc2a68862c0bc9aa154e57b2cfaa1945d0
+MISC ChangeLog 180173 SHA256 de7b4711c5e742bc3bb266e41bc9a5401c3412b788ba7681866298d949b945c3 SHA512 c0ede2dceccddcfb8fe95b44cde27075e1d2b57d0fec3feb19c41a952401401fa796e9391534f24c82a2637077f3bce27e4fefd0d4a1518b69ec50010c52f3cd WHIRLPOOL c24d53a5eb6b31767a076215c29d5d9c24c248955635d7b5cb7340f102a618b4ae5f51b473890faa5019fc1d867f1cdbb4ceff946479acefd0b404a19f84d399
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150821.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150821.ebuild
new file mode 100644
index 0000000..bd07c87
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150821.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-21_00-02-28/zip/netbeans-trunk-nightly-201508210002-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/ChangeLog b/dev-java/netbeans-nb/ChangeLog
index 933478e..c74da85 100644
--- a/dev-java/netbeans-nb/ChangeLog
+++ b/dev-java/netbeans-nb/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-nb-9999_p20150821 (21 Aug 2015)
+
+  21 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-nb-9999_p20150821.ebuild:
+  updated to the latest sources
+
 *netbeans-nb-9999_p20150820 (20 Aug 2015)
 
   20 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index fcffafb..ff49cfe 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -45,6 +45,7 @@ DIST netbeans-trunk-nightly-201508170002-src.zip 208816661 SHA256 899384675fce61
 DIST netbeans-trunk-nightly-201508180002-src.zip 208817240 SHA256 b497e33ddf10398e677b60713e4f8a54f4588dcc633c23841501857c8da5a12d SHA512 725cad02fafd38794cd93d0b1d0ebe01f14c2db6e0d0c21edcf3172406f4fe7ec6ebdae666c84c80c9c943340cdf13f82603f794508d3055a6135a67b6b156ed WHIRLPOOL f7f027bfee7467131e34b90f05f4e46a6aab8c2206cf87e7025267e15f8b6d3ce96e7838687bc53caaf39c60607f0cb17fe1f6bfdb5ad53ecaa529c972c2ae17
 DIST netbeans-trunk-nightly-201508190002-src.zip 208817531 SHA256 6594e5c2181ff7dfcf7eab3c7551571ea8e4cc6f3eb3f196a2b3b4bd7f394745 SHA512 84b4d1f1e77f1a4e2d97c14e2400381ce0d926dae2659cf38bbd4d2b7ae619d479ac1d73900f6d9cf10981b85982f7f19c00662974179e48cc4efb6e3481a82a WHIRLPOOL 7decfaa30422c8c588e8cfb65cd654119c3f80b60ffe3226074e5a1775648154a26a5ef267bd98f0a7720b107a0046b040652379bb6dd4a837d000863098ecd5
 DIST netbeans-trunk-nightly-201508200002-src.zip 208799494 SHA256 81de2b1f44baa32ffb769676ba38edab57124533bda1bb1dcda18b9be5dcb7c2 SHA512 1c68dbcff6bcfeb3566823749b57ce95c2de6a97333573897d78f5f6bc7fcfe2c06a2ff7805bfabea9dc9f60d9e5021d4c3d5aa720004d796caf3b163fb1699d WHIRLPOOL cc8344fb52507294d00071f967abdc5b77fcd37fd3989b81d0efdb7d35c0eca4349f86769f2a09915a72565e399852c40f21eaab89fb6a7c66a58960ecfefc39
+DIST netbeans-trunk-nightly-201508210002-src.zip 208800734 SHA256 c85c1f8027b3b9b03bbcc6743bb508899bc9050058c112f060d73daa544bbde6 SHA512 d8a3cbbc3f671d52bb5edcd2722c9ef847cdc160aecb4a9ee3283c2f64d82284c820c39a68e2aff2e7c3cd24fac618c1d3c48207b8323aa06f92524d0ab3a185 WHIRLPOOL b8938d9102fff59c5cc4f35db839492bbd1b1249d4e9c8da9eb4b2167c1e14d8906d49ba2bc9d301331e25d855b798883ee5f7aa51a5f00b272f55adae5339b3
 EBUILD netbeans-nb-7.0.1.ebuild 5106 SHA256 3c68751bf5face5f80e2d7dcedb7466e69343f2d06c0a4dd30a722a987fbb207 SHA512 d79343e0ca8655b074a8f96b9898e4bc0123d60e346602ba8d7a239597993cadb33a036b43862ef1a39630e4f0ba7e79892d8b2eed8b30535f12a5d0b9f4b581 WHIRLPOOL 9f2cd645e34fbcfa8f0059fbda4f355f411aaff7966121360dfe5b3c769966c5a4586bbc04142b279e3a3fa323bc4b51a6349cf3eafe89063db44fcae58ef119
 EBUILD netbeans-nb-7.1.2.ebuild 4977 SHA256 265f9e4a9490937a65632ddaef48e3a731154b07b9ee5f9536a991181fc2fcbd SHA512 65d1065993dba3b1fece428beb1b75f17d89eddb08aacd2cbf5ecd3ee5ca844e75e9100c324ecdeeed5b138b1da4ab8cd5a4598e584a17545ffc2c52ea763779 WHIRLPOOL 9b63f2b5671bd38d24ff6b280de37fc19c74170bf80c22818da5e8af415a85211c6cfcf690e68d7697c41a1b749a3c7b48ec9b362782df140856f892d381e360
 EBUILD netbeans-nb-7.2.ebuild 4960 SHA256 bef2020a6e0d722ca77c0931b9a06014cedc822f14a21d8d916200e358dcdfb8 SHA512 988d902bbef52e123b5800e56049210d69c4dd6dbeca80396aeac58c70d90b76da65b338e664368ea3f9a3973b7b94ffd0a47a77b01be53452c2cc04c4067442 WHIRLPOOL a27fa8a1a066499a3fc2cb82e955b6b18b1725889b088ea1e94528cde3ec58f3b46c1e757fa597af6ad4ba96218dacfacff9561799f46add316e233d46127d28
@@ -76,5 +77,6 @@ EBUILD netbeans-nb-9999_p20150817.ebuild 5003 SHA256 6b4a0a34bdead8f1cdb09598c85
 EBUILD netbeans-nb-9999_p20150818.ebuild 5003 SHA256 a151ebd58a596510fdc94c6e0fd3fea78d31beae74a5d5238415b441dca6dbf9 SHA512 2b5f491cc82572208e2368d2b476f29e17cee5cee430f0885cea3c268eff08bd91767c1e6d7dfc1b603672e6247fcbadd40ce239cb5d9e5799a889c2e7b834d7 WHIRLPOOL a8e9a4004418e86b1f55a3e75340955c0b27445e779fd4c13288ab9c113f66843f509c7a6d0e4e746dd78a7586b4cb50dd20865274a6448b4bf1b00812533df9
 EBUILD netbeans-nb-9999_p20150819.ebuild 5003 SHA256 d7c46dc51e1798bff454ba509c326eda4a004c1a3780ac51ded8ede1cdea9e5d SHA512 be469c7af09065ca40a73ec263b0693981aca9ce5b4ac7c7598912cfa32fb5f56f53dd3a59172ae254ab38e2ccfcfac6087bdecb2dba956adb56020f824ce96c WHIRLPOOL b8f2ed3c95188b906a83e17ffa115ed4ead9fafa76890d72b59f37a93580f3be84dc4e4c38dec16ebc5e94a34c1035b9bfa6d6b0974e4c342108670b259ad3e9
 EBUILD netbeans-nb-9999_p20150820.ebuild 5003 SHA256 d4e8163cbeb98f085919acf8b8ab7a3659e1ba4b5008653aa1a983471acfbd86 SHA512 3413afa0f149aa201a1ec0ed3c78c09749bc66f4155161e3d200453e1abc5badb9aba345bce241f1a1bab5b79db82219eea7edff0a1abe9d778d2cf14929ea01 WHIRLPOOL e2fd6f26ab1330669bc282678f339c222d3320596edfd14c33431fc7469bc0dbb5f88927bfacd5d7ceecdb031c8324da9d1145067d4a752bc97ec337ed95bd0f
-MISC ChangeLog 167973 SHA256 e8a0bb25edfdf5f422843975817697ee76a7fd6dd9007a13d789c9c4fda8d8f6 SHA512 813bc59f84de2172e309fca07d6cd0b5f648a0424af28deb8948fc92ec1f88e4d243a11e61975dce00191407df95f0d599bbaf34f389de631b63e33089441c89 WHIRLPOOL 43c6e9a38cbbeac1aa3b9a8479fbef6e00663af45b1b2a9e33c6f729671b155083c17116bbea803c8addae6307b9e75de7cd912d281da7fb64d5fd542b067c24
+EBUILD netbeans-nb-9999_p20150821.ebuild 5003 SHA256 cbc45fbbb0f2fd4933b8f7c900d3fbc1f4f0a56c2b9d91d4d92970a406df3718 SHA512 22914f4431a29d72f29c49adf3dbf80fea39cbc1f2df329e927a30f99561b23d032ef2e69873bdc8c3aebbeefa0c7e00f0821cf6c17d1f105e5cbc466bee49be WHIRLPOOL d68658fa724858a26dc7b70382c3d6912125b885fba1cfc6768440d2ba7e039919d846dfaf31fcd6dbb0e6c5c0310a802c8287c95b238a34e4919731394d6e33
+MISC ChangeLog 168139 SHA256 2a680f69a8881cc97456e4af0075138bda27a4053d708396b8d4775eb2b366f6 SHA512 8190a54d91a38c3d29db954595d34199cb35843403f5c1a7ad5ce8bc952c276d0daa473ae339e0fae5fa359c03b2f8b53a25e5c4b1f61310e6bd0af9e1b4d13d WHIRLPOOL aaf0332c17076121d5f6311e86e3c51b5b1edc36b9a84757c9e19afef9a37cac2a87c11a9be2754cb1e08b66ede893ae3b1a068d9c9aa12ca067678fb0770a9b
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20150821.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20150821.ebuild
new file mode 100644
index 0000000..318e1ab
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20150821.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-21_00-02-28/zip/netbeans-trunk-nightly-201508210002-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="keychain"
+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}
+	keychain? (
+		net-misc/keychain:0
+		net-misc/x11-ssh-askpass:0
+	)"
+
+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
+	use keychain && epatch "${FILESDIR}"/${SLOT}/keychain-support.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
+}
+
+pkg_postinst() {
+	if use keychain ; then
+		einfo "You enabled keychain support, that means NetBeans will use keychain for managing"
+		einfo "your keys while connecting to ssh protected repositories. If you want to load some"
+		einfo "keys on NetBeans startup, create file keychain-keys.txt in your userdir"
+		einfo "(~/.netbeans/${SLOT}/keychain-keys.txt) and put names of your keys in the file,"
+		einfo "each key on single line, for example:"
+		einfo "id_dsa"
+		einfo "id_dsa_gentoo"
+		einfo "If on NetBeans startup key will not be handled by keychain yet, you will be asked"
+		einfo "for key password (only this time and never again). You can find more information"
+		einfo "about keychain at https://wiki.gentoo.org/wiki/Keychain"
+	fi
+}

diff --git a/dev-java/netbeans-php/ChangeLog b/dev-java/netbeans-php/ChangeLog
index d18cb3c..fcd3457 100644
--- a/dev-java/netbeans-php/ChangeLog
+++ b/dev-java/netbeans-php/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-php-9999_p20150821 (21 Aug 2015)
+
+  21 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-php-9999_p20150821.ebuild:
+  updated to the latest sources
+
 *netbeans-php-9999_p20150820 (20 Aug 2015)
 
   20 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index f3e7a11..cc7df52 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -49,6 +49,7 @@ DIST netbeans-trunk-nightly-201508170002-src.zip 208816661 SHA256 899384675fce61
 DIST netbeans-trunk-nightly-201508180002-src.zip 208817240 SHA256 b497e33ddf10398e677b60713e4f8a54f4588dcc633c23841501857c8da5a12d SHA512 725cad02fafd38794cd93d0b1d0ebe01f14c2db6e0d0c21edcf3172406f4fe7ec6ebdae666c84c80c9c943340cdf13f82603f794508d3055a6135a67b6b156ed WHIRLPOOL f7f027bfee7467131e34b90f05f4e46a6aab8c2206cf87e7025267e15f8b6d3ce96e7838687bc53caaf39c60607f0cb17fe1f6bfdb5ad53ecaa529c972c2ae17
 DIST netbeans-trunk-nightly-201508190002-src.zip 208817531 SHA256 6594e5c2181ff7dfcf7eab3c7551571ea8e4cc6f3eb3f196a2b3b4bd7f394745 SHA512 84b4d1f1e77f1a4e2d97c14e2400381ce0d926dae2659cf38bbd4d2b7ae619d479ac1d73900f6d9cf10981b85982f7f19c00662974179e48cc4efb6e3481a82a WHIRLPOOL 7decfaa30422c8c588e8cfb65cd654119c3f80b60ffe3226074e5a1775648154a26a5ef267bd98f0a7720b107a0046b040652379bb6dd4a837d000863098ecd5
 DIST netbeans-trunk-nightly-201508200002-src.zip 208799494 SHA256 81de2b1f44baa32ffb769676ba38edab57124533bda1bb1dcda18b9be5dcb7c2 SHA512 1c68dbcff6bcfeb3566823749b57ce95c2de6a97333573897d78f5f6bc7fcfe2c06a2ff7805bfabea9dc9f60d9e5021d4c3d5aa720004d796caf3b163fb1699d WHIRLPOOL cc8344fb52507294d00071f967abdc5b77fcd37fd3989b81d0efdb7d35c0eca4349f86769f2a09915a72565e399852c40f21eaab89fb6a7c66a58960ecfefc39
+DIST netbeans-trunk-nightly-201508210002-src.zip 208800734 SHA256 c85c1f8027b3b9b03bbcc6743bb508899bc9050058c112f060d73daa544bbde6 SHA512 d8a3cbbc3f671d52bb5edcd2722c9ef847cdc160aecb4a9ee3283c2f64d82284c820c39a68e2aff2e7c3cd24fac618c1d3c48207b8323aa06f92524d0ab3a185 WHIRLPOOL b8938d9102fff59c5cc4f35db839492bbd1b1249d4e9c8da9eb4b2167c1e14d8906d49ba2bc9d301331e25d855b798883ee5f7aa51a5f00b272f55adae5339b3
 EBUILD netbeans-php-7.0.1.ebuild 4151 SHA256 3aee393fe89aa4788ccd17af46f1df43a5681c28af6d580724d8db0f5e804ff0 SHA512 60106805595338b83e17d906c199c54dc4cc5d979f964a41f9938a508e8514670f4e5538eeecd91f8cd06dd2b4376119674f9a7a9f2fac6c1255e14929f2bc19 WHIRLPOOL 1a09962a5bd67a4fd4eed48af3f185146d2de6f506952f626756aabf6a157678fe71e0752ed5988ff414803b83150d9b8b4de956895667e331659bb59f94e09c
 EBUILD netbeans-php-7.1.2.ebuild 3940 SHA256 779f3bceb2b5a49e923fff28c36c653e31e2d11e186fabab1e656c3314b48d28 SHA512 1296c8ccbec945e66588c2a1a490d3ea93a28672e77751e16c3dff1f1aa6e3a00b454345f0b888c684a0d31fe05aad4f44310998eb72bf1febba85da1bcdd08b WHIRLPOOL b0238f8c5aa4a8c0a5cff82b0daa29860fe39712e96110916cd8a26938ca07b8e05c308e1387c84e7d693026590846392227e95668d150bbc7f1cbc660676eec
 EBUILD netbeans-php-7.2.ebuild 4159 SHA256 bb5c66ed19c9341332e1e42efb29a4ab5d19a22c995bae93efc952ec105ad493 SHA512 c919b120bdc51b56f58b390e9a017f9e059c6b5709220e80138caf7ca3e58d432f53c9ed28f899dc9537851a4cb8cafa9e7067eaefc5d5798b05fb0be9d5bd5f WHIRLPOOL 9857d2e6ac50c4daf5c8afc0a5b65b068b6010ecf2ef04f063bc184810c18b50feda683d2d80c84c0e621909bb05b19731135f2a69f1e56db927c42e8057a658
@@ -80,5 +81,6 @@ EBUILD netbeans-php-9999_p20150817.ebuild 4423 SHA256 b66cc6ca1585897416213547ed
 EBUILD netbeans-php-9999_p20150818.ebuild 4423 SHA256 84da8930b91399c1aa7a9b058df09f883ad0c153f7e9af6f812867c6d05a0f7d SHA512 ba61c4c5424bd0f1b94834b296f1e169f2f97685034a649e5894dad405061318f28cc55bf7e7e1c599a91af089d54322f3a1c7cc0ceabc33445c17dea95e7f39 WHIRLPOOL ce2b35435487f186af15af02d404c66d54ad17d826ef0a6596c4f01f240d8b79973c3afb77485f61740da5acf74dafb60ee973708cab371deea4b612b64dedca
 EBUILD netbeans-php-9999_p20150819.ebuild 4423 SHA256 52e8067eb3fca9a03311dc41430ca33e2f99ef333c0bfee9abcf1e8b8651f653 SHA512 a530c51e3e82a4e632183b5c517d9d98bada8026d5cd9f90b5356ef46a546e96d30082bfbca5f9e9dc22f443ad002f99affac386cabe0e4774561a788f6023a5 WHIRLPOOL 90180538fdee9613e56a82a60891ee91800130d4226b93085a0ff739472ec0003560ba4099dc5789647daf8e492db6f09bd74317333edbc21466baa3ec8bb12d
 EBUILD netbeans-php-9999_p20150820.ebuild 4423 SHA256 3ce3ac9bef4e1322d4f2a4b54e670ed0f213d0daa6f5f284b191c69b80c45f5b SHA512 dfd15d4bbfd07904720934f37dbd06fb18d2cbf41f27bc4f9ecb89cfcb02f3b9f3f43089b739d8b433763f40189adc62947b5667bdc8e0d4324c7fd927d6bf62 WHIRLPOOL 8934a8de813d8c09702a002e5a755a37aa3eda79ebd3b40cce80b9a81f0fd49fdc19aa58973907f96a8d11a4d29846889f64d315a341868107c90fa10399ac0a
-MISC ChangeLog 167851 SHA256 626e06cb3dc4ccb9cd17d9674c02deb48f9e85764579316f9853b72bd4ef7132 SHA512 644da008b4e2f8ca05371a94643e782b6e892589ba621d75cacc2946e13962a160f3b0fff068155aa8c509d4458b451b3c75a25300a24c41ffcee646483fe841 WHIRLPOOL 86881a5d3681eaae086120395b50ed625e5ae05f935cc4570c4bca7d8ff2addf68467fefecd71ec74be853e4eb3161b6f531620698a295cb53a9640f523681f5
+EBUILD netbeans-php-9999_p20150821.ebuild 4423 SHA256 436a2ddcba985e47e3ba10f9d5db9626b25a4407870512c88a8632457b5212a7 SHA512 aac95fd96a69d6eb45ed9e8a5277e89df32d8e88934eea976d5262ab5a90125b517ddcac215555b776ef61045b9488778907b4d03eb0a5b01684f89b78342fb9 WHIRLPOOL a71b6124806db74d6e85ac779821fda58aff857f1cfa73cfc00382de946555693d62d5148f3307b36926d3a75f35f916b414b2788d470eea81fc461b84cfbe4c
+MISC ChangeLog 168019 SHA256 ecbaa1786a401a346894ca025b3227a3b1de451b156381ef094b72de03a451b6 SHA512 6280b5f22fec2878b5888f0f5605fd55714858fddf79ebbe204fb7fa84b220d0aff61eb1dd82f377f1357ae01960af9d4d9c78272d4c109b56d3a9444d6f69e6 WHIRLPOOL 99a1b3b7ffc7aa564dbfbdbae3e8243005547819724fe1c82e02fa69545540530d7d907e97de65c63dc0e5205b3450a9b448bf513950e4254d660968fa84922f
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20150821.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20150821.ebuild
new file mode 100644
index 0000000..30876e9
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20150821.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-21_00-02-28/zip/netbeans-trunk-nightly-201508210002-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/52AE855B57FF0326574A5B07D0BDDD9D8010D3C4-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}"/52AE855B57FF0326574A5B07D0BDDD9D8010D3C4-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=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm java-cup-11a.jar && dosym /usr/share/javacup/lib/javacup.jar ${instdir}/java-cup-11a.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/php
+}

diff --git a/dev-java/netbeans-platform/ChangeLog b/dev-java/netbeans-platform/ChangeLog
index 17aad0f..b8d1319 100644
--- a/dev-java/netbeans-platform/ChangeLog
+++ b/dev-java/netbeans-platform/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-platform-9999_p20150821 (21 Aug 2015)
+
+  21 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-platform-9999_p20150821.ebuild:
+  updated to the latest sources
+
 *netbeans-platform-9999_p20150820 (20 Aug 2015)
 
   20 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index cffc670..cb825e8 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -63,6 +63,7 @@ DIST netbeans-trunk-nightly-201508170002-src.zip 208816661 SHA256 899384675fce61
 DIST netbeans-trunk-nightly-201508180002-src.zip 208817240 SHA256 b497e33ddf10398e677b60713e4f8a54f4588dcc633c23841501857c8da5a12d SHA512 725cad02fafd38794cd93d0b1d0ebe01f14c2db6e0d0c21edcf3172406f4fe7ec6ebdae666c84c80c9c943340cdf13f82603f794508d3055a6135a67b6b156ed WHIRLPOOL f7f027bfee7467131e34b90f05f4e46a6aab8c2206cf87e7025267e15f8b6d3ce96e7838687bc53caaf39c60607f0cb17fe1f6bfdb5ad53ecaa529c972c2ae17
 DIST netbeans-trunk-nightly-201508190002-src.zip 208817531 SHA256 6594e5c2181ff7dfcf7eab3c7551571ea8e4cc6f3eb3f196a2b3b4bd7f394745 SHA512 84b4d1f1e77f1a4e2d97c14e2400381ce0d926dae2659cf38bbd4d2b7ae619d479ac1d73900f6d9cf10981b85982f7f19c00662974179e48cc4efb6e3481a82a WHIRLPOOL 7decfaa30422c8c588e8cfb65cd654119c3f80b60ffe3226074e5a1775648154a26a5ef267bd98f0a7720b107a0046b040652379bb6dd4a837d000863098ecd5
 DIST netbeans-trunk-nightly-201508200002-src.zip 208799494 SHA256 81de2b1f44baa32ffb769676ba38edab57124533bda1bb1dcda18b9be5dcb7c2 SHA512 1c68dbcff6bcfeb3566823749b57ce95c2de6a97333573897d78f5f6bc7fcfe2c06a2ff7805bfabea9dc9f60d9e5021d4c3d5aa720004d796caf3b163fb1699d WHIRLPOOL cc8344fb52507294d00071f967abdc5b77fcd37fd3989b81d0efdb7d35c0eca4349f86769f2a09915a72565e399852c40f21eaab89fb6a7c66a58960ecfefc39
+DIST netbeans-trunk-nightly-201508210002-src.zip 208800734 SHA256 c85c1f8027b3b9b03bbcc6743bb508899bc9050058c112f060d73daa544bbde6 SHA512 d8a3cbbc3f671d52bb5edcd2722c9ef847cdc160aecb4a9ee3283c2f64d82284c820c39a68e2aff2e7c3cd24fac618c1d3c48207b8323aa06f92524d0ab3a185 WHIRLPOOL b8938d9102fff59c5cc4f35db839492bbd1b1249d4e9c8da9eb4b2167c1e14d8906d49ba2bc9d301331e25d855b798883ee5f7aa51a5f00b272f55adae5339b3
 EBUILD netbeans-platform-7.0.1.ebuild 5049 SHA256 b67cf0867358fea808614c02b8b6ea2ab88223f8642175ac3f91dc8c610aca4e SHA512 611b8e831a95d1b4e1c3a1f5e4904c84f9606298a94eb0900ac06cc88670849d218a3a03cce07b2463e206da01ce2931cdb6677948d20d8326908a36851589e6 WHIRLPOOL 01769eca4eb20c2702a432a6180eed16a9a50687016e307e585ab5de5cab8b3b664e456d489ff15d9f5af349f791b161eecb9fef7bfaba09a70e1eaab5d545a0
 EBUILD netbeans-platform-7.1.2.ebuild 5034 SHA256 a069e7e45f768e590e5b30fdda26185d8fde492355e4c530ce44169def991cc6 SHA512 31cfb0d9f13eacfcafd49be995bc456d17a689776e032f68ed4585e068a49f6e992c37c57f23c5e27176fb060996bcfc86b0446ae26efbc488909102fc10c979 WHIRLPOOL 1bd35ac39366fd13192e4a6a177280727bceb2f5f12ff684a288725954a29a240f2d264c3ef2ca38fa3e133063cdd943cce1d0f493f0f8ea9a621833c8f0031b
 EBUILD netbeans-platform-7.2.ebuild 5432 SHA256 227add7f41117667d8487f2bf8eb846c21529e7b2c49dac46e4b3b33062f69b0 SHA512 e49958f21358fe9689336d5cd5edbe435d0a2fd12c315174dcb408bf6ed4e6515d39d458554fb576c342a43f0af50c327bada8fa0b2eb485e14c01ddcdb6248d WHIRLPOOL 4f9101a2d5495fb6002b7791822f85091309c04d6c475060c116725f8da32f9ed270f0c27a9f6a2bd2aa0bd7417b18e9165d1feff7e98f6205bdafff3223e5a3
@@ -94,5 +95,6 @@ EBUILD netbeans-platform-9999_p20150817.ebuild 9244 SHA256 48c28b1e94ba5bb23944b
 EBUILD netbeans-platform-9999_p20150818.ebuild 9244 SHA256 3a05649d1433c508bda2a0f69b9410949057f7e8429f2d687f4ded791ec32098 SHA512 b384e748a6ce4409aca99bb3e75254c9477fd8b42be57c8bfb3955add73acf516fe64f1cbd07fe7c8d03e1aecf750caa6e64eae290552829d1ef7c3191f6c0af WHIRLPOOL 79050be321bfb4c65bc20360d4843476e796d8292ecf1f4caddcf1ee1a903aa7e9a8b6d38a92dee56b21784dbd5e639fbda493acc1ace00fad00709f5f5f51b2
 EBUILD netbeans-platform-9999_p20150819.ebuild 9244 SHA256 28263f1227759ccd3e24248eef7dcac200b27c41f2b27faef5c82a7b7c4f8292 SHA512 4f4cef7d07388b105e69a37cf0fcdcb1419aa07bc5800ebd8863aa1d29970924f14095a16527e49e5178f314d1fe4e6b2ebb99f577e37cde85a6f6c27a141a94 WHIRLPOOL c51df0f973bfce786c1ea4128055517685d7ec6ae2560471760a388b7a36f298230dda142b53cc2654759e7dffcc67325e7ab6def1b5f181981acd63fd3bc4fe
 EBUILD netbeans-platform-9999_p20150820.ebuild 9244 SHA256 cfaf37a8c2ad54ef1bc0732581d786a718c47dfce1e4e8dcce3cf7c64385130a SHA512 44db520e46dc71e2b74331f978e0acd431a4c958f9ff51226583e3a4e63020de9be61dc971c78c3d1d8257a39948994473ff95387e2f2e831e5e5c407df07e43 WHIRLPOOL e54d0b3eaff2ef280bb3f22fcfe2490d994d54edacf7640b2ecdf5724fbdabf9658c5da02abc47abb42560076d3f8fdb3c38e32e212c1ddf83f85d44e5facec4
-MISC ChangeLog 180591 SHA256 30e9aa56a9b9fe042838f6d0ec6d00a57279c7062db6b4cccbfb64048c8e7cec SHA512 e2362e9cf4f2d00932fd420570984e5291d8dedf440ffc92cc25e1d74a187bf46aac5c1fac1c5e906fb92ff49c91360ad05e0dd44a3ea5f5166c953de8903013 WHIRLPOOL e9f731b14ec614e2b6001c82b6171046c0edadbbd9a7db8a2ec6c2ea96f7fddb1c88c66128b0e1cf466642749c679105e43eda473f776e93ebd5f693424237cf
+EBUILD netbeans-platform-9999_p20150821.ebuild 9244 SHA256 54217ef905cb92b5caf4d6f45b67b2deede95c801c9d66042e739fac31dd1a25 SHA512 a48765166b70a7586441a94cb487e02e3879245a0e6cec078ccdd098c1da2b97dce924ec48e1bea29c4d296640921d4dcce45e9855f013ff16ea58004af5d912 WHIRLPOOL 007a6bf5a9bb4d977ce9aa95e3ef2acb94a06b283385e3a0447d636b0fc1225ff911c6b5895aeb6ae49c2f65ef6335b4bd2059d1c7ccb631835ec5eb41bde4b5
+MISC ChangeLog 180769 SHA256 e891f6ad3667d241df33c6425878fe10f06c2929ea72f832aa4bb796f558ee1b SHA512 0214e47b4900a7081f91d5cdc1803d51b92ecd02803dc5d0ea750e6cff0e7fa16da4ec338e6feda4f7d770abe15014924caea2d520243820867a59eff5925c8e WHIRLPOOL 3823a7d9385ae1c02d4867e9024acff081d9e067ebe0464c2378303e8f1b983d19f8d2f9d552332166d163e9077bd2f849085e9842ee96d360aeaf3e7bc106ee
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20150821.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20150821.ebuild
new file mode 100644
index 0000000..510feb3
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20150821.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-21_00-02-28/zip/netbeans-trunk-nightly-201508210002-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/B250509C67194E89C3A27F96933DB7EB0E027E56-ko4j.jar
+	http://hg.netbeans.org/binaries/E556F74DF0942B304F94D9F82CAA8102FED6356E-net-java-html.jar
+	http://hg.netbeans.org/binaries/C74AC1ED160379872826FDC4A3C0CA924A3A0A83-net-java-html-boot.jar
+	http://hg.netbeans.org/binaries/03FE10857B0689B1F98B8D96DE87E80DF5D87A69-net-java-html-boot-fx.jar
+	http://hg.netbeans.org/binaries/31C9329E78A222E38CB86716ACFCEF81EF0BA1FD-net-java-html-boot-script.jar
+	http://hg.netbeans.org/binaries/24ED356FF3C72665CB5FB972B428824FABBC1987-net-java-html-geo.jar
+	http://hg.netbeans.org/binaries/432EDFB05C0F44E6ADAC4B1F3E08C67D1F52FB4B-net-java-html-json.jar
+	http://hg.netbeans.org/binaries/A7B6C3470DB8821A3587CE04844FF504A7C62354-net-java-html-sound.jar
+	http://hg.netbeans.org/binaries/B27F1304F18FEDE876F940AEFA6C9EB5632619D7-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}"
+
+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"
+# oracle-jdk-bin is needed because other jdks do not contain file jre/lib/ext/jfxrt.jar
+# the error:
+#  [parseprojectxml] Distilling /var/tmp/portage/dev-java/netbeans-platform-9999_p20140922/work/nbbuild/build/public-package-jars/org-netbeans-libs-javafx.jar from [/var/tmp/portage/dev-java/netbeans-platform-9999_p20140922/work/nbbuild/netbeans/platform/modules/org-netbeans-libs-javafx.jar, /opt/icedtea-bin-7.2.4.7/jre/lib/ext/jfxrt.jar]
+#  [parseprojectxml] Classpath entry /opt/icedtea-bin-7.2.4.7/jre/lib/ext/jfxrt.jar does not exist; skipping
+#  [nbmerge] Failed to build target: all-api.html4j
+
+DEPEND="dev-java/oracle-jdk-bin:1.7
+	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.7"
+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}"/B250509C67194E89C3A27F96933DB7EB0E027E56-ko4j.jar o.n.html.ko4j/external/ko4j.jar || die
+	ln -s "${DISTDIR}"/E556F74DF0942B304F94D9F82CAA8102FED6356E-net-java-html.jar net.java.html/external/net-java-html.jar || die
+	ln -s "${DISTDIR}"/C74AC1ED160379872826FDC4A3C0CA924A3A0A83-net-java-html-boot.jar net.java.html.boot/external/net-java-html-boot.jar || die
+	ln -s "${DISTDIR}"/03FE10857B0689B1F98B8D96DE87E80DF5D87A69-net-java-html-boot-fx.jar net.java.html.boot.fx/external/net-java-html-boot-fx.jar || die
+	ln -s "${DISTDIR}"/31C9329E78A222E38CB86716ACFCEF81EF0BA1FD-net-java-html-boot-script.jar net.java.html.boot.script/external/net-java-html-boot-script.jar || die
+	ln -s "${DISTDIR}"/24ED356FF3C72665CB5FB972B428824FABBC1987-net-java-html-geo.jar net.java.html.geo/external/net-java-html-geo.jar || die
+	ln -s "${DISTDIR}"/432EDFB05C0F44E6ADAC4B1F3E08C67D1F52FB4B-net-java-html-json.jar net.java.html.json/external/net-java-html-json.jar || die
+	ln -s "${DISTDIR}"/A7B6C3470DB8821A3587CE04844FF504A7C62354-net-java-html-sound.jar net.java.html.sound/external/net-java-html-sound.jar || die
+	ln -s "${DISTDIR}"/B27F1304F18FEDE876F940AEFA6C9EB5632619D7-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=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm hamcrest-core-1.3.jar && dosym /usr/share/hamcrest-core-1.3/lib/hamcrest-core.jar ${instdir}/hamcrest-core-1.3.jar || die
+	rm jhall-2.0_05.jar && dosym /usr/share/javahelp/lib/jhall.jar ${instdir}/jhall-2.0_05.jar || die
+	rm jna-4.1.0.jar && dosym /usr/share/jna/lib/jna.jar ${instdir}/jna-4.1.0.jar || die
+	rm jna-platform-4.1.0.jar && dosym /usr/share/jna/lib/platform.jar ${instdir}/jna-platform-4.1.0.jar || die
+	rm junit-4.12.jar && dosym /usr/share/junit-4/lib/junit.jar ${instdir}/junit-4.12.jar || die
+	rm osgi.cmpn-4.2.jar && dosym /usr/share/osgi-compendium/lib/osgi-compendium.jar ${instdir}/osgi.cmpn-4.2.jar || die
+	rm osgi.core-5.0.0.jar && dosym /usr/share/osgi-core-api/lib/osgi-core-api.jar ${instdir}/osgi.core-5.0.0.jar || die
+	rm swing-layout-1.0.4.jar && dosym /usr/share/swing-layout-1/lib/swing-layout.jar ${instdir}/swing-layout-1.0.4.jar || die
+	rm testng-6.8.1-dist.jar && dosym /usr/share/testng/lib/testng.jar ${instdir}/testng-6.8.1-dist.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/platform
+}

diff --git a/dev-java/netbeans-profiler/ChangeLog b/dev-java/netbeans-profiler/ChangeLog
index 46447e6..3b94702 100644
--- a/dev-java/netbeans-profiler/ChangeLog
+++ b/dev-java/netbeans-profiler/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-profiler-9999_p20150821 (21 Aug 2015)
+
+  21 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-profiler-9999_p20150821.ebuild:
+  updated to the latest sources
+
 *netbeans-profiler-9999_p20150820 (20 Aug 2015)
 
   20 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 46a07ff..145fc59 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -37,6 +37,7 @@ DIST netbeans-trunk-nightly-201508170002-src.zip 208816661 SHA256 899384675fce61
 DIST netbeans-trunk-nightly-201508180002-src.zip 208817240 SHA256 b497e33ddf10398e677b60713e4f8a54f4588dcc633c23841501857c8da5a12d SHA512 725cad02fafd38794cd93d0b1d0ebe01f14c2db6e0d0c21edcf3172406f4fe7ec6ebdae666c84c80c9c943340cdf13f82603f794508d3055a6135a67b6b156ed WHIRLPOOL f7f027bfee7467131e34b90f05f4e46a6aab8c2206cf87e7025267e15f8b6d3ce96e7838687bc53caaf39c60607f0cb17fe1f6bfdb5ad53ecaa529c972c2ae17
 DIST netbeans-trunk-nightly-201508190002-src.zip 208817531 SHA256 6594e5c2181ff7dfcf7eab3c7551571ea8e4cc6f3eb3f196a2b3b4bd7f394745 SHA512 84b4d1f1e77f1a4e2d97c14e2400381ce0d926dae2659cf38bbd4d2b7ae619d479ac1d73900f6d9cf10981b85982f7f19c00662974179e48cc4efb6e3481a82a WHIRLPOOL 7decfaa30422c8c588e8cfb65cd654119c3f80b60ffe3226074e5a1775648154a26a5ef267bd98f0a7720b107a0046b040652379bb6dd4a837d000863098ecd5
 DIST netbeans-trunk-nightly-201508200002-src.zip 208799494 SHA256 81de2b1f44baa32ffb769676ba38edab57124533bda1bb1dcda18b9be5dcb7c2 SHA512 1c68dbcff6bcfeb3566823749b57ce95c2de6a97333573897d78f5f6bc7fcfe2c06a2ff7805bfabea9dc9f60d9e5021d4c3d5aa720004d796caf3b163fb1699d WHIRLPOOL cc8344fb52507294d00071f967abdc5b77fcd37fd3989b81d0efdb7d35c0eca4349f86769f2a09915a72565e399852c40f21eaab89fb6a7c66a58960ecfefc39
+DIST netbeans-trunk-nightly-201508210002-src.zip 208800734 SHA256 c85c1f8027b3b9b03bbcc6743bb508899bc9050058c112f060d73daa544bbde6 SHA512 d8a3cbbc3f671d52bb5edcd2722c9ef847cdc160aecb4a9ee3283c2f64d82284c820c39a68e2aff2e7c3cd24fac618c1d3c48207b8323aa06f92524d0ab3a185 WHIRLPOOL b8938d9102fff59c5cc4f35db839492bbd1b1249d4e9c8da9eb4b2167c1e14d8906d49ba2bc9d301331e25d855b798883ee5f7aa51a5f00b272f55adae5339b3
 EBUILD netbeans-profiler-7.0.1.ebuild 3222 SHA256 b1bab800a27c30aaea26b8ff5ab21abdd1bec16b9890133429eca9ea77c018fe SHA512 d6198f44a06561b7e2598fdd6a37f8a3dc13c38f63dfbf6a86a083adbf71e9c62af87cb4e1b5b8dd2dc99feeeb99a7afcbb8f7747c378ad92c71263cc91a6c54 WHIRLPOOL c62613f511636b1f0393ac32c6b50641cdf7df9f9fdc95fd5acbe1a602ffe42fdabb556f989552b05b0607a5ad9d324a2019440c3ae66c50995ef3fc8775f385
 EBUILD netbeans-profiler-7.1.2.ebuild 3231 SHA256 94d87bf6f86add3bdc27f9f20084f35fe584fc2bd697acafa8c23cce16a0d1ee SHA512 dcc8da918a6b6e07ccae513fb4296d16891e205b49098fb8269d16beb9b1367b1920797cc78053b83f4321c1b69faa393365265c72213bb2abfb9d3f84f66319 WHIRLPOOL 18325a1df836e7242838920483c41d43f37b9dae8322d36a2a562b414baa0dc76971f581204ce76a6d64196dd60643089e8704da69617590cda61ce54ce82e8d
 EBUILD netbeans-profiler-7.2.ebuild 3214 SHA256 ddcba9ba672ad566ef256538fc8631ae691aa7c6574269199f26df5382c37f4b SHA512 1bb7eb95381861b8265ab366fe3c7a9b99971d1c4600eb6c7bffb521f4cebb32bcf3d662f82c811d47fe95e77cd39e48f3665f0fcabf9145eb171c2746d89684 WHIRLPOOL 7f74c2be9ec4e7ff419086f1da3b1a12b1c187102def004316ef89ed28f30da62542ed3409a51473a8d9d68d18a30de36b1d0307cd8eeb7e580668fe896c5aa5
@@ -68,5 +69,6 @@ EBUILD netbeans-profiler-9999_p20150817.ebuild 3478 SHA256 7d6e651e84fbfaf7cfdfa
 EBUILD netbeans-profiler-9999_p20150818.ebuild 3478 SHA256 7153012633b003c728c4fff76f46f63266ba0023a70c9bac8ae915552a5ba984 SHA512 2cd4071e7df0e93e99e01cca4b179d15108d6177c97fc367ff25923a631c711348f7ab6fcb1375c11ff39401368b516d67b4ed88f7172d9d751258e5832fd62d WHIRLPOOL 1d609926aa88175a87457644a6c104b98e70133edeb2b3dd0b9055b6b5bef55a7e557c305810f38b6d6249f3681caafdb053dd923e417b38a7b2cc8fc464dbfc
 EBUILD netbeans-profiler-9999_p20150819.ebuild 3478 SHA256 cdd511e2d0643bf5ac0896eb62e68f50d44914ee936a70343c783b47ccbb59a9 SHA512 b4baa7add5c68b1f171ef29f4a72080e1c368edcbed66385951be3a9e919299b4bbc819ca49da295da6b8b2679fad46d609edbbe7d7240cb9546e4644a45bf60 WHIRLPOOL 86a7f8a5df0109eb71c64cea1af3b2f74c35633122f1ce966969f18e24229a9235e985bdc43b3ab1bf4bf714d45eb427d7573cd640ebab981339e0a2e15744b7
 EBUILD netbeans-profiler-9999_p20150820.ebuild 3478 SHA256 e0b8cbbf5c3fef55e436fad97b5d268ce8647ea27b6b91f9938ee4391cdbca5b SHA512 57a8053a3732104cdbb09df25c336b7f5688f32ccc93fff821d9e0d7cb3d2ce753a0f0ed59d1dca9381da4904702e9f398a26f2daaf6b524b023f22f046bf84e WHIRLPOOL 0bc46a134feb074facf7807088f449d45052dfc5b70a1079dfaab91ae2fbc0783a8009eaf85ab931365e4d320fdb5e92cd0c8ef18a345591f887e64172900b33
-MISC ChangeLog 180052 SHA256 030699d0a36cdfc8ebbed222db11d4bdc55ea8f391b6467446169893688b4622 SHA512 016ced0ff7eada6ac96b965181fa23c697cc539260ffeda327419800b344269adb69155e0ec6d88d1b9ca23dc363f91418b8313adaf7366c476a4cad5875a8e0 WHIRLPOOL 39b61ae9d61e4411c863287e2708fa3a279f61bf204220204d722b1290fabe6e37360d2f2747343ff0d70752aa06013c4fce47741269bb1c3f576c71391840f0
+EBUILD netbeans-profiler-9999_p20150821.ebuild 3478 SHA256 2da6c8646e8c14e52240cbdc6b493143279caaa791d1b3bea70bba0341059516 SHA512 18029ede662853845f80b0e3f198b5686a267927724d1363572d9058e29efd025b36a537ecc9f2995e843c45c6d9d3f002b5227fc05d47f4d3cd42d2b884ad91 WHIRLPOOL 1052edd4d7d80a63cb311a6b37154fa3d269bb333dbeea4b98a795b0c37144fd45a446b0df88791b89ecbf6dcbebdf1f565b166a40a030799d243b75bf1c4963
+MISC ChangeLog 180230 SHA256 da4dc437660a6eb8bc4fc6a1657ee837c7b502645c56c943bac0cb03d0815236 SHA512 6a6cb0cc9746fce428a82cbaa9d084ff98ca26606d1ed8d141382e6161840897c35da987fa85132b24588519284af1635c5015718e51b384b2f478c70961ad45 WHIRLPOOL 3865fddabc77cf7864d06beb8dc928a374974834a083fa0387f1df8c5308b457357f671db35c06d0248c6208aae9c797ff5ae97f41f70a6cb58d3ef123d55ff4
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150821.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150821.ebuild
new file mode 100644
index 0000000..8ce12fe
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150821.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-21_00-02-28/zip/netbeans-trunk-nightly-201508210002-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/ChangeLog b/dev-java/netbeans-webcommon/ChangeLog
index fa720fd..c18fe3d 100644
--- a/dev-java/netbeans-webcommon/ChangeLog
+++ b/dev-java/netbeans-webcommon/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-webcommon-9999_p20150821 (21 Aug 2015)
+
+  21 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-webcommon-9999_p20150821.ebuild:
+  updated to the latest sources
+
 *netbeans-webcommon-9999_p20150820 (20 Aug 2015)
 
   20 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index 125db81..140a693 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -43,6 +43,7 @@ DIST netbeans-trunk-nightly-201508170002-src.zip 208816661 SHA256 899384675fce61
 DIST netbeans-trunk-nightly-201508180002-src.zip 208817240 SHA256 b497e33ddf10398e677b60713e4f8a54f4588dcc633c23841501857c8da5a12d SHA512 725cad02fafd38794cd93d0b1d0ebe01f14c2db6e0d0c21edcf3172406f4fe7ec6ebdae666c84c80c9c943340cdf13f82603f794508d3055a6135a67b6b156ed WHIRLPOOL f7f027bfee7467131e34b90f05f4e46a6aab8c2206cf87e7025267e15f8b6d3ce96e7838687bc53caaf39c60607f0cb17fe1f6bfdb5ad53ecaa529c972c2ae17
 DIST netbeans-trunk-nightly-201508190002-src.zip 208817531 SHA256 6594e5c2181ff7dfcf7eab3c7551571ea8e4cc6f3eb3f196a2b3b4bd7f394745 SHA512 84b4d1f1e77f1a4e2d97c14e2400381ce0d926dae2659cf38bbd4d2b7ae619d479ac1d73900f6d9cf10981b85982f7f19c00662974179e48cc4efb6e3481a82a WHIRLPOOL 7decfaa30422c8c588e8cfb65cd654119c3f80b60ffe3226074e5a1775648154a26a5ef267bd98f0a7720b107a0046b040652379bb6dd4a837d000863098ecd5
 DIST netbeans-trunk-nightly-201508200002-src.zip 208799494 SHA256 81de2b1f44baa32ffb769676ba38edab57124533bda1bb1dcda18b9be5dcb7c2 SHA512 1c68dbcff6bcfeb3566823749b57ce95c2de6a97333573897d78f5f6bc7fcfe2c06a2ff7805bfabea9dc9f60d9e5021d4c3d5aa720004d796caf3b163fb1699d WHIRLPOOL cc8344fb52507294d00071f967abdc5b77fcd37fd3989b81d0efdb7d35c0eca4349f86769f2a09915a72565e399852c40f21eaab89fb6a7c66a58960ecfefc39
+DIST netbeans-trunk-nightly-201508210002-src.zip 208800734 SHA256 c85c1f8027b3b9b03bbcc6743bb508899bc9050058c112f060d73daa544bbde6 SHA512 d8a3cbbc3f671d52bb5edcd2722c9ef847cdc160aecb4a9ee3283c2f64d82284c820c39a68e2aff2e7c3cd24fac618c1d3c48207b8323aa06f92524d0ab3a185 WHIRLPOOL b8938d9102fff59c5cc4f35db839492bbd1b1249d4e9c8da9eb4b2167c1e14d8906d49ba2bc9d301331e25d855b798883ee5f7aa51a5f00b272f55adae5339b3
 EBUILD netbeans-webcommon-7.2.ebuild 2665 SHA256 9328ea550dfeca5be5c2b03aa5f512d451f1673e49a40994155fca0b2fb2f79d SHA512 d8b80b79e78769a70d01605a79a8a91f7e839d4138b4cbf28cafca6f56ae3d7003c2f5f40aff77bbe3f2882f43a7d7dca3f0428f0f2723a42ae5b49e4c71ffff WHIRLPOOL 31254cbd2fc6cfb2d1bed4d22958595dbbf73032439f19e684463efbe466ee80c144f77ab00ced7a07815b1cdc1d45a87ceda83e7a2fd20ac2ce65e45d30a093
 EBUILD netbeans-webcommon-7.3.ebuild 2986 SHA256 327c0a73fb20778d9fbe4a12024fa065e4102a7aff3fcbda7448874656a46420 SHA512 3d270e940424b3bcdc8c7f8ff2016d33eb55420ac4037f4e406b688c2acea1b07a04625772265ac293d80c0d1afe3bbe6f865051ed9234b700619bd0781d8b39 WHIRLPOOL 5bc288949ed3aa9c3c4cd4cd33b817fe317754229ad30e80da8cfea817bfb77e988a1d6d3280aaef90619968e0309fad212deff0f7970f04438494a893a30a5b
 EBUILD netbeans-webcommon-7.4.ebuild 4727 SHA256 54a0b63527001da34a21ae3ed69c2cfbf9a446ee69bda4bb6ac5ebb939ebb68d SHA512 96895c972cf7092426ec8bc06dccc6ab4f33334da4e67fd4da01e586801110bda8d955f2f29ecd93b8bb58ae64c4af4139e9954a784c10dec925e2beaeab2394 WHIRLPOOL aa7b3b59d315bd37553052470b1f56f435979569e5ef033493cf6f93c29827f2ecd30f6b874f07a0cd8824469c6546982ac3ed360bf3b6cbf211d95943a3398a
@@ -72,5 +73,6 @@ EBUILD netbeans-webcommon-9999_p20150817.ebuild 4997 SHA256 fe0d15dd698595f515ef
 EBUILD netbeans-webcommon-9999_p20150818.ebuild 4997 SHA256 5e12e250acbef9e0ba5c2138b99c097376c8935c2cfdfbeaf77e0f42d4b1ba4a SHA512 abce095f4ceaaa569f4999b1a6f4b981574f7369cd53ef1d08bb0ff59ac5ca5852ea5d5147b1152c933b9e35e7ce873ec325b4b299fa6ac1aa4a4727b052f204 WHIRLPOOL 4f6caa9e534d1997fd67d49e2c1754928087ba656e3621aaf435a5f987a4ec5645d1c35b8d1822632959a0044268037bbef0decf938913fbf02f3bc21f964468
 EBUILD netbeans-webcommon-9999_p20150819.ebuild 4997 SHA256 c90351603f296e13d269e8bf8edea7cdb2781af8e5c4aac643d7a25cd712a943 SHA512 f9e1b4b71fe8acffa365c56935850f20240ad3dcb584d9ff1f5d5bdf160457b38e89fb3281551b9ca75730d40b5c1d97a537a4ed1cee136177502103d77ae82c WHIRLPOOL 439550139102bd21f26b9375c696c8123d437cdfcce626a19c8dcb9cb7727cab602c61b7cd29a50788f3d3b41532059354f384c11a277611ae1a367b13f11469
 EBUILD netbeans-webcommon-9999_p20150820.ebuild 4997 SHA256 a8dbbc0f72440d6e5ac5a8f465d40be24712ea7219774bbea11f4710939fc53c SHA512 3b8350b4b1df36f5be41638f5416ccba4ebb30a7870d6661367d3f864df927d098a25d3cd8d80accc3d6ff9de4eba6a24d38802d972e9e4aef5b67407a135b7f WHIRLPOOL 58302fca9c79a582367e7dff3a7497059a650ec41f8316eda8e8492492db93cb4b181abb321b2970b5673823043156ba42464be3686a6314e61ab448698c9bc2
-MISC ChangeLog 153285 SHA256 1cb2cebc1a8cb9c16893314def66c70578cf8e1127e0ae76bd77c9742db3c317 SHA512 9c082217e4b2d5e9596f6fffdd275834b1cd74cbd50baec21a11edd06d0e501da8ec9013397661228c9885fcbf31191c144d769f6742f7686941d578697048c4 WHIRLPOOL 6c44677128576feec122266bdab78726bcdafd64cca2a1caa7475f5241dfbf4187b0a5c6462e372582b9fe6f97ba01e6b29574b3839eec81bce7a65aa33415df
+EBUILD netbeans-webcommon-9999_p20150821.ebuild 4997 SHA256 7112250c3e6b930f7e3a0adb98c844c20ae3b8b41277932a26cdcb3d058534bf SHA512 c8c39f609d986bfa881352ab5f543974040c051e7f01f1be9e8b1aa036b5695b247076b3ca8a56fe6245993aba0204e8957f3e18042711790bca89019378151f WHIRLPOOL 56e42deeb76dcd7510687e37ffefc4a15bfb9199b8de2483d4b323600927dc9373bf5d05f3f1f015d078acbbb894674e07abf7c701b77672e51167689398fe6c
+MISC ChangeLog 153465 SHA256 2e97ab36b6f6fd557e8ac86cc4d0e01ad734adc6d687989074dad43a7ebefd31 SHA512 ba5495c9d4568f72d379d39f37b02efd2e20de834379ff53119c37cf7fde26068f21bd1e4ff6cc45772dbce5aad32a89b36edc295ab1c04e3c129e5c0ccedfbc WHIRLPOOL a20cb908027bf3eb6d3520e63c7a9a5ef4072b884cb4f60ed54ab57b7691e2c53d490b8c09e5aa133d713771ac179f6543b5d17819f719a0cf5f4edfce33d9f1
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150821.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150821.ebuild
new file mode 100644
index 0000000..f92f043
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150821.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-21_00-02-28/zip/netbeans-trunk-nightly-201508210002-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"
+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}
+	dev-java/commons-compress: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.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
+	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 libs.commons_compress/external commons-compress commons-compress.jar commons-compress-1.8.1.jar
+	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
+
+	local instdir=/${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-compress-1.8.1.jar  && dosym /usr/share/commons-compress/lib/commons-compress.jar ${instdir}/commons-compress-1.8.1.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/webcommon
+}

diff --git a/dev-java/netbeans-websvccommon/ChangeLog b/dev-java/netbeans-websvccommon/ChangeLog
index 72dcccc..bedd3eb 100644
--- a/dev-java/netbeans-websvccommon/ChangeLog
+++ b/dev-java/netbeans-websvccommon/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-websvccommon-9999_p20150821 (21 Aug 2015)
+
+  21 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-websvccommon-9999_p20150821.ebuild:
+  updated to the latest sources
+
 *netbeans-websvccommon-9999_p20150820 (20 Aug 2015)
 
   20 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 1c040bc..05644fb 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -37,6 +37,7 @@ DIST netbeans-trunk-nightly-201508170002-src.zip 208816661 SHA256 899384675fce61
 DIST netbeans-trunk-nightly-201508180002-src.zip 208817240 SHA256 b497e33ddf10398e677b60713e4f8a54f4588dcc633c23841501857c8da5a12d SHA512 725cad02fafd38794cd93d0b1d0ebe01f14c2db6e0d0c21edcf3172406f4fe7ec6ebdae666c84c80c9c943340cdf13f82603f794508d3055a6135a67b6b156ed WHIRLPOOL f7f027bfee7467131e34b90f05f4e46a6aab8c2206cf87e7025267e15f8b6d3ce96e7838687bc53caaf39c60607f0cb17fe1f6bfdb5ad53ecaa529c972c2ae17
 DIST netbeans-trunk-nightly-201508190002-src.zip 208817531 SHA256 6594e5c2181ff7dfcf7eab3c7551571ea8e4cc6f3eb3f196a2b3b4bd7f394745 SHA512 84b4d1f1e77f1a4e2d97c14e2400381ce0d926dae2659cf38bbd4d2b7ae619d479ac1d73900f6d9cf10981b85982f7f19c00662974179e48cc4efb6e3481a82a WHIRLPOOL 7decfaa30422c8c588e8cfb65cd654119c3f80b60ffe3226074e5a1775648154a26a5ef267bd98f0a7720b107a0046b040652379bb6dd4a837d000863098ecd5
 DIST netbeans-trunk-nightly-201508200002-src.zip 208799494 SHA256 81de2b1f44baa32ffb769676ba38edab57124533bda1bb1dcda18b9be5dcb7c2 SHA512 1c68dbcff6bcfeb3566823749b57ce95c2de6a97333573897d78f5f6bc7fcfe2c06a2ff7805bfabea9dc9f60d9e5021d4c3d5aa720004d796caf3b163fb1699d WHIRLPOOL cc8344fb52507294d00071f967abdc5b77fcd37fd3989b81d0efdb7d35c0eca4349f86769f2a09915a72565e399852c40f21eaab89fb6a7c66a58960ecfefc39
+DIST netbeans-trunk-nightly-201508210002-src.zip 208800734 SHA256 c85c1f8027b3b9b03bbcc6743bb508899bc9050058c112f060d73daa544bbde6 SHA512 d8a3cbbc3f671d52bb5edcd2722c9ef847cdc160aecb4a9ee3283c2f64d82284c820c39a68e2aff2e7c3cd24fac618c1d3c48207b8323aa06f92524d0ab3a185 WHIRLPOOL b8938d9102fff59c5cc4f35db839492bbd1b1249d4e9c8da9eb4b2167c1e14d8906d49ba2bc9d301331e25d855b798883ee5f7aa51a5f00b272f55adae5339b3
 EBUILD netbeans-websvccommon-7.0.1.ebuild 2692 SHA256 a18cf7fe0a1e38749826cb12651be06c210b038be50117647496ee6cbd184cda SHA512 32b32894713d7235ebd03446c5c411d22eb8701b96e3d3ac54eca78b2abc833babf279085cea3b74bb7bddc6d89a283a21c58a0b0462042ddd10e22dfcadeb84 WHIRLPOOL 59c18168245767acd1f8e53046f8942698237aa6fd903a669c626b7f17cf3d39247b7ae57f2984562230267885a4b6a62be43dc8a330f1dfeb2cc7acbbd7d3c6
 EBUILD netbeans-websvccommon-7.1.2.ebuild 2701 SHA256 3b2a1cf0d32db3c55b66d1c6b8c4ae2ad5487d3fdb27752468ce5c860f9b9515 SHA512 b9be64755f00157c2d6984887b8c0fdc1e34470f21df1fd72b3e399d3ec894af01c9b79fd604778213ac2086a6c96bf66366e8c2c8bf97f7fee23d16ceb36974 WHIRLPOOL 91559de8c8f6391c3c69888854778a91a1a7e0052ae69eb9762bcbd64d8bc5587fb84ebb55d7d0375da5a7855aa8672abfd035b6a38b3eeb5c23a4cd59b3cdce
 EBUILD netbeans-websvccommon-7.2.ebuild 2684 SHA256 8bf8cad1e0469713c63280620fed089600191230f501a78b834b010f8fa9b3e9 SHA512 fe885f92a7c6cfac532c8e40e4df6283253c43294e9d82ee4d0d070425496eee3792479c268b46bf1fd484f753ca1f21e7ca38a5d71816b6d4fd219082e8e276 WHIRLPOOL 9d2d622d4a800470c874d8751e9c2055e0a4ef72ad01a01aefda4e95a7f295d55fc95fdb55fdd1f631212e1f610bdc7a6b4ee631b92492bb85f73b0d9fb4ba26
@@ -68,5 +69,6 @@ EBUILD netbeans-websvccommon-9999_p20150817.ebuild 2727 SHA256 abd4efca7dbfca4dd
 EBUILD netbeans-websvccommon-9999_p20150818.ebuild 2727 SHA256 fda2112012261ccf84b3b89a72f6cb26f2f0efee04c9cec44836a0aff05fe3f5 SHA512 e88819ebea7e95eec1eae9d4e185448b821166624539f1e122d70ff8a9312a79b247daa41082cc1d4418d189e784e01594d83454d10927cede9849d579bbb660 WHIRLPOOL eca12eb0aedd542d52040b0b6aa3f3e9f535f1662181d31372cffd3cfd71707e54ed952093649724cacb8add255c59e53b56a52ff3df00f2743cd55183cf0349
 EBUILD netbeans-websvccommon-9999_p20150819.ebuild 2727 SHA256 0d693bc256f42d967e4bf883a333a18ee85e4d329c234292cf4cebb803fa7209 SHA512 d3a34eaae19d4c4eea58d9c4db739f0a06d25825731090806cf16b766a960e292e45d275868470bec65c1cafb4c727c924c6401e1ce2745e6fff807dc668bfa9 WHIRLPOOL e285179527918447dc87ab12289ecbf7ff805f6b79a24d0aa00467528ce923d05a4e687ffe5e26ecbc8dc728fa10c494760c42297d16123190e251bd86dd5d79
 EBUILD netbeans-websvccommon-9999_p20150820.ebuild 2727 SHA256 9b7a9ef3401abdf00869fa783550893fc71353af12a9f3e7d0f20c7ad3771aeb SHA512 e4897cb04ef924dfc583814dd951e18c476a205030ff651eceab26ceae30c4f89732534798b228fba4cc8196af69af0872a1ae6953d1380afa9a43491eddb993 WHIRLPOOL 340212144f82771463b93ab1fb74e4876484294f9956507019ff0a4c07ebd1e40dcf7f3206bc03809c69dc5c32e0adcace3439b625956c1dd349424bf1929256
-MISC ChangeLog 188902 SHA256 116d631d4c6950027668738147b142046cd48729d0e06d87225996789b516df3 SHA512 4adc5af5402080f40abbf04636e1d89ffe10f9bfe496addc58ff7e7cc7d016fc38653bb714df119a6f43d346502f801fd62f742f06eb4a79b839d6394531ccc9 WHIRLPOOL 27ade6a5f702989c3681c8232ff044e257a5275b6bc9e131f8ccf0f9dcd66670bd022327d0981723b1dcfda32ece928d2fbdff351761159062461689d87ae61e
+EBUILD netbeans-websvccommon-9999_p20150821.ebuild 2727 SHA256 ae0fee947feae887de4174851d9140e01ff61a0a610bff474f48d5ebc7c570ea SHA512 61de914f268a9d8b328e7b66ec3100aad46452bbe9296a60ae35d65293476f179e14f477e50b6a271cba5ceeba1efa838dd5fabb1ce302e6e79273f90a1f3e85 WHIRLPOOL 05aca1c24aedc6f1ec2d650c596fdabbd26e2377bd16aa8ef657cb9aa7d47ad6209b184911e84aaab26883f2bd83e2f6948ddf6c594585c14ab7e6045ca8b029
+MISC ChangeLog 189088 SHA256 3499bf5dd51bea949665c25bfeb802c20b16273606f7b1bfafbbe7f1f3ec64d9 SHA512 60905e94445b3fc97240d96366daae84220108153c5fb1a1f025794bb50cbfe38ac988f6f75b4842df9ba4688cd770582cce62e25c3dc9d9a88dc8e3460dc64b WHIRLPOOL 983634f98b560e3a402c8d5909b1cc194d84e23409425c46e98ce2cf377ea9caf38770d6485846609ef809cde5bb1b512582ed813e46cfbfaffd216dcc98ca60
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150821.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150821.ebuild
new file mode 100644
index 0000000..3807b4e
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150821.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-21_00-02-28/zip/netbeans-trunk-nightly-201508210002-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/ChangeLog b/dev-util/netbeans/ChangeLog
index 0463a31..ba4b489 100644
--- a/dev-util/netbeans/ChangeLog
+++ b/dev-util/netbeans/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-9999_p20150821 (21 Aug 2015)
+
+  21 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-9999_p20150821.ebuild:
+  updated to the latest sources
+
 *netbeans-9999_p20150820 (20 Aug 2015)
 
   20 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 5d1f191..e446fc1 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -45,6 +45,7 @@ DIST netbeans-trunk-nightly-201508170002-src.zip 208816661 SHA256 899384675fce61
 DIST netbeans-trunk-nightly-201508180002-src.zip 208817240 SHA256 b497e33ddf10398e677b60713e4f8a54f4588dcc633c23841501857c8da5a12d SHA512 725cad02fafd38794cd93d0b1d0ebe01f14c2db6e0d0c21edcf3172406f4fe7ec6ebdae666c84c80c9c943340cdf13f82603f794508d3055a6135a67b6b156ed WHIRLPOOL f7f027bfee7467131e34b90f05f4e46a6aab8c2206cf87e7025267e15f8b6d3ce96e7838687bc53caaf39c60607f0cb17fe1f6bfdb5ad53ecaa529c972c2ae17
 DIST netbeans-trunk-nightly-201508190002-src.zip 208817531 SHA256 6594e5c2181ff7dfcf7eab3c7551571ea8e4cc6f3eb3f196a2b3b4bd7f394745 SHA512 84b4d1f1e77f1a4e2d97c14e2400381ce0d926dae2659cf38bbd4d2b7ae619d479ac1d73900f6d9cf10981b85982f7f19c00662974179e48cc4efb6e3481a82a WHIRLPOOL 7decfaa30422c8c588e8cfb65cd654119c3f80b60ffe3226074e5a1775648154a26a5ef267bd98f0a7720b107a0046b040652379bb6dd4a837d000863098ecd5
 DIST netbeans-trunk-nightly-201508200002-src.zip 208799494 SHA256 81de2b1f44baa32ffb769676ba38edab57124533bda1bb1dcda18b9be5dcb7c2 SHA512 1c68dbcff6bcfeb3566823749b57ce95c2de6a97333573897d78f5f6bc7fcfe2c06a2ff7805bfabea9dc9f60d9e5021d4c3d5aa720004d796caf3b163fb1699d WHIRLPOOL cc8344fb52507294d00071f967abdc5b77fcd37fd3989b81d0efdb7d35c0eca4349f86769f2a09915a72565e399852c40f21eaab89fb6a7c66a58960ecfefc39
+DIST netbeans-trunk-nightly-201508210002-src.zip 208800734 SHA256 c85c1f8027b3b9b03bbcc6743bb508899bc9050058c112f060d73daa544bbde6 SHA512 d8a3cbbc3f671d52bb5edcd2722c9ef847cdc160aecb4a9ee3283c2f64d82284c820c39a68e2aff2e7c3cd24fac618c1d3c48207b8323aa06f92524d0ab3a185 WHIRLPOOL b8938d9102fff59c5cc4f35db839492bbd1b1249d4e9c8da9eb4b2167c1e14d8906d49ba2bc9d301331e25d855b798883ee5f7aa51a5f00b272f55adae5339b3
 EBUILD netbeans-7.0.1-r2.ebuild 6736 SHA256 e808fba2ddb516270d93b5cf67cff60d98b37ca58a158878f2e3b3ad696cfc82 SHA512 653fb585d9eaa20fcf88d778a7f34d63c9f29f2af2153a432fcab6d977ef9619c699b19587a48b148ccf717f4b31a43859b81cff80d5d84ad273c5fa16e8f565 WHIRLPOOL 257f2466c3ad198a05db9d5e377cad2707f8a4daf1f421e516d7435670a85fd4bb5f6b3ab657ebda8cc23937e1b4e1f4acce8cccd85bccddc5a7b1f9abbde0ce
 EBUILD netbeans-7.1.2.ebuild 6976 SHA256 4222e248dfb664ccfea85d4938ad691d3685f32d8e9b33289d1dda088057261b SHA512 cc0a20bd542b61621fe08d5413611f7bcbbebf0c37d5f67c590c31324e74eb5594e72efacc86d843ff3abffc98c4859c2733c63ce6f993baf51e24d69197b64d WHIRLPOOL 30fb7b0cbf22fc39a8dabefd27a0073ce73e62ef082d55839fb7f815bb73bc5c3c24c3418ce175f355d7c64138ef7e9616da41c68b3b57a70353d16c6113daf7
 EBUILD netbeans-7.2.ebuild 7057 SHA256 29140b2779f1a24722499605101c286d05415b4f97d2363afedef711cc586067 SHA512 0776f530f9530c533b13019f7b34fc664990a16926bcff768d0a9f3b9035de82dcd2ed66425ad8da27c65aa69fe3e6be966e0a1ee1bc222949e5d42e14f7f7f1 WHIRLPOOL 9fcb95348171fb0bd8d794b80b51b2e3ce36fd84ccc81653bdd0172cbfa99791e527b33c895ebf7b4d81c228f17d4afab367eb55ceffe28df835b2d09dc8f778
@@ -76,5 +77,6 @@ EBUILD netbeans-9999_p20150817.ebuild 7216 SHA256 220e30b8576667979182ea0b90b76c
 EBUILD netbeans-9999_p20150818.ebuild 7216 SHA256 35084c73bb40b4ca55cdbf16b840f140ed7fdfe153ea3cb71c90b362fd1db8f4 SHA512 0f9df5a980c3a961a183482be0d814c266995ca7a230165c4fea2ac4d5312c6b843ce06bfc42d0763811f42909c4b96c726a21c42295e0e3f059b0dd5bddab86 WHIRLPOOL de2c791d2939b3754a65447fad51257a00459cecde6beb6645f7b6198432d35c1f30e0d55651f08ff8a56e7817d4166f9b6cf775508d67e4a46a8d01b9730131
 EBUILD netbeans-9999_p20150819.ebuild 7216 SHA256 92edb5673b91df9a9d57804987daa09f0bc105f65add93a99e37483fd8406325 SHA512 e2c3e90a9b74255a3feca378060f529cf4c41b703e131b8eec538789a891b808ae00fea37e716440f35e2086fcccd70b42b514d60503cdfaf8781dbf86e7c4eb WHIRLPOOL 8c402febb7c32a5163852fc55dbafc96224b375e280e2cbbbe463c2f35909799b30b1fe5e812c708ee3a7926796c163d1eef522221ec14aae06122e5be15aea1
 EBUILD netbeans-9999_p20150820.ebuild 7216 SHA256 c65314aadad93241ac2f5d42a26e74b48dbf832b35c69656f520c51fb05458ea SHA512 87bb92fcd4af1fde2165b5020becf73ec2eff7f48d16864882b0995c5ccca733daa4d3c046724db8ecfcb3553ca7f3e8c9b5f76ba6ac612b50848fa38e8c0ffe WHIRLPOOL db05c182299845091cdb4722b85de3f61154b23b56ed4be62a3300e46683e93348e19a04f9ccca7fb772066fdec83d4e4c87041f07753f5049a9a98ed2b30a5c
-MISC ChangeLog 160252 SHA256 fe98df544806d1771540e331bf9dc7035086dcaec3bbd749329ebb740ce1ccad SHA512 1fdd5f570d591af20ff94a84cb8b23513afa42327e306b68a8c546685ef0bfdb696fa343a60cce63e2b905d7be4aeb7f260bfe2f801d560583c6bf42806ca014 WHIRLPOOL aaf459bf99d1195d8750de489522ec66867e8bb354fcea862ed56b49ea9cff349103dc38ab3b8f4fc5fd10df56b0245290ec3543da366662926d11b803afcd8c
+EBUILD netbeans-9999_p20150821.ebuild 7216 SHA256 8c0a0f50dc29df76d523b9b8ab223d58e8fe9b6f8929c7cdb04abd38f3fb033c SHA512 1d18181b6a5b1d655d5ad20534e693d67eb37fb15bab9c69e36ef4a2098430b4ee1575f67355c4d22236b2fa759a43ce87ed76e836cc4d0fe863c3d03e9f7a2f WHIRLPOOL 2a1c143b7763ea25a243468ad3ed4f3b79c30bb821f53fc35ff96ee149857551a2a84c60f8f29fe1bc13e8f8a4ea06e65482b643b759c8624eab5c8e0acd8b94
+MISC ChangeLog 160412 SHA256 0aec26e3b21ef4bb0cbafee6740fc0e04a2bbf459bb0952a1f5d21c56ac70a14 SHA512 94ba8dc16702ee331c736b213b26ee8433d22f4e82d0b68042ddab3a3fec6f49ea787d9692738d6f832997d756c7edf907d2ac5d4ed39e374c1d7a80ae3ecf53 WHIRLPOOL 98ffcff248a3f7c634d84f16a2db0b2c352f91f8db164e1c942b5e8745da0e4b925241d8f07f2edfb9c66b3bcb3957671f650a90b6fb1845c7fe151ffb1f329f
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

diff --git a/dev-util/netbeans/netbeans-9999_p20150821.ebuild b/dev-util/netbeans/netbeans-9999_p20150821.ebuild
new file mode 100644
index 0000000..b82ea5a
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20150821.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-21_00-02-28/zip/netbeans-trunk-nightly-201508210002-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_bg? ( ${ALL_URLS} )
+	linguas_ca? ( ${ALL_URLS} )
+	linguas_cs? ( ${ALL_URLS} )
+	linguas_de? ( ${ALL_URLS} )
+	linguas_el? ( ${ALL_URLS} )
+	linguas_es? ( ${ALL_URLS} )
+	linguas_fr? ( ${ALL_URLS} )
+	linguas_gl? ( ${ALL_URLS} )
+	linguas_hi_IN? ( ${ALL_URLS} )
+	linguas_id? ( ${ALL_URLS} )
+	linguas_it? ( ${ALL_URLS} )
+	linguas_ja? ( ${ALL_URLS} )
+	linguas_ko? ( ${ALL_URLS} )
+	linguas_lt? ( ${ALL_URLS} )
+	linguas_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_tl? ( ${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_bg
+	linguas_ca
+	linguas_cs
+	linguas_de
+	linguas_el
+	linguas_es
+	linguas_fr
+	linguas_gl
+	linguas_hi_IN
+	linguas_id
+	linguas_it
+	linguas_ja
+	linguas_ko
+	linguas_lt
+	linguas_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_tl
+	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}" = "gl" ]] ; then
+			lang="gl_ES"
+		elif [[ "${lang}" = "id" ]] ; then
+			lang="in_ID"
+		elif [[ "${lang}" = "nl" ]] ; then
+			lang="nl_BE,nl_NL"
+		elif [[ "${lang}" = "tl" ]] ; then
+			lang="fil_PH"
+		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_gl ; then
+		einfo
+		einfo "You selected Galician locale which has locale code gl:ES in Netbeans."
+	fi
+
+	if use linguas_id ; then
+		einfo
+		einfo "You selected Indonesian locale which has locale code in:ID in Netbeans."
+	fi
+
+	if use linguas_nl ; then
+		einfo
+		einfo "You selected Dutch locale so you can choose either nl:BE or nl:NL variant."
+	fi
+
+	if use linguas_tl ; then
+		einfo
+		einfo "You selected Tagalog locale which has for Filipino locale code fil:PH in Netbeans."
+	fi
+}


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

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-platform/, dev-java/netbeans-javafx/, ...
@ 2016-09-24  9:07 Miroslav Šulc
  0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2016-09-24  9:07 UTC (permalink / raw
  To: gentoo-commits

commit:     c0b365f299bcf5c2462884d8392a94a637df44f4
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 24 09:07:18 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Sep 24 09:07:18 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=c0b365f2

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.3.1

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index a810a99..a6259fb 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba2
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
+DIST netbeans-trunk-nightly-201609240002-src.zip 218005040 SHA256 9967b7b3ac0f93d01d11428ca5bd82d39fd38f96e1eba5acd6de7705e448d231 SHA512 9740be7fb9cae0e420bf30c7f3094ed3fb2da8e3c07ef7a3e5854eefc725eb49eaaf1e924fe6ca7ef84b4f0a625d663f36984cbd4741696f3142bcfd46f78a35 WHIRLPOOL 0df5b8f7f276422cf55c45a04ae4dd2dea291c8d16da9a093fea9f086735c2b953afca97e4b7b195be4d7ec51a204f7057c667e3af738b5eedb538fb3b64f27f
 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_p20160823.ebuild 3384 SHA256 35b21bd18a2dcddbeb229915e2ac3859b634bb9b53835bc62a4bfc0b623b5684 SHA512 95b8c39505958153a67dfb71a106cd182b3f57c54ad7892f19fc3a5692a64de791647a5ec120cb6468f0ea67e78149e2aaacc7fcc5c0ccb4bdd2a554ce02ff60 WHIRLPOOL 09c2bdfd8bfaa191aeec209eb6177b68cab5e9c72fdf8a292e92bcae722de3d4767d66f5980783434cd0fd21d0a3ab9acb36cd2c5a0b0e511bfd83811a5212dc
@@ -59,4 +60,5 @@ EBUILD netbeans-apisupport-9999_p20160920.ebuild 3384 SHA256 de7d5a01a0af33c46c1
 EBUILD netbeans-apisupport-9999_p20160921.ebuild 3384 SHA256 9372fb191756ed900d0a6f59fd005eadf314485663e48da56cf2ba32ae950e24 SHA512 ad53d9b0575fbf875f978808d7f1ef88eddd9ba7998a610979aa7b15b12c93377e56d080bdae8c45c12ada854e711297a356cf741292a2a552e5a678ee561823 WHIRLPOOL 40fccc3b9fe9f1be2cc000994f11b56a4bee7246b0f16f11869960ed3fc89d2b8510bcc09d297a964cc2320f0dd800d5ef0680315b2577521b87fd707b4c0d39
 EBUILD netbeans-apisupport-9999_p20160922.ebuild 3384 SHA256 09616722b9367099d6abf15dfb83a81cfdf5119bc54fa6ee6bb56c0fc12d30cf SHA512 1b54b505064a656fae662ee1daa141f1022bf5a8a6f3fb6a5f593a66f75b40dd3c9eed6fe7d87bc14c8eae4d1da627489be68d01372b72bac532c101c4c4a512 WHIRLPOOL f8d6f03a79198ee465619b8c4b9eaa558314756cebea9feb719246826542046e47940c557a654e23c55c8d351febed1c8c0fe6abc2c002d42a4daeddb4b5ea42
 EBUILD netbeans-apisupport-9999_p20160923.ebuild 3384 SHA256 086ab65897edffd05f26c28dc4d3c01098b258b2219fa4b65e5e9ec58a4753b3 SHA512 05e8e2ba035eb743b801a61388328537a9f5a7a759889d085f4052329ef270dcdecc5a39ed071037edf6ce70cad1fd198de4741aefae32afcfd000ca0a9d24e4 WHIRLPOOL dae7c988ed1dc79e7022c10d34833d2a9f22812b6f22427f137644eabb04fe8abafaa67e9dc58477678a7146ad488d90a06e2418353bc8107a5a150f8c4e7a12
+EBUILD netbeans-apisupport-9999_p20160924.ebuild 3384 SHA256 56f6eee2992edee7dc28214bf7633c39ed43246dbd2b503a5c498ba184bc1ac5 SHA512 cd132ebb024ea7f46769649be43b7bad506cbbc9f2de65527281a5883d440fda5003143a8c2998b013bac0363e8e6bc736fee1eee5cf1c138b311ac926bf0c63 WHIRLPOOL bc0c9b6e56df12ab7cea97a9e7cf74fee4359389230d1ef16fb50043b54d4c926544abdb93300751394a99b2ed21b238ca48259d17e75e63aa3c0150f07df428
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160924.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160924.ebuild
new file mode 100644
index 0000000..b70cf5c
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160924.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-09-24_00-02-33/zip/netbeans-trunk-nightly-201609240002-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 8cf8482..67b569d 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -46,6 +46,7 @@ DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba2
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
+DIST netbeans-trunk-nightly-201609240002-src.zip 218005040 SHA256 9967b7b3ac0f93d01d11428ca5bd82d39fd38f96e1eba5acd6de7705e448d231 SHA512 9740be7fb9cae0e420bf30c7f3094ed3fb2da8e3c07ef7a3e5854eefc725eb49eaaf1e924fe6ca7ef84b4f0a625d663f36984cbd4741696f3142bcfd46f78a35 WHIRLPOOL 0df5b8f7f276422cf55c45a04ae4dd2dea291c8d16da9a093fea9f086735c2b953afca97e4b7b195be4d7ec51a204f7057c667e3af738b5eedb538fb3b64f27f
 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_p20160823.ebuild 4790 SHA256 40ccad64d128bbbb16f9b56b88cc9ff33f416bfd47f988d2e38dead791d40391 SHA512 43f90442259811ed0adc9f2ce23e9d34e77c0fd04bee2f3e8f571798edb9f8b10a5824a7e76753150fcd2c85b76d96a43bab4b68a68e42cafaae4b1540ee4d6c WHIRLPOOL 34a7a25714040d68b36401cfc4d504b9b6ced6740f18bf9e5f37a059ea6c5fe7f5d060095cefa41b7e6e3e8a687ede4d137e2c8038446b8f3653b935b669b9e9
@@ -75,4 +76,5 @@ EBUILD netbeans-cnd-9999_p20160920.ebuild 4790 SHA256 16b13cee59598f079cad640930
 EBUILD netbeans-cnd-9999_p20160921.ebuild 4790 SHA256 da3da80e958a041a4390cb41003586fce8990b229358084ebc81a1080469b5a3 SHA512 18ef8cc5c50d5ae457a853ddc0ee84f445acac4f3d1c63e7ad70df308d30d270c52879fb2937ad997b6fec30f475c9ecabedfeae121944fec411697a7799033e WHIRLPOOL f7e4e4ea1b0c9d4214a6a597d4decf33bd74053d6c6e8f0633faf93ab898dc1c8496b72f60302a2c02012d5336d63cd169122696cedd376b5dc7fcb7c82ca67f
 EBUILD netbeans-cnd-9999_p20160922.ebuild 4790 SHA256 9a60a0268cd04e850f372732660d2b462655ab999dca6db8824a74c40b84604e SHA512 b9e737b10ba9ebac717da8a929a231cdc165e55c906c96e52bb567ffbaad5fae1dc16ec38da879477c8c68cf4039fe8d7e112d3d7cab51a67eb79fc9c9ed3cf2 WHIRLPOOL 15a1392d789ec3a3e86b31d4a2e88f0442cacfb6712d50f9c5e0efd70f4dacb6e449c953f2934216bb10f63ea8204202dd3d6ebcbecae9136c3aaca16ce5f22b
 EBUILD netbeans-cnd-9999_p20160923.ebuild 4790 SHA256 dc84c629b391b322ad6ba51221f2fe80bfca7af010b020cd0bf9a4f860c53549 SHA512 797d7fa8d814f0cc62c9ce2cf9d484cda8da017533d6087c0e6a6b1d2c68aa25f82bb79ceddbb58bc258e6b8ed40fc2b3177878f013bce6b287506923c793746 WHIRLPOOL fc599a2f28c81b92ce8a9cd21f02692fb9106a18d7c86d8c27f49f5a4996c2e41f8c8c5cf153ca05839b26ee1419a9e92c92fe60d1e4917bfe34c8b24ae9c6c5
+EBUILD netbeans-cnd-9999_p20160924.ebuild 4790 SHA256 7d6cede657826e5c4693a39cd6c38efcd167fe063fce5922a606a872a5ded830 SHA512 29fb81eb5f9376d7f920f90f9afb111df8251beb99155f673923ad4b344c1c6901e7f3a558b9cf23f1edcc28b52152b0dd86fdd2fac841aff272ebf15732fd0a WHIRLPOOL aa7d065c8b116b31da65a0f78c49765ea612c4edc9af2d2f45ae44e940df31aa9c56522653f8adb19ebbb70c5174e328743c92e4bea4eca7f1b30d3fa47fe5c9
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160924.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160924.ebuild
new file mode 100644
index 0000000..916a81f
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160924.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-09-24_00-02-33/zip/netbeans-trunk-nightly-201609240002-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/F20EEEDF4FE6B93B180387576FB780EED9F79C66-clank_0.3.9.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}"/F20EEEDF4FE6B93B180387576FB780EED9F79C66-clank_0.3.9.zip libs.clank/external/clank_0.3.9.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 43fafec..23d60bb 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba2
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
+DIST netbeans-trunk-nightly-201609240002-src.zip 218005040 SHA256 9967b7b3ac0f93d01d11428ca5bd82d39fd38f96e1eba5acd6de7705e448d231 SHA512 9740be7fb9cae0e420bf30c7f3094ed3fb2da8e3c07ef7a3e5854eefc725eb49eaaf1e924fe6ca7ef84b4f0a625d663f36984cbd4741696f3142bcfd46f78a35 WHIRLPOOL 0df5b8f7f276422cf55c45a04ae4dd2dea291c8d16da9a093fea9f086735c2b953afca97e4b7b195be4d7ec51a204f7057c667e3af738b5eedb538fb3b64f27f
 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_p20160823.ebuild 2968 SHA256 10cd01f8c224ac76c7006e2e1923d86e15c42869b92ec83f79909aae328b4b41 SHA512 69d65210d4ca7fedfde3a87f710e521841a9b2d5131f1d4fb495c9ce482be6a3c04a3098b92be831875fddb02f6593e63e6c05e415af9924658bc11bec61ab4d WHIRLPOOL 6dcba7a3b3ea87c101e8a346038bf50406da92a46c76e3f93cbfca54d9350cdd8bb4279d8acbcd9fcaaee1607e4ed4f64c5669b3c3cb0fbbe7ab0e04ae6205de
@@ -64,4 +65,5 @@ EBUILD netbeans-dlight-9999_p20160920.ebuild 2968 SHA256 55d14cd8522cde2857e3cdb
 EBUILD netbeans-dlight-9999_p20160921.ebuild 2968 SHA256 8929fae200cc9536eba4a8e528c8a3f598a99bf052452203ad7759981eb72d9e SHA512 1eaef46875e0579a45a18bc27c7a88900f9f1109cad9d293168dd9932cec1eec42af6b2bfc6d91d53886fcbd5d8848eb74f79a0250590486ca44ddb5e3644676 WHIRLPOOL 31cea4def2343ecdbc8021189406ed409b38f4891be2abf573414507182787fc69120b307626339068ce8dec7dbe3b4b6801e6115859bf5b81c899eda2e43d69
 EBUILD netbeans-dlight-9999_p20160922.ebuild 2968 SHA256 88b1fbca1de4604bcdd6cebd13733a3c9b689a3f59f7b384eaef945858a440ea SHA512 de97d61cc3d63f12d3ab1f80501dd86b6162ecbea3915c19f65f168bb6c918be0a9257b805efd0f8c32f56f4096a7c5d17c8728d145d58a27bc023aa4e032b53 WHIRLPOOL 8f5f4c1c8b06fad77e0888dc65a3efd89d65fb4a156b0bf28a5da788b7e2dd5c04d2d32331ff30087703bc51d3145c4c02e2acda545e1c9a8cb6f0a942da72f3
 EBUILD netbeans-dlight-9999_p20160923.ebuild 2968 SHA256 d24924c3b1be7ea5c8d4e87fcfe7cea094ec5457030fd758a98376094fe95134 SHA512 0a2872d10dfb87f5a1f95129af873c80e5f6f7cd22733455a41f3f442405c5ce57762e11fecda0567ffd630842ea631410e1ca5b510aea931f32ad2cbc87cf43 WHIRLPOOL 843bee7d2939f695ebd26a21452cc8279f8ee60b2915e309f0a3daa1003ac3b0a1d5a9faac61586758dff77eb53eb9e911793a72e08150cb8d150d025bf2b9e1
+EBUILD netbeans-dlight-9999_p20160924.ebuild 2968 SHA256 e3b9717643ad382c86ea5dc7fae19348ea5ce0132d56803c9a0789fd12cfcf25 SHA512 84acf550380f12047a03baf19c13316c24fad8c587db5e78593088e6dd6c5b35f564f679e5d1fa01e8c27ddac216e6d321dc8d2896bbcc23c3c4ee8ad596b5d1 WHIRLPOOL 9f0b6784ea1af1db425dab7d806f88e6d59172aeb0c96757d01b6b1f05faac72b69a03a8ce9822151a04e5ad0724bb7feeb7e33383ac19c1d19cf0dd952287d1
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160924.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160924.ebuild
new file mode 100644
index 0000000..cd44a13
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160924.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-09-24_00-02-33/zip/netbeans-trunk-nightly-201609240002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/18E39A0D10357B72EDB76F2070E27019317792F1-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}"/18E39A0D10357B72EDB76F2070E27019317792F1-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 4dd83fa..c5a1758 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -62,6 +62,7 @@ DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba2
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
+DIST netbeans-trunk-nightly-201609240002-src.zip 218005040 SHA256 9967b7b3ac0f93d01d11428ca5bd82d39fd38f96e1eba5acd6de7705e448d231 SHA512 9740be7fb9cae0e420bf30c7f3094ed3fb2da8e3c07ef7a3e5854eefc725eb49eaaf1e924fe6ca7ef84b4f0a625d663f36984cbd4741696f3142bcfd46f78a35 WHIRLPOOL 0df5b8f7f276422cf55c45a04ae4dd2dea291c8d16da9a093fea9f086735c2b953afca97e4b7b195be4d7ec51a204f7057c667e3af738b5eedb538fb3b64f27f
 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_p20160823.ebuild 15825 SHA256 3b8a47c2bdaa4d2b75d7c0dc06fd4b83deb14b63debbe08a7bc11653dd51e17a SHA512 26bafbd3d4bd6d75509f636d302924db669f65d120771c1185493fe77d2ac3b2456ea3d7fb37a7d512ccc771f8f46908dc376c47982ac930f8eef9866ea2953c WHIRLPOOL 423852e833a6939433f7de6c1cb7548a814b785d5eb9e14e1efe528ec5ea076b582ded26293affc9ce2491ae80cbe0ec26c42fc9be50674818849b9b74f8958a
@@ -91,4 +92,5 @@ EBUILD netbeans-enterprise-9999_p20160920.ebuild 15825 SHA256 71f2de62de7be77872
 EBUILD netbeans-enterprise-9999_p20160921.ebuild 15825 SHA256 d5d36a26517c98a7fd7ba2ae9df90ee1f49458c3ddea6056df8db2a06bd3922d SHA512 cb7311d13c5d836a65b2e3fcacbffda94cb8bb93fb632c5e94216c0cd0fd1eedd31c45fc32d8b1adda6c323ad3619c86c5e80123950d5b23e13ca3ae2a49dd32 WHIRLPOOL 7c4a17aa92a70461a4de7acce285805a3b862753ab64275e8da87fbe7c477ddbbe39da190dbcfc22c4fe49732fae0cb7d495587bd66ab77692d29de0d75b3b41
 EBUILD netbeans-enterprise-9999_p20160922.ebuild 15825 SHA256 9bc3f731dfe2bb62eb7e039c9f93810256099fb3bfc484c1ce82e4cbaf171d67 SHA512 36d48fefd0f288465361d05fb6b2ec69a99740998c67750a80b03e8373369804519acae7c79a0bca68e8576486f0e1305a583300472719ecc424221c4b39cb2a WHIRLPOOL 29ce318476918afbf1144fd112fd94d16588a019e0c2e2c12400a12c39a00552f6a01c398d66619f015095efa47891fd9e4f75a5906b4693e8bd4ac207f7cf32
 EBUILD netbeans-enterprise-9999_p20160923.ebuild 15825 SHA256 36c67989b9521d97e45b99b05cd188f21e9ab67cd248d0fdedd4dd38cf2b46d1 SHA512 5cb824ecffc96e57616d9dafba02347f69f85b9e84828c8d45d408484d4c7c9f27f9b4e942b75c8d552c78114daf4346659e62381ee1878e10970f569d4d6949 WHIRLPOOL e6057c3d43ec8bfa1e39f45aa89d947ab8cd2368e07dc89861543ed8872c785d2e5d58a553d3adc720fce79aac1b15633717360bfbbd8a329fe3f52970ee27f9
+EBUILD netbeans-enterprise-9999_p20160924.ebuild 15825 SHA256 33b99b02fd4eb2aaace86e443422bbad493058479d0f4c5ca33322aa357c68bc SHA512 09a71d8cbf9609c863b22588f470e94016453d0ee6edcd983aadbf6cc933ea0d4876419d108c21b3845a5a9a6610c3d966866c89fb097d0c0f850f7d52c649b3 WHIRLPOOL e420d6d3b2e233fb218236bf5fa8c10b6270145c949eaf217a20e91ed6558827a47949ee6acfcabba2419119cffbd5abf4a14f6a0c013b1db94543a4ecddd48c
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160924.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160924.ebuild
new file mode 100644
index 0000000..efb9108
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160924.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-09-24_00-02-33/zip/netbeans-trunk-nightly-201609240002-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 ce7a69c..4839060 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba2
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
+DIST netbeans-trunk-nightly-201609240002-src.zip 218005040 SHA256 9967b7b3ac0f93d01d11428ca5bd82d39fd38f96e1eba5acd6de7705e448d231 SHA512 9740be7fb9cae0e420bf30c7f3094ed3fb2da8e3c07ef7a3e5854eefc725eb49eaaf1e924fe6ca7ef84b4f0a625d663f36984cbd4741696f3142bcfd46f78a35 WHIRLPOOL 0df5b8f7f276422cf55c45a04ae4dd2dea291c8d16da9a093fea9f086735c2b953afca97e4b7b195be4d7ec51a204f7057c667e3af738b5eedb538fb3b64f27f
 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_p20160823.ebuild 2913 SHA256 5d874987a81194d5be1b5299e2772f00f1fccc364528c12b63863a1f44067fa8 SHA512 3f150b1e141337410c6b6854634d4431523741d3bceae13a0a4e02a42874fbf55a359ad655028ad5d0fc05cbada0114dbf0268cfa87c4f36d8346b6bb5d2353d WHIRLPOOL d37df3444e4d11fdb41ef412a404629b6d61f8f0fba392427232e9fcaa1563580033cbad1a2f4589fe0c9cbe002323a11b84735e162193ad110d976db085cb61
@@ -59,4 +60,5 @@ EBUILD netbeans-ergonomics-9999_p20160920.ebuild 2913 SHA256 3e3f526858d5221b6e4
 EBUILD netbeans-ergonomics-9999_p20160921.ebuild 2913 SHA256 242eef7be7445480b75d30b51172fdf7e79aaa76080194c0c73e5d3b34be68cc SHA512 1f8590eae56bb744f2370199a057d8b6e139f6cf2de5c39bd8351e0e0a905f53c0c6df1c7c1143e0ebcf183c3df333f86637b225528612c0da01f1dee308e170 WHIRLPOOL edf684e0046a5159f18eaa45e22b15f0cff5a91ad2231b17021f50604d6c6adbb1976694d4356054f89cb1483b41e0a5271e01155acec6bc90ea414a3a3cd40a
 EBUILD netbeans-ergonomics-9999_p20160922.ebuild 2913 SHA256 a71c94636e2d6a18d7a0349eba93a88443c7ea94b44eff33df16530c63ac7db2 SHA512 f1805dd048cb67cecf69b64aa4802ecee815755605810990808824df684aa0457e40151111fdd944ca79c84faac837858c7e03193e78fcf5a758386bf0808224 WHIRLPOOL 98725c779ca894afd72f7c2cb8fa5efb4df76e1f508891ea863a5477cc79168e5d9c67a9e7ad2261d8fee688cf9827877b986b815333af31e8e9f69381e131da
 EBUILD netbeans-ergonomics-9999_p20160923.ebuild 2913 SHA256 ae69b6f6b52c939444ae4803b0da11cb64e30be2c3f6b9be886f1795eca6f200 SHA512 6a66091c9bde3eb15cc90981871f6d986cd83d44ad781e1f3d7f9fc421c10438d5c82cea80bc3627c7e55536a8ed548e7c1445f2a783543fa848a1eaad40dfbc WHIRLPOOL b8bd1cfb7f712b38115d5f8ef7cad33b2be6b8c6c145429e6bc2ff6d761fd4e453e2b13a16ecbecffa3877783797c462780611d6b602f32a0d6086b15fee014e
+EBUILD netbeans-ergonomics-9999_p20160924.ebuild 2913 SHA256 61224ec52538c88240f9be4d7826b36a7fb2e3a15298232f8b1dd4e7c439d0e0 SHA512 de8ebf0cda69b36236e1dac1b7dca607d91803327a3d53d82cc9ef4d5dd7148d5943b816de02f5b226825ff265d19c788949dcea1f6727ba5ff50d828e15ef76 WHIRLPOOL ff5f8713bf650cbb54bc966c09fba1918406ea9b874977df09a181f6cefb331013d50c72c58e7080ed78d38046590dd83012967d926d1fb84ffba9e90443e51e
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160924.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160924.ebuild
new file mode 100644
index 0000000..af364ce
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160924.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-09-24_00-02-33/zip/netbeans-trunk-nightly-201609240002-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 24e8e80..4b02199 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba2
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
+DIST netbeans-trunk-nightly-201609240002-src.zip 218005040 SHA256 9967b7b3ac0f93d01d11428ca5bd82d39fd38f96e1eba5acd6de7705e448d231 SHA512 9740be7fb9cae0e420bf30c7f3094ed3fb2da8e3c07ef7a3e5854eefc725eb49eaaf1e924fe6ca7ef84b4f0a625d663f36984cbd4741696f3142bcfd46f78a35 WHIRLPOOL 0df5b8f7f276422cf55c45a04ae4dd2dea291c8d16da9a093fea9f086735c2b953afca97e4b7b195be4d7ec51a204f7057c667e3af738b5eedb538fb3b64f27f
 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_p20160823.ebuild 3377 SHA256 a59447c6bd7857f086ed57f62fc2d283ee52390727fe817575f67450781da2b3 SHA512 32729a9f723e14371a79e2bb2087c7b822ad4743d7a0bd4db65a114b71aa9edfa9c92241a609d1c4cf39eb7da15536702d07c0e6277ace0638f0d7ae7899b7c1 WHIRLPOOL 0dfd0f904abce48cdf86e623d3b12f1565dc84a9c5fa9ece482907acdc716a6dc9a3a5774891fa69ea5ce931f549c073fc64d372f316faaab45e5811605d5274
@@ -63,4 +64,5 @@ EBUILD netbeans-extide-9999_p20160920.ebuild 3377 SHA256 7999e7ccc6b393d509e6025
 EBUILD netbeans-extide-9999_p20160921.ebuild 3377 SHA256 72a863c9877d8f8f8041ea8d33b2a8b824fc66b907d076d8164d9dfb6589e65f SHA512 0c2afbe9e8b1a8295f80356a239f75a27e6c2efd2c4b9ba39e740726177f8ec41b9bc3152564ee4df4a71ec0f32a52f5884ffcd3b586c9ee1ab8def859b39da7 WHIRLPOOL 0670ab486ce5e24a429567b4b1638ee77a05a91813cdef973dbc298798ae30f9bf761b66d9de88d1d6716c4e4fe79ec9ff90a062c0e7d30d71df2d96bb3d7c14
 EBUILD netbeans-extide-9999_p20160922.ebuild 3377 SHA256 534d4faf272ca3cc66c0e2baddf479093968192a7b94ef02d7350ee3a30faca5 SHA512 58e913bc89a9103f2778da9b61a42456b62ca3ef665161b2036445812e21ed757ebf44d171223ba92d7192148682fef1c0e96e4b0679524abff439af45187492 WHIRLPOOL c576e9077fdad79947a4b80cf39e13e3c17a5d187c1f2c1e367a8c67fa78c36633a1f339a7cd390ea591c034080beaa94ba4425946fc622379bf73d6c3f0054d
 EBUILD netbeans-extide-9999_p20160923.ebuild 3377 SHA256 c13f4ea026ff0dfc45be0a40becf2973a9452f5737bee3b4bfea28dcd115f2bf SHA512 18da0a84a68fa38a459651e2be521bdef7e748251f3a21dfbaa71f2ca62f7a24b1a078065d88e6d2150c188acfe9ac42c59146194c292856758f6958265f35ec WHIRLPOOL 3e0bf748d1dd38ff029c1b904f889e39b9946c32aae6fd8250f18db6b4ffb1dfd7d61ada7135ac756edfe354522e3538c5ad2865f1886e88f6d50042ead23700
+EBUILD netbeans-extide-9999_p20160924.ebuild 3377 SHA256 6f9b9a99e5ed252857da8422e289665fcfa8de4d462558b4fad8bb7ac5370553 SHA512 e97e8b6e474bd1b8b61b991da2f3fb4db06f4d84b49c1663ecf1aab17d33a5480d4f32f99f55979d9c287fd707311b1b18f983c3c159e70daec672a9142e2a46 WHIRLPOOL adfac11903f62a25ce00451644356447fb08b94f84c91a1e1bb740f70a276c50af3c281c8b5447a024c4ef4805b72b8ba2d9e89ffba1001534ee243f789254bb
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160924.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160924.ebuild
new file mode 100644
index 0000000..d0d035e
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20160924.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-09-24_00-02-33/zip/netbeans-trunk-nightly-201609240002-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 6b87571..c044572 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba2
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
+DIST netbeans-trunk-nightly-201609240002-src.zip 218005040 SHA256 9967b7b3ac0f93d01d11428ca5bd82d39fd38f96e1eba5acd6de7705e448d231 SHA512 9740be7fb9cae0e420bf30c7f3094ed3fb2da8e3c07ef7a3e5854eefc725eb49eaaf1e924fe6ca7ef84b4f0a625d663f36984cbd4741696f3142bcfd46f78a35 WHIRLPOOL 0df5b8f7f276422cf55c45a04ae4dd2dea291c8d16da9a093fea9f086735c2b953afca97e4b7b195be4d7ec51a204f7057c667e3af738b5eedb538fb3b64f27f
 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_p20160823.ebuild 3416 SHA256 cfa018adc1167c6df621c732aef1a6b27886a372e0b2dd50fdaf3c505d139922 SHA512 f5269daae77cd1480ba1f7a589b4cc57dc4d3711d43384a0b2d4afb24f0cd2ae60cbe473a812783218928c69f86398f33a423032e647c502c9cda16cb9ad0477 WHIRLPOOL 2bf7497c1f86909f411e0293b4255e943456abe72a1f489d631f31fd71cd3ea6645cf17be5871955fd09a46c1780cf5656d13e897c9805cc80fa951c37e9a3d2
@@ -61,4 +62,5 @@ EBUILD netbeans-groovy-9999_p20160920.ebuild 3416 SHA256 523fffd499a2acf8232a624
 EBUILD netbeans-groovy-9999_p20160921.ebuild 3416 SHA256 a3258e5c6204ea4ebb735fcc49ee909a66dc25a6b1de4d8772cbbede5d546326 SHA512 782abb3a84a62f2eb50f0b7cbfcf9b53dbb574f910d923a210c1051d782331e7086d4ae65791b5fd2ef3b4160bbb43fd7e6a5552c3e1fb60d9f84aaaece9372e WHIRLPOOL a9486e05cea0ee82bafa18a2626a604a017f0401226eb79ba8b14a56215073ae2543a05e7972632b1844c9f4a266df23723b0497d006098b0a9057298507a833
 EBUILD netbeans-groovy-9999_p20160922.ebuild 3416 SHA256 4ad0fbdb8fd52a87874ce0481229fe9e4b46946ce8d4723e8684d6e2c2b19298 SHA512 5bb756b8b4fa1a969180dd812dfa08ad0bbf99430632fc13d3258a7007c8b3b7967fa6f33865567313a1de35a79ce697b769cb2e24fcd3ac2a8a29a1a3c48934 WHIRLPOOL 7c014d0c226a61d53ea4704edadab0dd7493820840c7f9873fc4779228718e3322a811b7a004fc3d6a75f9a2e50ed71a9c1872010cac1524b1352a609a0f569b
 EBUILD netbeans-groovy-9999_p20160923.ebuild 3416 SHA256 7c430ad28d5813a54a135cc26b3df74dee836834ea0702ea3607dafba48a9346 SHA512 e4350dbd75b58d4c9dbf20978d40e1a0b012a5e8bd4a4d190a47736456bcbc10736112d8126669214fdcc94b437fb664a5d4ee1cf6bd594ca14f37e7542efe27 WHIRLPOOL ee7fed3756c860af9ac483c4fc9f5d4c0787418deb0770a5f3592ffb6a8b959d5edd9a172ed856ceccd9b3e7fca24f37ad4f764e7cdf4b612d1f2592ba8c7958
+EBUILD netbeans-groovy-9999_p20160924.ebuild 3416 SHA256 b60699eaa885c6023e115a30d03604dc2e1806e9bab0eecde7deed8da1ef3bce SHA512 b501c69a04d45c6783b431f3207297653f718e5642674d02bc5c841d234cc89e0179d5270b1467b27e06cd443cec52155268ada3a1699385ed60764355a6cd95 WHIRLPOOL 63b3ff3fbe4c47674760879b92993d7105da7bba4524717e397eae7177a3aa32d002fd10fb6325cfdcd5435803ae6c85042fc14589b2eacdce2b0c95cef6e63d
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160924.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160924.ebuild
new file mode 100644
index 0000000..c86aa7f
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160924.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-09-24_00-02-33/zip/netbeans-trunk-nightly-201609240002-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 ab162b5..9a8f688 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba2
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
+DIST netbeans-trunk-nightly-201609240002-src.zip 218005040 SHA256 9967b7b3ac0f93d01d11428ca5bd82d39fd38f96e1eba5acd6de7705e448d231 SHA512 9740be7fb9cae0e420bf30c7f3094ed3fb2da8e3c07ef7a3e5854eefc725eb49eaaf1e924fe6ca7ef84b4f0a625d663f36984cbd4741696f3142bcfd46f78a35 WHIRLPOOL 0df5b8f7f276422cf55c45a04ae4dd2dea291c8d16da9a093fea9f086735c2b953afca97e4b7b195be4d7ec51a204f7057c667e3af738b5eedb538fb3b64f27f
 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_p20160823.ebuild 4126 SHA256 3deff245d1a3ec9c5bf424d3fd34dd65e36905541194cab8cd785b55a094c58f SHA512 789f86d39ec2088442c14dd01321ed82e1b5ff0450ca3602685d825b38c5c27f4838976427ce7c21e5762790cf6a547eef06b34d69932644bdc4ea33edd45967 WHIRLPOOL 3afa6275957560aad0e3c2cde615b0dd028cb5165849a090e3bc676cf40a3671d9293db9dfc42d01451c2df147c635a46a9911f9034308055ef8f86f19e387c2
@@ -64,4 +65,5 @@ EBUILD netbeans-harness-9999_p20160920.ebuild 4126 SHA256 644bb12dea929e3c68a6b6
 EBUILD netbeans-harness-9999_p20160921.ebuild 4126 SHA256 e6e857b6983fff8405ceadd509444b81f24f7e08d0135fad61ef7c65d08c82f1 SHA512 bfc0d12653efb4571f53c5181827e600942c24a36b41c0999bf146f47adfd46bdd50cdeca8036458755b339a0a2381ee11a636fb2dc972389ded7c5f55efc741 WHIRLPOOL 32461b02fe0d5acfa92556f1b51813ad18029c0a4859dc5d01b795d3a0505f715db86f467a9e72ebef61f97a51a42c8977b3d15c8daa292b69b488130067d558
 EBUILD netbeans-harness-9999_p20160922.ebuild 4126 SHA256 fca1856381e1a7494d7c9cb309b7c7253cd2ead2bdebadc4d13442ae409ea0f4 SHA512 9591cef614662591dca590f5b7c1134f60e694fe440129586c2dc9acbe6a1e90e8d9d52dae9c8773bce66d8b8fc477d770c7f6822deb6d211fc7b1703340d32d WHIRLPOOL 60c0abf60e09df66cc0506ac372f178c369f7274d09eebb4e153e7446fc8d536f6e1706fbe68fef22d788c5a971dd8f48afbb606357de84ee7a86020d6c1352b
 EBUILD netbeans-harness-9999_p20160923.ebuild 4126 SHA256 8345db8f7f5eff1aca757370b5808fd8646ebcadbccbf60719a2ae5e1afde62c SHA512 075c4c6a23c7c312932e96c872ed009f384e59920b257738f3a16d11aed6c46a8fec1582209347281d40f7a3018f9e72e53e1167b1f02282fa40cda5c9bb3a4a WHIRLPOOL 6fa4637fff9fb42ae53079126d77f9baf8dd4063e4aa0f757aeae125f3b5c2f042e2398220bc14c0dd2cd7c3866de1725fd4ad340add3f7c6c2b40e0b3d481f8
+EBUILD netbeans-harness-9999_p20160924.ebuild 4126 SHA256 32efc3a297338be15357e070c66ba9c5f12ccecc768c631fe195b8f906cddc39 SHA512 a269a96560428c31e0dbf595e47ff9fa8651105142bd7e032e25667ab8699945bc8e94ee58189d06a918a47f21beb0557e76ed06ed4777659b4e0f96b5f106ae WHIRLPOOL 95e76e0fd1a0277fc211776b7a17b33110e7a9c8a7b1b3e515e4e73f0cc2bf40b26bf40765a8853143b2ceb958cfefc58022af8842b1d3a4feaf44ebeb1669a0
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160924.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160924.ebuild
new file mode 100644
index 0000000..53f2bb5
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20160924.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-09-24_00-02-33/zip/netbeans-trunk-nightly-201609240002-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 f8fe37e..c89aae9 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -169,6 +169,7 @@ DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba2
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
+DIST netbeans-trunk-nightly-201609240002-src.zip 218005040 SHA256 9967b7b3ac0f93d01d11428ca5bd82d39fd38f96e1eba5acd6de7705e448d231 SHA512 9740be7fb9cae0e420bf30c7f3094ed3fb2da8e3c07ef7a3e5854eefc725eb49eaaf1e924fe6ca7ef84b4f0a625d663f36984cbd4741696f3142bcfd46f78a35 WHIRLPOOL 0df5b8f7f276422cf55c45a04ae4dd2dea291c8d16da9a093fea9f086735c2b953afca97e4b7b195be4d7ec51a204f7057c667e3af738b5eedb538fb3b64f27f
 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_p20160823.ebuild 29867 SHA256 8f2efe0e79cec54b3f6a36bb45f9644d1f614a9cd90ac5ece5c1d98c379e3cbb SHA512 42bc926beb5c1cc61d0d46c3c9e97196db8d168689f623cdeb8ccb6e8bfff3635280e291ccb0cfbf24b35dc5b962aa8be5acdf60995f80b2bc4b1ad74ba9f50b WHIRLPOOL 63831233671e8e022e0e45c47298a0bb61d3c00c7d0ffc84c3a52077d15f0f8eccb514a205cd0a3e60b77935de7109faa98512f2aa2be30382887a494dbfd5f6
@@ -198,4 +199,5 @@ EBUILD netbeans-ide-9999_p20160920.ebuild 29849 SHA256 b77baa64e73048f604ebaa909
 EBUILD netbeans-ide-9999_p20160921.ebuild 29849 SHA256 a8b62cd0a7a0fb29d46dc96b2e85b2a09dbe54a36d587032f3de389dca18cbf2 SHA512 c2b351954fb43715efb9996c77ba2150137330ffdafba6a1d0ad71e7bff260186d9cbfc41b7892e1a012e08a94a8d55047ad4d8ee71b1f020752b5c003afa009 WHIRLPOOL a06b6062153d8a63becaa310ec4f9713b7b6b672ee55dd12cb8080e3e49bc403d28ff1f820ce22a3a67adb1ff3215918407f114d2f495d3af71cb713b57c1c9c
 EBUILD netbeans-ide-9999_p20160922.ebuild 29849 SHA256 8917983cdcf8818f1d1e95470eff1fb2580e38e73d7e9e5902d4d9c069ea3db8 SHA512 6e16058d75d8c398406bf95eb1394a12fe6b06e4105af26aa92764c45f23c43098d617de303db0a7906dd6cf3c1773c7bc663fdf141332c97bc9592182116dd4 WHIRLPOOL 234ab0bc091a84ee6cfc27ab2826b7df9a64f13a346fce9cbf467463c91e2366abd7b420a4af30098235509604e451f5f5987b034fed14df9807c30e319ff0b1
 EBUILD netbeans-ide-9999_p20160923.ebuild 29849 SHA256 16e0491d916a1b5c263de2a39115b24321a8f354ff092096932c275cf278c0ef SHA512 686f1ec0f67b73a40d4656abf80fafa9ef7653cf19e2cf6b9d9bd3fc7d77f263b9a9c940d927cb36b6dffafa78f0cbc66af576f0d02a1e6db13dcc34162edd2b WHIRLPOOL 2ec2e5197333a2f552cd12c24ebb3c68030ca58434620824ef63a31405cadce83f014145598e7be86764d0ab2372df730167e886e39587dfa73d4d36d343356a
+EBUILD netbeans-ide-9999_p20160924.ebuild 29849 SHA256 59be043e33e4b2ec60fcf7c16e94b674aae50a6566a2599e9bf86c0c799aeb37 SHA512 bc71c487d82ce8af00f661665c9fef816c4a3f6e2983d639a258d871b8d943d9aaf68fbb816d2e491ffd8771da51c3585103f009ef333ea98af0e62107c12c33 WHIRLPOOL 89759856172356452607a32dd35245b92d0b91eae619d4da4a20da527e5d3a427d4dedb315761d3b626bdac0f50f1fb028fa3a6bba9ab9105d9d9cdbf2bf35b5
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160924.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160924.ebuild
new file mode 100644
index 0000000..7ee7858
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20160924.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-09-24_00-02-33/zip/netbeans-trunk-nightly-201609240002-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.4.1209.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.4.1209.jar && java-pkg_jar-from --into "${instdir}" jdbc-postgresql jdbc-postgresql.jar postgresql-9.4.1209.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 870cab2..6f48868 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -67,6 +67,7 @@ DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba2
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
+DIST netbeans-trunk-nightly-201609240002-src.zip 218005040 SHA256 9967b7b3ac0f93d01d11428ca5bd82d39fd38f96e1eba5acd6de7705e448d231 SHA512 9740be7fb9cae0e420bf30c7f3094ed3fb2da8e3c07ef7a3e5854eefc725eb49eaaf1e924fe6ca7ef84b4f0a625d663f36984cbd4741696f3142bcfd46f78a35 WHIRLPOOL 0df5b8f7f276422cf55c45a04ae4dd2dea291c8d16da9a093fea9f086735c2b953afca97e4b7b195be4d7ec51a204f7057c667e3af738b5eedb538fb3b64f27f
 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_p20160823.ebuild 15656 SHA256 ed0797c71be547652d0d57dc1b222c248f3b06977083ca94b2166d3f1c339c6e SHA512 31300865f3ecedb7c4291680de2a187f72eda4a254538e411f26e2535b83237f01e43a35a8cf8449946ee250f5d5dc7b8f1daf7bb5df4e2a8294816ce21b53d5 WHIRLPOOL 6aa802fb0f4db2e10e71f5e902b3c55d744f0c4340bee06470991cc425ba12fc0d90cef9c4d392ffb3bb9a3c9285fd965df975f7d2c81778e096e049cfbb0c23
@@ -96,4 +97,5 @@ EBUILD netbeans-java-9999_p20160920.ebuild 15656 SHA256 eb5eeba801ce75f3e4c8b65a
 EBUILD netbeans-java-9999_p20160921.ebuild 15656 SHA256 142511e71996d902af4597cd0020dfc79788c52bc4c67306098d79fce4bab8a1 SHA512 ccf7f1ba490d06e3bd82338e0fd2a92ec5cb702796e58fc0ae28839bebd1030afe2332e72fa043e321bb379144cd432e9e9bc2f8892be935a3a0337c62012ab9 WHIRLPOOL b06b67a24bcc7e97cd61cfa51d998678917ea8e69914e0c56adbb1b98cabf6ecfa95c73e8bc673a1513d3e90a212207409005534fde27fd45e57fa34c84f6044
 EBUILD netbeans-java-9999_p20160922.ebuild 15656 SHA256 47fcde1b320798b90abf6f888ca8e724e7ea0fff7f1ac8f55da90869cf450c07 SHA512 e8020e54a8c044b7e007314b46e965f3d881f5b4bcf557d2681739777e8529845d24127a448077d93b19c2c854a640650716232990552491e4f9b94543d22467 WHIRLPOOL 7d5bcf931aeba8c6b17796726b00f9c3963b9ce5b488be7b0bce0f0f320a1bbb48c078cdc1b3f96a5b1a242caa03e68bd0bde71262ca8e22ee05174e9b09d22e
 EBUILD netbeans-java-9999_p20160923.ebuild 15656 SHA256 34daae61c9ee4b64c5c7562abdcaa7ba1494a9741c03b338f4be8523f319266c SHA512 1ab5bf8f30f46c1582bee57060d9e95ba154d06c194f5dfa1695631269e97230d23c04f6743e918f0dbb0b7de344211aa9dd3ba34989b886a06b546ee65ef7f1 WHIRLPOOL d59ad85376486d4dbe22400506f4fb6a8bff16feed936e736ad5b0c99b23de6dbf6fa00634e44b8549e2f05f164900de19266553e1e6bd37073f7658d8cb9cea
+EBUILD netbeans-java-9999_p20160924.ebuild 15656 SHA256 3cc988699ac7f9196d1811242b2ac10197dd5ff416c070de2dd918d3c631d6a9 SHA512 c8c7533f4032f2ecd3c37af1815a26c33b9a5a1e0038a01e3c05feb1279a66d846290a16cc3a873e03b22583ed6976497e85d626592b75fd1b45f7064f0e2866 WHIRLPOOL 26adc368cbc21b69cdb036929a3e13cb4633668b5bf6932cf7136f41323701b298c6c83c1162937c5fc0887eb1eabbda75b124c509deacb2fb37e636643b66b4
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160924.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160924.ebuild
new file mode 100644
index 0000000..c1e6b05
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20160924.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-09-24_00-02-33/zip/netbeans-trunk-nightly-201609240002-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/5968566A351B28623DE4720B0ACB1E40338074D0-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}"/5968566A351B28623DE4720B0ACB1E40338074D0-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 09fb791..0181619 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba2
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
+DIST netbeans-trunk-nightly-201609240002-src.zip 218005040 SHA256 9967b7b3ac0f93d01d11428ca5bd82d39fd38f96e1eba5acd6de7705e448d231 SHA512 9740be7fb9cae0e420bf30c7f3094ed3fb2da8e3c07ef7a3e5854eefc725eb49eaaf1e924fe6ca7ef84b4f0a625d663f36984cbd4741696f3142bcfd46f78a35 WHIRLPOOL 0df5b8f7f276422cf55c45a04ae4dd2dea291c8d16da9a093fea9f086735c2b953afca97e4b7b195be4d7ec51a204f7057c667e3af738b5eedb538fb3b64f27f
 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_p20160823.ebuild 4971 SHA256 281682079c1b9cf2e4148db4315396933b8494cb9b4d3fc200d2f62fbebac700 SHA512 87712094b0318db35f4203f689190aba38c84d28c22df5808b0b9b545e155c0af5053b507325801b10bb9257fbfe449da65e77efa1e8df7fb24e422da7494de9 WHIRLPOOL 42a8164f4d202ae6f956f93b1cf74a4e6ebd00e86b5b50ecf13f086dbf8828cbebdf70dc48740a7837097a9308a110c3b009af1e82ed940e18b112c360d25776
@@ -62,4 +63,5 @@ EBUILD netbeans-javacard-9999_p20160920.ebuild 4971 SHA256 f942b0a7bd02a0aea4e89
 EBUILD netbeans-javacard-9999_p20160921.ebuild 4971 SHA256 21865902b7308019b2845fe76bb1b343913a0906d78f088b4385d3d554e075b2 SHA512 f4a9435803090501c346e2db625ef681ecd118c062927c81acc7a4f1e68b68a034fc2654ff490cdbb2e850100ce27bc447910a851e0a4fdd05e57f72ea35e886 WHIRLPOOL 9a88567d837160283db513c38588e3283c393c41358406afeb0aab4c7c88276ffad8a606115213a122b41afff7bfc8a13282c737d7c3c60e8aba27d2b81d08ab
 EBUILD netbeans-javacard-9999_p20160922.ebuild 4971 SHA256 4036468b046ac27f060a8b41e6aa686f061121a9a1fb525e6835d62682c3b6d1 SHA512 156ff632dc843a0cc81b0f3421c293bf0d27a50487f9fbfb15ee330869b09cdf162daec0b5fa2999e256ce4e3897cd320ea3dfd7003441d1a69a7b5daea315ef WHIRLPOOL bdd286b4e5a123926b53e5762047fe68a254508b559dc4085da61c2cbdeaeceea3ff2336c059a5103d56c782884b141775a43f247dcaa0b9bf142219009e9bea
 EBUILD netbeans-javacard-9999_p20160923.ebuild 4971 SHA256 b0426e6fa96ca0836b7993a87e43827af60202e84e9186de3f61980ce17c2166 SHA512 52910ddd3d8e8c15217cc418b2d4c8a07548628cc5c0277b52fecb8e9ca865d1e1b908d73f830264d684b64fc5065e93bcd9e03646fc8327910782e41b7acc29 WHIRLPOOL 18866a267a69c31aa45f750ca94f0d1eacadd46c1e2b07d67a59feabc51e073c4b3514747392b7461bb19b9c1ff10d41341bf55e66e5cc5a2975ee2edc8a3ef0
+EBUILD netbeans-javacard-9999_p20160924.ebuild 4971 SHA256 18a6e7c0a75430a929ee8305f382c7408f85ca8df8f0766796c37af3d65ac768 SHA512 21bd3a1cb7ad6f75263e7608ccc9339016d0bb4dee13ac09ad0055395f3df5448458d2c3bf938cee6174b89c1a542007bfdbfc846430b16d4b0e443250815a27 WHIRLPOOL 381777009f8fd0ebde9470899f035cd7864423143b42409591db638de3bd4c54c234269475fda89039da8e45d9ae79c84fa84c1a0e8fd061c60ce2243958cc0f
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160924.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160924.ebuild
new file mode 100644
index 0000000..49227bc
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160924.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-09-24_00-02-33/zip/netbeans-trunk-nightly-201609240002-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 ebaa27f..b8f292d 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba2
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
+DIST netbeans-trunk-nightly-201609240002-src.zip 218005040 SHA256 9967b7b3ac0f93d01d11428ca5bd82d39fd38f96e1eba5acd6de7705e448d231 SHA512 9740be7fb9cae0e420bf30c7f3094ed3fb2da8e3c07ef7a3e5854eefc725eb49eaaf1e924fe6ca7ef84b4f0a625d663f36984cbd4741696f3142bcfd46f78a35 WHIRLPOOL 0df5b8f7f276422cf55c45a04ae4dd2dea291c8d16da9a093fea9f086735c2b953afca97e4b7b195be4d7ec51a204f7057c667e3af738b5eedb538fb3b64f27f
 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_p20160823.ebuild 6293 SHA256 e0af01521fa0308e5b4e9626cdf50e052c66b39c8e9fef7a6ae82e7792bc9b8c SHA512 03d8133bd9f79f093c6e7552f58f8a954feba048830a3e66d2e7cd1b59700f6e6a155dd36d390a644c52974e3906bfc891339ddaf90fa1315790a7d48f32969a WHIRLPOOL 595e11edc37932665b54518e6258c7d9ecca3019f4950a7b63045be389092a36f0f9cc05945ef361fa3ba42105fc4f756b4401cfef54d1f5f7bbed73d6dc0116
@@ -61,4 +62,5 @@ EBUILD netbeans-javadoc-9999_p20160920.ebuild 6293 SHA256 8e8a74e20716e35510182e
 EBUILD netbeans-javadoc-9999_p20160921.ebuild 6293 SHA256 61d3c823f386ab5efa25a3213e2878d02a34ab2bf017a00355757f25c28ecb9d SHA512 45d02b81d4f303d4a0042a81a34ac4fde1ec9e898dc6a19d6d9bb2f1efbe22559a4913cf6eb34f22ae65c34a87ca985d8da208fa6097f939df13a138b886a074 WHIRLPOOL 610af3784a880a23a9e7d89c37f90aaeb590109ab3f4cace4ad7a194222e82beb8c10d59f9b2cf952a2756e8083ad59b6bd10acd1d402f5b04f5bb908dfca41b
 EBUILD netbeans-javadoc-9999_p20160922.ebuild 6293 SHA256 6fcf03a46bed23279cf1507b407e003bf1e1229e9864de276bd5052c2afd1f13 SHA512 e3ae3c7e394d2e3e3ac37f86e6fd8abf325eba9de51354ef98879d05f133194857c1629e06a176b8c531b01628ee4845b67a452e69372a2d4ea466226b172a57 WHIRLPOOL 7e2fe33e3100bd3b2a3528ddee7ffcf9767ece1c20f9aa25ed720e20589fb4c3999877f1d592ed69af81f4464be917b4f456f2fca63fe5df6ef4a9d05398043d
 EBUILD netbeans-javadoc-9999_p20160923.ebuild 6293 SHA256 8435fbd07c136f9d45d4c93ed7233ae3d7de8f73b9f688b21349f34c2d16eaad SHA512 5d1838c5c432850663b07dac0b233b130b35e39d8644bde04521c9ac7efb6f0b793e07430442e181fe780b81b796360b77eedac6413d3ff23498f16fdc0d26b7 WHIRLPOOL ba3fa57f5c884615727740103d02c4e8902d48a85980eea5860eda459200fe5d76d585ab01e286bf9c9128a9442895bfa602eab2119c27e6fc290b3c7f44c995
+EBUILD netbeans-javadoc-9999_p20160924.ebuild 6293 SHA256 f22a7a95af4ef9025105181f969461f1c9f8304dfa4a0c7dea2d39ff8c5a6ffb SHA512 aa600c62351b35e017055c0550418a24a66c9775163a05d074b3d56dfddb0ec64b9f26646219cffe33856d02b2d1b939eae7d073ccc385452df74c694535a2aa WHIRLPOOL 441ed4497a9ff83f7f6b69211608e4f036d08b64d75d84adce6dac6dc9969a624d2ad345ca50ba3d1ba15a85db5ca6246ccadbb13782796c06b1470bcd1efcbf
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160924.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160924.ebuild
new file mode 100644
index 0000000..c6fbf3e
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160924.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-09-24_00-02-33/zip/netbeans-trunk-nightly-201609240002-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 f2ee001..fac6a4e 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba2
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
+DIST netbeans-trunk-nightly-201609240002-src.zip 218005040 SHA256 9967b7b3ac0f93d01d11428ca5bd82d39fd38f96e1eba5acd6de7705e448d231 SHA512 9740be7fb9cae0e420bf30c7f3094ed3fb2da8e3c07ef7a3e5854eefc725eb49eaaf1e924fe6ca7ef84b4f0a625d663f36984cbd4741696f3142bcfd46f78a35 WHIRLPOOL 0df5b8f7f276422cf55c45a04ae4dd2dea291c8d16da9a093fea9f086735c2b953afca97e4b7b195be4d7ec51a204f7057c667e3af738b5eedb538fb3b64f27f
 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_p20160823.ebuild 4717 SHA256 fbde37b4307a53a4f762367cd36d9adb9f01ad87684cacff4e424f2483d0d74b SHA512 f4c908d71568ba543180320453b0069db2e2de53b96233384d510238bd0a68369262cbaaa303a76c6651d8989c85bf7bbc89bb79eb777f1f8cf62c7a72a1cb79 WHIRLPOOL 22b6af5b18b13568f9ab3ebd2c9ffe0cdfeabf6346b90d3f230f3b530ed4c75fa085a202a7dff70851511c47a32a6ad40418ad43dabd6b0bbcd3a4e772578012
@@ -67,4 +68,5 @@ EBUILD netbeans-javafx-9999_p20160920.ebuild 4717 SHA256 dc9fa4554706242615ca9f4
 EBUILD netbeans-javafx-9999_p20160921.ebuild 4717 SHA256 76680ecce25bbad915149b2979e7273d5d34d9e0205a2b4d64d3493e0d7ba7bb SHA512 37725e1749c144ad89916a3bee858df8ef1a162f232c40852b5af932d19f2589f6e8128bcd04860b1b17dc356e86a5decde75b64e0c64a66eaf7b20108f73343 WHIRLPOOL a97aa91d857683baadb676428f53c987d344accabe056fe6c625f12aefe60176af038d1438766f21890fa8c094d110196340e2b5156a740dc370d15591dd572c
 EBUILD netbeans-javafx-9999_p20160922.ebuild 4717 SHA256 654c5ea152120db6c9967e538d21531fef2db633c6a2b59458407694557de992 SHA512 49c8f2c996c9fcd0787f1e85dfa971d32e35bc259818dfd8b7da583f88d8951204affd8e15457d2271865712290f3bf01333049385db980a01dcdeca4a9d768b WHIRLPOOL aad3b34d197d6c479d8160517476964f8351e07205ec7e107fa44962663b786cd05d4ecaddff0c8816c860360366a0c16e27976b5f44240502ccfa96457a5c7c
 EBUILD netbeans-javafx-9999_p20160923.ebuild 4717 SHA256 d96535609c046ce32ecfd37f734bbbd51684cb4f5f5c169bc222ff332c0fa24a SHA512 3bc08040180a70797e8dbb93e481f290ba0989221c8f9a0564104c788b97cb4cc20e251df7690b8347b4d12062b6e888023e211761fe94ab8d106edc73058ff1 WHIRLPOOL 83ac51ce9bc9b3b955440f23d58cb4d534879887927e14440f14177fff88d8f19983d81cb1d4540375b7154d85ab0e06f3933a865919b5d239ef67cb377cce73
+EBUILD netbeans-javafx-9999_p20160924.ebuild 4717 SHA256 5ece17bdc2f52497d8824a3319b41308d9ea8f30ac4861581f7ea99369da9031 SHA512 b71f0813828f96687613368af86d5cf2a107350f102dfb4d6c4ee0717ab65f54cb35ae57451dabb0432808f1daf85d24a173fb295da52fbb6df066d4f4220e57 WHIRLPOOL 5fc0d4bf81e1bcad64f778ef65eb7a62262a6a1557f7652f650ce8a5208a8cd6dc9d6bfc47694ec4938b4bb376f7db95ac0b30d19dbf5424034d771bd2bfdfeb
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160924.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160924.ebuild
new file mode 100644
index 0000000..dcc22c0
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160924.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-09-24_00-02-33/zip/netbeans-trunk-nightly-201609240002-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 7f28a1b..ba73c1d 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba2
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
+DIST netbeans-trunk-nightly-201609240002-src.zip 218005040 SHA256 9967b7b3ac0f93d01d11428ca5bd82d39fd38f96e1eba5acd6de7705e448d231 SHA512 9740be7fb9cae0e420bf30c7f3094ed3fb2da8e3c07ef7a3e5854eefc725eb49eaaf1e924fe6ca7ef84b4f0a625d663f36984cbd4741696f3142bcfd46f78a35 WHIRLPOOL 0df5b8f7f276422cf55c45a04ae4dd2dea291c8d16da9a093fea9f086735c2b953afca97e4b7b195be4d7ec51a204f7057c667e3af738b5eedb538fb3b64f27f
 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_p20160823.ebuild 4412 SHA256 00be0b421d1120f27b29acef23b5633d8aafe28ee4ffd7ef50f1c4f17635c622 SHA512 7dcdc8cd3888f9ba3f62620b77bfa678d69dc2cffff76235ab9511574e8a98de6bb2303422a16905430a8c48b0499e8c51b23552d605d1fb8fab9b9d4d1d7366 WHIRLPOOL 06dfda10627ddfcc1af7ddfb273b13d9e89d5fe50fbd59a91a373739042a4b2e7d891e417689b50e6c15885a9be8c9d17dab99851e93e944d76d9102876b1ced
@@ -59,4 +60,5 @@ EBUILD netbeans-mobility-9999_p20160920.ebuild 4412 SHA256 3020a5b9fe9ddfee9f58a
 EBUILD netbeans-mobility-9999_p20160921.ebuild 4412 SHA256 90fbf38757830eac8f0bb29030e4302feff0d6c1937c0ae19135313ccd5ce692 SHA512 e5b69a0dbfc86f6970f0ae2e0d41c2d0108cbf7e8513e692dd11fd188b3ab4cea8cf57f0d54270bc4c988f007f6b099cebf5a68b0513f5a2cd08125847876d4b WHIRLPOOL c43a0acf87379ffe4ffbfda0cb97476518f692799ef0a1bc0a4bc7acbcddf15744949bdc6dbc7ad42d32eaacb3a01220b8894c4105cfb8568fb08c427d7c6491
 EBUILD netbeans-mobility-9999_p20160922.ebuild 4412 SHA256 d6bb5a34a3742abba1641d16db1564456e86fdc1f30e3f6a7438bba1f0212475 SHA512 2febe56aab2bda727d518107564cd63bebe5b168eb7ae0f1b38104ec4ce57dad069cb28ad79d64c2adcef66bdb51586e0065f3aaf644f544b65cb29633d54838 WHIRLPOOL fa200f54f108b114c29fb460046373f5bfe9efc3f09c47e6e4a6632c0b6b03498567baa5e8cda13c8f249fff5551f8c289cfd5c80103019ed87d1145a05a3675
 EBUILD netbeans-mobility-9999_p20160923.ebuild 4412 SHA256 ac5f7635522c1a2ef038c2da0c1dcb22a17ec77d3cd0a558219980a8de02c075 SHA512 b7786eb252b59edf1d003aee8a0cd19db338402413a7f08a2f0c389ea63ccdd4ecaed0d646897e64564f014fb5a410df535872272484e6a5051f0ca826741cdb WHIRLPOOL 6d56447c181386049dca27e1055b69f31045ba9edb73d05a7b37080a7545796a9a9b82fbc6764737203ba5c3e473c3e1f3b496ec84a17025efc57daaef23fe24
+EBUILD netbeans-mobility-9999_p20160924.ebuild 4412 SHA256 1d7eba398aa528fe1281a91dbcb28aef17b8e6b813ca6c92a3916fb81f897e6f SHA512 6a6b435c0d8344683797bab40a2585157090bbf9e3af566fefa9463b5757011a1cef4e918358a02d0b5aa8c45e4d689ec0ff16ff576111385a872cfef8e93cac WHIRLPOOL 3fb19a1229716cdc4ffca5bce6ee062321b1521f8831757cce267b4f213ac14d49907e8889244527b56b594ddc1f7a637255bb867c723f25744885862d9354cf
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160924.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160924.ebuild
new file mode 100644
index 0000000..161541c
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160924.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-09-24_00-02-33/zip/netbeans-trunk-nightly-201609240002-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 ad32597..a4283b1 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba2
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
+DIST netbeans-trunk-nightly-201609240002-src.zip 218005040 SHA256 9967b7b3ac0f93d01d11428ca5bd82d39fd38f96e1eba5acd6de7705e448d231 SHA512 9740be7fb9cae0e420bf30c7f3094ed3fb2da8e3c07ef7a3e5854eefc725eb49eaaf1e924fe6ca7ef84b4f0a625d663f36984cbd4741696f3142bcfd46f78a35 WHIRLPOOL 0df5b8f7f276422cf55c45a04ae4dd2dea291c8d16da9a093fea9f086735c2b953afca97e4b7b195be4d7ec51a204f7057c667e3af738b5eedb538fb3b64f27f
 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_p20160823.ebuild 4111 SHA256 3482f7df8c6865e62faf14dcce0ff6583c67bc0a43e070e27d574ecbc3045ffe SHA512 19e9d9db0dca38dbb7a8d63b8ebddecf5edcd93027480590e18357355a1ea69b13a41bbbc7162f99797a0cded7109b24c9d4894604cd3ccc8ebb19c18928bcd9 WHIRLPOOL 2bf848c7521e33c1d3401ca1eaabbd7a6a0a051e66f71ab0b4cf258d7c79369f6b12cba1f9858ee2ddb5b3edd3fb88044ce5a588be97f435a98c4ab44a5dfa23
@@ -62,4 +63,5 @@ EBUILD netbeans-nb-9999_p20160920.ebuild 4111 SHA256 60dd1c81f381320e4ded3b4847b
 EBUILD netbeans-nb-9999_p20160921.ebuild 4111 SHA256 561d42c61ddd8a944c49494594f16db3adcc75675fec213b1e3a0b0bbf178fed SHA512 e1ed23b200a6efdebb52e63418e51d1c17908beb4154831bc20a7945740a2e518d048d2ec639197ea3a12e20332f9efbaa500f15e4be48d2798456a8bf9d9e78 WHIRLPOOL c00aa9756cb4180c485ce81fd2718ee5fc877b9c4ffeef3f3d36fe5c8896dccf2461d19e5da07f010bc21e8f4134d7609c5c72925c28460d697f79a3170a8c04
 EBUILD netbeans-nb-9999_p20160922.ebuild 4111 SHA256 99f929e187c809bfdfb930a67cf32463eff7ee1f88d7d0264f751414d7368941 SHA512 17e167a50e9f9678bb3b89a6e252324dd3bc110747ed94e1d6167815aa40fe8f8c5cd39e40f226e89fe82420acc814d0d6049684cfef522b38fcdd49e23a3196 WHIRLPOOL 336ce82df999df3af21935ce281a0a4e354c988fefc834fd45a6457d841717d20797b3de1420e8c6336ddc27f04d535a12c0f77f27b4f38eaf6b28757486eede
 EBUILD netbeans-nb-9999_p20160923.ebuild 4111 SHA256 dc991bdc29dc3d8831ed431ef4d91fcab2176fc3b0eae78eb2342eb22c1afa9a SHA512 c445317f935b801fe5d901a17c4fff8440d6b74a729bec2bd96872722c40264adfc475bc1a8037f63d7518f9c8ef2e1655211ac84a82ae72f15745d3dceb747c WHIRLPOOL 42c81e4d225323697f59eedfcb45299db09bce3ade77a762dc391a59b22f56566f7ae0f0810eff4f8b76ae985e9be9fc3f27f6c8da2051f4b1e9d9bc87935da7
+EBUILD netbeans-nb-9999_p20160924.ebuild 4111 SHA256 d1e2a04c6bd365cc50021f1d586f0221e2ec774468404cf5c49678eb4e41e2d9 SHA512 a570a591c8d5bda1c078ac25ad560713cbabbbe63ce46944d290fef2d47f8e5058030e8490d3ebfaadaf941358230371875080885a93885390c579d4f58bb5a2 WHIRLPOOL 7fce0dcb7ae3eb8b3194573e743bea23b4a84861e5e547a68710550aa55739423bfcb84162479533b70feac4524247fd70b4f974ba1af006a09d878f07887818
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160924.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160924.ebuild
new file mode 100644
index 0000000..4026e1c
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20160924.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-09-24_00-02-33/zip/netbeans-trunk-nightly-201609240002-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 f1f29d7..b4769dc 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba2
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
+DIST netbeans-trunk-nightly-201609240002-src.zip 218005040 SHA256 9967b7b3ac0f93d01d11428ca5bd82d39fd38f96e1eba5acd6de7705e448d231 SHA512 9740be7fb9cae0e420bf30c7f3094ed3fb2da8e3c07ef7a3e5854eefc725eb49eaaf1e924fe6ca7ef84b4f0a625d663f36984cbd4741696f3142bcfd46f78a35 WHIRLPOOL 0df5b8f7f276422cf55c45a04ae4dd2dea291c8d16da9a093fea9f086735c2b953afca97e4b7b195be4d7ec51a204f7057c667e3af738b5eedb538fb3b64f27f
 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_p20160823.ebuild 4418 SHA256 70f82f30d50b637ad266eafb3fd3cbca37ac57b6ec7d90f9996657e973279fce SHA512 e3b6cc09999f23aa908871f5da2786b7607c5f4434c3b44b218a581b2219d059e958e74b55c730727330e57f58face4b4ce489932a92ca1b5957dd305108d79a WHIRLPOOL 71f2c57e1931456822264e8bda36cd2d84079db33e4cad08c8ee3dbdc679932823b6adb23966db6377d0510771c05e89485559c597667e29c1d8fa17e8ab9523
@@ -64,4 +65,5 @@ EBUILD netbeans-php-9999_p20160920.ebuild 4418 SHA256 158832e6eb864b252f9b66723a
 EBUILD netbeans-php-9999_p20160921.ebuild 4418 SHA256 12bd9e2e016096645258eecf0b540eae005058d3d860dd86db4c4a3dcdc872bf SHA512 02a7dfccc3a64ee0976230b55afa1dd9969d411646b843f569d593a6b3848ac77549359a269a7e8011c67d586839afbab58f3787974b5a58533ac3009dbfc8af WHIRLPOOL 4baca7f1020f388c471a2a074f3729534a531d47aee038d981b69500e0ef7b0f0048c2643d2796c811492ea58be13b4833e2cebb9ce9e20eb4a357d4d758b110
 EBUILD netbeans-php-9999_p20160922.ebuild 4418 SHA256 9b76fbee63f82bbf5e12809df5fc7e91fab65a409d8ecf759ccf1d1e73f818d9 SHA512 694d17097304d7df2981fc192d8a3f1831b9a694306ebba012100d6951173f2654a21dfb7167393543468d57991ccaf104f8943bc6ebab8f8b59f36904e1f0b4 WHIRLPOOL 910cdb5b7e5b9935165a1f7fa201bc2ef2cdf2727e506e52b6573e8fec3d98ad39a896981bfd73c6670afa5cc7701911116d18160f0f48546d669bc31e18c1a7
 EBUILD netbeans-php-9999_p20160923.ebuild 4418 SHA256 cf10d7940b3736dee724cb1232917e8c2f960f3937a0c99563db8797c22de5db SHA512 e144f88eb96b499267139291af9a4b50e37d9a80214b862fc55b54bb45b1406dfbcdd4d85034f7a0265e4fd0b4e1cc3fae6e26322bcf16413a50752a4526e170 WHIRLPOOL 55b067fe3e1daca16bf9b55c24d91ead1a5caad7501c9fb6689f64914a5b097765b5d8efc7c3f9e1049c6fe87671d68633f62d977e4527b87eeeffe71716c1f6
+EBUILD netbeans-php-9999_p20160924.ebuild 4418 SHA256 d480095ff309e7e11d0e825a89cc139cd899997f4296187c7cf5397f1ae52edf SHA512 17260f749633b1a8821339cb9e39053faeab60156eb0f046d741ea5e4b16e9cbdc0bd0638473678e44e87ecebe893da15e1b7fa79c6616f4718b4560ab68019c WHIRLPOOL 2b92b8ab5249869e685c713e9ddaefe15f0505411ab73d6a4c256cdd9fd2dedb5e7ab4eccb99a22cc6a2d7951563c40713da39ecaa8682f3c347f03e594bea1a
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160924.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160924.ebuild
new file mode 100644
index 0000000..3f47e23
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20160924.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-09-24_00-02-33/zip/netbeans-trunk-nightly-201609240002-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 97ce1a4..e057f24 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -56,6 +56,7 @@ DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba2
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
+DIST netbeans-trunk-nightly-201609240002-src.zip 218005040 SHA256 9967b7b3ac0f93d01d11428ca5bd82d39fd38f96e1eba5acd6de7705e448d231 SHA512 9740be7fb9cae0e420bf30c7f3094ed3fb2da8e3c07ef7a3e5854eefc725eb49eaaf1e924fe6ca7ef84b4f0a625d663f36984cbd4741696f3142bcfd46f78a35 WHIRLPOOL 0df5b8f7f276422cf55c45a04ae4dd2dea291c8d16da9a093fea9f086735c2b953afca97e4b7b195be4d7ec51a204f7057c667e3af738b5eedb538fb3b64f27f
 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_p20160823.ebuild 9520 SHA256 29da0a37ca6506374924bc718fa02888348ce3badb1559ac0ee95f1bd06b87dd SHA512 d127b384fc92d2970ff6577fc777319d690ca5dcbd243d5afe000da6b85aeaa86923afb64d86aee818040196e7d65a3a6063e0ffa758fd2db870b032102a00bb WHIRLPOOL a4e39c6835f96049c7e3cec9c0fe51128cba7d7be2df6e861a30bdbbaaed0b7e79e0a0dfa8abd37f88a2252da335e834e7a21fee9749fb09749fb8cc4163df6a
@@ -85,4 +86,5 @@ EBUILD netbeans-platform-9999_p20160920.ebuild 9520 SHA256 3920316f3bdba19211121
 EBUILD netbeans-platform-9999_p20160921.ebuild 9520 SHA256 6605bc3d321144d739c758b3f289cb0e0f09cd4bfdc15e18ff997499877d8b6c SHA512 88e79dcb8ec6f12ebb1ea326c0b340f349c9cc64eb3d46e6047b7c5165795f309da23741e9c96cd2fbea3ef77a8e14543a479c4e5a2f40079f252c331ffb245c WHIRLPOOL ca3ec959327aafa2418fc94ac5580717ccfafbbd96e694acdcac60ef429ac4fb9c106c0918bed786f0861757363bd92cd1cfda6e8e77fcde38ef8c77cc345f29
 EBUILD netbeans-platform-9999_p20160922.ebuild 9520 SHA256 be0d6e34acafb06fa50a32386907e85756c47a710f1ffa1c38518321cc0bc01d SHA512 e6a9861cabd381f9edb9cea48a01396248ce301d5b41c4f28ac7808fa2577eb68ac1b9b23540c45871d2d25feb8cb511c3983252480a8e1c4af127ba09286674 WHIRLPOOL 11f21c81a2c4d3232e48f0de32c115fe301dafa0658e99f7584a79fd51cd0712cbf8357f5ae7cc22338eba81339a54c5b31a3638b529ec82d3f938e4cbac0699
 EBUILD netbeans-platform-9999_p20160923.ebuild 9520 SHA256 ecf5afa681013f771772fc4707e0723ed93a3685567dd3135c506c127f826f47 SHA512 5e369337eda2ae02757dc5244117cde6809398dd0ef3bc167b74e7a6b11b37870f7d2b7c4bd80ba1bd673b3032492f847d1a888c5d471637bda3780de31c225c WHIRLPOOL 6ddb823d587da4fd78653935ae0a1cbb104026a7ce224631c87f0319fa265644ee79a52e40d009d7767818eea17cbecb7f6c679b6d6073da952f2e87e3719926
+EBUILD netbeans-platform-9999_p20160924.ebuild 9520 SHA256 c19e3622ecca069a0de8befb10bc591bf93dac984db3361394e17b144f82a864 SHA512 ead7fb0c1765deab7da74dacf847dd79f9e48a82a8bbe17914f9bfc048256a9e445a7c026c9df85f8e5db5f0b56c0b650ec9e04412716abaf43103c89acc0417 WHIRLPOOL 1830d244af280e302a325136262d4affda2ed4d043008529723390d680e56a13623a9c2f4d57b602fe9cbbe1993e5e28d1746533e308c0cdd126d62e06264c8c
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160924.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160924.ebuild
new file mode 100644
index 0000000..f85f4a6
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20160924.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-09-24_00-02-33/zip/netbeans-trunk-nightly-201609240002-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 f1fb53c..efe9d45 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba2
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
+DIST netbeans-trunk-nightly-201609240002-src.zip 218005040 SHA256 9967b7b3ac0f93d01d11428ca5bd82d39fd38f96e1eba5acd6de7705e448d231 SHA512 9740be7fb9cae0e420bf30c7f3094ed3fb2da8e3c07ef7a3e5854eefc725eb49eaaf1e924fe6ca7ef84b4f0a625d663f36984cbd4741696f3142bcfd46f78a35 WHIRLPOOL 0df5b8f7f276422cf55c45a04ae4dd2dea291c8d16da9a093fea9f086735c2b953afca97e4b7b195be4d7ec51a204f7057c667e3af738b5eedb538fb3b64f27f
 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_p20160823.ebuild 3472 SHA256 741ce1f42f33b75300465f4fd5e0d88bd7400b31fcccd308b005ce1fbe1bbe24 SHA512 ab606cf897e989e179fd11fe5d02e69f1f180aa00702ab1082521fdbfc88b8f9331cd8ce59ce8647a317b03591e72fc1b6603ffa0f2b23e716511f4a28ca473c WHIRLPOOL f0a6f115ce279b0aa19ed118a9576f747c6788520cd0095b1db221fe928b6f428edd743545431959db0f9178f832a58e461107aafbf287796574ec9c52f97c3d
@@ -59,4 +60,5 @@ EBUILD netbeans-profiler-9999_p20160920.ebuild 3472 SHA256 1d2c754743334e7c82cf7
 EBUILD netbeans-profiler-9999_p20160921.ebuild 3472 SHA256 bde0aefc575ff44cb2519f43bfdbb4f2dc69c675fd467cc6bc8ce93261ef56b7 SHA512 008920fc391f9ee5e70b21a95c14e1fb4be78eba476e1b32c39d9f63701a6a275521db997f49429d45b0b2958e3972d5285253af2c2e18ed3f9839d6065dc262 WHIRLPOOL e6f816d67923da46bef9da77fcbc0455d71f6d6b1bfd5060b824a06429ff36fab1720d40702d1eea315b3c34604490574669ab1873a4e676f3e173fe8b411de9
 EBUILD netbeans-profiler-9999_p20160922.ebuild 3472 SHA256 6cce91b426d46bd0d31d5eac3a099a8fc14dff8ebfce1d0859771e4bb75feada SHA512 9f63e050219813f09a7837f38918dc3c2b9fbd4f178afef7cc71e957996677bdb60c6afa0a8b48c0bd56438f268abfaf5e57e80db5cea32ba3216777614e32a5 WHIRLPOOL 5da3f46caaa380cd232225b93fffee13325c655feed579ebed0dfb636fbfcf58dadfc8ee34327303a9e6270616655d88f93302feb4e2da60e30b4d29eab43577
 EBUILD netbeans-profiler-9999_p20160923.ebuild 3472 SHA256 1af09909286a1d7374ff45ba29acf16cb6c98a7f7c2ab83d3b4fe2b962ee62e0 SHA512 87bdca97b9de975e61cad98b70fee591607fae30a7658f3e5234e720ec8c1266f585444adbf9ff0ef72e277815964f5f2c55fd4b5b46848a28b6730ee40e14c7 WHIRLPOOL cfbf422c548bda79880831979be15554344448d74878366112969210063932a9e622d265b574893dfa6b55371cd24593500f68e11f4e7563813059eb2f56654c
+EBUILD netbeans-profiler-9999_p20160924.ebuild 3472 SHA256 006e19f059e3376b3e98ba1bfd2dcdf21ef2f66a1c61abe727dfdfb25f6f99dd SHA512 c6e26d329d626e98b870e24d50038260ba7912dca2b60bd10f8ba7a1cf9a628cdac0bc83ed088341c4e82a387b4c77ce1338f1165aea2b2a6689ee1581f9c3b9 WHIRLPOOL 32116531c8b74dbfbf4828b2198d1b7f40785b6486354cc620851c0753325150e73f5347554969193ecdb2e3d4351e74a27ca4894e8b8aff49c91040ff162fc8
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160924.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160924.ebuild
new file mode 100644
index 0000000..a4ea525
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160924.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-09-24_00-02-33/zip/netbeans-trunk-nightly-201609240002-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 3a13f18..7d33d17 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -49,6 +49,7 @@ DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba2
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
+DIST netbeans-trunk-nightly-201609240002-src.zip 218005040 SHA256 9967b7b3ac0f93d01d11428ca5bd82d39fd38f96e1eba5acd6de7705e448d231 SHA512 9740be7fb9cae0e420bf30c7f3094ed3fb2da8e3c07ef7a3e5854eefc725eb49eaaf1e924fe6ca7ef84b4f0a625d663f36984cbd4741696f3142bcfd46f78a35 WHIRLPOOL 0df5b8f7f276422cf55c45a04ae4dd2dea291c8d16da9a093fea9f086735c2b953afca97e4b7b195be4d7ec51a204f7057c667e3af738b5eedb538fb3b64f27f
 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_p20160823.ebuild 6242 SHA256 de2120eee0f25deb37914c13b742e15215c6a4f696964b7eee3a6783f6227cda SHA512 4cb8d916f65e867de4ef5ebef8056895325ff5744dab638f45e44ba2258afc9fcd1f09a02cadb08a286a540fd562e8fa904a0fdd34daa9f246834459d599939e WHIRLPOOL 2327de2677695ea739be8c206535e0990298f003d52248b6676677751d1105b93a9b98e5b1e0f36088a1fd1f397fdbb3191a678b9fb752cc008217dae372872d
@@ -78,4 +79,5 @@ EBUILD netbeans-webcommon-9999_p20160920.ebuild 6242 SHA256 2d6623d7c15892c091ad
 EBUILD netbeans-webcommon-9999_p20160921.ebuild 6242 SHA256 0815d845808d3cd44f3ea2202e1ad2ad8dee295b1f2123aa6a95dff43687143f SHA512 291968838fc281e380eaede34d83d4eb058299ab6c0a3bbacba422091bf342dfa3ca3d84e8e08cb57db05700340653b92d64d20b037534b8a2a13066bbc5c53c WHIRLPOOL 1f15a6bb34d01c0c371a5bd736ba26105cd42a38e7130e3b16ad56cc9c4a712b777d209d09efd70b556fd479a137c818ebf35999f4c30b9dc7de1eccf9e897ed
 EBUILD netbeans-webcommon-9999_p20160922.ebuild 6242 SHA256 174b69168a6521f7bed7fdd3b3ae230cda80181702b5f5e97bdad987f3c35cd7 SHA512 f6681373874cb29bb55aba015bdf7fced80b42eae763b6b09fff6d7a58c4c194738d2fda7972dfa7977e00a9fb26a5f0809382744d68d75e091589593e16c3dc WHIRLPOOL e741de5c8bec5e6303c22894fb330251d91928427bfc9ee74fc10f180f4df4849f60a1b4925fd722828633858f857f8b257e2b138236b0cd7a20e303a7e86fc1
 EBUILD netbeans-webcommon-9999_p20160923.ebuild 6242 SHA256 2daf97814023159c8962cb4242526865c00dd3ced60050d46a874063031f4058 SHA512 341f6b769376bab304eeb60254b1d31855a615ed147dc9ed3f9752404ddfa5129903f41ce775ac365e6a0346a0718dc0afaf7be984568d34ac09c5381466c273 WHIRLPOOL fc74c52e49e2fb8d7c391e5618dc179498f243b694a82851bc6f04a0bd152a6770b86a419af5bafd3ef6d4fd0a71052f9afa7934ac01a392c794868d5a5154d7
+EBUILD netbeans-webcommon-9999_p20160924.ebuild 6242 SHA256 4dc62d25436f2c11ac5810a2a481a4f370c4dbd2585444513be067a483417700 SHA512 48c631128b58dd965c0db56e1acd8deb33f6b2d1cabe6fbb4b840908d6ab5a17ea14ab13b1532df91c93c954d876e2d2e8099ec8aba8c7f38f8daee5a9463923 WHIRLPOOL 505bf4aeba5a3911278ea3674b369d89bae25429746530b93f263e86503eb8dce5f7a14053c6a43da96a79180b92abac141a55657f8bf0cee631455f911e2d47
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160924.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160924.ebuild
new file mode 100644
index 0000000..684cdcc
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160924.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-09-24_00-02-33/zip/netbeans-trunk-nightly-201609240002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/7CA13589F586F659BB0E1561719A91CA47BF1897-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}"/7CA13589F586F659BB0E1561719A91CA47BF1897-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 96ff010..195eebe 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba2
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
+DIST netbeans-trunk-nightly-201609240002-src.zip 218005040 SHA256 9967b7b3ac0f93d01d11428ca5bd82d39fd38f96e1eba5acd6de7705e448d231 SHA512 9740be7fb9cae0e420bf30c7f3094ed3fb2da8e3c07ef7a3e5854eefc725eb49eaaf1e924fe6ca7ef84b4f0a625d663f36984cbd4741696f3142bcfd46f78a35 WHIRLPOOL 0df5b8f7f276422cf55c45a04ae4dd2dea291c8d16da9a093fea9f086735c2b953afca97e4b7b195be4d7ec51a204f7057c667e3af738b5eedb538fb3b64f27f
 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_p20160823.ebuild 2721 SHA256 20702ac8814079ae74788cb5b29630008117778a60f82969f70386a52f2c05d2 SHA512 156dac5e5a0582b1583bca7484249bc18aeddfdd25ead5db86c05bb67b52e2067144f264e813946875a114779403cc7fc6842ad54a9050ff8532c1dcf0dd7e14 WHIRLPOOL faa336a56c48d7fd27881c3dccc7ae7b8b9e74092f45fe2ebac8278aa15ecd1d29abf7afcb63d94c141e9709cebeba6a3e9f44227482b47a2f2a6d34254c0d7c
@@ -59,4 +60,5 @@ EBUILD netbeans-websvccommon-9999_p20160920.ebuild 2721 SHA256 e5ae98c4f2c8d36da
 EBUILD netbeans-websvccommon-9999_p20160921.ebuild 2721 SHA256 d6944a0e2c6617607193f5ddcda829c1ba6cd224ef775294fbf66299fd0fb614 SHA512 d49a533db74c1d2fecbcab357d58bdb6f1bd949d275be21bc0f3f22cddb35e6f9577c6fc7ac2a4ff4db9206a660074b52a2a10d81d9044c8da6ca8538ff0bb7f WHIRLPOOL 07482a937e0858ae5d779746fa2d4905b3b9d75c0ac3013ef0642b684590f24b4fe4ffb70cb1798fc4d0d16a3a08ebdeeb423d8797cf5b139e9a1cf9d57464d1
 EBUILD netbeans-websvccommon-9999_p20160922.ebuild 2721 SHA256 5b0ba48b0a4a9ed47c94eb5baa1192cb279c62603fedb3043be5d0d7edc79724 SHA512 9d04740d9cf0eb1c6fa08077e40667017f00769eece4c121e5fc620ecde22f22fea185c76270e5c001e12f8a3a8a525de185a37cc2b0fa791180c82f59a563c0 WHIRLPOOL 5f642a21c364b3aeaad9977ce698be4a40e7ee5c63877b273df5e15f92ffee41af3c5d7cd46ca995e9b2df3fad457549ddcd7d3ef74e175ee86391ba1e497b66
 EBUILD netbeans-websvccommon-9999_p20160923.ebuild 2721 SHA256 9aa15b94dc4a03eede4d6c37fb92ea1945412eaab45d48ec9187b2087690f939 SHA512 b1ad8c4235e829273dee53fc4871947aa9853b4b17fc9c91e2e5fdeb31f6005a9159263ee3d2b710ca465b729e7cc0dcdefe505f23175590b63e6adb099fa750 WHIRLPOOL b467f3d062109c70962490cc3b19080a1b393c9c02cfcb49402a74985d74bfab8503ec9414a7cfceac7584fdf0a767601a1da1ac78a7ed29d45993de44ac20e7
+EBUILD netbeans-websvccommon-9999_p20160924.ebuild 2721 SHA256 8d66ca60b597df4bbb5a874c707becd218f903962d373bfa7c4700365c24fec9 SHA512 aa08b93fb4b88a7033e2b4257bfe9a87c0c3ab131e7c81a75d1193b9afab751931c2c760e573473417623bbb7c31677e49bdf02b05d61c800b0069aac0e331f3 WHIRLPOOL 6e296009176126ad01303903b45c5d4e41eb92e638554c0a6bb9a18165a18ddd63a6b93007a2f0537c31eb16192f8c72240a6debad73e0f19a7e0be19fdd1dd7
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160924.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160924.ebuild
new file mode 100644
index 0000000..33f0c28
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160924.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-09-24_00-02-33/zip/netbeans-trunk-nightly-201609240002-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 7d33587..1a4f8e7 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba2
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
+DIST netbeans-trunk-nightly-201609240002-src.zip 218005040 SHA256 9967b7b3ac0f93d01d11428ca5bd82d39fd38f96e1eba5acd6de7705e448d231 SHA512 9740be7fb9cae0e420bf30c7f3094ed3fb2da8e3c07ef7a3e5854eefc725eb49eaaf1e924fe6ca7ef84b4f0a625d663f36984cbd4741696f3142bcfd46f78a35 WHIRLPOOL 0df5b8f7f276422cf55c45a04ae4dd2dea291c8d16da9a093fea9f086735c2b953afca97e4b7b195be4d7ec51a204f7057c667e3af738b5eedb538fb3b64f27f
 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_p20160823.ebuild 6939 SHA256 11795cf190402e43ca2cbd9ac9eddfe3ae67eea2b11ece465e7015f436994f81 SHA512 da82efd102cc54e55891840a67c086c9ba609db99d9dfdafce77b463a279e5453743eea4b604c057323a46ccb702192af6403c694c5c7d3dafbae2721fddb3c3 WHIRLPOOL c204fdeaa0a3d02e7b221f9a58ba563cde2e656c2ef6500c86a1412a570c1c6d8fa9114bd08586d85809456dd4f0d4925b948f4d0a247b00fc52bfae9f880ad1
@@ -62,4 +63,5 @@ EBUILD netbeans-9999_p20160920.ebuild 6939 SHA256 56c017c40bedb1f60809d6c5e5357c
 EBUILD netbeans-9999_p20160921.ebuild 6939 SHA256 ad1bf1c8a99452d8ec1e6e872a8a91b4cccc97a56ea6c4dd7c38a30b9815a7f4 SHA512 aea5283c6f064ea27a951214af716d3ef0ea4feb96ed2e529e740fd928d8f283a3233bdc7639de609018b214c5e1b9eed0b95e3091b493e3fd2e2317faa33a67 WHIRLPOOL 6082ab9fdd09c73340355c63add6d289c7f90e7ad7109a3253e2dc948b1ec5cd4a352d2682c15e752340945012d6f9c7df234eaa5f2bf49e84ef8000062c8b8c
 EBUILD netbeans-9999_p20160922.ebuild 6939 SHA256 ad2069cbb9ad4658cb4ef8fee5fa97a3d28a6eb3bad2609478c1c5465a0aa487 SHA512 541897fc7bb4c1c60701244492efaec3457be8734025bf2d72b45f1b89abb297c7ea5ac250e2080fcf48a0b97adaa95e29151a773e8dd40abcc00ec23064fb90 WHIRLPOOL 1f3212fea8f99255ec7eb30b3655a4f7cbb5274db925b7f795e57eebab137dc1d158030fe7ee1f305ed9cdcf5e6b10e51d15e6abaf1a129d565c48af289b3a2a
 EBUILD netbeans-9999_p20160923.ebuild 6939 SHA256 cf51769ce98e2975c55bdb0b88ffdff00aa51dfff31517b50485fd466c8b8b22 SHA512 cbb7c6cad642b72a6b149d3b5df317d0221beccee3e7d98903bde5aeb533d1bc63f2d79fe203758fb78fdc52281c77860e63b2cd7f094a98416ef139ee9dc71d WHIRLPOOL ee1d0d88e2160ed33f9f32200caf3553e4c97f8c258aede1eb943553a8d5ad4aebfe0edb51f6db3b9915ff364c522a3f8d604a8a7c97e3de5a87bec699cac66f
+EBUILD netbeans-9999_p20160924.ebuild 6939 SHA256 c4f4120ca5fe8e9ac2029940b6b863b48d183841431398a69482b1362165cda9 SHA512 bf0256177fe35d99bfc26fb6342cb737677bc38f128a32bd3a4f6ec0a1835438bcc449d4953d3c85a2ed9f7d7527805c424a51f441754424c13e44372c5d8358 WHIRLPOOL 35c78a0853827213128f6b33602e5069f3e068fd8a45654d79b74247faa573bdd7b28c21548c7d109a9d325960021350a6ba57446d26ec866cab969c5a196c63
 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834

diff --git a/dev-util/netbeans/netbeans-9999_p20160924.ebuild b/dev-util/netbeans/netbeans-9999_p20160924.ebuild
new file mode 100644
index 0000000..3b318a5
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20160924.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-09-24_00-02-33/zip/netbeans-trunk-nightly-201609240002-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] 2+ messages in thread

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

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-21  8:45 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-platform/, dev-java/netbeans-javafx/, Miroslav Šulc
  -- strict thread matches above, loose matches on Subject: below --
2016-09-24  9:07 Miroslav Šulc

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