public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-apisupport/, dev-java/netbeans-profiler/, ...
@ 2015-01-20  9:13 Miroslav Šulc
  0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2015-01-20  9:13 UTC (permalink / raw
  To: gentoo-commits

commit:     2bc22a9ee497b5eaa55d0feaac818820c0bdc994
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 20 09:13:22 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Jan 20 09:13:22 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/fordfrog.git;a=commit;h=2bc22a9e

netbeans: bumped to the latest sources

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

diff --git a/dev-java/netbeans-apisupport/ChangeLog b/dev-java/netbeans-apisupport/ChangeLog
index 33b1e8a..3638c0a 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_p20150120 (20 Jan 2015)
+
+  20 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-apisupport-9999_p20150120.ebuild:
+  bumped to the latest sources
+
 *netbeans-apisupport-9999_p20150119 (19 Jan 2015)
 
   19 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 7dd4b2f..731d11b 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6
 DIST netbeans-trunk-nightly-201501160001-src.zip 201394511 SHA256 0a5e6e98692bceabdacc7ef41fe2b7fb59d9c879453982b2dc0e79d28f077714 SHA512 2a5be09537b1735e712ec373cc7f41b1e8b7753be5026ec3a1562d7347f4d5addf58bb9ea052051e0df2113e18a366e4095f84432dffb4b75b86b9ca913d3d56 WHIRLPOOL 7a8d35dcba4754cb809b8ac8710cbba8ba5452c4c4e13963a40e032b13241aa9b44328f3bbeea681bf535a31980e766331acaf5ae265bda5dd5790bda872d8dc
 DIST netbeans-trunk-nightly-201501180001-src.zip 201391445 SHA256 b1bf4373e5b799f830894b4ea7ab878ef09c64059758cebb2fa1b1a244718965 SHA512 bf1a40344c915a754f3b7baed759b6513e6a055bface5fe6c30c4e0adeb76fe7d2aaac5d344553ee5df505131cb05c7e2219c67514d4a962f681f9a39c685166 WHIRLPOOL f33d7bfe0174c7de81986a44578df8322fa8f2b46911e9f6fc05ffe8f0839e70b691d62ef9b6dc1b248aceb68760330ef69e86f026a83b6c0f27bcee3a4bc07b
 DIST netbeans-trunk-nightly-201501190001-src.zip 201391445 SHA256 ce4ec7706f80732c5c6d5764fb4cb0f2f82341d668e2680ed4d12c382e8541de SHA512 232c8beecd613bafca37af997c3aae0f35caa28a3a3f381553bc3264916f606540bcb5186c8a2a52ca21ce177ed413d6907865b4b42b80c102e7c636df736628 WHIRLPOOL 2176f82b120a7f9360f3b01cb970a8fcc5078e97da90ae0e870b37a53998beca6306b5f58bf9af3a15dc403f1dbb888457a56b0657a2f972b8e01ebe1b725abe
+DIST netbeans-trunk-nightly-201501200001-src.zip 201396862 SHA256 1a9378d8f52c4f617653d096aff287cf62212af8a6f878fe54cc468e4dd4bed7 SHA512 92fd39cda2d11816b9a01e0e5c26b3f527354a69efdc940cb27d5b17ee6493a07225d2698260db2bdc220e01d166ac42b5fb62f809d1e2eb84419c6e6abb3e14 WHIRLPOOL c3ba7155b5d376041d750c42f1ff8f8dec5bdbfedb470dea483a665978ef3982f087cb7a521f7892c264bb38d0876e4e7a08346ae4579338ba698ae7ee4ba456
 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
@@ -70,5 +71,6 @@ EBUILD netbeans-apisupport-9999_p20150115.ebuild 3390 SHA256 4011ee695fc0a3e2c8b
 EBUILD netbeans-apisupport-9999_p20150116.ebuild 3390 SHA256 1a2de3ae48856cb1273f42076fcd475500c596557cfd291d3d245be3d9bc2784 SHA512 59eb275e8de0a41dffa5a1009e5cbee80f4e8286a654a54427841c10bb7b336e979a896c6ae03aa32bca05086b5dbab2a38dfdc853342e5e4ce62b33cbb8df46 WHIRLPOOL 54932975567f37d6cea466a3615499831d3d35b55547b0e30f1f3483f47b61a040b4f03805e8f9bdb8794bca56e74c07e385314c826adabfefb872464b7a1a67
 EBUILD netbeans-apisupport-9999_p20150118.ebuild 3390 SHA256 7113ea05991ec5fe4dcb311cb36ca9d5497806196ae43ce8a91d37f5db425087 SHA512 c87051ced9f1d444662a841929a92d6b4b947bde34493b948c7fdec9251127a79b274e17a6a9475e452f7611a210d2239ed04ad2b9648e534e3f8c202463dc90 WHIRLPOOL dda7b95aaaf871ad2f50ff1ab7e352be49c2867c41a732da2e48d9313d8038480c8e779e891dfece6c62098ca6bc86aa31144381312ee1861469337f9b4eb339
 EBUILD netbeans-apisupport-9999_p20150119.ebuild 3390 SHA256 c98effa1386e5ddcbe6cece4abbbd638d63274c6a59146d52821a2dbb5fe2c65 SHA512 9376a043702132d0add3f44c700e3296898032adf2c9b9c5f9fb41429d32f9968c1d9f19b0b4544ed09f4184e8d9514d7e53afa93041b6af077f402173f2661f WHIRLPOOL 9c0ab2912ca95a5263cd046a4c4320ad875430c9604982271158d95efdfff0051807717f443685373a64400817ffa978e7ad1f57f3fdbe63b56c9b58ab5cfdf7
-MISC ChangeLog 154383 SHA256 c2370018ca3277431563cdf8528b6a836bddac07fd91b6c91430e3bcce7e9608 SHA512 2d2a24f987cdba661cfdac31856355b1f2620abe5134292200b49d3b10a47b76b68cdb6767f138c2aea2349de355d436f154a8b2ad9d63c569b27730ff6148c4 WHIRLPOOL 2da0cc6afb0e3d2a53eaa12394db7b21a593fe150e56ce7f87bdcae2343cbfd654877edd5faf5f5413488a8b0b377f3779b9877dba7f23c68acdd8b28946777c
+EBUILD netbeans-apisupport-9999_p20150120.ebuild 3390 SHA256 bf1fab0ecdaa7f6aa37cf41366d44233da2ae492eb1016ed8aa17312a2d6fbe7 SHA512 0121916113a461c4acffe166c0555fb1620ae4f343e5ecb80524b4377e110a5344f528ce6db081fac0fc3938b516704b6c352b6abaf5b8d6608597fd737d0ebd WHIRLPOOL 15ffa2ae2b8bff82cfc99749343214e4af4a3855ee6499de1c7f6562fe473d2eab8a8dafa1335f3838a6f66125e2fe4df196de4749298bac81c2ed93ed738260
+MISC ChangeLog 154564 SHA256 e73e2dafc4dd5dacfb09c108dfd3e7b562d5b6125f156b64aa4ca13950bcb073 SHA512 8fd66d196111b2e8fa70c20e32ecffd33a2d7e2597e6ca42d12817e22ca53c9f028664aebf28224b26f662fad5aad6a45c095eed85f1558351ce012e5244c95f WHIRLPOOL 3a5490c2c2935e3534a77194cd38b222e06c01c93b6b94c248560e721f2043a07cd2b1c40bab6e92f5786d3385058f7011b6ec16b37b2ccb4499b801ebf8b914
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150120.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150120.ebuild
new file mode 100644
index 0000000..d0be2ca
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150120.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-01-20_00-01-55/zip/netbeans-trunk-nightly-201501200001-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 151afda..bbdac3a 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_p20150120 (20 Jan 2015)
+
+  20 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-cnd-9999_p20150120.ebuild:
+  bumped to the latest sources
+
 *netbeans-cnd-9999_p20150119 (19 Jan 2015)
 
   19 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index 5c60d15..067b7bf 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -51,6 +51,7 @@ DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6
 DIST netbeans-trunk-nightly-201501160001-src.zip 201394511 SHA256 0a5e6e98692bceabdacc7ef41fe2b7fb59d9c879453982b2dc0e79d28f077714 SHA512 2a5be09537b1735e712ec373cc7f41b1e8b7753be5026ec3a1562d7347f4d5addf58bb9ea052051e0df2113e18a366e4095f84432dffb4b75b86b9ca913d3d56 WHIRLPOOL 7a8d35dcba4754cb809b8ac8710cbba8ba5452c4c4e13963a40e032b13241aa9b44328f3bbeea681bf535a31980e766331acaf5ae265bda5dd5790bda872d8dc
 DIST netbeans-trunk-nightly-201501180001-src.zip 201391445 SHA256 b1bf4373e5b799f830894b4ea7ab878ef09c64059758cebb2fa1b1a244718965 SHA512 bf1a40344c915a754f3b7baed759b6513e6a055bface5fe6c30c4e0adeb76fe7d2aaac5d344553ee5df505131cb05c7e2219c67514d4a962f681f9a39c685166 WHIRLPOOL f33d7bfe0174c7de81986a44578df8322fa8f2b46911e9f6fc05ffe8f0839e70b691d62ef9b6dc1b248aceb68760330ef69e86f026a83b6c0f27bcee3a4bc07b
 DIST netbeans-trunk-nightly-201501190001-src.zip 201391445 SHA256 ce4ec7706f80732c5c6d5764fb4cb0f2f82341d668e2680ed4d12c382e8541de SHA512 232c8beecd613bafca37af997c3aae0f35caa28a3a3f381553bc3264916f606540bcb5186c8a2a52ca21ce177ed413d6907865b4b42b80c102e7c636df736628 WHIRLPOOL 2176f82b120a7f9360f3b01cb970a8fcc5078e97da90ae0e870b37a53998beca6306b5f58bf9af3a15dc403f1dbb888457a56b0657a2f972b8e01ebe1b725abe
+DIST netbeans-trunk-nightly-201501200001-src.zip 201396862 SHA256 1a9378d8f52c4f617653d096aff287cf62212af8a6f878fe54cc468e4dd4bed7 SHA512 92fd39cda2d11816b9a01e0e5c26b3f527354a69efdc940cb27d5b17ee6493a07225d2698260db2bdc220e01d166ac42b5fb62f809d1e2eb84419c6e6abb3e14 WHIRLPOOL c3ba7155b5d376041d750c42f1ff8f8dec5bdbfedb470dea483a665978ef3982f087cb7a521f7892c264bb38d0876e4e7a08346ae4579338ba698ae7ee4ba456
 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
@@ -83,5 +84,6 @@ EBUILD netbeans-cnd-9999_p20150115.ebuild 4586 SHA256 7775eb74c5741163677258dc21
 EBUILD netbeans-cnd-9999_p20150116.ebuild 4586 SHA256 52c6e544f6ef9b824d7af8324a7f004fb6937db9436db19b52a00b44f8e27428 SHA512 8a365612bf2e4c4c5d4330fdd5b82ae1b3c1fe5939e879c768aebe2b67e76466521857e616a13d0fcc033a0c0d375bc2b4b2e40dc2fcf3c808da4dc3fd34e782 WHIRLPOOL b62c55002855a2ab67ad373e05ad9911777b18a856e2971f49d5df55f647f6d4c5ee81c824a97169ab5ea5d1ea60cd9cf3d53ba2abea2ca48ddd8fc325f01d8e
 EBUILD netbeans-cnd-9999_p20150118.ebuild 4586 SHA256 6882fa70cbed44b940a4a2761d81b16583f0b24761c7d477ea080fc84d909a2f SHA512 ba2120913d14b0bf4c7bb4ffa249d1a1e2c1ac870234480be3d046838592367ad34cf12e81d4816ce02f39408233baea0e76e8b1958821a48805c7bb048c19b6 WHIRLPOOL 3020977a6d6bd9378bf99c6254cede2b525191b7afd66c79dd2c4708dd93bc339b17956d494af9d7da163e4fc4b223d45e1c1de8a70ff5a3791b5769a29d7173
 EBUILD netbeans-cnd-9999_p20150119.ebuild 4586 SHA256 a6ee0cc4194be234a9c16e55cdc81f307dd09ab1e05eeb8e85a89781f0278315 SHA512 c5d8f452769c800664c271fa35024146a3944f1d52e78d944d5664269d06e9144e75d39d82108ae9f6138c0b2805ab1f82d42c8dbff5ac176156094b2bf7e2ec WHIRLPOOL 3458a69746a9f84dbccdcfca1d0b13409e10723c6352ad7c546e66fbd9cf140bc08a808243173b12ab9407ca8db2e253b1fe991489a57f69cbe369fb64bad0ae
-MISC ChangeLog 141019 SHA256 d3cf97ff7df4c5a832de15a89532e9fc0e4b4f15d5be7029e6efd914b0031101 SHA512 6ac73938bf00b57dbc8f4306e1e33992ce9c5dbb2e8ac46762210ea11ccdb938a1b9cbef867774801ae99dcc4a4d56de2a7c2c9a2691b1ba51743a170e877544 WHIRLPOOL 388f16bb223a700b4818c700d891109103b86a07cf3b3fcf0b90c498930e8e49430d045fbf321e2ce1af194da4a7c28b7313ddd983e231795663966a5172b6c0
+EBUILD netbeans-cnd-9999_p20150120.ebuild 4586 SHA256 25666db555276180d7046d3912f39ba37e4e6696aef46d1a893494a9b72694bd SHA512 e6c36f9f01149dc04bf67c0cc0aaba96cd96d5951ffc697b81d3833044ade2f976f4caebd564e8222576fe866889a7ece3de7e1b3b43014a35a84bfdbcdc47d1 WHIRLPOOL 38ef873c22ce786396aeca127283bcec5ce57c1a8770bd13bbc96efd0a1bae027b774a754d0b42eca52f3da227a74e1391696dfb6c830f797ed57f40f5e103d3
+MISC ChangeLog 141186 SHA256 0792fd78429e9b07b221e3eea16ae65a2059770eb96cedb10e768ee3274f759a SHA512 b421d5ce2023c5749ca29d1f48890a91d0133e00203855b247efe946b3a9f6c5192de20bfa7ef786a9f300908e60975f66d840f76d136fce3c3ab5eaef64e223 WHIRLPOOL 1b19388b1a96e76fb94a0f239f7ca3e54be459ecaf087e46cfd1b3df0d119bb9b8f348ce5a910fe8da22558719ccba7a213fdfd670693ef32176b11f8dd16d1c
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150120.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150120.ebuild
new file mode 100644
index 0000000..b900652
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150120.ebuild
@@ -0,0 +1,125 @@
+# 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-01-20_00-01-55/zip/netbeans-trunk-nightly-201501200001-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/24C58A1D3C410AD3E23CD828871630C17068B238-cnd-build-trace-1.0.zip
+	http://hg.netbeans.org/binaries/2BCF2047382FB68A2F275677745C80E79B4046AB-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}"/24C58A1D3C410AD3E23CD828871630C17068B238-cnd-build-trace-1.0.zip cnd.discovery/external/cnd-build-trace-1.0.zip || die
+	ln -s "${DISTDIR}"/2BCF2047382FB68A2F275677745C80E79B4046AB-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 3238b04..8fb75df 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_p20150120 (20 Jan 2015)
+
+  20 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-dlight-9999_p20150120.ebuild:
+  bumped to the latest sources
+
 *netbeans-dlight-9999_p20150119 (19 Jan 2015)
 
   19 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 2ef3cfe..5921908 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -44,6 +44,7 @@ DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6
 DIST netbeans-trunk-nightly-201501160001-src.zip 201394511 SHA256 0a5e6e98692bceabdacc7ef41fe2b7fb59d9c879453982b2dc0e79d28f077714 SHA512 2a5be09537b1735e712ec373cc7f41b1e8b7753be5026ec3a1562d7347f4d5addf58bb9ea052051e0df2113e18a366e4095f84432dffb4b75b86b9ca913d3d56 WHIRLPOOL 7a8d35dcba4754cb809b8ac8710cbba8ba5452c4c4e13963a40e032b13241aa9b44328f3bbeea681bf535a31980e766331acaf5ae265bda5dd5790bda872d8dc
 DIST netbeans-trunk-nightly-201501180001-src.zip 201391445 SHA256 b1bf4373e5b799f830894b4ea7ab878ef09c64059758cebb2fa1b1a244718965 SHA512 bf1a40344c915a754f3b7baed759b6513e6a055bface5fe6c30c4e0adeb76fe7d2aaac5d344553ee5df505131cb05c7e2219c67514d4a962f681f9a39c685166 WHIRLPOOL f33d7bfe0174c7de81986a44578df8322fa8f2b46911e9f6fc05ffe8f0839e70b691d62ef9b6dc1b248aceb68760330ef69e86f026a83b6c0f27bcee3a4bc07b
 DIST netbeans-trunk-nightly-201501190001-src.zip 201391445 SHA256 ce4ec7706f80732c5c6d5764fb4cb0f2f82341d668e2680ed4d12c382e8541de SHA512 232c8beecd613bafca37af997c3aae0f35caa28a3a3f381553bc3264916f606540bcb5186c8a2a52ca21ce177ed413d6907865b4b42b80c102e7c636df736628 WHIRLPOOL 2176f82b120a7f9360f3b01cb970a8fcc5078e97da90ae0e870b37a53998beca6306b5f58bf9af3a15dc403f1dbb888457a56b0657a2f972b8e01ebe1b725abe
+DIST netbeans-trunk-nightly-201501200001-src.zip 201396862 SHA256 1a9378d8f52c4f617653d096aff287cf62212af8a6f878fe54cc468e4dd4bed7 SHA512 92fd39cda2d11816b9a01e0e5c26b3f527354a69efdc940cb27d5b17ee6493a07225d2698260db2bdc220e01d166ac42b5fb62f809d1e2eb84419c6e6abb3e14 WHIRLPOOL c3ba7155b5d376041d750c42f1ff8f8dec5bdbfedb470dea483a665978ef3982f087cb7a521f7892c264bb38d0876e4e7a08346ae4579338ba698ae7ee4ba456
 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
@@ -76,5 +77,6 @@ EBUILD netbeans-dlight-9999_p20150115.ebuild 2995 SHA256 701348a13acc8f87f342b34
 EBUILD netbeans-dlight-9999_p20150116.ebuild 2995 SHA256 ff37894f944835df50c468e36efbc6d90bd1c12a547a3a8b15f80e7f535cc86a SHA512 07d675df60c823436dab7ec5690d66bba2a396551cc41c96d7bf6a3bffff57c1329a9a7ad4dd7ccc5f459c851ff9ff4c31102476e5f4a72692d4951d29517a33 WHIRLPOOL 254a6d78d4be42a52d85ab32b6fadf84bc43fe86ca8ed6e27076a7314c41a18b546c4709144cae17b9c07636310f7cb5edb5cf2ff706d7be7b1340a7853827d8
 EBUILD netbeans-dlight-9999_p20150118.ebuild 2995 SHA256 f91edc523c3264dd93203d54800100ffbe8a323308091982024ca9c06b13aa1d SHA512 d5a8d48b8d01ee2931878d585088adf2acd78e3ae18efeb3c18c62f82670e2669151cbf9da09fbb94f7e54ff390a562aa73bd8dee1ad36ccdc6716c3f052fcca WHIRLPOOL 486cfd6ffac84b7f10e8aafef3e71039ae77ac844647a17b3bcdf78b5f892f5ed197a63176e459cd3f3ab0e645998fce144cbc3591b1f69abdb2775387628afc
 EBUILD netbeans-dlight-9999_p20150119.ebuild 2995 SHA256 158fc2e1046bfc65addf7cb3872da305606521a4d3b5c8319aea0932c30129cb SHA512 818fd875eed96c282ac5b15f691bc3d30ce650e91788fb1288c723085c00ca54263b8f14521ba2c2371cf7585b05216a3200ebcb44834b6783e4d0d3817a3f4a WHIRLPOOL 4870e156a2fe4ee5869bfec426b629e89852c3c6269ab4f9f2e5db1f5ab11f21626c537fa3b6daffdaf4c807239268d598e57c0b72b096510d9dc7cb79da6c1c
-MISC ChangeLog 147030 SHA256 ca375958e3654448c9178edcf79b1177caf9fc5f55864d9567baa72d81abc4fa SHA512 9f5e40ed0e9ffc3524cf8cccb0d12d4f1b3a2f93eee060aad8cd4209b4784ff9b70a8ec00619aa912e11663968a1b2ad7fca27d8af92a57c21f93f79aa3b1c23 WHIRLPOOL 8d03f062cdd8ecb652b412a7921c88889c25796ed5d43b1aa84911cb225cbbdae661b096fe73f12a223492312d6e46c3c15e08ba3a04d7698bcc9c29da99260e
+EBUILD netbeans-dlight-9999_p20150120.ebuild 2995 SHA256 f322c5f23012f61f49f20faf2a6a42a9751fae61e912e8ca104083c999da14f7 SHA512 5b6f69d45f7c368fc7bfb603e4f07e1fd9842064ce7f212d8cf0f122e1c4f30b998a724e32a7360ab3ac32448d691db5b6140a4a3d60d9e20be0508855a0bea4 WHIRLPOOL 3ef4b9498c71716e443eea2329bebd3b4704dd7c51b28cde6206bf1470003348a2a7757b7fe94d44646d24b7587781c882ea4191112ba1263695e43a9d911011
+MISC ChangeLog 147203 SHA256 247f8cd9903740061170701855d64455b82668827f4181612ba4b7c655151867 SHA512 01b74ad0929f65d1ffe36eb81b0a67f5a75812ad7b490035e3a6920d26094c10c1e94ba1599ed0375de9872dadcd5ed3f48c04b06e30a1587cd3eaf32adce7a2 WHIRLPOOL cf9aec40225ac729f5de691b1d270c4c03a4802a98b612685755f0a0d4b8df3e2c14da3d9186ecd8990384b6b0854de746a7379831d0f85946c4d4f9ccf23813
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150120.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150120.ebuild
new file mode 100644
index 0000000..978f406
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150120.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-01-20_00-01-55/zip/netbeans-trunk-nightly-201501200001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/9695A2FCDFCDDB42935490029E077C053E3F6FE1-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}"/9695A2FCDFCDDB42935490029E077C053E3F6FE1-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 8f0c84f..a6e7ef9 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_p20150120 (20 Jan 2015)
+
+  20 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-enterprise-9999_p20150120.ebuild:
+  bumped to the latest sources
+
 *netbeans-enterprise-9999_p20150119 (19 Jan 2015)
 
   19 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 4d66dbe..73384be 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -127,6 +127,7 @@ DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6
 DIST netbeans-trunk-nightly-201501160001-src.zip 201394511 SHA256 0a5e6e98692bceabdacc7ef41fe2b7fb59d9c879453982b2dc0e79d28f077714 SHA512 2a5be09537b1735e712ec373cc7f41b1e8b7753be5026ec3a1562d7347f4d5addf58bb9ea052051e0df2113e18a366e4095f84432dffb4b75b86b9ca913d3d56 WHIRLPOOL 7a8d35dcba4754cb809b8ac8710cbba8ba5452c4c4e13963a40e032b13241aa9b44328f3bbeea681bf535a31980e766331acaf5ae265bda5dd5790bda872d8dc
 DIST netbeans-trunk-nightly-201501180001-src.zip 201391445 SHA256 b1bf4373e5b799f830894b4ea7ab878ef09c64059758cebb2fa1b1a244718965 SHA512 bf1a40344c915a754f3b7baed759b6513e6a055bface5fe6c30c4e0adeb76fe7d2aaac5d344553ee5df505131cb05c7e2219c67514d4a962f681f9a39c685166 WHIRLPOOL f33d7bfe0174c7de81986a44578df8322fa8f2b46911e9f6fc05ffe8f0839e70b691d62ef9b6dc1b248aceb68760330ef69e86f026a83b6c0f27bcee3a4bc07b
 DIST netbeans-trunk-nightly-201501190001-src.zip 201391445 SHA256 ce4ec7706f80732c5c6d5764fb4cb0f2f82341d668e2680ed4d12c382e8541de SHA512 232c8beecd613bafca37af997c3aae0f35caa28a3a3f381553bc3264916f606540bcb5186c8a2a52ca21ce177ed413d6907865b4b42b80c102e7c636df736628 WHIRLPOOL 2176f82b120a7f9360f3b01cb970a8fcc5078e97da90ae0e870b37a53998beca6306b5f58bf9af3a15dc403f1dbb888457a56b0657a2f972b8e01ebe1b725abe
+DIST netbeans-trunk-nightly-201501200001-src.zip 201396862 SHA256 1a9378d8f52c4f617653d096aff287cf62212af8a6f878fe54cc468e4dd4bed7 SHA512 92fd39cda2d11816b9a01e0e5c26b3f527354a69efdc940cb27d5b17ee6493a07225d2698260db2bdc220e01d166ac42b5fb62f809d1e2eb84419c6e6abb3e14 WHIRLPOOL c3ba7155b5d376041d750c42f1ff8f8dec5bdbfedb470dea483a665978ef3982f087cb7a521f7892c264bb38d0876e4e7a08346ae4579338ba698ae7ee4ba456
 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
@@ -159,5 +160,6 @@ EBUILD netbeans-enterprise-9999_p20150115.ebuild 15147 SHA256 32d5865497090b91f3
 EBUILD netbeans-enterprise-9999_p20150116.ebuild 15147 SHA256 d471e33e89c8a25fdb7fe3776f690998894501ee604915287a3e8c86281d1908 SHA512 c9486ae6ba60782a805fe1cb0613003047795d13f7964b53a3c9952d51673f2b63bbcea62d3d120bf90d0c42db7acef8ff22dde9db3d4ace6a78f892477a88c1 WHIRLPOOL b2e4ba167c9255e579edc6b30e2578ad6df44a135e791662e2f6478b38f0169e95370759c8441439e96234ea803904bed5e089317c946ba7c49a5012bfd36e5b
 EBUILD netbeans-enterprise-9999_p20150118.ebuild 15147 SHA256 de08290aaedfb02717816d77333b45d1e9368754fb08f58dc87b6e971401e71c SHA512 e40d39f17e34d06137847966d66af6f5524f08e14a59e5c90db7bb285e7af8c3be779fa0d6bbe28d13fc7980d8545f45dc6e6fee79d52a98464dc51a5380dcc4 WHIRLPOOL 22a620d34beafa8ad13214e3a8f3a802e01640525a4819debcdf87a6cf0d8417957b849cd2c2925527ea55d54b17dff5bcaa0a6c942ce8e5d07094f50c3c0f26
 EBUILD netbeans-enterprise-9999_p20150119.ebuild 15147 SHA256 186fe6352ee1dee2c341ee41a17876dda3a0998174afc99479e11c916fce28e8 SHA512 0433744cd978f8d0078f30e059eac05f0f1bb23d8efed840563f822002f64f4b70c2f79c8757fc7ac4721c8f534d4eaf3f21a43a86042247c561fee2edef3ec1 WHIRLPOOL 64b02d3a679649ab9ae4fa0892b8522271ec876376b3ef197c8fabd9e2cbdabac8d955e5fcfeddf24b49f5395a6de73a44959487d98a5935e83f6b6ae8eef944
-MISC ChangeLog 154908 SHA256 0d1d1d0e708c65a1716e718dd9094afccd4b94866ae62de84e5526240a3c524d SHA512 c16455aabb61ef92ef7e11404929879bd61efaa84ca7269b74ef65d93e77c76c48b200e9b1b616121a2f7c46e454a1880343fed188a5ebcdf96fe94952d00166 WHIRLPOOL edbfbafcec24bf2d58616ccaf7b49bef1dc3c97ff0358f172e6655886a9cf8b42aeb3dcb25e0b020d231c11a052a217089bbaf228cad04cb695af6707863dbb7
+EBUILD netbeans-enterprise-9999_p20150120.ebuild 15147 SHA256 be456f664c423b99fd2c07a6bbac5c66cb0a0a4e0b15425a8464181d19825ed7 SHA512 a89b690c69ac102e1131c5548fa887821731e0236f8d3a56b1c2b1f024b53d4a2199e9bdc5fcfc384179fc6fb7598e977f4d977dd338827148f34c90a211829c WHIRLPOOL 2228cc1729ebe1abec4dd4a38e82b9a66ab272ee4672fc66d7d71abce66da1964bd258dd134ef9b012ed93f1a02cebdf712e387d0065bc37406b12d46ac638f0
+MISC ChangeLog 155089 SHA256 effbeb5b0f7c7a6e9020c6c580ce89d00f718f900a17b06cf3ab5d9db360284c SHA512 ba02ee625e9b4bed401d2b467358be4aefe2fbc76cbfcebd58b02349249ec3d5472892d0ea204763b595610bb268058a52bbdb367338929ac8dfb880c5716144 WHIRLPOOL 70cae7faf551b471b71ccc57ed75b9370e1942f90d7efe4e6a4ac04398c82cad099975e5276607907489f80b97fa18b5495e6990ccbf2a130e336314d720bbcc
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150120.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150120.ebuild
new file mode 100644
index 0000000..ad2d3a3
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150120.ebuild
@@ -0,0 +1,249 @@
+# 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-01-20_00-01-55/zip/netbeans-trunk-nightly-201501200001-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/75C30C488AD2A18A82C7FE3829F4A33FC7841643-glassfish-tooling-sdk-0.3-b054-246345.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/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/jakarta-oro:2.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}"/75C30C488AD2A18A82C7FE3829F4A33FC7841643-glassfish-tooling-sdk-0.3-b054-246345.jar libs.glassfish.sdk/external/glassfish-tooling-sdk-0.3-b054-246345.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.10.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/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 2959036..15a3dc4 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_p20150120 (20 Jan 2015)
+
+  20 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ergonomics-9999_p20150120.ebuild:
+  bumped to the latest sources
+
 *netbeans-ergonomics-9999_p20150119 (19 Jan 2015)
 
   19 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 6d405bb..8cc3650 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6
 DIST netbeans-trunk-nightly-201501160001-src.zip 201394511 SHA256 0a5e6e98692bceabdacc7ef41fe2b7fb59d9c879453982b2dc0e79d28f077714 SHA512 2a5be09537b1735e712ec373cc7f41b1e8b7753be5026ec3a1562d7347f4d5addf58bb9ea052051e0df2113e18a366e4095f84432dffb4b75b86b9ca913d3d56 WHIRLPOOL 7a8d35dcba4754cb809b8ac8710cbba8ba5452c4c4e13963a40e032b13241aa9b44328f3bbeea681bf535a31980e766331acaf5ae265bda5dd5790bda872d8dc
 DIST netbeans-trunk-nightly-201501180001-src.zip 201391445 SHA256 b1bf4373e5b799f830894b4ea7ab878ef09c64059758cebb2fa1b1a244718965 SHA512 bf1a40344c915a754f3b7baed759b6513e6a055bface5fe6c30c4e0adeb76fe7d2aaac5d344553ee5df505131cb05c7e2219c67514d4a962f681f9a39c685166 WHIRLPOOL f33d7bfe0174c7de81986a44578df8322fa8f2b46911e9f6fc05ffe8f0839e70b691d62ef9b6dc1b248aceb68760330ef69e86f026a83b6c0f27bcee3a4bc07b
 DIST netbeans-trunk-nightly-201501190001-src.zip 201391445 SHA256 ce4ec7706f80732c5c6d5764fb4cb0f2f82341d668e2680ed4d12c382e8541de SHA512 232c8beecd613bafca37af997c3aae0f35caa28a3a3f381553bc3264916f606540bcb5186c8a2a52ca21ce177ed413d6907865b4b42b80c102e7c636df736628 WHIRLPOOL 2176f82b120a7f9360f3b01cb970a8fcc5078e97da90ae0e870b37a53998beca6306b5f58bf9af3a15dc403f1dbb888457a56b0657a2f972b8e01ebe1b725abe
+DIST netbeans-trunk-nightly-201501200001-src.zip 201396862 SHA256 1a9378d8f52c4f617653d096aff287cf62212af8a6f878fe54cc468e4dd4bed7 SHA512 92fd39cda2d11816b9a01e0e5c26b3f527354a69efdc940cb27d5b17ee6493a07225d2698260db2bdc220e01d166ac42b5fb62f809d1e2eb84419c6e6abb3e14 WHIRLPOOL c3ba7155b5d376041d750c42f1ff8f8dec5bdbfedb470dea483a665978ef3982f087cb7a521f7892c264bb38d0876e4e7a08346ae4579338ba698ae7ee4ba456
 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
@@ -70,5 +71,6 @@ EBUILD netbeans-ergonomics-9999_p20150115.ebuild 2919 SHA256 7bbb97c6d2c8fc681ac
 EBUILD netbeans-ergonomics-9999_p20150116.ebuild 2919 SHA256 27c7bc6c53e7cd492766e59868982c94a9fe99ed238a34e94da922e25c23d929 SHA512 d1ce57c93647ce128615a33c9dc963e6d1ea4b690e498a74cf0da15df43cbb1ff75de1d4a0988d152071c6923dae8df5a7fb70ebdc009701f63598e2c658012e WHIRLPOOL 4bd301227ccfbb92f28d2f9a5d2d7ba6eb522d7d400d11783369bfda19f12da8a4246ac94414be3ff1048651967e4bb7a5d220380ba993c09bd75aff1cb52f13
 EBUILD netbeans-ergonomics-9999_p20150118.ebuild 2919 SHA256 61dec9c0ae69db18c9dafb835a321833ffb4cbe939915f1859495beeed837813 SHA512 f22794dea930dfdc48def5a7d2f7cf283d6273f336d63093b9b26f5a9b968036c85a3c8735808bf809860042316a48abb2e3ddfb2d47f4cddaa750348fec34f1 WHIRLPOOL 75bd3258709799eca1dd2a82dff094daf532872ab6b3ff1a451f4953c1e02e6672684b8ca5d2119c2ed6bcf4a9d406823ba2ec2797f6f894e0734508899db37e
 EBUILD netbeans-ergonomics-9999_p20150119.ebuild 2919 SHA256 55b170eae70be1daf7d54a8d8b742ebbddec9d865f6a2f8db72da730394778de SHA512 48b0d6cf35ba509d1791f265175785fa2591f678c41733c79c40b04a246d716bd54975e0b948d9bfc8206e63402f044cf98dfe2ee0b61eb7562fa5f86bd09714 WHIRLPOOL 712f0fc7ddef60c27ca83afd8b9bc83d96e55b6b2c4e720b13f9eb0daa855d7ebcafd694e2217ba78618276c8b1ef6b70ff2a1b3a4bd4a03387408bec56f1877
-MISC ChangeLog 154383 SHA256 79458e240bd56044eb46e0a898178417ca6b9f344da4d0e9b358a2e907721a93 SHA512 a316b800d0356b1e57de72e73fee8d861fc24e7bc15a1e2bffab5595b997ffaea3f5eeb37ce3a92242f32916b46d213a3294a34fe114d6917e94d925ed28cf73 WHIRLPOOL 6df388de542e3294830bd04f1fbd99b7babf2ce9f1b0d08e354015415da2d41c380d14c8972d6f3dd45782fdeb8780fc72ac86dcc46c1a7f51df3795028c255a
+EBUILD netbeans-ergonomics-9999_p20150120.ebuild 2919 SHA256 d0f4968b4bc7e0b94a00e8b9a3734fc2b71f5009f63ee046dec0298d4a1741a7 SHA512 ee80ae5e3318e86b083682618bdb75ba9b105ca8cab70e99f7e590da94c5ca2080d75202089eae29b863fb8ff7104b9f8a14bea44c49d7283caa5cbb119796b4 WHIRLPOOL 0ad0fac6f0f8e3b8259b562afa7c173ed7886a7bd8945bdd0a02a62d4ed11d8771c23ea11853296e3d3c607f2be2426a40a8c83badecb476688f458d1ffbb980
+MISC ChangeLog 154564 SHA256 29a7072b9079f7158ec7854c1a2a42fb30556225ca75681887597cdbbd2cf57c SHA512 28c7f65eb9c7279184c24bebc391665c38b165da4c8dd1e08b89979e6b83326bc9344e4acf7fde16a85b0ce8de99d67f2ade0e88644fb41fb23034416c51da42 WHIRLPOOL a659947e47a772bba4e0fe78219258917060702f2e35f802d7e0b7a6ca0fe06d73052366e0c59b0055bc31ed2ad15c95644d1d1a1c893fddd85d71b8b59737b0
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150120.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150120.ebuild
new file mode 100644
index 0000000..882bfad
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150120.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-01-20_00-01-55/zip/netbeans-trunk-nightly-201501200001-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 a761160..b06f99e 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_p20150120 (20 Jan 2015)
+
+  20 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-extide-9999_p20150120.ebuild:
+  bumped to the latest sources
+
 *netbeans-extide-9999_p20150119 (19 Jan 2015)
 
   19 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index bb840b1..dad95eb 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6
 DIST netbeans-trunk-nightly-201501160001-src.zip 201394511 SHA256 0a5e6e98692bceabdacc7ef41fe2b7fb59d9c879453982b2dc0e79d28f077714 SHA512 2a5be09537b1735e712ec373cc7f41b1e8b7753be5026ec3a1562d7347f4d5addf58bb9ea052051e0df2113e18a366e4095f84432dffb4b75b86b9ca913d3d56 WHIRLPOOL 7a8d35dcba4754cb809b8ac8710cbba8ba5452c4c4e13963a40e032b13241aa9b44328f3bbeea681bf535a31980e766331acaf5ae265bda5dd5790bda872d8dc
 DIST netbeans-trunk-nightly-201501180001-src.zip 201391445 SHA256 b1bf4373e5b799f830894b4ea7ab878ef09c64059758cebb2fa1b1a244718965 SHA512 bf1a40344c915a754f3b7baed759b6513e6a055bface5fe6c30c4e0adeb76fe7d2aaac5d344553ee5df505131cb05c7e2219c67514d4a962f681f9a39c685166 WHIRLPOOL f33d7bfe0174c7de81986a44578df8322fa8f2b46911e9f6fc05ffe8f0839e70b691d62ef9b6dc1b248aceb68760330ef69e86f026a83b6c0f27bcee3a4bc07b
 DIST netbeans-trunk-nightly-201501190001-src.zip 201391445 SHA256 ce4ec7706f80732c5c6d5764fb4cb0f2f82341d668e2680ed4d12c382e8541de SHA512 232c8beecd613bafca37af997c3aae0f35caa28a3a3f381553bc3264916f606540bcb5186c8a2a52ca21ce177ed413d6907865b4b42b80c102e7c636df736628 WHIRLPOOL 2176f82b120a7f9360f3b01cb970a8fcc5078e97da90ae0e870b37a53998beca6306b5f58bf9af3a15dc403f1dbb888457a56b0657a2f972b8e01ebe1b725abe
+DIST netbeans-trunk-nightly-201501200001-src.zip 201396862 SHA256 1a9378d8f52c4f617653d096aff287cf62212af8a6f878fe54cc468e4dd4bed7 SHA512 92fd39cda2d11816b9a01e0e5c26b3f527354a69efdc940cb27d5b17ee6493a07225d2698260db2bdc220e01d166ac42b5fb62f809d1e2eb84419c6e6abb3e14 WHIRLPOOL c3ba7155b5d376041d750c42f1ff8f8dec5bdbfedb470dea483a665978ef3982f087cb7a521f7892c264bb38d0876e4e7a08346ae4579338ba698ae7ee4ba456
 EBUILD netbeans-extide-7.4.ebuild 3311 SHA256 8585e0b9eac3b9bb35d5b5e0152936f84708a824d76831930a3dfd3d196556b0 SHA512 19eceec7a634923b4712eb277a1ff9900a2eb4d9ac0a2c699175333c263f0c02baaf24eb30bd7919444f5c9df751186689b2d4359ca1c88dca02884d7c18c3cd WHIRLPOOL e64509f198c4d09851f98d5bd2ddd5b469b0a7c0f3122f391c17833e5d6d77b7a6c2fd9e942e34f2df42047504ad40593f97af9b2898450e769c7b012355c316
 EBUILD netbeans-extide-8.0.2.ebuild 3315 SHA256 91d5ece7097d8bff6d04ebbfd12b6fefb787b41ef33b4288e31e9babc49feca1 SHA512 42f4767cf06a9528d02db53f4d487a495135934302e33bcac9384cfd174260ff922638c9a0e659c537c50a81f91372aaf9d2585b4505b999e681dca9acaea4e0 WHIRLPOOL c55f05d55e8dc22478d29cf9e8ecd15de3e402f19e2d41cd302ec8f0b0d0f23dd434fded92761d5bbc55e1219a6d424afe8754b146f8312248e3a53dfede3b2d
 EBUILD netbeans-extide-8.0.ebuild 3305 SHA256 b2d57e2e2d92760ead3d383fe4dd5b4fb9fc2807a9b58c6f40b44fc24072b8bb SHA512 6e7f12758188a564ef6b5cf8b0ffdf79e30d1021172d10f215d04e727bc4001e4385fd0961a26a6bb42638089e0919b1d4628a13ba11a3deac94d4693c7210d5 WHIRLPOOL adac8461de43669b7bb98ea8920c0a2944837211a37503b957221149d4b91c4bd92b6db160191990b838c474495c65f62c8a4bb9fdbcaa371b4648a335b1afa9
@@ -64,5 +65,6 @@ EBUILD netbeans-extide-9999_p20150115.ebuild 3383 SHA256 9bcac5fa6955229212a7b4e
 EBUILD netbeans-extide-9999_p20150116.ebuild 3383 SHA256 7733098c3179aff8223238b7ccfc1449463de00edf0730ca52e8a8b0621fab9f SHA512 7f4cc6fe1d4330ee6a3c068e443adcf215d1c794f8092114b090a3b9fcac0992b7f784cf72ebf76bf81abfd82fdf13ce4c7b2c85a9cfafcb394f3e5950047b62 WHIRLPOOL 4d62998bc87da17978ef5e7ef2d55f3a337ee35e243c9e50d2d32bd151f028aa8829580ebd5c019871a1f92c9d1ec02695d4f63c2d92e9a452306c56efe567bb
 EBUILD netbeans-extide-9999_p20150118.ebuild 3383 SHA256 3e6eecb155c8816f0461c7bde9d74f26eaeecdea3d0e630df284673905296a1d SHA512 fae3248d8d4efc922303231b0f77fb4d0b5c40df6d82b22296d8de2b41d313eb30620880928dda04c39726a55ddd8d65e41a01cd732e69bdeac5817c749680d8 WHIRLPOOL 6382b78dd43fb850897110dd0811cc4e21102185b367d8a8b6ba9f1e2b3cac8a589fa157097954a8366d1fdcccea6520d275b6987d1ffe46b21204ce48a550e7
 EBUILD netbeans-extide-9999_p20150119.ebuild 3383 SHA256 827d7cfb394c45175c048f607821eef1929054ffcf77b66e80067e85c14df5b5 SHA512 e455522dadf5629dd0c13ed3e718c54e8e834ae1bea2c7053bd20d166be364e9ace677d04179ac9da743e6bec44a30cd5498191e1902345eaa88124117b4ba18 WHIRLPOOL 77db24cda882c0ebf452ed5c8b5e0b2c20727d2cad5f284dbbb9889e13d185447be2e51091bc70957054863813fada0cfc6f8796f745862df092b732ccb56fc0
-MISC ChangeLog 79042 SHA256 2fae3d6ba65a2eb22d27da7adc82e8e5e50cb9def5be864262bf902c2671480c SHA512 0126e3a48c5134bb6f4633f49b08c6599a4e176ef808e5a25dc8385a546b80a574e12782bc5185d28db8a97f87cc91af760f2e5088569e396720344382bc6949 WHIRLPOOL 56321558fd34556775a281b47b446b3a4d050010179d017a45a4e1986dda6535e72093e6ab27b7ccae365f1d26e8565ecfc125a271cd5ab886f40745155e128b
+EBUILD netbeans-extide-9999_p20150120.ebuild 3383 SHA256 247fa9496a39be6b8d18424c32cc1f8baf82aa86837a11c85da18061b22985b9 SHA512 9ce70d44cc33a68ebbcf157f92f2e4b8fd3d53663e4f3e44e8422780203d137f0894ab2fe9617da681937e3250769fad7722937f24b57cdba5952e4e21d1b43e WHIRLPOOL 566f3e6892a15998a1cd9e000e02161fcfbee009947227842f52f346ae57bf65efc8b6b845d4be4be3d3f08649cb4cc617638209fe98081e30eb792ff804797e
+MISC ChangeLog 79215 SHA256 90cfd8fdce2714d7d48584845fe33055b535b0ec78430a08361a896b8286a0ec SHA512 9f5bf06dc2a1fd097c61e5fe11be2d2b03572e484422352462e170ba44d5e346e49b07af2c8c115f2fec6980bf8119369af3c656e0f296f5a42982e89e62f6de WHIRLPOOL 8cafe4370be8709240111c5e0a2856b499a595d4444c55885871e94bd811fe16e8384e694bfa6a184a101a3c55e3a8930001834daef16d142090c831486cba51
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20150120.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20150120.ebuild
new file mode 100644
index 0000000..1bf6c95
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20150120.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-01-20_00-01-55/zip/netbeans-trunk-nightly-201501200001-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 a33f349..e1bff68 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_p20150120 (20 Jan 2015)
+
+  20 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-groovy-9999_p20150120.ebuild:
+  bumped to the latest sources
+
 *netbeans-groovy-9999_p20150119 (19 Jan 2015)
 
   19 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index c4fbc92..8c89812 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -42,6 +42,7 @@ DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6
 DIST netbeans-trunk-nightly-201501160001-src.zip 201394511 SHA256 0a5e6e98692bceabdacc7ef41fe2b7fb59d9c879453982b2dc0e79d28f077714 SHA512 2a5be09537b1735e712ec373cc7f41b1e8b7753be5026ec3a1562d7347f4d5addf58bb9ea052051e0df2113e18a366e4095f84432dffb4b75b86b9ca913d3d56 WHIRLPOOL 7a8d35dcba4754cb809b8ac8710cbba8ba5452c4c4e13963a40e032b13241aa9b44328f3bbeea681bf535a31980e766331acaf5ae265bda5dd5790bda872d8dc
 DIST netbeans-trunk-nightly-201501180001-src.zip 201391445 SHA256 b1bf4373e5b799f830894b4ea7ab878ef09c64059758cebb2fa1b1a244718965 SHA512 bf1a40344c915a754f3b7baed759b6513e6a055bface5fe6c30c4e0adeb76fe7d2aaac5d344553ee5df505131cb05c7e2219c67514d4a962f681f9a39c685166 WHIRLPOOL f33d7bfe0174c7de81986a44578df8322fa8f2b46911e9f6fc05ffe8f0839e70b691d62ef9b6dc1b248aceb68760330ef69e86f026a83b6c0f27bcee3a4bc07b
 DIST netbeans-trunk-nightly-201501190001-src.zip 201391445 SHA256 ce4ec7706f80732c5c6d5764fb4cb0f2f82341d668e2680ed4d12c382e8541de SHA512 232c8beecd613bafca37af997c3aae0f35caa28a3a3f381553bc3264916f606540bcb5186c8a2a52ca21ce177ed413d6907865b4b42b80c102e7c636df736628 WHIRLPOOL 2176f82b120a7f9360f3b01cb970a8fcc5078e97da90ae0e870b37a53998beca6306b5f58bf9af3a15dc403f1dbb888457a56b0657a2f972b8e01ebe1b725abe
+DIST netbeans-trunk-nightly-201501200001-src.zip 201396862 SHA256 1a9378d8f52c4f617653d096aff287cf62212af8a6f878fe54cc468e4dd4bed7 SHA512 92fd39cda2d11816b9a01e0e5c26b3f527354a69efdc940cb27d5b17ee6493a07225d2698260db2bdc220e01d166ac42b5fb62f809d1e2eb84419c6e6abb3e14 WHIRLPOOL c3ba7155b5d376041d750c42f1ff8f8dec5bdbfedb470dea483a665978ef3982f087cb7a521f7892c264bb38d0876e4e7a08346ae4579338ba698ae7ee4ba456
 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
@@ -74,5 +75,6 @@ EBUILD netbeans-groovy-9999_p20150115.ebuild 3422 SHA256 38d2593f66af4952670575c
 EBUILD netbeans-groovy-9999_p20150116.ebuild 3422 SHA256 0d43e8ccf0cadbf997e61b5a6bdd87f1d63f33a5d4b7baf3e8265113235cea11 SHA512 424ff0fdf14f7c9200fd9d74f69c323386d4453aa11b9fcc417bb43a6499adbd36528296ff8fd6fa83fdcd54eedc3ce3e028df40066e474647a6223bf3500f4e WHIRLPOOL bd05beb365c156808c98cc31a627130cb4b45e7cb3d9d7f1903d6779f2832971f6bfc912bb8e2dc75492667de5263ec6ed3557ffe790a5bc42673b52c1014a36
 EBUILD netbeans-groovy-9999_p20150118.ebuild 3422 SHA256 95d1aabc2fd79aaa7770dca28ede02ff5acdbdd13765aa74803cf9034630a3aa SHA512 31fb4140b62e2bd8a07bf8775377068761b2686132cc515272f1c6dd6fddd30ecb46c001793910e51e384777464e1108267575f1b8c7000bb18202824b8bf8bb WHIRLPOOL fdb6c149deaec0528bca3b398b088f5d9e263c5ffa890a57efc1cda82da6d60b14a5439886fd022491661563130ad251dea129a33cbcac9190ab0dc492dd8af4
 EBUILD netbeans-groovy-9999_p20150119.ebuild 3422 SHA256 450b88640cfe658ebda2b22b20460c66940735d9c278f24768a1ef14187d8f5f SHA512 9dcdda4398e771384ff246a4352cf1bdde0a56a8fe2ad1f5368c1392a82d8cf9e8cd17e7457cda8b87e8eacb1bb6bd6e65f3468d68717e25c01a53cd75574311 WHIRLPOOL 3c1e34acc911d74a507f99d772c724a9c6f7c47ff5f52c917f4d2c82c3656dcb03bb6f72c3dbe66cac84f2e392cc4ac00d059e36294befbb426efdfe42b00d1f
-MISC ChangeLog 147022 SHA256 0717b803a9809bcb9d9f260c8d462c944602fac1d57162def15d4185fe70bd6d SHA512 038be2a6bd23eaaf1e18d068e4b0d7e421d1602effd476b74777d7add18cbe3ffe133245277e14e90637d40ddd8000c99b75b2ed5994f9fd33cb9150baccebf7 WHIRLPOOL 0479d4e5b23b719e8e2b203d3fce03c61101be951d24f12baa6cb559fa6e46bcd7d7613bcb37e2482f2d2dcc33e515b6f642dcfa2c9e12ddca0c7aa196046c70
+EBUILD netbeans-groovy-9999_p20150120.ebuild 3422 SHA256 7033da090c70a8dede2b1a7a9a27a9562ac60f649b6e603ef2404740845f4e4d SHA512 681aec5635620f216d65520dc995786c4cd87add0dbe8689bc722317a455b80c8f30e2dff911f1c19e8a501ea2932b48e101706868d534ff2d7892c1228c5f57 WHIRLPOOL add523d48883e389be477583c4e6699222fd561b64e104a4d034a561740870935e92ac95414dbdce06512983e2864287dddbfd64dfa4e23868cdb433e2c18cca
+MISC ChangeLog 147195 SHA256 b4fb1257376987ff5f98edf84aae320a7e97f540cb3489b595ab1d84a986237f SHA512 581d3fd68b49a86394b588ebf29cfd2116f67c87a4ad0ec64c58feb10a40ccba57581dd4bc5a3c91c069d0804646ba6bafaff27ef237eee97638176cc6d8330f WHIRLPOOL c13f8da62d18a933f04d872b0e7b41afbba36c2ecaba20115e156e51725915ccaf8c46ecbe2df9150adb30a2ad1336c866ad409bd1e06ef5ad7149f04fff4241
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150120.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150120.ebuild
new file mode 100644
index 0000000..7d27a82
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150120.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-01-20_00-01-55/zip/netbeans-trunk-nightly-201501200001-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 8c59c95..938bd84 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_p20150120 (20 Jan 2015)
+
+  20 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-harness-9999_p20150120.ebuild:
+  bumped to the latest sources
+
 *netbeans-harness-9999_p20150119 (19 Jan 2015)
 
   19 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index f57c8ca..bf1d43a 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -44,6 +44,7 @@ DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6
 DIST netbeans-trunk-nightly-201501160001-src.zip 201394511 SHA256 0a5e6e98692bceabdacc7ef41fe2b7fb59d9c879453982b2dc0e79d28f077714 SHA512 2a5be09537b1735e712ec373cc7f41b1e8b7753be5026ec3a1562d7347f4d5addf58bb9ea052051e0df2113e18a366e4095f84432dffb4b75b86b9ca913d3d56 WHIRLPOOL 7a8d35dcba4754cb809b8ac8710cbba8ba5452c4c4e13963a40e032b13241aa9b44328f3bbeea681bf535a31980e766331acaf5ae265bda5dd5790bda872d8dc
 DIST netbeans-trunk-nightly-201501180001-src.zip 201391445 SHA256 b1bf4373e5b799f830894b4ea7ab878ef09c64059758cebb2fa1b1a244718965 SHA512 bf1a40344c915a754f3b7baed759b6513e6a055bface5fe6c30c4e0adeb76fe7d2aaac5d344553ee5df505131cb05c7e2219c67514d4a962f681f9a39c685166 WHIRLPOOL f33d7bfe0174c7de81986a44578df8322fa8f2b46911e9f6fc05ffe8f0839e70b691d62ef9b6dc1b248aceb68760330ef69e86f026a83b6c0f27bcee3a4bc07b
 DIST netbeans-trunk-nightly-201501190001-src.zip 201391445 SHA256 ce4ec7706f80732c5c6d5764fb4cb0f2f82341d668e2680ed4d12c382e8541de SHA512 232c8beecd613bafca37af997c3aae0f35caa28a3a3f381553bc3264916f606540bcb5186c8a2a52ca21ce177ed413d6907865b4b42b80c102e7c636df736628 WHIRLPOOL 2176f82b120a7f9360f3b01cb970a8fcc5078e97da90ae0e870b37a53998beca6306b5f58bf9af3a15dc403f1dbb888457a56b0657a2f972b8e01ebe1b725abe
+DIST netbeans-trunk-nightly-201501200001-src.zip 201396862 SHA256 1a9378d8f52c4f617653d096aff287cf62212af8a6f878fe54cc468e4dd4bed7 SHA512 92fd39cda2d11816b9a01e0e5c26b3f527354a69efdc940cb27d5b17ee6493a07225d2698260db2bdc220e01d166ac42b5fb62f809d1e2eb84419c6e6abb3e14 WHIRLPOOL c3ba7155b5d376041d750c42f1ff8f8dec5bdbfedb470dea483a665978ef3982f087cb7a521f7892c264bb38d0876e4e7a08346ae4579338ba698ae7ee4ba456
 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
@@ -76,5 +77,6 @@ EBUILD netbeans-harness-9999_p20150115.ebuild 4131 SHA256 90550405cd67e736368b7e
 EBUILD netbeans-harness-9999_p20150116.ebuild 4131 SHA256 fb2337f9f2fae97010ae27b3152d7b192adf0215aed6de4d68f74793fd05570b SHA512 3e28453eb3fb139fd6f710c68594d07fcd28e3d8891e208d8356d670bc26e96d960323ec8854d96aee2e7bc7712c5e1dc5badfcde2d57e7dd68db374bae423e9 WHIRLPOOL a93dd3a803f5df9cb400da9b7752976b7287eb16e557d443c6254afe3607deef2ad8f71189c4bfc85ddf4c789fae4b2e70d593d16c96988e90d6891d44c9164e
 EBUILD netbeans-harness-9999_p20150118.ebuild 4131 SHA256 1433c0e355fef5a065dadc0720f05fc7067558cd58e7ecfa7e621ad8b53170b2 SHA512 356f5c24dea8e01aed371b1335554437792df9fef51f7332ab1abef537d465a155a4742a10d2614d8c54bda985eeb9a782be803ad36b7244ed603dbe4e57ee5e WHIRLPOOL 1ab83797f58fb421b69e7fcc5d845d1b4a712e6a90914e634800cfef2e1ee9577b64bf2307bc1efcc888f12b77744a8c5f94e273314aa01c1c6cf07347ce9182
 EBUILD netbeans-harness-9999_p20150119.ebuild 4131 SHA256 de6d8554c3a779967434e9a71f8b10266060faa2f8746ce138b2a31e90ce1984 SHA512 dc99fc2f10ea331671673018ecec92f6c3216e1343e5653929e7df2584408372ef853ec72de700036ba4c1c56909f9b1c3ae49e93349c072130e94940ffae80c WHIRLPOOL 4395936c9c2663597c533746a2914dfd7969d6aa18d468b38dc3fcfd9ae6ef830039f302c49cdab7c981e6045ff3a81e0b7016d253609541ea862afb9c1caf9c
-MISC ChangeLog 148891 SHA256 c620ad1857aee79bdb9b446b6fa1438de7c1b4864845eeacec236d3f6455d7a6 SHA512 525e5dad7f2a4261888932569c0079be80ea3b5c7f36c9559f4f08cdf3a2f02aa897e0be282033bfa514d2932796f07dc569b455623014746c415ce05d8efacc WHIRLPOOL 0071d4db831350e478110ff831d422e34669c36e65c181cbacd18857bf63056265a831e0917a44fcb01830cf8ecb19d3fa98e303eb0d600c99408352bbc653a4
+EBUILD netbeans-harness-9999_p20150120.ebuild 4131 SHA256 bbab44c8b1712888d3c18427cc42a6020a589975ac957f2290565d274eade088 SHA512 748c8b81112fc46f5d6da4aff48fa35d8cf7b71e599556249848d5fb1cb9a52be49fd97d55972f21ac1eb5168d9bd6ca36b53feccf197e7e647d8fa4396e5a0f WHIRLPOOL ccfc1069c519a611ee657030e98bf313d2857d7a17aaddd1b1d12d1d9d6a69fd80be3ea025734d8e6bfa4f5b114dfd75eb2a722c37b757aa6b6dae262afcf0ce
+MISC ChangeLog 149066 SHA256 fd591427ae8a63e24449d1b3c9e4a992b4583740674237ad3462081390bb2a27 SHA512 5ea97c5b52b6a841cd3344f5477a637b0ea92673d0fb00572d10dc8417c5b2ecd7a26c90db6c17e1b4c67e3641d0284df736ce72172cad64f218bc074d404c5c WHIRLPOOL 48dc4e90b4d1480df3ce7acdd5de4750a975c3503f61a0bed029a4d59ae3d34d0f331982b97e2e70f770523cdd24cae383ee02d3373adb092a5212086528b3c8
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20150120.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20150120.ebuild
new file mode 100644
index 0000000..f4fab39
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20150120.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-01-20_00-01-55/zip/netbeans-trunk-nightly-201501200001-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.10.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 850e715..925b814 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_p20150120 (20 Jan 2015)
+
+  20 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ide-9999_p20150120.ebuild:
+  bumped to the latest sources
+
 *netbeans-ide-9999_p20150119 (19 Jan 2015)
 
   19 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 7615b9f..b28d1b6 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -224,6 +224,7 @@ DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6
 DIST netbeans-trunk-nightly-201501160001-src.zip 201394511 SHA256 0a5e6e98692bceabdacc7ef41fe2b7fb59d9c879453982b2dc0e79d28f077714 SHA512 2a5be09537b1735e712ec373cc7f41b1e8b7753be5026ec3a1562d7347f4d5addf58bb9ea052051e0df2113e18a366e4095f84432dffb4b75b86b9ca913d3d56 WHIRLPOOL 7a8d35dcba4754cb809b8ac8710cbba8ba5452c4c4e13963a40e032b13241aa9b44328f3bbeea681bf535a31980e766331acaf5ae265bda5dd5790bda872d8dc
 DIST netbeans-trunk-nightly-201501180001-src.zip 201391445 SHA256 b1bf4373e5b799f830894b4ea7ab878ef09c64059758cebb2fa1b1a244718965 SHA512 bf1a40344c915a754f3b7baed759b6513e6a055bface5fe6c30c4e0adeb76fe7d2aaac5d344553ee5df505131cb05c7e2219c67514d4a962f681f9a39c685166 WHIRLPOOL f33d7bfe0174c7de81986a44578df8322fa8f2b46911e9f6fc05ffe8f0839e70b691d62ef9b6dc1b248aceb68760330ef69e86f026a83b6c0f27bcee3a4bc07b
 DIST netbeans-trunk-nightly-201501190001-src.zip 201391445 SHA256 ce4ec7706f80732c5c6d5764fb4cb0f2f82341d668e2680ed4d12c382e8541de SHA512 232c8beecd613bafca37af997c3aae0f35caa28a3a3f381553bc3264916f606540bcb5186c8a2a52ca21ce177ed413d6907865b4b42b80c102e7c636df736628 WHIRLPOOL 2176f82b120a7f9360f3b01cb970a8fcc5078e97da90ae0e870b37a53998beca6306b5f58bf9af3a15dc403f1dbb888457a56b0657a2f972b8e01ebe1b725abe
+DIST netbeans-trunk-nightly-201501200001-src.zip 201396862 SHA256 1a9378d8f52c4f617653d096aff287cf62212af8a6f878fe54cc468e4dd4bed7 SHA512 92fd39cda2d11816b9a01e0e5c26b3f527354a69efdc940cb27d5b17ee6493a07225d2698260db2bdc220e01d166ac42b5fb62f809d1e2eb84419c6e6abb3e14 WHIRLPOOL c3ba7155b5d376041d750c42f1ff8f8dec5bdbfedb470dea483a665978ef3982f087cb7a521f7892c264bb38d0876e4e7a08346ae4579338ba698ae7ee4ba456
 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
@@ -258,5 +259,6 @@ EBUILD netbeans-ide-9999_p20150115.ebuild 29641 SHA256 b28e67f7de5354a6ff76015e5
 EBUILD netbeans-ide-9999_p20150116.ebuild 29641 SHA256 5124cc60592a92cffac8efa8ca82eef226080bd0841786332dbc92bec84d263d SHA512 7ba2e3be5dd3fb62705df17c4dc594b8888dcab5e7e34058082c1358abd3b0b0576c13784689df7807a2624ce0e7fa676082e6ab3a5cc1d3f763f92952e99025 WHIRLPOOL 79663110e8be20e6d8aef4ae543f9d80001d5fa032c6fffa43a9f3cbe169f4eba4b8d997c2a578ffba8328aa494aa4bbc2b6e767b55ac93ad3e0de03a5a9d16c
 EBUILD netbeans-ide-9999_p20150118.ebuild 29641 SHA256 a77a1264f3287227866a23958e6b3dcd81477cef9841d6a31f97346ae9d711a9 SHA512 c5635d4acae72fd586d214965734826e34a11f8e9366df38e3a531b66a6a9a167ebc8a259afa3d5171d0f143a51f53df605ca67da421c3eafe7ecb9a0e66fe16 WHIRLPOOL b1990aa93fb774fe58dfbbf1fa9ed59fd598dfbb5df3af552e3192f5159f3b128ecc10861502c69b218e61565014a956792c23482de030e6a911049147b15bf5
 EBUILD netbeans-ide-9999_p20150119.ebuild 29641 SHA256 0a9d14dce3396c0b95d2c68f673f236dd330af3aefbeb5522f8ac50e40130ec4 SHA512 20eed88f79c720e02fa3fdf8769e392c32ad8f59ba0de87c7e08b4e3599ed66a340719ab02d4244eef0385be7752e9cee5ecd40b37651b6a84fd4474c1efd52c WHIRLPOOL f9569df13668a99cbf2e071aa36fb91f42a385c542c45edbadecc95ee8e34852e54dc19ae564f2e2375def885d6b1a8a21703b237a0e1c992c9841fd0a1c298d
-MISC ChangeLog 141933 SHA256 2eb65a79679e7baf03ab800744d53f43caa070c097bb8b574b9802ed7c60ab00 SHA512 1b8d87ba39c7572bc9842585592132631bdce4a4426b178892bd6ded1ee5a490fc0d5c61c2b4f164b47af1d0587954b723a446ac524985fad92702212967a88a WHIRLPOOL 27a02dee783b3bd431b4297047ba23f9eb396214d99bd93a866c3a796d963c58f977131cf5df6ba828906a3c08894cbaa6fc9bc42bd8819db2e9b420c4580613
+EBUILD netbeans-ide-9999_p20150120.ebuild 29641 SHA256 a9396d34246b81c8c8adb762f4c5996d76c9410112b0124dd0830b49a59a7d4c SHA512 3e31cdd4b6a9afd671d904880499184a18476f1ddad5f3afadc06385d0fa589428390c60f5549a8b81e3dca1574afdd9119f6cc621b2648528b56dd8aafcf7c0 WHIRLPOOL 14af3ab7526fc6732b1eac5f80ebdec039dc882bbadd717b849def6cddd281da733971d0697f26c32261277ca359dfea12a2baff89c270c4efcade7991b91eb9
+MISC ChangeLog 142100 SHA256 eb2581acf899b0b2417be3fe3923514d7625816c048fc4b869fbe00eeb34bbb1 SHA512 90effe73939d53c60e0575fe070fd8a168123ab8c1d8c635887c58d3c765c5d4fd5659847c89865f27bcd2ee810e03d1047438ff4c46bc47e48aa24db63b86b6 WHIRLPOOL 3a543fe5a013a7f0eaf7a956254295e385f3831a698f51fd07be477fd8b7ac4ec44d47d6799e2144b4a9d2915e1533780169c7c9801f524728fc88244bc22986
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20150120.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20150120.ebuild
new file mode 100644
index 0000000..5da65a4
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20150120.ebuild
@@ -0,0 +1,373 @@
+# 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-01-20_00-01-55/zip/netbeans-trunk-nightly-201501200001-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/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/53AFD6CAA1B476204557B0626E7D673FBD5D245C-css3-spec.zip
+	http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
+	http://hg.netbeans.org/binaries/C40DFDACDF892D1BA14B540B32C11B6F34659931-exechlp-1.0.zip
+	http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar
+	http://hg.netbeans.org/binaries/75C30C488AD2A18A82C7FE3829F4A33FC7841643-glassfish-tooling-sdk-0.3-b054-246345.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/DA6CE3C2EB334DB61EFA99CD66134619867368FA-js-corestubs.zip
+	http://hg.netbeans.org/binaries/997BF4A93B8A99E37AB51C9016D1D18CF5FF4B60-js-domstubs.zip
+	http://hg.netbeans.org/binaries/291540295937BAC426A5A5BDDB6D86604075F4C0-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/7052E115041D04410A4519A61307502FB7C138E6-org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar
+	http://hg.netbeans.org/binaries/B19A4D998C76FE7A30830C96B9E3A47682F320FC-org.eclipse.core.jobs-3.5.101.jar
+	http://hg.netbeans.org/binaries/E64EF6A3FC5DB01AD95632B843706CCE56614C90-org.eclipse.core.net_1.2.100.I20110511-0800.jar
+	http://hg.netbeans.org/binaries/6658C235056134F7E86295E751129508802D71F2-org.eclipse.core.runtime-3.7.0.jar
+	http://hg.netbeans.org/binaries/0CA9B9DF8A8E4C6805C60A5761C470FCE8AE828F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110.jar
+	http://hg.netbeans.org/binaries/9C74D245214DB08E7EB9BC07A951B41CFE3E3648-org.eclipse.equinox.app-1.3.100.jar
+	http://hg.netbeans.org/binaries/78E5D0B8516B042495660DA36CE5114650F8F156-org.eclipse.equinox.common_3.6.0.v20110523.jar
+	http://hg.netbeans.org/binaries/FD94003A1BCE42008753522BFED68E5A84B92644-org.eclipse.equinox.preferences-3.4.2.jar
+	http://hg.netbeans.org/binaries/54AE046B40C9095C2637F8D21664C5CD76E34485-org.eclipse.equinox.registry_3.5.200.v20120522-1841.jar
+	http://hg.netbeans.org/binaries/0FFB9B1D7CD992CE6C8AAEEC2F6F98DFBB1D2F91-org.eclipse.equinox.security-1.1.1.jar
+	http://hg.netbeans.org/binaries/B005B69D9F5B4DBA636A95403D5CB62BAD5C486D-org.eclipse.jgit-3.6.0.201412230720-r.jar
+	http://hg.netbeans.org/binaries/0F81EBAFB75BE1C3A972B7563078897958724E1A-org.eclipse.jgit.java7-3.6.0.201412230720-r.jar
+	http://hg.netbeans.org/binaries/A94F8F805202B28236FFBC03C1CA149129DAEA1C-org.eclipse.mylyn.bugzilla.core_3.10.0.20131024-1218.jar
+	http://hg.netbeans.org/binaries/19D64C17A692D2023E22B16AD515118DF6427790-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710.jar
+	http://hg.netbeans.org/binaries/A1BF01D1DD09274446738C3F83360314B8881CD5-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210.jar
+	http://hg.netbeans.org/binaries/136A7EB3BB9B2559C5F9184B438F108C959B3C03-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116.jar
+	http://hg.netbeans.org/binaries/531746EBE57071AB7F8CCC7ACB0E806F25893916-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116.jar
+	http://hg.netbeans.org/binaries/D3ED088A49DE9E5163457E9279181DD4185BFBE6-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023.jar
+	http://hg.netbeans.org/binaries/8D4278A9F47D17A104182E59CF06D682B3DE0B3E-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055.jar
+	http://hg.netbeans.org/binaries/1FC011B8A350B70950B3F1D722D7F2890C6E76D8-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055.jar
+	http://hg.netbeans.org/binaries/6E914CA3075C8FDF7652F04A02868CF32F2EDCE3-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055.jar
+	http://hg.netbeans.org/binaries/8A2F6232978E0330A5D36F19BA0686F96FB980B5-org.tmatesoft.svnkit_1.8.4.r10218_v20140302_1242.jar
+	http://hg.netbeans.org/binaries/820FD32B3FB7F885996B15474F220BDCCACD6D27-processtreekiller-1.0.2.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/CE9A1C96875443F2FDD5127B750DA39CF4CE818B-com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.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/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/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
+	>=dev-java/jsch-0.1.46:0
+	dev-java/jzlib: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}"/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}"/53AFD6CAA1B476204557B0626E7D673FBD5D245C-css3-spec.zip css.editor/external/css3-spec.zip || die
+	ln -s "${DISTDIR}"/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip derby/external/derbysampledb.zip || die
+	ln -s "${DISTDIR}"/C40DFDACDF892D1BA14B540B32C11B6F34659931-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}"/75C30C488AD2A18A82C7FE3829F4A33FC7841643-glassfish-tooling-sdk-0.3-b054-246345.jar libs.glassfish.sdk/external/glassfish-tooling-sdk-0.3-b054-246345.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}"/DA6CE3C2EB334DB61EFA99CD66134619867368FA-js-corestubs.zip javascript2.editor/external/js-corestubs.zip || die
+	ln -s "${DISTDIR}"/997BF4A93B8A99E37AB51C9016D1D18CF5FF4B60-js-domstubs.zip javascript2.editor/external/js-domstubs.zip || die
+	ln -s "${DISTDIR}"/291540295937BAC426A5A5BDDB6D86604075F4C0-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}"/7052E115041D04410A4519A61307502FB7C138E6-org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar o.eclipse.core.contenttype/external/org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar || die
+	ln -s "${DISTDIR}"/B19A4D998C76FE7A30830C96B9E3A47682F320FC-org.eclipse.core.jobs-3.5.101.jar o.eclipse.core.jobs/external/org.eclipse.core.jobs-3.5.101.jar || die
+	ln -s "${DISTDIR}"/E64EF6A3FC5DB01AD95632B843706CCE56614C90-org.eclipse.core.net_1.2.100.I20110511-0800.jar o.eclipse.core.net/external/org.eclipse.core.net_1.2.100.I20110511-0800.jar || die
+	ln -s "${DISTDIR}"/6658C235056134F7E86295E751129508802D71F2-org.eclipse.core.runtime-3.7.0.jar o.eclipse.core.runtime/external/org.eclipse.core.runtime-3.7.0.jar || die
+	ln -s "${DISTDIR}"/0CA9B9DF8A8E4C6805C60A5761C470FCE8AE828F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110.jar o.eclipse.core.runtime.compatibility.auth/external/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110.jar || die
+	ln -s "${DISTDIR}"/9C74D245214DB08E7EB9BC07A951B41CFE3E3648-org.eclipse.equinox.app-1.3.100.jar o.eclipse.equinox.app/external/org.eclipse.equinox.app-1.3.100.jar || die
+	ln -s "${DISTDIR}"/78E5D0B8516B042495660DA36CE5114650F8F156-org.eclipse.equinox.common_3.6.0.v20110523.jar o.eclipse.equinox.common/external/org.eclipse.equinox.common_3.6.0.v20110523.jar || die
+	ln -s "${DISTDIR}"/FD94003A1BCE42008753522BFED68E5A84B92644-org.eclipse.equinox.preferences-3.4.2.jar o.eclipse.equinox.preferences/external/org.eclipse.equinox.preferences-3.4.2.jar || die
+	ln -s "${DISTDIR}"/54AE046B40C9095C2637F8D21664C5CD76E34485-org.eclipse.equinox.registry_3.5.200.v20120522-1841.jar o.eclipse.equinox.registry/external/org.eclipse.equinox.registry_3.5.200.v20120522-1841.jar || die
+	ln -s "${DISTDIR}"/0FFB9B1D7CD992CE6C8AAEEC2F6F98DFBB1D2F91-org.eclipse.equinox.security-1.1.1.jar o.eclipse.equinox.security/external/org.eclipse.equinox.security-1.1.1.jar || die
+	ln -s "${DISTDIR}"/B005B69D9F5B4DBA636A95403D5CB62BAD5C486D-org.eclipse.jgit-3.6.0.201412230720-r.jar o.eclipse.jgit/external/org.eclipse.jgit-3.6.0.201412230720-r.jar || die
+	ln -s "${DISTDIR}"/0F81EBAFB75BE1C3A972B7563078897958724E1A-org.eclipse.jgit.java7-3.6.0.201412230720-r.jar o.eclipse.jgit.java7/external/org.eclipse.jgit.java7-3.6.0.201412230720-r.jar || die
+	ln -s "${DISTDIR}"/A94F8F805202B28236FFBC03C1CA149129DAEA1C-org.eclipse.mylyn.bugzilla.core_3.10.0.20131024-1218.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.10.0.20131024-1218.jar || die
+	ln -s "${DISTDIR}"/19D64C17A692D2023E22B16AD515118DF6427790-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.10.0.20130926-1710.jar || die
+	ln -s "${DISTDIR}"/A1BF01D1DD09274446738C3F83360314B8881CD5-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.10.0.20131018-1210.jar || die
+	ln -s "${DISTDIR}"/136A7EB3BB9B2559C5F9184B438F108C959B3C03-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116.jar || die
+	ln -s "${DISTDIR}"/531746EBE57071AB7F8CCC7ACB0E806F25893916-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116.jar || die
+	ln -s "${DISTDIR}"/D3ED088A49DE9E5163457E9279181DD4185BFBE6-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023.jar || die
+	ln -s "${DISTDIR}"/8D4278A9F47D17A104182E59CF06D682B3DE0B3E-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055.jar || die
+	ln -s "${DISTDIR}"/1FC011B8A350B70950B3F1D722D7F2890C6E76D8-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055.jar || die
+	ln -s "${DISTDIR}"/6E914CA3075C8FDF7652F04A02868CF32F2EDCE3-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055.jar  || die
+	ln -s "${DISTDIR}"/8A2F6232978E0330A5D36F19BA0686F96FB980B5-org.tmatesoft.svnkit_1.8.4.r10218_v20140302_1242.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.4.r10218_v20140302_1242.jar || die
+	ln -s "${DISTDIR}"/820FD32B3FB7F885996B15474F220BDCCACD6D27-processtreekiller-1.0.2.jar extexecution.process/external/processtreekiller-1.0.2.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}"/CE9A1C96875443F2FDD5127B750DA39CF4CE818B-com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.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 --build-only --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.49.jar
+	java-pkg_jar-from --build-only --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.3.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/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.3.jar && dosym /usr/share/jvyamlb/lib/jvyamlb.jar ${instdir}/jvyamlb-0.2.3.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 3231049..3ba4f07 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_p20150120 (20 Jan 2015)
+
+  20 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-java-9999_p20150120.ebuild:
+  bumped to the latest sources
+
 *netbeans-java-9999_p20150119 (19 Jan 2015)
 
   19 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 6e3d1ff..35b2e71 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -116,6 +116,7 @@ DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6
 DIST netbeans-trunk-nightly-201501160001-src.zip 201394511 SHA256 0a5e6e98692bceabdacc7ef41fe2b7fb59d9c879453982b2dc0e79d28f077714 SHA512 2a5be09537b1735e712ec373cc7f41b1e8b7753be5026ec3a1562d7347f4d5addf58bb9ea052051e0df2113e18a366e4095f84432dffb4b75b86b9ca913d3d56 WHIRLPOOL 7a8d35dcba4754cb809b8ac8710cbba8ba5452c4c4e13963a40e032b13241aa9b44328f3bbeea681bf535a31980e766331acaf5ae265bda5dd5790bda872d8dc
 DIST netbeans-trunk-nightly-201501180001-src.zip 201391445 SHA256 b1bf4373e5b799f830894b4ea7ab878ef09c64059758cebb2fa1b1a244718965 SHA512 bf1a40344c915a754f3b7baed759b6513e6a055bface5fe6c30c4e0adeb76fe7d2aaac5d344553ee5df505131cb05c7e2219c67514d4a962f681f9a39c685166 WHIRLPOOL f33d7bfe0174c7de81986a44578df8322fa8f2b46911e9f6fc05ffe8f0839e70b691d62ef9b6dc1b248aceb68760330ef69e86f026a83b6c0f27bcee3a4bc07b
 DIST netbeans-trunk-nightly-201501190001-src.zip 201391445 SHA256 ce4ec7706f80732c5c6d5764fb4cb0f2f82341d668e2680ed4d12c382e8541de SHA512 232c8beecd613bafca37af997c3aae0f35caa28a3a3f381553bc3264916f606540bcb5186c8a2a52ca21ce177ed413d6907865b4b42b80c102e7c636df736628 WHIRLPOOL 2176f82b120a7f9360f3b01cb970a8fcc5078e97da90ae0e870b37a53998beca6306b5f58bf9af3a15dc403f1dbb888457a56b0657a2f972b8e01ebe1b725abe
+DIST netbeans-trunk-nightly-201501200001-src.zip 201396862 SHA256 1a9378d8f52c4f617653d096aff287cf62212af8a6f878fe54cc468e4dd4bed7 SHA512 92fd39cda2d11816b9a01e0e5c26b3f527354a69efdc940cb27d5b17ee6493a07225d2698260db2bdc220e01d166ac42b5fb62f809d1e2eb84419c6e6abb3e14 WHIRLPOOL c3ba7155b5d376041d750c42f1ff8f8dec5bdbfedb470dea483a665978ef3982f087cb7a521f7892c264bb38d0876e4e7a08346ae4579338ba698ae7ee4ba456
 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
@@ -148,5 +149,6 @@ EBUILD netbeans-java-9999_p20150115.ebuild 13429 SHA256 8f9e798f3e957f9101c93da4
 EBUILD netbeans-java-9999_p20150116.ebuild 13429 SHA256 84777411b2c89454bd34bca29e88ebe458a494c3c3f194592f2e699067ac56ce SHA512 b85d782bc08200bf13c0c5b6600b96b2da5c75554b371aa76109b67fbcff5bc279a0503264603f65f0c923f1d96dace8e5c9ac5d24ce0ff1a36ae4758b2e43a8 WHIRLPOOL 7326cbab2a79367819df079a953d828360cdf30fb343a55c81377d26bde7d7d67ac920b67bbc59c0988d642b77c897b209c61ed055d3d49fd7f2a7ccf19e722a
 EBUILD netbeans-java-9999_p20150118.ebuild 13429 SHA256 611c6d83f5c8f23fea3bfe94602bf4237428962072c469bb2a23c6986ad9ea68 SHA512 08cfdc583d18122860ffdffba9a1b1820a2f6bc2fe959f56c803dd85a4779cb0a45df6b348b42e8fcc6b48590b25b35f06c1eeb9c09a192d27097753afeb8603 WHIRLPOOL 96f914f7b5dfc7f19bfb424016a7105c476936b2195ddb94a1f974a4e4ba2ea1f80cbdc7ae56d37037dbe1be3819042b9acfb097ecd8fd67b3061ff2f7208c6b
 EBUILD netbeans-java-9999_p20150119.ebuild 13429 SHA256 788f98dfe95c056ce18b8cd3e602024abc97234002fb91aed378e2d76dffb11f SHA512 184b61fe9793acff5d09a8c418973fbe1db1d934602c599f05c4a182afa67222e6624fa9c00ce5ab61561c1eb288f0354b51d19081ab47cac0328abbd742ddba WHIRLPOOL a4bfd31bfe33109f67d873f5e9280e454899b6b00453b5e496adf0524ec25c3873b1d7b76c0fd506ef25db98e6f2f97236971a73365646f0ce9b1cf2b5fdc78c
-MISC ChangeLog 144576 SHA256 7656299eff111ad2493f44e69763f82da23fb0791bf6f17a5fed73891ca0f9ee SHA512 85e4309e9062bec0acfe2f174776dad4ac0c4245f15948abb7ca2ae3645c5c87a568123a51d1c0a7f4c4935df403f0bbe321e379516d19f83bd67a7f55ce088e WHIRLPOOL 1233e0d317c422437f1127d9659c009ce1c66572e35ea70ae1d8a857ee76a8526961754b1c3216e79cf23d156f1f50bcff95823fd6fced6ac6f1cc746b07cdc9
+EBUILD netbeans-java-9999_p20150120.ebuild 13429 SHA256 00caf2f373335e27e1ee6500b0867470513b12371fe3cfeb4fe54e7a496f8e11 SHA512 472d37d03a452d5ac7f425698a316c740a820ad350961fcbe858d23a2e78c41a2112924a0054fabc65e50d35607d526c992a470a6f3f134826d8b735fb61ad2b WHIRLPOOL 473278af7473167b3d2473c1d706f4fef09dae0f148a76e376d714d67426ada68f41f5265de11a505b3123ab8fd6ff97c1d7c21a011017bfcdec4190da3215f6
+MISC ChangeLog 144745 SHA256 a5a41403d11fab5a8ca4b84ef5683e3ae9049c74367ad87c23f29083515d971b SHA512 232992683f7fa998ff3e129bf5acaaeee7fc96b54f4e94c2425aff83ef2d54e01ab58e3cb129e5580211dae231df91d2ef4d3c291ebf4e4e1ef644c554678acc WHIRLPOOL 7ab4de20453a7ca7b530e06cbb01f6cecdb6e38ec5cd3f125d5a1698109fc0dd166187891ff0bd9627d0e45a7b15101cc3627fe068758612642b0011102654df
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20150120.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20150120.ebuild
new file mode 100644
index 0000000..c320696
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20150120.ebuild
@@ -0,0 +1,253 @@
+# 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-01-20_00-01-55/zip/netbeans-trunk-nightly-201501200001-src.zip"
+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/E5579EF3B0C1EF2F43562DD0C3B32F8E1F603B49-nb-javac-api.jar
+	http://hg.netbeans.org/binaries/38F9F426B1CE20EDC709424F51EDA1C87F13F420-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"
+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:2.2
+	dev-java/jdom:1.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/cglib:2.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/saaj:0
+	dev-java/stax-ex: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}"/E5579EF3B0C1EF2F43562DD0C3B32F8E1F603B49-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
+	ln -s "${DISTDIR}"/38F9F426B1CE20EDC709424F51EDA1C87F13F420-nb-javac-impl.jar libs.javacimpl/external/nb-javac-impl.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
+	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-2.2 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.10.jar
+	java-pkg_jar-from --into maven.embedder/external jdom-1.0 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}/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-2.2/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-2.1/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
+	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 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 streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/streambuffer.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-1.0/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 982bac9..b20dda5 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_p20150120 (20 Jan 2015)
+
+  20 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javacard-9999_p20150120.ebuild:
+  bumped to the latest sources
+
 *netbeans-javacard-9999_p20150119 (19 Jan 2015)
 
   19 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 45c6015..da48bc1 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -41,6 +41,7 @@ DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6
 DIST netbeans-trunk-nightly-201501160001-src.zip 201394511 SHA256 0a5e6e98692bceabdacc7ef41fe2b7fb59d9c879453982b2dc0e79d28f077714 SHA512 2a5be09537b1735e712ec373cc7f41b1e8b7753be5026ec3a1562d7347f4d5addf58bb9ea052051e0df2113e18a366e4095f84432dffb4b75b86b9ca913d3d56 WHIRLPOOL 7a8d35dcba4754cb809b8ac8710cbba8ba5452c4c4e13963a40e032b13241aa9b44328f3bbeea681bf535a31980e766331acaf5ae265bda5dd5790bda872d8dc
 DIST netbeans-trunk-nightly-201501180001-src.zip 201391445 SHA256 b1bf4373e5b799f830894b4ea7ab878ef09c64059758cebb2fa1b1a244718965 SHA512 bf1a40344c915a754f3b7baed759b6513e6a055bface5fe6c30c4e0adeb76fe7d2aaac5d344553ee5df505131cb05c7e2219c67514d4a962f681f9a39c685166 WHIRLPOOL f33d7bfe0174c7de81986a44578df8322fa8f2b46911e9f6fc05ffe8f0839e70b691d62ef9b6dc1b248aceb68760330ef69e86f026a83b6c0f27bcee3a4bc07b
 DIST netbeans-trunk-nightly-201501190001-src.zip 201391445 SHA256 ce4ec7706f80732c5c6d5764fb4cb0f2f82341d668e2680ed4d12c382e8541de SHA512 232c8beecd613bafca37af997c3aae0f35caa28a3a3f381553bc3264916f606540bcb5186c8a2a52ca21ce177ed413d6907865b4b42b80c102e7c636df736628 WHIRLPOOL 2176f82b120a7f9360f3b01cb970a8fcc5078e97da90ae0e870b37a53998beca6306b5f58bf9af3a15dc403f1dbb888457a56b0657a2f972b8e01ebe1b725abe
+DIST netbeans-trunk-nightly-201501200001-src.zip 201396862 SHA256 1a9378d8f52c4f617653d096aff287cf62212af8a6f878fe54cc468e4dd4bed7 SHA512 92fd39cda2d11816b9a01e0e5c26b3f527354a69efdc940cb27d5b17ee6493a07225d2698260db2bdc220e01d166ac42b5fb62f809d1e2eb84419c6e6abb3e14 WHIRLPOOL c3ba7155b5d376041d750c42f1ff8f8dec5bdbfedb470dea483a665978ef3982f087cb7a521f7892c264bb38d0876e4e7a08346ae4579338ba698ae7ee4ba456
 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
@@ -73,5 +74,6 @@ EBUILD netbeans-javacard-9999_p20150115.ebuild 4982 SHA256 f991980471a8e396fb289
 EBUILD netbeans-javacard-9999_p20150116.ebuild 4982 SHA256 0cb0051b965d98164b2a986b2327fb3b8ef6286c5e4e4d3b43947f25dbbcc9f8 SHA512 a3d9267162df1acc11c1ee649c7fbc3cb8d001d6fb33d93c010e48f3f767a3cafa601e03940e411180c9b1221bd4e5bc81051414b32b59c700a417f9d385e4c5 WHIRLPOOL 8a9d4d49c10a19203d1fcbd37627e75bf043ae2e7d7bcfb099b7054fe8f025536552b5368cf04d8711b234f075df0fd108a4c475723cee8e309a153bb9ab2107
 EBUILD netbeans-javacard-9999_p20150118.ebuild 4982 SHA256 c95b66b489d8c45a5a26d5caaed9103c4e1eab3026d93e978ba9fa9fc1e34a5b SHA512 8a81fdf2067c6604115e42ecf11556ad75ab6025fc47286e8a4bbc89a0eb83eb45365bd4176610beb646ae2d2ce2d0297c4902de15e4d55537afa730add50f2a WHIRLPOOL 359fce96adcb4f6ec4205c9e816adce2271d4356cf3247ad596e9105f891ee44c861df45305d6951da1fc1777ad9647a6b3e271450c7298855bd4048c4bce467
 EBUILD netbeans-javacard-9999_p20150119.ebuild 4982 SHA256 ecc54fac44a7b853c48d2d0b8c3cd0a9afe860c66cf1b93380ab096197137ff6 SHA512 807fbd475c4e51e6cf9909ce784c89cf747d62d7513b35e4aa1aca1584a8017ea1bc79deba6f633b9fc0c6ed2837695c0d8b1af7370383a324309ea617330d36 WHIRLPOOL cf1512c6d3a90956beef7bc8c5ac148c37451f0906a028b3bf5cedd0c9517a0628b4f4d3373c7937d2961f1b4a227ddbce7b878b56547b967e5c14033e40901c
-MISC ChangeLog 150760 SHA256 0097d0e76be70df3088a01debcd4b623bf19f02a77ac913d6deb4283b339784a SHA512 6f7bc6862190a21bf08e96e80e360feaa45687d6b2e5afa7d0b41bbe70982344cc3e413a1f53e151a1a3cb864d2205d151ad8a365768fb9d5cd9b893f87ff84f WHIRLPOOL 634dc2142dbef209bc57c437bda52d186420bf7403bbe3d7b384591e6454e1e6a0106a8c75b3bdfe2b9809040a58882efa687754c0a2b8251690973f5c21c710
+EBUILD netbeans-javacard-9999_p20150120.ebuild 4982 SHA256 067b3d60cc3fe809568b6bf77ffe1a8b86cf2eed9aa6121561dbaa78d2c5b96a SHA512 d4eedd7c3b68bf50a4fd02aa39bcb086b76f075f178851fadce4df85ede87e216e68ffbd55c08c481ae20bf19ec4a05501572671d7bb7dbb65bb96ade220f09e WHIRLPOOL 1120dbbf4d66ee8b9ce78a79cca2b89c69f7ac4a044297ce938a67df803db71b192b4677e3daa6c59ecff898f0a19c65dcfa309199999174818ed44d84423253
+MISC ChangeLog 150937 SHA256 9d3b23f457552837624942e86c14432ad967726ae24935b47de029c7fa800316 SHA512 763eb285fa37d15475631c552a3d2263822bb929755e6afe956e7efbf587c10829432e86d042b99f0bf2bef699f808401a2abb839c94800679d8b45096305053 WHIRLPOOL 796d004b06b67d182279af7fd8fb3ce4884db43e7be7a97d08547d3eb926416645511c5827a2c13718386bc5bbb0d2d25ffe148036da45d2ef57fd947b7f5ef2
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150120.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150120.ebuild
new file mode 100644
index 0000000..c7de931
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150120.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-01-20_00-01-55/zip/netbeans-trunk-nightly-201501200001-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 26ed43c..44d757f 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_p20150120 (20 Jan 2015)
+
+  20 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javadoc-9999_p20150120.ebuild:
+  bumped to the latest sources
+
 *netbeans-javadoc-9999_p20150119 (19 Jan 2015)
 
   19 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index ea90c1e..e6dc8bd 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -44,6 +44,7 @@ DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6
 DIST netbeans-trunk-nightly-201501160001-src.zip 201394511 SHA256 0a5e6e98692bceabdacc7ef41fe2b7fb59d9c879453982b2dc0e79d28f077714 SHA512 2a5be09537b1735e712ec373cc7f41b1e8b7753be5026ec3a1562d7347f4d5addf58bb9ea052051e0df2113e18a366e4095f84432dffb4b75b86b9ca913d3d56 WHIRLPOOL 7a8d35dcba4754cb809b8ac8710cbba8ba5452c4c4e13963a40e032b13241aa9b44328f3bbeea681bf535a31980e766331acaf5ae265bda5dd5790bda872d8dc
 DIST netbeans-trunk-nightly-201501180001-src.zip 201391445 SHA256 b1bf4373e5b799f830894b4ea7ab878ef09c64059758cebb2fa1b1a244718965 SHA512 bf1a40344c915a754f3b7baed759b6513e6a055bface5fe6c30c4e0adeb76fe7d2aaac5d344553ee5df505131cb05c7e2219c67514d4a962f681f9a39c685166 WHIRLPOOL f33d7bfe0174c7de81986a44578df8322fa8f2b46911e9f6fc05ffe8f0839e70b691d62ef9b6dc1b248aceb68760330ef69e86f026a83b6c0f27bcee3a4bc07b
 DIST netbeans-trunk-nightly-201501190001-src.zip 201391445 SHA256 ce4ec7706f80732c5c6d5764fb4cb0f2f82341d668e2680ed4d12c382e8541de SHA512 232c8beecd613bafca37af997c3aae0f35caa28a3a3f381553bc3264916f606540bcb5186c8a2a52ca21ce177ed413d6907865b4b42b80c102e7c636df736628 WHIRLPOOL 2176f82b120a7f9360f3b01cb970a8fcc5078e97da90ae0e870b37a53998beca6306b5f58bf9af3a15dc403f1dbb888457a56b0657a2f972b8e01ebe1b725abe
+DIST netbeans-trunk-nightly-201501200001-src.zip 201396862 SHA256 1a9378d8f52c4f617653d096aff287cf62212af8a6f878fe54cc468e4dd4bed7 SHA512 92fd39cda2d11816b9a01e0e5c26b3f527354a69efdc940cb27d5b17ee6493a07225d2698260db2bdc220e01d166ac42b5fb62f809d1e2eb84419c6e6abb3e14 WHIRLPOOL c3ba7155b5d376041d750c42f1ff8f8dec5bdbfedb470dea483a665978ef3982f087cb7a521f7892c264bb38d0876e4e7a08346ae4579338ba698ae7ee4ba456
 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
@@ -76,5 +77,6 @@ EBUILD netbeans-javadoc-9999_p20150115.ebuild 6234 SHA256 9bb821fafc961a68a3cdd0
 EBUILD netbeans-javadoc-9999_p20150116.ebuild 6234 SHA256 53365a599b58eb3d715b537a15fa6b8a3f164299c8e57ad501a3b572305f970b SHA512 d2cf1c4b4e6a6cb84149e5aa89a860f59d0e41ff9736c9219953ed1e9b273a3c76a33b5f7d029855c2312aff689466e4779cb0fc66d6237d7e7f6409b927df70 WHIRLPOOL 914cd995256470301b884f447dcce901e9cbe53ca5a151a607548b82e5d2aefc2b9f5fa45d6fde854803ae2fd1299b669088948b751a5ec12c01da4d4db13415
 EBUILD netbeans-javadoc-9999_p20150118.ebuild 6234 SHA256 521289b829609fe6098b51496c5b70440d4a991b3136d9d2462ccaca453209a6 SHA512 92a95f2a97fd11165c8939bf731ce8ec04310d5e56ea8a5e7ff55877272457dc88cdbcc4ce3400b4e77891603f8e559aae833108a488da0b26a38227db276a34 WHIRLPOOL aa559c5a51cd023d72e30045f116bdfd51e7eb5283997297fe6c2080d1d3e438c63581b54b4c9dbe885e3684284d43575bf76bfb1cc1121a1d73284416446ca4
 EBUILD netbeans-javadoc-9999_p20150119.ebuild 6234 SHA256 40617063c7a7f13db25570471d7d12a70d6e1ebf6414627b6a9fd3400139cbcc SHA512 577c1e2b2f0f4705ebf7cf375467d4d05e44a126a1876da5814ae790fc34230b5311fc5f8493b18e88f2335f2d19279e96196a50785f6cc31fb5312002c91b3e WHIRLPOOL 0e05e81f0041499f4f080da08bd0a76e6405ef6b8ba913e9d8a5d3e3ed30b59b91d70699b5582e6c28c579e3e9a06e81a11b91602bb21a0dec2446974e4f968c
-MISC ChangeLog 148717 SHA256 04d2ee251c9681554aa0dbf8b1ba563d443047e43134eb03e22269ec3b79fd3b SHA512 711bd1ec31e125b1b45fb938f8effa74d609dcd74300244f578162063eca5ac6cfba1444216f16fa79d6c960afadb7736649089a8c24690b35e45ed89f7a6afc WHIRLPOOL cc50ce0eca9d10d0e219e248ad5957101a48b6f341434b5d25eee5a00bab2c28b99fc338f55bb9b6b871624262bf3c281d028351579bef4576b945c4b89a3400
+EBUILD netbeans-javadoc-9999_p20150120.ebuild 6234 SHA256 009a7ca34a96307c78d9c83dce750649810d56d10d093e21b1709064886ac8d5 SHA512 f1b2f4ceef3880c9f79936db788a8422306d0f00c5f2c7a809cb1ed0403798b1948197ad6fb19f97a75f7f67cc5840b3cd3c1e4d7fa414f5ad58bb6af1248d32 WHIRLPOOL 3c1bfbf9cbfd4273bd5f029d448027aa04b6696b3ce39c571407b6010367072dc4c2e58f3355ac363b272eb45629d4606cca6fdca6be83cfdb1053b41dd7555e
+MISC ChangeLog 148892 SHA256 0a73b7b32323ae140850eb745d02cc5cb0c459efddf3dfc9064d163a760175da SHA512 67c159ffbbc48bd385b944cafa6081286a7952f11699f17a7f4b6db9e90246a7322bbd5883985d99628ab918ff3de499dc12a7f8c0d7c79eba333e129049ee22 WHIRLPOOL 45ef0831a9a1880b5114d220eb44a90cae68555ced05a5eed3b8faa43adad5c983f789bbba7c864ce2ef93059cd463f281bf72579a5cdbd8265d4c7b53033d62
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150120.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150120.ebuild
new file mode 100644
index 0000000..b12faef
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150120.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-01-20_00-01-55/zip/netbeans-trunk-nightly-201501200001-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.10.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 44314fe..46c838f 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_p20150120 (20 Jan 2015)
+
+  20 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javafx-9999_p20150120.ebuild:
+  bumped to the latest sources
+
 *netbeans-javafx-9999_p20150119 (19 Jan 2015)
 
   19 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 408d6ab..7640b79 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -43,6 +43,7 @@ DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6
 DIST netbeans-trunk-nightly-201501160001-src.zip 201394511 SHA256 0a5e6e98692bceabdacc7ef41fe2b7fb59d9c879453982b2dc0e79d28f077714 SHA512 2a5be09537b1735e712ec373cc7f41b1e8b7753be5026ec3a1562d7347f4d5addf58bb9ea052051e0df2113e18a366e4095f84432dffb4b75b86b9ca913d3d56 WHIRLPOOL 7a8d35dcba4754cb809b8ac8710cbba8ba5452c4c4e13963a40e032b13241aa9b44328f3bbeea681bf535a31980e766331acaf5ae265bda5dd5790bda872d8dc
 DIST netbeans-trunk-nightly-201501180001-src.zip 201391445 SHA256 b1bf4373e5b799f830894b4ea7ab878ef09c64059758cebb2fa1b1a244718965 SHA512 bf1a40344c915a754f3b7baed759b6513e6a055bface5fe6c30c4e0adeb76fe7d2aaac5d344553ee5df505131cb05c7e2219c67514d4a962f681f9a39c685166 WHIRLPOOL f33d7bfe0174c7de81986a44578df8322fa8f2b46911e9f6fc05ffe8f0839e70b691d62ef9b6dc1b248aceb68760330ef69e86f026a83b6c0f27bcee3a4bc07b
 DIST netbeans-trunk-nightly-201501190001-src.zip 201391445 SHA256 ce4ec7706f80732c5c6d5764fb4cb0f2f82341d668e2680ed4d12c382e8541de SHA512 232c8beecd613bafca37af997c3aae0f35caa28a3a3f381553bc3264916f606540bcb5186c8a2a52ca21ce177ed413d6907865b4b42b80c102e7c636df736628 WHIRLPOOL 2176f82b120a7f9360f3b01cb970a8fcc5078e97da90ae0e870b37a53998beca6306b5f58bf9af3a15dc403f1dbb888457a56b0657a2f972b8e01ebe1b725abe
+DIST netbeans-trunk-nightly-201501200001-src.zip 201396862 SHA256 1a9378d8f52c4f617653d096aff287cf62212af8a6f878fe54cc468e4dd4bed7 SHA512 92fd39cda2d11816b9a01e0e5c26b3f527354a69efdc940cb27d5b17ee6493a07225d2698260db2bdc220e01d166ac42b5fb62f809d1e2eb84419c6e6abb3e14 WHIRLPOOL c3ba7155b5d376041d750c42f1ff8f8dec5bdbfedb470dea483a665978ef3982f087cb7a521f7892c264bb38d0876e4e7a08346ae4579338ba698ae7ee4ba456
 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
@@ -74,5 +75,6 @@ EBUILD netbeans-javafx-9999_p20150115.ebuild 4723 SHA256 5354f5e69334a2f6989aa7e
 EBUILD netbeans-javafx-9999_p20150116.ebuild 4723 SHA256 63f49967b2218fd37554ba16317ce7781c67a6f63c29b2932caaf96995e0e892 SHA512 41c75c5187ab0fb127e40f9b8fa3f05bc4021a4a65b43b5750d8ce8ceab602062d0354b5edaf0bc4c8c216f063ccb55853fbd09de9f5ef8a3d09fcd9bdd8f3da WHIRLPOOL 45eb0c5cc0c0c427b1b1f2f479c21d2cafc88edb8f8838912fb71f0bb1a73f132c7ee80629b73ffa745a5b1f1b994da714420a02719fd9432074e8690ace7495
 EBUILD netbeans-javafx-9999_p20150118.ebuild 4723 SHA256 2efdf04bd6892ec153f459e98684f130e81d2482e5f6333ea19f7f2c898e09f7 SHA512 693ca81e085ded76351a67553bb33a77b3cb2c894191695c47374b2308728a80588ee07aa50b9e17cc3303f11343a7735844d112f951dbee35c91ea1326ca155 WHIRLPOOL eb6f0f8bcef73bfc76c4fd92fe47fe5017b2cc7d826b5b33895deb257237f960c43552e41677433756d2a17f92f9cb508523d7a30dfcd19313bd078d23170e5e
 EBUILD netbeans-javafx-9999_p20150119.ebuild 4723 SHA256 0b3275a0b4924eb68e19e8efcfdcbb13bf2d748ab9db2d006ef02e155a39d725 SHA512 3836a7185a537c3e5143de031fc1ecb0f3e3f312e485c2b209e7533c3ba909db50cb0d4cb0ff58a029761f2c2e6953d7f4b9b705b004dc2cd2ad7625060d69a4 WHIRLPOOL 60b88361fdb8596d9c152b61c7be7ab89dd1da59a3f20b70b29fb9e78f421be0d931c56e25e2213f2fc80623e59544ea2385d58a6f033d8d039e1f306b313625
-MISC ChangeLog 133541 SHA256 eda2b1eef69f0a82f3c5035940c2d952e2d0ecc7448aa287b0fbac32720a7832 SHA512 17e1378c5a9c4b56de9ead93ece5c0d76f9ae73d50317db4e29e1f3b7eb5e55393feb775ab90042fe202013166b6e620d1ea72d20f03824a0089dfc3b342bc64 WHIRLPOOL ccb92e6e3722020fd7ac71dcb6b91cf399b059dd53db9c7bd81b41b41b02ae7b7e9ac2b26d050b7bda296cb8f504c5d9c2c0617f70c6f965f3185d70fa85fc00
+EBUILD netbeans-javafx-9999_p20150120.ebuild 4723 SHA256 9b12fe42fa5a2c05cfc2dbfeac85b493538584b49e9318e1e4d0bb5fe71ffbf3 SHA512 fc73b0fc4dade61e2bde4c8164ef42e2bc0b1e36d5985e6b2f0a6c58a6ba2229411d26e7772a05801eccf3c5e7506f9f166b7e13a2761335beba4a21a381c0f5 WHIRLPOOL 41100bda521a11267f2aa51e95ac97e4c905c790153c904b7db85cb1abb52ba054d297f94112cd0e46276c74cd5a8bde4c5de99bba9f8c5b482e6ff0902adec6
+MISC ChangeLog 133714 SHA256 f0978f9fe8b9f5f96f1cc1a52ce01c3a136828de83231505f238d4b45209388d SHA512 b71cb5620bef491c05ff930c048873821cd8796cff0e2fa49c8709284c4091f17d16f580b8999454bb568d46f230d438f1b347dd05cf125e00db5b41abbae56c WHIRLPOOL cbc0c68944563869e3c204f7b1b5c5255e29eb27e7b9dd4de4a2de2158caca5d2502781899d0e18da863edc9599f000e4a641b1d6b2c5112fd64a5e52adffaaa
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150120.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150120.ebuild
new file mode 100644
index 0000000..1d6c4de
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150120.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-01-20_00-01-55/zip/netbeans-trunk-nightly-201501200001-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/0F7FC8D69950B86D5F67529B5C551DB84C5BCF87-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}"/0F7FC8D69950B86D5F67529B5C551DB84C5BCF87-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.10.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 843c9e2..046ba25 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_p20150120 (20 Jan 2015)
+
+  20 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-mobility-9999_p20150120.ebuild:
+  bumped to the latest sources
+
 *netbeans-mobility-9999_p20150119 (19 Jan 2015)
 
   19 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index c2b065b..7d14b60 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -47,6 +47,7 @@ DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6
 DIST netbeans-trunk-nightly-201501160001-src.zip 201394511 SHA256 0a5e6e98692bceabdacc7ef41fe2b7fb59d9c879453982b2dc0e79d28f077714 SHA512 2a5be09537b1735e712ec373cc7f41b1e8b7753be5026ec3a1562d7347f4d5addf58bb9ea052051e0df2113e18a366e4095f84432dffb4b75b86b9ca913d3d56 WHIRLPOOL 7a8d35dcba4754cb809b8ac8710cbba8ba5452c4c4e13963a40e032b13241aa9b44328f3bbeea681bf535a31980e766331acaf5ae265bda5dd5790bda872d8dc
 DIST netbeans-trunk-nightly-201501180001-src.zip 201391445 SHA256 b1bf4373e5b799f830894b4ea7ab878ef09c64059758cebb2fa1b1a244718965 SHA512 bf1a40344c915a754f3b7baed759b6513e6a055bface5fe6c30c4e0adeb76fe7d2aaac5d344553ee5df505131cb05c7e2219c67514d4a962f681f9a39c685166 WHIRLPOOL f33d7bfe0174c7de81986a44578df8322fa8f2b46911e9f6fc05ffe8f0839e70b691d62ef9b6dc1b248aceb68760330ef69e86f026a83b6c0f27bcee3a4bc07b
 DIST netbeans-trunk-nightly-201501190001-src.zip 201391445 SHA256 ce4ec7706f80732c5c6d5764fb4cb0f2f82341d668e2680ed4d12c382e8541de SHA512 232c8beecd613bafca37af997c3aae0f35caa28a3a3f381553bc3264916f606540bcb5186c8a2a52ca21ce177ed413d6907865b4b42b80c102e7c636df736628 WHIRLPOOL 2176f82b120a7f9360f3b01cb970a8fcc5078e97da90ae0e870b37a53998beca6306b5f58bf9af3a15dc403f1dbb888457a56b0657a2f972b8e01ebe1b725abe
+DIST netbeans-trunk-nightly-201501200001-src.zip 201396862 SHA256 1a9378d8f52c4f617653d096aff287cf62212af8a6f878fe54cc468e4dd4bed7 SHA512 92fd39cda2d11816b9a01e0e5c26b3f527354a69efdc940cb27d5b17ee6493a07225d2698260db2bdc220e01d166ac42b5fb62f809d1e2eb84419c6e6abb3e14 WHIRLPOOL c3ba7155b5d376041d750c42f1ff8f8dec5bdbfedb470dea483a665978ef3982f087cb7a521f7892c264bb38d0876e4e7a08346ae4579338ba698ae7ee4ba456
 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
@@ -79,5 +80,6 @@ EBUILD netbeans-mobility-9999_p20150115.ebuild 4418 SHA256 d6ef4aef261e28e40e075
 EBUILD netbeans-mobility-9999_p20150116.ebuild 4418 SHA256 e12cb3cd50d7068f19a4dae8a8d7f7c4fe47a16a3d1936c82828bb12a5988616 SHA512 b4769f05709c9e9eb448cd876ae0f83e442036b65f8440d29015ae384b3a088b9626d9a0825dd3937cb86fbc09f5dd01ecfa8649d8046f2fdb08a300f1a95133 WHIRLPOOL 4c522ae1fa0eb1557104a5f69618f6bd8f95f3c0d1954fe9c26fdc4f693b389039a28e26ed5cbffa7b9634458f9021827cc703f2ec20407733101e07ca38094b
 EBUILD netbeans-mobility-9999_p20150118.ebuild 4418 SHA256 c3dd3881bfebe3a69015260d7cfff93fdda8b7186fdfed738a1a44dd60281504 SHA512 efa64491f54d4e4c51639bb949d57d25a0413be71752e062cfcaec7382abe2dd4ced5754513eba25efbccc9fc7833aef1c41948ef16f545945df81a84fc00d72 WHIRLPOOL 51ec29a6fa004a5990af9878b492ad53a0dc83faf6e308cf5d9f4f53e30d1b09ec3b870c1a68c8a894e5f2452d82ed12e46823f3a78f3f5febafa6debaf9d527
 EBUILD netbeans-mobility-9999_p20150119.ebuild 4418 SHA256 625352f3e597b36221b0adbc916b8968734a0b8e468e48853eaa85531ffab295 SHA512 80d3f3c0f19627aa593c93945d922d9077fa49d05367a435fa14d4c6ba5d73c5377f305c25e3d3f1608ea4207d50fe474cc46ea6e1f7d686ccb4e7430b98dd54 WHIRLPOOL cf018c85e9ab7df36aab59782562d7984b62a1cc4c0ae5795d3e48756e78bf542abfc9fdfa98c70ea3f054429ca05129f9a7c0d4bb6e138f9d2bd87db691356b
-MISC ChangeLog 150901 SHA256 30e39c8e7f5363258755ec971c1186d65d83d58d256c945ac336257dc4999ed4 SHA512 347f8e3b301787cd74a6c0b661733f9cec57c361224a41c0dd12e617962ea137ed39a57dda5c972dbb268b64a729190522c935ec2dd7280eba6e0f03eb72def5 WHIRLPOOL 1d8df939324faf4ae02714e800f4595307d1ec93ded216a71fdef51a4254556ab282be2eaf355f617ac209fe990a482a90d0f99365f44e9715dab5af8f81ed05
+EBUILD netbeans-mobility-9999_p20150120.ebuild 4418 SHA256 b66c5873d21fd6d8d27606551b2e2b03468962d17109b86abed22c283c71e810 SHA512 6e9c52b42b28f5893f6083ad1892909fc4c74c90ba748f4e3667456af350d79d785958ee6745225a36efa8ded5c5efe2e37b329cf943b165de414639a523311e WHIRLPOOL 1f682d1e7a4a50c45e90d362de05e9c6450d6a7d8406d9afc056cea7e2e0793be431bd0775038f81ddd043d50cd1399f61599415c7a3d54cc9ce0f43211ad75a
+MISC ChangeLog 151078 SHA256 a8965d53ed2fbf87ca72243fd9774b5329f7048200c7db43cce381ddc29453b9 SHA512 c86f87dd8adb8aac7de6e84d3d22ae466e3f3b8fbbf3d5c39052b7bfd43685405505906281c193113d8ef37346c7ae2686f27ff09d6321817873558baa9ad132 WHIRLPOOL dac7eee183beb4ca6c926e656e343d7ff926bdfad1dbf8b2c860129d89968691ff8b622c7902ec1555d194dd5a2d108be1f371e68348966d8d5af784d7635bd5
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150120.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150120.ebuild
new file mode 100644
index 0000000..72d6580
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150120.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-01-20_00-01-55/zip/netbeans-trunk-nightly-201501200001-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 af84ed1..ba800b4 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_p20150120 (20 Jan 2015)
+
+  20 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-nb-9999_p20150120.ebuild:
+  bumped to the latest sources
+
 *netbeans-nb-9999_p20150119 (19 Jan 2015)
 
   19 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index bfcab62..a7de8bd 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -46,6 +46,7 @@ DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6
 DIST netbeans-trunk-nightly-201501160001-src.zip 201394511 SHA256 0a5e6e98692bceabdacc7ef41fe2b7fb59d9c879453982b2dc0e79d28f077714 SHA512 2a5be09537b1735e712ec373cc7f41b1e8b7753be5026ec3a1562d7347f4d5addf58bb9ea052051e0df2113e18a366e4095f84432dffb4b75b86b9ca913d3d56 WHIRLPOOL 7a8d35dcba4754cb809b8ac8710cbba8ba5452c4c4e13963a40e032b13241aa9b44328f3bbeea681bf535a31980e766331acaf5ae265bda5dd5790bda872d8dc
 DIST netbeans-trunk-nightly-201501180001-src.zip 201391445 SHA256 b1bf4373e5b799f830894b4ea7ab878ef09c64059758cebb2fa1b1a244718965 SHA512 bf1a40344c915a754f3b7baed759b6513e6a055bface5fe6c30c4e0adeb76fe7d2aaac5d344553ee5df505131cb05c7e2219c67514d4a962f681f9a39c685166 WHIRLPOOL f33d7bfe0174c7de81986a44578df8322fa8f2b46911e9f6fc05ffe8f0839e70b691d62ef9b6dc1b248aceb68760330ef69e86f026a83b6c0f27bcee3a4bc07b
 DIST netbeans-trunk-nightly-201501190001-src.zip 201391445 SHA256 ce4ec7706f80732c5c6d5764fb4cb0f2f82341d668e2680ed4d12c382e8541de SHA512 232c8beecd613bafca37af997c3aae0f35caa28a3a3f381553bc3264916f606540bcb5186c8a2a52ca21ce177ed413d6907865b4b42b80c102e7c636df736628 WHIRLPOOL 2176f82b120a7f9360f3b01cb970a8fcc5078e97da90ae0e870b37a53998beca6306b5f58bf9af3a15dc403f1dbb888457a56b0657a2f972b8e01ebe1b725abe
+DIST netbeans-trunk-nightly-201501200001-src.zip 201396862 SHA256 1a9378d8f52c4f617653d096aff287cf62212af8a6f878fe54cc468e4dd4bed7 SHA512 92fd39cda2d11816b9a01e0e5c26b3f527354a69efdc940cb27d5b17ee6493a07225d2698260db2bdc220e01d166ac42b5fb62f809d1e2eb84419c6e6abb3e14 WHIRLPOOL c3ba7155b5d376041d750c42f1ff8f8dec5bdbfedb470dea483a665978ef3982f087cb7a521f7892c264bb38d0876e4e7a08346ae4579338ba698ae7ee4ba456
 EBUILD netbeans-nb-7.0.1.ebuild 5116 SHA256 17ac4a9aa7931d052a899ad8649bed42d5c37a06d913e0dc8ded118d7ef01c47 SHA512 932964fcc4d8d614a2ad8531eecd9298b89f06ac97db68e140e77bceb5d9c08c35524ae4766c18f5467bb01391a9c9f29cd4c5e45c29664b91340a33b0804d7e WHIRLPOOL 0e935fc1c63b61a97e60941111cd30fe4f7b740743013074f7722f3556473ccdba8bcd70ac6f544c67e2a60dd2d7c96abc9bf6bfc51aa6e9ff3135d041ebf3a1
 EBUILD netbeans-nb-7.1.2.ebuild 4987 SHA256 075ef11ab57b236061e4df3e905524ecfba2966c5d735d113b878a03219a9cc1 SHA512 321182e1780acfdbff56c1c84748897cf8c4dcf9fc94d0a6db71a018968e8f96e479a2dbb2f97655d50ee836ac1a81fdd62f6f04ba1b2d54157158e577c2b986 WHIRLPOOL 3d3742c6e90f0231ecabf5200446d00900204f51b9fb2be92954668dae86584d8ef477be11cad462a9721a04a1bc97673b8d8d808ef49f0345d979022471d919
 EBUILD netbeans-nb-7.2.ebuild 4970 SHA256 79d73ca57dd63e25afccd44816dd248e79f6974dd7e9ebbf4b3b11eb659092d9 SHA512 083317f6944c5fe38507fbca18804888e25c23070420a3080bb68bf00be95e520541c381482a6c55ff60656b36f8dd3fac60f2c605e4e3ee0ae92427faa468da WHIRLPOOL 7f02ab258612c5035b26326f25aaa08bf60fc0ff3108a2bf61dbcde9fe845e647f91319938206742a5f131fe905678833f3ad2449f68efef7e6ed4203f7538f3
@@ -78,5 +79,6 @@ EBUILD netbeans-nb-9999_p20150115.ebuild 5013 SHA256 103a0cfbd35f674f55c41196e64
 EBUILD netbeans-nb-9999_p20150116.ebuild 5013 SHA256 c26f290012171c53491cfb559ec705cc7a8e3e93d61d19c0ca941b6a3ba8ee28 SHA512 0cee6db475842b2a539fe6f46429867f27aaeb22efb863835f982af9cbf883a4bcbc26f72d77595790eb4a67337be28addace80d291eb75f78c9a4dd6fa969ca WHIRLPOOL 2f8808e16ff24d402a302e79e9c85a3960f561516f98edc91530d896657867108c72f469977fc91c267f03701b053a215ea400a16129f53116c3c8b77e5dbd3f
 EBUILD netbeans-nb-9999_p20150118.ebuild 5013 SHA256 8f83adc6636fb2ce02f54e7c6e65022308364a98bf9628a034927adeeb8e1caf SHA512 246bd1380b8a9c28e382478bed3630a7ece971dc8ea6c2a7e20340e30e357c9b832bc1c72edd9d884b8f2988e8840637a7969e295e27710001ed8a72f8ce05ad WHIRLPOOL 1c9a6b65bbe6d568c13f4afefba4419c7c2b67e5fb2b830d6e9c34bf4270daf627e1888f0dbedeb995746b6b8d24b258effd33c26355eaf4488fc2330c769246
 EBUILD netbeans-nb-9999_p20150119.ebuild 5013 SHA256 b9008bbdb6f1c0131b1372cae804b2cc07774b3c89905883c58238d3b1f45595 SHA512 de9e39a10c058a8cd89f628cc37bd04079d24b6f0845864461ac30c2fabad74cfe90e43a49e2f50723e0c02ec0366baa584b3a136925fc5238210f656c92fb81 WHIRLPOOL dbe8f401dbb7ba9522dd62c0186b3ff86024b927621300f8d117d1c2c4b2abe10993b255ba21fbba74ca2b6ff5e81c36a3e8701cb0e0da657f0deae5434f11e9
-MISC ChangeLog 139928 SHA256 d3b9965df89eae0f60d768e868b3abc07008ef0d0547802dcf1a72014723a000 SHA512 da57437f8dddecb1e3905698b537a54f48f906c593464e4e95167b9356a319d2a62827533b3c80027f3119e80893c4db49b77e18279a348ec9668387fc73b460 WHIRLPOOL ae8ca26d3423bc433c085e831b6dac5c9393655d9dea01993358ad6376743dd91f9fbbe5f7dd1271f58e14f9f0987b8d49b9751deab3f23d6ef1c1a1689e6a10
+EBUILD netbeans-nb-9999_p20150120.ebuild 5013 SHA256 1981eb380d880576444bb00c7547670c2df74e1d5a7fbd9a48a300ef99572e30 SHA512 bd6891d40f3c5b328d017d5671d0e5a97c4b9e085b502145c9f6833b1a7cc461b790a4a296270db6a3458cf0f73ff95dea3dc56cab238192e05a5ee09de3a761 WHIRLPOOL 62de3cc3328d8611cdc9f6b7d1516184f318b69f64fd880ceea4cba01d222de2da7bbe06fb137390e498b094fcf6c237370f6335918bb5b7d156b4f7a4713fa1
+MISC ChangeLog 140093 SHA256 f5b08d61cd40642551f4c829a07ed6619854a03f3d62e24a8305c5eac7e198bb SHA512 662e315767291ca2e6c87470655f4e58deff66bfed15c276c178380fe62aaf6c98dec9b4dd82c9d79a686f9e90b89bb8cbad92ae538e20ab3ac206e9fc4f6050 WHIRLPOOL e38c5384b716febe4ae903157ae905f92a15025d4d22670ce988c967d2867f8be72286266049df2296f2e8290ff9dc94dbf5b3ff12ca00314458e606de9f0f1b
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20150120.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20150120.ebuild
new file mode 100644
index 0000000..74926ec
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20150120.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-01-20_00-01-55/zip/netbeans-trunk-nightly-201501200001-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 http://www.gentoo.org/doc/en/keychain-guide.xml"
+	fi
+}

diff --git a/dev-java/netbeans-php/ChangeLog b/dev-java/netbeans-php/ChangeLog
index a5d6f21..23741ce 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_p20150120 (20 Jan 2015)
+
+  20 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-php-9999_p20150120.ebuild:
+  bumped to the latest sources
+
 *netbeans-php-9999_p20150119 (19 Jan 2015)
 
   19 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index 6415ea9..9308f13 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -49,6 +49,7 @@ DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6
 DIST netbeans-trunk-nightly-201501160001-src.zip 201394511 SHA256 0a5e6e98692bceabdacc7ef41fe2b7fb59d9c879453982b2dc0e79d28f077714 SHA512 2a5be09537b1735e712ec373cc7f41b1e8b7753be5026ec3a1562d7347f4d5addf58bb9ea052051e0df2113e18a366e4095f84432dffb4b75b86b9ca913d3d56 WHIRLPOOL 7a8d35dcba4754cb809b8ac8710cbba8ba5452c4c4e13963a40e032b13241aa9b44328f3bbeea681bf535a31980e766331acaf5ae265bda5dd5790bda872d8dc
 DIST netbeans-trunk-nightly-201501180001-src.zip 201391445 SHA256 b1bf4373e5b799f830894b4ea7ab878ef09c64059758cebb2fa1b1a244718965 SHA512 bf1a40344c915a754f3b7baed759b6513e6a055bface5fe6c30c4e0adeb76fe7d2aaac5d344553ee5df505131cb05c7e2219c67514d4a962f681f9a39c685166 WHIRLPOOL f33d7bfe0174c7de81986a44578df8322fa8f2b46911e9f6fc05ffe8f0839e70b691d62ef9b6dc1b248aceb68760330ef69e86f026a83b6c0f27bcee3a4bc07b
 DIST netbeans-trunk-nightly-201501190001-src.zip 201391445 SHA256 ce4ec7706f80732c5c6d5764fb4cb0f2f82341d668e2680ed4d12c382e8541de SHA512 232c8beecd613bafca37af997c3aae0f35caa28a3a3f381553bc3264916f606540bcb5186c8a2a52ca21ce177ed413d6907865b4b42b80c102e7c636df736628 WHIRLPOOL 2176f82b120a7f9360f3b01cb970a8fcc5078e97da90ae0e870b37a53998beca6306b5f58bf9af3a15dc403f1dbb888457a56b0657a2f972b8e01ebe1b725abe
+DIST netbeans-trunk-nightly-201501200001-src.zip 201396862 SHA256 1a9378d8f52c4f617653d096aff287cf62212af8a6f878fe54cc468e4dd4bed7 SHA512 92fd39cda2d11816b9a01e0e5c26b3f527354a69efdc940cb27d5b17ee6493a07225d2698260db2bdc220e01d166ac42b5fb62f809d1e2eb84419c6e6abb3e14 WHIRLPOOL c3ba7155b5d376041d750c42f1ff8f8dec5bdbfedb470dea483a665978ef3982f087cb7a521f7892c264bb38d0876e4e7a08346ae4579338ba698ae7ee4ba456
 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
@@ -81,5 +82,6 @@ EBUILD netbeans-php-9999_p20150115.ebuild 4423 SHA256 d2086c51e219a41ce60cf68e71
 EBUILD netbeans-php-9999_p20150116.ebuild 4423 SHA256 1fb33578bd88f2cd8fe8a5d9f6a2b31f656ca564a9636adad3a203dc0ed7dce9 SHA512 165dfcca55da8d7bdbbabd52aece82c430337b7fda701069f1b620c3f80fdf5d51296b5de40984740345046b4c5baab0de2c243d7083b4a08acb5a11e05d8224 WHIRLPOOL 896f667876e2ca186d0fc20ab53dda6335cb61a4c30561cc2b8e79973ab400e8140d29c82d37ff21758547ac7b4fc093ce564634a20f6884e31eb3844a9e29b6
 EBUILD netbeans-php-9999_p20150118.ebuild 4423 SHA256 8f63409287fe2fc821fb23a73deb8df7c3ddf6c4882edf4e54f59167ad38e8b5 SHA512 72ded40ccb7dab63954e3dcf4653634733c54c2f03f90c3398b273d4ee32ad9a348b2cb14e756b5774544d8bab897f5244955d7601743d510ad2239e9fd796c0 WHIRLPOOL 6f080a0b973585b081ce7be6bd0f760b7a69dcce590a6033ab9c63ef74dc23630c3491df76c27833a493d97383ec72ec7543023b09428ed048dc8fbc66e3808e
 EBUILD netbeans-php-9999_p20150119.ebuild 4423 SHA256 7bec48e383dae477d40987f7cc0f880ed3d7f5f19e896085a0e40636ecf75948 SHA512 ebf4abbfa0757a1d214e97fb2d6b1d51cd1545003cc9f5e18792b686cd3aeeb25ddb4d69d15d77d44d37819f4a4d4926f877cf8ade4959723f7eb4237d6a371d WHIRLPOOL 8e38e558c7dcef7d51f6bd8878aefe36abbef4a5f191f2baf95a5cab6a09b757286358cdae91b8add3d3788d671b044c7f386d65c5ddb2a1e3971f289417dbcc
-MISC ChangeLog 140762 SHA256 26223b6618512f74c61cc5fb966e2af20adddafd27948071eee856d675fc34eb SHA512 50b7153a22bf4ad585666180a71fa20543a1789b41b918afdd760e52b3affe77485af4952e0f3fee4216dfde8c30891c35eae7fc8dadfb40c80458156bf541de WHIRLPOOL 41884dd64506ca49367c2e4b1d4d8bb71e1aa6add1624373553717cd82c1c23effd094e47d4a1b4d90ab5606f45e8919afeab9ea158c5a4cd5941a1dbeababfc
+EBUILD netbeans-php-9999_p20150120.ebuild 4423 SHA256 5d84459ce0b1f2f9f20b1f7bddf28edda6e06452dbb1e9e394c3c54b1fa9aae6 SHA512 d1341e3e29574bcd95a2ded7f4b7887ebfc3e88eec31f9adfd8b4a92a13dd1bc794c0b4826cf054fe2f5d44aeb42e9b766fc267b32a8adb2b984d038abd77a4c WHIRLPOOL 9aa2845d37b87419ea26af49cdd3c35ef40b2b280a9c1b6fa582c966f4bce8ddf52d24a294bcac1d60556b7b88cf79c06c2d4f32eb2b294c87d61a4bb151e7f9
+MISC ChangeLog 140929 SHA256 09d42507980bcf49f88739e4a2dcfb383f86827b6cdff1276af3c36c3ae249fe SHA512 334f179a866d9b385bba540eab985624b593e694bccebb10dcca7a245f09d5996a0a7f8585d73bc22110dcc566be1ac9affcb5e822262f2bcad551c3c7a9b5dd WHIRLPOOL ae923a66404a6cc4bc545f31ba084032c380ae1871309c946e9c92c025249c0ec4856aff745995fcbad36cb6d9bd8a2c79e353ae733757b0a72ecf9c2bea508a
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20150120.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20150120.ebuild
new file mode 100644
index 0000000..8f94909
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20150120.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-01-20_00-01-55/zip/netbeans-trunk-nightly-201501200001-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/BFB982F9B33E2F1A1766C212C8208793F9B7E77C-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}"/BFB982F9B33E2F1A1766C212C8208793F9B7E77C-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 f3119fd..4f610da 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_p20150120 (20 Jan 2015)
+
+  20 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-platform-9999_p20150120.ebuild:
+  bumped to the latest sources
+
 *netbeans-platform-9999_p20150119 (19 Jan 2015)
 
   19 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 7f7a799..ab07c78 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -72,6 +72,7 @@ DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6
 DIST netbeans-trunk-nightly-201501160001-src.zip 201394511 SHA256 0a5e6e98692bceabdacc7ef41fe2b7fb59d9c879453982b2dc0e79d28f077714 SHA512 2a5be09537b1735e712ec373cc7f41b1e8b7753be5026ec3a1562d7347f4d5addf58bb9ea052051e0df2113e18a366e4095f84432dffb4b75b86b9ca913d3d56 WHIRLPOOL 7a8d35dcba4754cb809b8ac8710cbba8ba5452c4c4e13963a40e032b13241aa9b44328f3bbeea681bf535a31980e766331acaf5ae265bda5dd5790bda872d8dc
 DIST netbeans-trunk-nightly-201501180001-src.zip 201391445 SHA256 b1bf4373e5b799f830894b4ea7ab878ef09c64059758cebb2fa1b1a244718965 SHA512 bf1a40344c915a754f3b7baed759b6513e6a055bface5fe6c30c4e0adeb76fe7d2aaac5d344553ee5df505131cb05c7e2219c67514d4a962f681f9a39c685166 WHIRLPOOL f33d7bfe0174c7de81986a44578df8322fa8f2b46911e9f6fc05ffe8f0839e70b691d62ef9b6dc1b248aceb68760330ef69e86f026a83b6c0f27bcee3a4bc07b
 DIST netbeans-trunk-nightly-201501190001-src.zip 201391445 SHA256 ce4ec7706f80732c5c6d5764fb4cb0f2f82341d668e2680ed4d12c382e8541de SHA512 232c8beecd613bafca37af997c3aae0f35caa28a3a3f381553bc3264916f606540bcb5186c8a2a52ca21ce177ed413d6907865b4b42b80c102e7c636df736628 WHIRLPOOL 2176f82b120a7f9360f3b01cb970a8fcc5078e97da90ae0e870b37a53998beca6306b5f58bf9af3a15dc403f1dbb888457a56b0657a2f972b8e01ebe1b725abe
+DIST netbeans-trunk-nightly-201501200001-src.zip 201396862 SHA256 1a9378d8f52c4f617653d096aff287cf62212af8a6f878fe54cc468e4dd4bed7 SHA512 92fd39cda2d11816b9a01e0e5c26b3f527354a69efdc940cb27d5b17ee6493a07225d2698260db2bdc220e01d166ac42b5fb62f809d1e2eb84419c6e6abb3e14 WHIRLPOOL c3ba7155b5d376041d750c42f1ff8f8dec5bdbfedb470dea483a665978ef3982f087cb7a521f7892c264bb38d0876e4e7a08346ae4579338ba698ae7ee4ba456
 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
@@ -104,5 +105,6 @@ EBUILD netbeans-platform-9999_p20150115.ebuild 8293 SHA256 5e3599e69b68285bff404
 EBUILD netbeans-platform-9999_p20150116.ebuild 8293 SHA256 f618c62440e6ec8d15e6e32b95b66d6ae72786eb01f3541fbe1eb3c126c6c203 SHA512 16583bbe0ff02ad1bde98cd1cb1290933441143b5edf820dce1ac172857e8e5b63efda1ab7d23104cca59c61d666b310dde76fa29b39e90f335bb074e5bee513 WHIRLPOOL 007c2e0c11c14b2f7a6958e1da382dc405faa45a98601ab113c79dde2e7f549dab3d9a9569cf330c4466af1e56cae9d36fb87c1a5719a0bdc3cba9f76302c422
 EBUILD netbeans-platform-9999_p20150118.ebuild 8293 SHA256 75733e9bfb7d75c24dc7f2a36a7681d089b1ca7569d83e1633259298ed9a21b3 SHA512 f06d5b89fc0dc0cd62f9d54d8fa711ba32e7469dbd1053af03a3e44d248418f1fff29e0931e7df76e902ca1dfad214229922d3e585c0fd0cf80bcd0984244d81 WHIRLPOOL 6431e12ca729b8ca7a41e5c9aa1d0062b909806191f2f13df042716ee3476cd4f9708b7bfc35c0f6940c7f8781621d853a801263853eb15fbd28066d95d31355
 EBUILD netbeans-platform-9999_p20150119.ebuild 8293 SHA256 7b1c39cfd122cb6e3cdc9ad67a8b5c1f7931040a8528384ff5e4374579067268 SHA512 ce600c1f45ed49187a2f30b62343ddb2b4ff1201ca22bca20dd52068fe79778db7177cf460f99296a2ef5c53f8312404f1625f93c1577fd216c5536e084749e6 WHIRLPOOL 5b368b3b5db10c9be6aff9134a602606869778199b112473ddc0198d40efa476a2b3a1a5f7096a92380598cadc730f56aff867e46d89c36ef9b65e742a6196b3
-MISC ChangeLog 151497 SHA256 7ee339403453daf310f8ece00c0092cf396d4cdcf1952bf63b0df4797c3fce08 SHA512 949b1c499b1e8e76e674d06b60400924847594f9a7390cc60fe346ecab920c6b4ca1ce159f31b1cd321d6bdabd4b283ff30ffd94b3ae6a134e64802eb2cfdc34 WHIRLPOOL 623fcf69186d539367e131b90e3f1fca8bbff9381affb4b12603f9d7965e68d3da3904d51f0f6eedcb0dbe04fd4164ab0680ccfedd3878a48e0c4c8f22cf80dd
+EBUILD netbeans-platform-9999_p20150120.ebuild 8293 SHA256 e4a66347d02b09c2ac8593265ea5382ea05051060ceb2c48d05b92d0c7cb347d SHA512 edfed7980d33ca696ac3a082015410d4ce8b4624502d9b107b5161015c7d20cc113d14d99b4c20884dd74f47bb3a9ccac88f527c74f841dd3aefbae18b6680ce WHIRLPOOL 568c2a705de3ce4ab78bca8abb3e13ef9ad897e9112db78b80317c55d7816a30bae91e2a74f4cee9f974d14105814301e0bc32b4f8c40903839be68fbdf8c5f0
+MISC ChangeLog 151674 SHA256 8642e7f5bb8b01385bdd781ea95e67530ccc3209155e1bcaea5c9d4770242163 SHA512 f76a70833a857ff3fe35d53e5ad9a7f09754c8bf47845d5f036ab51717700ec562cb99c2fd5998ac2faeb11e4c50a03460e8f94863f7ba77dc57bd5ea5114de0 WHIRLPOOL 5cd2317d274cf9011e6770881e59a2fcaf382ed9e44958fdce9a78de21ed3f66dd9c97bca5e649e7b9bba92917317e29672ae52063996eeae17bd0d0bcd357db
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20150120.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20150120.ebuild
new file mode 100644
index 0000000..e925227
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20150120.ebuild
@@ -0,0 +1,153 @@
+# 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-01-20_00-01-55/zip/netbeans-trunk-nightly-201501200001-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/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/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar
+	http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip
+	http://hg.netbeans.org/binaries/AC97B566699146713B3CF0ABC226B5C08EF7CF33-testng-6.8.1-dist.jar
+	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/javahelp:0
+	>=dev-java/jna-3.4:0
+	>=dev-java/osgi-core-api-5:0
+	dev-java/swing-layout:1[source]"
+# 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}"/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}"/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar libs.osgi/external/osgi.cmpn-4.2.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}"/AC97B566699146713B3CF0ABC226B5C08EF7CF33-testng-6.8.1-dist.jar libs.testng/external/testng-6.8.1-dist.jar || 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.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.osgi/external osgi-core-api osgi-core-api.jar osgi.core-5.0.0.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-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/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 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 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
+	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 e471753..76d45a5 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_p20150120 (20 Jan 2015)
+
+  20 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-profiler-9999_p20150120.ebuild:
+  bumped to the latest sources
+
 *netbeans-profiler-9999_p20150119 (19 Jan 2015)
 
   19 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index cb84a6e..981db22 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6
 DIST netbeans-trunk-nightly-201501160001-src.zip 201394511 SHA256 0a5e6e98692bceabdacc7ef41fe2b7fb59d9c879453982b2dc0e79d28f077714 SHA512 2a5be09537b1735e712ec373cc7f41b1e8b7753be5026ec3a1562d7347f4d5addf58bb9ea052051e0df2113e18a366e4095f84432dffb4b75b86b9ca913d3d56 WHIRLPOOL 7a8d35dcba4754cb809b8ac8710cbba8ba5452c4c4e13963a40e032b13241aa9b44328f3bbeea681bf535a31980e766331acaf5ae265bda5dd5790bda872d8dc
 DIST netbeans-trunk-nightly-201501180001-src.zip 201391445 SHA256 b1bf4373e5b799f830894b4ea7ab878ef09c64059758cebb2fa1b1a244718965 SHA512 bf1a40344c915a754f3b7baed759b6513e6a055bface5fe6c30c4e0adeb76fe7d2aaac5d344553ee5df505131cb05c7e2219c67514d4a962f681f9a39c685166 WHIRLPOOL f33d7bfe0174c7de81986a44578df8322fa8f2b46911e9f6fc05ffe8f0839e70b691d62ef9b6dc1b248aceb68760330ef69e86f026a83b6c0f27bcee3a4bc07b
 DIST netbeans-trunk-nightly-201501190001-src.zip 201391445 SHA256 ce4ec7706f80732c5c6d5764fb4cb0f2f82341d668e2680ed4d12c382e8541de SHA512 232c8beecd613bafca37af997c3aae0f35caa28a3a3f381553bc3264916f606540bcb5186c8a2a52ca21ce177ed413d6907865b4b42b80c102e7c636df736628 WHIRLPOOL 2176f82b120a7f9360f3b01cb970a8fcc5078e97da90ae0e870b37a53998beca6306b5f58bf9af3a15dc403f1dbb888457a56b0657a2f972b8e01ebe1b725abe
+DIST netbeans-trunk-nightly-201501200001-src.zip 201396862 SHA256 1a9378d8f52c4f617653d096aff287cf62212af8a6f878fe54cc468e4dd4bed7 SHA512 92fd39cda2d11816b9a01e0e5c26b3f527354a69efdc940cb27d5b17ee6493a07225d2698260db2bdc220e01d166ac42b5fb62f809d1e2eb84419c6e6abb3e14 WHIRLPOOL c3ba7155b5d376041d750c42f1ff8f8dec5bdbfedb470dea483a665978ef3982f087cb7a521f7892c264bb38d0876e4e7a08346ae4579338ba698ae7ee4ba456
 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
@@ -70,5 +71,6 @@ EBUILD netbeans-profiler-9999_p20150115.ebuild 3478 SHA256 62b0d5e5e15e11d58b4d3
 EBUILD netbeans-profiler-9999_p20150116.ebuild 3478 SHA256 de5b4b51c1e3651fc8d5592145c9534589272e9ba7a793c1aaf629c35642e88b SHA512 2a6089f96f09dbf2074303c03cf3c3d38455ef8b7262f2d4399908a38121e40ad93bcde7a5a891da4e2b50655c7e068fb9f4f07c2d1df994ef205d430f12b246 WHIRLPOOL 72421d0cb157b9230934bfd0a8bb01ad7d28882af663f9047744c0a68191edbb509bd7457812b4ba409b1abeab719422eb994c3002e1b2018005fec92f23c082
 EBUILD netbeans-profiler-9999_p20150118.ebuild 3478 SHA256 1a8a41944225f8fc0ece1d06c5d603631ce16551516beee9597f5e2c5ab524a5 SHA512 b6062aaf1fd74e97d057a395417fd50c439c89bc00c766bf654dfc1e868dee469508f480d99f78967bdf3124f37b8f9d7f1b27acbe4482b14d7f7a2542409704 WHIRLPOOL 44cee17d7862491074d3b587cfacd38b2236429a012c699f42ada261d9bb6764c38aa5c9c5b1c98bb356ba08389a69d0111d02478876f7e4e91c25bcbd280ef0
 EBUILD netbeans-profiler-9999_p20150119.ebuild 3478 SHA256 53c24023b661cd64e8efda3f4e1da5e6db515520fb1238b3c4dfb6d64e034cff SHA512 ce8dbd30bb3adb061a804a4ea0d517fdd04439335093b8033c6ed0e4927c57eac8d033de27da5e87c6e73977100b56e0a867e80acea3622d9f402f44289bf8a2 WHIRLPOOL 7a507483885dee703d698c8ce3b2078758580e757ad0ed432e86185e8bad10178461248fcc22b85d0242f7d037cd10760eed3a52a45a3fef39e3f37d98ed8476
-MISC ChangeLog 150958 SHA256 893173e8ce910edc05efa98e5a0a36d8270e9f7700f82d6df6ad32376f4c7bec SHA512 433aedd52d8ed553b7c85e1c622a0e08cab9a51dccb2b6a24ebcd2760d218e0211add06e93cb811bea7fd745c69f006cdeff4de7cfc079056f19ad26260d4393 WHIRLPOOL e1d59a2687b5770a89816e0beb2804ddb38952eff95de379a1719640b846842e21bb47a868bb0313477b6e916ce3ee09785bc490efc94089852626ae93e28c2f
+EBUILD netbeans-profiler-9999_p20150120.ebuild 3478 SHA256 979d9ced9f2bf0446673a337b3fcba84b41cbe8c8fd2931992aadbac0aa418f0 SHA512 d2127fdd30a4908a2f71bef0f39d879e9e2f4a0caee72a063f62fb7ec4c269d742f13dae2adef9be04dd1d9165f8e523958d3b1d4e6948b5e3c9587cad943413 WHIRLPOOL 0d13dc72c5867fd533f2d91766594bc4529833ab90eb5092523b69c3715a6a8b9c8930c1740b6c71b00626f2c89603e8c1c1e686d2d60860826475c923913c63
+MISC ChangeLog 151135 SHA256 748eafe11bdbccb5087004ffcfed78d1d1612b865968b208e31220de1c543161 SHA512 bf1edf56a404b89a7284dbd9567c29f6af862ec083bd20c20501ecdf0bb7ec3a6c6642d1628b5fa1e9d54b7d5f660ca909b87c75fc563a6b818cf28da7819a82 WHIRLPOOL 0dde75dee783d398414fbaa1606eaf89afc972fc3c61f54918d5af121807e6fe67171ab2b5705f3a19cd28de56a0b004bfa6c72b31bdeaa76946f9d29548e4d7
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150120.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150120.ebuild
new file mode 100644
index 0000000..1a61f75
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150120.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-01-20_00-01-55/zip/netbeans-trunk-nightly-201501200001-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 a5551e0..a94999e 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_p20150120 (20 Jan 2015)
+
+  20 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-webcommon-9999_p20150120.ebuild:
+  bumped to the latest sources
+
 *netbeans-webcommon-9999_p20150119 (19 Jan 2015)
 
   19 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index 7c232b7..73ed1bb 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -44,6 +44,7 @@ DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6
 DIST netbeans-trunk-nightly-201501160001-src.zip 201394511 SHA256 0a5e6e98692bceabdacc7ef41fe2b7fb59d9c879453982b2dc0e79d28f077714 SHA512 2a5be09537b1735e712ec373cc7f41b1e8b7753be5026ec3a1562d7347f4d5addf58bb9ea052051e0df2113e18a366e4095f84432dffb4b75b86b9ca913d3d56 WHIRLPOOL 7a8d35dcba4754cb809b8ac8710cbba8ba5452c4c4e13963a40e032b13241aa9b44328f3bbeea681bf535a31980e766331acaf5ae265bda5dd5790bda872d8dc
 DIST netbeans-trunk-nightly-201501180001-src.zip 201391445 SHA256 b1bf4373e5b799f830894b4ea7ab878ef09c64059758cebb2fa1b1a244718965 SHA512 bf1a40344c915a754f3b7baed759b6513e6a055bface5fe6c30c4e0adeb76fe7d2aaac5d344553ee5df505131cb05c7e2219c67514d4a962f681f9a39c685166 WHIRLPOOL f33d7bfe0174c7de81986a44578df8322fa8f2b46911e9f6fc05ffe8f0839e70b691d62ef9b6dc1b248aceb68760330ef69e86f026a83b6c0f27bcee3a4bc07b
 DIST netbeans-trunk-nightly-201501190001-src.zip 201391445 SHA256 ce4ec7706f80732c5c6d5764fb4cb0f2f82341d668e2680ed4d12c382e8541de SHA512 232c8beecd613bafca37af997c3aae0f35caa28a3a3f381553bc3264916f606540bcb5186c8a2a52ca21ce177ed413d6907865b4b42b80c102e7c636df736628 WHIRLPOOL 2176f82b120a7f9360f3b01cb970a8fcc5078e97da90ae0e870b37a53998beca6306b5f58bf9af3a15dc403f1dbb888457a56b0657a2f972b8e01ebe1b725abe
+DIST netbeans-trunk-nightly-201501200001-src.zip 201396862 SHA256 1a9378d8f52c4f617653d096aff287cf62212af8a6f878fe54cc468e4dd4bed7 SHA512 92fd39cda2d11816b9a01e0e5c26b3f527354a69efdc940cb27d5b17ee6493a07225d2698260db2bdc220e01d166ac42b5fb62f809d1e2eb84419c6e6abb3e14 WHIRLPOOL c3ba7155b5d376041d750c42f1ff8f8dec5bdbfedb470dea483a665978ef3982f087cb7a521f7892c264bb38d0876e4e7a08346ae4579338ba698ae7ee4ba456
 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
@@ -74,5 +75,6 @@ EBUILD netbeans-webcommon-9999_p20150115.ebuild 4997 SHA256 d4a393471335a0eb6286
 EBUILD netbeans-webcommon-9999_p20150116.ebuild 4997 SHA256 0251db677101f76e3ec56f52beef42321d8debf73ba5e2e26505ee830124c1b6 SHA512 e6037bc7136a2c876a65ad14d6b2cbd5523297acc05983defd8a188d7f7aef23d2a2a7e0688bbb525a007b657318ed0c8ef71d76761ae6f0b6164a5a74a112a3 WHIRLPOOL b7ad8462fe27ab5cb59a921e39fda75df03bc11412029ad68c5a7afecad14775fb50f0a03f8d731cc855e551beb879b1f6c920b5be902dbc038d14278159ede0
 EBUILD netbeans-webcommon-9999_p20150118.ebuild 4997 SHA256 85000b0400338b446298a941b63c84d45a95a01d38233d3625589fb43621dfcc SHA512 bb891437516e3f6fe0bb2df4a4febbb2ef73c47243ac42ed45356a8edb87ab5c3599470f090a251f31c824512f6234f78ce90e4a7611ff8aac242b445d8245ae WHIRLPOOL 610f9e0ef6c6db49b3a97eecae0b9b688228b480bc86b7806a95d782c461567caaccd15ad0d398016433531ffc791f3047e6afb0b63669e18aa89c89355aa801
 EBUILD netbeans-webcommon-9999_p20150119.ebuild 4997 SHA256 59521a9e2b8a0063d64c908d4e23a9ce3b36e7e870db0c57d3a3f93c5a6b64b0 SHA512 91b8e8ed94e44d426a5feebcbf6057b6d07d555bb3e60e71739a784511a13456eacb6ad75a27b108b35dc1b8a4680f7758b0f24372ca67a9faefcc14e5b46ad0 WHIRLPOOL 1b2efde7ad000830c0ab0fcf3bacc6596ffceab6de179b4c29d5c23e85df3072a8b34eee50ac34aaadb319a40129cb1146bc375164931b0ec7bf9162f638b707
-MISC ChangeLog 123814 SHA256 e4f6242e0bfdba306fd66d01c3f29e5a312e0e1f6ccf17225f66026a6c9676fc SHA512 35058130d4e0122e8a2eccd46c7a3ef228b371c300db81984d18a2aed522f045409f285321c7e2f480b64fc643d88e27f50860efc301d4374f16646ee3199014 WHIRLPOOL 185cf7655fc9a30d992361d2dcc94b3b7ff56f29f302946fa4ade635974319a86130192fffea035927d8c53a36cedc219e57a404a1c34fdd37b494d927922c7c
+EBUILD netbeans-webcommon-9999_p20150120.ebuild 4997 SHA256 1acfbe6ec2a711b4e039afbad0ef493f3873ca0dcb48bd81fe614cb1d45f141c SHA512 5f6b6a5f34042ebc6e190895d9ec4347026978df20c5ce0adedf16932b6f274135d9d75d221dcc29f96b716ec0a20f0e71aa62724d56b9081bfcf5829690ff73 WHIRLPOOL 99bc42a5e1dbb5b6841ed01868f7efc26ebd30643d165d4146a6b052d6214fc1f4c6b4eecb8be474aea0a9870fe67c507ef3cab960bb5ed46282bc4b143ce726
+MISC ChangeLog 123993 SHA256 c8664fbc89fc0e1de58a721fe0a37a7f55666ba4f548a8190178cd0a3382e3a8 SHA512 bc909cf635ab315030d4178eaa11c5b3a23241f6db1ba0aa201dea1c4ef1bb821bcd0b2f677b9a46f07a901b5c701dfdd17d0026c0f90d52c635f60f4d83e24a WHIRLPOOL 8f01b012f8385ac1414743e6597871087983999142c6bcec2737099a362a03ca3ec1122af3676a4a947f128477318bc9645a8f01d3e993a7ae67e3761e45ab86
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150120.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150120.ebuild
new file mode 100644
index 0000000..e68b7ca
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150120.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-01-20_00-01-55/zip/netbeans-trunk-nightly-201501200001-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 9237f5d..6f7c84d 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_p20150120 (20 Jan 2015)
+
+  20 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-websvccommon-9999_p20150120.ebuild:
+  bumped to the latest sources
+
 *netbeans-websvccommon-9999_p20150119 (19 Jan 2015)
 
   19 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index dfdcd1e..7f24cd2 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6
 DIST netbeans-trunk-nightly-201501160001-src.zip 201394511 SHA256 0a5e6e98692bceabdacc7ef41fe2b7fb59d9c879453982b2dc0e79d28f077714 SHA512 2a5be09537b1735e712ec373cc7f41b1e8b7753be5026ec3a1562d7347f4d5addf58bb9ea052051e0df2113e18a366e4095f84432dffb4b75b86b9ca913d3d56 WHIRLPOOL 7a8d35dcba4754cb809b8ac8710cbba8ba5452c4c4e13963a40e032b13241aa9b44328f3bbeea681bf535a31980e766331acaf5ae265bda5dd5790bda872d8dc
 DIST netbeans-trunk-nightly-201501180001-src.zip 201391445 SHA256 b1bf4373e5b799f830894b4ea7ab878ef09c64059758cebb2fa1b1a244718965 SHA512 bf1a40344c915a754f3b7baed759b6513e6a055bface5fe6c30c4e0adeb76fe7d2aaac5d344553ee5df505131cb05c7e2219c67514d4a962f681f9a39c685166 WHIRLPOOL f33d7bfe0174c7de81986a44578df8322fa8f2b46911e9f6fc05ffe8f0839e70b691d62ef9b6dc1b248aceb68760330ef69e86f026a83b6c0f27bcee3a4bc07b
 DIST netbeans-trunk-nightly-201501190001-src.zip 201391445 SHA256 ce4ec7706f80732c5c6d5764fb4cb0f2f82341d668e2680ed4d12c382e8541de SHA512 232c8beecd613bafca37af997c3aae0f35caa28a3a3f381553bc3264916f606540bcb5186c8a2a52ca21ce177ed413d6907865b4b42b80c102e7c636df736628 WHIRLPOOL 2176f82b120a7f9360f3b01cb970a8fcc5078e97da90ae0e870b37a53998beca6306b5f58bf9af3a15dc403f1dbb888457a56b0657a2f972b8e01ebe1b725abe
+DIST netbeans-trunk-nightly-201501200001-src.zip 201396862 SHA256 1a9378d8f52c4f617653d096aff287cf62212af8a6f878fe54cc468e4dd4bed7 SHA512 92fd39cda2d11816b9a01e0e5c26b3f527354a69efdc940cb27d5b17ee6493a07225d2698260db2bdc220e01d166ac42b5fb62f809d1e2eb84419c6e6abb3e14 WHIRLPOOL c3ba7155b5d376041d750c42f1ff8f8dec5bdbfedb470dea483a665978ef3982f087cb7a521f7892c264bb38d0876e4e7a08346ae4579338ba698ae7ee4ba456
 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
@@ -70,5 +71,6 @@ EBUILD netbeans-websvccommon-9999_p20150115.ebuild 2727 SHA256 aa9ddcf1829a4a2d6
 EBUILD netbeans-websvccommon-9999_p20150116.ebuild 2727 SHA256 6c30bc2507cc9e5a096cd50e6615b4609d6ecc4034e312ddf0377ac91f1b2c66 SHA512 6da1d854fd9f6b20b6d224600197c67bad3caff62dee02101da504e2ae3af6d301a2c7f52f42da19bed6c668e0c5707a7021af18ff77a5613115fcc40af66951 WHIRLPOOL 42cb4ce0c8899ce032a8091f914156b90ac9d71f912e7cff0845c59c721ecc1da2dc6621dab8ec93e50849ec71c9582581f8330bfc8949cf75f26ae9295b17fa
 EBUILD netbeans-websvccommon-9999_p20150118.ebuild 2727 SHA256 1f59d2120e206997bab4c493976a3cab1f91b0440d4db909ed691b9e73a9d96e SHA512 b1d78610baef6378fa30373a28b2504a0884ff379b28b44a863cf30d05d60011c9d858d0f2586221b54c31820d2c4635b60ade78546a0e8716268fc85f1c3117 WHIRLPOOL 1933ebc83fbe473827be12c8d99e5b30187fe6e2a80cd33c658317098393f797db9680c5f6e7223e002bb31d43f4b320de32a0136fc29d023f026ef0ee422702
 EBUILD netbeans-websvccommon-9999_p20150119.ebuild 2727 SHA256 1ac36d17eaf05534e933a128c7a8cb1bfee23f9e89e2ee15fa1245a3a3640224 SHA512 7697999c8e3054531000b2e1da48479751bda7e3ac68bd86f2ad8bcf0b2afb8d6e4abd7d99320146e8b94ad8f08d9b94a9226ca8da125f99652128cb921fbf70 WHIRLPOOL 7fb0b3acbcbfd0bd682da42e6428cfc3a80c3bdfc750404be77fdcca0661c51d86039a76bc2f8c1ba12389f712909c6ec3479803f668036fcfa2cc454d3b17fc
-MISC ChangeLog 158123 SHA256 18000f7a87e470e334a5bb48a652d15ca3b44b213e2f9e4def6fc1b7a7ebf1ac SHA512 0ae3eacb4978cc49b0595468a516ddcdebc5e7babfa11af12098ec07c648cdbd550ebd30fbf77bf3b586c4fd9862e535cc721c29d5997d4809a7c0b191c2ac36 WHIRLPOOL ba5981e0449f969c78d9193b4404509f986bc54b424f0787244d47a769a9df60f21f343b05d7b917724c33ce44ebb67b44765b058b989100145340011c74bc8d
+EBUILD netbeans-websvccommon-9999_p20150120.ebuild 2727 SHA256 1fc1715c4144ffbe58189d38bd4eb0f056c292da8b39cfdcc77a28cdf04a06c7 SHA512 d241104d507f705aa56e05a22a981c9c26d100e22524525cac9ad9fa07f4d0665740452a5c9021d50198d499589196eec22723c2643eeba59cede092a7ec3359 WHIRLPOOL 6f1b51a34eb1b49a7b8e37efd2ec38167a750d2dabdfaae77c479d17638ace9ea8498509927e1c2b56e370c4a8d20370a407a1fbb086b7e202f0917b4ba53b47
+MISC ChangeLog 158308 SHA256 615c75f16c6dfdb6f9c2bc56f13d995724dcd65846bf1c70e13127067bc5135f SHA512 0b3fb669bce29179fff0131e6d851fabccec2b81740183f4125032749fb2d80ae54f6a088b1f9cd469fc91c86bc7c33324387c7479af00b09ffb55c11a342a17 WHIRLPOOL ff748b753d1d313909c90b9a2848499d482216ecd23068aec25c71b674968afd7438377726cb00641aa540f9d2b6f7301e949a569a5fbcd11d87c6dedae86442
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150120.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150120.ebuild
new file mode 100644
index 0000000..5ab4c15
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150120.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-01-20_00-01-55/zip/netbeans-trunk-nightly-201501200001-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 3f9652a..e16dd71 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_p20150120 (20 Jan 2015)
+
+  20 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-9999_p20150120.ebuild:
+  bumped to the latest sources
+
 *netbeans-9999_p20150119 (19 Jan 2015)
 
   19 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 7405bd6..b7d4d04 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -46,6 +46,7 @@ DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6
 DIST netbeans-trunk-nightly-201501160001-src.zip 201394511 SHA256 0a5e6e98692bceabdacc7ef41fe2b7fb59d9c879453982b2dc0e79d28f077714 SHA512 2a5be09537b1735e712ec373cc7f41b1e8b7753be5026ec3a1562d7347f4d5addf58bb9ea052051e0df2113e18a366e4095f84432dffb4b75b86b9ca913d3d56 WHIRLPOOL 7a8d35dcba4754cb809b8ac8710cbba8ba5452c4c4e13963a40e032b13241aa9b44328f3bbeea681bf535a31980e766331acaf5ae265bda5dd5790bda872d8dc
 DIST netbeans-trunk-nightly-201501180001-src.zip 201391445 SHA256 b1bf4373e5b799f830894b4ea7ab878ef09c64059758cebb2fa1b1a244718965 SHA512 bf1a40344c915a754f3b7baed759b6513e6a055bface5fe6c30c4e0adeb76fe7d2aaac5d344553ee5df505131cb05c7e2219c67514d4a962f681f9a39c685166 WHIRLPOOL f33d7bfe0174c7de81986a44578df8322fa8f2b46911e9f6fc05ffe8f0839e70b691d62ef9b6dc1b248aceb68760330ef69e86f026a83b6c0f27bcee3a4bc07b
 DIST netbeans-trunk-nightly-201501190001-src.zip 201391445 SHA256 ce4ec7706f80732c5c6d5764fb4cb0f2f82341d668e2680ed4d12c382e8541de SHA512 232c8beecd613bafca37af997c3aae0f35caa28a3a3f381553bc3264916f606540bcb5186c8a2a52ca21ce177ed413d6907865b4b42b80c102e7c636df736628 WHIRLPOOL 2176f82b120a7f9360f3b01cb970a8fcc5078e97da90ae0e870b37a53998beca6306b5f58bf9af3a15dc403f1dbb888457a56b0657a2f972b8e01ebe1b725abe
+DIST netbeans-trunk-nightly-201501200001-src.zip 201396862 SHA256 1a9378d8f52c4f617653d096aff287cf62212af8a6f878fe54cc468e4dd4bed7 SHA512 92fd39cda2d11816b9a01e0e5c26b3f527354a69efdc940cb27d5b17ee6493a07225d2698260db2bdc220e01d166ac42b5fb62f809d1e2eb84419c6e6abb3e14 WHIRLPOOL c3ba7155b5d376041d750c42f1ff8f8dec5bdbfedb470dea483a665978ef3982f087cb7a521f7892c264bb38d0876e4e7a08346ae4579338ba698ae7ee4ba456
 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
@@ -78,5 +79,6 @@ EBUILD netbeans-9999_p20150115.ebuild 7216 SHA256 a4bbbf4b6012d8ddd8495eebfb13e6
 EBUILD netbeans-9999_p20150116.ebuild 7216 SHA256 932a7ddb1f2112bbf19bea6281826ce0c0bbfcb8c82b7ce344ae81f54802ba17 SHA512 362c8d7c3bf9e4b1bd6d02cfc67f02e662292803268d24a2f9c00cdb0a9e96a758e4797f2ea7ff019c8d02b5f840d2a031c1991db55feaa97a1e4f271488bcf2 WHIRLPOOL 4dd9bd1655142727033e31eaa15a870d2386fc8448d2a48c20848e76483563312b3360d72ed50f00c6ad3aebfeea8ae0ab5985f8c30ef1b3099c166fe0df77c1
 EBUILD netbeans-9999_p20150118.ebuild 7216 SHA256 7a062c1b98caa319060dece145d11ce58c23fd26f9431a34e18b9d41647ae5fc SHA512 c5ab2287f52cdc6b4f79b15780560542aa4583da16cea0fbce09bc6ebac0b02b0e8b4c50c3c04fa2a95c4c91f147505b38b9f7075a0c58349528dedf25fde9b6 WHIRLPOOL 302db2c25d542d129832cb6133be572f6d7a3297e5408d9a0393a89e67e8fee12c40d17e9f6d0eaf76b1b68587f491523ace57d91606e934b1d2a41e7ce8309d
 EBUILD netbeans-9999_p20150119.ebuild 7216 SHA256 b5b2e582ed7951a59ca92f94626a75520193cf24dddc25aefcdb905740cce090 SHA512 a8b78600ab6bce97df9c43a97040e03176c591793339d8221d2f895bea009e1ba6b519db16a7c35e00c9d2e5c1ad5c4fe142c7cfe55df43ea513da3bc73dd90d WHIRLPOOL eb84493a8bbfe7b8ceb848e873ee156d174867e457a884fa3b1a28fc96b109c4fd37b65846957320089b726300010203f88d74e57a9c6bd6070f8d7529459d0d
-MISC ChangeLog 134671 SHA256 208881efadf72a3ddc7737f7f5590afb947fbea17472fbee1b4a79fee343d56a SHA512 ceb81a1e5fa40e5feaa7fd23c49752d13cbe27a9a0fab1c913a3ed7ea2f83a2053276ee29bd562917043c04d90f9c10bb02df9ae80d703656d083077ebb488cf WHIRLPOOL aca273d9ae86762afa2d924e33657ab2403f028e2711c8ad84f6eb529b57a62f76865f2d83a3a5560a98723e630f7370ba92cadd41c75a1ba539516aacb03d80
+EBUILD netbeans-9999_p20150120.ebuild 7216 SHA256 a46b7bf70116ab124fbc25bb50bed53d93b6986204d5cd09b35ab7b982bbfc21 SHA512 c3a358dd649e655ce3860fbe52ab0071659afac6afc9afff3568765a9924c7e5b8bf3a1398c52b32e24feed5aa5e34cec4d69a5d4c37bd0553410ae816a4dcc4 WHIRLPOOL 49b0466d93ab1cbc9f3d80d483ae88d742ac37c8a0ca5c8b17ae46a8f08160466bfeb5c73e488696a1d34a8b13c6bbee6cf593d992f84fb92aad8f48797652a1
+MISC ChangeLog 134830 SHA256 e2c930755c6e2551cd7cfabefc452f876b1a337bf954a7aa4ffb8affc99d15cc SHA512 8fb9dab444bc92c45782880d58dacce65634749cdabee319ba9e42d0f92f581cffebf93a9264230cfc784b1861ed2b87290a2503525ea1a984b5b884f4144001 WHIRLPOOL 13c3ad9033ada049210ae676046ac4819751b6609ce957d36e7a618280a8663f2017c807047f89240885c1b39bb0d83224b28ba6e10c1739568638e4e47c9ad2
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

diff --git a/dev-util/netbeans/netbeans-9999_p20150120.ebuild b/dev-util/netbeans/netbeans-9999_p20150120.ebuild
new file mode 100644
index 0000000..2eb2a56
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20150120.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-01-20_00-01-55/zip/netbeans-trunk-nightly-201501200001-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] 3+ messages in thread

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-apisupport/, dev-java/netbeans-profiler/, ...
@ 2015-09-14 11:36 Miroslav Šulc
  0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2015-09-14 11:36 UTC (permalink / raw
  To: gentoo-commits

commit:     f578b14c198a45b0fca3f1464e88ce63c37d85a3
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 14 11:31:31 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Sep 14 11:31:31 2015 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=f578b14c

netbeans: version bump

Package-Manager: portage-2.2.20.1

 dev-java/netbeans-apisupport/Manifest              |   2 +
 .../netbeans-apisupport-9999_p20150914.ebuild      | 111 ++++++
 dev-java/netbeans-cnd/Manifest                     |   3 +
 .../netbeans-cnd-9999_p20150914.ebuild             | 127 +++++++
 dev-java/netbeans-dlight/Manifest                  |   2 +
 .../netbeans-dlight-9999_p20150914.ebuild          | 101 ++++++
 dev-java/netbeans-enterprise/Manifest              |   2 +
 .../netbeans-enterprise-9999_p20150914.ebuild      | 266 +++++++++++++++
 dev-java/netbeans-ergonomics/Manifest              |   2 +
 .../netbeans-ergonomics-9999_p20150914.ebuild      | 101 ++++++
 dev-java/netbeans-extide/Manifest                  |   2 +
 .../netbeans-extide-9999_p20150914.ebuild          | 108 ++++++
 dev-java/netbeans-groovy/Manifest                  |   2 +
 .../netbeans-groovy-9999_p20150914.ebuild          | 111 ++++++
 dev-java/netbeans-harness/Manifest                 |   2 +
 .../netbeans-harness-9999_p20150914.ebuild         | 114 +++++++
 dev-java/netbeans-ide/Manifest                     |   2 +
 .../netbeans-ide-9999_p20150914.ebuild             | 377 +++++++++++++++++++++
 dev-java/netbeans-java/Manifest                    |   2 +
 .../netbeans-java-9999_p20150914.ebuild            | 273 +++++++++++++++
 dev-java/netbeans-javacard/Manifest                |   2 +
 .../netbeans-javacard-9999_p20150914.ebuild        | 134 ++++++++
 dev-java/netbeans-javadoc/Manifest                 |   2 +
 .../netbeans-javadoc-9999_p20150914.ebuild         | 168 +++++++++
 dev-java/netbeans-javafx/Manifest                  |   2 +
 .../netbeans-javafx-9999_p20150914.ebuild          | 124 +++++++
 dev-java/netbeans-mobility/Manifest                |   2 +
 .../netbeans-mobility-9999_p20150914.ebuild        | 126 +++++++
 dev-java/netbeans-nb/Manifest                      |   2 +
 .../netbeans-nb/netbeans-nb-9999_p20150914.ebuild  | 148 ++++++++
 dev-java/netbeans-php/Manifest                     |   2 +
 .../netbeans-php-9999_p20150914.ebuild             | 127 +++++++
 dev-java/netbeans-platform/Manifest                |  10 +
 .../netbeans-platform-9999_p20150914.ebuild        | 166 +++++++++
 dev-java/netbeans-profiler/Manifest                |   2 +
 .../netbeans-profiler-9999_p20150914.ebuild        | 121 +++++++
 dev-java/netbeans-webcommon/Manifest               |   2 +
 .../netbeans-webcommon-9999_p20150914.ebuild       | 123 +++++++
 dev-java/netbeans-websvccommon/Manifest            |   2 +
 .../netbeans-websvccommon-9999_p20150914.ebuild    |  94 +++++
 dev-util/netbeans/Manifest                         |   2 +
 dev-util/netbeans/netbeans-9999_p20150914.ebuild   | 264 +++++++++++++++
 42 files changed, 3335 insertions(+)

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index eeb759c..f733f79 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -7,6 +7,7 @@ DIST netbeans-trunk-nightly-201509040002-src.zip 208956475 SHA256 4cc75f6e48a660
 DIST netbeans-trunk-nightly-201509050002-src.zip 208961273 SHA256 0e4ee8605bb5933ec079c7bc1a597d00cecd76d589ea27a1612eb51253d2bf17 SHA512 d87f0251d65b3c44468ce3da97b3a9f077938da2eaa08c7afc887dbcd0054cad88840a1c12e553ba5100ebe4e272f0a89503a694ae3329952102959a530f70fd WHIRLPOOL 9f1409fe6b8775cfaa64af217fbf88220c8307ff4b169d694f431cbaaff3b46bd7f0c3a97654706e0c949d01d0a61515daef679ebea6012b56da3af7af0ac01b
 DIST netbeans-trunk-nightly-201509100002-src.zip 209128741 SHA256 5d5a40a072eab70857662787af171f4af2a73d866e122c465618914c851e790c SHA512 c40b93171efc0d42e84d34d437c15085189078d51a99be10e63a813a9e7ca9451dcaba6748344e585cc444903c29a56fb1a78c43545136910c000accf53dfe83 WHIRLPOOL 033764680db1d66360e33286c05d58e33bf0288f09e2caa9871beee1d727047b8af6a3de079c595ca508f89f0b29ae4aa96298bd4be5cee3b77e32f9759cb527
 DIST netbeans-trunk-nightly-201509110002-src.zip 209149212 SHA256 9833b3b5804a16062972c36bbc1af9ae9445f7313884195e6ac0935a43182b98 SHA512 2ba867e3c5816b08da70cc9fe5a697ae68d55b3eb28ada6c6b9364dd8828a1f16122dd57f7556113d93b4af034f4b6a0aee05d79336e18b9a8f014b86eff448a WHIRLPOOL 21026c2040e6b6d843308065fd6409ebca28a013d8166d19260888beca80dc37f50e3a327cb059f92803591a23a9838484fd2b1fee78fa3b37b378a495bda782
+DIST netbeans-trunk-nightly-201509140002-src.zip 209159147 SHA256 cdcaeab5534f59320d499b5e84f1deec2863f605ccf4f7be5ced8415e0e3a70e SHA512 0a40110edf53330612d3d586eb7931013c5279fb5db2a8383da90da03df12f291d6c7e5c0da14987311efb10cec017abf201fcf0e299141d079c316447ab8234 WHIRLPOOL ce02272125ee84695d786dcf3c66ac89f56deaed2076dd00e35a997235ca32b181257d80246f20e0e26b6983052b490f0507f718d58f164549991a940e1dd598
 EBUILD netbeans-apisupport-8.0.2.ebuild 3314 SHA256 b68fe791f275fe4fcc8b00888688949b8927cb39db2cf9ad7860017c6d20adee SHA512 35c4bbcd34ec0eaef8a2de86c13333d2bf092db61af48558c3e173bb17dbf8fcd15001307bd7c498f4ccdbaa4277e1ee42ff0909af6170039165b547f646c383 WHIRLPOOL 206fe8d5f64e76827d3eb958a629ba087e8a16c2797752f5d9e62dff4166653677587a81be19e0a2c6adcf49292255d532e1f542c02550b1cf6ffd51467bde3c
 EBUILD netbeans-apisupport-9999_p20150901.ebuild 3384 SHA256 187e107dda837afe5fdc0b321a4bba2e5fc6f18dff1eb359c64c122ad04b9e86 SHA512 ea07d62ef5f4ee8d68f17f69fb3b10924e37ff38a6c15147f432232f354d3475f4fc768a535503cd12da6a3d6b2ad303abec714e362506bd723ff23cbef4b36c WHIRLPOOL 9fc6fb1c7f4bbbf79d15eef81c9c440c3a98a2ed8ff4f04e73ba4a0e36b9c54cad45e50ea89e04e5a8b175a3d9d56c9f3e3af47fbe9dd21b9d8c367bb3623ea2
 EBUILD netbeans-apisupport-9999_p20150903.ebuild 3384 SHA256 13a7a16b6a12ed08e9ad7234bec1ad5e5fe209e4f13e4587bfcf4d28a8869b22 SHA512 cbd2dbb4d8c01b1f6c70ca8a7835a58c2ecf94a0ec084ef2b2c73b675734ec61497925791bc2045fe7b36d372676309057a520a669828d604d93dd279306e9db WHIRLPOOL 08fc78eac704d29500bec5772b64ed2b159130e3414c9f7beeddb786ad3233afa0b74086d7de80d66ca335af56b22eafe254513a847839cc1ecf7584cbad832d
@@ -14,4 +15,5 @@ EBUILD netbeans-apisupport-9999_p20150904.ebuild 3384 SHA256 3b8b8fb422b0b4dc29b
 EBUILD netbeans-apisupport-9999_p20150905.ebuild 3384 SHA256 7ab71cf027981aab170a8581e770e4218db36424f2b3232e60ceadce358bf2b3 SHA512 e9fbf4851909629dd0e51984cba44801a2cd20c332a2f30c6a5cf957e69ecbde0a5327b974dd3dd522d148cc9addc6535a04af7ca3fdd62a035f726e3ea4738e WHIRLPOOL 826d3280bd444f9f6635b7ecc47b54cd8732abf488bf5e8616b638a2a02c1898fb7e07397d4f0ee3689c08a6539088ddd51ce49e8cb7cb4f9fff8e9739d13272
 EBUILD netbeans-apisupport-9999_p20150910.ebuild 3384 SHA256 42571ec3edc4e88fbc7de8c22d8b95e7ec9355586885ebaf6b626f80dca606f8 SHA512 2e7b3b21007f3dca194936ff3da063aefb415f2ae7cadbaf640b2ad60a76b516367977dc7b9aa65706703e9c9fd5638ad0e86f2a7410bacae31ef1a124fd4495 WHIRLPOOL cba885f4765557fe28e656c09896b004bf693daa9c2c3854bf4eeffa0e0ce8b38d3c1c8bf93247f975be1622e967f6022d628b3bd3b5f40cfaa498019e8c88c6
 EBUILD netbeans-apisupport-9999_p20150911.ebuild 3384 SHA256 25fc98d85069546e0fbfa50bf71e330a30881ab8efaf19e3a695522c24e605f7 SHA512 bca9c385ef1f7fb2b18f56cc53d237f842c6753d0a48088920d90351d3928f8c931828f617b7c521251c6ce04835545d070e84b3b8bb6095fd09c0cb02b5054c WHIRLPOOL 305439375a622f96604b5a7f79e38efa1a0abfa1bc369c1f810beab0255d058dc264157406968dcc8916bf3bbe01e8aca06c537f52954e6bdb76c588a4c17f67
+EBUILD netbeans-apisupport-9999_p20150914.ebuild 3384 SHA256 f310c45396c4b7495748d6399c113b3baaf9e7f72ab557ef838928e0809ffafa SHA512 ff390780810d61728b83d5143131c26b3cc4d0461bab9714ac91dda5b7974f5a16410bbca4b20313f5249aa158b631fcda68420824d2e218394d83b01d64ba33 WHIRLPOOL d5b0651cd5390a81b73053ae02efbec5b9261ffb4cfab8e73e8853518dd79b8e10f82665399f9092480a3a4359c0b08fd669e2e44e85cd24e60ff01aa607daa9
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index 3c64c61..f7f51ee 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -1,3 +1,4 @@
+DIST 069B350908C75C4C2D357902CC4A5967EDCCD420-clank_0.3.6.zip 7499918 SHA256 a1d7e2cc7830d6338c175846357e9c7f1afeb64fe3f9840b6fa97ed2133d47d0 SHA512 81735aac1cf26a568333d893c1e2c558ca0c77b92dce90a0524d56125b565ba69ff30f7d01e2d21bedf57d0ed91275d27156dbe6b8df48d969f16f049152ca04 WHIRLPOOL fda157151796ba7cc9344d5124719670e6cd0b44655127515874cb026b8c752f4fcc25e555fc1ff5bfb1c503b66efc631645f920d3514e08b5e4e8dcbba1b6dd
 DIST 23CB1F69F8E645CCD8C436D59F5FDB676A96A9D7-clank_0.3.6.zip 7712458 SHA256 36c8f75d0563c8d8c7dea3bd5948d2dc9b1f5a57950d5fe22b3e0c4ba56e8d44 SHA512 a5cab2fd02f79eade56550c3433ca89fa9eb5be4b5a18a9f30e52501c0d084d4e7ab6d9dc8c02c7585997f1ebd4bb5b3f71da5ce0aafa52a5bb7c05d0e2d193e WHIRLPOOL ebfc9fa2e5745dabfc8aa27f8c699c2d431807e7f6627c9ed97804816a0a2cb30f6ea8af2232e19c5fc61380acbc768939e91f46c4393ef5ea4aafa0314d1191
 DIST 24C58A1D3C410AD3E23CD828871630C17068B238-cnd-build-trace-1.0.zip 28980 SHA256 205a14a41fb7232c2a20779278ee1e303e6d3dedb3c84496b370ae397a7767b5 SHA512 0e570745cfb163cb54ac8b6b0f6feb6c76e3c414f03eab213f93637dc84471c0bb5b786af096acdd6265383474bf26db763ebda066add398efe601e5749a51b9 WHIRLPOOL 2d0042e180eba66269d4ccdf6279dcd166b4a34947406b5f7279b0017ebed27b2ea95f1565e57908e3567b303fb69d2cb5ca6504653126611ced84f103650a0c
 DIST 2BCF2047382FB68A2F275677745C80E79B4046AB-cnd-rfs-1.0.zip 152701 SHA256 ee454c52dab7af01a0c292bbbd9bd5fa62e07480d4284a34e38746aba4bb501b SHA512 222ae7d6fc8a1f5610a107264fd249180a7a865094979dd5426fb266b94e1d24ef421199cdcb923ab58577c292a183863c45a1434b4dcb35bd67dbdcde945e54 WHIRLPOOL 821c0e5e9534955ee9b4200476fa1fe65b453520551cb71a71a225bb96ac69ba6c408e9d59b5df7008ec1b8d173035e76358172cf3ebafbbd50d0971db3a8983
@@ -20,6 +21,7 @@ DIST netbeans-trunk-nightly-201509040002-src.zip 208956475 SHA256 4cc75f6e48a660
 DIST netbeans-trunk-nightly-201509050002-src.zip 208961273 SHA256 0e4ee8605bb5933ec079c7bc1a597d00cecd76d589ea27a1612eb51253d2bf17 SHA512 d87f0251d65b3c44468ce3da97b3a9f077938da2eaa08c7afc887dbcd0054cad88840a1c12e553ba5100ebe4e272f0a89503a694ae3329952102959a530f70fd WHIRLPOOL 9f1409fe6b8775cfaa64af217fbf88220c8307ff4b169d694f431cbaaff3b46bd7f0c3a97654706e0c949d01d0a61515daef679ebea6012b56da3af7af0ac01b
 DIST netbeans-trunk-nightly-201509100002-src.zip 209128741 SHA256 5d5a40a072eab70857662787af171f4af2a73d866e122c465618914c851e790c SHA512 c40b93171efc0d42e84d34d437c15085189078d51a99be10e63a813a9e7ca9451dcaba6748344e585cc444903c29a56fb1a78c43545136910c000accf53dfe83 WHIRLPOOL 033764680db1d66360e33286c05d58e33bf0288f09e2caa9871beee1d727047b8af6a3de079c595ca508f89f0b29ae4aa96298bd4be5cee3b77e32f9759cb527
 DIST netbeans-trunk-nightly-201509110002-src.zip 209149212 SHA256 9833b3b5804a16062972c36bbc1af9ae9445f7313884195e6ac0935a43182b98 SHA512 2ba867e3c5816b08da70cc9fe5a697ae68d55b3eb28ada6c6b9364dd8828a1f16122dd57f7556113d93b4af034f4b6a0aee05d79336e18b9a8f014b86eff448a WHIRLPOOL 21026c2040e6b6d843308065fd6409ebca28a013d8166d19260888beca80dc37f50e3a327cb059f92803591a23a9838484fd2b1fee78fa3b37b378a495bda782
+DIST netbeans-trunk-nightly-201509140002-src.zip 209159147 SHA256 cdcaeab5534f59320d499b5e84f1deec2863f605ccf4f7be5ced8415e0e3a70e SHA512 0a40110edf53330612d3d586eb7931013c5279fb5db2a8383da90da03df12f291d6c7e5c0da14987311efb10cec017abf201fcf0e299141d079c316447ab8234 WHIRLPOOL ce02272125ee84695d786dcf3c66ac89f56deaed2076dd00e35a997235ca32b181257d80246f20e0e26b6983052b490f0507f718d58f164549991a940e1dd598
 EBUILD netbeans-cnd-8.0.2.ebuild 4510 SHA256 0a9a4e58e28f395b5bcb017016b6ddb1b77afe393d0e5bd81cc05e3a32076c71 SHA512 2b1fedfe292fa140920fd11829e77127f9535e08b8307886accfa37e6d11195a1204e6b71b2640937da0711c3ce0bbf80c0eaa3c248a64fd61b6a3d99d5de14e WHIRLPOOL 10b1518360ade5d6f1f27c79a10f630b94a2ec5062e18df11f9828d4b374e6cbdea0b9f770e01c117ca90fa194dff9bd3be6a468075c2d35167fb78a7bb32794
 EBUILD netbeans-cnd-9999_p20150901.ebuild 4790 SHA256 0be3c11a9af46d2d8aba83d0e15c09b935bd598464f43d5030887464d3f96f9b SHA512 f3b2e7de31f3434d6390bec0382fd6d77d2075470543cb9052572c91483ccfd026822a5db6f10932cb86b5974a0d2c5f390551873dac6cbd1f463b62560ab196 WHIRLPOOL f158e99c020c4e0f67c3ceec7a59d5f2cc455c52db4a9301bce821a123b7c8f3e570467aabe9281ac440d067dac36525b864dabd0c06b88ad86a2464d4e5140a
 EBUILD netbeans-cnd-9999_p20150903.ebuild 4790 SHA256 57a5694dab810fdf15990d575c3270fb7338837550ba4598e21703e4d904e85c SHA512 b5073782475520ba9126954d5341c0977a73f4b838ea4484835558b821baab49cbb52e3e07705f611e879b3eefedccb1e9a0817bbf9b98d80d17018e5888ad1d WHIRLPOOL 408c5a25c4877204b5e3a9ae8c4b7b23464a68527a8bd37e37df89a5fddf71fd23cc4e80610981dd72325d9289cfe2c5b3172986e3aff240be9911354b7d8946
@@ -27,4 +29,5 @@ EBUILD netbeans-cnd-9999_p20150904.ebuild 4790 SHA256 fe4930fc07866e09ba20693722
 EBUILD netbeans-cnd-9999_p20150905.ebuild 4790 SHA256 57f8979fede60bf65852e4527a5edc23f853d0a7127964b7bcf3520ca41e9ffe SHA512 468f3d6c806e417d43762926d68add0558b394c970ba72cf25d3da05cd7301b9a03ccfe959d710992a7a5a1a6296c293c86049f26811181e27a96d917925a69d WHIRLPOOL eed7af4f64b4e3a5feb8a6c7e0b78ff3f41cd14afd53f5a04d010ab6d0e0437391dd82ee9d1af21adaddee0bd37f88c0432c08091294992a181de04b9b5b3fb0
 EBUILD netbeans-cnd-9999_p20150910.ebuild 4790 SHA256 8ef572e9ea46ebb3c403369976f6d7d5b7882f950c6c0fdf9539122857a06094 SHA512 ef3ab5e44fab095b8d72c0fab31f69459164b6c534ebfe30d70e086bef807893c12dc3eaac4e9c3e05ed9e94d37a7e7d280db5aea8fb976996d1fc3934d9f9a2 WHIRLPOOL 31393e6c313cc02ffd8f1c9bde56102c44f36f5f37536d76d2b4db1ddcf73e6c09ce338a66986ab9f779a0e8120d9c0f917db1b56afc3e21874d235f85667ce7
 EBUILD netbeans-cnd-9999_p20150911.ebuild 4790 SHA256 a0625df95e7b9a9af31338574d0a0b298272310f22d20f68dee3aa1a702b9f0b SHA512 86138698a937176ce3afeacec1d23d6f9a7b965ea9b04d9b23a4fe0257ef5fd467ccc681e1182ba822ba92744e47edcc959a2a6b8f36d517d43208b78b38edfc WHIRLPOOL 6e085b8c39208a206f9d7db78767bf252cddbdeac53c4a16c5cfa43a7dfe37eaffdef4e7bc689cdc86da008a17eb88f79eda27dffd6b4519b83d9956de91fe55
+EBUILD netbeans-cnd-9999_p20150914.ebuild 4790 SHA256 50932d2b0cb6a9edb4cd69bde82d3b68a05f423f3b2da10de6cd7a6228793c51 SHA512 0b3a4d72ae37ecc08c48201ff9129c67b1c70c9175a077630b0480d1bcf60c629a6ac53f81e1f7efbb79ca4aacaaa1be56bbab42ebd0970658ac183fdfa4e58c WHIRLPOOL 909af5ae85c91bf317a984c2601da50aeb3acd8f56d12384b929ffe99cb131bf7e814db8aa4836195953b3cd8ed031813193abc0654b3802e5a7ad63d165b422
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150914.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150914.ebuild
new file mode 100644
index 0000000..84fc85f
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150914.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans CND Cluster"
+HOMEPAGE="http://netbeans.org/projects/cnd"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-09-14_00-02-28/zip/netbeans-trunk-nightly-201509140002-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/069B350908C75C4C2D357902CC4A5967EDCCD420-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}"/069B350908C75C4C2D357902CC4A5967EDCCD420-clank_0.3.6.zip libs.clank/external/clank_0.3.6.zip || die
+	ln -s "${DISTDIR}"/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip cnd.discovery/external/cnd-build-trace-1.0.zip || die
+	ln -s "${DISTDIR}"/BB83D4F8047D608858154CB041054F5CAE35B903-cnd-rfs-1.0.zip cnd.remote/external/cnd-rfs-1.0.zip || die
+	ln -s "${DISTDIR}"/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip cnd.modelimpl/external/open-fortran-parser-0.7.1.2.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.jna/external jna jna.jar jna-4.1.0.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-dlight-${SLOT} dlight || die
+	cat /usr/share/netbeans-dlight-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.dlight.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/cnd >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/cnd$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	fperms 755 bin/dorun.sh
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/cnd
+}

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index d529845..1d8e1be 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -9,6 +9,7 @@ DIST netbeans-trunk-nightly-201509040002-src.zip 208956475 SHA256 4cc75f6e48a660
 DIST netbeans-trunk-nightly-201509050002-src.zip 208961273 SHA256 0e4ee8605bb5933ec079c7bc1a597d00cecd76d589ea27a1612eb51253d2bf17 SHA512 d87f0251d65b3c44468ce3da97b3a9f077938da2eaa08c7afc887dbcd0054cad88840a1c12e553ba5100ebe4e272f0a89503a694ae3329952102959a530f70fd WHIRLPOOL 9f1409fe6b8775cfaa64af217fbf88220c8307ff4b169d694f431cbaaff3b46bd7f0c3a97654706e0c949d01d0a61515daef679ebea6012b56da3af7af0ac01b
 DIST netbeans-trunk-nightly-201509100002-src.zip 209128741 SHA256 5d5a40a072eab70857662787af171f4af2a73d866e122c465618914c851e790c SHA512 c40b93171efc0d42e84d34d437c15085189078d51a99be10e63a813a9e7ca9451dcaba6748344e585cc444903c29a56fb1a78c43545136910c000accf53dfe83 WHIRLPOOL 033764680db1d66360e33286c05d58e33bf0288f09e2caa9871beee1d727047b8af6a3de079c595ca508f89f0b29ae4aa96298bd4be5cee3b77e32f9759cb527
 DIST netbeans-trunk-nightly-201509110002-src.zip 209149212 SHA256 9833b3b5804a16062972c36bbc1af9ae9445f7313884195e6ac0935a43182b98 SHA512 2ba867e3c5816b08da70cc9fe5a697ae68d55b3eb28ada6c6b9364dd8828a1f16122dd57f7556113d93b4af034f4b6a0aee05d79336e18b9a8f014b86eff448a WHIRLPOOL 21026c2040e6b6d843308065fd6409ebca28a013d8166d19260888beca80dc37f50e3a327cb059f92803591a23a9838484fd2b1fee78fa3b37b378a495bda782
+DIST netbeans-trunk-nightly-201509140002-src.zip 209159147 SHA256 cdcaeab5534f59320d499b5e84f1deec2863f605ccf4f7be5ced8415e0e3a70e SHA512 0a40110edf53330612d3d586eb7931013c5279fb5db2a8383da90da03df12f291d6c7e5c0da14987311efb10cec017abf201fcf0e299141d079c316447ab8234 WHIRLPOOL ce02272125ee84695d786dcf3c66ac89f56deaed2076dd00e35a997235ca32b181257d80246f20e0e26b6983052b490f0507f718d58f164549991a940e1dd598
 EBUILD netbeans-dlight-8.0.2.ebuild 2898 SHA256 08402481b573b90396431be03bda45904b2dd29f0086e09a111fe362e310c3f7 SHA512 3f6d6c9ea0043382562fbe47ad16e3273032407a74cb44ec7ff26736f96483835af4be8674361e910912a550b9fe592cc5a28c2b93b6b993076553195c35eac5 WHIRLPOOL 9d8706ccbc0d97b0f5d64ebf22c36316b08d8fbccd57408119ca5f5faef08c7f82677bf67488ff611eabeaa730e4c9a730c50966d94d738cfe79330ac147863d
 EBUILD netbeans-dlight-9999_p20150901.ebuild 2968 SHA256 f24ed1a628b18c080f9e06c1b488b101ebc2cf6cf0aa44c5b86f168fe52f912a SHA512 0fa494a731edd4f27e36d537e0a57ab868b8a04db394777b191d8352c452f75d06900ec23b0e25e4d08b18cfe9a8d9245890b01e24e510e52b2b218ebb91d2e8 WHIRLPOOL 439d07e76a1cb3967a1ef46540bfde542e11ffd7e4fbeb6fde5f198fa5f203703b6df26c4ba764d11d6299849fc8d4c5b7eb9f2133de02ccc586deee4cc34c34
 EBUILD netbeans-dlight-9999_p20150903.ebuild 2968 SHA256 e798582769fa118385293ad20cfcdeb51a4e10be437941396b37a71faf72bf3a SHA512 3080e3c87c9668b8c1646a61f2106ae937e1b8c9049e9d08aa933458b8e4dc4721c1caf84e12c37c397c4982cecfd53e39f2516c05617a59905182aa4e4190c1 WHIRLPOOL 5ea9f447ee4cd7a398db727ce0e3dd2944c58979d8af5f5a9c686732fd6dabf2403c2357c2e5d4d088ee36655b403dc6d574e2676d032e639b9cab3faf00bf70
@@ -16,4 +17,5 @@ EBUILD netbeans-dlight-9999_p20150904.ebuild 2968 SHA256 20bc1a30e74ba61ab325740
 EBUILD netbeans-dlight-9999_p20150905.ebuild 2968 SHA256 e8d44c511dda9ed4cfcbf5e6bdb6282af22aaf421cce61aa678feae1b08109c0 SHA512 30b310325b8e6b1a6712e729a8722706d5c3990e48a8e1920d02c4a6ec897267617eb3ac8b4e170ee502f45ca656a47e0aa0d41a61f99d7665cba744e5f5314d WHIRLPOOL 8e92141b2784c30e3dfc4f8d327bc61e6d67cb28af29aebdaf742c6ed43e2c982cf968e719e59b4150c0ca5caa431b0ee1daaef1f0a7e27b80d5307b476bea94
 EBUILD netbeans-dlight-9999_p20150910.ebuild 2968 SHA256 792d7ce29c35e4a85df18300f4b52281a38b33781eb5f54aff1d2ab09d96ce09 SHA512 ae8e078d936a13fd8ef222021547bb6dd0339b5116f247cb4dae287ad533a9e55fecfbe5faedd1c23ed6bf65a721022600034f54c9af6db980f59e40b7320fe3 WHIRLPOOL 0f27883b35d1dcd454d4a291d70a034434ad07b87aeae3066cd00a39e86bc898cfd5ce2ac994ecdfbbb680a52e3835594f54c1df42fd1276ac9599adbc4c58e0
 EBUILD netbeans-dlight-9999_p20150911.ebuild 2968 SHA256 0a379a8c6162403345249ecd7143fc864c9efce927358d1d473d8f278742940a SHA512 11e20dfbcc355f3a33d07f2727dfeb41b699524b7002968363c5dd1c0a44cf34fd36f2121234e323a1665b3d509f8ca3f06815329aa7948d436ccbb305463851 WHIRLPOOL 4e072e0e1cf6063b507fd304687a8f79512929d26d3df1cd1a58d65158b1235ed219b61b8cf7386d141cf1a46915b66c57c739ae0954199bfd86d4148c9e876a
+EBUILD netbeans-dlight-9999_p20150914.ebuild 2968 SHA256 80b05f9d601f411f2211eab2c61e1329d5c27a4f8fe4dec4993723b7f467b571 SHA512 b979693d6a0a0780194296a5a602f912c8c0002206d41077312689b629c0f40cd26af2eebe92c872d96c0d6af8a941576bcd697055df5f4d2065e518a1944a73 WHIRLPOOL 35eb43a94541843b0ce8067b31b710c25c8c9fdd8597c7409c9b2608d24f6972148c46a4c6d013dfd2f47b044ff6afce349bd2df903639436c4e68bd22dfdac8
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150914.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150914.ebuild
new file mode 100644
index 0000000..2bc1eb5
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150914.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans D-Light Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-09-14_00-02-28/zip/netbeans-trunk-nightly-201509140002-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/Manifest b/dev-java/netbeans-enterprise/Manifest
index f9492e5..7711900 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201509040002-src.zip 208956475 SHA256 4cc75f6e48a660
 DIST netbeans-trunk-nightly-201509050002-src.zip 208961273 SHA256 0e4ee8605bb5933ec079c7bc1a597d00cecd76d589ea27a1612eb51253d2bf17 SHA512 d87f0251d65b3c44468ce3da97b3a9f077938da2eaa08c7afc887dbcd0054cad88840a1c12e553ba5100ebe4e272f0a89503a694ae3329952102959a530f70fd WHIRLPOOL 9f1409fe6b8775cfaa64af217fbf88220c8307ff4b169d694f431cbaaff3b46bd7f0c3a97654706e0c949d01d0a61515daef679ebea6012b56da3af7af0ac01b
 DIST netbeans-trunk-nightly-201509100002-src.zip 209128741 SHA256 5d5a40a072eab70857662787af171f4af2a73d866e122c465618914c851e790c SHA512 c40b93171efc0d42e84d34d437c15085189078d51a99be10e63a813a9e7ca9451dcaba6748344e585cc444903c29a56fb1a78c43545136910c000accf53dfe83 WHIRLPOOL 033764680db1d66360e33286c05d58e33bf0288f09e2caa9871beee1d727047b8af6a3de079c595ca508f89f0b29ae4aa96298bd4be5cee3b77e32f9759cb527
 DIST netbeans-trunk-nightly-201509110002-src.zip 209149212 SHA256 9833b3b5804a16062972c36bbc1af9ae9445f7313884195e6ac0935a43182b98 SHA512 2ba867e3c5816b08da70cc9fe5a697ae68d55b3eb28ada6c6b9364dd8828a1f16122dd57f7556113d93b4af034f4b6a0aee05d79336e18b9a8f014b86eff448a WHIRLPOOL 21026c2040e6b6d843308065fd6409ebca28a013d8166d19260888beca80dc37f50e3a327cb059f92803591a23a9838484fd2b1fee78fa3b37b378a495bda782
+DIST netbeans-trunk-nightly-201509140002-src.zip 209159147 SHA256 cdcaeab5534f59320d499b5e84f1deec2863f605ccf4f7be5ced8415e0e3a70e SHA512 0a40110edf53330612d3d586eb7931013c5279fb5db2a8383da90da03df12f291d6c7e5c0da14987311efb10cec017abf201fcf0e299141d079c316447ab8234 WHIRLPOOL ce02272125ee84695d786dcf3c66ac89f56deaed2076dd00e35a997235ca32b181257d80246f20e0e26b6983052b490f0507f718d58f164549991a940e1dd598
 EBUILD netbeans-enterprise-8.0.2.ebuild 15071 SHA256 84621e3bb946cfa254bb70ca3c3f61202882a7e6d631769ad2f0f4639b0de875 SHA512 6ad38e840764661e6bc5b89b5925e9665871009ba0b640c0a78c555ec104214dbee1200a93cb48e655bc620e07bb6e4d8932b23a00fe458f8a5e9e5c3200d79d WHIRLPOOL b2c2bbf2ff72f8cd9b4cdbe039fdbf7cd074b0fdc20f634aa0b6f79f5c639be358c61fab30854a6e3ab9714a285d9461ac4e39e94e10c14c5068422d6c873c56
 EBUILD netbeans-enterprise-9999_p20150901.ebuild 15931 SHA256 44c06fa71678bc9434d41c8f580375f0e56c4756da1ad14de658574360a4ca8a SHA512 0e0800cd6259f4e4524d328a593ad4d1a40cb0b129ef53088403c0fe90b732f15eb897686485f629501cdaf4efbbaa69c60ce648e655a016abf4d24588a9191a WHIRLPOOL ee6d2a407a2d6e124f21912a7a0b1c6dfc8155cf228f9f451554c1c40ab63d497070d0264360aded0de23e7c03a52825593fde03dc4ed092b65789cbe083d47a
 EBUILD netbeans-enterprise-9999_p20150903.ebuild 15931 SHA256 2d15c63f7b1c6b590dfbda9cc26aa44ee36c043a695ad4ae06bac98b17f9f73a SHA512 6ca976ec3cb4b96d4d9794abaaadaa7e42dc0d4537e02a6cd0a65b0df7c2789a5eeeaabdb33b42df134271d4f8f0b5d54ddbeffb18a704e36c6e8a25f6d5245b WHIRLPOOL b0927d3c4aedd46698cba83fb07e35d5d0796ec9a50b65cc828534da1c45ab9b75701c58003583af3f999a2d4fa69a6b4a62abc3225d7591444dfca0353e3bf8
@@ -46,4 +47,5 @@ EBUILD netbeans-enterprise-9999_p20150904.ebuild 15931 SHA256 108e483f1d0090f6db
 EBUILD netbeans-enterprise-9999_p20150905.ebuild 15931 SHA256 6d553b1dda96babcc4a3733608b3120b3589529b6ccc85431f004af506f6b922 SHA512 da2f0c69d6376308566bbb62bff775dd420e44c04cdd028c37ebeeb0df3f8896552ea84cce1611c7edf66ae111d237aaa3bd788ce2e955e6a72354a1687153ea WHIRLPOOL c0b995185f6e64ce2818ed2c642344b893ba16955ca56b6f3eda6ecfb47900d44bb5f88870a35b022c22254daa3add1dd2b8041ae5bbfe2c0085ece2960e9847
 EBUILD netbeans-enterprise-9999_p20150910.ebuild 15931 SHA256 7734de964099ec2e1538812a6e81d524146a71782a7435c0268bc1eb92b95b1c SHA512 6a4b17a2e508b10fcfab4ef9b01a94bdf6cb1858552156013c47e389cc4e5ccc2c5c1a0b6026668a81bcc0cf1622cd0fae426007617912dde1703f7a0b6ba70c WHIRLPOOL 5eabd087563f874fc9c3dded471a06e54160894ea0f8c812dceb44e234993d6fd691e9a44b445c360002ab8879837f5be89d68cb90b1c7aa38c10892ac46b866
 EBUILD netbeans-enterprise-9999_p20150911.ebuild 15931 SHA256 8efa765f218e10f37db492c306569d324af0422161352502fb243e17b3867fa3 SHA512 11735535a644e22ee4f978ede02deedb6eeffd60324687c80888068e0126e7f77ac9cf9e754b0b93fac2cd385bcb8638ceaef9952e1ca78815571e9b5f8b2054 WHIRLPOOL 723e1b245249e9851921ae1e10bc7ba51185732091e0ee714d709c60cba05bb6a41a1d3ca249437f4f62212ccdd8994fb616791be60497e6da6635dcf6ff6dc1
+EBUILD netbeans-enterprise-9999_p20150914.ebuild 15931 SHA256 9101e110b3d92415c5c316c94265682f2aa856e04cf2ea35a58895e51a17dd31 SHA512 98cc5ffd25d12b0d6b9829b2ba7c5c465ba34b283ae07424ac56ec87312b644cdf497e1be11bd997a0ac6a2666796953903b1e4bb2f6eb9e2dd5204e87c68ec4 WHIRLPOOL 0262e3566d8cdec8250eba494a669c60f90c01493eb5aa4828692d541b1e15c0b11b332e96fb1d937be24d6fa6c00b1e8ab216f8a937d97c698444b19a5f0ae3
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150914.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150914.ebuild
new file mode 100644
index 0000000..dad975e
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150914.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Enterprise cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-09-14_00-02-28/zip/netbeans-trunk-nightly-201509140002-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/Manifest b/dev-java/netbeans-ergonomics/Manifest
index bf180c5..4dbd8a6 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -7,6 +7,7 @@ DIST netbeans-trunk-nightly-201509040002-src.zip 208956475 SHA256 4cc75f6e48a660
 DIST netbeans-trunk-nightly-201509050002-src.zip 208961273 SHA256 0e4ee8605bb5933ec079c7bc1a597d00cecd76d589ea27a1612eb51253d2bf17 SHA512 d87f0251d65b3c44468ce3da97b3a9f077938da2eaa08c7afc887dbcd0054cad88840a1c12e553ba5100ebe4e272f0a89503a694ae3329952102959a530f70fd WHIRLPOOL 9f1409fe6b8775cfaa64af217fbf88220c8307ff4b169d694f431cbaaff3b46bd7f0c3a97654706e0c949d01d0a61515daef679ebea6012b56da3af7af0ac01b
 DIST netbeans-trunk-nightly-201509100002-src.zip 209128741 SHA256 5d5a40a072eab70857662787af171f4af2a73d866e122c465618914c851e790c SHA512 c40b93171efc0d42e84d34d437c15085189078d51a99be10e63a813a9e7ca9451dcaba6748344e585cc444903c29a56fb1a78c43545136910c000accf53dfe83 WHIRLPOOL 033764680db1d66360e33286c05d58e33bf0288f09e2caa9871beee1d727047b8af6a3de079c595ca508f89f0b29ae4aa96298bd4be5cee3b77e32f9759cb527
 DIST netbeans-trunk-nightly-201509110002-src.zip 209149212 SHA256 9833b3b5804a16062972c36bbc1af9ae9445f7313884195e6ac0935a43182b98 SHA512 2ba867e3c5816b08da70cc9fe5a697ae68d55b3eb28ada6c6b9364dd8828a1f16122dd57f7556113d93b4af034f4b6a0aee05d79336e18b9a8f014b86eff448a WHIRLPOOL 21026c2040e6b6d843308065fd6409ebca28a013d8166d19260888beca80dc37f50e3a327cb059f92803591a23a9838484fd2b1fee78fa3b37b378a495bda782
+DIST netbeans-trunk-nightly-201509140002-src.zip 209159147 SHA256 cdcaeab5534f59320d499b5e84f1deec2863f605ccf4f7be5ced8415e0e3a70e SHA512 0a40110edf53330612d3d586eb7931013c5279fb5db2a8383da90da03df12f291d6c7e5c0da14987311efb10cec017abf201fcf0e299141d079c316447ab8234 WHIRLPOOL ce02272125ee84695d786dcf3c66ac89f56deaed2076dd00e35a997235ca32b181257d80246f20e0e26b6983052b490f0507f718d58f164549991a940e1dd598
 EBUILD netbeans-ergonomics-8.0.2.ebuild 2843 SHA256 f9262f6ee7f2aed1fab9bf4cf756f565272e9894afa50b349735e39961e7acc3 SHA512 f158c27640541f7aef31da050e0811c07a251ae4797cc663b95a074a47eaf9d6bb7a9aa11ba38ea55e75c185f7dba74629ba6716a819e8ad68eb3db9ada71451 WHIRLPOOL 4fe9634fb673fb05dbba25996efc3a212ef3bb23ab6e7c732cb75de076feb930735e3901806fd9c801abc7ee8aa8eb800718065325d415371255a886474061d4
 EBUILD netbeans-ergonomics-9999_p20150901.ebuild 2913 SHA256 5c3c619373ecaa4361d21b0686e634abd8e4f94f1d73aedbdc57307d50c64ba3 SHA512 d83f039014436f6e26b1f6fab2391ad2ecc33c184847574ea9c646a1b028f22ce3b566e4976a28d5b6bb00fd671043ff81bc718be76304077caa016613ef1edc WHIRLPOOL d0dbd357622f050e0b18a5c1262057050b740ce60069bdf6450cbdab0cdc4a78c81fc28e3837bd1fa1ab571666d3c2885fb975f5e26d50550b7c30ddbe17f547
 EBUILD netbeans-ergonomics-9999_p20150903.ebuild 2913 SHA256 08d2510fcb31a4ff36c702493e7a028659225e1678b6ad519c625b11220286c9 SHA512 5c5917f2498717d6d404145d13f2e1e75e1e93b08baaa451fbfa4c8e9b518f6207ec1eb86d7f6d57cc96ebaf55c0926f14b8601d7c2ea036c6566e95b2c5deb0 WHIRLPOOL 0e82e1fc32f080535e2b621f69111f0b5f453e08613b916c6fa1eb741cd9dfdb72651b31ac8f5c7bcf31b0b968aed41c3c6d9de6fa272b6d06851853beb1d57b
@@ -14,4 +15,5 @@ EBUILD netbeans-ergonomics-9999_p20150904.ebuild 2913 SHA256 8ef30ecede00161828d
 EBUILD netbeans-ergonomics-9999_p20150905.ebuild 2913 SHA256 7cff158b980d95dae799697361df1a71cad68896d8031d04a6acccab087aad4c SHA512 7a3e6f2a424955052827b2f1250dc35336d1c073f317de144afb3be3287b8324a5500f4aadc37f3aa0144f7a9ef65762022035ac3d809370d3901731cfc6ca1c WHIRLPOOL ddc3d6e43b98e5a0b30b8c9bad69a7d5e1e14fe1b856b08f14840b8a1687f579f56c5943c0b395981005dd33a135e09f488c6e68826d284101c1158d0fb52ca3
 EBUILD netbeans-ergonomics-9999_p20150910.ebuild 2913 SHA256 e675ed7f9000df1ca4e06774c482af25af3f59bee2d428d093e7ac033080935a SHA512 ad5b379d52ad4ed5784ad7d56740fae3d78315fa22add1b593eed971883ab6f1204435e5e8323d442b8463999fef98f90038b5da817c6b86a2ea9a4d06e00401 WHIRLPOOL e84575cf1298f90831c21065454ef8432c927081478a5a2aad02e648270d40d515448b556cad5a6bd29eb714bcea96bfa60940fdf517059c5fc891e7aac29128
 EBUILD netbeans-ergonomics-9999_p20150911.ebuild 2913 SHA256 cadbf669681bdfa15c762725a48ee807161e8689a98dba57cf8c4ec3b791334e SHA512 8c284ef562ee56912849790ccc277e9f30172d9b2ba35f728ba91a99db045fa44633e2ec54406fbb7023de978077cfb62b151a88904d3a72d8f47e8a3a2970e6 WHIRLPOOL ed76e147072a3a8bb8c9adadf8a90c70114925557e1b3d2001c6709971d8639efd0964eb60037cd96d37e29752a2fdaecaacaa0d8e446a26286af8acc9a3df12
+EBUILD netbeans-ergonomics-9999_p20150914.ebuild 2913 SHA256 48e1d1f1f682f53c1524d8aa790a653a644fb959a002b14173814e7d4d61bc76 SHA512 91551f3350562d318a9dfa662ba63a04682187df219e9d1cc04f3fa26782233858fabe0ee98f080e228a676084b39c377922f9ee99487eb608aa2aa659eac8f5 WHIRLPOOL 77d4ad318a910ea6e6971b2cb4798edc331d1d4966a05197cba33346109bf05807ec7119f714d6b35f58b06f467efab07406db9bb1f2059578ae250aade6017d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index 54fcc1f..b5b52bc 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -9,6 +9,7 @@ DIST netbeans-trunk-nightly-201509040002-src.zip 208956475 SHA256 4cc75f6e48a660
 DIST netbeans-trunk-nightly-201509050002-src.zip 208961273 SHA256 0e4ee8605bb5933ec079c7bc1a597d00cecd76d589ea27a1612eb51253d2bf17 SHA512 d87f0251d65b3c44468ce3da97b3a9f077938da2eaa08c7afc887dbcd0054cad88840a1c12e553ba5100ebe4e272f0a89503a694ae3329952102959a530f70fd WHIRLPOOL 9f1409fe6b8775cfaa64af217fbf88220c8307ff4b169d694f431cbaaff3b46bd7f0c3a97654706e0c949d01d0a61515daef679ebea6012b56da3af7af0ac01b
 DIST netbeans-trunk-nightly-201509100002-src.zip 209128741 SHA256 5d5a40a072eab70857662787af171f4af2a73d866e122c465618914c851e790c SHA512 c40b93171efc0d42e84d34d437c15085189078d51a99be10e63a813a9e7ca9451dcaba6748344e585cc444903c29a56fb1a78c43545136910c000accf53dfe83 WHIRLPOOL 033764680db1d66360e33286c05d58e33bf0288f09e2caa9871beee1d727047b8af6a3de079c595ca508f89f0b29ae4aa96298bd4be5cee3b77e32f9759cb527
 DIST netbeans-trunk-nightly-201509110002-src.zip 209149212 SHA256 9833b3b5804a16062972c36bbc1af9ae9445f7313884195e6ac0935a43182b98 SHA512 2ba867e3c5816b08da70cc9fe5a697ae68d55b3eb28ada6c6b9364dd8828a1f16122dd57f7556113d93b4af034f4b6a0aee05d79336e18b9a8f014b86eff448a WHIRLPOOL 21026c2040e6b6d843308065fd6409ebca28a013d8166d19260888beca80dc37f50e3a327cb059f92803591a23a9838484fd2b1fee78fa3b37b378a495bda782
+DIST netbeans-trunk-nightly-201509140002-src.zip 209159147 SHA256 cdcaeab5534f59320d499b5e84f1deec2863f605ccf4f7be5ced8415e0e3a70e SHA512 0a40110edf53330612d3d586eb7931013c5279fb5db2a8383da90da03df12f291d6c7e5c0da14987311efb10cec017abf201fcf0e299141d079c316447ab8234 WHIRLPOOL ce02272125ee84695d786dcf3c66ac89f56deaed2076dd00e35a997235ca32b181257d80246f20e0e26b6983052b490f0507f718d58f164549991a940e1dd598
 EBUILD netbeans-extide-8.0.2.ebuild 3307 SHA256 084e952eae1708b0fab785fd34313985e864dbc74a8531a0d5cdcf906e88f85a SHA512 ade8dc37aa932d7ec20966199e521311716061c23df08d02635f78efd2776f1d7bf040b0f9c9488b947bbbdfb3e33fa764723e3dfffa2214892bc6d685428f6f WHIRLPOOL ad2c26b005675ebca7d902ff1e6caa28552f3fda6795e327cc3584cf109f0ad6efad6516e15af5e70d689be236298b0948003e09a3da4991b3e29a1c85607b2f
 EBUILD netbeans-extide-9999_p20150901.ebuild 3377 SHA256 a459e45e713807b3565add526bbbca698d49b86ec31dfdb90dde5de79a98bf4f SHA512 7221a46804530530304a4cb1a36d58a82c19717e9d6a61c4e5c35a28ad3cb58d108fb11341a5ef9005557b1c7e891478e64f38aa12efffc652ddb684ba94c0d3 WHIRLPOOL 8b4d65a5d5c72f544ea83b43681136ba08678b20a71a15d336e9f8cf235331e01d6ba21bb7bf8147deb638d9e857006eb1ead0a0016e47c3c21262012c03e8ff
 EBUILD netbeans-extide-9999_p20150903.ebuild 3377 SHA256 e0a7a1f3704f2521ff54dbaa7eb9672a10bb8b866026d359c6fd4ae287937afa SHA512 c0f77e05c7a78608804126a10738d46e337f38b0124e30f50d14fedb24e984bca9a94bf31ee8ff6cc3931ca8b74527d521a27384dba09f555f7d59bafc366642 WHIRLPOOL 73fe4c7dc37d7b1ab2794cc55864dad1a5c1408a14c028df00c9f26c5049f08ccb5b8d2a88d3b0f2ad72d5fc927513692157e38b943db69fce602f6256638ab8
@@ -16,4 +17,5 @@ EBUILD netbeans-extide-9999_p20150904.ebuild 3377 SHA256 95201f57ee8e7e652660751
 EBUILD netbeans-extide-9999_p20150905.ebuild 3377 SHA256 a1572dea64ffeaf591e84ce69d582eb518c6b4b05eef0b56e29ceed376a10441 SHA512 202241e945890917f1076be1d79250c24fe758bba9ddc6b82cb1cb98d036d838cc692e610319359416e59edff5c0fecabbed436ae89f2d6685ebada418f39c7f WHIRLPOOL 13b3d51d1c9b14cb0d6a692230254cd402df5da367e8c0601b898d4eaa244cbe72b72e9c7c7ebfd213143c3b2094f51dda9e6ccfb08254ab3e226360df85c5d2
 EBUILD netbeans-extide-9999_p20150910.ebuild 3377 SHA256 87e84103c4dc20ed68868d2bd77e6ceb0fd6895f2d6fd05b73f08cd377847471 SHA512 08eff343e7404dc735b3133c0a353d5da42e6b764e704d18cfdcbd1b712d75643e25fc52531f81cd5302c6401022889d1d413e2eaddc44fa34387b36d2318428 WHIRLPOOL ca7838b02a4b7099896ad69e8c6986829ae7d76d4102fdb36988471b8499fcc21f90f0c42ad2bad5cea8c2aa249bd6314d09c19cef487c050e50fa47d25c846d
 EBUILD netbeans-extide-9999_p20150911.ebuild 3377 SHA256 787bd0b409195b4575d88e9a8d6bf2939027dbe1600cba5521417b9c8d26f324 SHA512 1316048db9382dc8987609e393ea32467ac4f4e22781c9ca33fcac54e1a0371619225f6983a955dadad76b9cad3cf66dddc010a8d2dc978163a59678b9ff4815 WHIRLPOOL 3f585eef5d5dbd54ee24e42b53bb216fa84f794f8698db949312ca97622afb4156e789e53f711f3fc0016a336367bdbb9316a7b1779c07659b7533309a46d738
+EBUILD netbeans-extide-9999_p20150914.ebuild 3377 SHA256 77f2909564d529ada9bfd65450c492a4a8e40ed17b043aa937749a1654194f99 SHA512 6274e8158a874de68a7ad374c629c98e4637f3a9304e6da9d017a2586f606ba8a5d1aca316fa854db86d2b03b694dbb292f670850debfad388d64399ec789a65 WHIRLPOOL da730ad9cf8c9961c7fde8e6cfecdeb7bbde12073957fcba3900ce4dc058bfe6894a4779f9a5a6c03c511b43ede152b692a5ac5db2840c4a871322d73a0db5f3
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 19e2874..a7c1801 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -8,6 +8,7 @@ DIST netbeans-trunk-nightly-201509040002-src.zip 208956475 SHA256 4cc75f6e48a660
 DIST netbeans-trunk-nightly-201509050002-src.zip 208961273 SHA256 0e4ee8605bb5933ec079c7bc1a597d00cecd76d589ea27a1612eb51253d2bf17 SHA512 d87f0251d65b3c44468ce3da97b3a9f077938da2eaa08c7afc887dbcd0054cad88840a1c12e553ba5100ebe4e272f0a89503a694ae3329952102959a530f70fd WHIRLPOOL 9f1409fe6b8775cfaa64af217fbf88220c8307ff4b169d694f431cbaaff3b46bd7f0c3a97654706e0c949d01d0a61515daef679ebea6012b56da3af7af0ac01b
 DIST netbeans-trunk-nightly-201509100002-src.zip 209128741 SHA256 5d5a40a072eab70857662787af171f4af2a73d866e122c465618914c851e790c SHA512 c40b93171efc0d42e84d34d437c15085189078d51a99be10e63a813a9e7ca9451dcaba6748344e585cc444903c29a56fb1a78c43545136910c000accf53dfe83 WHIRLPOOL 033764680db1d66360e33286c05d58e33bf0288f09e2caa9871beee1d727047b8af6a3de079c595ca508f89f0b29ae4aa96298bd4be5cee3b77e32f9759cb527
 DIST netbeans-trunk-nightly-201509110002-src.zip 209149212 SHA256 9833b3b5804a16062972c36bbc1af9ae9445f7313884195e6ac0935a43182b98 SHA512 2ba867e3c5816b08da70cc9fe5a697ae68d55b3eb28ada6c6b9364dd8828a1f16122dd57f7556113d93b4af034f4b6a0aee05d79336e18b9a8f014b86eff448a WHIRLPOOL 21026c2040e6b6d843308065fd6409ebca28a013d8166d19260888beca80dc37f50e3a327cb059f92803591a23a9838484fd2b1fee78fa3b37b378a495bda782
+DIST netbeans-trunk-nightly-201509140002-src.zip 209159147 SHA256 cdcaeab5534f59320d499b5e84f1deec2863f605ccf4f7be5ced8415e0e3a70e SHA512 0a40110edf53330612d3d586eb7931013c5279fb5db2a8383da90da03df12f291d6c7e5c0da14987311efb10cec017abf201fcf0e299141d079c316447ab8234 WHIRLPOOL ce02272125ee84695d786dcf3c66ac89f56deaed2076dd00e35a997235ca32b181257d80246f20e0e26b6983052b490f0507f718d58f164549991a940e1dd598
 EBUILD netbeans-groovy-8.0.2.ebuild 3346 SHA256 907e6cd11c222f15c826494b44929483803f0e4249de0d54db51e6855b574148 SHA512 8bb37121e7e32621959318d109b1d982e2c705a9deb7171f5fef1dcaed55fc5718b0bc9e6bbb2592cdaa5e96d874bb6e6bfa96d06fe09f14d5250c1485eb1da5 WHIRLPOOL d5e09fa1e975835f05c6132c091fee4ae9fc9dd671af9f5f88a9195d5cd4a93804f96687ed3f2bd741117fa65773f2c464b3cfd6697425039cc51a940efa2a31
 EBUILD netbeans-groovy-9999_p20150901.ebuild 3416 SHA256 bd899df99a2dfaf3081354ae331ad0494b5f2cdda81dc9039cef398ff8fcb10d SHA512 5753e9033ecb74072aae302ac814e5e8f3c264b159f4d82f7d41467f552b8089ad4a02141a277f154d8f48145a925b4214898e188d69f38d50dbb28af5b45b60 WHIRLPOOL ff875fab2e82d6fe6dcbabcccf334ff8056939ea7502773191ba622ecf597acbb49ac0a685ddca883bee01a890c220d9d531b6daa01189dc9b4a58cf41144c80
 EBUILD netbeans-groovy-9999_p20150903.ebuild 3416 SHA256 52900724587824fe2970ef01a4f6e2478d2b43f8068473edce228ae26f295f11 SHA512 15387a879c00dc1262cfe45c5d4d4bed353a15606531a1942a4921eaa7e947d89624bf81ed25a75bc9d76c1f8d7d729478e31f5dff416f08ba5c81280d1b88ab WHIRLPOOL fe65f7e8120c3586e0e35c49008c85296237f69eeac8f6f383a0bf47c86407e66c6f17c3ff01dbdb921ecd9bb4c71e57e106a1f779b276239b9fa3ccefa8d2ab
@@ -15,4 +16,5 @@ EBUILD netbeans-groovy-9999_p20150904.ebuild 3416 SHA256 3d4a80ccfb6abf713b08bea
 EBUILD netbeans-groovy-9999_p20150905.ebuild 3416 SHA256 13bc549391ab10a9a25effb9f060c5571879f15c8a2cacc9d81d6efca511701e SHA512 32d1302682eb822e6dc6d7fc0d2485f8afdd5cd822913ab1c7dc99477e39322c6ee92728ea91b225947d690d7aca81292c4ed52c6cab8a56536776ab291cd71f WHIRLPOOL e7716c90b0e7f63c837d5e9e7b8d0eb4bcbdbd87848e494fda303f260c43a3270c6309cd8fdda31c485a125140e31e6d110e0b09b36a8451c29849ff8c814ee3
 EBUILD netbeans-groovy-9999_p20150910.ebuild 3416 SHA256 6dba1de476b8bf9501da5adec0028c2e60988718f7dfe656192d390daaf0b406 SHA512 dcfdfa8085f93008d3681ac4c9d26cfa785c1c43aee1f576b50097cc64704267c3b7880c7fcf196f1530315d7880f319f6450b3985c53b69f8942dbeb92e0e14 WHIRLPOOL 68c8e8988bccb38659b5a78658a6054b268e4e8f5741cd660d661693bdb5e26c33569efe22aa4d08c1feb92b6108bcefc414019472df9fc5cb1beafee8c0d42d
 EBUILD netbeans-groovy-9999_p20150911.ebuild 3416 SHA256 ad8fecb923a1adbc56a83a86b740a1f562803f0ccd520d0daba98fced07171cd SHA512 9ca4fdc8bd64c7c3d4c18691b3875968672ddd8e465a789be0c1f35c0ea74c8068f4f455682dd9dbf842e648d28cc5b1f42b724f77113f47ffa3c571b030d670 WHIRLPOOL ac776f4e1173148eda24564f72e19b4de5abfa60e6b29ed64fb987c1bea1eaece5431397de3bff60b8ae89afc85dae74f4fc3277a1a4760c713a4d34401de0d4
+EBUILD netbeans-groovy-9999_p20150914.ebuild 3416 SHA256 cfeac72b47716cfbdd3088db781ee75e7b8b7af226af3eb3db85309db251ea6a SHA512 eeb0c02e56a5f349c6b23a8fe7bb5456eed83af8d413034eb8e20e4851a3b6d12a952d9816bd7011926154212f86689800f12e38d21248b555fd65f1434ed7df WHIRLPOOL 2172c53e64f60003dfec846bad6179a37302109bf4c065b87779db2139bc83946a4e85dd8567a752d26595eb88219be26b88838cf9950b50140a9f4659d0e321
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 8e15652..f3e0563 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -12,6 +12,7 @@ DIST netbeans-trunk-nightly-201509040002-src.zip 208956475 SHA256 4cc75f6e48a660
 DIST netbeans-trunk-nightly-201509050002-src.zip 208961273 SHA256 0e4ee8605bb5933ec079c7bc1a597d00cecd76d589ea27a1612eb51253d2bf17 SHA512 d87f0251d65b3c44468ce3da97b3a9f077938da2eaa08c7afc887dbcd0054cad88840a1c12e553ba5100ebe4e272f0a89503a694ae3329952102959a530f70fd WHIRLPOOL 9f1409fe6b8775cfaa64af217fbf88220c8307ff4b169d694f431cbaaff3b46bd7f0c3a97654706e0c949d01d0a61515daef679ebea6012b56da3af7af0ac01b
 DIST netbeans-trunk-nightly-201509100002-src.zip 209128741 SHA256 5d5a40a072eab70857662787af171f4af2a73d866e122c465618914c851e790c SHA512 c40b93171efc0d42e84d34d437c15085189078d51a99be10e63a813a9e7ca9451dcaba6748344e585cc444903c29a56fb1a78c43545136910c000accf53dfe83 WHIRLPOOL 033764680db1d66360e33286c05d58e33bf0288f09e2caa9871beee1d727047b8af6a3de079c595ca508f89f0b29ae4aa96298bd4be5cee3b77e32f9759cb527
 DIST netbeans-trunk-nightly-201509110002-src.zip 209149212 SHA256 9833b3b5804a16062972c36bbc1af9ae9445f7313884195e6ac0935a43182b98 SHA512 2ba867e3c5816b08da70cc9fe5a697ae68d55b3eb28ada6c6b9364dd8828a1f16122dd57f7556113d93b4af034f4b6a0aee05d79336e18b9a8f014b86eff448a WHIRLPOOL 21026c2040e6b6d843308065fd6409ebca28a013d8166d19260888beca80dc37f50e3a327cb059f92803591a23a9838484fd2b1fee78fa3b37b378a495bda782
+DIST netbeans-trunk-nightly-201509140002-src.zip 209159147 SHA256 cdcaeab5534f59320d499b5e84f1deec2863f605ccf4f7be5ced8415e0e3a70e SHA512 0a40110edf53330612d3d586eb7931013c5279fb5db2a8383da90da03df12f291d6c7e5c0da14987311efb10cec017abf201fcf0e299141d079c316447ab8234 WHIRLPOOL ce02272125ee84695d786dcf3c66ac89f56deaed2076dd00e35a997235ca32b181257d80246f20e0e26b6983052b490f0507f718d58f164549991a940e1dd598
 EBUILD netbeans-harness-8.0.2.ebuild 4055 SHA256 2674d562adc57648c82cac9f714f74f9d29dd7b7ff7fa7f0ef37c43ef0975489 SHA512 7d72bed5b955b2365a4c11fcd97a2d6f2372ab939fb9a03b3ff7915053f24d695373c1aa154f6e6916d37ef3ace7b38864d575419460382760500576dae52e49 WHIRLPOOL 72f54a6cb83f282a75f0abb073109414a7b8bcd4e9263466281e68ff34148a7343ed3bd78ebdc8afd109b6b9f5b9f15bfd0e250f418fcaa4986a7c886b57b9f6
 EBUILD netbeans-harness-9999_p20150901.ebuild 4125 SHA256 c9189bd6d9b770dcc22627aedb7041e6dd80a0464b4b3649a6cebf1352fd7dea SHA512 154f820f3b07192e4d8b35fd473cdedd3dcee70d81f8484e95a33846fd6c3e8474acbad1ee99ca2ee29574da125521ca695bed8a471e5fd10ab7724ef9d8f7d4 WHIRLPOOL 8b4a9ff80f36f06108df4508abd091b99e5ed96c6b297c1efe5b18b3f798890f6f23313c02d543d89fcde5169631bf3cdca15cc54a086747f8f52eda303d8f09
 EBUILD netbeans-harness-9999_p20150903.ebuild 4125 SHA256 68de6c9e0f914b0db958bcb0a48f9e74170cef31e65dcea5e8996f8796df32d1 SHA512 93a557e04df4f9fc4bc068b087e3b91d5fb409c30e8c16b625f2973b28e3f5f36474fa7d36ca9fc72c154bb2a2bd84b696a95241cd02ec14cf7ae4800291d545 WHIRLPOOL 4bbdb9c03f2b21ce25eba8f4ac8abe8144c4f315dc2a608d2ec4cb3a6adcd7020f4bae313924024eaba580e245d1e8e3e3cd19f3d1e6f90db4c6ca6f7c90ad3c
@@ -19,4 +20,5 @@ EBUILD netbeans-harness-9999_p20150904.ebuild 4125 SHA256 9e64e0a2ec17df672daedb
 EBUILD netbeans-harness-9999_p20150905.ebuild 4125 SHA256 b40aed5fd4be5ef577b33ebef09d14a804c4adc7ae0a65b6dedf86c3571a965d SHA512 364650e97f55dc0bde7117c7586320d86f13b4d9f9ccea54128d27632f23ce641e6f7de8f639997018172629bef0cb75c311bbe44b3e8b960876ab9dae098205 WHIRLPOOL 5e96a28f21f0d4be0758e3d2dd9e89cfb4b42725875fa02d07c0d13825feaf5af90e994463b061d6c837778e44dfe65ac4ca9ea1ecf0cefd42ab75f6160b5266
 EBUILD netbeans-harness-9999_p20150910.ebuild 4125 SHA256 455152da6aba61f06d8677d60bd0c5c1df6d8439bbaf9573b72641564855af0c SHA512 5dcd8479b609e704abb50fce1654640bccf29cf2c283044de3c96215b97377c5612bb7629ee8379c454a72f7831da5fdf5ac0c16053f2289a5fcd9c24ce651b1 WHIRLPOOL b95cfb8aefc2b79378556ecabe2a0a804706d1a1918450edb752c77ec4bb567bb3988c212b72353dc71c7adaf3f918c55a0354aff2530ce0340d450db6bd2434
 EBUILD netbeans-harness-9999_p20150911.ebuild 4125 SHA256 1a33f003625fce99e14e4e620dad9829eaafb771ddfa30704d36559c3a581bba SHA512 c59f4018a08485d938a0702c07685c51a3c9ccc6b1e4103e1d360ba81c3b83491950518b564c9b8810f68653701f2a91a7e0f3ccda218cbf8cf5fb5d9316b2b3 WHIRLPOOL 5aa07a900bf350c80203cf7144a13c3173b9a048f8f70a2fffd4f766d26583779554b53b4fbdac68627324b381181f2c76ee80637c0eb6e1523141cc77570c2b
+EBUILD netbeans-harness-9999_p20150914.ebuild 4125 SHA256 44bcecb8562b2e40d845b081f8a464447599a4d45e512f9b390dea97fea4e8c9 SHA512 1598fb8ed5b8317638ef150ab940e51d30b2225ab78b263290a409c801feb816adf8459659c25db29d27de0cefef490a4024bf646d22857547578322166fc9ad WHIRLPOOL a863567647c7e790e2b332a53c95822465e1040aec58171c3207c80397cdb4b9257e3a7e6f3bc438f936644e4de3ccdedb2d8735b3beaf43725a77c194b317bd
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20150914.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20150914.ebuild
new file mode 100644
index 0000000..0f19663
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20150914.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Harness"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-09-14_00-02-28/zip/netbeans-trunk-nightly-201509140002-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/Manifest b/dev-java/netbeans-ide/Manifest
index e02fb2f..e2a0acc 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -113,6 +113,7 @@ DIST netbeans-trunk-nightly-201509040002-src.zip 208956475 SHA256 4cc75f6e48a660
 DIST netbeans-trunk-nightly-201509050002-src.zip 208961273 SHA256 0e4ee8605bb5933ec079c7bc1a597d00cecd76d589ea27a1612eb51253d2bf17 SHA512 d87f0251d65b3c44468ce3da97b3a9f077938da2eaa08c7afc887dbcd0054cad88840a1c12e553ba5100ebe4e272f0a89503a694ae3329952102959a530f70fd WHIRLPOOL 9f1409fe6b8775cfaa64af217fbf88220c8307ff4b169d694f431cbaaff3b46bd7f0c3a97654706e0c949d01d0a61515daef679ebea6012b56da3af7af0ac01b
 DIST netbeans-trunk-nightly-201509100002-src.zip 209128741 SHA256 5d5a40a072eab70857662787af171f4af2a73d866e122c465618914c851e790c SHA512 c40b93171efc0d42e84d34d437c15085189078d51a99be10e63a813a9e7ca9451dcaba6748344e585cc444903c29a56fb1a78c43545136910c000accf53dfe83 WHIRLPOOL 033764680db1d66360e33286c05d58e33bf0288f09e2caa9871beee1d727047b8af6a3de079c595ca508f89f0b29ae4aa96298bd4be5cee3b77e32f9759cb527
 DIST netbeans-trunk-nightly-201509110002-src.zip 209149212 SHA256 9833b3b5804a16062972c36bbc1af9ae9445f7313884195e6ac0935a43182b98 SHA512 2ba867e3c5816b08da70cc9fe5a697ae68d55b3eb28ada6c6b9364dd8828a1f16122dd57f7556113d93b4af034f4b6a0aee05d79336e18b9a8f014b86eff448a WHIRLPOOL 21026c2040e6b6d843308065fd6409ebca28a013d8166d19260888beca80dc37f50e3a327cb059f92803591a23a9838484fd2b1fee78fa3b37b378a495bda782
+DIST netbeans-trunk-nightly-201509140002-src.zip 209159147 SHA256 cdcaeab5534f59320d499b5e84f1deec2863f605ccf4f7be5ced8415e0e3a70e SHA512 0a40110edf53330612d3d586eb7931013c5279fb5db2a8383da90da03df12f291d6c7e5c0da14987311efb10cec017abf201fcf0e299141d079c316447ab8234 WHIRLPOOL ce02272125ee84695d786dcf3c66ac89f56deaed2076dd00e35a997235ca32b181257d80246f20e0e26b6983052b490f0507f718d58f164549991a940e1dd598
 EBUILD netbeans-ide-8.0.2.ebuild 29317 SHA256 42218788ab0fc7c7cd1bb42a8b0c72a66543a3260b752aa55365833c355bcc63 SHA512 c712b66b6bee654390a45e5c616479df2be624bb770f3838d4fcce875f71a8d165703dffd55c4fd7d30e19c392784203e5fe01e2404907d88c935d439efaf578 WHIRLPOOL 67763e4a36215ac002fd321556ce2269affc15ba48ad5069d7ccc746d918179994f174e09305a9d9ddadddbea690778c2769e0ea1993eafc09e01580485e2292
 EBUILD netbeans-ide-9999_p20150901.ebuild 30334 SHA256 a2430eba1da126a548c390a52701aa5a9ff7f3c5afcf591492704f6270f49ee2 SHA512 ee3b7c4d773f16ae78341f8393397d6090055d11b2b45a579afc23e020cda5bf0f86b1348d47b99fe94280885db4869b3f54a15e5f70aafb62c2ead0e63bc9f6 WHIRLPOOL dae179c3bed6fdbfa5527a31d3b15a9e8f1eb7a805ce872b9fa512be27b1ee4e3393a0713bec6e461fdaf7d09c04857c68cca5b497f772559491a4f32f2ef4cc
 EBUILD netbeans-ide-9999_p20150903.ebuild 30334 SHA256 ae41f1ecbbaf9cfc10fa655a7ac439d418a40d7cd2ae2cf8e40009035c839f22 SHA512 c8d03b4c44ed1855b06f861347078aadbbaed51e42eced7f35f02c438440a269b055042aa44666ebd2c0d1fb16c626f07a70c751025bce97735393e4faf9c387 WHIRLPOOL 45c00d9dcc84161a15412652088d25e5f220b7d499da453ef2f482960c7e51cef8d6ac3e6b343e9a9b5b78f6cc8f68ba7aaab15c557c2734c0335bf27e48a531
@@ -120,4 +121,5 @@ EBUILD netbeans-ide-9999_p20150904.ebuild 30334 SHA256 a8dd72e491f3153c89c4845fc
 EBUILD netbeans-ide-9999_p20150905.ebuild 30334 SHA256 736a98194605a069fd8a0ac3ee6aabfdfcd84f61be213b35972df860cd81385d SHA512 52d8d1610898cc4acd085656b1c842a4d7e0ddf3ff598ab34bf11b956f7a91272343895f1ba53fcf6d2f97212e904c9b5cc8e53aafafd7036d935bfb2761eccc WHIRLPOOL 923c1f8d1e3a29a44a6a061b02fb645e5a540c96dd56d4d0054c097c552d494534a754017ef36e4a3d7e6e741a27297fbbb192ebf4554fe3011f1ce7c2474d5b
 EBUILD netbeans-ide-9999_p20150910.ebuild 30334 SHA256 ad1a8b29b2a9fdd348fe5b8490625933c3b187516a06d701c89280f3bd3d8219 SHA512 4a58d40d1e04d7dd9d839351e115c95ead0a58a8a2d5235bedaf396de80003ace8ed58d5b2b9d5b24826a33fe6d281d3cf3f04eaafdf95e0f321d48ee2447154 WHIRLPOOL f5f720b4897d80893436e681e240a75e4b72208f9ff0becd0dde9b72ac6da4fd60c32d85b41b2fc2a541c77f5455ee7082c487ca06e9ec747b056dac7bbe5f22
 EBUILD netbeans-ide-9999_p20150911.ebuild 30334 SHA256 8159f5809cf9cf368a76b8cec6e647372471d6ee0cc6e35147b4ac3101502e47 SHA512 cee0236e5be8ec725f3e8969ed1750628ee9622db9c7eef1b4ffa899ac53ade782257d2583dc5cc5ece03c5455394e1c995f4c6139cc494186bc4699862eed6c WHIRLPOOL 8a2e9132d529f40d0d087664d9df4c5a7fe27409bdcb1e53bf613dca1defcf3c3c47bd825207044dfad234609928025a584a8c60194aa5e36f2c0a3df88d66f7
+EBUILD netbeans-ide-9999_p20150914.ebuild 30334 SHA256 4c3267a9fe8092d970cd132a24f268402faa9fce9b0f80b9981d163d3faf8bb3 SHA512 2bc8699ddc6b588cd6e83a8bacad1f7ef9cab9c1a7b482862f0a537a12502078b01fffe5841d6161ebde0ccdfc2ffc9b355aca4d07573a8aa436baa21b187134 WHIRLPOOL 744458c4d2103007c06b97675567d135c385863a6d6b186ce23fa32a91f317c0f1e85fda8ad22688770f53fec33a6001fd5c60a3c58f4aeb27a2eef3a612ffa8
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20150914.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20150914.ebuild
new file mode 100644
index 0000000..6f6e5fb
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20150914.ebuild
@@ -0,0 +1,377 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-09-14_00-02-28/zip/netbeans-trunk-nightly-201509140002-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/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip
+	http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar
+	http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar
+	http://hg.netbeans.org/binaries/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar
+	http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar
+	http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip
+	http://hg.netbeans.org/binaries/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar
+	http://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar
+	http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
+	http://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar
+	http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar
+	http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar
+	http://hg.netbeans.org/binaries/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar
+	http://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar
+	http://hg.netbeans.org/binaries/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip
+	http://hg.netbeans.org/binaries/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip
+	http://hg.netbeans.org/binaries/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip
+	http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar
+	http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar
+	http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar
+	http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar
+	http://hg.netbeans.org/binaries/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}"/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip html.parser/external/html5doc.zip || die
+	ln -s "${DISTDIR}"/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar html.parser/external/htmlparser-1.2.1.jar || die
+	ln -s "${DISTDIR}"/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar libs.ini4j/external/ini4j-0.5.1.jar || die
+	ln -s "${DISTDIR}"/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar html.validation/external/io-xml-util.jar || die
+	ln -s "${DISTDIR}"/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar html.validation/external/iri.jar || die
+	ln -s "${DISTDIR}"/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip spellchecker.dictionary_en/external/ispell-enwl-3.1.20.zip || die
+	ln -s "${DISTDIR}"/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar c.googlecode.javaewah.JavaEWAH/external/JavaEWAH-0.7.9.jar || die
+	ln -s "${DISTDIR}"/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar xml.jaxb.api/external/jaxb-api.jar || die
+	ln -s "${DISTDIR}"/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip libs.jaxb/external/jaxb-api-doc.zip || die
+	ln -s "${DISTDIR}"/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar libs.jaxb/external/jaxb-impl.jar || die
+	ln -s "${DISTDIR}"/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar libs.jaxb/external/jaxb-xjc.jar || die
+	ln -s "${DISTDIR}"/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar libs.jaxb/external/jaxb1-impl.jar || die
+	ln -s "${DISTDIR}"/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar libs.javafx/external/jfxrt.jar || die
+	ln -s "${DISTDIR}"/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar html.validation/external/jing.jar || die
+	ln -s "${DISTDIR}"/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip javascript2.editor/external/js-corestubs.zip || die
+	ln -s "${DISTDIR}"/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip javascript2.editor/external/js-domstubs.zip || die
+	ln -s "${DISTDIR}"/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip javascript2.editor/external/js-reststubs.zip || die
+	ln -s "${DISTDIR}"/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.core-0.0.7.jar || die
+	ln -s "${DISTDIR}"/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.sshagent-0.0.7.jar || die
+	ln -s "${DISTDIR}"/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.pageant-0.0.7.jar || die
+	ln -s "${DISTDIR}"/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.usocket-jna-0.0.7.jar || die
+	ln -s "${DISTDIR}"/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.53.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/Manifest b/dev-java/netbeans-java/Manifest
index d1ee28f..8bd8ee0 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201509040002-src.zip 208956475 SHA256 4cc75f6e48a660
 DIST netbeans-trunk-nightly-201509050002-src.zip 208961273 SHA256 0e4ee8605bb5933ec079c7bc1a597d00cecd76d589ea27a1612eb51253d2bf17 SHA512 d87f0251d65b3c44468ce3da97b3a9f077938da2eaa08c7afc887dbcd0054cad88840a1c12e553ba5100ebe4e272f0a89503a694ae3329952102959a530f70fd WHIRLPOOL 9f1409fe6b8775cfaa64af217fbf88220c8307ff4b169d694f431cbaaff3b46bd7f0c3a97654706e0c949d01d0a61515daef679ebea6012b56da3af7af0ac01b
 DIST netbeans-trunk-nightly-201509100002-src.zip 209128741 SHA256 5d5a40a072eab70857662787af171f4af2a73d866e122c465618914c851e790c SHA512 c40b93171efc0d42e84d34d437c15085189078d51a99be10e63a813a9e7ca9451dcaba6748344e585cc444903c29a56fb1a78c43545136910c000accf53dfe83 WHIRLPOOL 033764680db1d66360e33286c05d58e33bf0288f09e2caa9871beee1d727047b8af6a3de079c595ca508f89f0b29ae4aa96298bd4be5cee3b77e32f9759cb527
 DIST netbeans-trunk-nightly-201509110002-src.zip 209149212 SHA256 9833b3b5804a16062972c36bbc1af9ae9445f7313884195e6ac0935a43182b98 SHA512 2ba867e3c5816b08da70cc9fe5a697ae68d55b3eb28ada6c6b9364dd8828a1f16122dd57f7556113d93b4af034f4b6a0aee05d79336e18b9a8f014b86eff448a WHIRLPOOL 21026c2040e6b6d843308065fd6409ebca28a013d8166d19260888beca80dc37f50e3a327cb059f92803591a23a9838484fd2b1fee78fa3b37b378a495bda782
+DIST netbeans-trunk-nightly-201509140002-src.zip 209159147 SHA256 cdcaeab5534f59320d499b5e84f1deec2863f605ccf4f7be5ced8415e0e3a70e SHA512 0a40110edf53330612d3d586eb7931013c5279fb5db2a8383da90da03df12f291d6c7e5c0da14987311efb10cec017abf201fcf0e299141d079c316447ab8234 WHIRLPOOL ce02272125ee84695d786dcf3c66ac89f56deaed2076dd00e35a997235ca32b181257d80246f20e0e26b6983052b490f0507f718d58f164549991a940e1dd598
 EBUILD netbeans-java-8.0.2-r3.ebuild 13294 SHA256 4abac657cff75400e92b1f2b19bca696113cdc37611c8c0f49dfa8c82fec4296 SHA512 32e41d7acc3aca026993e5edc791f1314f2bfda47413538af655b0335973c4fe50d998c67f129307b164075c3e0503280b4c1729d700431644ca6610d7f0f635 WHIRLPOOL d7f99c13421d08529b54085138fcffd2959a3c3f97d94a1dbe6e726a6dbc2cded69ec0bf97e1458b56847ac121954e8f173c1adde0703fd2969defa53ac37c51
 EBUILD netbeans-java-9999_p20150901.ebuild 14818 SHA256 2e650037a388a620e743e8212f0099878e8908fe4dc1680b36f6ae8e9a72fa54 SHA512 b7d8475055812c78ee45ceec123fc103641b4070972f0f7e3572a0b07efee2ca2cbcd16600fcfc7f30dff461fc235ccbbc1fde941f528e27f4a2f742f3ee5cdd WHIRLPOOL bb23d595159c481696ba4fefba3e398797db9cea44e4c2f00eef7929fbe1f442362c470163bc460d349da5cb18f627a3892c6d63b17439112becf538352785e2
 EBUILD netbeans-java-9999_p20150903.ebuild 14818 SHA256 f34ba8d98927651ec621ec445d4760fc596073f6857194bfceb5688b2910089b SHA512 ce7c86a52990ec26660a9eee1bc7588a2e069e80e42eb5b521699a9784e1da41411d5e9965c4f77bd4771b7046e9bd99e6563511336744404dd716e54c11faae WHIRLPOOL 5477f4bda878bfa48ba3851b740e5d9f06f594fa953f5ea0fab0a37917c7462b7356f96aaeca5847e85623c37e4bb46df81217451aace87cbcde7c50c38146a6
@@ -42,4 +43,5 @@ EBUILD netbeans-java-9999_p20150904.ebuild 14818 SHA256 e8df0f520bd69b0cd9032449
 EBUILD netbeans-java-9999_p20150905.ebuild 14818 SHA256 2dc7c76af383ce332823499c5a30eaad6e4b0ac184ae59f93762025fd1d0eb80 SHA512 bf607edd140cb38e5acefba806598102a5f86636345c1d4180443b925687422c47247ea6321c12d27914ea620bd46f88dc4c314dc936b3f598fce108ee77013f WHIRLPOOL aba652098f65af5f52c1234e242f05a86c2adf66bc4a3e176a61621cadbfcc21261e16cf2ee27c6ef1973c1de6064f733eb7d0fac10fb237977c3fafbafd0ed8
 EBUILD netbeans-java-9999_p20150910.ebuild 14818 SHA256 9ddfbd1fed869fe888de332f58f8c5224d53c30570c7fb33fa1748ef9fb53d4b SHA512 c684c36881ce540359c29bc805522681a21bf59b3b702f0f8461a3db25f1a652c7e026b905d0aaecf641b8e47d4ad9a5a4050e923e6cafd4f740921b2f552cb8 WHIRLPOOL 19a2afaf71b2f4d0230d953e229c0712892d1f51aa196cc708fab1650dae2c3248754511edf25c4d2ef63d923a1fa81a11fcb664ec9fba17fc52f46af7fff20c
 EBUILD netbeans-java-9999_p20150911.ebuild 14818 SHA256 f8818f214d9dc5aa3a1def3c69e1f78e71d1e108f1b0966f78ddf5c772c0e54f SHA512 3dc5dcfdfc1fead693739ecb506a4ac846da0ae6f5b6084e2fdb22636d1bd5aab66b0be769043585d11526e365030623b51a64050ae6b565268748d324cc400e WHIRLPOOL f70c3d8bdf8572da8e95738f1d2f03f727b2e7336d53355995c93bc5918ebe9fb65828e291325572d1e1af9c90a432210be2b7f322ae2923e7b1bc5749ca3ae1
+EBUILD netbeans-java-9999_p20150914.ebuild 14818 SHA256 0b3ea17a460bed5d409d466392b7b8868b5f11d2227cad477a9887c6166fc7b9 SHA512 069cf42315117a89beb7255f42ca56643cbc4bfde90e55a8aba611284a2cabdda89ed736c243930b19856cbe1df472dba605ffed2b5baa8de6f90c13aee0e448 WHIRLPOOL 4dcab901e6f83addcd969657bfa0c5f6c5a33c36160c4fb96dabb023cd65dc1b5388e6c8c3060a72187c74167b98ca26f8f32fb9a0fa6736437004909670c4af
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20150914.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20150914.ebuild
new file mode 100644
index 0000000..e3d38c9
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20150914.ebuild
@@ -0,0 +1,273 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+# Maven cannot be unbundled because it depends on exact maven version and exact content of maven directory
+
+DESCRIPTION="Netbeans Java Cluster"
+HOMEPAGE="http://netbeans.org/projects/java"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-09-14_00-02-28/zip/netbeans-trunk-nightly-201509140002-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/F210CBE1FA591EDAFD64E6076E926A0A9A30F129-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}"/F210CBE1FA591EDAFD64E6076E926A0A9A30F129-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/Manifest b/dev-java/netbeans-javacard/Manifest
index cf7e337..23ccc7a 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -10,6 +10,7 @@ DIST netbeans-trunk-nightly-201509040002-src.zip 208956475 SHA256 4cc75f6e48a660
 DIST netbeans-trunk-nightly-201509050002-src.zip 208961273 SHA256 0e4ee8605bb5933ec079c7bc1a597d00cecd76d589ea27a1612eb51253d2bf17 SHA512 d87f0251d65b3c44468ce3da97b3a9f077938da2eaa08c7afc887dbcd0054cad88840a1c12e553ba5100ebe4e272f0a89503a694ae3329952102959a530f70fd WHIRLPOOL 9f1409fe6b8775cfaa64af217fbf88220c8307ff4b169d694f431cbaaff3b46bd7f0c3a97654706e0c949d01d0a61515daef679ebea6012b56da3af7af0ac01b
 DIST netbeans-trunk-nightly-201509100002-src.zip 209128741 SHA256 5d5a40a072eab70857662787af171f4af2a73d866e122c465618914c851e790c SHA512 c40b93171efc0d42e84d34d437c15085189078d51a99be10e63a813a9e7ca9451dcaba6748344e585cc444903c29a56fb1a78c43545136910c000accf53dfe83 WHIRLPOOL 033764680db1d66360e33286c05d58e33bf0288f09e2caa9871beee1d727047b8af6a3de079c595ca508f89f0b29ae4aa96298bd4be5cee3b77e32f9759cb527
 DIST netbeans-trunk-nightly-201509110002-src.zip 209149212 SHA256 9833b3b5804a16062972c36bbc1af9ae9445f7313884195e6ac0935a43182b98 SHA512 2ba867e3c5816b08da70cc9fe5a697ae68d55b3eb28ada6c6b9364dd8828a1f16122dd57f7556113d93b4af034f4b6a0aee05d79336e18b9a8f014b86eff448a WHIRLPOOL 21026c2040e6b6d843308065fd6409ebca28a013d8166d19260888beca80dc37f50e3a327cb059f92803591a23a9838484fd2b1fee78fa3b37b378a495bda782
+DIST netbeans-trunk-nightly-201509140002-src.zip 209159147 SHA256 cdcaeab5534f59320d499b5e84f1deec2863f605ccf4f7be5ced8415e0e3a70e SHA512 0a40110edf53330612d3d586eb7931013c5279fb5db2a8383da90da03df12f291d6c7e5c0da14987311efb10cec017abf201fcf0e299141d079c316447ab8234 WHIRLPOOL ce02272125ee84695d786dcf3c66ac89f56deaed2076dd00e35a997235ca32b181257d80246f20e0e26b6983052b490f0507f718d58f164549991a940e1dd598
 EBUILD netbeans-javacard-8.0.2.ebuild 4906 SHA256 944fee40d693c2c287e748f70ba565f3cd84bb7c19110f8be716134ec20694a7 SHA512 1f66cd2756effbfde7d43f9da7d8d93cb6252c58a02ee3d821f6faeaf63bf3c63e28f80c6eb44689e3aa954452a2f3893c65e75de84158dff1da0d94cafea14a WHIRLPOOL 88197e03008b8acb1ce62f72783bb096d9a3fc2a289b83367841a8adbee2bf822031f9bd6051831515ee44b1d5d2a109c5646f98ca723506f27c874301fb4189
 EBUILD netbeans-javacard-9999_p20150901.ebuild 4976 SHA256 f8bbd7f2419ccc07c17b05c295359dc07c55f3cfca78d7760105b82903fa2b79 SHA512 53bb2b9edbe87daecc4feb6b063579517ccea53b52168fc4a6ed03d8351d3f254a819125937aec58f551aa926b4b5a567b5bde3850fc390fad437f45194add80 WHIRLPOOL 9403f1dc9c3042fb5981d340b02d3615db9aefde73f1b2ade96b9010bdd6a37f610387aa303625ae0c979f20ccffd57ca87115321bd42ff9b6dcb39bcff03580
 EBUILD netbeans-javacard-9999_p20150903.ebuild 4976 SHA256 20835b1551b3382cd7a6b3f97fcf7725597e77317e8a5ede489954f99f0eb4e4 SHA512 93dc8f950ec2d8d8ad83eba39699436121729915ceca17ab3a4593ea2ec0a9cbeb81263f52cde443fb2ebe43658620c438664cd112b30774290a8cc03f2dfdb6 WHIRLPOOL 69670cab1e9e12e074a2874ade1cec66b08313763f7380b1839395becdab4bbd617172987d0ddb021dfa29241654119fa2d6d61cb34d507584c3c8e7670f6b83
@@ -17,4 +18,5 @@ EBUILD netbeans-javacard-9999_p20150904.ebuild 4976 SHA256 0109827ea9c50ee4bc784
 EBUILD netbeans-javacard-9999_p20150905.ebuild 4976 SHA256 f398bf9974a37f3cc272471e847f8bdad72ed3634bf9e4e2ca6bd02739d73a3d SHA512 44ed2bfe5caf5e0bad9e3499942c452da0448c8eaa4f34f290e45090e408916615a845efe697719f564328c5c7e3f28d700a1d9460b8b1fdc69efe8de3527793 WHIRLPOOL c7fec664b62d92b29bb8676bfa17504a1c9fe60206e21cd6b142e5542063cfd9af182a930b5a3cd586c34d1fcc74bd0c21dc57e7cc460062ef1ac3559b838b91
 EBUILD netbeans-javacard-9999_p20150910.ebuild 4976 SHA256 5ee46dd22772700a0879a1af1b77608bcf72e4de7e25262bfab2f353c10dd7fb SHA512 b63dbd3ea683572d16ca913cbae9bb8a1824c56435ba7a44a679c2b096596a768275c7ffee35c2bbebefed37489c6a4ae2ba9c797c84ebba3b42bcbe76886710 WHIRLPOOL 6f1c220ec34d4491ded0940c8419b27ba88afc1fa58c976b5a8add0dce2d9e9671e46db4d285a421f2543c8885c5ac034a29260202ea9bcb0b2e2fb79be15b60
 EBUILD netbeans-javacard-9999_p20150911.ebuild 4976 SHA256 d164cd67d26c5f31cfa772de43d6ee0c0c5ee4a52264f2c1ca4c8d97e688ae92 SHA512 88d255feb8bf6f46bb8b31a16a88ebbac8d63ac40579e0ef0c6fa9eb3ec2a3a54957810d0de3a6772d511287cbaefdbe529c327a2d8bb24d727b36326b09fa8f WHIRLPOOL 0f125d6b0548ecb9e41cdb5ec2b1bd02104239ba057fe58d1311226c82829968bb7eb3e890b5bb4fa158bbd6785cd8ae2c0baaf2f867ae662b52012a1010ddf8
+EBUILD netbeans-javacard-9999_p20150914.ebuild 4976 SHA256 a88bcaa47f91d1526fdbed8a323a939fb94a7a7ea78483644852c9cfb376243c SHA512 a47471278379d1e264f1cce3a33d7b27a084cec57a3d98558a230107fd1fe9dc457ac9848e80d759e90bc8a7728d28d71ca7ddf0bc95f5bb8dcf05a981ba172e WHIRLPOOL efeeffd5f2a4ee1c81b0874afb09a1005f1d32b748b9031cf9d86a628ecfa776a5259a614eeef788287af254ec9717ba394349b76ec56578333d78f5fa61bc94
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150914.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150914.ebuild
new file mode 100644
index 0000000..6be3a2e
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150914.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaCard Cluster"
+HOMEPAGE="http://netbeans.org/projects/javacard"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-09-14_00-02-28/zip/netbeans-trunk-nightly-201509140002-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/Manifest b/dev-java/netbeans-javadoc/Manifest
index 0328559..8f1d4c6 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -8,6 +8,7 @@ DIST netbeans-trunk-nightly-201509040002-src.zip 208956475 SHA256 4cc75f6e48a660
 DIST netbeans-trunk-nightly-201509050002-src.zip 208961273 SHA256 0e4ee8605bb5933ec079c7bc1a597d00cecd76d589ea27a1612eb51253d2bf17 SHA512 d87f0251d65b3c44468ce3da97b3a9f077938da2eaa08c7afc887dbcd0054cad88840a1c12e553ba5100ebe4e272f0a89503a694ae3329952102959a530f70fd WHIRLPOOL 9f1409fe6b8775cfaa64af217fbf88220c8307ff4b169d694f431cbaaff3b46bd7f0c3a97654706e0c949d01d0a61515daef679ebea6012b56da3af7af0ac01b
 DIST netbeans-trunk-nightly-201509100002-src.zip 209128741 SHA256 5d5a40a072eab70857662787af171f4af2a73d866e122c465618914c851e790c SHA512 c40b93171efc0d42e84d34d437c15085189078d51a99be10e63a813a9e7ca9451dcaba6748344e585cc444903c29a56fb1a78c43545136910c000accf53dfe83 WHIRLPOOL 033764680db1d66360e33286c05d58e33bf0288f09e2caa9871beee1d727047b8af6a3de079c595ca508f89f0b29ae4aa96298bd4be5cee3b77e32f9759cb527
 DIST netbeans-trunk-nightly-201509110002-src.zip 209149212 SHA256 9833b3b5804a16062972c36bbc1af9ae9445f7313884195e6ac0935a43182b98 SHA512 2ba867e3c5816b08da70cc9fe5a697ae68d55b3eb28ada6c6b9364dd8828a1f16122dd57f7556113d93b4af034f4b6a0aee05d79336e18b9a8f014b86eff448a WHIRLPOOL 21026c2040e6b6d843308065fd6409ebca28a013d8166d19260888beca80dc37f50e3a327cb059f92803591a23a9838484fd2b1fee78fa3b37b378a495bda782
+DIST netbeans-trunk-nightly-201509140002-src.zip 209159147 SHA256 cdcaeab5534f59320d499b5e84f1deec2863f605ccf4f7be5ced8415e0e3a70e SHA512 0a40110edf53330612d3d586eb7931013c5279fb5db2a8383da90da03df12f291d6c7e5c0da14987311efb10cec017abf201fcf0e299141d079c316447ab8234 WHIRLPOOL ce02272125ee84695d786dcf3c66ac89f56deaed2076dd00e35a997235ca32b181257d80246f20e0e26b6983052b490f0507f718d58f164549991a940e1dd598
 EBUILD netbeans-javadoc-8.0.2.ebuild 5993 SHA256 baf9da38d87b86eb8ed10ef46017361f36ca8583dd90885c9d1667a51851bc52 SHA512 892bc25b30dc26e3ee7c8be9aaf8542c00a7fa1d1d8f883d82bebb816edfa93e1ee9abeac1b0c47ecc8b4169bcaded56c5c71f18151fdc22fe241fcee0fd4521 WHIRLPOOL 2012f28f3ba5074b4d262b20e9a1c8ddf590ce444339ec1a404c890867c1271e38f9f9e09717d0648fae061553f5c8da3d97a70c35c8e853fe4894fb6fd4ec96
 EBUILD netbeans-javadoc-9999_p20150901.ebuild 6228 SHA256 70adb18643384a52dbe2b88467c14663a755609b1a5098cf816c5c0b88994e9e SHA512 529fa63d125fe04aa06c4f444924b0e1390680092ff4a474810b6ede97925cdf907b14283016f9000f54bc9cc1a1d0e89835ca681940152a029eee0f370c2fba WHIRLPOOL e117f345fd2dde9298afd3f8b2f7ac1a699936336a68dee80c50cc33193aba40b069ed8867a1af84efe3a4621fea35daf8b0835bf89f7ca7f35278b60ddaa56a
 EBUILD netbeans-javadoc-9999_p20150903.ebuild 6228 SHA256 9f0dd0e792cbe63c9dad51f0b445a2245ac2931123c3de1fc8079631e3dd4b77 SHA512 76e8762c17b07fdbe1ab65cef9b6b6c0e26355deb5f1827b7d864cf582d1aeecac57c579d439a49f19cbadd6db7f92e626e0c97ef5ddf0b1b883cfdd6282ee6b WHIRLPOOL 0efef7d57f10a275fda7f97c209ae41fc61f8f9961de19325e34c117378d97e7d1b362ffab93e1ac71ce38b13881823937fb8ef10fb014c84e1cd61ae42b3d2c
@@ -15,4 +16,5 @@ EBUILD netbeans-javadoc-9999_p20150904.ebuild 6228 SHA256 d2ca7f3ac0834bdc1b573b
 EBUILD netbeans-javadoc-9999_p20150905.ebuild 6228 SHA256 916ef349d02270f884d4f2ec72c989127d657a1d4839555bf132b924e1adc6e4 SHA512 76a75c0b46264e02941cc9af34d6aacc8170428b3a729a7e454354b74a6497ad8cce6bd575eb109ec186563b2e52271407403f2b96bbd2dc83accd63df46aefb WHIRLPOOL e6cd8afa92fd661380086543458d4fb1a4a48fdb762c892cb107e254270c5e94aa2c6152c0a7af7eaa02da2694d02c4ad8ec9570ba65e5526a987eefed12bf1a
 EBUILD netbeans-javadoc-9999_p20150910.ebuild 6228 SHA256 616e969d78389ccdb8bd58ab6c10123c6e605331caa7dbb50232a18a1b37f5fc SHA512 483739088c7ab6417e7ee206f4b1eeb10843e64221d0a54565bcce6555cd99bce83c8e2296e8a11a2fab09974a0f1625c4398e1327f976e73ac494846e57c742 WHIRLPOOL be826f957643374b7946e5d05dd2f1ddf25c1b6485fc4b31557c95d0784eb88717a7ff6b7c828195428cb487ba0aa95357c82f36c3d31881f01bf8a03cdde49b
 EBUILD netbeans-javadoc-9999_p20150911.ebuild 6228 SHA256 bbd22580d9902265b98d32486365d38b2ef1b04e23d9f2c1847d4c9ea7429225 SHA512 c2014b89109e8a2c74fb898f7eddcb0841f371fc6f655e71fc2689bb89a2aef1a363133b07d050f8605ed1765471fca04b87bd20a3a394caacb483579e6fc28e WHIRLPOOL 59cf0e44bd8969117e3da8c16a8525b5108132b188ab534a6ca78253059b0685b2092fd82a1ddf9eccaeef1f84682b8d3715a737a3ae63ca2c307e74c1b8f2e8
+EBUILD netbeans-javadoc-9999_p20150914.ebuild 6228 SHA256 55dd9bf613c5bf6c5998afcdc3fd8194e58492ed3acd3897223bc8eaea80cfb8 SHA512 aeb46693635b14b92659b2f7f913aa2bc198098803e5653c8226822b84bde4e0a37212e32c3cfbbfc6307d49e778b7d1a7048e09e8c7f590b1a88b2fd4861e98 WHIRLPOOL 1c56c5b63744fd251f5f7c5264ee30011f0d067a70891211892bb195b32aa078f1cee5fcb4fc9522fd74a79acd1933d0360c07086b9e5c197161904b7d136351
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150914.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150914.ebuild
new file mode 100644
index 0000000..8a478c2
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150914.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaDocs"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-09-14_00-02-28/zip/netbeans-trunk-nightly-201509140002-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/Manifest b/dev-java/netbeans-javafx/Manifest
index cce9f2f..4468c5f 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -14,6 +14,7 @@ DIST netbeans-trunk-nightly-201509040002-src.zip 208956475 SHA256 4cc75f6e48a660
 DIST netbeans-trunk-nightly-201509050002-src.zip 208961273 SHA256 0e4ee8605bb5933ec079c7bc1a597d00cecd76d589ea27a1612eb51253d2bf17 SHA512 d87f0251d65b3c44468ce3da97b3a9f077938da2eaa08c7afc887dbcd0054cad88840a1c12e553ba5100ebe4e272f0a89503a694ae3329952102959a530f70fd WHIRLPOOL 9f1409fe6b8775cfaa64af217fbf88220c8307ff4b169d694f431cbaaff3b46bd7f0c3a97654706e0c949d01d0a61515daef679ebea6012b56da3af7af0ac01b
 DIST netbeans-trunk-nightly-201509100002-src.zip 209128741 SHA256 5d5a40a072eab70857662787af171f4af2a73d866e122c465618914c851e790c SHA512 c40b93171efc0d42e84d34d437c15085189078d51a99be10e63a813a9e7ca9451dcaba6748344e585cc444903c29a56fb1a78c43545136910c000accf53dfe83 WHIRLPOOL 033764680db1d66360e33286c05d58e33bf0288f09e2caa9871beee1d727047b8af6a3de079c595ca508f89f0b29ae4aa96298bd4be5cee3b77e32f9759cb527
 DIST netbeans-trunk-nightly-201509110002-src.zip 209149212 SHA256 9833b3b5804a16062972c36bbc1af9ae9445f7313884195e6ac0935a43182b98 SHA512 2ba867e3c5816b08da70cc9fe5a697ae68d55b3eb28ada6c6b9364dd8828a1f16122dd57f7556113d93b4af034f4b6a0aee05d79336e18b9a8f014b86eff448a WHIRLPOOL 21026c2040e6b6d843308065fd6409ebca28a013d8166d19260888beca80dc37f50e3a327cb059f92803591a23a9838484fd2b1fee78fa3b37b378a495bda782
+DIST netbeans-trunk-nightly-201509140002-src.zip 209159147 SHA256 cdcaeab5534f59320d499b5e84f1deec2863f605ccf4f7be5ced8415e0e3a70e SHA512 0a40110edf53330612d3d586eb7931013c5279fb5db2a8383da90da03df12f291d6c7e5c0da14987311efb10cec017abf201fcf0e299141d079c316447ab8234 WHIRLPOOL ce02272125ee84695d786dcf3c66ac89f56deaed2076dd00e35a997235ca32b181257d80246f20e0e26b6983052b490f0507f718d58f164549991a940e1dd598
 EBUILD netbeans-javafx-8.0.2.ebuild 4647 SHA256 15e5e0b1c4729852dd55e5bfb2dcb520ba7c959bd9927d315c0abcb3f94e4ecc SHA512 520c60264fee67b0ccfd50ced0cc8586d5653d5186fa75c6b7cd8b400aae834de446b7e6145ad38df7e68207391fb360ef4834140e096d48add568fed387ac98 WHIRLPOOL 416a56ceb2ba85e3923ada0c8ef485cdd6fa16b3423b8fd0de523fa54dd082cbaedee5da4f1a92b50e440195f9256376f50e99a850d70ccdcb8c0ff370007f7c
 EBUILD netbeans-javafx-9999_p20150901.ebuild 4717 SHA256 e95804f3d997f20e45ff63e57182227513494d00f034115bfea0fb80f7b06f86 SHA512 20431b8026fbcca039f412ab076e9aeea22745f964858dee0cebb070c08113cdabe35edefdb998efd0d146b0a9d055de441b21620e1beadfeb9970009e479eab WHIRLPOOL 1352d5de66acd787070011681f7800e37f7bc9f9420b7e957a16c490b7b0419d88408c13ce930f2e2507ff8a84308a93ed50434ed80c9f26b21e28356b73a716
 EBUILD netbeans-javafx-9999_p20150903.ebuild 4717 SHA256 f8dcd19435adff0ba1a386857b8a0d2624ba16b64e36bfd40f58a2da8616be5f SHA512 776aa675ae3ee669bff503e9ac240e801dd080c34a18f46a53ee9308044152eb4dd067b0ce9b3d89708a56f533426c2010e06d63d2c7465bd3e461193a71c082 WHIRLPOOL 12f7d33492850172e803a4c2fac724d0b6e196bc7d64746fb51f1382cc1d82df5714511dadc1167e5921d6a492e47d5e879f8f5fdcd1bb2d2501e14e2425407c
@@ -21,4 +22,5 @@ EBUILD netbeans-javafx-9999_p20150904.ebuild 4717 SHA256 497c44f9db9fea0521dd95c
 EBUILD netbeans-javafx-9999_p20150905.ebuild 4717 SHA256 8c09810810ea11401158131b84c38f3248e5208d76f08717f8a6cf062af3702d SHA512 be8a4137472c1c15c6423cbed94dff65a443b3b3f44050d5b6f0bb0eb2efe722d92a8fa2e072678cc0febdb322ee059d8b956e4a48d4c8b894a086034dc2bf5c WHIRLPOOL 75a210bfad240d6410c24e0165ce3ab6ad0cc75aad47d3f6e210a4a5e0c2fe356b7a1a5941a10025327d43f9aee6ee62582da62592655134135f8223f56bcdb0
 EBUILD netbeans-javafx-9999_p20150910.ebuild 4717 SHA256 285dc98f2546c22ef7cf28d40ce19bce743ca01a78a6cee962f8505e1d8aeafe SHA512 df7a74229d38d46655ce4a55b948815a003a07efaf61a5dcb27e438fd2e67fc3ce496d10d48937568ef86f3d71284492a615f04714eb3377106fb140a0965c55 WHIRLPOOL d0e795aed7c0a6c4194bacd892a992d4fb61b36a0732cd9ae470c543dd197987242a68da31473e436a1793253e5cf7867c35d871b39c4fcff3ca2673d88a89bf
 EBUILD netbeans-javafx-9999_p20150911.ebuild 4717 SHA256 199333103fec23a92ea0dec58dd970513141a3f041a1d4452c4e382d4478094b SHA512 7fad44aebcc400d877afac63fd71b56ae23f39f7a6d84adec00a11320e2476fdcddf295ad43dec20aa097c88e6ad2b50abe9a30688e6154b17b32bcf23dc2000 WHIRLPOOL 84f2a56c12b0345036b1fc530067c15dc877bda8deea7298660a475a19084fffab2aa8b3bba3646a840d31becf68afae9b428da7b5fb568ac31ed2e18b2fce02
+EBUILD netbeans-javafx-9999_p20150914.ebuild 4717 SHA256 c94fb1e23128e30fa73bbb32f64b5b253a06a3ec1d824d84ff6712d7ece8551d SHA512 416f91922ba69496cc1de0720559c933b053487bbe1587fe3cff56c640ec836eba6f9b4e7697c489b13c69a39b226ac41bb2108511b26a16c84f017ac8b37369 WHIRLPOOL 936e030931b83ead8beba2d397f24b049e189c0faabf27aa7ef36de371ec6d294f40070834d6b5e05d76fe790726b3d0253a3a8fcc91e202f2a2d2b405f939b0
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150914.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150914.ebuild
new file mode 100644
index 0000000..fc7e228
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150914.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaFX Cluster"
+HOMEPAGE="http://netbeans.org/projects/javafx"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-09-14_00-02-28/zip/netbeans-trunk-nightly-201509140002-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/Manifest b/dev-java/netbeans-mobility/Manifest
index 1aa2872..c29eba3 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -7,6 +7,7 @@ DIST netbeans-trunk-nightly-201509040002-src.zip 208956475 SHA256 4cc75f6e48a660
 DIST netbeans-trunk-nightly-201509050002-src.zip 208961273 SHA256 0e4ee8605bb5933ec079c7bc1a597d00cecd76d589ea27a1612eb51253d2bf17 SHA512 d87f0251d65b3c44468ce3da97b3a9f077938da2eaa08c7afc887dbcd0054cad88840a1c12e553ba5100ebe4e272f0a89503a694ae3329952102959a530f70fd WHIRLPOOL 9f1409fe6b8775cfaa64af217fbf88220c8307ff4b169d694f431cbaaff3b46bd7f0c3a97654706e0c949d01d0a61515daef679ebea6012b56da3af7af0ac01b
 DIST netbeans-trunk-nightly-201509100002-src.zip 209128741 SHA256 5d5a40a072eab70857662787af171f4af2a73d866e122c465618914c851e790c SHA512 c40b93171efc0d42e84d34d437c15085189078d51a99be10e63a813a9e7ca9451dcaba6748344e585cc444903c29a56fb1a78c43545136910c000accf53dfe83 WHIRLPOOL 033764680db1d66360e33286c05d58e33bf0288f09e2caa9871beee1d727047b8af6a3de079c595ca508f89f0b29ae4aa96298bd4be5cee3b77e32f9759cb527
 DIST netbeans-trunk-nightly-201509110002-src.zip 209149212 SHA256 9833b3b5804a16062972c36bbc1af9ae9445f7313884195e6ac0935a43182b98 SHA512 2ba867e3c5816b08da70cc9fe5a697ae68d55b3eb28ada6c6b9364dd8828a1f16122dd57f7556113d93b4af034f4b6a0aee05d79336e18b9a8f014b86eff448a WHIRLPOOL 21026c2040e6b6d843308065fd6409ebca28a013d8166d19260888beca80dc37f50e3a327cb059f92803591a23a9838484fd2b1fee78fa3b37b378a495bda782
+DIST netbeans-trunk-nightly-201509140002-src.zip 209159147 SHA256 cdcaeab5534f59320d499b5e84f1deec2863f605ccf4f7be5ced8415e0e3a70e SHA512 0a40110edf53330612d3d586eb7931013c5279fb5db2a8383da90da03df12f291d6c7e5c0da14987311efb10cec017abf201fcf0e299141d079c316447ab8234 WHIRLPOOL ce02272125ee84695d786dcf3c66ac89f56deaed2076dd00e35a997235ca32b181257d80246f20e0e26b6983052b490f0507f718d58f164549991a940e1dd598
 EBUILD netbeans-mobility-8.0.2.ebuild 4342 SHA256 e9b4ff8fe38904346bc21a82219696e97322bf9df4e9d4cad2259b6f08bbe7f9 SHA512 338711fe61c469cee80e499ddf8c3ad70a3a38e6658311afcd1d24edd1a99b87566fafcbd392bb958b589796e0913d2574b07570870c8d3382a91a324227082f WHIRLPOOL 855b2817c36bea67c8fb368a0740be18b71dbebb2b98a154552f002a56eaff34f54eee2698379d7200a6042c1de699df23e7717b5b6c532776852d8757b74cb0
 EBUILD netbeans-mobility-9999_p20150901.ebuild 4412 SHA256 24385dc623efa0f82a8ac6b377c867cc43863d1ef24a67cf0a55840d22d24fc8 SHA512 cef8f1359a5a8607376cf3db54b737a637a2efb7e08a3ec34ef911403c3cbe7c3f6201674522554875d96e8870a6a53b9fa54f9bb4d920575b7fd870d00f4448 WHIRLPOOL 7ab52bd93e70de0c6b3c184bce62b22086e81d736224ce66a157c40a052a57d9963030916f96fa54c5be7abfbec33536fe6be968696eff0461d1900366c0acb1
 EBUILD netbeans-mobility-9999_p20150903.ebuild 4412 SHA256 7ba27bee1e24a5cae28b92bd03db76751ef9815e6b9ca1f48e93302e33753edd SHA512 90aa1332c367f89d6fd7cd562376baac469928b71d878f6974bd0435eac1238c49a8215a53286092331fe2b87dff24357928e4811b093bcef8307bbe90d6eb87 WHIRLPOOL cf8378b155e8661bc366ea56ae4078e2e5c0209f9eb1363202b3daa3a9ab531ad21ecee420ac96e62a6ecd006f4e80ef9da8095cce60e9a293c644923e432656
@@ -14,4 +15,5 @@ EBUILD netbeans-mobility-9999_p20150904.ebuild 4412 SHA256 1712463fb2a07efd10e48
 EBUILD netbeans-mobility-9999_p20150905.ebuild 4412 SHA256 42dbade13b01ed5ec99814098ff1b87d5bc966b412de18386c38aecd721589b4 SHA512 bf71983dd2d76afae9a2eddd3dfd169ec20cf7d33583ad3c1305b8fdd74f0b5eb9fb308125fa784d82d3de8e45f745c15a6955ae9944291b88906b49ca2bd60d WHIRLPOOL 0877e81257c3680e5f89425f703f1d20a100eb90d5080e789e455c5828f04ab3567ca231e6f5dcf2ac674bcf4fd060f8668e5fd9882863283d911e21c268ccec
 EBUILD netbeans-mobility-9999_p20150910.ebuild 4412 SHA256 7117fba9674f59b1c451046ff96cacfef8b43691b92a0f6eeaa1cb4ae1110f0b SHA512 e0bf5f75a57f8aed1dc2ea676651e6546dde3aa6c7c8ee2bea598d0a1c4109477857004fc682e8ba499fa2d5b025dff4f1bcf48609a22f33da3650729ac09f5d WHIRLPOOL 506d643b7ab64a874801720cbaee644b677a03cf4f2c99617a75ab2be482e1d71db142d61e58c3f8514c8a5ad31ae285ac580f264353fa96f6474179529d2afd
 EBUILD netbeans-mobility-9999_p20150911.ebuild 4412 SHA256 d30eaaec4b94d61cf35522c2be6ce82b78bfae1ee80c8acfe8ec0c6f8b73dc9e SHA512 765fc220bd226be4e8252a4df404ec9216f6b2adeebb209b4f881566d4aed1e249ed84c749d2b4aa4ff1e0788e8308eae5f0f731bd743f6343c5597735c5dffb WHIRLPOOL eb14046ebace8b35aab7d661272ccead4959bb3a423e36e59d6f41864d274fb9bc9aa6663eda0c66b8469d9b64250ba66f07f344212b67b9a0ad608e3d6fcc6a
+EBUILD netbeans-mobility-9999_p20150914.ebuild 4412 SHA256 318aaed2311c749e72dc270361abfd97a8be75dd6fe5295688b69c82cea84ca4 SHA512 54768745327eb30abd6316d9b5b89e542542d0999fcf73155dfcb70b2a18e59e7a89a1fcf9e0fae3be2523ce68bb4ee5a2731d9c98263db66a4e6970b6c663c6 WHIRLPOOL 4d57661356f650fe83588f05d3cfcf5c374c90ee1232f053ee56d3253bdb9443c07589cdf25706b00c8b5564d660083ee160358b5741d4b6fd96ca5de7dc1cbd
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 6217a8c..696b89a 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -10,6 +10,7 @@ DIST netbeans-trunk-nightly-201509040002-src.zip 208956475 SHA256 4cc75f6e48a660
 DIST netbeans-trunk-nightly-201509050002-src.zip 208961273 SHA256 0e4ee8605bb5933ec079c7bc1a597d00cecd76d589ea27a1612eb51253d2bf17 SHA512 d87f0251d65b3c44468ce3da97b3a9f077938da2eaa08c7afc887dbcd0054cad88840a1c12e553ba5100ebe4e272f0a89503a694ae3329952102959a530f70fd WHIRLPOOL 9f1409fe6b8775cfaa64af217fbf88220c8307ff4b169d694f431cbaaff3b46bd7f0c3a97654706e0c949d01d0a61515daef679ebea6012b56da3af7af0ac01b
 DIST netbeans-trunk-nightly-201509100002-src.zip 209128741 SHA256 5d5a40a072eab70857662787af171f4af2a73d866e122c465618914c851e790c SHA512 c40b93171efc0d42e84d34d437c15085189078d51a99be10e63a813a9e7ca9451dcaba6748344e585cc444903c29a56fb1a78c43545136910c000accf53dfe83 WHIRLPOOL 033764680db1d66360e33286c05d58e33bf0288f09e2caa9871beee1d727047b8af6a3de079c595ca508f89f0b29ae4aa96298bd4be5cee3b77e32f9759cb527
 DIST netbeans-trunk-nightly-201509110002-src.zip 209149212 SHA256 9833b3b5804a16062972c36bbc1af9ae9445f7313884195e6ac0935a43182b98 SHA512 2ba867e3c5816b08da70cc9fe5a697ae68d55b3eb28ada6c6b9364dd8828a1f16122dd57f7556113d93b4af034f4b6a0aee05d79336e18b9a8f014b86eff448a WHIRLPOOL 21026c2040e6b6d843308065fd6409ebca28a013d8166d19260888beca80dc37f50e3a327cb059f92803591a23a9838484fd2b1fee78fa3b37b378a495bda782
+DIST netbeans-trunk-nightly-201509140002-src.zip 209159147 SHA256 cdcaeab5534f59320d499b5e84f1deec2863f605ccf4f7be5ced8415e0e3a70e SHA512 0a40110edf53330612d3d586eb7931013c5279fb5db2a8383da90da03df12f291d6c7e5c0da14987311efb10cec017abf201fcf0e299141d079c316447ab8234 WHIRLPOOL ce02272125ee84695d786dcf3c66ac89f56deaed2076dd00e35a997235ca32b181257d80246f20e0e26b6983052b490f0507f718d58f164549991a940e1dd598
 EBUILD netbeans-nb-8.0.2.ebuild 4927 SHA256 7531e50c4d76608bf925efdba4f54f522de3a8ceeef4d48807fb4ee48bfabdf6 SHA512 925734f331cf228066c5c9e614f48b756af31cac8b559cfe756347b6a2cb0ce362c7c41489a25084f2ed3f2e415baefd148a54f39fc00269fb14179efe056cb9 WHIRLPOOL e3224c5f22bb8e4792a5f98bbe819e071ff18c99533ce05a3fc1c5898ddcca1e3ce34487ba78159bb4d60155acdf15ae4fe81189ff2d5b1bc77ffd9ee4e20aca
 EBUILD netbeans-nb-9999_p20150901.ebuild 4997 SHA256 4bc20abbd79e622dae684777ea3942b19cdb96e94d76cae254b9bae919055997 SHA512 9eac2a9adbcb86bde4662b9edbb874ba820db2e622a0f4e436a570081cb49e664958e3e8fe6900dbfcfd44a0e1b33047fc25a536e93781b8e9b303ae9738bc83 WHIRLPOOL b83b659bbbd93f830039465b737c190e5031e88a634523f3e2647715e4a5b953d3469ac1c760db9613f3d6987157d89b14f0e740da228c0436950fd339d53ab9
 EBUILD netbeans-nb-9999_p20150903.ebuild 4997 SHA256 f2cbf0e344be20488551d7ad04e8c1f2452c03bc7f6f1e3db68527924c3a9b4f SHA512 f7eb44514e61a0e30d546d43caf3e2239da9faa0e59d6c224df6a102fd194589079833b980fcc719982faa9a35c2fb60dec1cf77f327926955e984e633fafba1 WHIRLPOOL 4995f7d9e24ca16d1d7d5a863692fa221b252f2185beac1c6ca908b3ea731a94f7f150affd8cfd03d16f2f7eb620be60833286d37a8d4b71a1e6b8eadbb32f50
@@ -17,4 +18,5 @@ EBUILD netbeans-nb-9999_p20150904.ebuild 4997 SHA256 4c7fe05cb641765cc286adeb499
 EBUILD netbeans-nb-9999_p20150905.ebuild 4997 SHA256 037cf0a9a7748fadfa90e366be3e9ef63af92fb1f0d6a2294216c4b0025dc4fa SHA512 2cb7f5c7764641b82bddc2210ee2ffdc55ed5a66f72c373748495e8e842f852bbb309404c2050ef7d1bff4d5a7ef9ca89d3e71ae47b88dc9bb93e5517a4518f3 WHIRLPOOL c625ef1b79bcc5e84ac7b63b7bd3fcd84c091f0455c4fa57d91b7e52ad3f09481eb8ff6381d7e522e7a14071d5bb9f3dae741fb7d28600814e6efae2d8191a45
 EBUILD netbeans-nb-9999_p20150910.ebuild 4997 SHA256 402d81e548f2b8c7e0e4cf9442886d955ec05e7cc5750f03e736756a1aa1052e SHA512 6561a8487c380679e72070aaac942649ab62c03581e5a78509528c101226ea9ddafaee965c6aefa293ae9c2a045e98f48dbc66b720f9dfa35127e43bab858697 WHIRLPOOL 9f1ad9fd16b6c91b46324715949ddcd450e52014d0027dd3f4550b3c407b62d2473a289b2a5f45db435637b86305816532b4bcb5b54246a4fc998fd24da9bee5
 EBUILD netbeans-nb-9999_p20150911.ebuild 4997 SHA256 7cdcfea353cb124da315b7218d7616fd9c113cc2f9815926b8042eb0eadffc91 SHA512 0dc67fc8bbaeaf671a18d53d94cee1c1482b665f091d8318082a93a82b1ddfb091b5048ea7dd94ae33c3720d70f33e4df1cfec54b2d9e8b898c34445dd6c5ea4 WHIRLPOOL 1e803beeb46a3cd9d4d57577e6b0e424d2f644bb28492672f5b148d4524ba20d99b28e5d958c81d28223d858b470e83b174e461792ed4e783317f8d7b0668395
+EBUILD netbeans-nb-9999_p20150914.ebuild 4997 SHA256 b732bb9b9e9f525270f0f99f8975a6dcb82c07a6eb04ef2056c5afc387256bb7 SHA512 9275d710948861173aed8f0e37b5195684a7322a8ae4a21ff5b53647ce3e742b9d7c3eb3d1ae2562de2f72c6c948f3fb4f3da69f8ebac3acb3118422c03cd076 WHIRLPOOL 202450d4b7ab806dfe7e89958f9b2c998f189f48eb327532522f922040b38eee747351d055c97c29448cecfa674ab3332edbde40b15dd1ce741b8ab36697d5d3
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20150914.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20150914.ebuild
new file mode 100644
index 0000000..9a43ce0
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20150914.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Branding"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-09-14_00-02-28/zip/netbeans-trunk-nightly-201509140002-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/Manifest b/dev-java/netbeans-php/Manifest
index be3c8a3..d916598 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -12,6 +12,7 @@ DIST netbeans-trunk-nightly-201509040002-src.zip 208956475 SHA256 4cc75f6e48a660
 DIST netbeans-trunk-nightly-201509050002-src.zip 208961273 SHA256 0e4ee8605bb5933ec079c7bc1a597d00cecd76d589ea27a1612eb51253d2bf17 SHA512 d87f0251d65b3c44468ce3da97b3a9f077938da2eaa08c7afc887dbcd0054cad88840a1c12e553ba5100ebe4e272f0a89503a694ae3329952102959a530f70fd WHIRLPOOL 9f1409fe6b8775cfaa64af217fbf88220c8307ff4b169d694f431cbaaff3b46bd7f0c3a97654706e0c949d01d0a61515daef679ebea6012b56da3af7af0ac01b
 DIST netbeans-trunk-nightly-201509100002-src.zip 209128741 SHA256 5d5a40a072eab70857662787af171f4af2a73d866e122c465618914c851e790c SHA512 c40b93171efc0d42e84d34d437c15085189078d51a99be10e63a813a9e7ca9451dcaba6748344e585cc444903c29a56fb1a78c43545136910c000accf53dfe83 WHIRLPOOL 033764680db1d66360e33286c05d58e33bf0288f09e2caa9871beee1d727047b8af6a3de079c595ca508f89f0b29ae4aa96298bd4be5cee3b77e32f9759cb527
 DIST netbeans-trunk-nightly-201509110002-src.zip 209149212 SHA256 9833b3b5804a16062972c36bbc1af9ae9445f7313884195e6ac0935a43182b98 SHA512 2ba867e3c5816b08da70cc9fe5a697ae68d55b3eb28ada6c6b9364dd8828a1f16122dd57f7556113d93b4af034f4b6a0aee05d79336e18b9a8f014b86eff448a WHIRLPOOL 21026c2040e6b6d843308065fd6409ebca28a013d8166d19260888beca80dc37f50e3a327cb059f92803591a23a9838484fd2b1fee78fa3b37b378a495bda782
+DIST netbeans-trunk-nightly-201509140002-src.zip 209159147 SHA256 cdcaeab5534f59320d499b5e84f1deec2863f605ccf4f7be5ced8415e0e3a70e SHA512 0a40110edf53330612d3d586eb7931013c5279fb5db2a8383da90da03df12f291d6c7e5c0da14987311efb10cec017abf201fcf0e299141d079c316447ab8234 WHIRLPOOL ce02272125ee84695d786dcf3c66ac89f56deaed2076dd00e35a997235ca32b181257d80246f20e0e26b6983052b490f0507f718d58f164549991a940e1dd598
 EBUILD netbeans-php-8.0.2.ebuild 4347 SHA256 585b2488d748f3d0f87c17c951870e167aac7bf10847428add786e4a8a446583 SHA512 1431305d4f340cb0a2c7c896c54d45f6f02ef82a4201f82053278b98511a5a4a68210317530e9cdf5cf1f495996d3a3f9c4b2c3c479aa407abd375072ab3182f WHIRLPOOL af8476f2ff2d119f2657e6be03cfea1160f86e41bd791f40609f1bc8a8aada46ba1081e4f2417b0fddde931fa4e43d20956c0fe1d4fdf3617b78d01afd23f9b4
 EBUILD netbeans-php-9999_p20150901.ebuild 4417 SHA256 b6f52a63053c7f6d74829800396e15d463a7316c2de194bb0e243385eb8cc95b SHA512 b783d245589b2f43d616f3e3af5ab8bb0d9c5097974c640f8d22996b8185eb921edb851c174bd02a17ef0d29c50f0db03c595b5f23bc717dd3b2c4944c7fbf73 WHIRLPOOL 00d18b2b7f6bff0fcf8852a6137df8eebaa99885091a6363628b7ae18dd9c4ec18e3dfb75f214092be4cde7fe7c1150889ee8c173751089af52e8710f67446b7
 EBUILD netbeans-php-9999_p20150903.ebuild 4417 SHA256 e7c715d04d186e6e62d408485f33ee6c94ec5a76969d95de552d10e590b94940 SHA512 44abb97abf1ae49840e20575bd05374f301870892bde53213df37d5a0b21bd6d9691bfc9f36120225d357572ba6df840cd4ef5f5f5492c24e5ef25f57f64624a WHIRLPOOL 35a1dcede6c295345409ac71f20c53c41b772a523d91d91bcd9b20369bc203e5f7f79e1ce7e2a72bb3cbb50ad693dfd8ad77a4ba22eea72000d70dfa593dfc00
@@ -19,4 +20,5 @@ EBUILD netbeans-php-9999_p20150904.ebuild 4417 SHA256 6ea9bea545050e6c10de271e02
 EBUILD netbeans-php-9999_p20150905.ebuild 4417 SHA256 05a81f041949a3b0e88817b1d13fdd67e53182e9a97bc36b3f1d1ab50062ce76 SHA512 955b49444d7a29e79e0de83a3c76b4962faa2f4168b3926b481c7fdc84d2d154b37a6abffff31980bf41a80d64ebed3cdbd0ba53683f44e8c696213dbf2e618d WHIRLPOOL 2e88ce494150366ee293210037f4fc1d57f1b0dfa4b2850d78c7378af7ee77dc8221c82fa4d7f38c9131a3acbab3fe7c0341d8aeb02caa1f83dd4d0a63f88695
 EBUILD netbeans-php-9999_p20150910.ebuild 4417 SHA256 b81a223e9ed4ebf40f856b0282d40de66db4fb45b81a8302909f60cf573b6972 SHA512 4d63cf61f149932e20a745788d888d6e6a6a8b058dd0fe9766ae16d631a96aad4731e08bb72a8066c6d8c3611418ae6e8483dc6faa7613711aaaa6cbda949b6e WHIRLPOOL 2d8d23041b2693a27abc0044f3a14df9a8432f62b566a2907ab551dad97aadaf87cf2af3c90b0f432faa11dc9c031ca4f0e757fab6920a20fdb6bd0d27e0eadb
 EBUILD netbeans-php-9999_p20150911.ebuild 4417 SHA256 e339d6bf1a0f914784bbe163403daf30db522f978e868a9e104433087d07a541 SHA512 b2f4134e133d9922315b4ebdf712c06e57d3a8f77d4481fade2d946c9f4bb5a32de2f644d34c4613945b02ab3b0b542f2d6dff7f1bb5d53a364282d649fb05c5 WHIRLPOOL 9ef7bc81ea8ff36bf88f0b589e67415aaa72ecf7e2c114a11b17b56589d10367dcba77051f455a13d81bbad7d9bc7596299254d1de9820862e91a29fa42e2000
+EBUILD netbeans-php-9999_p20150914.ebuild 4417 SHA256 62e159a5b5c0c29209b706551be320ca84450dc78e29154daf8edb484976b8d1 SHA512 e52ce209b828467b94ca3436c94bfdb120bb214aa49c598f6f296cfbca0a7e21572e9982d450725d9d851a089dcbbf9d19b33bb358aacdcf7d0e5a21a2a55078 WHIRLPOOL b82b7d0d8c002a4a61e67f8061e49e1900462a73126513c47016ee20ead9aec304db025eeeb10c425a49ce0ae0d422f43af78c014ff17c113c33e5aa1b61167f
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20150914.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20150914.ebuild
new file mode 100644
index 0000000..e354a5a
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20150914.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans PHP Cluster"
+HOMEPAGE="http://netbeans.org/projects/php"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-09-14_00-02-28/zip/netbeans-trunk-nightly-201509140002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip
+	http://hg.netbeans.org/binaries/73E9BC8A7AF36E0C95210F61A85AFEF212AEE1A9-phpsigfiles.zip
+	http://hg.netbeans.org/binaries/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-webcommon-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/javacup:0"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.php -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip php.phpdoc.documentation/external/phpdocdesc.zip || die
+	ln -s "${DISTDIR}"/73E9BC8A7AF36E0C95210F61A85AFEF212AEE1A9-phpsigfiles.zip php.project/external/phpsigfiles.zip || die
+	ln -s "${DISTDIR}"/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip php.editor/external/predefined_vars.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.javacup/external javacup javacup.jar java-cup-11a.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-webcommon-${SLOT} webcommon || die
+	cat /usr/share/netbeans-webcommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.webcommon.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/php >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/php$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	local instdir=${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/Manifest b/dev-java/netbeans-platform/Manifest
index e70cbd3..b735804 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -1,4 +1,5 @@
 DIST 03FE10857B0689B1F98B8D96DE87E80DF5D87A69-net-java-html-boot-fx.jar 63071 SHA256 3da9815a7a11675944cbe85efdce0ca9756c5b6be1a16bf9b0e98b5984f4415f SHA512 7693394686124c5eae90bd1ee3b49a1356635f044f3aa8ddcbe838cbe1334a9efd15034d0513db1078afabcd13d667882f2f3b042eee0529a97b2f18c4c45032 WHIRLPOOL d731b30cd7c2b0284a0bc90c36950486bf9da4e94170733419257908df9b3f6c0166b8154b336df321b0986393e32ad0a501401c8ec43d952582933429914310
+DIST 091957C242A6FF3AC88D00C57B1703ED2D342B04-net.java.html.boot-1.2.1.jar 58919 SHA256 3de213479f0d91bed30a124d05a7ef35dfff1f9ca0fca30ae03699191c4a236c SHA512 f1ac88ea0d7d2775ed1a3df9dac39c7dce55ce291da0e48fa6139961a8ac44413f70a73c40ea0ee5da8082067258068cab9321d05183d97c54fe042644bb8603 WHIRLPOOL 47eb3b8406f49248eec24c9e6cad88d8204beaa8a6b01c62cfd247ac10d5f49207bd51fc362e1e03025837e2be0776e6e5b029e071b5efd1b3f39c7ccca532c2
 DIST 1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar 529233 SHA256 a61000572baa9e216f035b56dc4f2b4119328e8858af5d523af84b356d7857e0 SHA512 55f88f204cafd6968a952d6d08286220a569f678915446aca2b49bfe3bb7e2de6935d5ce834ef55363209d8f23be7d2275cc517a2ce837b75e5e5a6551e9ba9e WHIRLPOOL 4cba5cb7078c4b24ceec00a54aef36898ca288643c6b85c360b271b2a914e516f298bc489f9e78477411c9ecdaa17f3262381d02b360d4309dc5b9308523b7e7
 DIST 1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip 77859 SHA256 1503657e36d02befc5433a57f1134209f98f3d193ea30c9ac0553814a8590a21 SHA512 15834d5448da80be539259e902ffa678a3b94293ffec221ad1e6238f0abd2dd2b588b8c06165f7e89796e96a6660c3166aad13112d34eebbed29163b52074b56 WHIRLPOOL 274c0cf5fa7d44701d7ea82b34758d6fceada1fe88bbea34058a468d350e1661c76f07e7ee0edc6b0c34113f7afc4540f2345e2d1bf6bf577969a305362d4227
 DIST 2274D50B71CE1090A372F67105E28076598C7076-net.java.html.boot-1.2.jar 58919 SHA256 d62972a3a178037a3653def4c4b217f10358f372cac0f47eee765e14e60158a6 SHA512 42542c7bd2e983dd965b17fadc49cc5c86203c57543adaf637c773a06b039f4254730bcffaa4f0422130f11a603210a4954bfb827eb123cf0b015a98183c9be5 WHIRLPOOL 58da915a187621caf4094422b34b059df563081365cbea092051749e5b5f7815077017498e2bbb7c99a810d6e3c6eb8134de5b7aa1eb45493ea783a121b6c01f
@@ -6,6 +7,8 @@ DIST 24ED356FF3C72665CB5FB972B428824FABBC1987-net-java-html-geo.jar 26117 SHA256
 DIST 2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar 241636 SHA256 94ecde163b4ca3a42425cd830c79197f22d0d1336d471ced6a8a83b07acbf7c8 SHA512 346746e19ca24e7489ba7bb283cefa47d2df33e6795e9e275bdc269dc312537264c24537b2128246cca8a4c2053a73e4172c6d0b9f16450e227d9aa895e9c730 WHIRLPOOL beb6125f81acbe80b6249d2b857a0759a876bba677466af6d1b71b54dffe33272d3d8e98953a49e2acf502fc27d60c31eef442e19f5f63a17a3d5190c27e6b69
 DIST 31C9329E78A222E38CB86716ACFCEF81EF0BA1FD-net-java-html-boot-script.jar 10699 SHA256 555f1fda384ab2466f4ea8a6ceee918c3207fc0765f833835bf0a3ae4d87546f SHA512 80fa6c2efb84c0046eef85613ac4c0b66e22ff611621c74d38f9f480b4fc31c30af607d8a6b99cf557dbea18b61844cdfb3236026f3597a984debbe4ad4a5bd7 WHIRLPOOL c44e695c890ca53328d441a8728a86045d3892aad9f1c934ab8ef76a74f8e11c6adde7531e37fc21bba1028e3f42e54fda44823f23978e9de5aa692ce23d1aa7
 DIST 432EDFB05C0F44E6ADAC4B1F3E08C67D1F52FB4B-net-java-html-json.jar 97196 SHA256 4497b1cbf9bc8e8eb8323ec6ea1b226e94cb30c374da4971c47d3129061e1975 SHA512 726cdf540cb0031b0433c09eea93f99b316ceebde771a7dfcc1f52c7858404a47c8c284c479b4e7dbfaa46453a0c84abf2fcf86e0eb9f666a2fbc48a207259d4 WHIRLPOOL ec6989a5f261cc08d9a5181d4b0b7c3a2e23719483b23559f465bb56283565347b63292946e29caa8ba1c93df16faf93b5d2226c3d4c850b0754d505945e7328
+DIST 448219090165A0BFAC6A8350291637618ACC3CE8-net.java.html.geo-1.2.1.jar 26104 SHA256 bd2e06ca920417151131874639e21bf0ffb91968d885cd6a668c17fe7fd7b01f SHA512 3f1c78ab6e87e2d95485f3559f169ee374b824113b7d66095917257c7ab810add96acd1b2ab0e8f9d130756d3cf7c0206c8a67e75fc73d7d4b170851369a7330 WHIRLPOOL f05e513001d4a9ac76d177a026a975904266e47b6d50fb545e8260ebf75be123fd4ce34830a5064051f3248fb9bf4d702830e0d48fa7ed6319c6716f11e85aa6
+DIST 4F8300CCBF919EFD997FABB7666BCDBC369FB2B6-net.java.html.sound-1.2.1.jar 9111 SHA256 6b466172659812544767c70ea22f05ed548e7c7aa934d38cdcf91bca882ab637 SHA512 7a5780bbd1ab40d6cf3f46664d242f0008caeb4472a76920e260b4c84e36e1733136ce782b7deb330c2162d6cc4d4a9d7cc9df091fa446f7052e9db6e8af45ad WHIRLPOOL 191f0d8171744e45d4f8ff8846989d067b884ebf6cd18a4494bae1aeb1c4985dd0cad686ed4c288e480d9536362913ef39bbc99950b0d42a7a22d96bed320e73
 DIST 580F8767F658464D74ACB06E53DAA6DC5163D494-net.java.html.boot.script-1.2.jar 10709 SHA256 04e92a97b0e007db39ec53edc6b134d0732ae8c4b4a487135b91533fe97aa6ae SHA512 4f4dc45fca964ad9ac1060cec56895a6271f4e25a2e69bab3b3020fcab095bbed153958e07f6e69a4b050c021d7a89955e5702f692fab7d07c2a313b8e5000f6 WHIRLPOOL 455ab1ebac34cd21100aad1ef7f47f6886b3f1852eb6415f07bd7fc6cd64fe07eacca6221ba21eda9a0125b18b0c0d76e840006c71223f17763e10132a470a64
 DIST 596C9CF835BF8780716303293CF1D0A9BE1BF665-net.java.html.geo-1.2.jar 26103 SHA256 d69015a6dfe91198615610e699d5dd702a41ee4ba5feea0c17b7b6454d00f0ec SHA512 00a81677691415ebe931bc197c7a433cdc3259f2bfe0fd97e73637b8738dfdb69ce112f234ca2ab183266129175c3405863d7111fbe3f07d55c76b5c892a244d WHIRLPOOL 410ab39624f926b845c25dc2563982db7082f84d575ae0b5b48fe14998dd6a8396533390a9d5d6904495595ee2bd54b702d451813080f1bc86db13d7a72b0d49
 DIST 8184917299BC0E616ACB170D3B73EAB71A39D98A-net.java.html.boot.fx-1.2.jar 66428 SHA256 b5943efbc8ea518b4610d8bbde860b21733dd0392173037f48088ff578b29d2c SHA512 d80ac68bb6320f65654e383a14b179deb27235d5c8e3cc86dd89ba7c2f8b44a4cbdca76d8ae0cce2770211570a789929f9186e2f3292d3547968bb57e81c515f WHIRLPOOL 3b0e9f7a80093516a66b847de5251742e1b4bdb1958ada93f418b10cc6edaa3726881fd091f22e0ea91c87a2fbf6e4c499c0eafddb1e8e1cb225d7c20bab7e95
@@ -19,8 +22,13 @@ DIST B27F1304F18FEDE876F940AEFA6C9EB5632619D7-org.eclipse.osgi_3.9.1.v20140110-1
 DIST C45CABAA90C7C62FC6F3EABA3C4B82AAA498964D-net.java.html.sound-1.2.jar 9109 SHA256 3820f9547313ebe5b7d8e5ae8aae6edbd4e50ad4c9f66bb16ab9db3ec1dd18fe SHA512 919224b94f9ba91ce536fb5958512b1692a64d538276a0181024fe24b3c91ef8d98bbdbdc22a3e6ccfb1dc541797f930ba197353abaf8a8454923e7bed1b7048 WHIRLPOOL e588c67eacb136928ff09ed6600e16ef0b662410142112a8d3e4a102bcaf49d73665816a89ef29992efc9043e96621479a8dea096bfd2e031be44627944089a4
 DIST C610EC75CCEFF8B48FF2EC2BCECE2D4540CC5FD5-net.java.html-1.2.jar 14729 SHA256 20a7b27a865055fa4fd44fcb721d7f1fba7e18d10876ffabde4f444ca09eeda2 SHA512 718450bc318bee522a13b537adfc0b1baa3d62a422051cfc74a13815577512d20960d7d61e4a2b01a7e7f478d3c5620d958059603a541d95c053b79a9ad477d5 WHIRLPOOL 80d8d84dbc99fba645a6f90ae56692e9e1358528e6e6eea1ac8a8d59aab9a54e83e4a10639a8774f46dc86d425d7300a825c7b7cc3bb6a54ead9eb895b5f5138
 DIST C74AC1ED160379872826FDC4A3C0CA924A3A0A83-net-java-html-boot.jar 59117 SHA256 6628cc5b03f7dd137ad61da4fe39c91336c120939870a2381bf8db50f7dfc8eb SHA512 a61ef4d1fbd212b046dbc3f532eb3993131b6f35740e8b3c9e73d49af25cba34ca72b182bc90dc8f451aee3aa6051573a947ec6abdcf64e00a670fd39f4d3e7b WHIRLPOOL 08521e68daaf63a8bab88e5135674455dcec6c3b0f25a673b6b529888fee1d46cbab245b31127287f55e2b84baea9c9c113dbec463b902848c5d3ec1e4abc272
+DIST CD9F9B8C8971346400FF6CCE9A31AE9C8A5CE46E-net.java.html.boot.script-1.2.1.jar 10709 SHA256 df61a21c0a73effa623bd0d20337817cbd01a87f937d66e107cf5537239769b0 SHA512 97bbe98133f78a98fa3ff45a8f68ead170b9471fb1f2e2c2decd0ef8351c27f01c6309fa629bd6ba5a799dd666e4ca454984798e55b1a60c8f1af2daa552e81c WHIRLPOOL e534ac3c40aa8d8b55ebfcaeae6fd2ed947aadee063f3e21dab1e92cc60035304ecdcf9e12f5d9e6124f16cf3001a61a2485afb27010b938cfa182a0634ca1be
+DIST D85E2725EE887261A5533F546CD1997BDC838464-ko4j-1.2.1.jar 86200 SHA256 ababd909749480774d3fcf1ea4a56f44399d8e224bc829d70cd5e663d57fa452 SHA512 6dbcb5c2fb3b4c5be9315a0317261a463c77b04e94eddbb2822897170fafff31d563e54bd64d531a78523fc2d228795b0f43293c6e240b89ed738c0d5f597835 WHIRLPOOL 041d3f1e617096f47b47084e83fb2d10215c473d9a7e5a14e86af78626798676ec9c43a11d161d9a056c658914da3dc223dd24cc28941cf25ae9e5fc0a66f131
+DIST E27E4D0AE8C8DC507A06C4432F85FEC4918FCA60-net.java.html.json-1.2.1.jar 99627 SHA256 8371cebe591b8c5c3e8033d2c5c5dc967a82334604f93f05e2250a9466d01aa9 SHA512 962029a544d158528b312cbc23d333ca45f9b820ea64a2ee33e6fa1965b75c462674d4ed0a236fc991f0685f351f3803c320d2e9861934d805c6add2c14bb2d5 WHIRLPOOL 7913ca58cd9139faa32f4b8eb51217af8ed9d988afe3f2e639cbdce56f1dff21bf0321c383b607e4947cf4a6efd0ed25ecf12e6df55c8b4d80be8345c5951599
 DIST E3A5F2A5ABD41D2551DB29361BAE41ED8A985FB5-ko4j-1.2.jar 86200 SHA256 3383e79042783403e1c799010009dda79a3a778ace1e4baf50b143e7fd862cb3 SHA512 4f601e9d1b7d98b55c43a59d58c5e73248ef6c19f8b027e9d2a25e4e32419798c6d36b212d0725baa68f8f6ef862277f1c549df07fd4fc1c9d04d3b29e0a7e86 WHIRLPOOL 53b0c05abe4f9d5babb85d57b09d76f0421eb1c887fa3ab3e4f186139f150c1b5b63190068dcc211101671dfa4d3119fed13f5dbc5d00ec6bef5527cdcb2fdc9
 DIST E556F74DF0942B304F94D9F82CAA8102FED6356E-net-java-html.jar 14567 SHA256 32c33cc1e93823e6ef0e04fe4386a39f1d1319f4672c782558c598a5927e0370 SHA512 189d73acb3df53fcd79ee74fe6e2a91cab80af9a2793e956fb1d250fac84a9ef91236f06696a769d01e2af811b072ea53ed447a08f349944b3a6c7739fdb3d67 WHIRLPOOL 21ecf7e92be7ccfbf5b7a416875ce1247128ab37f1590543809f57e7af3d2a660ac8c97a754314c5fac946bda391e99da5d915253c46b8187f8f341c17d074d6
+DIST E96EBE549375A4FCB3FACFEBB42F553C8F108606-net.java.html.boot.fx-1.2.1.jar 66432 SHA256 ddd1d56390374535cd0357b178a1ca3ef963960115956025209cb0e2e8ad6b32 SHA512 48ae88ebd5ad847f81518fcb4826a43037f888e764ed55436a6c534759eb7e08bf37acef7bc114fb1aac86d6ba6b8ae5da87c254d5cedea89bda56c93bdaa269 WHIRLPOOL 98b0c330cafacaa8d77ff4873bc15a079ec3efe2b166cdd9df032db7e118519860a68c48b90e7bf2a1d8fa72f822b4556c895510b058d923e8b8dbbe4fea674a
+DIST F8DEDF1222AAF1F460B4DEE4F4FB6C689D7FD51E-net.java.html-1.2.1.jar 14728 SHA256 f9522cddc8d3017684c33611a334a54d4820d4d474575c3230c6d028227520c1 SHA512 eaaf86c0bfb36147cb86a2d753d73411487fb8d813bd586e5b835a9fa6ca6640646c313e27fb28161048a42b4e6f9c06d3207c01d6b0780a617163d93c1f6c2f WHIRLPOOL c4ae678b00346d3fc212cec9d2f28afa3a397a71649b42f80fcc210a557fd368c8371c89e93f8564c6eb4e6ac597b4df0422b728f4fca4b416eb80a61b0e21b0
 DIST FA012CF6D4BF8BB584EF5642B85A65544764C1AB-net.java.html.json-1.2.jar 99602 SHA256 44159ae78a5a5784f7a7e5f4534b91d0ae0a056671f33488cf02b0191ed0057c SHA512 54de7ed57e7d33019fb7c6159fc6b9720e21d4f3ceba3ceb3b9f90490dfb10a8dd4fff7dbf35800a59f0169e0d4d3476d21df00adb703cd53982f98abe610325 WHIRLPOOL 09f1b08667acbb4675e0303905b83b580b1c13c4c4c0000c045eecf05883c721612526c8e67ee1cf5507a2504948f1dbfe145c9fb85421cf721aa7cc37473278
 DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
 DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
@@ -31,6 +39,7 @@ DIST netbeans-trunk-nightly-201509040002-src.zip 208956475 SHA256 4cc75f6e48a660
 DIST netbeans-trunk-nightly-201509050002-src.zip 208961273 SHA256 0e4ee8605bb5933ec079c7bc1a597d00cecd76d589ea27a1612eb51253d2bf17 SHA512 d87f0251d65b3c44468ce3da97b3a9f077938da2eaa08c7afc887dbcd0054cad88840a1c12e553ba5100ebe4e272f0a89503a694ae3329952102959a530f70fd WHIRLPOOL 9f1409fe6b8775cfaa64af217fbf88220c8307ff4b169d694f431cbaaff3b46bd7f0c3a97654706e0c949d01d0a61515daef679ebea6012b56da3af7af0ac01b
 DIST netbeans-trunk-nightly-201509100002-src.zip 209128741 SHA256 5d5a40a072eab70857662787af171f4af2a73d866e122c465618914c851e790c SHA512 c40b93171efc0d42e84d34d437c15085189078d51a99be10e63a813a9e7ca9451dcaba6748344e585cc444903c29a56fb1a78c43545136910c000accf53dfe83 WHIRLPOOL 033764680db1d66360e33286c05d58e33bf0288f09e2caa9871beee1d727047b8af6a3de079c595ca508f89f0b29ae4aa96298bd4be5cee3b77e32f9759cb527
 DIST netbeans-trunk-nightly-201509110002-src.zip 209149212 SHA256 9833b3b5804a16062972c36bbc1af9ae9445f7313884195e6ac0935a43182b98 SHA512 2ba867e3c5816b08da70cc9fe5a697ae68d55b3eb28ada6c6b9364dd8828a1f16122dd57f7556113d93b4af034f4b6a0aee05d79336e18b9a8f014b86eff448a WHIRLPOOL 21026c2040e6b6d843308065fd6409ebca28a013d8166d19260888beca80dc37f50e3a327cb059f92803591a23a9838484fd2b1fee78fa3b37b378a495bda782
+DIST netbeans-trunk-nightly-201509140002-src.zip 209159147 SHA256 cdcaeab5534f59320d499b5e84f1deec2863f605ccf4f7be5ced8415e0e3a70e SHA512 0a40110edf53330612d3d586eb7931013c5279fb5db2a8383da90da03df12f291d6c7e5c0da14987311efb10cec017abf201fcf0e299141d079c316447ab8234 WHIRLPOOL ce02272125ee84695d786dcf3c66ac89f56deaed2076dd00e35a997235ca32b181257d80246f20e0e26b6983052b490f0507f718d58f164549991a940e1dd598
 EBUILD netbeans-platform-8.0.2.ebuild 5406 SHA256 98e9861da45ead0d2d975a0527315df5282870b2d7e71a089724d91c18852e81 SHA512 cadbe66132d3ad81f6d149e20731b558c11c529e2ec15b1fe47ff97d99a3f4b4612fa5c98c435c4ff979eaefab6702721db009a03162202c96b4b411cf9f872a WHIRLPOOL 9552948e8bbad308f4379eaae69d8c214da9fbfab87d75226949b69ddca3e68c2d36c4d05738196073e5b959ab0b764064c9186d421198937122aa4bdc4988dc
 EBUILD netbeans-platform-9999_p20150901.ebuild 9238 SHA256 85c58de49e8cf1c2202b5f892c9d9283587f255c58c4835f2169dce8b767967a SHA512 5d90e804870b94de49cf76db7e99bd2564f2fcd9984e9dc0b1f0ba02c5a66a2b97e0e59ad0b986d8ef055fb1184ab35998248379b76a456f576df5f87b90f81e WHIRLPOOL 4a74b24b3e8a975f1eff66d95406c629bf860b1956937a44f33eb2d92291d2dd95fb91dd8c34f730a35d6daafa9d16a67f2ed2a300c691d5dcacfd8f435b5185
 EBUILD netbeans-platform-9999_p20150903.ebuild 9334 SHA256 2e3f4bc8579db348c5b81fb1460caec924efd1c59ee4e980f0606673944d0efe SHA512 21e7cd36c60d7ac8d6ac919203d9d0fe800bf02c5d44d7f450f2005a6da86c1ec3ce50cc8a3577af144618964e0d2b9a9183f2957fdfbe087e2e5eefc4ff4186 WHIRLPOOL 1989aeedda0e97d37a5e99ec99899862d057fae52eafa789ef100c80f5ef30339a01f9155c9fb3be7fd3d91a693136eaad259b8706723a7fda51ee2949378eb2
@@ -38,4 +47,5 @@ EBUILD netbeans-platform-9999_p20150904.ebuild 9334 SHA256 298f8551b57f1d0456b99
 EBUILD netbeans-platform-9999_p20150905.ebuild 9334 SHA256 82c1cc5831c3248c886975df4cc42f11e73364a4d3efbd1f969e49ce6fb41849 SHA512 2f56821fb17824fcf86d270215e6aacf9b61d4e543c7b7c90422323ae64bc736d757e43134d95bfd5c40d4f6f22b1935ee5020627fbde9b2df862468fc19d5ed WHIRLPOOL 2fa28a80605ae592be2a12c53fe873eccbcf401222facc5eed207a8bb01921b33c38ccdd03e3187f42cb3740fa483b7ca89b78937f8651b98ac72d187393a80a
 EBUILD netbeans-platform-9999_p20150910.ebuild 9334 SHA256 2deb3054116db06de4e2ee3610c812a3b8c33e5bfb9726bf0bcfdb7ac60fe758 SHA512 67d160c319488ee24b13d2e8bae320985c394c3339c3eeb578026f833646a4d0797a1ff77e49c986c8bf7003fa175a790aef3175dc3b95b8f63fbaf03166ec66 WHIRLPOOL b77e63872ad657c20b8953f3124c105d34675d6cfb2db22e600003d05c33c2464fbcf387d01539f2486b7abb8be53c54aa5df812045215965830bb8b819c4901
 EBUILD netbeans-platform-9999_p20150911.ebuild 9334 SHA256 0da7726262fdcc68a35dd78d93883ffd96ec8928f55bcf8e56cc8de976970552 SHA512 2d867668df5ea9cabfc89f7d4473a958ffdce57f93d9c2d0726ebd72c8ec70f7bbd586aba0962b53602bb9e0ba4000998dbe893f186b9c0473ad19801f62fe0d WHIRLPOOL e4d7e49e023329c15c480b4829c9dfc4b3815e9c6dce34890063c268ed1703274f35f4b67abc533d4a38faaf12a48c715d7b5a53fed777c8fec12c6094614069
+EBUILD netbeans-platform-9999_p20150914.ebuild 9382 SHA256 d7484e54be1695327a998c284835af5647524c0faf30647e203482bfc2b42a9f SHA512 d2437197848e0cb0cb15ac5162d3d8118d84596e2029bd6856f22b0632a084c96744493c5f6e21ee6538b6673ee5a98fc776935c0db4c832ebae72053d46adbf WHIRLPOOL ddcaf68172239149f7587eb6f0958103bf1f81888b3e2564c8efe5ae78683b812add70312c84c0e8252daebd6f6d60daebf462db111e2932618f60ef06f5fed8
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20150914.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20150914.ebuild
new file mode 100644
index 0000000..9a51fc4
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20150914.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Platform"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-09-14_00-02-28/zip/netbeans-trunk-nightly-201509140002-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/D85E2725EE887261A5533F546CD1997BDC838464-ko4j-1.2.1.jar
+	http://hg.netbeans.org/binaries/F8DEDF1222AAF1F460B4DEE4F4FB6C689D7FD51E-net.java.html-1.2.1.jar
+	http://hg.netbeans.org/binaries/091957C242A6FF3AC88D00C57B1703ED2D342B04-net.java.html.boot-1.2.1.jar
+	http://hg.netbeans.org/binaries/E96EBE549375A4FCB3FACFEBB42F553C8F108606-net.java.html.boot.fx-1.2.1.jar
+	http://hg.netbeans.org/binaries/CD9F9B8C8971346400FF6CCE9A31AE9C8A5CE46E-net.java.html.boot.script-1.2.1.jar
+	http://hg.netbeans.org/binaries/448219090165A0BFAC6A8350291637618ACC3CE8-net.java.html.geo-1.2.1.jar
+	http://hg.netbeans.org/binaries/E27E4D0AE8C8DC507A06C4432F85FEC4918FCA60-net.java.html.json-1.2.1.jar
+	http://hg.netbeans.org/binaries/4F8300CCBF919EFD997FABB7666BCDBC369FB2B6-net.java.html.sound-1.2.1.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}"/D85E2725EE887261A5533F546CD1997BDC838464-ko4j-1.2.1.jar o.n.html.ko4j/external/ko4j-1.2.1.jar || die
+	ln -s "${DISTDIR}"/F8DEDF1222AAF1F460B4DEE4F4FB6C689D7FD51E-net.java.html-1.2.1.jar net.java.html/external/net.java.html-1.2.1.jar || die
+	ln -s "${DISTDIR}"/091957C242A6FF3AC88D00C57B1703ED2D342B04-net.java.html.boot-1.2.1.jar net.java.html.boot/external/net.java.html.boot-1.2.1.jar || die
+	ln -s "${DISTDIR}"/E96EBE549375A4FCB3FACFEBB42F553C8F108606-net.java.html.boot.fx-1.2.1.jar net.java.html.boot.fx/external/net.java.html.boot.fx-1.2.1.jar || die
+	ln -s "${DISTDIR}"/CD9F9B8C8971346400FF6CCE9A31AE9C8A5CE46E-net.java.html.boot.script-1.2.1.jar net.java.html.boot.script/external/net.java.html.boot.script-1.2.1.jar || die
+	ln -s "${DISTDIR}"/448219090165A0BFAC6A8350291637618ACC3CE8-net.java.html.geo-1.2.1.jar net.java.html.geo/external/net.java.html.geo-1.2.1.jar || die
+	ln -s "${DISTDIR}"/E27E4D0AE8C8DC507A06C4432F85FEC4918FCA60-net.java.html.json-1.2.1.jar net.java.html.json/external/net.java.html.json-1.2.1.jar || die
+	ln -s "${DISTDIR}"/4F8300CCBF919EFD997FABB7666BCDBC369FB2B6-net.java.html.sound-1.2.1.jar net.java.html.sound/external/net.java.html.sound-1.2.1.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/Manifest b/dev-java/netbeans-profiler/Manifest
index f117160..4bed869 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -7,6 +7,7 @@ DIST netbeans-trunk-nightly-201509040002-src.zip 208956475 SHA256 4cc75f6e48a660
 DIST netbeans-trunk-nightly-201509050002-src.zip 208961273 SHA256 0e4ee8605bb5933ec079c7bc1a597d00cecd76d589ea27a1612eb51253d2bf17 SHA512 d87f0251d65b3c44468ce3da97b3a9f077938da2eaa08c7afc887dbcd0054cad88840a1c12e553ba5100ebe4e272f0a89503a694ae3329952102959a530f70fd WHIRLPOOL 9f1409fe6b8775cfaa64af217fbf88220c8307ff4b169d694f431cbaaff3b46bd7f0c3a97654706e0c949d01d0a61515daef679ebea6012b56da3af7af0ac01b
 DIST netbeans-trunk-nightly-201509100002-src.zip 209128741 SHA256 5d5a40a072eab70857662787af171f4af2a73d866e122c465618914c851e790c SHA512 c40b93171efc0d42e84d34d437c15085189078d51a99be10e63a813a9e7ca9451dcaba6748344e585cc444903c29a56fb1a78c43545136910c000accf53dfe83 WHIRLPOOL 033764680db1d66360e33286c05d58e33bf0288f09e2caa9871beee1d727047b8af6a3de079c595ca508f89f0b29ae4aa96298bd4be5cee3b77e32f9759cb527
 DIST netbeans-trunk-nightly-201509110002-src.zip 209149212 SHA256 9833b3b5804a16062972c36bbc1af9ae9445f7313884195e6ac0935a43182b98 SHA512 2ba867e3c5816b08da70cc9fe5a697ae68d55b3eb28ada6c6b9364dd8828a1f16122dd57f7556113d93b4af034f4b6a0aee05d79336e18b9a8f014b86eff448a WHIRLPOOL 21026c2040e6b6d843308065fd6409ebca28a013d8166d19260888beca80dc37f50e3a327cb059f92803591a23a9838484fd2b1fee78fa3b37b378a495bda782
+DIST netbeans-trunk-nightly-201509140002-src.zip 209159147 SHA256 cdcaeab5534f59320d499b5e84f1deec2863f605ccf4f7be5ced8415e0e3a70e SHA512 0a40110edf53330612d3d586eb7931013c5279fb5db2a8383da90da03df12f291d6c7e5c0da14987311efb10cec017abf201fcf0e299141d079c316447ab8234 WHIRLPOOL ce02272125ee84695d786dcf3c66ac89f56deaed2076dd00e35a997235ca32b181257d80246f20e0e26b6983052b490f0507f718d58f164549991a940e1dd598
 EBUILD netbeans-profiler-8.0.2.ebuild 3402 SHA256 8021dea620d1bc26214ff0ec285f8061c24693dd28a62a97a48ac3223707e920 SHA512 2660390337a973256b1aac3a02b14e16782c230fa2714ae695213b0cabc0eb60621c6a1ae234f9e57259a19de22a87447f9a89ab846bd59bcedd2be313c35072 WHIRLPOOL 5d1053ded03143b2de05b64cfbe59b515cb786d60bfa65566be795567bfaf5feb88a2f8e7161a05da512fafd523f871778d5ddeb3c6b89fc95885096e379f65d
 EBUILD netbeans-profiler-9999_p20150901.ebuild 3472 SHA256 2463f091c9f090fd538ea9a18cb2fc00819c7e8d8b3780e0bbdff4a426fb361d SHA512 40e7d264ee795e18ea90278e8e1d792abbe6ad4c4339d76ffbf63dd1126b0c5bedcd259741dff47c624a415aa7e8c57c3d8ef192d74b69373b6bf3ec574d6691 WHIRLPOOL 1d33cc1f24c6b8e3dca00668fa152b5956490d4eabc60bcae55adcee1c45950c02c0ab19daadb7b3691fc0bc908be618f56af9119243770298307a398b181442
 EBUILD netbeans-profiler-9999_p20150903.ebuild 3472 SHA256 9c439061ab5f353d42cd066cc5793626222b9e9e9b40b4217427498e7036ac4b SHA512 0c0cf3b94565f9dbad4cca20fb9abc672655e8a032c4d53794d9db03cde7b400d41126d3eeca82304952f488d232f041675fea7ad417b4f2faa9c5e24bead22a WHIRLPOOL 97d96c8613ed98c787251b8a0d4a556ffb47cd477449044c9dd8b535c9b632650870b70ee6816604701884a83c19f869db0256cb7c1ff83c6af986a22d21a5fa
@@ -14,4 +15,5 @@ EBUILD netbeans-profiler-9999_p20150904.ebuild 3472 SHA256 2ce2d24294cda35057f5d
 EBUILD netbeans-profiler-9999_p20150905.ebuild 3472 SHA256 7b39021f88048a7c705a57101e585987b1e873e9b846c5414a80593a6eeda36a SHA512 7df39644cd6d86ec8250e821bb28264352670d4afea8b6451ad5ff63c2df2bb1596d6f82b5c1d7044ba2c927e17beb7491735259335a7e6785096db27715e12c WHIRLPOOL cb344a4427d6c76d56845ee51565cdd08a25dc32339cf83eacedcecd0fda57bde0573d7338c8244b214c62d58ed806c58d7bb77a4b0849ba2bc8d49e23f48aae
 EBUILD netbeans-profiler-9999_p20150910.ebuild 3472 SHA256 ada7d53fd4449f8bf122354e2be89f6a4d88f2de271912adc9bd243c7ded1653 SHA512 e72fdce714f3efbf097f3fb3722420a5b5d205d630b877a4313524857eca2045d6608eac88b0d2afc25cbe5d35dea2c7c4c00cd17c054735950a2781749f5854 WHIRLPOOL 6108e5e5174dcf929dff4b456f1f16f9f060d8ee0b2267813dd4767fd0300d3dfd2f2a3374b5b5f3a3ae99d58b63d8376965cc7dd0dd46b5678512ddccc318fd
 EBUILD netbeans-profiler-9999_p20150911.ebuild 3472 SHA256 f125bd2e5c137f25a2905b4aa62824cbfbbd5d884272d8c0f80139ef934b9fe5 SHA512 62c0740af11cd9cf9e20ca4b08fadf685f219f22f1bab0daae1811793d171165e9eee39357fed661b3cfe85d9ea8e251a0b1c1bb6f69b5fa9497e275b27c6af8 WHIRLPOOL be9d5bd0bde460b5caacb3f6a1c302eb373d7965e66f25d31e3cf4f9f774be8930c3e0c4d068c74758ecb9c088636b1ed827b56bdfe034d3d9779b05f67f5521
+EBUILD netbeans-profiler-9999_p20150914.ebuild 3472 SHA256 70e6661ae19b9266a061eeae848bfc222db8ce83c0e63637938067ff772faaf6 SHA512 9a453a6ddb59beeff6c76e35cfd583c9d96aa0a6cb3ffa76bcc954289dd10b37e8217c06e5098b0b7caebf839ae6f3e6cc8debd0965f0ed465add1a4ff0b952c WHIRLPOOL d9716e833060942bb6ed623db92d0c8e4d9b7a0ba3a469202a2231cf3e284ebcaf3b003e267a51a515e302bb230a342341d34445690e2402a02584f71c7d2e05
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index b5f497e..bb30ddf 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -16,6 +16,7 @@ DIST netbeans-trunk-nightly-201509040002-src.zip 208956475 SHA256 4cc75f6e48a660
 DIST netbeans-trunk-nightly-201509050002-src.zip 208961273 SHA256 0e4ee8605bb5933ec079c7bc1a597d00cecd76d589ea27a1612eb51253d2bf17 SHA512 d87f0251d65b3c44468ce3da97b3a9f077938da2eaa08c7afc887dbcd0054cad88840a1c12e553ba5100ebe4e272f0a89503a694ae3329952102959a530f70fd WHIRLPOOL 9f1409fe6b8775cfaa64af217fbf88220c8307ff4b169d694f431cbaaff3b46bd7f0c3a97654706e0c949d01d0a61515daef679ebea6012b56da3af7af0ac01b
 DIST netbeans-trunk-nightly-201509100002-src.zip 209128741 SHA256 5d5a40a072eab70857662787af171f4af2a73d866e122c465618914c851e790c SHA512 c40b93171efc0d42e84d34d437c15085189078d51a99be10e63a813a9e7ca9451dcaba6748344e585cc444903c29a56fb1a78c43545136910c000accf53dfe83 WHIRLPOOL 033764680db1d66360e33286c05d58e33bf0288f09e2caa9871beee1d727047b8af6a3de079c595ca508f89f0b29ae4aa96298bd4be5cee3b77e32f9759cb527
 DIST netbeans-trunk-nightly-201509110002-src.zip 209149212 SHA256 9833b3b5804a16062972c36bbc1af9ae9445f7313884195e6ac0935a43182b98 SHA512 2ba867e3c5816b08da70cc9fe5a697ae68d55b3eb28ada6c6b9364dd8828a1f16122dd57f7556113d93b4af034f4b6a0aee05d79336e18b9a8f014b86eff448a WHIRLPOOL 21026c2040e6b6d843308065fd6409ebca28a013d8166d19260888beca80dc37f50e3a327cb059f92803591a23a9838484fd2b1fee78fa3b37b378a495bda782
+DIST netbeans-trunk-nightly-201509140002-src.zip 209159147 SHA256 cdcaeab5534f59320d499b5e84f1deec2863f605ccf4f7be5ced8415e0e3a70e SHA512 0a40110edf53330612d3d586eb7931013c5279fb5db2a8383da90da03df12f291d6c7e5c0da14987311efb10cec017abf201fcf0e299141d079c316447ab8234 WHIRLPOOL ce02272125ee84695d786dcf3c66ac89f56deaed2076dd00e35a997235ca32b181257d80246f20e0e26b6983052b490f0507f718d58f164549991a940e1dd598
 EBUILD netbeans-webcommon-8.0.2.ebuild 4723 SHA256 e2ba39cb6f22c990acf9a492eac5707f130382d56f9bc1e3636e82cbe4d61938 SHA512 61955d38f829b3ed54bc5cb9a71da07f05676a2bf7219fa8073aeee0f0e2d0e73f7aa6ec1636be39fb071d3d2b9de7ceb813a247a61961874f4cc78697d4e568 WHIRLPOOL 1a272650fc2394716a790b79cb85a9322929c7cc96ea4776cc639fb869c5b536140dbdc632b1a8aa9cb1fc8e740050125c2ebe9390de7a8f4207e88e24924206
 EBUILD netbeans-webcommon-9999_p20150901.ebuild 4991 SHA256 6a58d046976202f9630b42e133fac192593354c8620dfca0bc5f6d5eefb41b63 SHA512 c7d0da7bf9bacf40c8afc1ee6543749b0f30969abd398bddc9109f18e29f93416496d0e31c837358412f1de192953972b3a4ed7f709789dd6abcff9f63b871c6 WHIRLPOOL eb9eefc3b2fa66241f1035309856f3b68c3373cd355d3d275b5dae7bef26d53a93628863b081e4cbde480371dd72a037ce275af31947069fce424c563866e267
 EBUILD netbeans-webcommon-9999_p20150903.ebuild 4991 SHA256 b12f68d20eb276d5787e83ba650885835308517e4de0553dc4bf16487ef5d974 SHA512 5f4fb009a589c9bc36a2908d16009b6d72f476e5fcbea52fd21385448a58335a033ad3e58a410173c0ac029e892db0d2ca2081ae8bd16bed98b62d121690d237 WHIRLPOOL 1deef8a500b05468cf6f3c2623cc38eec880bcaab1dae9ab51ff4424018465db71ed37c7146b289451558d54d858f4246ec3cfb80feecea0e1f42306c105b4a4
@@ -23,4 +24,5 @@ EBUILD netbeans-webcommon-9999_p20150904.ebuild 4991 SHA256 6e6633b309145779324f
 EBUILD netbeans-webcommon-9999_p20150905.ebuild 4991 SHA256 8c375182027b28ac6e9edd25700e46462c14cfe9a2cf9c647e35ed35ea6016fa SHA512 de8380efbc22d8989e286c98096eb76a4e86d4ba37d6cdbc59b0b021f2f9bc0888cf1db1dc33f6019655904d476522883cefd78befe507fb057dee4ce8982d7f WHIRLPOOL 5cb5ea2d0d715e5ff14f4f00ee0ee3dbc399d263a70a0919a2e80fa4ee5d734bb442f5404b16893a820efd792bb4ce0fb5dbda99f7d9a139e0cd7c38f3436351
 EBUILD netbeans-webcommon-9999_p20150910.ebuild 4991 SHA256 b00aad27e00cd0900fbd92139350f13689dae966abce2bfef9400f19b6c3a837 SHA512 69331453f497f65d63256d68a660e6a870a2ad4ba55d0df35a6b53343c75c9efcbc6c2b06d527caf2bd3d9095cd8f177e345c09e4c9182329971d599658d1997 WHIRLPOOL b7a22ed49e8db0f81513a3f1ca51b95e33ef7ca9963b42e0b6038b0e7d5e673bd9ea6149cca8feeddbcee84f11de5e76795f56e0ec9039813b69418b90d16f53
 EBUILD netbeans-webcommon-9999_p20150911.ebuild 4991 SHA256 76802501ce512eab2fce0e30705b615739d480d7cd749f0ae6e84c9db386f5d6 SHA512 9101debfa7fdc847d290259322ceada8ce780fc65245773fbbcf07e39b84f5fb3afb8635440d510045cb7a561929353c96c0850039068c843d7d77be3bc1a69d WHIRLPOOL cf97886f0a14ac02e4b83a907d8b23f9c432179a9c9b175541af06cb2f75852cac3cde8c565bc04533b6e95e4c00fa717ae7bfde24b57c6395a8929ec9f39c95
+EBUILD netbeans-webcommon-9999_p20150914.ebuild 4991 SHA256 effe63f53cba64c97aa72a551076e34370fc9c828dd714532f49d53de98236d6 SHA512 b9387c353e55afff01908a5215806a4ea00d84523f61dd61d546c62a3eb2cf16b23d9b55558dd3bf5d2afdc789c79ad92329189bfd8f6a61c2578ba70444d5f5 WHIRLPOOL 7f86faa1190f131fa6496a2ddfb3fa8ace8b59f76a834f6b5aafe991530ebc6326c67610f605888d490894a47908a627ffaf5126fd7f23b896732add9a26f3ed
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150914.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150914.ebuild
new file mode 100644
index 0000000..3a34ae2
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150914.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-09-14_00-02-28/zip/netbeans-trunk-nightly-201509140002-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/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 4c5afae..77de07d 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -7,6 +7,7 @@ DIST netbeans-trunk-nightly-201509040002-src.zip 208956475 SHA256 4cc75f6e48a660
 DIST netbeans-trunk-nightly-201509050002-src.zip 208961273 SHA256 0e4ee8605bb5933ec079c7bc1a597d00cecd76d589ea27a1612eb51253d2bf17 SHA512 d87f0251d65b3c44468ce3da97b3a9f077938da2eaa08c7afc887dbcd0054cad88840a1c12e553ba5100ebe4e272f0a89503a694ae3329952102959a530f70fd WHIRLPOOL 9f1409fe6b8775cfaa64af217fbf88220c8307ff4b169d694f431cbaaff3b46bd7f0c3a97654706e0c949d01d0a61515daef679ebea6012b56da3af7af0ac01b
 DIST netbeans-trunk-nightly-201509100002-src.zip 209128741 SHA256 5d5a40a072eab70857662787af171f4af2a73d866e122c465618914c851e790c SHA512 c40b93171efc0d42e84d34d437c15085189078d51a99be10e63a813a9e7ca9451dcaba6748344e585cc444903c29a56fb1a78c43545136910c000accf53dfe83 WHIRLPOOL 033764680db1d66360e33286c05d58e33bf0288f09e2caa9871beee1d727047b8af6a3de079c595ca508f89f0b29ae4aa96298bd4be5cee3b77e32f9759cb527
 DIST netbeans-trunk-nightly-201509110002-src.zip 209149212 SHA256 9833b3b5804a16062972c36bbc1af9ae9445f7313884195e6ac0935a43182b98 SHA512 2ba867e3c5816b08da70cc9fe5a697ae68d55b3eb28ada6c6b9364dd8828a1f16122dd57f7556113d93b4af034f4b6a0aee05d79336e18b9a8f014b86eff448a WHIRLPOOL 21026c2040e6b6d843308065fd6409ebca28a013d8166d19260888beca80dc37f50e3a327cb059f92803591a23a9838484fd2b1fee78fa3b37b378a495bda782
+DIST netbeans-trunk-nightly-201509140002-src.zip 209159147 SHA256 cdcaeab5534f59320d499b5e84f1deec2863f605ccf4f7be5ced8415e0e3a70e SHA512 0a40110edf53330612d3d586eb7931013c5279fb5db2a8383da90da03df12f291d6c7e5c0da14987311efb10cec017abf201fcf0e299141d079c316447ab8234 WHIRLPOOL ce02272125ee84695d786dcf3c66ac89f56deaed2076dd00e35a997235ca32b181257d80246f20e0e26b6983052b490f0507f718d58f164549991a940e1dd598
 EBUILD netbeans-websvccommon-8.0.2.ebuild 2651 SHA256 a195b307847c466dbb5f46eb04240358ce3c92cadeecb8fda1562304de46820f SHA512 933626bd2073f58e3508180c042e237b9e61ba6f3c992cf37ea43978ac2fc972d2dcc3ef0b5c390b3867296e197ed2605c43452c98e36acf0982e7338b6d1eb7 WHIRLPOOL c3db8f0b50116d0129f50778e1961166e76601d8c165e20e73d75c91b02c8a095067e0f13e18178d849dd29adcedaeee7d3e0e62f99be592d7ce159fd6af632e
 EBUILD netbeans-websvccommon-9999_p20150901.ebuild 2721 SHA256 1b1853b108ea504ea98052027c51e2ab8e55853bc016e1b288f7d5fdfa937ba9 SHA512 f914e9d3d8060c6740ab305233379a6c5cda835a09d1ad9c2d5e4a37fe7154f560899b4dc4e375b4a1d8b724102b522eb02529d65ce562afb914cdabbeebceff WHIRLPOOL 2eb7a4627b93b6bb8bbc033a6e941a64452a5c6377e28b86abcaca6b6be76ddec7df0950e7ef5234f5e3d6addb3dd191cfa00f6fc18b4442a2d7c1e6b27fa19b
 EBUILD netbeans-websvccommon-9999_p20150903.ebuild 2721 SHA256 5b548eaf95bd714f2b32bdbf189f8a5967ebb9ff9f4472b7dec07165540a4bf2 SHA512 d4e19899b1df32711eb649b10bb66ee7daeb463ce87bf330f3405e02788e7acea6a8573aacd2f17c5e09c93762e627dfc88b1f331c40280761cd0bd1d2b0339c WHIRLPOOL e6914d11ecf33f57de66f4bba5f8689f0ffc0ff40df29ec98cc6a0b731cf7c73096124e67433205a3fafaf744cc8b9c0a0361c905be1823b0dbde7e85bd52a66
@@ -14,4 +15,5 @@ EBUILD netbeans-websvccommon-9999_p20150904.ebuild 2721 SHA256 71946d71ff2214b1c
 EBUILD netbeans-websvccommon-9999_p20150905.ebuild 2721 SHA256 8c3627294310a820630da79b063c973b8b8c45a61936bf51263591941587f045 SHA512 a8e65a4094e542e1ba55aa800394749b121a73324816d8279b86b4bc10033ea6713a7a0c5d40321974102bebbb7b26e2d38c5ef8b4959702cb5916905c0490c2 WHIRLPOOL 9880aa66f43b62da2b289273c0a43a508181df74694850c6bbf30b603612142e93f3955cea1a717567ae572cb8623d0a29deeecf1f6466d0e6262ef45a4fd068
 EBUILD netbeans-websvccommon-9999_p20150910.ebuild 2721 SHA256 3fe5e0f18c2eeb76aef1dcd08f4801444284c2fcec484b32e527f3e3a4b99d21 SHA512 090e755f1f35fc94328a948635285c46551267986d744493d2a9e60e8f0bbcea458cb311844beb383821bede3883dd94c657e585880eae2621fd9a6af771335b WHIRLPOOL ddeea47cd78dac2d720abf63929c41a62341e57c618ff5c5b48d50284645cc8e1b0b7d22a709d586ef43d69cb4311218304b5b00f685a0a1c60a4949fb0d46df
 EBUILD netbeans-websvccommon-9999_p20150911.ebuild 2721 SHA256 7517e8d0862e30bd443ea108b3c705bdcd527af02c0c2939ba9a3ab5bd1204b5 SHA512 53ed1c06586bd32c294f5dc2667f2152bca2e4973327983fe37c9e9ce4fcb3125a827d2becdfe59090cd00ae068abcfba1cae209bdc47fa2b5c6b29d7834c6da WHIRLPOOL fae1d5bc686bfaf78903cd1b8b210b6c6a8cd4baa933a07b38cb4c7e9788c1d9b6d09b47360818ac35f6699001c306b40e2a36a242e98cdcab19647b119014b3
+EBUILD netbeans-websvccommon-9999_p20150914.ebuild 2721 SHA256 41de18c1c6beef6483dd0059ae110ab4daef1a6072695a9e6076567a603d0ab1 SHA512 43f23cd5773be7a6e3d2859ce4218271510bb6318adce194edb90fa342e96d89221bb5edd381985dd7dc1ab5d7c3cee02cf0cb72c4c840191fb59c9ab77b2352 WHIRLPOOL e09384741bbe250f95b231eff35d645d77788a7c425909261db2fdf780267d2c92d45fe63583e37f4b086c767a32b1ada38e28c3884b5c4a7e84d8bb2d76c5b4
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index f12edaf..a1affd7 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -9,6 +9,7 @@ DIST netbeans-trunk-nightly-201509040002-src.zip 208956475 SHA256 4cc75f6e48a660
 DIST netbeans-trunk-nightly-201509050002-src.zip 208961273 SHA256 0e4ee8605bb5933ec079c7bc1a597d00cecd76d589ea27a1612eb51253d2bf17 SHA512 d87f0251d65b3c44468ce3da97b3a9f077938da2eaa08c7afc887dbcd0054cad88840a1c12e553ba5100ebe4e272f0a89503a694ae3329952102959a530f70fd WHIRLPOOL 9f1409fe6b8775cfaa64af217fbf88220c8307ff4b169d694f431cbaaff3b46bd7f0c3a97654706e0c949d01d0a61515daef679ebea6012b56da3af7af0ac01b
 DIST netbeans-trunk-nightly-201509100002-src.zip 209128741 SHA256 5d5a40a072eab70857662787af171f4af2a73d866e122c465618914c851e790c SHA512 c40b93171efc0d42e84d34d437c15085189078d51a99be10e63a813a9e7ca9451dcaba6748344e585cc444903c29a56fb1a78c43545136910c000accf53dfe83 WHIRLPOOL 033764680db1d66360e33286c05d58e33bf0288f09e2caa9871beee1d727047b8af6a3de079c595ca508f89f0b29ae4aa96298bd4be5cee3b77e32f9759cb527
 DIST netbeans-trunk-nightly-201509110002-src.zip 209149212 SHA256 9833b3b5804a16062972c36bbc1af9ae9445f7313884195e6ac0935a43182b98 SHA512 2ba867e3c5816b08da70cc9fe5a697ae68d55b3eb28ada6c6b9364dd8828a1f16122dd57f7556113d93b4af034f4b6a0aee05d79336e18b9a8f014b86eff448a WHIRLPOOL 21026c2040e6b6d843308065fd6409ebca28a013d8166d19260888beca80dc37f50e3a327cb059f92803591a23a9838484fd2b1fee78fa3b37b378a495bda782
+DIST netbeans-trunk-nightly-201509140002-src.zip 209159147 SHA256 cdcaeab5534f59320d499b5e84f1deec2863f605ccf4f7be5ced8415e0e3a70e SHA512 0a40110edf53330612d3d586eb7931013c5279fb5db2a8383da90da03df12f291d6c7e5c0da14987311efb10cec017abf201fcf0e299141d079c316447ab8234 WHIRLPOOL ce02272125ee84695d786dcf3c66ac89f56deaed2076dd00e35a997235ca32b181257d80246f20e0e26b6983052b490f0507f718d58f164549991a940e1dd598
 EBUILD netbeans-8.0.2.ebuild 7167 SHA256 80e31382a0ceb680c2a055dc5c78c1dce8edf32c50bbae6a1c14a2c568492519 SHA512 0ab466ca247ec953896ef0ab3b01b43ffea3a9f37e9bcdacecfc0476226d45cef35e4ddf27f2b85628d9512ed304e6cc6cfe963a5e547217d08cad400eefc4b9 WHIRLPOOL d09668e669f4f8d7987ab02cf26104fc6e54ba29b8b497fe0013cc8816a2d7560c99e6e1b02db77ead872d5240b84c09e3fabbc3465587d1d1ca7d6fcae114c1
 EBUILD netbeans-9999_p20150901.ebuild 7210 SHA256 aa601ee01f6fb1485234688933becffe18ee2d30af5045951a2bffc2f24f849a SHA512 98f00da7d90c3425cd718c34d65aa46980a9c10f50dd34a01a1776d1a1488e92b9e657210f61e45724b6c9358a36a44a2fbf8ac5b7012012d163c6c91f7ec421 WHIRLPOOL 008820f5bbb9077bc739629262c1e24bbece9c55b50c270c76c3900424ea77e0dca4a33bdf32535b506d61dacd951f65d669485321837dd83234404ad9143594
 EBUILD netbeans-9999_p20150903.ebuild 7210 SHA256 73a22280e3cd8d717bb224ba8c243faa59493011739522863e3e93b83def156d SHA512 87214a421b60dbe51dd45b0124ba463585096fe7f7820fa48e0cbf7d55b3d3080645ecd9dbd4679d7968a9b90d1ed60b88bbc3e50109a00e3c2a7ea8192ef0b2 WHIRLPOOL b820124da7676168df3529566db7b2ca095972189a1ba848da238caae7a93947c0c664af310edc722146d2daaa9fdab9bbcc5b3477207664a5193c003f289c09
@@ -16,4 +17,5 @@ EBUILD netbeans-9999_p20150904.ebuild 7210 SHA256 26e7f917eab6ce7ea1fb1d6feb75d0
 EBUILD netbeans-9999_p20150905.ebuild 7210 SHA256 580c06c4afbee145d0c2606224b36fef691279aeacc3787470e2ddac42813623 SHA512 84ab7e983f97e210710002fa21645582360b1a3ce645dab2c1487543a692318fb8a23c4791e7dde645b7f81d527a1c75283945a3c6a80ee878b87470fcd882f8 WHIRLPOOL 9e521e648b657653bff5af79932c76a4e8dea05dd023e7daf0562e94b2c24da6ddfd0c15d57e94f9c1ade67c1081f9386b50b368a201e1daa589d1273df5a140
 EBUILD netbeans-9999_p20150910.ebuild 7210 SHA256 e5dac39a15a3bb96f96b40af22168fbeb9791c8d3a4864aca7329b08259ee014 SHA512 0badc6158b0acb2b2b519392e7c55c32c96fc8d8444c2ab70d649ed7ab892ff240b067e722ad79ce1fa909f888858c0ab9a093c7b15ffbac1e120b72b46f50ad WHIRLPOOL b925a840cf164a6520b08f7009b26fedf9b0cf68390858637c2c45e62cbc122ec91f8b08e017a8a9e62499eec85c5020e3a2ecf66a8fa7ca9a0673af1a3ffc9f
 EBUILD netbeans-9999_p20150911.ebuild 7210 SHA256 3d56378edc3b701678b54a30a7867d26611e93fe4c4878b8fbcad2cee5f09dab SHA512 b8fd891ab8ad0fe2aea15c09adb6a104f8424b6e6346473d7c8e0d9eed4a8d01fb03d71c412c53034611ebcbc3cb08c3de8022853d4e2edd6aeb3a9ee0185775 WHIRLPOOL f63cb3f16acbf71ed53180fa5179c2dc12dddd73fcc658faad2b7291975dfe7a61b0765447b78ebcc97ed7e33b2214bdbc403cd9b06579102d90b0b93fc32243
+EBUILD netbeans-9999_p20150914.ebuild 7210 SHA256 97559b1aa14f762847a1866723d6fba2265203b61f390e3481c0cd68bb0a654a SHA512 12555ef853b5f47fb74f6c1974bb2f894f3d82897d980ca5fa5d1ea17273a52db382cccf3b1b0b80a97f870c5622d750f0dcc4da30b87153749630bba797eeab WHIRLPOOL 30cd5c2fcfca12b002115631d708dac0330ded807dfdfb5fb38d5dda9a275d204e5dab59745fbf95aec218acdcadf95b9408fda9e440405d4c10a90e1961137c
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

diff --git a/dev-util/netbeans/netbeans-9999_p20150914.ebuild b/dev-util/netbeans/netbeans-9999_p20150914.ebuild
new file mode 100644
index 0000000..9bf6296
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20150914.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-09-14_00-02-28/zip/netbeans-trunk-nightly-201509140002-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] 3+ messages in thread

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-apisupport/, dev-java/netbeans-profiler/, ...
@ 2016-09-04  7:12 Miroslav Šulc
  0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2016-09-04  7:12 UTC (permalink / raw
  To: gentoo-commits

commit:     b2bc34987547c42cd5645f3e37a0effb9e8188e4
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  4 07:12:26 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Sep  4 07:12:26 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=b2bc3498

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.3.0

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 29f46d2..b8ffe65 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
 DIST netbeans-trunk-nightly-201609020002-src.zip 217296178 SHA256 6632afeb1d3fb3cf91648945d03703b474ac9ee5d6855f6a4732bd6c711c1d9b SHA512 bb9f63963e2895c46a0869fd48e401c5d14325e63cea951ddc6385f88dd6fef8385783432f094315d521fcf8795f28997a13fea249e957949f1cc021827152b7 WHIRLPOOL 64aeace6080e9fdfef49484fbf32665a1dee2bd0c597dcbe0d22e5aaf486d45e7f1919cb826b0273dfca780b80d9e19de616b638ac775190b1493a262c269d81
 DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0ecac361b9c3fde36c0680843b36b13edee0c77c82ce82de1fcb SHA512 4da03b4ec722bd3ce3453e1e9e9753f1d7ecf48bb15b3550270eff8748e74765c1dfe3af9e5eef7fec036d352d513797b0619042d76537b8670b55e29f52340f WHIRLPOOL 8d036a278c24075565fdaa6791f04a2cd413f5370c77688a225dd618bfa14c4a8926639b9077c5526084edfdf35de9aac4126fa62af633306e4e15b4985d0065
+DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 3384 SHA256 f0e45793d8d2a56949aff7f0239c9f63dcedec497450d521037281b52c699ee4 SHA512 ef21d03f27c1df2f86d7d8fd2bc08d4e98d13daa6f14d4ddff305c608901b810612d83247c737a2bd7b961c63d9c803801c29f2db67b7537a9b34cc1bebb4013 WHIRLPOOL 501c684661f3b3aea7935b3435d79566fbcab25b2320ab85e9221ce8bee620f5afc04b000de1ed0a465981f1514418e79523be9c7e807257ddc8a162e426dced
@@ -53,4 +54,5 @@ EBUILD netbeans-apisupport-9999_p20160829.ebuild 3384 SHA256 6945ea971f3d7a987f0
 EBUILD netbeans-apisupport-9999_p20160901.ebuild 3384 SHA256 510bf247897091f2ad67b95928d5a23f8288a94f876cd96fa4ffb0526aac2ef5 SHA512 67f635482ff8cdcabe3e5e2f41f6ff3f4222de79ef4cc9dae6603ee4ae047728350baaaa35c056ef7de960178c9f73cbcebe377fff5a5afc8feaefb27b4cda53 WHIRLPOOL f3b2c08334b0a0c0c0d1653ee3f62a4de7093c81d54c77d1ccb47c992b9f9664542da94007fbd2210aa32f0f1656f577b1359b64985786ce72add2268700b3bb
 EBUILD netbeans-apisupport-9999_p20160902.ebuild 3384 SHA256 ea015bfc03cd3451c658cb88cf408524edf5f2370f5b703c1085b0ad078b3b0e SHA512 31030438909a57054a5a368ddf8618da0ca6fdc31cc21ced82498c97acfc762968e018fb8de1433e9d954ece83741ef8ed17570b3cb5199e8ff06116fd5784e2 WHIRLPOOL cdcb4ecded324d70590998d2bed8ea62219692079b55081331424621d3cb5a44d1052cf7cf75f905f0197612828bebd8d084cd15b38faf7ec57e68377767e3c8
 EBUILD netbeans-apisupport-9999_p20160903.ebuild 3384 SHA256 e8c8f4daa3ddd7732589c198bc58f5282d00d79e28807f66df664656d1ade517 SHA512 83e97b6ce7a61f33d590dcae7d1155f1c46e435a7a236c4c072c8e81e14247e65abe3e6f3ebec50c6bf4656f7fae8b6f1d49fdca3271278f0416b53aa6d6f4e0 WHIRLPOOL c3845c95696added615ad78ad19b40d8db5c5cf2a44fb158aea79f50050dfff2a5c0f3197f19cbbd60469b52381405d26d7e0a4bcf4885707b19fbfcda60e379
+EBUILD netbeans-apisupport-9999_p20160904.ebuild 3384 SHA256 16b8a6404d905a2f737494832645bcdf76498f0d5c9f43b8f6774a691be8de10 SHA512 84b187c7521843e4f3f3a0340e0e7c880e8ad5bc1b7ef0dfeb44700d9be19112d28c2d1c1f9c482bd33f182dd2c3aef245cf77814efca00269809a89952bbad8 WHIRLPOOL 99f9b4c9afb1b82c9cf98330b19fc55d0d00d1d658ccdf51e7b628abc00d90f6d7ab53cb9d8dcd43a24eb26307d4961f0efc07622687cc6353527d15a93f891d
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160904.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160904.ebuild
new file mode 100644
index 0000000..30ad011
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160904.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-04_00-02-33/zip/netbeans-trunk-nightly-201609040002-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 cadec67..516b169 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -4,6 +4,7 @@ DIST 371AD978F940F80738D147BA611D646BF82538A5-clank_0.3.6.zip 11434036 SHA256 e9
 DIST 43A82EB3CE61B9B0B1C60586C7D84729BD5BE3E0-cnd-build-trace-1.0.zip 38904 SHA256 d97735f723292f9fe534d0821841370ee3a14a577c3fc959078ae865c16201d4 SHA512 ae3b1865e32403c09354fe9bda5092f88bdfc9bf36c18f21dbf4cccbbb2874881aee3cadea039860a3ddc5770b9ba95201faeb13ebcdfe5a403fee12e8935852 WHIRLPOOL 8a5f7ff0b4b94054a0fcd7366d37f6cc34f3c5e90d94172447993b9bc06753e13d57fbb2d2c14fe2a4ca5b15285b5165fc7f66b6012710669878cea67c6463e8
 DIST 4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar 164365 SHA256 8633aa79a2566f51a089195e09a4581af3ee71bfc13eb234af5e0cf6383078b4 SHA512 f1300e2d1e47659f6113a0a3dcc953766b5a8ab32f13bedf4d6ac652ffcf828c17474d47edec08d7ad9039d7abb8570770b48fa53b8ff6b47a028836490777bc WHIRLPOOL 765c87803d9cf622ae7936cb922ad9bff8823a09baf01a6c8b4a81df8ba5fd7cd17b513b36da9910b75349de45185f4641680f35be8335e08b9c30283b6d3345
 DIST 5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar 2388361 SHA256 9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7 SHA512 04be4dfba3a21f3ab9d9e439a64958bd8e844a9f151b798383bd9e0dd6ebc416783ae7cb1d1dbb27fb7288ab9756b13b8338cdb8ceb41a10949c852ad45ab1f2 WHIRLPOOL 488b7b9af1d1d06cca163d43e7be190730e2f0421796c21a26ace11196ee37a16b1bdeea78a1e2e64f8ca0e87f67a2aecd066af21505f3dd92dd76de40a94fa0
+DIST 5E0E2BDEFE842E63FE33F0AE4E877426CBBF306B-clank_0.3.6.zip 10988320 SHA256 7cc09c58251da83b29f70dc0601a561c8278e12b33dc741c3cad7e5b1e74bf3a SHA512 6712aebe0037f0fc96ded9ae948ca63c06de7a2c23e4c60eaaad78ff71fa89e9a70f374d94cdec08a7915df0f7e8b7ea2fbfb0aa71a1feac96d36e65284ced90 WHIRLPOOL da464c2e4063fead2465da36e5248606cda13ccbc562526044c1aae3806107b78be2688b8277c0c49b036c19e04981e213a5de2ca5b13b17c27a5e8368bcd2e6
 DIST 99529DC0E1426A102A98EF5494B6F6AA6E497F62-clank_0.3.6.zip 7930942 SHA256 ad9a64303fc4db833d2789a7d5b0be537ea7db55090189411e5778efff54a8a6 SHA512 46d91f0cbe86af186b87e6b972ecc9391f5b2a670eaf7238b60bb5399c0da40382c729338d1e2cf8ab94eb4ac64bfe9253da1cfad2ec900a87d56df4d299d707 WHIRLPOOL 52ab6b35eaa04d0e375bc4aaad43c4390021309da1956e81db6ba4fc8730da147f35eeceb8a02fa7e42e315296e8be3eb03d88d7d8987fdce30ec433ac5c407b
 DIST A22324F86EB1673E0D54D0FFF5C8047FAED4A2BA-clank_0.3.6.zip 11611624 SHA256 9aa63cf1ae6ba132858ca3f529ca8481e35efc7cb5b9b5177440ef13ccd31122 SHA512 cdf15d8a1df6c3df4f536fc962ec4a4dd6439fd4cfe5d68bf1cacf53378711454ba76c9398cbc3563f84e7be344de0715041cbf6d6e7c0e76523871ddafa4c02 WHIRLPOOL 53b2135b1b2203a8c568994efd8e2f95136833732e4799bef25077f5d73ad4c4f84b28abc17e39db7807de0484654caeb1004c5ec021bd654ffe9de45a64bc61
 DIST BB83D4F8047D608858154CB041054F5CAE35B903-cnd-rfs-1.0.zip 177647 SHA256 c92c3d3311b8f75883f4f9280fe8d6932b154c67c9dd1bd65a49beb45e578cd1 SHA512 c42e4f0c1b7efb24a45dc375180bfc8b0e02e74e01233665d3e74bf83a182c2b0bbe8b572a8eeb993d77312f6d118777d0576adfca4ea8f4c2cfe08892155345 WHIRLPOOL 41b573c7ca4b926333f28a9329a2423955055ff716e7be03b7a6f4714e7261e57574b16a0e89b96ae744dc0a36f9a4a72f8d948b11a6b8052159d42cbd40876a
@@ -39,6 +40,7 @@ DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
 DIST netbeans-trunk-nightly-201609020002-src.zip 217296178 SHA256 6632afeb1d3fb3cf91648945d03703b474ac9ee5d6855f6a4732bd6c711c1d9b SHA512 bb9f63963e2895c46a0869fd48e401c5d14325e63cea951ddc6385f88dd6fef8385783432f094315d521fcf8795f28997a13fea249e957949f1cc021827152b7 WHIRLPOOL 64aeace6080e9fdfef49484fbf32665a1dee2bd0c597dcbe0d22e5aaf486d45e7f1919cb826b0273dfca780b80d9e19de616b638ac775190b1493a262c269d81
 DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0ecac361b9c3fde36c0680843b36b13edee0c77c82ce82de1fcb SHA512 4da03b4ec722bd3ce3453e1e9e9753f1d7ecf48bb15b3550270eff8748e74765c1dfe3af9e5eef7fec036d352d513797b0619042d76537b8670b55e29f52340f WHIRLPOOL 8d036a278c24075565fdaa6791f04a2cd413f5370c77688a225dd618bfa14c4a8926639b9077c5526084edfdf35de9aac4126fa62af633306e4e15b4985d0065
+DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 4790 SHA256 3f49046069953d4fb2f708fe39dd5e779d94084591413fc1e14adfb1b41ae8f8 SHA512 31a7baefa4beab6f131652c482160bb97d5fe24e1ac5da2caa5d6ac665ce32a2047d140143d8f4e1a2ebf8ecd85958ad8b1057ae2aefcfc7c42aa0f10cb40430 WHIRLPOOL 1fd17c62a11782e5937093b01b327883e7ded5ae4d6e5d8df562dd1a98f69501d0ea4650da53dfdf171719aff53fb95ca84b2295f0b56fc53ad746f104097d1d
@@ -65,4 +67,5 @@ EBUILD netbeans-cnd-9999_p20160829.ebuild 4790 SHA256 f7746423ecd033715e809822b1
 EBUILD netbeans-cnd-9999_p20160901.ebuild 4790 SHA256 10294fbb52396e0c50d7fa3e91583141798e0193b4ddf2e3a4b888ddb3bfed3e SHA512 bc12f02584a4f4cdb9d9b134f7c0b6233b714134316149555349afca3c7f14532321029175c6c185ff997a69f17eab40b794489c4c5b2fba2189b9006ebfeed6 WHIRLPOOL e1f4d41c146f3663a612dcfea0e2d325240bf86f7928ae994d9fdf5e73972c2802eaa0fdb4b7c4fa4d0d98a7c391218716158f4cb6cedcaad8e11bd42960995e
 EBUILD netbeans-cnd-9999_p20160902.ebuild 4790 SHA256 7508ad02d49f67929fccbf31f15a1bc0f711edacdec9d5f9597575c62edd18d3 SHA512 60b61a8874f34349594cbcd8542596de1127703d1e993918042195c5253c954d346e77eff211fa1e7ea8ba78a9ffb5362c678df4c8851b60ec6c96f7a0149df4 WHIRLPOOL c5badf22cf9c37f48b20b3cea2b2b66bca90dcec5771f1ea625ddffddbeaffde6c7fdaa6b0b4e977860d2f3492667040885e36c24fd19a118a11fe11b18ac18f
 EBUILD netbeans-cnd-9999_p20160903.ebuild 4790 SHA256 cab4797f73f63341309b8131384c49088410d2700f2299802745f4187b65d55d SHA512 4d82487340faf575203d41901f438825357c08c7de4e847a0e3af23dd7d98f93b37cad15bc248b3a227cd1bdee86af90812706c86e40766673c8311e478d1688 WHIRLPOOL af97ecd2c765f4f29aedc334f16ce47b3e2c66493b385a52f82afdaafb3afa19e87a554ba5b8c24957c7b7d76c772504d185d85882d6ca155285f44b80444b74
+EBUILD netbeans-cnd-9999_p20160904.ebuild 4790 SHA256 101ef2bfda8e2f6e447157190d188fd58c47ac54e7b519e0a55a31c065d4d3e0 SHA512 81aa4b3040721c0395886f14ab1c451dc2b37f4b543943a66c58278e5c3652622dc97a977247f0b1b509c663799caca89738ebba21a811f2de841690f34393a9 WHIRLPOOL 1eb2b91f3bab71b743d3fc52fd530a90d8153cfbdde32905a733f0be7f9e42a0c17c228acb00681ed694528374ec2f975ca53df1fb83ad3acb68ee1d58d101cc
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160904.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160904.ebuild
new file mode 100644
index 0000000..51e4552
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160904.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-04_00-02-33/zip/netbeans-trunk-nightly-201609040002-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/5E0E2BDEFE842E63FE33F0AE4E877426CBBF306B-clank_0.3.6.zip
+	http://hg.netbeans.org/binaries/43A82EB3CE61B9B0B1C60586C7D84729BD5BE3E0-cnd-build-trace-1.0.zip
+	http://hg.netbeans.org/binaries/E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip
+	http://hg.netbeans.org/binaries/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+# These files are for remote development and debugging
+QA_PREBUILT="usr/share/netbeans-cnd-${SLOT}/bin/*"
+
+CDEPEND="~dev-java/netbeans-dlight-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	>=dev-java/jna-3.4.0
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.cnd -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r16-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar libs.antlr3.devel/external/antlr-3.4.jar || die
+	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
+	ln -s "${DISTDIR}"/5E0E2BDEFE842E63FE33F0AE4E877426CBBF306B-clank_0.3.6.zip libs.clank/external/clank_0.3.6.zip || die
+	ln -s "${DISTDIR}"/43A82EB3CE61B9B0B1C60586C7D84729BD5BE3E0-cnd-build-trace-1.0.zip cnd.discovery/external/cnd-build-trace-1.0.zip || die
+	ln -s "${DISTDIR}"/E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip cnd.remote/external/cnd-rfs-1.0.zip || die
+	ln -s "${DISTDIR}"/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip cnd.modelimpl/external/open-fortran-parser-0.7.1.2.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.jna/external jna jna.jar jna-4.2.2.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-dlight-${SLOT} dlight || die
+	cat /usr/share/netbeans-dlight-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.dlight.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/cnd >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/cnd$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	fperms 755 bin/dorun.sh
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/cnd
+}

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 0f9009b..42fc92f 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -1,6 +1,7 @@
 DIST 0F89C62CA701D20BA9A9A526D4D017888C3B5A65-fs_server-1.0.zip 469579 SHA256 2673ebd340ac69ad5dfed6f63376394cab2cfb094f249552092c0bb46e093367 SHA512 0a73753c62b44b5f1af14d9e25086fd3420129b4ce31bab0c3786a91ac180af23dbe93e13ed3368e968076933a9a4e5d242ac7a911a7b39da3f3e4da40876b2c WHIRLPOOL bc74461dac822bfbc947b9ea3cb8e4183f026954d9f82d7b38feb8bd24c5302784d567373871a72d4177f6e9ec84018624e9069c9b49105eae848e1eb2eb5375
 DIST 457A4C66AE33D1D5887BB1F359EEA41A10EBB2AB-fs_server-1.0.zip 283369 SHA256 2da5ca58d9960bb19f3b573709c0f73a408cbd94a19e89abfcc261b85decf9d2 SHA512 60a742dad5967c2eb5350d62cfc39925a4413fc4dc904ebdf1e6a04849a4f659dc75ff6166189957854d1241badc0bc0925aa868509d96495f41f4d91565a545 WHIRLPOOL 27e8e1219ee65f87b4cf0a24ac9955bbf65e33d4cd2315bfc9c157b170b6b9eba1d703a72a4a1a2ae05462b6c8c99b82b1e908362d65bfc36685e2c1ccb75b5f
 DIST 51AC4960C19CF4C2CCA636765BFBC09A5029BFC5-fs_server-1.0.zip 453773 SHA256 9b339678aac261dd2353a4938be897eebff43c34a532263cc0c827743cd4c1b9 SHA512 ea965ed488fabe8bcb93e4b95d3c7e6f546cd8a30ec57b0268645e8270097308be9eaabeb524c4401baa78922d6a782021b46042bd44236e19ae8c94ae2e3a02 WHIRLPOOL 9044f2eb2cca1205266b065f6bf086140a33acc33b833b9e367b5f888952fa786a58bb29cf0947a863caf3c00b60fe418b8a248a06064197703d230c2374b358
+DIST C9EE1ACA53AA71183590274D658ABD0A6AD6B2BE-fs_server-1.0.zip 474895 SHA256 1fe42f73ce252cac72f7b73f381390398b7c86ea904ae12750e73dd9f4ad9923 SHA512 2d870d280eeab161c941a63a3b9fd43237ed83e4bfdd9076195685d6e7f7c1c72472e2b16141498e5ce18e0df4ca5924e9986cfc774ada2d703461f6e2226ca7 WHIRLPOOL ad0727596b8efe9b9e702fd2a2373529a2c350745681a2a237a8293ccda5592aa2366bd83504a83ba24407493d115b6f13b73ef231a68b94c11a4ff097e227a6
 DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
 DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
@@ -30,6 +31,7 @@ DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
 DIST netbeans-trunk-nightly-201609020002-src.zip 217296178 SHA256 6632afeb1d3fb3cf91648945d03703b474ac9ee5d6855f6a4732bd6c711c1d9b SHA512 bb9f63963e2895c46a0869fd48e401c5d14325e63cea951ddc6385f88dd6fef8385783432f094315d521fcf8795f28997a13fea249e957949f1cc021827152b7 WHIRLPOOL 64aeace6080e9fdfef49484fbf32665a1dee2bd0c597dcbe0d22e5aaf486d45e7f1919cb826b0273dfca780b80d9e19de616b638ac775190b1493a262c269d81
 DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0ecac361b9c3fde36c0680843b36b13edee0c77c82ce82de1fcb SHA512 4da03b4ec722bd3ce3453e1e9e9753f1d7ecf48bb15b3550270eff8748e74765c1dfe3af9e5eef7fec036d352d513797b0619042d76537b8670b55e29f52340f WHIRLPOOL 8d036a278c24075565fdaa6791f04a2cd413f5370c77688a225dd618bfa14c4a8926639b9077c5526084edfdf35de9aac4126fa62af633306e4e15b4985d0065
+DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 2968 SHA256 c4fd510f32e35649b9e5a73979905ffdd65d28a5d2d0c355f8980423a6566795 SHA512 3012d48de23e892ca1cf372d7531ee8b8a13b329de7a6890b9995d2610b9390798689233c4946f9a835fe5c5d5d31b076e953ddbce1cc82b2f1a8bcf4dcbf41f WHIRLPOOL eedd4a62f3b46c6823dc3c14f74bf90524062f7829002d563f4f7f6e8715b3f577783d74bc9c6a3bd33c1876032fe86327e0b3364627a6155af2ec51cf64ca6d
@@ -56,4 +58,5 @@ EBUILD netbeans-dlight-9999_p20160829.ebuild 2968 SHA256 a98a009495c7fce4f058deb
 EBUILD netbeans-dlight-9999_p20160901.ebuild 2968 SHA256 d0b5fb71275970b2c852bd12c4216e7b07ca17920924aff5b7a009db73a8e18c SHA512 3229515011cc8336648deaa46e20fc16973cb2c10dbe4cb9d53d911d96dee22c68da598d8e1cbc128690accde68e025b052a23ff3bb0cc66c46b72cdfb02d138 WHIRLPOOL 93ecb0b678d5f9efb4eb18d7ae1a1a352816e8c798daf3f265dfc40c2585a45150f6d3d194fb58e283a9e6f7b85d3eb7e205b4d140c9be7559e4a514f16c146d
 EBUILD netbeans-dlight-9999_p20160902.ebuild 2968 SHA256 cdaeef3c2f0cdefb577acd208bccd82b2d09775113261411516b9476ef3fb8a8 SHA512 c0ce614c72034d23fe5eb041da1a008dd83535ee873bc02eec6c52ad0dbdb3634676950206d8953e967bda7ccf7a006b2a2b0e381a55ecda455a88c01a76d947 WHIRLPOOL 4b500bebc75e097cb45ebef363613413bec6a44cf526d39806ee580ca5c8619d7c8f0d2aa771782fc4334980c2c9e6977bbf1c5dde24c0a058099bf4d23eefbf
 EBUILD netbeans-dlight-9999_p20160903.ebuild 2968 SHA256 c17d080f5673dfd3d49d3bd9b2d8265b440224a00639630276e9c9b860826c26 SHA512 d901fd5c2835042c31b60eb0a1b4c72714e56ca480adfdb110640793b67577fa56433c6e00326b6114ac4ce97b251ba8ca1bf1f4b24ea0813f74aec69365552d WHIRLPOOL 580f1a070606831c05885fadfd015f20de558ab6bc4326bf63225bbfd7b4dc00cf0fb5db1cffe4109b618ddfe5eaa7cca3bfa8ddbeba3cd6eedcee687a18796e
+EBUILD netbeans-dlight-9999_p20160904.ebuild 2968 SHA256 7de137f4b6c437ae3e55d6fccf0fafd7f6595f46af319d13d07e5a211510768b SHA512 b3e79c8aebed2927d0d8d70db3c22c0926e93d44e132023c608f31b52cb4fcdae3cb4c0665b2cf765b6626b9051f53c8c9a6faebc4aba5b9072346e1bd4382fd WHIRLPOOL 212c53ccb30441647a31625e50272a93cfbbabbf726faa102c3e5301f3a5e42d3f54c5a69a19be42a95188f0ab1641e5183198246df39f11528167eceeda7bde
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160904.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160904.ebuild
new file mode 100644
index 0000000..f4501e8
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160904.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-04_00-02-33/zip/netbeans-trunk-nightly-201609040002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/C9EE1ACA53AA71183590274D658ABD0A6AD6B2BE-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}"/C9EE1ACA53AA71183590274D658ABD0A6AD6B2BE-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 fd88732..dc61ff4 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -59,6 +59,7 @@ DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
 DIST netbeans-trunk-nightly-201609020002-src.zip 217296178 SHA256 6632afeb1d3fb3cf91648945d03703b474ac9ee5d6855f6a4732bd6c711c1d9b SHA512 bb9f63963e2895c46a0869fd48e401c5d14325e63cea951ddc6385f88dd6fef8385783432f094315d521fcf8795f28997a13fea249e957949f1cc021827152b7 WHIRLPOOL 64aeace6080e9fdfef49484fbf32665a1dee2bd0c597dcbe0d22e5aaf486d45e7f1919cb826b0273dfca780b80d9e19de616b638ac775190b1493a262c269d81
 DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0ecac361b9c3fde36c0680843b36b13edee0c77c82ce82de1fcb SHA512 4da03b4ec722bd3ce3453e1e9e9753f1d7ecf48bb15b3550270eff8748e74765c1dfe3af9e5eef7fec036d352d513797b0619042d76537b8670b55e29f52340f WHIRLPOOL 8d036a278c24075565fdaa6791f04a2cd413f5370c77688a225dd618bfa14c4a8926639b9077c5526084edfdf35de9aac4126fa62af633306e4e15b4985d0065
+DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 15825 SHA256 e4824e152bd518440ca8e09ea452519a3888f4f5868ac466596b138c5b2f61ba SHA512 c1ef3b8c2cd54238ad1c5b77d2c0f7d530c9f2e2194a372879eef06d37a7e23df087f98a529e598270ca6bd8e3a78c5e52a08e8c1085e0a6c5b46b433f3c9496 WHIRLPOOL 2a39dfaf18a3225e2c7050573f4c38897057b11ef1e62c85aa147760a840c20442ba8e1e6901f00606ca96c50dade0713596820f1453c2cb9c826ab7bb37cb3d
@@ -85,4 +86,5 @@ EBUILD netbeans-enterprise-9999_p20160829.ebuild 15825 SHA256 d948ea9be53b33a5a2
 EBUILD netbeans-enterprise-9999_p20160901.ebuild 15825 SHA256 09a619ebd3bb9b72c41c7e06d0d55addad3d3a912bd12da537182e03900396b6 SHA512 213021feb7f6676d989c37c5c7495e94e0101a3c3694ac8980f897923c5d2373661f616521d34d5995f08b8ad7024e39bcd93346eb79f14647b4e0408f7a6e21 WHIRLPOOL a108e1734dd563ca2fdb910db89f7b4e21c98f6a0bffcfaae653d9d6af93f54cbd4d8c4460df0ea1dd98db03cbd40612adf7e6115bb00384121d58a33102d6dc
 EBUILD netbeans-enterprise-9999_p20160902.ebuild 15825 SHA256 0c199fe7a098b3818c3f837d833a73560fc26330c1fae2a2692bc82fc84bd9eb SHA512 372c04f9a2e5f62f444ebe18b78cddf1f22fa2a6ca3623793450b1e55024c8f8d5288935f6243b309526d963114252b06f1a10b2144ee1b2f674bba74fc655d7 WHIRLPOOL 2468a0a10d2b118b25df4d169c3be5d16847cda62d759e6321f48e3e9b28701e4b315e9abc219059a85f120a0c1778cdbe5349087a698e344f9abc875bcf68f8
 EBUILD netbeans-enterprise-9999_p20160903.ebuild 15825 SHA256 cf8d76c19046036572477ddafe99b79f94acb2fbee9b39990c02b82df3356e78 SHA512 490e5d2e4930f5fe3b98a7accd04814ef298ef06910d02e037085a5c51dc69b67211b9e17cee974d07ac2ef8feec8b89da36dc719781cea1cd3cb460d85e363c WHIRLPOOL 7b013941e1e56a3d366bd7197ca72575291c5e0c45877f7472d56e690fe18193a50b6248aba7d07013f7cb8b31fb9a39b47444f7266c7f3b4b415fed9c001622
+EBUILD netbeans-enterprise-9999_p20160904.ebuild 15825 SHA256 3d45f3fee523e66385c3e2b0922cac6500df6d2efab8b93c70affab4aa851898 SHA512 93b16231d4cbb2bcf8848673dff9dad3317446bab3695982616fee5cdbee3005c0a2d08ed483d3478bbfce4a151e53c0ff1488381d169325b7c6abbb7c82eefc WHIRLPOOL 1f5c87371055672569821724cd99f375eb7d394c8b246fe8bfec899128ebfd076ed384e138e82301649e830d3103647c82f21a40d6574a583e4bb10d9c9392d6
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160904.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160904.ebuild
new file mode 100644
index 0000000..1e34ad9
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160904.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-04_00-02-33/zip/netbeans-trunk-nightly-201609040002-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 e56bc6a..391c558 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
 DIST netbeans-trunk-nightly-201609020002-src.zip 217296178 SHA256 6632afeb1d3fb3cf91648945d03703b474ac9ee5d6855f6a4732bd6c711c1d9b SHA512 bb9f63963e2895c46a0869fd48e401c5d14325e63cea951ddc6385f88dd6fef8385783432f094315d521fcf8795f28997a13fea249e957949f1cc021827152b7 WHIRLPOOL 64aeace6080e9fdfef49484fbf32665a1dee2bd0c597dcbe0d22e5aaf486d45e7f1919cb826b0273dfca780b80d9e19de616b638ac775190b1493a262c269d81
 DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0ecac361b9c3fde36c0680843b36b13edee0c77c82ce82de1fcb SHA512 4da03b4ec722bd3ce3453e1e9e9753f1d7ecf48bb15b3550270eff8748e74765c1dfe3af9e5eef7fec036d352d513797b0619042d76537b8670b55e29f52340f WHIRLPOOL 8d036a278c24075565fdaa6791f04a2cd413f5370c77688a225dd618bfa14c4a8926639b9077c5526084edfdf35de9aac4126fa62af633306e4e15b4985d0065
+DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 2913 SHA256 0f64221b065daf4e7ec4a250e2306ea2e9e1906418bdf15a74bf2f62ac91726d SHA512 e42fcb525d3d92fcc84778ca8e6a06288516b92117a5e587e7c3fb18ed87e9ae0359a47b196283175a7badc4e17bf8819356cf4de74a53e55c9a2ed93be8e295 WHIRLPOOL c867c8722300351c3a8ea7193f4693860ebc1d8c88d6f95db7ff5d3c005c221de639bc9225f83e683ee0830208e14c6d841ec97fdc7c4f875017397b0aaa16a3
@@ -53,4 +54,5 @@ EBUILD netbeans-ergonomics-9999_p20160829.ebuild 2913 SHA256 ec8672e62b3c57e3b9b
 EBUILD netbeans-ergonomics-9999_p20160901.ebuild 2913 SHA256 8efe7cf5c02e556106330c243ea525b618176cb83a9a7628e90fce30fbb13804 SHA512 8becc42d5249dd48752a77c8bfcaee83046b992d450d13c938352ef30e7e59f4db45df34403723e900f1136ff4d0fd46cfd817505424ad7ff86c8f3a0de99fc6 WHIRLPOOL 633a4624ecbb75c3addd5529bba726f32340ef5d1cc38d539cab0551af01a2b0b6c7f30ee85fd23bd4c773fbacd5f63cc8c813b0d8983f97371e057169b9b178
 EBUILD netbeans-ergonomics-9999_p20160902.ebuild 2913 SHA256 674b38a2c2710fffd0472a53788075365a2048982f8d265e28deccf1facef9de SHA512 927fdd54593c2f2738d5573f3b3af1873c8019e653d4374d3abf3c3844978a025d947069c325723bfbe40211e0a20b3e29b253b816f4525b7e941889a39a723e WHIRLPOOL 1ad9b68e586a6ad93b675b4a4896857ab5c41ef90b61ff411644f58644606b95ae8f81a5d4f08a2bb3b548837a15880b0ea8665ab4d545af1328fb6b2b61d935
 EBUILD netbeans-ergonomics-9999_p20160903.ebuild 2913 SHA256 b2354fef560329d6ccafc0030550f47fa211da536a6b67815f167ec7d210b620 SHA512 be8467a6ba42ac39b899ad334ac008d7580a6e299c25033740b9313030ae1acc3030ad5615268307ccda02d7960ae0bf844f226739a81a976bd13598df807511 WHIRLPOOL f09f5555ed8cacc445b62f03fe1aba89538a9e959af96c31cfc820992c78e0b3e5c625be9eb7be8fff1fea44dd80df30345d2796f66ab741d49767283c3e03f5
+EBUILD netbeans-ergonomics-9999_p20160904.ebuild 2913 SHA256 c4e141ce7ee413c484eee1538b8bc3064fae12ecc7a333be8489dd904bcbf40d SHA512 d55f470422d51c8f3b2fe59557a80fd0a33d059d1dbbb0e6387a77592f0fbd391647c24fc38d6ce1186b370d97b0a442965b19d13452e0450f41042657a0b2ec WHIRLPOOL 486d06bbebacbea523c47babaae691bd4cb400d512e8e561154ce20dcfaa346b9216cf533d0989b36968dc5881583fefd5360e98c2f3de803b3bce397909b697
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160904.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160904.ebuild
new file mode 100644
index 0000000..4fe26f8
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160904.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-04_00-02-33/zip/netbeans-trunk-nightly-201609040002-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 68cb143..2c88c87 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
 DIST netbeans-trunk-nightly-201609020002-src.zip 217296178 SHA256 6632afeb1d3fb3cf91648945d03703b474ac9ee5d6855f6a4732bd6c711c1d9b SHA512 bb9f63963e2895c46a0869fd48e401c5d14325e63cea951ddc6385f88dd6fef8385783432f094315d521fcf8795f28997a13fea249e957949f1cc021827152b7 WHIRLPOOL 64aeace6080e9fdfef49484fbf32665a1dee2bd0c597dcbe0d22e5aaf486d45e7f1919cb826b0273dfca780b80d9e19de616b638ac775190b1493a262c269d81
 DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0ecac361b9c3fde36c0680843b36b13edee0c77c82ce82de1fcb SHA512 4da03b4ec722bd3ce3453e1e9e9753f1d7ecf48bb15b3550270eff8748e74765c1dfe3af9e5eef7fec036d352d513797b0619042d76537b8670b55e29f52340f WHIRLPOOL 8d036a278c24075565fdaa6791f04a2cd413f5370c77688a225dd618bfa14c4a8926639b9077c5526084edfdf35de9aac4126fa62af633306e4e15b4985d0065
+DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 3377 SHA256 b45f733134cc75997718dbfbf6a3d02e3c6eab38bf4b23ea84c1a29281e419dd SHA512 03514caddb6f8e9fb04c85c8f2a3e47fb4718a248f082119ecfa1c541e53123c0bc08f9524263de0905ba340108ae53da3ecff1f91cb200af71374b0d52a1bfc WHIRLPOOL 5f377c28e81ccddb3da0e84cd019b54c30c08ac87ce8780cca0786e985cc347ba32495cb118832865fc257df0f967aa9b61e306c1f765ce7989d1617d3ff9200
@@ -57,4 +58,5 @@ EBUILD netbeans-extide-9999_p20160829.ebuild 3377 SHA256 626ced6297160a5a078e2dd
 EBUILD netbeans-extide-9999_p20160901.ebuild 3377 SHA256 044a6d90a3bbc5b2ea976a60626d163646258b8f9b607f48807c9e5fc205eacc SHA512 7299576b1232e56bc56eaf961a225e5d01bc16d45ac89640b8547c31c1342b77714c9fa9733c6a81d06e51cbad5422a896f101fcd80ccde50365c4d6adaebef6 WHIRLPOOL 7c638df833b0c52fc9bd3d47bdb324bffd3ff898ef849d472187328fb79b6cc5511e2eed7592762903439ef51863e809b001eb3df56d06d318f29fc1bb672faf
 EBUILD netbeans-extide-9999_p20160902.ebuild 3377 SHA256 e4994db02b0bb825d5697336d23354466786b2b6cfb874e339f9b13e11e27049 SHA512 ea31d255619ae9b5ae3461ef2402ec34172462c740def7ce0d647c0eb8a7bb8df3435580227e906ae1ae544e66bd807380d3777d432e659a75197e7efb4d3f84 WHIRLPOOL 3705d0abc0c66799fb693fcee57a32c7646e517fe9f737d989a9c65123b732ad448fd81566246c13b64086d6602c7e13e03505ed6d769016e8c240a0f71a0c68
 EBUILD netbeans-extide-9999_p20160903.ebuild 3377 SHA256 944daec79d07686fe13753a33c1da2eed19ca6e5f25a7e688bbe6941fd6ad40e SHA512 48a464ee6e3190a4c941bc86f488750e5ac54eaf2c9b3755bcebfdc7551e97feabf558a3e8f8a259f9333fbdd4404d6c024edd78ee452bc76e51256e871ac6c8 WHIRLPOOL a06aea9ddead43acd4661f3ece115e0bd12851d3502f8b03b49e4c01e54da0d0b7413ba2ea1b51dec9ab595271be8a8edfbaf8b651aa0d731e77d7cbedd237df
+EBUILD netbeans-extide-9999_p20160904.ebuild 3377 SHA256 df8c650659cc11e0fb43bf4e00ad59e1d0a7e20b64db9b0e84004373c0068423 SHA512 bda4468c0d3c36fc0fa2e2e85ffe92d21d4b1fb0faee8268e19383f090be4db2f61b180a2140df67e22e57585324fe684322bdbec14142c70ff2ce1fe45998f7 WHIRLPOOL 5a42702b5ef84ace97ea6963311928966f0bd21abc795acdb09b225521f2ed56d3c7592d249ab80cc1d4d1d3b38b25779842360169fd3dada37bf74669082b50
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160904.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160904.ebuild
new file mode 100644
index 0000000..fd1f80f
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20160904.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-04_00-02-33/zip/netbeans-trunk-nightly-201609040002-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 ec5ffb6..3b7a485 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
 DIST netbeans-trunk-nightly-201609020002-src.zip 217296178 SHA256 6632afeb1d3fb3cf91648945d03703b474ac9ee5d6855f6a4732bd6c711c1d9b SHA512 bb9f63963e2895c46a0869fd48e401c5d14325e63cea951ddc6385f88dd6fef8385783432f094315d521fcf8795f28997a13fea249e957949f1cc021827152b7 WHIRLPOOL 64aeace6080e9fdfef49484fbf32665a1dee2bd0c597dcbe0d22e5aaf486d45e7f1919cb826b0273dfca780b80d9e19de616b638ac775190b1493a262c269d81
 DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0ecac361b9c3fde36c0680843b36b13edee0c77c82ce82de1fcb SHA512 4da03b4ec722bd3ce3453e1e9e9753f1d7ecf48bb15b3550270eff8748e74765c1dfe3af9e5eef7fec036d352d513797b0619042d76537b8670b55e29f52340f WHIRLPOOL 8d036a278c24075565fdaa6791f04a2cd413f5370c77688a225dd618bfa14c4a8926639b9077c5526084edfdf35de9aac4126fa62af633306e4e15b4985d0065
+DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 3416 SHA256 4a5078fdb207606b04792b824fb6f76f7e6e8b6bebf806ec6eca22998feecfb5 SHA512 4c20436c57537ea3adc9c9697053c5fb45e257c7c69ddb0b00024d5858d8fce3833318fdcaa286ab1f32972fddd9a1c94ea5cd28e935cbe626c7ad759d3fbb4d WHIRLPOOL f6b82e7f117578a24b3bf718ebc90e8ae3962f8d3c55c172f5326cd07133848b7b594dbeb1a3e888e10c7d2bd7bb1e5de17b86bc8ed10bfca5c5739a294206ef
@@ -55,4 +56,5 @@ EBUILD netbeans-groovy-9999_p20160829.ebuild 3416 SHA256 915f8dbcbe1387e92c2a8a2
 EBUILD netbeans-groovy-9999_p20160901.ebuild 3416 SHA256 46be5790e675abd9d835ef7863d357674bb0769ffbb1c4cba45ecf8610e4fca1 SHA512 e3719edef1d6820f322b928f4d99b363a4610cd9909f2d6b599f810af4b4f166c75612ffa9dd0627959d59fd96d773b958744ce314e97e9e43f8ae0d8d80321d WHIRLPOOL decd91bb91b98a18c6f7a7a49d3864db0f710cf09f8c1dfeaa31032481c80659e702d1096558ca298dd482dd48c350ffd3cab774f2645e6cb59d7e573695c34d
 EBUILD netbeans-groovy-9999_p20160902.ebuild 3416 SHA256 0a64f3dd949950ccb8d723fc2e5773ae82f468439767e7c765f9e751191e51c0 SHA512 1549afde9bbd920b2117e4509ed4dc33a507cbba90e7e373320a71f9d875335fed7b18d23cdda93079714575274d98ed77cef8b03cd380a0a474fc3ce9d093a7 WHIRLPOOL 28e9692d2f4d9792c60620348ae88590c01bfb8869511701af39384e21296cda1993e2f928886c1b235d7ca5fe4e056fb5760a2aa38008ab9b2ae50c50b84737
 EBUILD netbeans-groovy-9999_p20160903.ebuild 3416 SHA256 e162d66c6879491bcecce280bc35fc774828cdb01f1f7dd3da5326a92e51b7f4 SHA512 a57e4ed3080442f6c395b5583eb2ed78dd1a8f2103d9f70849f0af9e950985843522720503ac68b7a4a5d6c4e8872b0e442ecf928566b3a2e7b20212ce6b3639 WHIRLPOOL bca4eb4160f36ede0520ac4e6c42941cf3dab52d1f29f12c56ebc87d81c54d2a998f8a13258db582ced378cc94423a5f1859b4427ba10c7d9f3f7c1982d411f6
+EBUILD netbeans-groovy-9999_p20160904.ebuild 3416 SHA256 a64a8eaae9b083620908a959d429ba34153a72ee53c287248a8a6c20dba50da9 SHA512 fa115d9fd7f95d4a92301c5e29ee7d5bc97ad5be73226c0b5207563f434e6d87f7c75a0a39743e3115092d5937d4a2af79c31ef26b94255d11518f5acca9d7a6 WHIRLPOOL 2521869c21e204c0b76fb2ccfefaa8224e94f1e2e7e3fe47f5b11833526e5af4b1be22914a50f3374aac04b554252fae7e95ef2d8518069b3cdc4789f3e2de04
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160904.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160904.ebuild
new file mode 100644
index 0000000..91c1402
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160904.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-04_00-02-33/zip/netbeans-trunk-nightly-201609040002-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 1ac7222..6d44f51 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
 DIST netbeans-trunk-nightly-201609020002-src.zip 217296178 SHA256 6632afeb1d3fb3cf91648945d03703b474ac9ee5d6855f6a4732bd6c711c1d9b SHA512 bb9f63963e2895c46a0869fd48e401c5d14325e63cea951ddc6385f88dd6fef8385783432f094315d521fcf8795f28997a13fea249e957949f1cc021827152b7 WHIRLPOOL 64aeace6080e9fdfef49484fbf32665a1dee2bd0c597dcbe0d22e5aaf486d45e7f1919cb826b0273dfca780b80d9e19de616b638ac775190b1493a262c269d81
 DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0ecac361b9c3fde36c0680843b36b13edee0c77c82ce82de1fcb SHA512 4da03b4ec722bd3ce3453e1e9e9753f1d7ecf48bb15b3550270eff8748e74765c1dfe3af9e5eef7fec036d352d513797b0619042d76537b8670b55e29f52340f WHIRLPOOL 8d036a278c24075565fdaa6791f04a2cd413f5370c77688a225dd618bfa14c4a8926639b9077c5526084edfdf35de9aac4126fa62af633306e4e15b4985d0065
+DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 4126 SHA256 063a865a89d4d4c566d53ae77a754a61c74d9837cd982e203d276008b8c7e7dc SHA512 1824c591a18d713347f1ca4f3bafc945ea9c54fdab7d3fbf6ef5b8550535e8e4d6965b997cc6b3cdf311fd8fcd4495810477a39aff8520cd2cc486993e1f6924 WHIRLPOOL 9b5f3d910228fce6268b06f55285100f033ef3de9c344d4f3f7f24cbc7ad871cf8b3771abec2e6362d515918d73b6475e5943b20d4f6472a5f7513e3815eb696
@@ -58,4 +59,5 @@ EBUILD netbeans-harness-9999_p20160829.ebuild 4126 SHA256 f0db647af3fa24d48fc764
 EBUILD netbeans-harness-9999_p20160901.ebuild 4126 SHA256 7df8b62ce9b8e8d1f051aa05ffbc0b7e9f0dcb427983b01a14a114bf6e243400 SHA512 d5dbecf2dfbf2bfeedbc886c5abb76a81deeb8d5c1fe8b6d0bc9bbecad070c52eed91817361c620bf24a1c7b32b6420e8a296f153cdcda7f64f029e154d6eb3c WHIRLPOOL f2300981e99f99f11319d24c62249b064bb526b88650e6defeac73dfe4e3f142ed27d79a13fe1ba30f621eb1a87867d8f62c1a053daa2543a1177a0af6166d89
 EBUILD netbeans-harness-9999_p20160902.ebuild 4126 SHA256 77910ac8156b6bd7a7cbc6cab01b0b880558f285eed31541b02b9f3163a961b0 SHA512 88c051e0f7165c4dd276e50d07ba7b7c750a6aeb925bfaf56c80422cd5556f6a127b57526496c71185d576ee48f5f1ce9935b7912db05f3d7e256ef04f9d1d7d WHIRLPOOL 04f0fd95c7b1ee9083d24548be7835a5fa2c03ea684b4518557d4db0af96f202843691a9f7768aef5afa87f88723873e503293e003a7f446cce46a4ba06c3ee1
 EBUILD netbeans-harness-9999_p20160903.ebuild 4126 SHA256 daa9bec98a2541afd4888796e9f24fde7c25d53d89b4b67f77c68de258d3ed3f SHA512 679886a78cb4838c134fc8def7d7dea7a4b24d14a540c4879e3a6330b5b96270a63900710305ae1dd830aeec0e7342d51610965d0768290f73578f2268aea502 WHIRLPOOL ce8d7bf33fdabf064cbd8fb3533dcca3394238d9663663849172d116879ca84947a96e79ea5e658d1a270192af75caf6f9fab9ddaeb38eee7a56d806a4655279
+EBUILD netbeans-harness-9999_p20160904.ebuild 4126 SHA256 4200557b0e31af9b40369100bfec9335ef58f1b8948dafbeb4ef2f00d013b493 SHA512 bf4836b51e6df852846c4d833c933f3fe88bdf2ac5da223b54c6e2e0eb00e1c4a9a3f355707b85141e0d1f9838337c18c5af12349a863d4028a9826e3d7372eb WHIRLPOOL 2424f7445fb0b783ba7adf91af05be3f030263db78546565b380ae35992b818c3d45183b5b131acc3c9e6cbf1a2239828a969047100938e9bca27eeed231fa7f
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160904.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160904.ebuild
new file mode 100644
index 0000000..6e8e27a
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20160904.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-04_00-02-33/zip/netbeans-trunk-nightly-201609040002-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 27a03c8..0869c0b 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -166,6 +166,7 @@ DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
 DIST netbeans-trunk-nightly-201609020002-src.zip 217296178 SHA256 6632afeb1d3fb3cf91648945d03703b474ac9ee5d6855f6a4732bd6c711c1d9b SHA512 bb9f63963e2895c46a0869fd48e401c5d14325e63cea951ddc6385f88dd6fef8385783432f094315d521fcf8795f28997a13fea249e957949f1cc021827152b7 WHIRLPOOL 64aeace6080e9fdfef49484fbf32665a1dee2bd0c597dcbe0d22e5aaf486d45e7f1919cb826b0273dfca780b80d9e19de616b638ac775190b1493a262c269d81
 DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0ecac361b9c3fde36c0680843b36b13edee0c77c82ce82de1fcb SHA512 4da03b4ec722bd3ce3453e1e9e9753f1d7ecf48bb15b3550270eff8748e74765c1dfe3af9e5eef7fec036d352d513797b0619042d76537b8670b55e29f52340f WHIRLPOOL 8d036a278c24075565fdaa6791f04a2cd413f5370c77688a225dd618bfa14c4a8926639b9077c5526084edfdf35de9aac4126fa62af633306e4e15b4985d0065
+DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 29867 SHA256 8869ab05195b271f6778d85766fa3f9fd961e0c083dd46b3a053101e0ab05c96 SHA512 6fec085ea686b0542eb98875716958a899b4058abda539f883b2ad701d8805ac8c74486a783e0ff11ceebc996e5eeff744f429d8f36c361ab9c6d334c55e7e66 WHIRLPOOL 3f1bc01d0fc4d54f176ee1f8115080447b739749f1e2fafc3e1db7648e9d8ff2e661979490020d43c1d7e24ad51d32a7bca5ed1b0b2b4a39d2c95a449b12112f
@@ -192,4 +193,5 @@ EBUILD netbeans-ide-9999_p20160829.ebuild 29849 SHA256 a6f7fab5c9676f4258ba58360
 EBUILD netbeans-ide-9999_p20160901.ebuild 29849 SHA256 c1cbbcf929e5d8d7b4308f18929032c82a75de4cf674a52b44aa029a0e33fd7f SHA512 f70b98cb010431cf8389e111e023695abf8689721560252df25b9679d584f08dece3583327ea078404eea481bcee38d136d3221f93f766735cc6fc24170f2dcf WHIRLPOOL 448b751ab2996d8dc1989ad4211dd9a20a7e6d31e7a3cc2889994726ecd21df1417329f410810c918695f605117fafe89b123881ff5ef5c010ee42408ed71945
 EBUILD netbeans-ide-9999_p20160902.ebuild 29849 SHA256 49237219eaf86408a7ce442bba18cf8c197585e0e4020572ca5d58b4a9082ac6 SHA512 72511d62d0c4109b9ace099ecf7f9c2e4f6224c8a703d779566b6547db197dd7e264e257a149933b44cbb8ff1030e5604bd1130098dea06726f981eda4e36878 WHIRLPOOL b5222460569d4a1886b31c615e9d31770544dd9047fc48da39d3652d1744fd8d6a4dc4adafde9078261a59ba4a6cba97553d6dfdbd5c6f76d54e277e4c98be94
 EBUILD netbeans-ide-9999_p20160903.ebuild 29849 SHA256 a118013a0233d23f25f45f444bda8cd233898a29a7d986fbffc24816e164d63c SHA512 b108637a3958c68ecb83517e18d93e01ebc8b97c934723e12aac30ce0373491165db0e5cdbf7ca670e24920e385564fb1a092f57d40e54b054a2eb74b0116c8b WHIRLPOOL 7591e7fc9083b7b95271084c9caebccfda1ed9697c92efc3a50ce23e489413fd2ce998dd2040148ff5e9c273c0eede0432dc5544d33de81b700cb4d89b25bfe2
+EBUILD netbeans-ide-9999_p20160904.ebuild 29849 SHA256 9da555106fc05b372faa641edf69b94e483a4e04e07d9221ea3007f52ed7303a SHA512 6e8f93dd510e4e353bdc04496354692911de0e64d61bdd82779a3169e6cc5a8f0d4c2738fc325d2cd18ae5ded8c95d751e1b9418ab0dfaef0b8859b6ab961443 WHIRLPOOL 6ed7f674b36d23597bdb76d818591673ea3b3bb76eb56261653408202d6ad7c4379d57303c610ddc16ea0814cfcd9b7ef25f9aa5850d43cdae439bdc15146c9b
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160904.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160904.ebuild
new file mode 100644
index 0000000..f2e8a1a
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20160904.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-04_00-02-33/zip/netbeans-trunk-nightly-201609040002-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 8b460f8..401969b 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -62,6 +62,7 @@ DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
 DIST netbeans-trunk-nightly-201609020002-src.zip 217296178 SHA256 6632afeb1d3fb3cf91648945d03703b474ac9ee5d6855f6a4732bd6c711c1d9b SHA512 bb9f63963e2895c46a0869fd48e401c5d14325e63cea951ddc6385f88dd6fef8385783432f094315d521fcf8795f28997a13fea249e957949f1cc021827152b7 WHIRLPOOL 64aeace6080e9fdfef49484fbf32665a1dee2bd0c597dcbe0d22e5aaf486d45e7f1919cb826b0273dfca780b80d9e19de616b638ac775190b1493a262c269d81
 DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0ecac361b9c3fde36c0680843b36b13edee0c77c82ce82de1fcb SHA512 4da03b4ec722bd3ce3453e1e9e9753f1d7ecf48bb15b3550270eff8748e74765c1dfe3af9e5eef7fec036d352d513797b0619042d76537b8670b55e29f52340f WHIRLPOOL 8d036a278c24075565fdaa6791f04a2cd413f5370c77688a225dd618bfa14c4a8926639b9077c5526084edfdf35de9aac4126fa62af633306e4e15b4985d0065
+DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 15656 SHA256 b4bdbaa284e5081e64dac110f95a1798350cd821e5bddc210957c8852918559e SHA512 82e0b5329cecfa0f3ed1dbdc16319592c2b71c3fe4b93503e1ed02bef7f18a91d8cef91b44d242b418e437a329db30127357d965bc6d578797245afdd05b4e38 WHIRLPOOL 02782938a01df4ecdfcd9bc99d1aa9853ff91b5c81507189e1ac7a66ec5dae657aeb32c3bcf99f91ec0f38e1f65da097d5c783eb84fdb5766dd5be2c3d2349f6
@@ -88,4 +89,5 @@ EBUILD netbeans-java-9999_p20160829.ebuild 15656 SHA256 bc83101c53e23a1d651468ba
 EBUILD netbeans-java-9999_p20160901.ebuild 15656 SHA256 5147b0072c79f93d2afa3d9e38f9d5a5c03f6517431d20599b1c524e571efec5 SHA512 7c3c9b9e5e9e403dd6ee876d55984aa6352d117205134d5233534e3b74dec57b6925809e46e4a40843990eaeda124c33796633c28efc731dcede63a7b5107c4c WHIRLPOOL d04a1868162cfa5c869c1827ec4fb194d2c1cecc2c307fc4a618280c1aab484e3d6125b0ff9064627c965787ca66c75803aafbd1ac8e93c7a9afd5d2cdd2c73a
 EBUILD netbeans-java-9999_p20160902.ebuild 15656 SHA256 06ee2a2c07fbc252dfc4128f07feea0b6a3803afec1a0452ea1f814c8ea75434 SHA512 5932a5819df8e440a4ced9abf2c20d2ec175b2dbbcc209dca76d75d5003ac8df4d0550e4ac4ed9dc1b1a561ff1ddd52cc83e37ef9f11f7d754f3a39147c0e973 WHIRLPOOL 5e74022f99f7e3a9e6fb7f534d292d5692df2b4630b00550d740d9e9b9ac851a29647c32f23e8ec3f018db111004382948e925d57414761f68324f113f83f346
 EBUILD netbeans-java-9999_p20160903.ebuild 15656 SHA256 75f17635df93b12e82ce2a79f86a925045b2dcecb9206c36b0952419e7cb6212 SHA512 4e33ff56fd83d3297f2c594d270e7953c24194de2439f8796ee474c376729fe0ce9d4b4247e6c3766720d460cf885d608b7c91a6820940a2f91285de6f215c33 WHIRLPOOL 40200ea35dbf01d8da216591d9181461379a54ce613f778753eb29a96d34046806e5b99fd82bf738aa2fb7d22d0950f8c9b66cef4b7215badbd189f847769dae
+EBUILD netbeans-java-9999_p20160904.ebuild 15656 SHA256 d0e9a1132ad4cdf2772df87b7127fa6c3929b9b18dc98f6a5e2a807bf7e523bb SHA512 92808d4f68558072f554cbe09ccbd9543a922223d798c0de735c826820fbf3af8a254c21e0817fec749d30e11b0a1c21ed72094cda8d3b36a8d53afb64ba767c WHIRLPOOL a667b0d23228dad04e887817ba4ce5c70e559c4f8819a1c23a858d1806be974856b0a851a337a396af9423c880d47ad1583970da4de310da1c1d9835796c0b56
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160904.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160904.ebuild
new file mode 100644
index 0000000..3f5fda3
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20160904.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-04_00-02-33/zip/netbeans-trunk-nightly-201609040002-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/99A1BD1870E7A06AF2E525ECE3DDEC7F4E5E54E4-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}"/99A1BD1870E7A06AF2E525ECE3DDEC7F4E5E54E4-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 06685e6..4499034 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
 DIST netbeans-trunk-nightly-201609020002-src.zip 217296178 SHA256 6632afeb1d3fb3cf91648945d03703b474ac9ee5d6855f6a4732bd6c711c1d9b SHA512 bb9f63963e2895c46a0869fd48e401c5d14325e63cea951ddc6385f88dd6fef8385783432f094315d521fcf8795f28997a13fea249e957949f1cc021827152b7 WHIRLPOOL 64aeace6080e9fdfef49484fbf32665a1dee2bd0c597dcbe0d22e5aaf486d45e7f1919cb826b0273dfca780b80d9e19de616b638ac775190b1493a262c269d81
 DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0ecac361b9c3fde36c0680843b36b13edee0c77c82ce82de1fcb SHA512 4da03b4ec722bd3ce3453e1e9e9753f1d7ecf48bb15b3550270eff8748e74765c1dfe3af9e5eef7fec036d352d513797b0619042d76537b8670b55e29f52340f WHIRLPOOL 8d036a278c24075565fdaa6791f04a2cd413f5370c77688a225dd618bfa14c4a8926639b9077c5526084edfdf35de9aac4126fa62af633306e4e15b4985d0065
+DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 4971 SHA256 ea2d1f4a305aeefea537b23c11d9b8b59ca31798d2819bd6cd06a4e2354bcec1 SHA512 5995560a03a6486a93282c4bfc01295a065ec8f2f6566ed486fe2f2f4c69bcd43c44fecdc4f90e9a2c62a78a1ddbeafc9c990c73f01734a4d8ce373754c3b735 WHIRLPOOL aee5fb419748f2659c34ec3cbf0b6e300bd544cf8f88b897d59452bfe0f2232a5d4ea421e26c98fe88afdfaaad61c389cee702cc17e7fac154459f7b0f8a8925
@@ -56,4 +57,5 @@ EBUILD netbeans-javacard-9999_p20160829.ebuild 4971 SHA256 6ee1fd71a7bacf2aac756
 EBUILD netbeans-javacard-9999_p20160901.ebuild 4971 SHA256 771e34db8c9fb8270fed4124ae9e3f9bcd968415afc1d62e6f53fb8e6ebfae80 SHA512 c5330952122e0cb95d56ffa19bd51216177179a3d9396bea5563b064b8f6392534a4415c4e2184c45f7fe6e1124ef718e5690b781328efd7b3f48f427e861256 WHIRLPOOL e876f88b48f8c06d81e0404158a3f688c03f409d89df3ed015a3cb709c9cf0dd68170f905c29f959df1024b416fd8853173b09ce7c2b3650cb98f55f8e7460ef
 EBUILD netbeans-javacard-9999_p20160902.ebuild 4971 SHA256 15b67aa32a5cbc39353e7ee0fbd41a688a77d29331e4fbfe46eeef12ed6e06df SHA512 36e5414253aedb27e5d4b421301d1f32c26259113bb4a925f1c149c17cad3eb7c93b73c5bcacc72c1357330892cf7299c299be58812f37f3e6178695ca18e496 WHIRLPOOL be91fc0e2c0870cd5eee05a5917f3bad275ba89576957eee9ca708ef5feea28b2d6544f55a7c9ed3b115fee0cb17d649561b3256c962de6530b833491cc9cca0
 EBUILD netbeans-javacard-9999_p20160903.ebuild 4971 SHA256 a510dc5155388a24795895a09b84925ff3d33ebe658374196ab646c5d283247c SHA512 2689c3c9bfc6d15ebfd8208e6ada7f67c66759cd0c4f7e0c315690bea48fb4d68c5d2f08690c26d22779f93c0ab01f23661ed8b73112c160cfad0ca72b3c8d4e WHIRLPOOL 8c84a0abdd34f20c6611aae0566ef3aa3d034b3399f3e70cf56a0d9607dee55f7e75c0cff81bf68bb0ce91e2260d01a34407efd7367f882248b7c3bfd75eae9f
+EBUILD netbeans-javacard-9999_p20160904.ebuild 4971 SHA256 f80314766ccbee3e18757bf759dba5ff918863d4f892c073b0c03399cdb17c46 SHA512 4b27a14d93bb4ddee05c406de6577ca0150fbe04e2324f870fa3061fbae6148d9a4d886197d0d3ac75dad263e2a52fc92f5d30ee89858fc136d5903079ee02c2 WHIRLPOOL a1faa9e162c3a6efa742cba385676beba35616574980caacca83eec742c730f6f5bad68e2de8e5c988ab2d6f3a7a784210d3881136e765f1c5fd8ead1345bb17
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160904.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160904.ebuild
new file mode 100644
index 0000000..ec18e86
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160904.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-04_00-02-33/zip/netbeans-trunk-nightly-201609040002-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 b55fdd3..8b94634 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
 DIST netbeans-trunk-nightly-201609020002-src.zip 217296178 SHA256 6632afeb1d3fb3cf91648945d03703b474ac9ee5d6855f6a4732bd6c711c1d9b SHA512 bb9f63963e2895c46a0869fd48e401c5d14325e63cea951ddc6385f88dd6fef8385783432f094315d521fcf8795f28997a13fea249e957949f1cc021827152b7 WHIRLPOOL 64aeace6080e9fdfef49484fbf32665a1dee2bd0c597dcbe0d22e5aaf486d45e7f1919cb826b0273dfca780b80d9e19de616b638ac775190b1493a262c269d81
 DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0ecac361b9c3fde36c0680843b36b13edee0c77c82ce82de1fcb SHA512 4da03b4ec722bd3ce3453e1e9e9753f1d7ecf48bb15b3550270eff8748e74765c1dfe3af9e5eef7fec036d352d513797b0619042d76537b8670b55e29f52340f WHIRLPOOL 8d036a278c24075565fdaa6791f04a2cd413f5370c77688a225dd618bfa14c4a8926639b9077c5526084edfdf35de9aac4126fa62af633306e4e15b4985d0065
+DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 6293 SHA256 4cb1aa813d16116f1b4606ade20a77bba7950ba86d680149d17b5c6641342342 SHA512 2b16a76c082c76431c3622e215801c1c133e455b7f2a4b15fd075a78c166cd6b5f30f40745f53be9ff0cb5a24d4832f0562278ac42f2f266b76611a3289b01de WHIRLPOOL dcd7d717e90178dd04a1a8ebb79bbd23f3e8316c8a66abadb3a4f66a48c3a889147155dd650be168bffd0a38fed627ef3821d9a1148ab84dcf5cd878518746cd
@@ -55,4 +56,5 @@ EBUILD netbeans-javadoc-9999_p20160829.ebuild 6293 SHA256 87ddccfa705ea33c6371f5
 EBUILD netbeans-javadoc-9999_p20160901.ebuild 6293 SHA256 df11758b565df7b1870cccb82ca013f95107c10a8bcfea17d24f66d87402187b SHA512 8a9390acec77716d1cf5d346d76158a28ef9ad26d08d7809a11a76979f6b0ed14a5920fb70d6f8616c00207d535e11d7aab90bbd7a79d12d85448e97f90a604c WHIRLPOOL 8dc1ba9f260910815ec9e1d878a96c0a0a622cd6fb076eb5527d97aaff0487d8d017955463ec556ba8c29c01db1b0a32b19911649ab1d08f0130846d948e3b6a
 EBUILD netbeans-javadoc-9999_p20160902.ebuild 6293 SHA256 1a34e7a5bc09c51e6959d57d4b0578ef3ce61b11477b18bb0ac0515cc3975e65 SHA512 99b0f16289a9aff45eb44d85039a003868f1b5b471c569bf510467cb3b4aa7a6e1c43351e1d7952b66121619a5bb1f290dd338c30ea49663e2131fc7691d4f17 WHIRLPOOL fc71f31fc1cd7db5a821144bb46184bb7b94eb4b7678341dccc251c91fe98c4236685ccd216eedf244dcf0fdb8038afbc487a1cb221ed5c29828124c257c7145
 EBUILD netbeans-javadoc-9999_p20160903.ebuild 6293 SHA256 6861d4defd395f89d0a0a8bd406eb8235c3fc9559222e9db046f05a1e911a6ad SHA512 577f7b03bf3d3b69be5983b0579db115af75c47d41e0dfee65630dff1b243ff12450cc492a918b970d5085b92c40ffbaaaebfd5de6fe31edee4c6ff1e1d2ad38 WHIRLPOOL 211fdffa70c25fb279cadb3d5b3a987ec2f246508641caa931a485da3af8c65e3293e71b47bc852563b7c415104b6f7663fe9dde7241394cf42ba7f0dd38cafe
+EBUILD netbeans-javadoc-9999_p20160904.ebuild 6293 SHA256 160f0def8dea91d16273198991f519dbcdcb4cc895a1bd23ec51a29907bd5234 SHA512 ee9ad5de586e784f021931f474bceee28014931d37ccb221a29bc491e2e55ad6cd9d2fe2858d59ce97c5fe29a66b1b594f546e99f4229009da860deda45d3592 WHIRLPOOL abd502e1cbf90052f4d5b07742dc74ac90e79d652eaafa82f4173b11c22cbfee44f53c292771e3e0a67386a028b4ab258822fb1dc75eef20f23e465113ca509b
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160904.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160904.ebuild
new file mode 100644
index 0000000..8715a79
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160904.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-04_00-02-33/zip/netbeans-trunk-nightly-201609040002-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 3f5d7c7..70efadc 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
 DIST netbeans-trunk-nightly-201609020002-src.zip 217296178 SHA256 6632afeb1d3fb3cf91648945d03703b474ac9ee5d6855f6a4732bd6c711c1d9b SHA512 bb9f63963e2895c46a0869fd48e401c5d14325e63cea951ddc6385f88dd6fef8385783432f094315d521fcf8795f28997a13fea249e957949f1cc021827152b7 WHIRLPOOL 64aeace6080e9fdfef49484fbf32665a1dee2bd0c597dcbe0d22e5aaf486d45e7f1919cb826b0273dfca780b80d9e19de616b638ac775190b1493a262c269d81
 DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0ecac361b9c3fde36c0680843b36b13edee0c77c82ce82de1fcb SHA512 4da03b4ec722bd3ce3453e1e9e9753f1d7ecf48bb15b3550270eff8748e74765c1dfe3af9e5eef7fec036d352d513797b0619042d76537b8670b55e29f52340f WHIRLPOOL 8d036a278c24075565fdaa6791f04a2cd413f5370c77688a225dd618bfa14c4a8926639b9077c5526084edfdf35de9aac4126fa62af633306e4e15b4985d0065
+DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 4717 SHA256 6186231ec60cc3e9352ef6aac6744b45d6ec096b9208c766b2f208edfd044f5e SHA512 b1d322976745d28065ee76a62c65231b4890715c38b143508d7b81c99d25c65298bb564f1c8e45c37db5b1b4255d9aa9d5ec0b090d9f63f1e0b9b453fc489f14 WHIRLPOOL 49b587b41efcfa7853ca98d5e6b18608428492396bbbe4c2f52b6840d7aeb3d68deccd306a0a92e03917ef7eab0710edc8fbdd010aaf25597f839622171371ff
@@ -61,4 +62,5 @@ EBUILD netbeans-javafx-9999_p20160829.ebuild 4717 SHA256 7f01aa38f26cbf900524180
 EBUILD netbeans-javafx-9999_p20160901.ebuild 4717 SHA256 afda23e506ad84f0c3b9faaa6f239f36b07e16eba600086efb7ebd2bf5a6f739 SHA512 1f8192151c037eb1ea1df568cd13ad3ccd92928ad5c4000de1a4f142c868fddcb72e23a78dd91bec1e9c6cdd049d55816d5af538def5221c628a80aae536a53a WHIRLPOOL 9b22ac91892e92287033d245ad630b0f03df805989fa0380b0254f1acc6693301553edaf074f70261ee2adde8de0f8898a18dca281b0d0fde7b80d47c509a09c
 EBUILD netbeans-javafx-9999_p20160902.ebuild 4717 SHA256 2680bda4d3faff0b54ebe79d3b979bfdcddfe24c9ed3a060f20f7f1f9b2dd273 SHA512 43ef1b89d8222e1186567012258c1fcd07dea49dc6f7a3c0220700ddb4b6d986cce5c65f38aa9279c50be491a13f38e976ed98cf1e1cff167e3c04b3235c857a WHIRLPOOL df09f4f8bf5e6d1040d68990dbef13af74b83ae673853dca716d112baa950e4611431e5a7418c7d6166a09bb1e3bc62d754c746493911ee741d87991e065896a
 EBUILD netbeans-javafx-9999_p20160903.ebuild 4717 SHA256 6097b7e592b621c4dda9d7add22f1b55ee3db94930de2d443a24e73f924b1a58 SHA512 6de7a16d5bb0eb35d9965669b6722ed3f533d0b3b4c8a9292cb85abdfdaa05af90616fcda5154d03b55401e935f2c9adee0500fcca4c283c5e03901a6086f3eb WHIRLPOOL 3428df131878f6ce57a0570c8819e56a9972262f1837cc52397659bbc3a092e9dda9bc49f4ed82686aa6f736e89aee64aadc53ee2812463493f4adfb4ce17976
+EBUILD netbeans-javafx-9999_p20160904.ebuild 4717 SHA256 9092e11874999e4514242e3e96b39301c82bd78e5926e6ca89d291b7d0d68305 SHA512 e2aa4601b909577c1ba2c48dde6b9108d48dfa1410b02c139990e852f6e323fbdb12e37bb0ce36aa3aeb484994078e89259bbfdddfdd9a6e86f744eccf34dba3 WHIRLPOOL 07ddac8fc9edd09a9dd13a1bdfb5d147ce0e61a71d1f7d7cd14fcb8e6e477b94854d5e64bae0abf56d0e3c6369092f01a5f697c7eba0acd643b4fd9bed8e18ca
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160904.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160904.ebuild
new file mode 100644
index 0000000..d86e1b4
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160904.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-04_00-02-33/zip/netbeans-trunk-nightly-201609040002-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 96dd81d..ff52674 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
 DIST netbeans-trunk-nightly-201609020002-src.zip 217296178 SHA256 6632afeb1d3fb3cf91648945d03703b474ac9ee5d6855f6a4732bd6c711c1d9b SHA512 bb9f63963e2895c46a0869fd48e401c5d14325e63cea951ddc6385f88dd6fef8385783432f094315d521fcf8795f28997a13fea249e957949f1cc021827152b7 WHIRLPOOL 64aeace6080e9fdfef49484fbf32665a1dee2bd0c597dcbe0d22e5aaf486d45e7f1919cb826b0273dfca780b80d9e19de616b638ac775190b1493a262c269d81
 DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0ecac361b9c3fde36c0680843b36b13edee0c77c82ce82de1fcb SHA512 4da03b4ec722bd3ce3453e1e9e9753f1d7ecf48bb15b3550270eff8748e74765c1dfe3af9e5eef7fec036d352d513797b0619042d76537b8670b55e29f52340f WHIRLPOOL 8d036a278c24075565fdaa6791f04a2cd413f5370c77688a225dd618bfa14c4a8926639b9077c5526084edfdf35de9aac4126fa62af633306e4e15b4985d0065
+DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 4412 SHA256 3f56c4dca782b3bc27f5b6e0ba6d786091db3f8f7e736cd78e2dd8ea38f76ff3 SHA512 7a55fb8c75cacdd59827b50c10308a08beeedae9a3a09342d18e84cb432c0db0f6b3c052db336ca0114b14c440253022fa5c06b3a3d8a4f3645188a92c0ae1e3 WHIRLPOOL eceb99365cdc47692b74bf170ba0488f1089b59ab577bec1ecd2f2c229c237b5ce669e62a68fe1f37df956ad53d05cac87646599139fca6e24e8a60ff3cad07a
@@ -53,4 +54,5 @@ EBUILD netbeans-mobility-9999_p20160829.ebuild 4412 SHA256 1c18d11fb3069006a7c1f
 EBUILD netbeans-mobility-9999_p20160901.ebuild 4412 SHA256 f89bb05601b815be0214a46e4b2f9e7629653fbb24d7c47fe8346dfc05805876 SHA512 5936e4e719ea10a3bd3469bf058dd18ea82a767868a238340d5cb38612db9e91ed02dec4ea89be94a523e0a4fcab44a2c056d0c8a6304ee263d19cebf0492986 WHIRLPOOL 6c7dba0c13eb79fd596efd755084072dd13e3a9a51d0fd48943f30ca00aa38b0b84416e013a67385690f03dc9fb347941864bbfca4ed093625149428281d5624
 EBUILD netbeans-mobility-9999_p20160902.ebuild 4412 SHA256 b56842e619c9aea9af10758ecb11edbdf4f1a05fef718082aa4c48d9c414d60c SHA512 28849bc3d76c099f535e2ec1bb19a2c2040c352064afa92bd27af043df83704746a070c58c902b678c056ce236492e56a669bac5498e57ee5c1fb5b7f6ff2cb3 WHIRLPOOL e8a13a1db5f270013896120b302ca6b8a2ee86f3f641f4f21bdba2e5d88434874a1f7b569739c89e21338afa625f04c7364f3b7d6306ec60d064c0b4329ae5ea
 EBUILD netbeans-mobility-9999_p20160903.ebuild 4412 SHA256 c679fc835f9c23a539c36bf23c60da60b42e00e96ac4f632d868f087162cbbf0 SHA512 ef197b823078ca47d602da175b6837e3e2a4b13a8fef903ac13d4760008c0ea7c2b5907887d3f5d994a31007c2a3aab8f8697808ce1c1a4d0186499bc2f0deb9 WHIRLPOOL 9ffef32a8f1f397c86d55db439799624205d478879f3303e8d6736eca30649b1f4ecb13efa2cfebd1d0b5c800b3cb89c20e3538c7aeae22751c09ae73de95ac2
+EBUILD netbeans-mobility-9999_p20160904.ebuild 4412 SHA256 d43f731d120fa8a04686e71c90554f2610012510676f4c3c320f744001f5d28a SHA512 24629e38f462371fa94464aca41bff28ab3f1f79c20458582dc923f2e7095007d1df6cb816acb215a465db8fe8a7a871302269ad76311051304c56c5a2f5d098 WHIRLPOOL 3a38e2a1c20d132eb3729e66428632a876f3897b2c8456b3fd5da24ab7e61c0356f1dd5859d9fbe7e6cfc5839df76eaf1a84442c105f47e593e14414b9b798f7
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160904.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160904.ebuild
new file mode 100644
index 0000000..1cdf720
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160904.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-04_00-02-33/zip/netbeans-trunk-nightly-201609040002-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 6a06b9b..333f72d 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
 DIST netbeans-trunk-nightly-201609020002-src.zip 217296178 SHA256 6632afeb1d3fb3cf91648945d03703b474ac9ee5d6855f6a4732bd6c711c1d9b SHA512 bb9f63963e2895c46a0869fd48e401c5d14325e63cea951ddc6385f88dd6fef8385783432f094315d521fcf8795f28997a13fea249e957949f1cc021827152b7 WHIRLPOOL 64aeace6080e9fdfef49484fbf32665a1dee2bd0c597dcbe0d22e5aaf486d45e7f1919cb826b0273dfca780b80d9e19de616b638ac775190b1493a262c269d81
 DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0ecac361b9c3fde36c0680843b36b13edee0c77c82ce82de1fcb SHA512 4da03b4ec722bd3ce3453e1e9e9753f1d7ecf48bb15b3550270eff8748e74765c1dfe3af9e5eef7fec036d352d513797b0619042d76537b8670b55e29f52340f WHIRLPOOL 8d036a278c24075565fdaa6791f04a2cd413f5370c77688a225dd618bfa14c4a8926639b9077c5526084edfdf35de9aac4126fa62af633306e4e15b4985d0065
+DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 4111 SHA256 914fc806c0c6dabe5b4b1ebc0b7f013e17fb042de587811b8410b46da9e39dfe SHA512 1eb08797e5e261912e0be656928324dfbddcecf60f7c849ba3f0952ed034cee39cf68a75ec76ea9257a0542529ac629849338ab5aa672763f350fe9f030113b1 WHIRLPOOL 19bc4171859d690450e3eca42c4e98c5b5a8814932b44571358c1349d34bd9e0a2866e5523bc2562df67d81926f61ba050fbf49425e53a48eff92e28843eb74b
@@ -56,4 +57,5 @@ EBUILD netbeans-nb-9999_p20160829.ebuild 4111 SHA256 3a140e3e604be1da27633011843
 EBUILD netbeans-nb-9999_p20160901.ebuild 4111 SHA256 ac43a3847c3a425129a9762b672638648e0adb1ead273f370f422ac8a40c5a00 SHA512 a9cdbf5243d3f0c99e35fe16384b23fbb3e678adf8e1adf3dc19a0e0befc653924d0b2d5b81f1d94cdb3c4de817544df1ce013569cc13f18851273da3c1d8509 WHIRLPOOL 72ab9db58379041a80fe899b6ca25a37194536ed2c0bd76ab43092d65817dff300cb03ff709e4765daec65be6745a6297844b7678b64185a4497309310bb9207
 EBUILD netbeans-nb-9999_p20160902.ebuild 4111 SHA256 c2bf444f66647328c55216168b2204ac355470292269a8d8125ee5c9f74b62a9 SHA512 51137098a857c2587a906f83f7687600413cf08f22cf303dae69f55b18fcf3e17bfeb4053a74c541481bfdd66f2fac49f6ca1d982a74884a3a05b0eb04b71f0b WHIRLPOOL 3a58494bbe8414f9460c93d9bb3a8bb537b06ad50844b1e15706ad9b94c14446609c3581a89d42e189af69206743e5ef9544712663e163de586bbcaa2d53d12a
 EBUILD netbeans-nb-9999_p20160903.ebuild 4111 SHA256 a7d284fa1e53b7b70944aa09538924e77529422fc64bbdb283ac58fe6c7224e8 SHA512 4ca9f520a3a98fd6cbe3e6c06f621f8b361f4d898476830cc0d0adaec228cec3b4c3c475bdafb8af3528d00f599efe8b9c7ae9a69d87393881b53d59df67e458 WHIRLPOOL b5b5f8cf90dfbc7e4848187db3165eee5f3c78933f53c52236d8be02a6860e3f2821f681523879be6f4c32b74a7055290e156ea3a89eec2b668a6e8401917553
+EBUILD netbeans-nb-9999_p20160904.ebuild 4111 SHA256 13905c43a2c31a16574baf7f6e3804b4be13bc6af7661c9cb47ce3c2a4484a6b SHA512 c9f046eb96b1840600023153590d02579b8b0f546c79a6d0515803658713ea719aa629fbe7412c0e8a576877e506470b5e341880ead6ee1bf7c4e8615dd25295 WHIRLPOOL 3bd9570835d4cc8f5f8e7931edf85e3c05a6d5bf1f3a43a84c11b619b1733c868bb9c9cd7bd1250678740fc323857682b095bab5eefb937162cc3e4dddf98cdb
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160904.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160904.ebuild
new file mode 100644
index 0000000..aa6eceb
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20160904.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-04_00-02-33/zip/netbeans-trunk-nightly-201609040002-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 2ff7adb..4298230 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
 DIST netbeans-trunk-nightly-201609020002-src.zip 217296178 SHA256 6632afeb1d3fb3cf91648945d03703b474ac9ee5d6855f6a4732bd6c711c1d9b SHA512 bb9f63963e2895c46a0869fd48e401c5d14325e63cea951ddc6385f88dd6fef8385783432f094315d521fcf8795f28997a13fea249e957949f1cc021827152b7 WHIRLPOOL 64aeace6080e9fdfef49484fbf32665a1dee2bd0c597dcbe0d22e5aaf486d45e7f1919cb826b0273dfca780b80d9e19de616b638ac775190b1493a262c269d81
 DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0ecac361b9c3fde36c0680843b36b13edee0c77c82ce82de1fcb SHA512 4da03b4ec722bd3ce3453e1e9e9753f1d7ecf48bb15b3550270eff8748e74765c1dfe3af9e5eef7fec036d352d513797b0619042d76537b8670b55e29f52340f WHIRLPOOL 8d036a278c24075565fdaa6791f04a2cd413f5370c77688a225dd618bfa14c4a8926639b9077c5526084edfdf35de9aac4126fa62af633306e4e15b4985d0065
+DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 4418 SHA256 521f26a4aaf11c9f8c83ec8579139f3e7602cad7d305610f7c39b9e928231f69 SHA512 67b56b4c640b26ecc4b5dac146a07490944c8139da84a129259b88461fa8e6d3268f1b39becff6da3e49aa86b8da666dc7a1a52de02ff3a7188f0930f6f59480 WHIRLPOOL 9e017f383407056f3b242db533162cce5adfb83c7bcb731f54bde9637a3f5a0915abcb5a4cda1e7abcc30879e39d656105b6fd45e7a83f043ee4a2d66f82b89f
@@ -58,4 +59,5 @@ EBUILD netbeans-php-9999_p20160829.ebuild 4418 SHA256 8271d2a5823efb1756378ff76a
 EBUILD netbeans-php-9999_p20160901.ebuild 4418 SHA256 4c21387443b8257d5598bff2323ea12ee5f59bcbbece9aade5176ef8649bfc72 SHA512 92d4305f2a4260652df7ac8bde324305eab2d89f5061f91aab5b946d0c739cc832c08475a21c745aeb2999a8bb19508dec63cda7fd46b1beead680c81290b77d WHIRLPOOL 37b231db271985e5b1f187c7b51530f740159c0af14444adaa03bef9d1f39d440d3ea8195502c8c8de771a0af6ef89e593633ac52b3f476ea510ee302aec6da9
 EBUILD netbeans-php-9999_p20160902.ebuild 4418 SHA256 7eb52f802b8565a63f235db9a36e3451d065a403ec40915184624abcf3a4d7d0 SHA512 f56f6af07f84b84c832482dca39fa794cb36acdf28f32e1ae9762429e31a23046163b3ea1d7bb8d776399b3a19ce2a43961a8ba8ec92ab14577dcd7a23ebe070 WHIRLPOOL 5a1cab69434820eb7f042c1fb1d85c3c48a66f6815149b95c95bb4fb4f7e353f31a86830f86933156ce8891bdcdd03b89a7d229ceee7e856021aa4f9f080dd1f
 EBUILD netbeans-php-9999_p20160903.ebuild 4418 SHA256 c0da03da74ad432614935a2c5178114b6a50ff9e005da1e03578d34b3ab12a18 SHA512 1cc5e1aadef55aea4e0d17f4b4e97ade49c091b14cae0740d6282373432d4f682b2e091fb32efdc20586afc3e74f3bc70f9592994f1ac2150e451e9d6d338599 WHIRLPOOL b6c9f0b2519165a73a212976a45fa5a02762fa1cfe784534ab07f87c3579b9151aa389700af9437489262effbb3c84f92baa0d16c4413e8dc28da32e9addf165
+EBUILD netbeans-php-9999_p20160904.ebuild 4418 SHA256 a17bc9f6e62b924bf20ee0470be1fd2a94ca037c28cfe25420942c421618f752 SHA512 2253cdfab4a994e9e55be449d8f8184f0523ff9557c431ff9365df5aa57376f33863afc51228f2f3288bbf7b1cc47ec580e2fc3f6a71d0b738595e9457304b86 WHIRLPOOL b441b3265616095482152deacc3df59f6bc505a1f0a6884153841928addaa13b0d6e2dab8fbae69b2b5872728f24041d60ecf98a193ec0d92dca59270aec7937
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160904.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160904.ebuild
new file mode 100644
index 0000000..dde5a35
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20160904.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-04_00-02-33/zip/netbeans-trunk-nightly-201609040002-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 dbfe1be..2baf33d 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -53,6 +53,7 @@ DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
 DIST netbeans-trunk-nightly-201609020002-src.zip 217296178 SHA256 6632afeb1d3fb3cf91648945d03703b474ac9ee5d6855f6a4732bd6c711c1d9b SHA512 bb9f63963e2895c46a0869fd48e401c5d14325e63cea951ddc6385f88dd6fef8385783432f094315d521fcf8795f28997a13fea249e957949f1cc021827152b7 WHIRLPOOL 64aeace6080e9fdfef49484fbf32665a1dee2bd0c597dcbe0d22e5aaf486d45e7f1919cb826b0273dfca780b80d9e19de616b638ac775190b1493a262c269d81
 DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0ecac361b9c3fde36c0680843b36b13edee0c77c82ce82de1fcb SHA512 4da03b4ec722bd3ce3453e1e9e9753f1d7ecf48bb15b3550270eff8748e74765c1dfe3af9e5eef7fec036d352d513797b0619042d76537b8670b55e29f52340f WHIRLPOOL 8d036a278c24075565fdaa6791f04a2cd413f5370c77688a225dd618bfa14c4a8926639b9077c5526084edfdf35de9aac4126fa62af633306e4e15b4985d0065
+DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 9520 SHA256 37d585dfcb3fe3945f1a40493695892af455f99a6ad6b4d33663251494e56a4d SHA512 9fa9e38328bb44b437b04a877be340d234b6d1a0039de75bb61852f142174f3d73b227828cb6bfd2def19050cb5102ee3c8f4b98e9044df51b667c81f937d4b3 WHIRLPOOL 66490293a57c48db63f947de70f0f2d505b8ca3d86f4b09e140c1f4ba87fe744d07dd58ad272d9ce877b67e827a4c65e25fe63839142e8c9a7f8c626a3741c8b
@@ -79,4 +80,5 @@ EBUILD netbeans-platform-9999_p20160829.ebuild 9520 SHA256 0f78647b9f0684f9c3c3c
 EBUILD netbeans-platform-9999_p20160901.ebuild 9520 SHA256 9e58f6281f7dc2b135e95047be70133098c8aa8841e72a51942b88b50da5d51e SHA512 01e963910202ed93b07ac1b99dd9214fc88989d27904dddf2082cb7f334035281bfff2c4fa63a7d5ef115ce5fb43bd4d42e5d6d325f65c995e662e63fee6e969 WHIRLPOOL c6a57988c8c04a6c2efd4abee7719e7cea63e135b944e167109e343f47b3dfe3b44573b48e76aad2bc3e6270ff166d45daad99f250cad94f7d8229b96bbcb178
 EBUILD netbeans-platform-9999_p20160902.ebuild 9520 SHA256 1ad4417b676389ea8b175332ba961ca4811a1b324562cc49fe59bb4528eb91bd SHA512 8d4fe130cd0f0b0a41672fa86ae1e6359b80a6eff8f996203171d1e1fb6dfca60aacfab24b0f565d5dd780f167e19ecdad28c21062ca045b69761bed4c49728c WHIRLPOOL 8ce61effe4e984dac4bade67704dda5eb15566df0f4f869796cdc5d7bc7107ef964fb2a593eb504fea424af0ef5994f8172660d9438f0dbb16815a4fb26e7464
 EBUILD netbeans-platform-9999_p20160903.ebuild 9520 SHA256 6276fe781629a5adad6b9b3df582924286c810e2232a01b0821153400d47d2aa SHA512 ddbd3b083bb45f4218477b7a7c5198c6212864e37a1c6f9032fbb57243ca1c09fed5023eea2c6c15658859d6f95a9af1ef6c9139968b4eb456d8fc17302608cf WHIRLPOOL 667caa6aa1d54271ee918a0daf4dd1cfc7f46734f76805c67092cf71b5782dacd11d0891891db8bb628fd33055abb6f5322ba9738c466fca4bc23d3645e9d8ce
+EBUILD netbeans-platform-9999_p20160904.ebuild 9520 SHA256 2f94cb4b5561a356deb3c4c18b9e4a3f3a1473932a7282bacc18463067c85b5a SHA512 4cb75ea59f4b8a31f378b607e3c7e873da8bb1d1b1df7f1cf3c93cb67cc842835516e966ee1d43d55f573b802d1e1d8fa724fc4a2df965354c5d75749aea4fe2 WHIRLPOOL 41c4974bb9346578722d41c593ecbdb7f68842f6c1130cfd861c36313843ab980aec21b12629d1720681c1e78a6058f2040d8535a412fefd44a210777f0b0be0
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160904.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160904.ebuild
new file mode 100644
index 0000000..48a52fa
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20160904.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-04_00-02-33/zip/netbeans-trunk-nightly-201609040002-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 ff8023a..9c8253b 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
 DIST netbeans-trunk-nightly-201609020002-src.zip 217296178 SHA256 6632afeb1d3fb3cf91648945d03703b474ac9ee5d6855f6a4732bd6c711c1d9b SHA512 bb9f63963e2895c46a0869fd48e401c5d14325e63cea951ddc6385f88dd6fef8385783432f094315d521fcf8795f28997a13fea249e957949f1cc021827152b7 WHIRLPOOL 64aeace6080e9fdfef49484fbf32665a1dee2bd0c597dcbe0d22e5aaf486d45e7f1919cb826b0273dfca780b80d9e19de616b638ac775190b1493a262c269d81
 DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0ecac361b9c3fde36c0680843b36b13edee0c77c82ce82de1fcb SHA512 4da03b4ec722bd3ce3453e1e9e9753f1d7ecf48bb15b3550270eff8748e74765c1dfe3af9e5eef7fec036d352d513797b0619042d76537b8670b55e29f52340f WHIRLPOOL 8d036a278c24075565fdaa6791f04a2cd413f5370c77688a225dd618bfa14c4a8926639b9077c5526084edfdf35de9aac4126fa62af633306e4e15b4985d0065
+DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 3472 SHA256 9e18bfb3068b1c55766af682d3248c8337d18faad1344092a9c35f42a6d8e626 SHA512 c69bba3bae120d6bdb9eeb3c27663b56a0bb3f11fe58ab3f100175ff8e5dc214d6ea87d3587071bffa2d26569b410b09477eb4a55978ab25d63edbf956598df0 WHIRLPOOL 0443cfbe6289fdaf07720ce3816a1585b2540bf0611645eafe3395104df4862f0fa25f5d907794900648cb28b4883911baa8e607a646dc74b5945ea60168ffa7
@@ -53,4 +54,5 @@ EBUILD netbeans-profiler-9999_p20160829.ebuild 3472 SHA256 5b2114102e446e49f573f
 EBUILD netbeans-profiler-9999_p20160901.ebuild 3472 SHA256 f5edd5388e32394979dc528bdf3818d27500a6ded3041c07a0e675bbb3274af3 SHA512 1c312dcc8754a84121916706864826e36283e73611744977b5821ab25cb6aa8c7768f1a42f1daf68a61a0b2b62a90fdc741d45a5855682c3b4292b75c02b5a12 WHIRLPOOL a792c1d76aab6d528d6a43b0e440fa74b75bcdda092d1ff994ef2d9b412e2a43dd9c5c81d51a06daa8ae51d7228b73994d882fb1bad2d39e04b5fff55fe38622
 EBUILD netbeans-profiler-9999_p20160902.ebuild 3472 SHA256 0004247b6668fd223edff24e1793f13a9ceefcda665230b5e7f5494634b15189 SHA512 ab2972f4fa5e525505cb00530f652da76384253d2459796459625fc0a63d178d5f36204cdd068a57b5c3ffa5dedfcf810d3d1510824b829510365652c85ea98f WHIRLPOOL 98d14bced6600c4afe105c8b9f7e521c475a61c9b6a89992b6e7e38fbb5311cad67ca97b1808764125957eeb7f5afd6fa8c39d17b0603c16afdb91225cfdda6a
 EBUILD netbeans-profiler-9999_p20160903.ebuild 3472 SHA256 b5cc8b42343a869a356e30976b3dba0c3509cf7f7c72d594e9c9800e19647cfe SHA512 de5ec146e0b69ebf144d4cd5dc11a0b55923483101837755e5f76ffcdb13e1fcd90669689e067d0f92a31b7f51caf2e0c5ee24eaabd3151a6601cd6a8e191aad WHIRLPOOL 8ac34b0e90c949f90bb729335de7c953973bd1d5206cb0f649177c1642151f6fd97fe4987726fe9d8108dc4e1b565c764fe82f163c00addaa30e598fce260095
+EBUILD netbeans-profiler-9999_p20160904.ebuild 3472 SHA256 cb0ee8c87fc41d375f921360485d437360fc857b502755aa66d7ee0ea94869e4 SHA512 3e645315f7ee10c281740a44cdb4ea4a68669f94899f6bad4f0ecd480eab13a98e293cd2d7082d6f688e20e31a824e543f6a6f2dbbc68d18915c5adefaec9691 WHIRLPOOL 564973383e38fd1c9fe3664fcb76d3410bc660c07c230c1939b1fd5054ebda1f905819a9dc831ca068bbc29dc1b88aea90ae47308ac1ad4106e183d87dc2a2cd
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160904.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160904.ebuild
new file mode 100644
index 0000000..2a84d4e
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160904.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-04_00-02-33/zip/netbeans-trunk-nightly-201609040002-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 c8f81e0..c327cfb 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -46,6 +46,7 @@ DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
 DIST netbeans-trunk-nightly-201609020002-src.zip 217296178 SHA256 6632afeb1d3fb3cf91648945d03703b474ac9ee5d6855f6a4732bd6c711c1d9b SHA512 bb9f63963e2895c46a0869fd48e401c5d14325e63cea951ddc6385f88dd6fef8385783432f094315d521fcf8795f28997a13fea249e957949f1cc021827152b7 WHIRLPOOL 64aeace6080e9fdfef49484fbf32665a1dee2bd0c597dcbe0d22e5aaf486d45e7f1919cb826b0273dfca780b80d9e19de616b638ac775190b1493a262c269d81
 DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0ecac361b9c3fde36c0680843b36b13edee0c77c82ce82de1fcb SHA512 4da03b4ec722bd3ce3453e1e9e9753f1d7ecf48bb15b3550270eff8748e74765c1dfe3af9e5eef7fec036d352d513797b0619042d76537b8670b55e29f52340f WHIRLPOOL 8d036a278c24075565fdaa6791f04a2cd413f5370c77688a225dd618bfa14c4a8926639b9077c5526084edfdf35de9aac4126fa62af633306e4e15b4985d0065
+DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 6242 SHA256 69f1b62f9854561efb578637a3e15ebcfff378922782577ea06c7043f40d39d1 SHA512 20576ede88474e3c3f7fd2e72384675c60730b9c5f4cfb452bc7a87905308feeac77307a855f87978c044c308be68584e9375850b342cd48eba214b113e5aab5 WHIRLPOOL 0bc8d4883a57af2ed2d5a5ca84d4902b03bf1434579defff2737d6e47a5ea23154c73e58efa000a123dbb74a677b68ce1140640d2d06b6cd0335cb4d6f481cb9
@@ -72,4 +73,5 @@ EBUILD netbeans-webcommon-9999_p20160829.ebuild 6242 SHA256 ef73c787c9210d44569e
 EBUILD netbeans-webcommon-9999_p20160901.ebuild 6242 SHA256 46564b33607829cb2f0da5a2167f53a1be8a62c2c4f8754ef3fe384cf3bea584 SHA512 51558f03f77aa0c85ea437860a62f307b56187e43fc0a2bc1724011c62599a17b157b212e42c27b90cd4c7b2227cb541002ef4738d546afc6196175525e9458a WHIRLPOOL e41cac853513b3e3fa214ba2747fa32b0054dcd56c9d13f985c15400076180607ba7c953818a07165a979e584618d65b58bee623b80c103f739a9835762d79dd
 EBUILD netbeans-webcommon-9999_p20160902.ebuild 6242 SHA256 b6391591e1d5a6a7814a6578720c862e5b395747ff94f63ee82c915d13867234 SHA512 564fe2c6a89bc3dee07fb80e07cd953d1dd8dee5f04135e7fcb41c738fcc70fc8fa4f6fffcfb394954636ff744f5160aea07f0004a43ff1c8f9542fff22a09e1 WHIRLPOOL 815d7c6fe6689a004740afd0677bf2b3cbecc37456cbba9103ff48e67ce2f0b1ab62170b16e958b8e3658fd4d1679de54d7d6f391da64bc9696bef0aded5d558
 EBUILD netbeans-webcommon-9999_p20160903.ebuild 6242 SHA256 63fc4965bcfa94463df38e9f35ceedb03cb46ed00e50d738bc7be60e777e2516 SHA512 03b1eeed9b60778dac04f254f0b3de138bbdee4178046dd4fa615d1ec52ad367c1e655d6a2120e796b5ab1a50f1984d7ba5aec877a9e11c965851719b4b13f8d WHIRLPOOL 58d570e1fbf329488fc5d517557575f6167036f5f66c6f43c85583ba61460d3e64587e45f99d5b6d0aeccdc86acc8bfdf1b76632384c029755cc473026c70ee6
+EBUILD netbeans-webcommon-9999_p20160904.ebuild 6242 SHA256 a09736d7ab4471e200f2e519da6373461cfd9a8c7c9449c5d8bc35aea29083be SHA512 723efd1d67ae020c17788e56b35f24681d5e764086c85f95503ed19218b30316a20e91691c09fd15677b07481b8fd3decd5b7fb012d86bd797d1218259cabc9a WHIRLPOOL 06f729a75270f6c89e7ec6d5e2739210be822d04d0a74b80e279444511da95d9be9bd915ed60bd7cbdc15e10774cad68d7f343fbcc0e53ade4be58dfda65d284
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160904.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160904.ebuild
new file mode 100644
index 0000000..80ba02d
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160904.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-04_00-02-33/zip/netbeans-trunk-nightly-201609040002-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 7a66eec..8d34964 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
 DIST netbeans-trunk-nightly-201609020002-src.zip 217296178 SHA256 6632afeb1d3fb3cf91648945d03703b474ac9ee5d6855f6a4732bd6c711c1d9b SHA512 bb9f63963e2895c46a0869fd48e401c5d14325e63cea951ddc6385f88dd6fef8385783432f094315d521fcf8795f28997a13fea249e957949f1cc021827152b7 WHIRLPOOL 64aeace6080e9fdfef49484fbf32665a1dee2bd0c597dcbe0d22e5aaf486d45e7f1919cb826b0273dfca780b80d9e19de616b638ac775190b1493a262c269d81
 DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0ecac361b9c3fde36c0680843b36b13edee0c77c82ce82de1fcb SHA512 4da03b4ec722bd3ce3453e1e9e9753f1d7ecf48bb15b3550270eff8748e74765c1dfe3af9e5eef7fec036d352d513797b0619042d76537b8670b55e29f52340f WHIRLPOOL 8d036a278c24075565fdaa6791f04a2cd413f5370c77688a225dd618bfa14c4a8926639b9077c5526084edfdf35de9aac4126fa62af633306e4e15b4985d0065
+DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 2721 SHA256 b1ee00734f3213fded0e0fcdd807bdb20a114ada052451df6e3566142949735c SHA512 01e7acb1638070ca74e7d31fc29fc502f60d30bbee61a64e751dac7503cd6edfec84fd1ee00d54e18ccdffc560cf3bcc0255bc06d8f68519ade5b4606d240cab WHIRLPOOL 28b0a1f3f065590227678a99efcd2f28b7e78da4e19b86b4518e4a28b3884bc43a98cc5c7ee12ea4de833a15319227eef62ccdaac4d28214dcff5bcdd425f79c
@@ -53,4 +54,5 @@ EBUILD netbeans-websvccommon-9999_p20160829.ebuild 2721 SHA256 3dac61291723c9248
 EBUILD netbeans-websvccommon-9999_p20160901.ebuild 2721 SHA256 91c5896de81d6ec33f5170b1ae03eefdccc531fe717a7965b29b1307736fd2fc SHA512 dd006f9188a31b559f452b844b9e82fd221536d629c55a8ad0d617aeb20f9d4cc905edf7e640acb8fdf783282004bcb036d13ee0c744104b0028d29e8bf33d0a WHIRLPOOL d329b2bef5896dcb93946f8bd6f1495ad5b4e125c38ae449eead2e9491db0766fcd895254e3f95e2ace97c29771eac434c82744d35dcc025879b5b0986b27ee9
 EBUILD netbeans-websvccommon-9999_p20160902.ebuild 2721 SHA256 a665a8e01867973c6572b49b7115b82cbd21798ff5032278488cbf6a1783072d SHA512 286157850a10f1322d379058cc51be952f1ca622253bb5aa786d1bb6fc27f0957df1fd666b8451fc4ea293f821de38694835312bb0e8549b75957c03455307bc WHIRLPOOL 058e4288fffad281c2ad45f258f04665cc2aec3d728ccf9bfbda3be99768521b5970e15eba4e22da365ff66d58ded4898a03601ce6440e2456043a5593c6958c
 EBUILD netbeans-websvccommon-9999_p20160903.ebuild 2721 SHA256 9cae6e8d7a7d95bf07b7df8f4d55d2172a2b3587d2cde176a8d2471e3f2895d6 SHA512 98ab9f7c7fb6fcf27ae35d2289b1fbf0447c73160beb5c0b8a0c2c37a6dc2f4b3e3e66748bcb502ea3bd12480143838900b733d6734635f402b58e72f3e07c94 WHIRLPOOL 6b9ae4a1343d639dead69c408c8c2bbca7f237e6fbd2118df58d80e41b79376a17b915ff643b4c39b25268418bcbf85759e62f395a64e19ae87190ba5edb2418
+EBUILD netbeans-websvccommon-9999_p20160904.ebuild 2721 SHA256 6bc66b44207a503e93e0b2bdd282888e70ceca85b148c38e2ad534bba5cf1adf SHA512 f746abb31a33a27860e80fe723901fd82ebe290b6003b6b914831706bd56d980dda817d791ecf3967d172580e8cff7b64c0a11b0a4cf4b7e5fe851c0ca2a3550 WHIRLPOOL ded112eaa645f68b1a71c9671d65279314fb2535ce5e78fbddbe873e967fde781a7ebf77d0a911f9e8b9cfa02fa3d01d689ff2dfa69c01e2e3231b278488258f
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160904.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160904.ebuild
new file mode 100644
index 0000000..c35ea20
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160904.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-04_00-02-33/zip/netbeans-trunk-nightly-201609040002-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 958b65f..754368e 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
 DIST netbeans-trunk-nightly-201609020002-src.zip 217296178 SHA256 6632afeb1d3fb3cf91648945d03703b474ac9ee5d6855f6a4732bd6c711c1d9b SHA512 bb9f63963e2895c46a0869fd48e401c5d14325e63cea951ddc6385f88dd6fef8385783432f094315d521fcf8795f28997a13fea249e957949f1cc021827152b7 WHIRLPOOL 64aeace6080e9fdfef49484fbf32665a1dee2bd0c597dcbe0d22e5aaf486d45e7f1919cb826b0273dfca780b80d9e19de616b638ac775190b1493a262c269d81
 DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0ecac361b9c3fde36c0680843b36b13edee0c77c82ce82de1fcb SHA512 4da03b4ec722bd3ce3453e1e9e9753f1d7ecf48bb15b3550270eff8748e74765c1dfe3af9e5eef7fec036d352d513797b0619042d76537b8670b55e29f52340f WHIRLPOOL 8d036a278c24075565fdaa6791f04a2cd413f5370c77688a225dd618bfa14c4a8926639b9077c5526084edfdf35de9aac4126fa62af633306e4e15b4985d0065
+DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 6939 SHA256 6d77d80205042f72e52fa2a6d98f4d8d940e3298f2e67c4db48cf3360c9ad470 SHA512 70bae8da40f377610552d1e108797602a61130c3c7910bb8c65c832242937e8e26e986706197f21ecded09709facfa1b6b2753b845cf81dee8bf8335cbf3de55 WHIRLPOOL 27273a5debefbfdcbe9f45c5383c104ecea9e1b4dc7793c7941196dc8c4d17c708f6d7d6fdd7b328afd2c86254a9376e167df8f16f0356d9e5c8866d9d83986a
@@ -56,4 +57,5 @@ EBUILD netbeans-9999_p20160829.ebuild 6939 SHA256 0ef0e941b9969a3c0d7fdee5eefff4
 EBUILD netbeans-9999_p20160901.ebuild 6939 SHA256 e5770caa7f53a2d42a136a4eaf8ee427d6b160c097e3eeb9cd6edfa73d0f40c1 SHA512 e47e2aaf66892b07f9e4bbb31b2643fef1141c86d780d6d1d0666f1678674dda490fcfa8edebf4527943c1426531f423460b06499c1821abc3e38d784ac5e848 WHIRLPOOL 0b7dfc7134c5f3966a1299e128ee8257a59dc49a072e6faae9a2ea76ddda1fc6e7dd9d8ffd67e8091a74864817e340e06a2246822af903581c4ad59c953cb972
 EBUILD netbeans-9999_p20160902.ebuild 6939 SHA256 22b3583c58376a84e2250f9ec8ed314c502c0dca178271bb279beb3f3cf9184f SHA512 d3d50613316f791b03de94d7c8d732037f55f9dde225359ed4b207d47c763492f8a8f58959973652615f75dc1f8b87ec50aae224afdc67f12d9f739b7a64e9dd WHIRLPOOL 9bd2bf61317489ee634fc899bd0068c0d220e4df607318f9e41fce4f77a6774d382a7d8d6119d44f6c0599411756d9bd3765187e22016202e31b85a3d68d99f2
 EBUILD netbeans-9999_p20160903.ebuild 6939 SHA256 c1ef0a5fa1d6014ad0f06f4e19bb3a10fd213b15ad44895efb58a747d37a9960 SHA512 44f8c95f94342732891b34091f2c6c653a90b0cf5e402f2d80088c17d5d9978f6555d553f7f4765c12042ed7752274d880d3e78a76c256d0b41070d7f0535b19 WHIRLPOOL c5c21860c8082ee1f592dd815946c91b27eeba867d9d53d021935b7d5816531d8395c6f75b8f6d8da3beb5a55db24744bfee16faf12d363e7a90f933b714926a
+EBUILD netbeans-9999_p20160904.ebuild 6939 SHA256 a95dd06b25a5a2472489f04d9c8ad979a3ac39a0de42207fa00493f79a2eadbf SHA512 558ff853f831c12c01b89b2f635bdd0bea4741652fc086be8cc7cfafd8ba2cd118b4c65e10850bf6141a7c7118b32362951d4e78623c0dad7feac47d70a83787 WHIRLPOOL 8ddfcdf88ca189c19c8db25fe2c848373ae52790473535bd57235f761f169ff938161fc62f24e6cd56403c7094f6117f2e0e7afca61c4897d634da32ee765c23
 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834

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


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

end of thread, other threads:[~2016-09-04  7:12 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-14 11:36 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-apisupport/, dev-java/netbeans-profiler/, Miroslav Šulc
  -- strict thread matches above, loose matches on Subject: below --
2016-09-04  7:12 Miroslav Šulc
2015-01-20  9:13 Miroslav Šulc

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