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

commit:     e0cf638ba8caf36b2495474726af26809bc628c6
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 18 10:10:37 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Jan 18 10:10:37 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/fordfrog.git;a=commit;h=e0cf638b

netbeans: bumped to the latest sources

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

diff --git a/dev-java/netbeans-apisupport/ChangeLog b/dev-java/netbeans-apisupport/ChangeLog
index 3149c88..a6176fc 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_p20150118 (18 Jan 2015)
+
+  18 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-apisupport-9999_p20150118.ebuild:
+  bumped to the latest sources
+
 *netbeans-apisupport-9999_p20150116 (16 Jan 2015)
 
   16 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 47d9b85..7f7e802 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -45,6 +45,7 @@ DIST netbeans-trunk-nightly-201501130001-src.zip 201373370 SHA256 eb5fbabdcc6f24
 DIST netbeans-trunk-nightly-201501140001-src.zip 201400262 SHA256 65aef07f80d9cfe6b47ac2c3aa2be2f1d98a7d9466a44c5196cab7b88e743a2d SHA512 1175de97a824b8be65a5b25b20cfcd17ae4ab4b101794f7dbdde8059b7192f30193d634e63141a54e9e8c2018166f1f204d321270ba91959d450839b9e1fb89e WHIRLPOOL b5944d4eb663cda53d83f88a52775868cf942c632e5cae0be25970fde60557aa43f69095ddc0861eb872f815e562f6998a5873b8aae1c2c660ae8e8ade75b4c2
 DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6b3b7a2050181c2ec341fa33b031423a913141b9c76aa590044 SHA512 6cd0ff2334b892835c91ae0c0bcf996e2322673533f46cec0efa37db25837f809202de061696c737da837099179a1fe20ef7bd569f6c04375e6090a8c5757d4d WHIRLPOOL 82a9189ff14ac9f373d84346361b231bc7ef298be20892b7a76e20ba8fe3762055f11957f40ba914d939d650cf7f9b098604aae84d30622e207498a5ad14fa81
 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
 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
@@ -84,5 +85,6 @@ EBUILD netbeans-apisupport-9999_p20150113.ebuild 3390 SHA256 4dfd14635ea8c13041b
 EBUILD netbeans-apisupport-9999_p20150114.ebuild 3390 SHA256 167281625d91d0f9d07a4fdbe21a76c17f20df9b960b5b685a96e6b9bb5961e4 SHA512 667a74b58dfd1ebf217850cc52584135dc21557170e3211d50cb28ee9d46ee15e7c54b94e9751028570d361f81dc7563f57e92b19f5565aa1170a1ab588e696f WHIRLPOOL 36778499d30133821d09324f1f30637bc98aa951eb487be2eb206013be8f83c7b29507e537400d6cbde5512b0d2399c2fb92d1113da987f7d661f396905affd5
 EBUILD netbeans-apisupport-9999_p20150115.ebuild 3390 SHA256 4011ee695fc0a3e2c8b64fdca954fb5e114af6e364244995ff37aad4f18d3a82 SHA512 74cd50a6a601b2e2a8ecde3875b7f79fd401cc6fa5b0fb73726306d14aeb1a41d039cb3c1f778999dd1f9a226be6bf6bad84e2ca2dc9b6d75065302f496b3233 WHIRLPOOL c954a6f2d0e2834074dc2f5b32165d84104f560613f9262c1d29aa4e1f00564c635c8be17edf91dbc96ff63f1b8a753fec3398dd9b6cc8ead0695b2d5c2b7f99
 EBUILD netbeans-apisupport-9999_p20150116.ebuild 3390 SHA256 1a2de3ae48856cb1273f42076fcd475500c596557cfd291d3d245be3d9bc2784 SHA512 59eb275e8de0a41dffa5a1009e5cbee80f4e8286a654a54427841c10bb7b336e979a896c6ae03aa32bca05086b5dbab2a38dfdc853342e5e4ce62b33cbb8df46 WHIRLPOOL 54932975567f37d6cea466a3615499831d3d35b55547b0e30f1f3483f47b61a040b4f03805e8f9bdb8794bca56e74c07e385314c826adabfefb872464b7a1a67
-MISC ChangeLog 153527 SHA256 9d9546dfac3be11231922a1b69b679e2c0ecc92f9dd39a5e6bcbc6d312fb5aeb SHA512 0897d7be840cc8dffd51409987d23496f62c4116e77cccc5b88df2214eeadaf768f8be474683e449d4aac198db5834907a2dea7bb4564e527a705280e78229c9 WHIRLPOOL 5818561b4c499e229fe901ba2107d1e1475625b66e1b957ca550b27910a9d777512aa6f3c419e0c49caa19fb3629533e2ec3d9d801d2b359796007df325c38e2
+EBUILD netbeans-apisupport-9999_p20150118.ebuild 3390 SHA256 7113ea05991ec5fe4dcb311cb36ca9d5497806196ae43ce8a91d37f5db425087 SHA512 c87051ced9f1d444662a841929a92d6b4b947bde34493b948c7fdec9251127a79b274e17a6a9475e452f7611a210d2239ed04ad2b9648e534e3f8c202463dc90 WHIRLPOOL dda7b95aaaf871ad2f50ff1ab7e352be49c2867c41a732da2e48d9313d8038480c8e779e891dfece6c62098ca6bc86aa31144381312ee1861469337f9b4eb339
+MISC ChangeLog 153708 SHA256 6355ca8bf5d86fa7a3682a023ac6386b75deafe1d8ae5bf8d9a6999b71cb2dd7 SHA512 ed32cb4aba6cfb4e2e724485594022c16ab89d0d3ee3a4deafcd7d69437760682fd672f508ef1b4081d435998d5045d027a36632f3eb67f848fc5148b52824d8 WHIRLPOOL 3dd5b4841c308098d6bd881fe08e6ff0061cb8b215538b967746273682683d6ddb9f7d836f6264382ac1f63ca356a73059971ac388114c4cff391eefbf1ddcd0
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150118.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150118.ebuild
new file mode 100644
index 0000000..f4c3148
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150118.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-18_00-01-55/zip/netbeans-trunk-nightly-201501180001-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 4417583..242929e 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_p20150118 (18 Jan 2015)
+
+  18 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-cnd-9999_p20150118.ebuild:
+  bumped to the latest sources
+
 *netbeans-cnd-9999_p20150116 (16 Jan 2015)
 
   16 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index 31b447b..505bac0 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -58,6 +58,7 @@ DIST netbeans-trunk-nightly-201501130001-src.zip 201373370 SHA256 eb5fbabdcc6f24
 DIST netbeans-trunk-nightly-201501140001-src.zip 201400262 SHA256 65aef07f80d9cfe6b47ac2c3aa2be2f1d98a7d9466a44c5196cab7b88e743a2d SHA512 1175de97a824b8be65a5b25b20cfcd17ae4ab4b101794f7dbdde8059b7192f30193d634e63141a54e9e8c2018166f1f204d321270ba91959d450839b9e1fb89e WHIRLPOOL b5944d4eb663cda53d83f88a52775868cf942c632e5cae0be25970fde60557aa43f69095ddc0861eb872f815e562f6998a5873b8aae1c2c660ae8e8ade75b4c2
 DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6b3b7a2050181c2ec341fa33b031423a913141b9c76aa590044 SHA512 6cd0ff2334b892835c91ae0c0bcf996e2322673533f46cec0efa37db25837f809202de061696c737da837099179a1fe20ef7bd569f6c04375e6090a8c5757d4d WHIRLPOOL 82a9189ff14ac9f373d84346361b231bc7ef298be20892b7a76e20ba8fe3762055f11957f40ba914d939d650cf7f9b098604aae84d30622e207498a5ad14fa81
 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
 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
@@ -97,5 +98,6 @@ EBUILD netbeans-cnd-9999_p20150113.ebuild 4586 SHA256 c14dc25a24d1fddc74d78b279e
 EBUILD netbeans-cnd-9999_p20150114.ebuild 4586 SHA256 be0dcc3f79a7b3f8abe7d72514830eda4328a411556f9502b08ce77f8ef721d8 SHA512 18d8030a392c12185e5f3ee3fb08c2600a057796e4698b3818c8433bae5b0263f4e0acfb97734a89085910e574e2ed7ba22bbf808e853ec91de93dbe09786211 WHIRLPOOL 9f8648c683c2fbb790b475b72488f7d853f42d52cc8770e35219ec960c8091eb049c6533d051eb4c7baa1880eeb226dcc39e04468898d5ff18d1c280bd84f6be
 EBUILD netbeans-cnd-9999_p20150115.ebuild 4586 SHA256 7775eb74c5741163677258dc21ab307b678794a4f826fc6aad72129d5e420d00 SHA512 4fb73f7d97a44ec4039e89b41430b4cef7e5baf29c2e8bd4d630077f5e79abee300f893a8000ed97c8d50ec496a624da01a377caa3ecb6729ae466270ecebff3 WHIRLPOOL 7b40fb0a6cdae862497f8b153294bb77e94f472705eef38268ee9ad95aeae76070474017a5ad7332d079cfd03cc75e4347b700c05e77399c7dbf015e7fccd284
 EBUILD netbeans-cnd-9999_p20150116.ebuild 4586 SHA256 52c6e544f6ef9b824d7af8324a7f004fb6937db9436db19b52a00b44f8e27428 SHA512 8a365612bf2e4c4c5d4330fdd5b82ae1b3c1fe5939e879c768aebe2b67e76466521857e616a13d0fcc033a0c0d375bc2b4b2e40dc2fcf3c808da4dc3fd34e782 WHIRLPOOL b62c55002855a2ab67ad373e05ad9911777b18a856e2971f49d5df55f647f6d4c5ee81c824a97169ab5ea5d1ea60cd9cf3d53ba2abea2ca48ddd8fc325f01d8e
-MISC ChangeLog 140262 SHA256 bf5e21b4bd8a485e0c6d49091e3a978059b08723efcce684f461cb09db624c9e SHA512 24cfe2b5289a5e6eb11d021810b5466ad937d3b5b09847c8fd7c3407e7ac8902276f4aefdc0b99dbb4bf030f447721cfde150a91a55ffc09e4e30b54380f2b4c WHIRLPOOL 84d9f5cc74ae41a007c601007c734b1f6e08e0a731f4cff6fd668ab0c076c854f2bce22c432f7725712644291ab4b7cd6420e3740438289c291cff534ea5607d
+EBUILD netbeans-cnd-9999_p20150118.ebuild 4586 SHA256 6882fa70cbed44b940a4a2761d81b16583f0b24761c7d477ea080fc84d909a2f SHA512 ba2120913d14b0bf4c7bb4ffa249d1a1e2c1ac870234480be3d046838592367ad34cf12e81d4816ce02f39408233baea0e76e8b1958821a48805c7bb048c19b6 WHIRLPOOL 3020977a6d6bd9378bf99c6254cede2b525191b7afd66c79dd2c4708dd93bc339b17956d494af9d7da163e4fc4b223d45e1c1de8a70ff5a3791b5769a29d7173
+MISC ChangeLog 140429 SHA256 f72115d546878024a5d18d9ec9d76f4b171860b2d359548063f0c7f6381f9334 SHA512 109442be1da0529da256b5a855915efad8f8dee420ad6648781ff579557dee875eb0f561d9783ce33cddab7292e8faf0440a5bb8b9a5886b2e313ee3e62ad954 WHIRLPOOL 6e3fe451a13a9b66bcf3cb580f681864f21dfa4c75dd4be59b383cd8a168c9adb70e5f0e93e67d05c36a70b05ed5b547d868600ada49dd26d6d1c3adfb0338fe
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150118.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150118.ebuild
new file mode 100644
index 0000000..c081935
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150118.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-18_00-01-55/zip/netbeans-trunk-nightly-201501180001-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 d19d901..f93fc2a 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_p20150118 (18 Jan 2015)
+
+  18 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-dlight-9999_p20150118.ebuild:
+  bumped to the latest sources
+
 *netbeans-dlight-9999_p20150116 (16 Jan 2015)
 
   16 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index eb36053..bea3f37 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -53,6 +53,7 @@ DIST netbeans-trunk-nightly-201501130001-src.zip 201373370 SHA256 eb5fbabdcc6f24
 DIST netbeans-trunk-nightly-201501140001-src.zip 201400262 SHA256 65aef07f80d9cfe6b47ac2c3aa2be2f1d98a7d9466a44c5196cab7b88e743a2d SHA512 1175de97a824b8be65a5b25b20cfcd17ae4ab4b101794f7dbdde8059b7192f30193d634e63141a54e9e8c2018166f1f204d321270ba91959d450839b9e1fb89e WHIRLPOOL b5944d4eb663cda53d83f88a52775868cf942c632e5cae0be25970fde60557aa43f69095ddc0861eb872f815e562f6998a5873b8aae1c2c660ae8e8ade75b4c2
 DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6b3b7a2050181c2ec341fa33b031423a913141b9c76aa590044 SHA512 6cd0ff2334b892835c91ae0c0bcf996e2322673533f46cec0efa37db25837f809202de061696c737da837099179a1fe20ef7bd569f6c04375e6090a8c5757d4d WHIRLPOOL 82a9189ff14ac9f373d84346361b231bc7ef298be20892b7a76e20ba8fe3762055f11957f40ba914d939d650cf7f9b098604aae84d30622e207498a5ad14fa81
 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
 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
@@ -92,5 +93,6 @@ EBUILD netbeans-dlight-9999_p20150113.ebuild 2995 SHA256 ab9c2bbd47557ea7429945e
 EBUILD netbeans-dlight-9999_p20150114.ebuild 2995 SHA256 cf9b79bbeb270aa57a4268f0f5a8d4cb421ae864e04955fefe30492b92bbdbb8 SHA512 983da37fa9b6c675e11096c36522a1e3447b562dbb8147faf0ddd897723eab82c4f638e8ec88a5ef61b6e2bb86b02f1a3cf99ca6152bf4fbec1ae12d2e42c8a7 WHIRLPOOL 6ed8a96595086bd9d9f71289eec7187a4b8766b5a679808c8736ca7fbd693122ca039f8e334e11105672b3c8eff89b2c6d5dd5646c413072a53fea51403d0b0e
 EBUILD netbeans-dlight-9999_p20150115.ebuild 2995 SHA256 701348a13acc8f87f342b348c169a789812b421d18831763bc5eab4a6d7b1bf3 SHA512 b00187b6db521f10efeab8e51c727ed5a596b8ef0ea03186560e524aed9aa1b03c865dbb7473e9bf1ffe161d2273c3d7d21d800274aa6248023452c1885c78cc WHIRLPOOL e50da17f1f185f68777d6f0807d221868992028ecc73bd0cd006a3cf57b0e5c7ee86ae90648c8a9a80bfffb397a1389dfb09992a5ff67ba5eba4e8d29aeb5245
 EBUILD netbeans-dlight-9999_p20150116.ebuild 2995 SHA256 ff37894f944835df50c468e36efbc6d90bd1c12a547a3a8b15f80e7f535cc86a SHA512 07d675df60c823436dab7ec5690d66bba2a396551cc41c96d7bf6a3bffff57c1329a9a7ad4dd7ccc5f459c851ff9ff4c31102476e5f4a72692d4951d29517a33 WHIRLPOOL 254a6d78d4be42a52d85ab32b6fadf84bc43fe86ca8ed6e27076a7314c41a18b546c4709144cae17b9c07636310f7cb5edb5cf2ff706d7be7b1340a7853827d8
-MISC ChangeLog 146226 SHA256 917e9ed0300edd57e6d611797866e17cc0f45e5d563a3c851276087b70c02fb7 SHA512 8738b46afa1bbb17b213ed0eb503deae33f0c2444fdcd0587778ea1dc54bb4a080fdc0129932d530b68f2b46444f2551694d8394ac6a0c2ddae0c1a03779b0ed WHIRLPOOL f273a9208cdbd80344585e75d8c59cb32620ee083a74880256ad8f43d1247ce5d615d5cc3247119f6abdad5a19ec0f9631269f1ef9761a824e0f52baca3ed9e7
+EBUILD netbeans-dlight-9999_p20150118.ebuild 2995 SHA256 f91edc523c3264dd93203d54800100ffbe8a323308091982024ca9c06b13aa1d SHA512 d5a8d48b8d01ee2931878d585088adf2acd78e3ae18efeb3c18c62f82670e2669151cbf9da09fbb94f7e54ff390a562aa73bd8dee1ad36ccdc6716c3f052fcca WHIRLPOOL 486cfd6ffac84b7f10e8aafef3e71039ae77ac844647a17b3bcdf78b5f892f5ed197a63176e459cd3f3ab0e645998fce144cbc3591b1f69abdb2775387628afc
+MISC ChangeLog 146399 SHA256 d6b7da898d161648cb8ac15601b88f0e0ab80790492d0b11c0f35630afa50951 SHA512 92898bac356873191412e87c1a1fcb69343310530ae8a188da2715e7bb8901a8d5dfcdb678fc398e4912f5a0cae205c8d6db0147b6c827406f42eb15730bbd3e WHIRLPOOL 8cea6b31e5a069772c320226e475e00fb22ed870d3397bc10f43ceb91d79776e33c6e3192e01e3085025ca46bcdbfd3fdbc4c7a20303305a5b6d545925f6d36d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150118.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150118.ebuild
new file mode 100644
index 0000000..738203f
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150118.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-18_00-01-55/zip/netbeans-trunk-nightly-201501180001-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 e17fd5b..a4ab557 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_p20150118 (18 Jan 2015)
+
+  18 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-enterprise-9999_p20150118.ebuild:
+  bumped to the latest sources
+
 *netbeans-enterprise-9999_p20150116 (16 Jan 2015)
 
   16 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 5d597d2..4e7c8ca 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -134,6 +134,7 @@ DIST netbeans-trunk-nightly-201501130001-src.zip 201373370 SHA256 eb5fbabdcc6f24
 DIST netbeans-trunk-nightly-201501140001-src.zip 201400262 SHA256 65aef07f80d9cfe6b47ac2c3aa2be2f1d98a7d9466a44c5196cab7b88e743a2d SHA512 1175de97a824b8be65a5b25b20cfcd17ae4ab4b101794f7dbdde8059b7192f30193d634e63141a54e9e8c2018166f1f204d321270ba91959d450839b9e1fb89e WHIRLPOOL b5944d4eb663cda53d83f88a52775868cf942c632e5cae0be25970fde60557aa43f69095ddc0861eb872f815e562f6998a5873b8aae1c2c660ae8e8ade75b4c2
 DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6b3b7a2050181c2ec341fa33b031423a913141b9c76aa590044 SHA512 6cd0ff2334b892835c91ae0c0bcf996e2322673533f46cec0efa37db25837f809202de061696c737da837099179a1fe20ef7bd569f6c04375e6090a8c5757d4d WHIRLPOOL 82a9189ff14ac9f373d84346361b231bc7ef298be20892b7a76e20ba8fe3762055f11957f40ba914d939d650cf7f9b098604aae84d30622e207498a5ad14fa81
 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
 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
@@ -173,5 +174,6 @@ EBUILD netbeans-enterprise-9999_p20150113.ebuild 15147 SHA256 1da3c2f249ec931e72
 EBUILD netbeans-enterprise-9999_p20150114.ebuild 15147 SHA256 25705e9e8694c026a811b5ff8ccd862bd60e8be5f889f438840fcf98e7cccf36 SHA512 88619fb4c6534a95aa5177dff66a4f2df0403a7670ca7bf2fa33c471658bde754b54171b263815b9d71328fdf80760537131f53b49b2de17c7f942d8e0f64c9c WHIRLPOOL 08fccbf929de7a2ac37a4e31555ffa5867dab89a139f0ef6431502323370eb2f7e50087231c6b3053ac7c429a9974deddd78275423d40940bf8de354e362995b
 EBUILD netbeans-enterprise-9999_p20150115.ebuild 15147 SHA256 32d5865497090b91f3dd1a20cb5a9199e0e711f8a9ab5529b75ed242c934808d SHA512 a2d2efa162c7b87dd432afc0e93aa8646e6bbe88843f86412fe93182b55c2f84a3975b9198a0272bd67b651503e3e4d086ef325828acaceaae360b4bf5a63b7a WHIRLPOOL 33bbccd4407c0feff096f6d32064e177309de22200f254763813745a4beef2b5881f5896968f4329d5415849ebd3d94ea464ffe40f03c9819d14cccf97a4752e
 EBUILD netbeans-enterprise-9999_p20150116.ebuild 15147 SHA256 d471e33e89c8a25fdb7fe3776f690998894501ee604915287a3e8c86281d1908 SHA512 c9486ae6ba60782a805fe1cb0613003047795d13f7964b53a3c9952d51673f2b63bbcea62d3d120bf90d0c42db7acef8ff22dde9db3d4ace6a78f892477a88c1 WHIRLPOOL b2e4ba167c9255e579edc6b30e2578ad6df44a135e791662e2f6478b38f0169e95370759c8441439e96234ea803904bed5e089317c946ba7c49a5012bfd36e5b
-MISC ChangeLog 154052 SHA256 cad6c223ddd73c1ed3357f42310db5b53a419840b8495b91e63c3114afc6ee50 SHA512 26c7db6e09653da4bf0b93c97fa79666a76ab22e3b70c6256c542da88c33c64c2b3cf50361d5f7957b656998a4640d907d2dfef563466fa377052ec612e03564 WHIRLPOOL 8a48cd3bd88d345f7b7f6423d98dbb4cdc97764b8fef7fc63abd206cda70122e554890be6eaa0eb64941fdc82ea7e44bb94ebd2ca37ff93613141dd302ef2283
+EBUILD netbeans-enterprise-9999_p20150118.ebuild 15147 SHA256 de08290aaedfb02717816d77333b45d1e9368754fb08f58dc87b6e971401e71c SHA512 e40d39f17e34d06137847966d66af6f5524f08e14a59e5c90db7bb285e7af8c3be779fa0d6bbe28d13fc7980d8545f45dc6e6fee79d52a98464dc51a5380dcc4 WHIRLPOOL 22a620d34beafa8ad13214e3a8f3a802e01640525a4819debcdf87a6cf0d8417957b849cd2c2925527ea55d54b17dff5bcaa0a6c942ce8e5d07094f50c3c0f26
+MISC ChangeLog 154233 SHA256 71b2f986833555603740d727a7b9d1357815c0f4b992bf231593e092a569ff1d SHA512 76b96e689a9354011b5e6cae07c8bb5b79ba46e1692e07ba4f2f9ede44bbc8e12bd510954e5c6b3fd75af366a7dec18948a71702dd92ece1cf95ecb4f6f39791 WHIRLPOOL 1d40133171b1db0f49cac1a50a245ea0ab20a0701429517dc6db0efd1aafce80171a5891d4b0dc53cf5c45bb397fa1f2b9bf4e0c956e3de88e4ba5d36b143135
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150118.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150118.ebuild
new file mode 100644
index 0000000..b017fa1
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150118.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-18_00-01-55/zip/netbeans-trunk-nightly-201501180001-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 24aba8c..60c5ba4 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_p20150118 (18 Jan 2015)
+
+  18 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ergonomics-9999_p20150118.ebuild:
+  bumped to the latest sources
+
 *netbeans-ergonomics-9999_p20150116 (16 Jan 2015)
 
   16 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index ab58bc2..297d5c4 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -45,6 +45,7 @@ DIST netbeans-trunk-nightly-201501130001-src.zip 201373370 SHA256 eb5fbabdcc6f24
 DIST netbeans-trunk-nightly-201501140001-src.zip 201400262 SHA256 65aef07f80d9cfe6b47ac2c3aa2be2f1d98a7d9466a44c5196cab7b88e743a2d SHA512 1175de97a824b8be65a5b25b20cfcd17ae4ab4b101794f7dbdde8059b7192f30193d634e63141a54e9e8c2018166f1f204d321270ba91959d450839b9e1fb89e WHIRLPOOL b5944d4eb663cda53d83f88a52775868cf942c632e5cae0be25970fde60557aa43f69095ddc0861eb872f815e562f6998a5873b8aae1c2c660ae8e8ade75b4c2
 DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6b3b7a2050181c2ec341fa33b031423a913141b9c76aa590044 SHA512 6cd0ff2334b892835c91ae0c0bcf996e2322673533f46cec0efa37db25837f809202de061696c737da837099179a1fe20ef7bd569f6c04375e6090a8c5757d4d WHIRLPOOL 82a9189ff14ac9f373d84346361b231bc7ef298be20892b7a76e20ba8fe3762055f11957f40ba914d939d650cf7f9b098604aae84d30622e207498a5ad14fa81
 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
 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
@@ -84,5 +85,6 @@ EBUILD netbeans-ergonomics-9999_p20150113.ebuild 2919 SHA256 d64a782c532ec94d9c1
 EBUILD netbeans-ergonomics-9999_p20150114.ebuild 2919 SHA256 a464dcbfd483ec2dada2234b898bf85714700075b4bee286312e691f100150e9 SHA512 83bb52dda29f1bccbc60d3a5d032e4887a2f8ff0adad78437ec87965f1a16d4cd5343888f502648d0012a2479a20fe886d99a350b81b968da68152e4e144814a WHIRLPOOL 5c9edcdd8e05a995c8a825a6f04a53729a34875e927e33b6188f5bf2c88a543601fa6752f5fecd8698c6333bda80f4c662324c4605dd78287f4e01d73847da75
 EBUILD netbeans-ergonomics-9999_p20150115.ebuild 2919 SHA256 7bbb97c6d2c8fc681ace228f0679aa978aac4b947cf2900b5e663bbb2c1dbc70 SHA512 3eb5010891f0dcd6d3b9088d5485fcfcaf38feaf03c08ea27213028519d50289c9056080ff22127ef46898d0c8861ec235f8dff20b8afb95e8df1b447958dd4d WHIRLPOOL 1e1efe618184c5e5e7eeefa956c9e679cb90145659f37265a76ca2bc7e57ef83d01b94a3b8afa56eb761c5225c0a6c5b645eeb3df57548c2879bb36c477ad2a4
 EBUILD netbeans-ergonomics-9999_p20150116.ebuild 2919 SHA256 27c7bc6c53e7cd492766e59868982c94a9fe99ed238a34e94da922e25c23d929 SHA512 d1ce57c93647ce128615a33c9dc963e6d1ea4b690e498a74cf0da15df43cbb1ff75de1d4a0988d152071c6923dae8df5a7fb70ebdc009701f63598e2c658012e WHIRLPOOL 4bd301227ccfbb92f28d2f9a5d2d7ba6eb522d7d400d11783369bfda19f12da8a4246ac94414be3ff1048651967e4bb7a5d220380ba993c09bd75aff1cb52f13
-MISC ChangeLog 153527 SHA256 6e4ba730cb7f69475571ff8f60e546b0edca87b2bae467855ef21c3c31e56839 SHA512 11c49b4642f8dc277c8d9ea156316db3ea39c5b0f4ca2cba61e167a1469dbfae5dc9a12154b7a5738826b31bb6b40c10f7fdec315f5c3b1798b16703377de7bd WHIRLPOOL 4054b52b59fd4ef4640c8d6b50194000b799c3355fbeb6ae12cfebc44d4021fc68117ee09a580947f105207356b9cdb8f0c69ebe94727a11831e2843deeba6b2
+EBUILD netbeans-ergonomics-9999_p20150118.ebuild 2919 SHA256 61dec9c0ae69db18c9dafb835a321833ffb4cbe939915f1859495beeed837813 SHA512 f22794dea930dfdc48def5a7d2f7cf283d6273f336d63093b9b26f5a9b968036c85a3c8735808bf809860042316a48abb2e3ddfb2d47f4cddaa750348fec34f1 WHIRLPOOL 75bd3258709799eca1dd2a82dff094daf532872ab6b3ff1a451f4953c1e02e6672684b8ca5d2119c2ed6bcf4a9d406823ba2ec2797f6f894e0734508899db37e
+MISC ChangeLog 153708 SHA256 811dd4d55c3aad2375b99cad265b1fddc533876707a44c39f47696002e3ecc4b SHA512 b0ef5ba39de5d5e9a21aca3096dd3e836fe10678fa7cad22b836783f26009b3213198cb320bd6488fe6784ffa25a3d619214b5f7364a7097f16796bf8f375582 WHIRLPOOL bfbaf7f8109973daa449f4bd69608807172efc694c22eabe699a593944a825fd73cd5e3a503dfba0f114dc3ebcb553c654a88cc0c8361941a5346dbec56ce47b
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150118.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150118.ebuild
new file mode 100644
index 0000000..785ccef
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150118.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-18_00-01-55/zip/netbeans-trunk-nightly-201501180001-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 cb46f48..3b300d5 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_p20150118 (18 Jan 2015)
+
+  18 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-extide-9999_p20150118.ebuild:
+  bumped to the latest sources
+
 *netbeans-extide-9999_p20150116 (16 Jan 2015)
 
   16 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index 6758618..27a5937 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -43,6 +43,7 @@ DIST netbeans-trunk-nightly-201501130001-src.zip 201373370 SHA256 eb5fbabdcc6f24
 DIST netbeans-trunk-nightly-201501140001-src.zip 201400262 SHA256 65aef07f80d9cfe6b47ac2c3aa2be2f1d98a7d9466a44c5196cab7b88e743a2d SHA512 1175de97a824b8be65a5b25b20cfcd17ae4ab4b101794f7dbdde8059b7192f30193d634e63141a54e9e8c2018166f1f204d321270ba91959d450839b9e1fb89e WHIRLPOOL b5944d4eb663cda53d83f88a52775868cf942c632e5cae0be25970fde60557aa43f69095ddc0861eb872f815e562f6998a5873b8aae1c2c660ae8e8ade75b4c2
 DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6b3b7a2050181c2ec341fa33b031423a913141b9c76aa590044 SHA512 6cd0ff2334b892835c91ae0c0bcf996e2322673533f46cec0efa37db25837f809202de061696c737da837099179a1fe20ef7bd569f6c04375e6090a8c5757d4d WHIRLPOOL 82a9189ff14ac9f373d84346361b231bc7ef298be20892b7a76e20ba8fe3762055f11957f40ba914d939d650cf7f9b098604aae84d30622e207498a5ad14fa81
 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
 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
@@ -78,5 +79,6 @@ EBUILD netbeans-extide-9999_p20150113.ebuild 3383 SHA256 00c5a68c9cd96675835d706
 EBUILD netbeans-extide-9999_p20150114.ebuild 3383 SHA256 c2e601c6578150f39885f6f8c73b6092844afb3b95448976d9a0b3dfa566ef1a SHA512 acddc531ba0c51d531ff57c2cc545e3562fc77df075c868fe0787b19e8bd31bb7bb432d0df5dc634d4b3d8174d4668870712440867f408925c1b17b922abd59f WHIRLPOOL 98d14002a03ce2124e1462fc494570fc864452bc66d7d352c8c9b3f433576ab76f8781232e226330bd79208504b0c14bcda4ee2b0a3ef742b74342561c7bbdfc
 EBUILD netbeans-extide-9999_p20150115.ebuild 3383 SHA256 9bcac5fa6955229212a7b4ebfa9ef1d297b8e249a4b9327e5290c546b8915d87 SHA512 024a0f2c935bc03a6c014796f5872e49d4ac61940004f902d8d281ede06fbe5c9cd394b2081f12966f213f5384cd39de2d8dca049765fe683b581c08e8033ef5 WHIRLPOOL ea78c777b365621301b20988dba0bc799d663973fbb9ef62989545e9bcefd2ad5d7005b1caced24202f23c4fe9a3327727eddabcdcaa03e21371f257edf9b256
 EBUILD netbeans-extide-9999_p20150116.ebuild 3383 SHA256 7733098c3179aff8223238b7ccfc1449463de00edf0730ca52e8a8b0621fab9f SHA512 7f4cc6fe1d4330ee6a3c068e443adcf215d1c794f8092114b090a3b9fcac0992b7f784cf72ebf76bf81abfd82fdf13ce4c7b2c85a9cfafcb394f3e5950047b62 WHIRLPOOL 4d62998bc87da17978ef5e7ef2d55f3a337ee35e243c9e50d2d32bd151f028aa8829580ebd5c019871a1f92c9d1ec02695d4f63c2d92e9a452306c56efe567bb
-MISC ChangeLog 78238 SHA256 446ae158393af468d0fb376e5ddf6d7857ce580f16550e44fc2d71ee976a6a4e SHA512 87fa7a3914f28c4d6ed5e5e3d786c7521967cbb0601ee4d15caecaaff86df19878d41fb9341f981822de93eec215b644ed6429f58cfe0e543aa67cd054eae22f WHIRLPOOL 75fe383b6f8aa02250ebb24b3d263104b3252e1efbc1122d8a6cbc64f414e77c2793e19b3b831ee5813b10d35d1b679ccb0a902466444b059d0c862e33aa66bd
+EBUILD netbeans-extide-9999_p20150118.ebuild 3383 SHA256 3e6eecb155c8816f0461c7bde9d74f26eaeecdea3d0e630df284673905296a1d SHA512 fae3248d8d4efc922303231b0f77fb4d0b5c40df6d82b22296d8de2b41d313eb30620880928dda04c39726a55ddd8d65e41a01cd732e69bdeac5817c749680d8 WHIRLPOOL 6382b78dd43fb850897110dd0811cc4e21102185b367d8a8b6ba9f1e2b3cac8a589fa157097954a8366d1fdcccea6520d275b6987d1ffe46b21204ce48a550e7
+MISC ChangeLog 78411 SHA256 146376f1ccf3c1e1e396fd7039adfd5cf9b61f90093ba60db9cdf865755f2ccd SHA512 55c7ea8b76645088f6be600d1010163f502bec74827ba7168f326134dca5ed1e255bb897bd65564cb03d06c83b4374aed6eb0d2ada372111396e5904848d1ded WHIRLPOOL 4a90f7087fbf35e0a40ffd8a88de9529ce1ccb31e41dbe87f2fc5be6478cf33ceacc9bf9e8e79091ce97ffc66f426f747742a857cccf7fd2d8bd0773dec25ce5
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20150118.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20150118.ebuild
new file mode 100644
index 0000000..5e27c83
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20150118.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-18_00-01-55/zip/netbeans-trunk-nightly-201501180001-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 15a37d8..af4e2de 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_p20150118 (18 Jan 2015)
+
+  18 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-groovy-9999_p20150118.ebuild:
+  bumped to the latest sources
+
 *netbeans-groovy-9999_p20150116 (16 Jan 2015)
 
   16 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 60ec3d6..e4a3217 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -49,6 +49,7 @@ DIST netbeans-trunk-nightly-201501130001-src.zip 201373370 SHA256 eb5fbabdcc6f24
 DIST netbeans-trunk-nightly-201501140001-src.zip 201400262 SHA256 65aef07f80d9cfe6b47ac2c3aa2be2f1d98a7d9466a44c5196cab7b88e743a2d SHA512 1175de97a824b8be65a5b25b20cfcd17ae4ab4b101794f7dbdde8059b7192f30193d634e63141a54e9e8c2018166f1f204d321270ba91959d450839b9e1fb89e WHIRLPOOL b5944d4eb663cda53d83f88a52775868cf942c632e5cae0be25970fde60557aa43f69095ddc0861eb872f815e562f6998a5873b8aae1c2c660ae8e8ade75b4c2
 DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6b3b7a2050181c2ec341fa33b031423a913141b9c76aa590044 SHA512 6cd0ff2334b892835c91ae0c0bcf996e2322673533f46cec0efa37db25837f809202de061696c737da837099179a1fe20ef7bd569f6c04375e6090a8c5757d4d WHIRLPOOL 82a9189ff14ac9f373d84346361b231bc7ef298be20892b7a76e20ba8fe3762055f11957f40ba914d939d650cf7f9b098604aae84d30622e207498a5ad14fa81
 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
 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
@@ -88,5 +89,6 @@ EBUILD netbeans-groovy-9999_p20150113.ebuild 3422 SHA256 8e04fdc9c8099b8fddfc2fe
 EBUILD netbeans-groovy-9999_p20150114.ebuild 3422 SHA256 3d48db78c3e60544387a931e666bff167f68154333ad6939aedfa4deb20ab58b SHA512 0ec683069d07c0b32cc373bedce91795837023dba43de198f586a30a5d95444c2a125d2f905aa0d9da31956397269ca61576b6d15f8a4a8149c26d4dc287c1ce WHIRLPOOL 813b326d9a87ae820f915e499569b4ab5bee2c62d1caf57e4f33333fc77a482f15db44558cb72477ea1677537e6c2ab932134e089fdd3d085c5f2244b1d9801d
 EBUILD netbeans-groovy-9999_p20150115.ebuild 3422 SHA256 38d2593f66af4952670575cf0a38dd5ef94f0d44954ece459dc21262ab75dcdc SHA512 76df7e24975dbb6990866a858a80cb5e5ab1657b178db33817e8eb787b8d572c94b678bf064229d85e2cd864e06c0fc7db18f9dec37ab053b384ad9ef288e43c WHIRLPOOL 89f45dc34bf0152bd74634fefd9172b37619d1343264bce40c14a5e60973eb6fa00631de6144a4c51e694b339620092c560069aa54397df31cce695aac754689
 EBUILD netbeans-groovy-9999_p20150116.ebuild 3422 SHA256 0d43e8ccf0cadbf997e61b5a6bdd87f1d63f33a5d4b7baf3e8265113235cea11 SHA512 424ff0fdf14f7c9200fd9d74f69c323386d4453aa11b9fcc417bb43a6499adbd36528296ff8fd6fa83fdcd54eedc3ce3e028df40066e474647a6223bf3500f4e WHIRLPOOL bd05beb365c156808c98cc31a627130cb4b45e7cb3d9d7f1903d6779f2832971f6bfc912bb8e2dc75492667de5263ec6ed3557ffe790a5bc42673b52c1014a36
-MISC ChangeLog 146218 SHA256 fd86ac1c5eb38465b2a7fd22db71faba8e1e58148e42f0220765810c7a2c429a SHA512 bb19dfbedc914254a885839227a210a879edf1f53d282f8a92eb45ab8e9cf4f25c931f6463f7c034ea2b9b62c7eae74f50c3f9fa440fd04e36e5283b7a8f5835 WHIRLPOOL 1f0c7272c598ac4ffca37bba1f34d6529276d2f772a422bd362d4440a0f47bff626acf7ccb4b7408e14cebd57ae66e103df4bf1a7738c1e18e8a9359f4bcc292
+EBUILD netbeans-groovy-9999_p20150118.ebuild 3422 SHA256 95d1aabc2fd79aaa7770dca28ede02ff5acdbdd13765aa74803cf9034630a3aa SHA512 31fb4140b62e2bd8a07bf8775377068761b2686132cc515272f1c6dd6fddd30ecb46c001793910e51e384777464e1108267575f1b8c7000bb18202824b8bf8bb WHIRLPOOL fdb6c149deaec0528bca3b398b088f5d9e263c5ffa890a57efc1cda82da6d60b14a5439886fd022491661563130ad251dea129a33cbcac9190ab0dc492dd8af4
+MISC ChangeLog 146391 SHA256 de4a5a54ae269490396d87f768c4761e56f5a9d84bcef98d61ce2c724454433c SHA512 14712700c925ea86988fd2c40c19e282768126f6051d6f0fc70eb8030e064998a35f9551bb1b73803f83b1ee1a1016a0aaa880d83756441159178b49a186fde6 WHIRLPOOL 839674c646dc14a914bf3bc3fcf90e00f19eb475b6814cda15ea21cccd7ec183d96df7e4ef4396f2703c63674219ddc5e534ddac8c0837734eabb2fd6c1e2b73
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150118.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150118.ebuild
new file mode 100644
index 0000000..4a5eea8
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150118.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-18_00-01-55/zip/netbeans-trunk-nightly-201501180001-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 30c2c01..4b7baa5 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_p20150118 (18 Jan 2015)
+
+  18 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-harness-9999_p20150118.ebuild:
+  bumped to the latest sources
+
 *netbeans-harness-9999_p20150116 (16 Jan 2015)
 
   16 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 291e508..35c9b1f 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -51,6 +51,7 @@ DIST netbeans-trunk-nightly-201501130001-src.zip 201373370 SHA256 eb5fbabdcc6f24
 DIST netbeans-trunk-nightly-201501140001-src.zip 201400262 SHA256 65aef07f80d9cfe6b47ac2c3aa2be2f1d98a7d9466a44c5196cab7b88e743a2d SHA512 1175de97a824b8be65a5b25b20cfcd17ae4ab4b101794f7dbdde8059b7192f30193d634e63141a54e9e8c2018166f1f204d321270ba91959d450839b9e1fb89e WHIRLPOOL b5944d4eb663cda53d83f88a52775868cf942c632e5cae0be25970fde60557aa43f69095ddc0861eb872f815e562f6998a5873b8aae1c2c660ae8e8ade75b4c2
 DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6b3b7a2050181c2ec341fa33b031423a913141b9c76aa590044 SHA512 6cd0ff2334b892835c91ae0c0bcf996e2322673533f46cec0efa37db25837f809202de061696c737da837099179a1fe20ef7bd569f6c04375e6090a8c5757d4d WHIRLPOOL 82a9189ff14ac9f373d84346361b231bc7ef298be20892b7a76e20ba8fe3762055f11957f40ba914d939d650cf7f9b098604aae84d30622e207498a5ad14fa81
 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
 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
@@ -90,5 +91,6 @@ EBUILD netbeans-harness-9999_p20150113.ebuild 4131 SHA256 d88dd1fad7f7ebcc340df3
 EBUILD netbeans-harness-9999_p20150114.ebuild 4131 SHA256 3b3e4c4f922eaffa7ed0ffa5d682843c59443026df0b4a86afeca8bd74c2f268 SHA512 ffaabe1db1b08f5e49d71721bb186b9edcfca3bd91361a46c6000c9b33e082acf52bda49bac460ce360a080324e3effcfb9333c31112155a1d383374e3c5ff71 WHIRLPOOL 24f6b3b83ee3d871847a71e48d7e7fb4b79e93ec5ba34e4f04d7deef81c77ecc0e9be24e83e63735f35da93a3299131498192f6c441033777180a9ca28fc920f
 EBUILD netbeans-harness-9999_p20150115.ebuild 4131 SHA256 90550405cd67e736368b7e031faef64fd58d986c9335f18a7ac1ac9c0e1360ec SHA512 33f0b40fad3589fe3c81b48b2b1d2b2b50510c785c884084c404adf2be47a936a952bdcbabbf74fb6332a14347a3b111a24df89b69044b7277883b2bfe1ff5a1 WHIRLPOOL 6ffc61543927c966f02b7a67e87f5bc3f66386af911e9c1f395c7beadd14516eb588eea0353ae6b4375b179de22e2716275728afb7121e4de7f8c24247286919
 EBUILD netbeans-harness-9999_p20150116.ebuild 4131 SHA256 fb2337f9f2fae97010ae27b3152d7b192adf0215aed6de4d68f74793fd05570b SHA512 3e28453eb3fb139fd6f710c68594d07fcd28e3d8891e208d8356d670bc26e96d960323ec8854d96aee2e7bc7712c5e1dc5badfcde2d57e7dd68db374bae423e9 WHIRLPOOL a93dd3a803f5df9cb400da9b7752976b7287eb16e557d443c6254afe3607deef2ad8f71189c4bfc85ddf4c789fae4b2e70d593d16c96988e90d6891d44c9164e
-MISC ChangeLog 148074 SHA256 377a5cb0e6474056b8420ca90b940a79d01a8952600cd11a512f1cc1752d51f7 SHA512 1199b1c4a55bc44b1b7efdb9b3aeb90dbb6f2ff55366f2c6df9ff01b921f23ca92ed958640807845c8782168e3e0de9dd402548b0fb4e2ec91c89861984407cf WHIRLPOOL 2e54de25c82100e64300999269d863a4d92a9357c96af67f46acf5638d66feb0b3d22ab92c29fee7537dba78b97101c378de30c03dd4688b5ca40a8444868d1c
+EBUILD netbeans-harness-9999_p20150118.ebuild 4131 SHA256 1433c0e355fef5a065dadc0720f05fc7067558cd58e7ecfa7e621ad8b53170b2 SHA512 356f5c24dea8e01aed371b1335554437792df9fef51f7332ab1abef537d465a155a4742a10d2614d8c54bda985eeb9a782be803ad36b7244ed603dbe4e57ee5e WHIRLPOOL 1ab83797f58fb421b69e7fcc5d845d1b4a712e6a90914e634800cfef2e1ee9577b64bf2307bc1efcc888f12b77744a8c5f94e273314aa01c1c6cf07347ce9182
+MISC ChangeLog 148249 SHA256 e422e54d975fa871b6276782abccaafd8d0de5ec556d5dcedcf922edbfd1b183 SHA512 137aabea17a2f04b135687066566f21955f7888aede9c56914059f75593ed1e2932836d8382b5c3998b72ff268d5da1b1466945e65ed9c26a5acc33f43e25bc8 WHIRLPOOL 558311a0bb46f014e22be3529bc13c01722574f73088149068f973592818d402cfd05d75736f665496663b601f0daa0f466893a9bfeb02f4abf376c27ff85389
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20150118.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20150118.ebuild
new file mode 100644
index 0000000..974805e
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20150118.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-18_00-01-55/zip/netbeans-trunk-nightly-201501180001-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 1a54fc2..cfa7c58 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_p20150118 (18 Jan 2015)
+
+  18 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ide-9999_p20150118.ebuild:
+  bumped to the latest sources
+
 *netbeans-ide-9999_p20150116 (16 Jan 2015)
 
   16 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 1d1fcb8..658354b 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -231,6 +231,7 @@ DIST netbeans-trunk-nightly-201501130001-src.zip 201373370 SHA256 eb5fbabdcc6f24
 DIST netbeans-trunk-nightly-201501140001-src.zip 201400262 SHA256 65aef07f80d9cfe6b47ac2c3aa2be2f1d98a7d9466a44c5196cab7b88e743a2d SHA512 1175de97a824b8be65a5b25b20cfcd17ae4ab4b101794f7dbdde8059b7192f30193d634e63141a54e9e8c2018166f1f204d321270ba91959d450839b9e1fb89e WHIRLPOOL b5944d4eb663cda53d83f88a52775868cf942c632e5cae0be25970fde60557aa43f69095ddc0861eb872f815e562f6998a5873b8aae1c2c660ae8e8ade75b4c2
 DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6b3b7a2050181c2ec341fa33b031423a913141b9c76aa590044 SHA512 6cd0ff2334b892835c91ae0c0bcf996e2322673533f46cec0efa37db25837f809202de061696c737da837099179a1fe20ef7bd569f6c04375e6090a8c5757d4d WHIRLPOOL 82a9189ff14ac9f373d84346361b231bc7ef298be20892b7a76e20ba8fe3762055f11957f40ba914d939d650cf7f9b098604aae84d30622e207498a5ad14fa81
 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
 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
@@ -272,5 +273,6 @@ EBUILD netbeans-ide-9999_p20150113.ebuild 29641 SHA256 e535d312eff6159b45d4c6e70
 EBUILD netbeans-ide-9999_p20150114.ebuild 29641 SHA256 38440a5ed44abfc6457321d4e1b6d664ff532aa075d7253575c452bec58fbd77 SHA512 effc9890a79883cd5cf0e24054b59512076de26678f1deb317a6a34163575bc39524f205febc296300f388fab38567556c46d91e1da3d663b7359efbbc0944b4 WHIRLPOOL 9d9bd71fe1d0aba94c03ef8ee105610b3c806a6d317692a628982e4140ea08f2d4a4ad0da7bc12e322bdf79b237f59655bb35de77414c9fcdc655ef00bc60a41
 EBUILD netbeans-ide-9999_p20150115.ebuild 29641 SHA256 b28e67f7de5354a6ff76015e5bb293d2804413d2d585cdbf7e8b9a1ed2d3664b SHA512 d009d51e39597b11c3dc3a86f774ff953a91463a52dbea846705cf6d91d9f27edc85ca1d262c743a7a720bae2ab4efe5064099385a11737c92be688be2a20c91 WHIRLPOOL c7a379b65db68bb4f74b2bfe37587f0dd11e62ef852cb073051126000692c01690c9d119670e53a8db9a870bb6804f343f7498b1150c1f2f067956a2da071aad
 EBUILD netbeans-ide-9999_p20150116.ebuild 29641 SHA256 5124cc60592a92cffac8efa8ca82eef226080bd0841786332dbc92bec84d263d SHA512 7ba2e3be5dd3fb62705df17c4dc594b8888dcab5e7e34058082c1358abd3b0b0576c13784689df7807a2624ce0e7fa676082e6ab3a5cc1d3f763f92952e99025 WHIRLPOOL 79663110e8be20e6d8aef4ae543f9d80001d5fa032c6fffa43a9f3cbe169f4eba4b8d997c2a578ffba8328aa494aa4bbc2b6e767b55ac93ad3e0de03a5a9d16c
-MISC ChangeLog 141176 SHA256 a895cef2e8435a18bf891ac7f5f2a6c99a3f96b90c416f2a13ca8fb710a3d231 SHA512 a52ad287d17f6dca9178c8eabc303c9d2431348d55fece498cdb18c2aca440fddbe2306652334f31bf79f58308561b846dbef4bd1e28043d3bdcf13aec06ed67 WHIRLPOOL 6b4b2693169624d1409ec9a63f2e577aa932de3ed8e9b6b90e0895f0ea285254df4af93bf671b54b92a05010adfe86ddb21a2064d0ad51deac5d05a1e89c2cdc
+EBUILD netbeans-ide-9999_p20150118.ebuild 29641 SHA256 a77a1264f3287227866a23958e6b3dcd81477cef9841d6a31f97346ae9d711a9 SHA512 c5635d4acae72fd586d214965734826e34a11f8e9366df38e3a531b66a6a9a167ebc8a259afa3d5171d0f143a51f53df605ca67da421c3eafe7ecb9a0e66fe16 WHIRLPOOL b1990aa93fb774fe58dfbbf1fa9ed59fd598dfbb5df3af552e3192f5159f3b128ecc10861502c69b218e61565014a956792c23482de030e6a911049147b15bf5
+MISC ChangeLog 141343 SHA256 40ad4c11e852a227a5b2c26296d48ce86996425cbbf5ddcb0a284d9e45451c4d SHA512 90b012ff2e1058ef9deb194c92876f26ee6eae167b10ff5a73b9c532fcac3430fff219822c62ceef1eef8f09207a990b4950e3dae7bf1eed7a50061a090a8c85 WHIRLPOOL f460e1c82b809f8bf1894ee2e1fab48272d82fa9cd6806a5e985f25169509c9f76342ec53b739e9485b1e84b2f6c9449e55f306094681a8ab2c23649bc56ea46
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20150118.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20150118.ebuild
new file mode 100644
index 0000000..d9dc8d7
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20150118.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-18_00-01-55/zip/netbeans-trunk-nightly-201501180001-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 f2d7aca..292547d 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_p20150118 (18 Jan 2015)
+
+  18 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-java-9999_p20150118.ebuild:
+  bumped to the latest sources
+
 *netbeans-java-9999_p20150116 (16 Jan 2015)
 
   16 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 922363e..f140032 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -123,6 +123,7 @@ DIST netbeans-trunk-nightly-201501130001-src.zip 201373370 SHA256 eb5fbabdcc6f24
 DIST netbeans-trunk-nightly-201501140001-src.zip 201400262 SHA256 65aef07f80d9cfe6b47ac2c3aa2be2f1d98a7d9466a44c5196cab7b88e743a2d SHA512 1175de97a824b8be65a5b25b20cfcd17ae4ab4b101794f7dbdde8059b7192f30193d634e63141a54e9e8c2018166f1f204d321270ba91959d450839b9e1fb89e WHIRLPOOL b5944d4eb663cda53d83f88a52775868cf942c632e5cae0be25970fde60557aa43f69095ddc0861eb872f815e562f6998a5873b8aae1c2c660ae8e8ade75b4c2
 DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6b3b7a2050181c2ec341fa33b031423a913141b9c76aa590044 SHA512 6cd0ff2334b892835c91ae0c0bcf996e2322673533f46cec0efa37db25837f809202de061696c737da837099179a1fe20ef7bd569f6c04375e6090a8c5757d4d WHIRLPOOL 82a9189ff14ac9f373d84346361b231bc7ef298be20892b7a76e20ba8fe3762055f11957f40ba914d939d650cf7f9b098604aae84d30622e207498a5ad14fa81
 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
 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
@@ -162,5 +163,6 @@ EBUILD netbeans-java-9999_p20150113.ebuild 13429 SHA256 5e746642e87c71ff5d008ac6
 EBUILD netbeans-java-9999_p20150114.ebuild 13429 SHA256 6e4f432236b9140ed6b31ae70785789ae435a0c016b7b9b941ef69c514d7e01a SHA512 846b44d2288bd5ca85724a64482dda7027b5c4880ada24cab969f40fda9aa60ac1115211088bb7c252ccb05777b62e45ca6822147898baf69ca4571e1f4f644f WHIRLPOOL a7ce4d453ef01a38cf26f7b133a5689d3b0b145474428eb72a9aa2b203cc707622af008af102bf988b1e626c799257ca234cf126555f74410219ac914bec3644
 EBUILD netbeans-java-9999_p20150115.ebuild 13429 SHA256 8f9e798f3e957f9101c93da462653a7a00202797fbdbc6cc42256db285d0a768 SHA512 46e8254c4a64858737f6eab5c859c0098d9116ad51faf5612cb081a9228c554e679420bb29e0eb524662d13cadf82b2abacaacba838d9e7aec2af14b274e0bee WHIRLPOOL f6e4a2a90dd4df0888cea49a1e6c2a6df4abbc302f2f41df33cbda43f33ea0f2d52fe6df59d99fbeaf78900ef96d2925135999d5dd4d51c3b9b3fcb57d91370e
 EBUILD netbeans-java-9999_p20150116.ebuild 13429 SHA256 84777411b2c89454bd34bca29e88ebe458a494c3c3f194592f2e699067ac56ce SHA512 b85d782bc08200bf13c0c5b6600b96b2da5c75554b371aa76109b67fbcff5bc279a0503264603f65f0c923f1d96dace8e5c9ac5d24ce0ff1a36ae4758b2e43a8 WHIRLPOOL 7326cbab2a79367819df079a953d828360cdf30fb343a55c81377d26bde7d7d67ac920b67bbc59c0988d642b77c897b209c61ed055d3d49fd7f2a7ccf19e722a
-MISC ChangeLog 143806 SHA256 77ef5ad4ddde1db8599adcd94df75cf54553a8e405f4e905882b34174e211395 SHA512 302f4c48b6fa418cc3369eacaa68c2a30d66b7f9b91a9b53087df8194d4a95c00841fcf735362d4a3ea64adfb3e14b1ad41e639b2d1ddcabe0b47024b2403f99 WHIRLPOOL a54219224c82d758e5fe24518d973569ac885df70554594749ee5effef8c89977f65e833d3b21b0577243888ec1305c3bd393ce61d71443be902a9742bde02a0
+EBUILD netbeans-java-9999_p20150118.ebuild 13429 SHA256 611c6d83f5c8f23fea3bfe94602bf4237428962072c469bb2a23c6986ad9ea68 SHA512 08cfdc583d18122860ffdffba9a1b1820a2f6bc2fe959f56c803dd85a4779cb0a45df6b348b42e8fcc6b48590b25b35f06c1eeb9c09a192d27097753afeb8603 WHIRLPOOL 96f914f7b5dfc7f19bfb424016a7105c476936b2195ddb94a1f974a4e4ba2ea1f80cbdc7ae56d37037dbe1be3819042b9acfb097ecd8fd67b3061ff2f7208c6b
+MISC ChangeLog 143975 SHA256 b526bebbf6df6e0ffdeb1d8e09199c7429b5657548f0e4e3b2f439a6110a1d04 SHA512 cc3053cac47caafb39bad40a89d14a0efc8663f19948d872db686875d5b12c08d1067db35b51557dd6785d9b72f09364940ecd08a2e2bff6d4cc73cf027f9465 WHIRLPOOL 8c6323688d8c721b18d38af629bc36ebc2cdd66a327053732c81974442cf3d43fa6137b6c7657d209ead3e4641ab7c335f230487b8c1bfec824cb9cd82f67f75
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20150118.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20150118.ebuild
new file mode 100644
index 0000000..565cfb2
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20150118.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-18_00-01-55/zip/netbeans-trunk-nightly-201501180001-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 3b0a977..1995a64 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_p20150118 (18 Jan 2015)
+
+  18 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javacard-9999_p20150118.ebuild:
+  bumped to the latest sources
+
 *netbeans-javacard-9999_p20150116 (16 Jan 2015)
 
   16 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 42e5831..2b91aea 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -48,6 +48,7 @@ DIST netbeans-trunk-nightly-201501130001-src.zip 201373370 SHA256 eb5fbabdcc6f24
 DIST netbeans-trunk-nightly-201501140001-src.zip 201400262 SHA256 65aef07f80d9cfe6b47ac2c3aa2be2f1d98a7d9466a44c5196cab7b88e743a2d SHA512 1175de97a824b8be65a5b25b20cfcd17ae4ab4b101794f7dbdde8059b7192f30193d634e63141a54e9e8c2018166f1f204d321270ba91959d450839b9e1fb89e WHIRLPOOL b5944d4eb663cda53d83f88a52775868cf942c632e5cae0be25970fde60557aa43f69095ddc0861eb872f815e562f6998a5873b8aae1c2c660ae8e8ade75b4c2
 DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6b3b7a2050181c2ec341fa33b031423a913141b9c76aa590044 SHA512 6cd0ff2334b892835c91ae0c0bcf996e2322673533f46cec0efa37db25837f809202de061696c737da837099179a1fe20ef7bd569f6c04375e6090a8c5757d4d WHIRLPOOL 82a9189ff14ac9f373d84346361b231bc7ef298be20892b7a76e20ba8fe3762055f11957f40ba914d939d650cf7f9b098604aae84d30622e207498a5ad14fa81
 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
 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
@@ -87,5 +88,6 @@ EBUILD netbeans-javacard-9999_p20150113.ebuild 4982 SHA256 7ae2e8bafcdc063e45e5c
 EBUILD netbeans-javacard-9999_p20150114.ebuild 4982 SHA256 6703de46d3d775df57d000bb7d17bc34c19b4c406f4c420a1eb92c622653728e SHA512 9714c2be9c6bfb797a2c4260b4bc72c4f7361896e2365f41d42823a948f4cdeae8291caa0502b596349bac2f9ce47a3d0faf1f42022bce2a35597ef23deb55b8 WHIRLPOOL 1d863c9749042f12a54f00d710fd004e06ae4b854493b66607b2c97502fb5aafa8e2b606950b49ef63798d658213ac0f5fbbd95e127db90aeb043055bb0febf3
 EBUILD netbeans-javacard-9999_p20150115.ebuild 4982 SHA256 f991980471a8e396fb289967836a65c33167e77a3800cd9b83944a017ce691a6 SHA512 b390b136467507b76f448039f5be9f4a75ca027c89734e09cc93844c4e9d9c496e9fccbadcb928c7f0a39612bb1a42b1bf18a07d2381a9eb64d40cddbc727d0e WHIRLPOOL b5e6570eec78886d3717d53416e4a4568b332ce2a29d9cee778769fb56d92eccf495bf97cb9c1a271ff9efea550c424b59ed189c1d49a0aea9b08991738f52d9
 EBUILD netbeans-javacard-9999_p20150116.ebuild 4982 SHA256 0cb0051b965d98164b2a986b2327fb3b8ef6286c5e4e4d3b43947f25dbbcc9f8 SHA512 a3d9267162df1acc11c1ee649c7fbc3cb8d001d6fb33d93c010e48f3f767a3cafa601e03940e411180c9b1221bd4e5bc81051414b32b59c700a417f9d385e4c5 WHIRLPOOL 8a9d4d49c10a19203d1fcbd37627e75bf043ae2e7d7bcfb099b7054fe8f025536552b5368cf04d8711b234f075df0fd108a4c475723cee8e309a153bb9ab2107
-MISC ChangeLog 149930 SHA256 a3a3307388417142018e55238b435c6680a557f826251c73a3f93f238bf1e975 SHA512 a7e7851e3d9ea49fc94d2394df3f81753b2525295fe2ec00673d07b489d602d5a8ca92b8305602b4650144a913ff2cf68668fde3b5e8e6e3000bab47a21e1011 WHIRLPOOL bf91b1747cd754660ad54e23ab25d40801ae56e3133f688ad9b07ab00d4b06403bff0aa2a0398247643ce001194bd45e4757e848233b2ae8e978b1bcb828db4c
+EBUILD netbeans-javacard-9999_p20150118.ebuild 4982 SHA256 c95b66b489d8c45a5a26d5caaed9103c4e1eab3026d93e978ba9fa9fc1e34a5b SHA512 8a81fdf2067c6604115e42ecf11556ad75ab6025fc47286e8a4bbc89a0eb83eb45365bd4176610beb646ae2d2ce2d0297c4902de15e4d55537afa730add50f2a WHIRLPOOL 359fce96adcb4f6ec4205c9e816adce2271d4356cf3247ad596e9105f891ee44c861df45305d6951da1fc1777ad9647a6b3e271450c7298855bd4048c4bce467
+MISC ChangeLog 150107 SHA256 0af536a85263b8f214eab6a1f8b0bdfc815677b05b09a3cc57324ea665d44914 SHA512 d1ba9f3e293cb6e3f38154129a1b5d750d4c0b8d75a1fd55519fb75a0d88bc676f523dc4f8cd111a93c6872c162ec201681f2c15da94adfd3d97733efd14c631 WHIRLPOOL f35426db2f7abcb69c5515557e9bbb6b361bfe4509080173a1841d653477747117cbaccec7d1e63e4414b3c0aceca3fece7e867d41a47ce733ce205e7fa902d7
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150118.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150118.ebuild
new file mode 100644
index 0000000..678864a
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150118.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-18_00-01-55/zip/netbeans-trunk-nightly-201501180001-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 db6a32e..02a930a 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_p20150118 (18 Jan 2015)
+
+  18 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javadoc-9999_p20150118.ebuild:
+  bumped to the latest sources
+
 *netbeans-javadoc-9999_p20150116 (16 Jan 2015)
 
   16 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index 332b4bf..54a6316 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -51,6 +51,7 @@ DIST netbeans-trunk-nightly-201501130001-src.zip 201373370 SHA256 eb5fbabdcc6f24
 DIST netbeans-trunk-nightly-201501140001-src.zip 201400262 SHA256 65aef07f80d9cfe6b47ac2c3aa2be2f1d98a7d9466a44c5196cab7b88e743a2d SHA512 1175de97a824b8be65a5b25b20cfcd17ae4ab4b101794f7dbdde8059b7192f30193d634e63141a54e9e8c2018166f1f204d321270ba91959d450839b9e1fb89e WHIRLPOOL b5944d4eb663cda53d83f88a52775868cf942c632e5cae0be25970fde60557aa43f69095ddc0861eb872f815e562f6998a5873b8aae1c2c660ae8e8ade75b4c2
 DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6b3b7a2050181c2ec341fa33b031423a913141b9c76aa590044 SHA512 6cd0ff2334b892835c91ae0c0bcf996e2322673533f46cec0efa37db25837f809202de061696c737da837099179a1fe20ef7bd569f6c04375e6090a8c5757d4d WHIRLPOOL 82a9189ff14ac9f373d84346361b231bc7ef298be20892b7a76e20ba8fe3762055f11957f40ba914d939d650cf7f9b098604aae84d30622e207498a5ad14fa81
 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
 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
@@ -90,5 +91,6 @@ EBUILD netbeans-javadoc-9999_p20150113.ebuild 6234 SHA256 d79635390b42ddb6223575
 EBUILD netbeans-javadoc-9999_p20150114.ebuild 6234 SHA256 a73534d92bbf49398e11628079e621c49cb5a58a918a5edb5c997b3311d9bbdf SHA512 b4bf0b9e8ea52e90e98132464cb7d37d48b1bc9a6d1d3132b18d35a0becf8495f6d8dd11d51202a69792b5b22a6fa4a65425db61919780e9a4ed51f12c4b4400 WHIRLPOOL e4d667b18d47801e7d45ccb1f2998128a1b193740e87030174867768358896ebb27bd1471753a399edfadb41c1b795619df6c5cb9c4f0183c6f6d4dfa5195a71
 EBUILD netbeans-javadoc-9999_p20150115.ebuild 6234 SHA256 9bb821fafc961a68a3cdd0c82c42efaba802c8f8c2e535355661bc659b90b18c SHA512 4ed440a75ba374cc8460715d4abd0e6d57bb6780edf9057f04fc645c172bc37dd4865472cd7546dbc65e894120fc787e4021d8c1023561e855f436a9a5505280 WHIRLPOOL 9ec6b27d47082326f74546478920dcbff019efc86d64bacd6f56a89b5c97275824bbfab40d1351b9749c1d3b648f0eea563f95c315798a4018c860d0d72c859c
 EBUILD netbeans-javadoc-9999_p20150116.ebuild 6234 SHA256 53365a599b58eb3d715b537a15fa6b8a3f164299c8e57ad501a3b572305f970b SHA512 d2cf1c4b4e6a6cb84149e5aa89a860f59d0e41ff9736c9219953ed1e9b273a3c76a33b5f7d029855c2312aff689466e4779cb0fc66d6237d7e7f6409b927df70 WHIRLPOOL 914cd995256470301b884f447dcce901e9cbe53ca5a151a607548b82e5d2aefc2b9f5fa45d6fde854803ae2fd1299b669088948b751a5ec12c01da4d4db13415
-MISC ChangeLog 147900 SHA256 661418da639abd91e106b348c5e7ec2fba9baa735d70dfca8764a5a10a865566 SHA512 d7020b4e4226496cab037ab9c033260cdfc5dc715c8b73e7b56a1c1665bbd87087dd1dfab24d8482f6c1436b2b37568455b3fd69a4e9c69cd7d77eef815e2b19 WHIRLPOOL f05b593de12f3252681b50d635326d359549e3f80d2df80dabb328db7447f7dbeb453f70d8fbc31f8a9aeebdbeea7784fc7f221697b3e78be37f3ce4b7bad090
+EBUILD netbeans-javadoc-9999_p20150118.ebuild 6234 SHA256 521289b829609fe6098b51496c5b70440d4a991b3136d9d2462ccaca453209a6 SHA512 92a95f2a97fd11165c8939bf731ce8ec04310d5e56ea8a5e7ff55877272457dc88cdbcc4ce3400b4e77891603f8e559aae833108a488da0b26a38227db276a34 WHIRLPOOL aa559c5a51cd023d72e30045f116bdfd51e7eb5283997297fe6c2080d1d3e438c63581b54b4c9dbe885e3684284d43575bf76bfb1cc1121a1d73284416446ca4
+MISC ChangeLog 148075 SHA256 2e814c1487b71558ef673d24f12527b63053806333e28cf7bc385c68085894d1 SHA512 7dd034595ff4ff444fb45684cdf31859e5236af646586f877e48fdb14f0adba11f3e5d1c9b4a397dfc0e72144e9bd9ae6567f835c2397998e9dfa74a130cc879 WHIRLPOOL ac2c5dab5867b197f24235628327782c8911081a8d7b091bbf83e240383f2042f7a70e6fbf30b28d88779ee6d3c33c389c9228936dd6c89b2d1a47ca7e0c7caf
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150118.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150118.ebuild
new file mode 100644
index 0000000..8a63bfe
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150118.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-18_00-01-55/zip/netbeans-trunk-nightly-201501180001-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 15f17b9..d9a01c0 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_p20150118 (18 Jan 2015)
+
+  18 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javafx-9999_p20150118.ebuild:
+  bumped to the latest sources
+
 *netbeans-javafx-9999_p20150116 (16 Jan 2015)
 
   16 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 900868a..0aab245 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -50,6 +50,7 @@ DIST netbeans-trunk-nightly-201501130001-src.zip 201373370 SHA256 eb5fbabdcc6f24
 DIST netbeans-trunk-nightly-201501140001-src.zip 201400262 SHA256 65aef07f80d9cfe6b47ac2c3aa2be2f1d98a7d9466a44c5196cab7b88e743a2d SHA512 1175de97a824b8be65a5b25b20cfcd17ae4ab4b101794f7dbdde8059b7192f30193d634e63141a54e9e8c2018166f1f204d321270ba91959d450839b9e1fb89e WHIRLPOOL b5944d4eb663cda53d83f88a52775868cf942c632e5cae0be25970fde60557aa43f69095ddc0861eb872f815e562f6998a5873b8aae1c2c660ae8e8ade75b4c2
 DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6b3b7a2050181c2ec341fa33b031423a913141b9c76aa590044 SHA512 6cd0ff2334b892835c91ae0c0bcf996e2322673533f46cec0efa37db25837f809202de061696c737da837099179a1fe20ef7bd569f6c04375e6090a8c5757d4d WHIRLPOOL 82a9189ff14ac9f373d84346361b231bc7ef298be20892b7a76e20ba8fe3762055f11957f40ba914d939d650cf7f9b098604aae84d30622e207498a5ad14fa81
 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
 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
@@ -88,5 +89,6 @@ EBUILD netbeans-javafx-9999_p20150113.ebuild 4723 SHA256 d7da0d3306879e7b28aacec
 EBUILD netbeans-javafx-9999_p20150114.ebuild 4723 SHA256 d359afa5415e77a71f7df856dad130d06bf16b816ba68854ef910f06479c9d98 SHA512 b15111249e72b485322fe03814884242b21e8fd250425946d7383619609ceed6c8b50418cb4b5a74ee5ea1ca0f9b2de1ccfb5d17ad2c956ba01ae1c8c232250c WHIRLPOOL 016829bb885b039484fbc9c5dda0e6b9bcdfa3af8065bb663aea0368660178716a3f5a831355c07b16cd828999099834682a695d1baba5c2a76655422cafaafd
 EBUILD netbeans-javafx-9999_p20150115.ebuild 4723 SHA256 5354f5e69334a2f6989aa7e6c6227eae7a3d007b168686f5205a22c678f76516 SHA512 dc261bd23b9a7e014c425e0afd13d58584132543b05721a08188f393c560db28e4aa4959c0d59a1970eed1961410804510f40b5d625a1ec4d7c0214993f11ac4 WHIRLPOOL 20f256da511cbc50df32ac9d1d226f9ca0c8357b91f4a64a44fac81915c47f0d162e1a8b0fe612584551069f3e30ede4afaaab3bd11a081b683f8c4ad81e41a5
 EBUILD netbeans-javafx-9999_p20150116.ebuild 4723 SHA256 63f49967b2218fd37554ba16317ce7781c67a6f63c29b2932caaf96995e0e892 SHA512 41c75c5187ab0fb127e40f9b8fa3f05bc4021a4a65b43b5750d8ce8ceab602062d0354b5edaf0bc4c8c216f063ccb55853fbd09de9f5ef8a3d09fcd9bdd8f3da WHIRLPOOL 45eb0c5cc0c0c427b1b1f2f479c21d2cafc88edb8f8838912fb71f0bb1a73f132c7ee80629b73ffa745a5b1f1b994da714420a02719fd9432074e8690ace7495
-MISC ChangeLog 132737 SHA256 6d1275b84496a399e2b41f02eba6f093ba34e498990f824b0e4d4ba56738a88f SHA512 3d148a2d7ed4e3a8d316518620bb2c2f734bdd95090d37d18d30c00451e91855408c5f60e40876473deb1dce36276b8c60a54b00246340b4fb67d2d156889ed8 WHIRLPOOL a8a3bbe306734ca74a7a8621138874ef2d836daeee5e44eab31ed89a3f6cd2ebd9a8589c19e412b4e03da0524712e48bf6d8634c04b2c51aee62f5a2fcc4cf2a
+EBUILD netbeans-javafx-9999_p20150118.ebuild 4723 SHA256 2efdf04bd6892ec153f459e98684f130e81d2482e5f6333ea19f7f2c898e09f7 SHA512 693ca81e085ded76351a67553bb33a77b3cb2c894191695c47374b2308728a80588ee07aa50b9e17cc3303f11343a7735844d112f951dbee35c91ea1326ca155 WHIRLPOOL eb6f0f8bcef73bfc76c4fd92fe47fe5017b2cc7d826b5b33895deb257237f960c43552e41677433756d2a17f92f9cb508523d7a30dfcd19313bd078d23170e5e
+MISC ChangeLog 132910 SHA256 fabba7f82db3353bea1581160e2a145fd542acaa166040e81943c3e32da41bc5 SHA512 7a3da84e48e7b4cfeff2e4478f5051ef269a568c79ced52b0e084809899d97e7b353023db0d9e2273d46f54a34e355d10e92abb7b9242253d0875edfef888408 WHIRLPOOL a632125b9009035295ee6dbd55fcbad01008268a2f5fc04713517c42fa4986deb9a94ad7a54ae64d7155576b1e53b5ddaf702dcbfe09c3f1261da94637417a0f
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150118.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150118.ebuild
new file mode 100644
index 0000000..f776021
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150118.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-18_00-01-55/zip/netbeans-trunk-nightly-201501180001-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 c5eb716..56c273d 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_p20150118 (18 Jan 2015)
+
+  18 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-mobility-9999_p20150118.ebuild:
+  bumped to the latest sources
+
 *netbeans-mobility-9999_p20150116 (16 Jan 2015)
 
   16 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 19e9434..2e2b26f 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -54,6 +54,7 @@ DIST netbeans-trunk-nightly-201501130001-src.zip 201373370 SHA256 eb5fbabdcc6f24
 DIST netbeans-trunk-nightly-201501140001-src.zip 201400262 SHA256 65aef07f80d9cfe6b47ac2c3aa2be2f1d98a7d9466a44c5196cab7b88e743a2d SHA512 1175de97a824b8be65a5b25b20cfcd17ae4ab4b101794f7dbdde8059b7192f30193d634e63141a54e9e8c2018166f1f204d321270ba91959d450839b9e1fb89e WHIRLPOOL b5944d4eb663cda53d83f88a52775868cf942c632e5cae0be25970fde60557aa43f69095ddc0861eb872f815e562f6998a5873b8aae1c2c660ae8e8ade75b4c2
 DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6b3b7a2050181c2ec341fa33b031423a913141b9c76aa590044 SHA512 6cd0ff2334b892835c91ae0c0bcf996e2322673533f46cec0efa37db25837f809202de061696c737da837099179a1fe20ef7bd569f6c04375e6090a8c5757d4d WHIRLPOOL 82a9189ff14ac9f373d84346361b231bc7ef298be20892b7a76e20ba8fe3762055f11957f40ba914d939d650cf7f9b098604aae84d30622e207498a5ad14fa81
 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
 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
@@ -93,5 +94,6 @@ EBUILD netbeans-mobility-9999_p20150113.ebuild 4418 SHA256 3b0c1c8080846219d3864
 EBUILD netbeans-mobility-9999_p20150114.ebuild 4418 SHA256 a0356a0a2011216022bfc9b546a390dcf79798ec6aa09393508ac3398365d248 SHA512 0aa2aafa2b5f8a48ac4e4f16505c12b8b9c2ececb78f008069277d35625386ecb97b2995550190fdd0f96185b1104844ccab9b40673cf7129efe623a7f8a6812 WHIRLPOOL 905c35236fa1f66deca8097521c0456d383d3de52077bd69070e1cedcf0bcada66a457c3903f56b902e25033e47ab2702061a0a39bb63cd16e6663d37f13abf2
 EBUILD netbeans-mobility-9999_p20150115.ebuild 4418 SHA256 d6ef4aef261e28e40e0757eb8d451dc877f9e55cefb7d86dbfa5842945a9782e SHA512 ef0a1489ffb12e687cc5448fbacb277c3f25e7ce9a401056ad568bafbbb1a356c7f261347ef0a48a84a7a8775693bea65a3df16760c018df15709ba70b8e648a WHIRLPOOL 1c994a95cee1e9eed5c3424d6131912534114de3d0f038e690355ce7ae207c08c5777d6602c23a9d17a9a8f39f969c546307f6f8f1232703c3a55f486a32d036
 EBUILD netbeans-mobility-9999_p20150116.ebuild 4418 SHA256 e12cb3cd50d7068f19a4dae8a8d7f7c4fe47a16a3d1936c82828bb12a5988616 SHA512 b4769f05709c9e9eb448cd876ae0f83e442036b65f8440d29015ae384b3a088b9626d9a0825dd3937cb86fbc09f5dd01ecfa8649d8046f2fdb08a300f1a95133 WHIRLPOOL 4c522ae1fa0eb1557104a5f69618f6bd8f95f3c0d1954fe9c26fdc4f693b389039a28e26ed5cbffa7b9634458f9021827cc703f2ec20407733101e07ca38094b
-MISC ChangeLog 150071 SHA256 614740f15e7d27417c8622e72251f4672bebec19c6ef20ee1153f36732a5c3bd SHA512 9eeda5032b551abcbc83e8e76fe41f141d2781e16e4314ef6f867686099cef1728aaa64fd671bd6f5b8878decad87c1315097fbe814863123303037baeac1709 WHIRLPOOL 1150b2c8939e8c3e53304cf61e3d72cb72f68027a1a957b011ef074dace6a00033d0deee6c5d3c76dc3b706333c5ef1eb049aca567e24fa751e2230d2622ac3e
+EBUILD netbeans-mobility-9999_p20150118.ebuild 4418 SHA256 c3dd3881bfebe3a69015260d7cfff93fdda8b7186fdfed738a1a44dd60281504 SHA512 efa64491f54d4e4c51639bb949d57d25a0413be71752e062cfcaec7382abe2dd4ced5754513eba25efbccc9fc7833aef1c41948ef16f545945df81a84fc00d72 WHIRLPOOL 51ec29a6fa004a5990af9878b492ad53a0dc83faf6e308cf5d9f4f53e30d1b09ec3b870c1a68c8a894e5f2452d82ed12e46823f3a78f3f5febafa6debaf9d527
+MISC ChangeLog 150248 SHA256 560edd8003efa2b82f69f46cd8f1d887e0e98946f38f7ad63a33573ea46d0266 SHA512 3568505cdb6d45dcb0a7cb8f533bfee5305dd2a17aaf5a789bc34a72d52d531acd8c79fdd7e796bf09a13af8b0a5638c3bb7d5595c95daa4a7717dd6eda2f78d WHIRLPOOL 105a3b57c1b78bfe6604dc392fac0b39e0164a1ef4123b79ae620017e4d66a645673449a1571e9e252876929a1e9833a95bba4807e700f42a4af27ec62db093f
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150118.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150118.ebuild
new file mode 100644
index 0000000..2f59c50
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150118.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-18_00-01-55/zip/netbeans-trunk-nightly-201501180001-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 0d01ace..08b1b21 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_p20150118 (18 Jan 2015)
+
+  18 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-nb-9999_p20150118.ebuild:
+  bumped to the latest sources
+
 *netbeans-nb-9999_p20150116 (16 Jan 2015)
 
   16 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 9bc7de3..ab9ac1a 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -53,6 +53,7 @@ DIST netbeans-trunk-nightly-201501130001-src.zip 201373370 SHA256 eb5fbabdcc6f24
 DIST netbeans-trunk-nightly-201501140001-src.zip 201400262 SHA256 65aef07f80d9cfe6b47ac2c3aa2be2f1d98a7d9466a44c5196cab7b88e743a2d SHA512 1175de97a824b8be65a5b25b20cfcd17ae4ab4b101794f7dbdde8059b7192f30193d634e63141a54e9e8c2018166f1f204d321270ba91959d450839b9e1fb89e WHIRLPOOL b5944d4eb663cda53d83f88a52775868cf942c632e5cae0be25970fde60557aa43f69095ddc0861eb872f815e562f6998a5873b8aae1c2c660ae8e8ade75b4c2
 DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6b3b7a2050181c2ec341fa33b031423a913141b9c76aa590044 SHA512 6cd0ff2334b892835c91ae0c0bcf996e2322673533f46cec0efa37db25837f809202de061696c737da837099179a1fe20ef7bd569f6c04375e6090a8c5757d4d WHIRLPOOL 82a9189ff14ac9f373d84346361b231bc7ef298be20892b7a76e20ba8fe3762055f11957f40ba914d939d650cf7f9b098604aae84d30622e207498a5ad14fa81
 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
 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
@@ -92,5 +93,6 @@ EBUILD netbeans-nb-9999_p20150113.ebuild 5013 SHA256 2191d51222749b3bb5332d11699
 EBUILD netbeans-nb-9999_p20150114.ebuild 5013 SHA256 ed135fc7e3f9490f201fd2f473d9be8858961ab369556988167cabab44bf39a7 SHA512 bc551e1e0433a4e02cf71426409f4c41ea34b693dbbd968d578e3e7efd666cbe31cb9d90bb75f841916174c78c55e55a430067c73e0a95027abbd7ebafadf268 WHIRLPOOL 86cc7c7a9cf8722572e7d7d89df496f5a464273ab4a188fa09c85c7434bffc21c66fb11a2ef564a63c438c49f33e3124cc30488b1ae54247eb48de29be24fd9b
 EBUILD netbeans-nb-9999_p20150115.ebuild 5013 SHA256 103a0cfbd35f674f55c41196e6410dc3884aef3263bb8c4aa1e5d5f023374af5 SHA512 7db94f851a055a679a30e8d68e0667f1f2ec7821536f5d2de2618ba32f89d9ad4145f53c22c3ad36f850c2a66fa36c08f987251bc2aa40aeafe87cdb6940d52b WHIRLPOOL 82b40ce9a9ed35e14207b03c1fcfdaa02994c5628bc8284df563506cf5092cf58375078a22f11d71146cef1cd1ab5954c9bf50bf016ca138b2ec030a07a12873
 EBUILD netbeans-nb-9999_p20150116.ebuild 5013 SHA256 c26f290012171c53491cfb559ec705cc7a8e3e93d61d19c0ca941b6a3ba8ee28 SHA512 0cee6db475842b2a539fe6f46429867f27aaeb22efb863835f982af9cbf883a4bcbc26f72d77595790eb4a67337be28addace80d291eb75f78c9a4dd6fa969ca WHIRLPOOL 2f8808e16ff24d402a302e79e9c85a3960f561516f98edc91530d896657867108c72f469977fc91c267f03701b053a215ea400a16129f53116c3c8b77e5dbd3f
-MISC ChangeLog 139184 SHA256 b93774b7a0887d576418f840f23e622094d491bcf6367217deb306b70886bd5f SHA512 c2eb94bffca447d0037c8c1a40280561035c1ceb3f52362320df74c318a07ba1367fba3aa0d61b1c6a52880f7b5e4b6ceb9ddc602c01d529ff15944ab6961d99 WHIRLPOOL 4803ffef0250aee05d5ec6ad3d8464735e9aa28385b3bf99c3d58ce1b2c18e621a734890b603d34d474446da7383a435f540ea10055ee0d3f84ce5509bbba8db
+EBUILD netbeans-nb-9999_p20150118.ebuild 5013 SHA256 8f83adc6636fb2ce02f54e7c6e65022308364a98bf9628a034927adeeb8e1caf SHA512 246bd1380b8a9c28e382478bed3630a7ece971dc8ea6c2a7e20340e30e357c9b832bc1c72edd9d884b8f2988e8840637a7969e295e27710001ed8a72f8ce05ad WHIRLPOOL 1c9a6b65bbe6d568c13f4afefba4419c7c2b67e5fb2b830d6e9c34bf4270daf627e1888f0dbedeb995746b6b8d24b258effd33c26355eaf4488fc2330c769246
+MISC ChangeLog 139349 SHA256 cb3ccdfd36e4903093444bf69dc9f88ba31f38ecdca5c919def5cb66bcb06f51 SHA512 882ad66ce79001eefed3e7928315eeb35b1e923d71c24549864571b4e2e5b32124204f8e2c06247446bdbfaaf502ef191128e1bca55993eca1899cec47e871ca WHIRLPOOL 48bc6cb59de06605b88f2b89f4c517ea4675cc7f6ba3e12714510c4cd36fbf4efa21bfdb0ef702b9bfa97927e535f42771055953e42a739dbc3f52ecf58408ee
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20150118.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20150118.ebuild
new file mode 100644
index 0000000..e62e21b
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20150118.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-18_00-01-55/zip/netbeans-trunk-nightly-201501180001-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 d913c43..687c597 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_p20150118 (18 Jan 2015)
+
+  18 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-php-9999_p20150118.ebuild:
+  bumped to the latest sources
+
 *netbeans-php-9999_p20150116 (16 Jan 2015)
 
   16 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index 4b422b9..0a4a7e3 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -56,6 +56,7 @@ DIST netbeans-trunk-nightly-201501130001-src.zip 201373370 SHA256 eb5fbabdcc6f24
 DIST netbeans-trunk-nightly-201501140001-src.zip 201400262 SHA256 65aef07f80d9cfe6b47ac2c3aa2be2f1d98a7d9466a44c5196cab7b88e743a2d SHA512 1175de97a824b8be65a5b25b20cfcd17ae4ab4b101794f7dbdde8059b7192f30193d634e63141a54e9e8c2018166f1f204d321270ba91959d450839b9e1fb89e WHIRLPOOL b5944d4eb663cda53d83f88a52775868cf942c632e5cae0be25970fde60557aa43f69095ddc0861eb872f815e562f6998a5873b8aae1c2c660ae8e8ade75b4c2
 DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6b3b7a2050181c2ec341fa33b031423a913141b9c76aa590044 SHA512 6cd0ff2334b892835c91ae0c0bcf996e2322673533f46cec0efa37db25837f809202de061696c737da837099179a1fe20ef7bd569f6c04375e6090a8c5757d4d WHIRLPOOL 82a9189ff14ac9f373d84346361b231bc7ef298be20892b7a76e20ba8fe3762055f11957f40ba914d939d650cf7f9b098604aae84d30622e207498a5ad14fa81
 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
 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
@@ -95,5 +96,6 @@ EBUILD netbeans-php-9999_p20150113.ebuild 4423 SHA256 026a382552a0801c52d106224f
 EBUILD netbeans-php-9999_p20150114.ebuild 4423 SHA256 86e0f51b97364e8ab308d3ef5e555745ef64e888e16705cd8d53634eab5722e9 SHA512 0cad5fff67645e92066008139c705217a0ad14efdbfd35fba928166466b513de99d03de171770d758ef5fa8c77f7dbd22f49b935dec6c23f2ba69742c321fb4a WHIRLPOOL ee6eb00272d5f4a3c670c22adc23899b0d66638cfcfb45e79a85b3de29c8927dff0bdd2fba421f6d8329a46422ad966bd3dfa6a920e19ad44adc5f91079d6a6d
 EBUILD netbeans-php-9999_p20150115.ebuild 4423 SHA256 d2086c51e219a41ce60cf68e7119b0fd0117360da9fa2eb3f1e337425fe2a8ff SHA512 a177a1189a5e757df359db84bbc928111363816d9ec70ef41dd77f8063e10701cfaf9652852db001d6eb945336c958cfed66be676046863f70655e1d0cf052c6 WHIRLPOOL d0a67b052d50e9b0f0549a2d1c7b04e03a0a228a18773b30b25f0746d7b92495b8df615f3abd31609be4857a5bbfbd12b48c0e1c878e42de55fd304942095dbc
 EBUILD netbeans-php-9999_p20150116.ebuild 4423 SHA256 1fb33578bd88f2cd8fe8a5d9f6a2b31f656ca564a9636adad3a203dc0ed7dce9 SHA512 165dfcca55da8d7bdbbabd52aece82c430337b7fda701069f1b620c3f80fdf5d51296b5de40984740345046b4c5baab0de2c243d7083b4a08acb5a11e05d8224 WHIRLPOOL 896f667876e2ca186d0fc20ab53dda6335cb61a4c30561cc2b8e79973ab400e8140d29c82d37ff21758547ac7b4fc093ce564634a20f6884e31eb3844a9e29b6
-MISC ChangeLog 140005 SHA256 da15289a0b4481a2baade0b1f6805684d6d00120cb336b1481444d82ce589b6a SHA512 2c6ed4d60789a8abb6728c444de7c3b28682e66007e7ccdde685dbc833e6a16785124401dc98cb1e6cd5a494e899e0b9103cf72247eede13527497b6be15ef20 WHIRLPOOL 82ca93522252f24ed59f3823a9d6cc8d5496506ee38f2a75947add9b061ab56bddd8dd26afa459cbe65a6cab11dc0fcaef3864ee23702fdbeef69c82f35932af
+EBUILD netbeans-php-9999_p20150118.ebuild 4423 SHA256 8f63409287fe2fc821fb23a73deb8df7c3ddf6c4882edf4e54f59167ad38e8b5 SHA512 72ded40ccb7dab63954e3dcf4653634733c54c2f03f90c3398b273d4ee32ad9a348b2cb14e756b5774544d8bab897f5244955d7601743d510ad2239e9fd796c0 WHIRLPOOL 6f080a0b973585b081ce7be6bd0f760b7a69dcce590a6033ab9c63ef74dc23630c3491df76c27833a493d97383ec72ec7543023b09428ed048dc8fbc66e3808e
+MISC ChangeLog 140172 SHA256 49d5a47bc404877d52bd1850427a75eb8395db5f7406d773e6e6c60edef3354c SHA512 37c65a027fc26022d033b695f97c490b72770d26ef9d95903058138177ce0d08b5e8a1fddd5ada90055e3e0a976f843a407e0d9ad840fa2db489e6a7bf951536 WHIRLPOOL c0eeed353947109bdbeb0d6fbfcf4b7e1f58fa490b1429a1cf0c66ac8942339e975157968a2cea6c05646efc1e6db389ef13286105762195b42b03be3ade610e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20150118.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20150118.ebuild
new file mode 100644
index 0000000..c7ca665
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20150118.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-18_00-01-55/zip/netbeans-trunk-nightly-201501180001-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 15aaf38..dbe2424 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_p20150118 (18 Jan 2015)
+
+  18 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-platform-9999_p20150118.ebuild:
+  bumped to the latest sources
+
 *netbeans-platform-9999_p20150116 (16 Jan 2015)
 
   16 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index b9ac190..c93c238 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -79,6 +79,7 @@ DIST netbeans-trunk-nightly-201501130001-src.zip 201373370 SHA256 eb5fbabdcc6f24
 DIST netbeans-trunk-nightly-201501140001-src.zip 201400262 SHA256 65aef07f80d9cfe6b47ac2c3aa2be2f1d98a7d9466a44c5196cab7b88e743a2d SHA512 1175de97a824b8be65a5b25b20cfcd17ae4ab4b101794f7dbdde8059b7192f30193d634e63141a54e9e8c2018166f1f204d321270ba91959d450839b9e1fb89e WHIRLPOOL b5944d4eb663cda53d83f88a52775868cf942c632e5cae0be25970fde60557aa43f69095ddc0861eb872f815e562f6998a5873b8aae1c2c660ae8e8ade75b4c2
 DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6b3b7a2050181c2ec341fa33b031423a913141b9c76aa590044 SHA512 6cd0ff2334b892835c91ae0c0bcf996e2322673533f46cec0efa37db25837f809202de061696c737da837099179a1fe20ef7bd569f6c04375e6090a8c5757d4d WHIRLPOOL 82a9189ff14ac9f373d84346361b231bc7ef298be20892b7a76e20ba8fe3762055f11957f40ba914d939d650cf7f9b098604aae84d30622e207498a5ad14fa81
 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
 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
@@ -118,5 +119,6 @@ EBUILD netbeans-platform-9999_p20150113.ebuild 8293 SHA256 d24f1c873d7c04db94e84
 EBUILD netbeans-platform-9999_p20150114.ebuild 8293 SHA256 30ce978fde2c58b11017dd7b409c7be606a11c20d41e081e7129b60dc2ad219f SHA512 cbf3a241b4d37cf68dd7ee1cbd1fd944eadc988ced18ba0e823228016c4986be2f3309e50e78e508b361fe185bbbaa1eb9fe28f16e0cddf3f0874c74610d3468 WHIRLPOOL 10935199184bb1b20c0c1f4c0f2b653b1a66401e7093cef3a0a81548561285d698b4ef4c0463e88965ed94db4952c4cff1330be9d1c02cd7a05812c3aacf60df
 EBUILD netbeans-platform-9999_p20150115.ebuild 8293 SHA256 5e3599e69b68285bff404f318e02870e3ca21a2df87ca076b5ca6cc92f6ad925 SHA512 43cf67defbd3829aedf6ae7e28348b6258d55a898484d4df0cf0a75e0259d4af160e504f6c3373d179efe7d707f6d21ddd1cc19ab0e7f67b06adfa585a452865 WHIRLPOOL 6f098ae26151355249c5a7e21822c8d763e75b2e70214bc4a90d7495aed069fc3e0a7363d4a78b3eb095117a3715cf528af04f91c0d301b046adb308e928ccb3
 EBUILD netbeans-platform-9999_p20150116.ebuild 8293 SHA256 f618c62440e6ec8d15e6e32b95b66d6ae72786eb01f3541fbe1eb3c126c6c203 SHA512 16583bbe0ff02ad1bde98cd1cb1290933441143b5edf820dce1ac172857e8e5b63efda1ab7d23104cca59c61d666b310dde76fa29b39e90f335bb074e5bee513 WHIRLPOOL 007c2e0c11c14b2f7a6958e1da382dc405faa45a98601ab113c79dde2e7f549dab3d9a9569cf330c4466af1e56cae9d36fb87c1a5719a0bdc3cba9f76302c422
-MISC ChangeLog 150667 SHA256 449d99f70fc8b29786df2371b15083b0e32655a255963b3d587c3559ee7ae0ec SHA512 e4cf8aadac6ca52fbf9065f8b9cfc7619e824231945cc3807598a2c40c5eda8921b985de1bc6df5b4c8e0c3edb6d2b5cdfddcdc1e24aed5638390756c58fbd9c WHIRLPOOL ff5aa78d367274e56eefaad41510e7c2e93c3c204157be4126062f10ad3f5afc5710879c522c5f71eb17d742a0811cdd7d5d720323c214da9bf5114f8aed93d7
+EBUILD netbeans-platform-9999_p20150118.ebuild 8293 SHA256 75733e9bfb7d75c24dc7f2a36a7681d089b1ca7569d83e1633259298ed9a21b3 SHA512 f06d5b89fc0dc0cd62f9d54d8fa711ba32e7469dbd1053af03a3e44d248418f1fff29e0931e7df76e902ca1dfad214229922d3e585c0fd0cf80bcd0984244d81 WHIRLPOOL 6431e12ca729b8ca7a41e5c9aa1d0062b909806191f2f13df042716ee3476cd4f9708b7bfc35c0f6940c7f8781621d853a801263853eb15fbd28066d95d31355
+MISC ChangeLog 150844 SHA256 35defb4df0b40c6503abb352e75503a8ae49ada2a0b72d951198bf6612c8da73 SHA512 7366d64bb15298dbc334f3367c430d2b419f5abae80babde7afd2cbf643e2a8b51a1bfb024d02c5a7c3e581968fdad5ca816d059993b8519e00582b724fdeb21 WHIRLPOOL 143f681e73c1d57491ac0cc53839e8b56c7ea85bd8a7f078d70d693b50ac2989f952e41ded9fef88370f18d9b1e85eef5534bb441d8f364d3b014a6e05c5a073
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20150118.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20150118.ebuild
new file mode 100644
index 0000000..5188417
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20150118.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-18_00-01-55/zip/netbeans-trunk-nightly-201501180001-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 536fb7f..fb168f5 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_p20150118 (18 Jan 2015)
+
+  18 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-profiler-9999_p20150118.ebuild:
+  bumped to the latest sources
+
 *netbeans-profiler-9999_p20150116 (16 Jan 2015)
 
   16 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index c5baa28..b1abf5c 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -45,6 +45,7 @@ DIST netbeans-trunk-nightly-201501130001-src.zip 201373370 SHA256 eb5fbabdcc6f24
 DIST netbeans-trunk-nightly-201501140001-src.zip 201400262 SHA256 65aef07f80d9cfe6b47ac2c3aa2be2f1d98a7d9466a44c5196cab7b88e743a2d SHA512 1175de97a824b8be65a5b25b20cfcd17ae4ab4b101794f7dbdde8059b7192f30193d634e63141a54e9e8c2018166f1f204d321270ba91959d450839b9e1fb89e WHIRLPOOL b5944d4eb663cda53d83f88a52775868cf942c632e5cae0be25970fde60557aa43f69095ddc0861eb872f815e562f6998a5873b8aae1c2c660ae8e8ade75b4c2
 DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6b3b7a2050181c2ec341fa33b031423a913141b9c76aa590044 SHA512 6cd0ff2334b892835c91ae0c0bcf996e2322673533f46cec0efa37db25837f809202de061696c737da837099179a1fe20ef7bd569f6c04375e6090a8c5757d4d WHIRLPOOL 82a9189ff14ac9f373d84346361b231bc7ef298be20892b7a76e20ba8fe3762055f11957f40ba914d939d650cf7f9b098604aae84d30622e207498a5ad14fa81
 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
 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
@@ -84,5 +85,6 @@ EBUILD netbeans-profiler-9999_p20150113.ebuild 3478 SHA256 33e27ac1cd118a16d7f09
 EBUILD netbeans-profiler-9999_p20150114.ebuild 3478 SHA256 c51d13f368a66ec3f418259948846e1be451b02a093a8ec937a67b515319a25c SHA512 e1a0c4cffa66d80fa49bc56e4225ab550c1dd0bd42d24f08cfa21f51a5cda734a73d572d1a36f5c4bf1443e56db5b45293c1b86f3c2d4fe4a6d424ff437d4f33 WHIRLPOOL 4ebed844534bcd07c56524277a083d12fbfe8d4c91b81801dde8eaaefc409107c2e3b9aab00cce052fac94fc7619ae6757b2c57dd7cb2268f0ebacb40b7d555d
 EBUILD netbeans-profiler-9999_p20150115.ebuild 3478 SHA256 62b0d5e5e15e11d58b4d3f181fb2858774d81283c42e21a2daaa854bfc6acbb2 SHA512 d96f0da5848aefce3828d87c95085a277f4bd866a7e3b82cf3e6c2bfa988c23248cb3a216976f8cc677ae5f270e0d7e5da419cb0fadfed1bb14176741d13a2bb WHIRLPOOL 2ebc369fad408d30d88a2c19171e0edcf63e9331dc55b8119ab8c3436aa9fe58b4f289aec22d27f379a020dcab76a4460a952bcdf95dc77e059d18470b1ff9c0
 EBUILD netbeans-profiler-9999_p20150116.ebuild 3478 SHA256 de5b4b51c1e3651fc8d5592145c9534589272e9ba7a793c1aaf629c35642e88b SHA512 2a6089f96f09dbf2074303c03cf3c3d38455ef8b7262f2d4399908a38121e40ad93bcde7a5a891da4e2b50655c7e068fb9f4f07c2d1df994ef205d430f12b246 WHIRLPOOL 72421d0cb157b9230934bfd0a8bb01ad7d28882af663f9047744c0a68191edbb509bd7457812b4ba409b1abeab719422eb994c3002e1b2018005fec92f23c082
-MISC ChangeLog 150128 SHA256 7cd1811cd3891a7040b7e7bece74682eb366f1ad029a9a17603f9bb8a2584115 SHA512 74162820c6396107e9bb90bdf74301c44ffee3a6bd8cb5c3c0fcf5687316366fb4bc39681400b5d9a6aface9cf08bd2523a2712746c6cc3a7ce3962c44105cf1 WHIRLPOOL f7ba836a1566e0bce9bc12fe8bc852df26fb0788256e8a9b237a8f05c6a0fe7792abf55e57825c84d4674af75a728d5299da8e15f5d81caf7e326b14ef54362e
+EBUILD netbeans-profiler-9999_p20150118.ebuild 3478 SHA256 1a8a41944225f8fc0ece1d06c5d603631ce16551516beee9597f5e2c5ab524a5 SHA512 b6062aaf1fd74e97d057a395417fd50c439c89bc00c766bf654dfc1e868dee469508f480d99f78967bdf3124f37b8f9d7f1b27acbe4482b14d7f7a2542409704 WHIRLPOOL 44cee17d7862491074d3b587cfacd38b2236429a012c699f42ada261d9bb6764c38aa5c9c5b1c98bb356ba08389a69d0111d02478876f7e4e91c25bcbd280ef0
+MISC ChangeLog 150305 SHA256 5482c9828ac64e641c5d7a7dc3eb2dae8e69e009c5f8b03d49a4a0ace0ee66c4 SHA512 3dfe2157003ebce429faded64dace8649e987039480f1d99d2568aea9111054d892579c779ca623bacbb8d8330c895070165a11e68d615e19df168e19782f20c WHIRLPOOL c437e15d8b5eb39dd82b62bf8ee5c50af7aa2817ac877bd4d3072e8f418508fbd506fa93e6039963ee09f10f8790f7ffce1eb2051b06a8c727d5686151561679
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150118.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150118.ebuild
new file mode 100644
index 0000000..6a6e23b
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150118.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-18_00-01-55/zip/netbeans-trunk-nightly-201501180001-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 c264ca2..f3777df 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_p20150118 (18 Jan 2015)
+
+  18 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-webcommon-9999_p20150118.ebuild:
+  bumped to the latest sources
+
 *netbeans-webcommon-9999_p20150116 (16 Jan 2015)
 
   16 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index ee397ff..a100efd 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -51,6 +51,7 @@ DIST netbeans-trunk-nightly-201501130001-src.zip 201373370 SHA256 eb5fbabdcc6f24
 DIST netbeans-trunk-nightly-201501140001-src.zip 201400262 SHA256 65aef07f80d9cfe6b47ac2c3aa2be2f1d98a7d9466a44c5196cab7b88e743a2d SHA512 1175de97a824b8be65a5b25b20cfcd17ae4ab4b101794f7dbdde8059b7192f30193d634e63141a54e9e8c2018166f1f204d321270ba91959d450839b9e1fb89e WHIRLPOOL b5944d4eb663cda53d83f88a52775868cf942c632e5cae0be25970fde60557aa43f69095ddc0861eb872f815e562f6998a5873b8aae1c2c660ae8e8ade75b4c2
 DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6b3b7a2050181c2ec341fa33b031423a913141b9c76aa590044 SHA512 6cd0ff2334b892835c91ae0c0bcf996e2322673533f46cec0efa37db25837f809202de061696c737da837099179a1fe20ef7bd569f6c04375e6090a8c5757d4d WHIRLPOOL 82a9189ff14ac9f373d84346361b231bc7ef298be20892b7a76e20ba8fe3762055f11957f40ba914d939d650cf7f9b098604aae84d30622e207498a5ad14fa81
 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
 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
@@ -88,5 +89,6 @@ EBUILD netbeans-webcommon-9999_p20150113.ebuild 4997 SHA256 5f9b6c71c952022b9b89
 EBUILD netbeans-webcommon-9999_p20150114.ebuild 4997 SHA256 ddfdfa120d1b65a9f646e3b694145513f0c99cf7ac9a429a23ce13cb33566f75 SHA512 d6a32f19760b0bdfbf73d867c915b4a2f23ec6d725d785da0f0a16f9abcc22427c29b3bb3cac1adb1d62b5e1834c3e8f5ed6a7b37516ee0fa486304ec02759c4 WHIRLPOOL 9acab1cbb1185e3880ef26c20bc5664c28e2fa17ab177fc49812ca1f45052b1ff76c5f1d499b3e7978deb6b0ef5e95c7c3994479e8b5f4807678dd45720f440a
 EBUILD netbeans-webcommon-9999_p20150115.ebuild 4997 SHA256 d4a393471335a0eb6286438fc779cfbfd8620a08085d8fe4c8444d93135d2e8c SHA512 1293b48ee5ea063c34a441a1c5c1b75c58265bb10a19948d5a7006ad61edf015f4e2af0c90fd9b93889348da68478c45a7b3127eceb00c4164508afc4c14fd22 WHIRLPOOL 04bd0333e32d0a5a06177269e191af1b14509cbaf1649f314aab8c94b9e2b939ca215895f35523a36b475cf6c0dbfe95475b7f73ec6a8fad5b091c1ea27ff939
 EBUILD netbeans-webcommon-9999_p20150116.ebuild 4997 SHA256 0251db677101f76e3ec56f52beef42321d8debf73ba5e2e26505ee830124c1b6 SHA512 e6037bc7136a2c876a65ad14d6b2cbd5523297acc05983defd8a188d7f7aef23d2a2a7e0688bbb525a007b657318ed0c8ef71d76761ae6f0b6164a5a74a112a3 WHIRLPOOL b7ad8462fe27ab5cb59a921e39fda75df03bc11412029ad68c5a7afecad14775fb50f0a03f8d731cc855e551beb879b1f6c920b5be902dbc038d14278159ede0
-MISC ChangeLog 122971 SHA256 201cf2b95b17158b0c03e782da8dd62e058c81a4c1320298648eb75ce381a52e SHA512 d633aa21ea8ed57b148159d4dafa6fa10d76ca21a59025d0e5ee7ac2b8b709dc1c46cd4a26ce0fe83db4448893281c46562e980c523fd3f98079f0aae6c286f7 WHIRLPOOL 53585dc25798137cb670037a54b514492c08a8db7fd74718d0ff56615b5c7d9ebf7abffbeb441da097477bd3617489be6fc0f106cac2add05a5b34e51a8a0da9
+EBUILD netbeans-webcommon-9999_p20150118.ebuild 4997 SHA256 85000b0400338b446298a941b63c84d45a95a01d38233d3625589fb43621dfcc SHA512 bb891437516e3f6fe0bb2df4a4febbb2ef73c47243ac42ed45356a8edb87ab5c3599470f090a251f31c824512f6234f78ce90e4a7611ff8aac242b445d8245ae WHIRLPOOL 610f9e0ef6c6db49b3a97eecae0b9b688228b480bc86b7806a95d782c461567caaccd15ad0d398016433531ffc791f3047e6afb0b63669e18aa89c89355aa801
+MISC ChangeLog 123150 SHA256 e143cdfe3073c079d084dd5377882bf1030706db8d593c1afbf5123028dd1ee8 SHA512 b74d54363d82527217bbe8f3f8048fd6f650bf5386d70048423139b38ce6ea8402fe40ec715da937b8b8ed11739e8fbc1734fa950bdd791f158aa445b80cafb4 WHIRLPOOL 75582ad712e8391d0d07fc7be77765fd069f730095a87280761b6633c76ea849f31ade653187f2f3eb79eede912016e90919f8d5337c2dea7128de030a91466a
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150118.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150118.ebuild
new file mode 100644
index 0000000..7746c01
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150118.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-18_00-01-55/zip/netbeans-trunk-nightly-201501180001-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 36e58aa..346764d 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_p20150118 (18 Jan 2015)
+
+  18 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-websvccommon-9999_p20150118.ebuild:
+  bumped to the latest sources
+
 *netbeans-websvccommon-9999_p20150116 (16 Jan 2015)
 
   16 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 2b20e84..97222b9 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -45,6 +45,7 @@ DIST netbeans-trunk-nightly-201501130001-src.zip 201373370 SHA256 eb5fbabdcc6f24
 DIST netbeans-trunk-nightly-201501140001-src.zip 201400262 SHA256 65aef07f80d9cfe6b47ac2c3aa2be2f1d98a7d9466a44c5196cab7b88e743a2d SHA512 1175de97a824b8be65a5b25b20cfcd17ae4ab4b101794f7dbdde8059b7192f30193d634e63141a54e9e8c2018166f1f204d321270ba91959d450839b9e1fb89e WHIRLPOOL b5944d4eb663cda53d83f88a52775868cf942c632e5cae0be25970fde60557aa43f69095ddc0861eb872f815e562f6998a5873b8aae1c2c660ae8e8ade75b4c2
 DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6b3b7a2050181c2ec341fa33b031423a913141b9c76aa590044 SHA512 6cd0ff2334b892835c91ae0c0bcf996e2322673533f46cec0efa37db25837f809202de061696c737da837099179a1fe20ef7bd569f6c04375e6090a8c5757d4d WHIRLPOOL 82a9189ff14ac9f373d84346361b231bc7ef298be20892b7a76e20ba8fe3762055f11957f40ba914d939d650cf7f9b098604aae84d30622e207498a5ad14fa81
 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
 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
@@ -84,5 +85,6 @@ EBUILD netbeans-websvccommon-9999_p20150113.ebuild 2727 SHA256 aeb389cfef748bf0d
 EBUILD netbeans-websvccommon-9999_p20150114.ebuild 2727 SHA256 d6349f1a50a0ab593e454e08ea4047a697dbe25a90400a09f3e7b6d587f64dd5 SHA512 ac1c8838c55749e16f0649b5ced8673dc941c7692596a5982d1e2d6fc732e48e368b1c696703d6b873b3fcdb973d1219167f96151ba5e58f0ed29067b471d52c WHIRLPOOL 464034a53422dc00300834183a7c2c10ae163f2559c0a8e717b24cbdb56efc209299f9e56be7080f9f8d5e89f62eaf5b9f8e5c2a34404ada7e362c8253e0a1e9
 EBUILD netbeans-websvccommon-9999_p20150115.ebuild 2727 SHA256 aa9ddcf1829a4a2d6021080cfa1dbc2a8c7cebfb8315940db86946b8a89d581b SHA512 ce503b1c8bf330109b0356f2a75a7a9c73ede633bf0fed73d50d5255265ff5592b901b7a43759dc0c05ac5e74aa1e4c74a069ce9fda8e4fe13a06eda00fb20a6 WHIRLPOOL 67bb41532686549a8aa088afff0abed80ae0af6260f8d0b50dedd9954e444a3b8642f12825f39fa44071e398ec02b724cf229f1ff2571d344f1eb34e2216b67f
 EBUILD netbeans-websvccommon-9999_p20150116.ebuild 2727 SHA256 6c30bc2507cc9e5a096cd50e6615b4609d6ecc4034e312ddf0377ac91f1b2c66 SHA512 6da1d854fd9f6b20b6d224600197c67bad3caff62dee02101da504e2ae3af6d301a2c7f52f42da19bed6c668e0c5707a7021af18ff77a5613115fcc40af66951 WHIRLPOOL 42cb4ce0c8899ce032a8091f914156b90ac9d71f912e7cff0845c59c721ecc1da2dc6621dab8ec93e50849ec71c9582581f8330bfc8949cf75f26ae9295b17fa
-MISC ChangeLog 157241 SHA256 804db6929c63a60084c02642c4b183b87b93641d7cc306a4a422f3484c575d08 SHA512 7c6f2bfb9c0a792818d26954fb3b699e3a38d176cf2cbc9c950f5b842e6be3bbf18b5b87a9c659e89bc2d880f0f6b57edc6cf227417a7339df8f3a516e1cf3b0 WHIRLPOOL abae880066691128048a980ecb10d0bfbdc5ac18c602c11a60b90738410d4d3be9f3f2abed37777fc2ab4ab42ee8073c1f756ccaef3fb9c3503dfbf1c82d147b
+EBUILD netbeans-websvccommon-9999_p20150118.ebuild 2727 SHA256 1f59d2120e206997bab4c493976a3cab1f91b0440d4db909ed691b9e73a9d96e SHA512 b1d78610baef6378fa30373a28b2504a0884ff379b28b44a863cf30d05d60011c9d858d0f2586221b54c31820d2c4635b60ade78546a0e8716268fc85f1c3117 WHIRLPOOL 1933ebc83fbe473827be12c8d99e5b30187fe6e2a80cd33c658317098393f797db9680c5f6e7223e002bb31d43f4b320de32a0136fc29d023f026ef0ee422702
+MISC ChangeLog 157426 SHA256 607cbbed3adae3787d0d8abd67b41ac773232eb056fbf697b159f5870c32e26d SHA512 454e2c9945b9c2b5695c98bac1b764221f376167a62ff99a2f01779d157ec5365730fdea33dd9f81eada98fd59792cef5a4e29963de16caef351b4d540f061f2 WHIRLPOOL 86af8d74b7be89bc02a2e4d77494b3d672f208c16a3818098f476be8373f9523cc3828b0deb23416e9fe992e19b44936c437972b435df0c8319b0f0fa2252e43
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150118.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150118.ebuild
new file mode 100644
index 0000000..2e78385
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150118.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-18_00-01-55/zip/netbeans-trunk-nightly-201501180001-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 dddf6dd..a2112b2 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_p20150118 (18 Jan 2015)
+
+  18 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-9999_p20150118.ebuild:
+  bumped to the latest sources
+
 *netbeans-9999_p20150116 (16 Jan 2015)
 
   16 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 9841d8f..0f2451a 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -53,6 +53,7 @@ DIST netbeans-trunk-nightly-201501130001-src.zip 201373370 SHA256 eb5fbabdcc6f24
 DIST netbeans-trunk-nightly-201501140001-src.zip 201400262 SHA256 65aef07f80d9cfe6b47ac2c3aa2be2f1d98a7d9466a44c5196cab7b88e743a2d SHA512 1175de97a824b8be65a5b25b20cfcd17ae4ab4b101794f7dbdde8059b7192f30193d634e63141a54e9e8c2018166f1f204d321270ba91959d450839b9e1fb89e WHIRLPOOL b5944d4eb663cda53d83f88a52775868cf942c632e5cae0be25970fde60557aa43f69095ddc0861eb872f815e562f6998a5873b8aae1c2c660ae8e8ade75b4c2
 DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6b3b7a2050181c2ec341fa33b031423a913141b9c76aa590044 SHA512 6cd0ff2334b892835c91ae0c0bcf996e2322673533f46cec0efa37db25837f809202de061696c737da837099179a1fe20ef7bd569f6c04375e6090a8c5757d4d WHIRLPOOL 82a9189ff14ac9f373d84346361b231bc7ef298be20892b7a76e20ba8fe3762055f11957f40ba914d939d650cf7f9b098604aae84d30622e207498a5ad14fa81
 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
 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
@@ -92,5 +93,6 @@ EBUILD netbeans-9999_p20150113.ebuild 7216 SHA256 ae012f69a2244659ac63b3262cd7df
 EBUILD netbeans-9999_p20150114.ebuild 7216 SHA256 02ca10c7d20f2f37c54eb2ff6f21f6521b088fcccfb67515529d52bbaa81ab5a SHA512 f1b64da112b597e857d508d6564b9563b96d323fbbd80fa21438bd36d8b1df63624ba476983d42edd45ff4c7dc4d3ad2166f66021498ae126456f71e68fb76c4 WHIRLPOOL 8bde0a6bc540cf62401c74d539496bed9c09d34caa3218730301da51e6ca11cb46a640ab96e560a5a4eab60cea5abfd5c7ec3bfeb88b554f762e8d0f27d103fa
 EBUILD netbeans-9999_p20150115.ebuild 7216 SHA256 a4bbbf4b6012d8ddd8495eebfb13e6cc11aba015547f6aefba5ebf625bdb6a43 SHA512 4ea70adb5dd0f9ac9e641ce7a5e4c45c723b2c3d8a0e0b420fb7da65d41c29ee844767a3bc70d9fb9f73b5c9853ab0342ccb11b30d6ebe68006982f638354f70 WHIRLPOOL fbf70c3918379c5552ae150b7621515401ccf778e17bc7eb0e9c394df5688debef2a27983b6015e70e3ccd7d92e44a9fda91299d2b21bd3761b2ebbc43c0bc47
 EBUILD netbeans-9999_p20150116.ebuild 7216 SHA256 932a7ddb1f2112bbf19bea6281826ce0c0bbfcb8c82b7ce344ae81f54802ba17 SHA512 362c8d7c3bf9e4b1bd6d02cfc67f02e662292803268d24a2f9c00cdb0a9e96a758e4797f2ea7ff019c8d02b5f840d2a031c1991db55feaa97a1e4f271488bcf2 WHIRLPOOL 4dd9bd1655142727033e31eaa15a870d2386fc8448d2a48c20848e76483563312b3360d72ed50f00c6ad3aebfeea8ae0ab5985f8c30ef1b3099c166fe0df77c1
-MISC ChangeLog 133966 SHA256 e36e978871e8eff71ece937d4b6674cdfa7b00dc2bde5ae0d7b6b411eff070fd SHA512 c4248b1dc4713f4af6561de9d005c4b123dd09321ed3ce7e701802931abb28a7d5f1e3b01faeb8459ac3e9290e7d7becad573a93d8318b89ccb2ca7b5d48b548 WHIRLPOOL 0805a1f7ce3f7e0c05f4c1ced2ab385f7c756bf2cfcb64973f9bd9f1a1e329c69ecb05e950d9b3a7fc835c88329215016d2d257d9888f6ae238247ff3f773378
+EBUILD netbeans-9999_p20150118.ebuild 7216 SHA256 7a062c1b98caa319060dece145d11ce58c23fd26f9431a34e18b9d41647ae5fc SHA512 c5ab2287f52cdc6b4f79b15780560542aa4583da16cea0fbce09bc6ebac0b02b0e8b4c50c3c04fa2a95c4c91f147505b38b9f7075a0c58349528dedf25fde9b6 WHIRLPOOL 302db2c25d542d129832cb6133be572f6d7a3297e5408d9a0393a89e67e8fee12c40d17e9f6d0eaf76b1b68587f491523ace57d91606e934b1d2a41e7ce8309d
+MISC ChangeLog 134125 SHA256 c6507e0caa1aed9727a338049dbe10ff68c567fe07f6f080daa3e603c2e8d6ae SHA512 2931055b8df337fe2bac4258ba3da0a9313b719bfdf998d75ad7710516ec922c674290b1673f02e9e23e53386a122d2b639f5352377038339ddd58e47e31fee0 WHIRLPOOL a29de4556052b67f5307f07a364bdaf15a1d5d319219884e7d6faa7c8232d853cd0d8810d2b7496a7eab30f435910517cd92629809be9abbc832ff4ef0c6b78f
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

diff --git a/dev-util/netbeans/netbeans-9999_p20150118.ebuild b/dev-util/netbeans/netbeans-9999_p20150118.ebuild
new file mode 100644
index 0000000..86c9ddf
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20150118.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-18_00-01-55/zip/netbeans-trunk-nightly-201501180001-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-websvccommon/, dev-java/netbeans-groovy/, ...
@ 2015-08-22  8:46 Miroslav Šulc
  0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2015-08-22  8:46 UTC (permalink / raw
  To: gentoo-commits

commit:     5f2756e6dd6df6eb0c86507ab337249164c09ba9
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 22 08:46:49 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Aug 22 08:46:49 2015 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=5f2756e6

netbeans: bumped to the latest sources

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

diff --git a/dev-java/netbeans-apisupport/ChangeLog b/dev-java/netbeans-apisupport/ChangeLog
index f941a7d..89c7b46 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_p20150822 (22 Aug 2015)
+
+  22 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-apisupport-9999_p20150822.ebuild:
+  updated to the latest sources
+
 *netbeans-apisupport-9999_p20150821 (21 Aug 2015)
 
   21 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 96a1e77..b09db69 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201508180002-src.zip 208817240 SHA256 b497e33ddf1039
 DIST netbeans-trunk-nightly-201508190002-src.zip 208817531 SHA256 6594e5c2181ff7dfcf7eab3c7551571ea8e4cc6f3eb3f196a2b3b4bd7f394745 SHA512 84b4d1f1e77f1a4e2d97c14e2400381ce0d926dae2659cf38bbd4d2b7ae619d479ac1d73900f6d9cf10981b85982f7f19c00662974179e48cc4efb6e3481a82a WHIRLPOOL 7decfaa30422c8c588e8cfb65cd654119c3f80b60ffe3226074e5a1775648154a26a5ef267bd98f0a7720b107a0046b040652379bb6dd4a837d000863098ecd5
 DIST netbeans-trunk-nightly-201508200002-src.zip 208799494 SHA256 81de2b1f44baa32ffb769676ba38edab57124533bda1bb1dcda18b9be5dcb7c2 SHA512 1c68dbcff6bcfeb3566823749b57ce95c2de6a97333573897d78f5f6bc7fcfe2c06a2ff7805bfabea9dc9f60d9e5021d4c3d5aa720004d796caf3b163fb1699d WHIRLPOOL cc8344fb52507294d00071f967abdc5b77fcd37fd3989b81d0efdb7d35c0eca4349f86769f2a09915a72565e399852c40f21eaab89fb6a7c66a58960ecfefc39
 DIST netbeans-trunk-nightly-201508210002-src.zip 208800734 SHA256 c85c1f8027b3b9b03bbcc6743bb508899bc9050058c112f060d73daa544bbde6 SHA512 d8a3cbbc3f671d52bb5edcd2722c9ef847cdc160aecb4a9ee3283c2f64d82284c820c39a68e2aff2e7c3cd24fac618c1d3c48207b8323aa06f92524d0ab3a185 WHIRLPOOL b8938d9102fff59c5cc4f35db839492bbd1b1249d4e9c8da9eb4b2167c1e14d8906d49ba2bc9d301331e25d855b798883ee5f7aa51a5f00b272f55adae5339b3
+DIST netbeans-trunk-nightly-201508220002-src.zip 208858908 SHA256 eaeb7783c5302a6fb71c658071bf7283fe282bde2b18df8b6f07ed8cca69bc0d SHA512 c6687256e92c8447dd1d77b4dd678502d23ed7b6a799439f1a066371c672670bee25b46ba2ee2a090382ab157aae31641acc20373898f58fceac642a2a8aeebe WHIRLPOOL df6a09212c094d65f92004dd68ac857892308540c5ff9e914b683a40163ce784868c06214dd5636688c81549fd9e0e69b14df3c8ca268d1de517cb6ac4349594
 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_p20150818.ebuild 3390 SHA256 54ffc668849a41a809f
 EBUILD netbeans-apisupport-9999_p20150819.ebuild 3390 SHA256 b29a30c9e29ce22a7079e9abd9e986d47635faf0aeb6e8392a50f904b28875b8 SHA512 14198814a46ec60ae51a43a9d10f270659cc1dbf50ebec99656393ce1c419047d395fadae7153a5a23fed9c03d8fecc5f33e5b26e00fd75650df581a91fed66a WHIRLPOOL 629ba3afb0bb1e449ee85bcc0fa1c8f8d7d5bb581b5b4fa69c993dc709d41f41a62611850fa609db2ece9715eca503206de61a5be03edd6ae97560b67bc05bfa
 EBUILD netbeans-apisupport-9999_p20150820.ebuild 3390 SHA256 c28f2078faf2e34aa69e4d2e0a34f9b6950d79d087d024bf98268d5386f94895 SHA512 c379f85216eb1b2dfd47f02e415743d013f998fdacee11c6689ad69b6d1d677d89bc25d2ca13a66afa43dbdcda0fedb4345ff953ec40d79ad74a063ee7a2eac8 WHIRLPOOL ba83a67ee5460df7ee6011b05235dfe168aa7096dd681f7700cec94bf63f7423c1eedbd941476cba34080e6054485b9569780de4d7e0a0f0c64b398abc96f336
 EBUILD netbeans-apisupport-9999_p20150821.ebuild 3390 SHA256 31b3f93c2304f0259e5e9039d32979bc6baa5ed058697e59164a2bab4b7701eb SHA512 c7afbf12d5e6c98e86eb3c2069fa321c3bf94a4521bdcad9e5ec11d2fa54b7bc65b60d81f8ecffbf6333d7ad34f539edc351ad861c9bb9e2d7ad013948f60355 WHIRLPOOL 5935978fbf458b8e190fae5dc84fb99fb8bc90a0dd08281f46e0e9433054c14fdc4401a5243fb00f239ccefd2d1cfd9141218a697bcd81c088fd207d6f0af7b7
-MISC ChangeLog 184413 SHA256 63f7bbbb708298ed2beee5dd2208a7c72ba949124eaa8b0aed929a044e492fcc SHA512 a3179ced5d2aa7d864625d758c0d27fe3d2e6699a0b199417b59c2ea9af38e5b6b6c825a35078842eda8bc278c0d77786346fdaa3fc9d41f0a4a2754120a5e98 WHIRLPOOL 9837bca02da1804d6dc4626d50531bc51d9c0610bb5d1d097f885414157410bd934e2753cc6aed49b0e57baaf432b58b3308d8a763d6480bebd88d68a2ef0232
+EBUILD netbeans-apisupport-9999_p20150822.ebuild 3390 SHA256 b7a39146127c71aa35d7b8bc75e0dfcd47ef72add853b254ba1a4ea46a688e8c SHA512 5609a30035d76f00b3d72973bbd195d530aba9abfbcc4779ea6bb16ceae4918b38b85366e9ec6aed69082b4d9f15d4a64c17fecf9cca3393c5d0352470f9c53c WHIRLPOOL 87d16b75ba638606e6b0a78f8c276cfa13d68aa6f9738fa9ccd371e9e7d15f61af9733c4f16908fd14782516664c689d3145859020f1ab888c29cb3b2597cebc
+MISC ChangeLog 184595 SHA256 ac918fd9226668cc2d47259b851f322baec7d3a86d4a0904385dbb1daebb0587 SHA512 8da4cb4d9764ea8653105575dd2e4c841ef93a8b3a2185345c32e56f7447ca32e27c5ae154457fc22e7abd954ff74f850b68be5af3c21bf32421ceb6a8a51c37 WHIRLPOOL c4d6d1ed02c2e308a9089b5007473e29550906503092231ba9df3bcb8ef8418312d8b8d7480a2ac16027518d12e0afb3238bc10d7c5b29d798c9b65588bb3d80
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150822.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150822.ebuild
new file mode 100644
index 0000000..5b3cfff
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150822.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans API Support Cluster"
+HOMEPAGE="http://netbeans.org/projects/apisupport"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-08-22_00-02-28/zip/netbeans-trunk-nightly-201508220002-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 c21147f..8f3d4d0 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_p20150822 (22 Aug 2015)
+
+  22 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-cnd-9999_p20150822.ebuild:
+  updated to the latest sources
+
 *netbeans-cnd-9999_p20150821 (21 Aug 2015)
 
   21 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index ef7015e..5a72dc5 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -6,6 +6,7 @@ DIST 2BCF2047382FB68A2F275677745C80E79B4046AB-cnd-rfs-1.0.zip 152701 SHA256 ee45
 DIST 38733D0432C0C5CBE3AF36465AB7DE2B6170E98D-clank_0.3.6.zip 7401678 SHA256 a0b45cf016068c6e7ae6a19ffa22c1bd809b367836eeb67f745f04e250e64173 SHA512 d05a9add9c941065bf1a44360a9588fe6ee0798589302582ecbe13458e0e6441e9414808f5417a8f834e5c3d71dfd397b9b5a30fec1ed344228efcddcb008a35 WHIRLPOOL 381f2d5dbde553d82c30c72495b7dbcd13070549649340e650ceba4634a2b75316946951c9dc6328c0dc8df79b021600f98bf81cbb75b9683779b7cd4443552f
 DIST 3A8AF153DB7B434C6E97911B66A1DF27ADD37FF3-clank_0.3.6.zip 9108458 SHA256 a9d77eb8504727eff8690eca0d8f12f738209e37f79f63b8229324fd0121164b SHA512 6d408c4c6a983ca71fbac4e716aae79384ea31843d33036d333441744b6f3a1183d7554b33b8b3fd12272c5b774f88cd889b969a03904bd9783977bcd0d70919 WHIRLPOOL a7f4a70ddd3e8cbb7e16d78167dd17d2aa4a79f96498b0384c30f12a24e38884f2ca62b31bd0db4fb1ed0c998c26bdf17338a8bb80ff6eb4e22191b938a6908f
 DIST 415A808B75F9EDB3CD6F4689DCEF9C399BF802A8-clank_0.3.6.zip 7308384 SHA256 c4cf1547275956b7f04d8d848ddbd6a7ca4bdbf3a95c43ec02732f2ae5654c87 SHA512 1dd82de19366260def1ce8b6df89600f4402d2d189a2d7e21041d78866ba7fdaf3e3785a9cf5e8382aba745cd284cb2e3f3d37fd9607bcd16d73c1aa566b1294 WHIRLPOOL 10453cb76df030a2ee67dcc3c7514a0991953c266e7b77f11c1c92f26cc7e0075168ec469b0286ad7f9f3833517cd5b9f8daad24d2a5760f2fd979308e164c02
+DIST 481F3F250488F9230E076578DBDB0ED0AC5A47F9-clank_0.3.6.zip 7483906 SHA256 d32b9673a8414d235a1c3ba689124fa01a9424f2493cae9411125c6034ce44b3 SHA512 e22d5b3be329dc4c00dd2d92c6c55f36ef29557a0504c4a3bdce393910a024a71d08a1f797c4b38414b5c2e66fccba61a554fc51bb6cb6ec3bf039790657a51b WHIRLPOOL fee7739bb0be9fd2807311dbb5832b2761a76a4c62fdd53860105947b5e60f47036c97eaed43b931e05bdac6b6c68fa8e2bfdb9e6c86b366317465f3e947ff04
 DIST 4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar 164365 SHA256 8633aa79a2566f51a089195e09a4581af3ee71bfc13eb234af5e0cf6383078b4 SHA512 f1300e2d1e47659f6113a0a3dcc953766b5a8ab32f13bedf4d6ac652ffcf828c17474d47edec08d7ad9039d7abb8570770b48fa53b8ff6b47a028836490777bc WHIRLPOOL 765c87803d9cf622ae7936cb922ad9bff8823a09baf01a6c8b4a81df8ba5fd7cd17b513b36da9910b75349de45185f4641680f35be8335e08b9c30283b6d3345
 DIST 5C917BCC015510DC6C7E3B511DB85B2978C0774C-cnd-build-trace-1.0.zip 19708 SHA256 e2c7a9e2ae6488e1c7cddfb969f42ac19335077bfe8b39fdb57ad3202648bac3 SHA512 0b409dcdb99dc8972b281ae6614b2780166033d79d7da5c9e8214d5044b46e4561c0d604ab1f35817404f5f6a295bb7c62209810baf16f60fb808da069a328ed WHIRLPOOL 0b092090f9430c8526201db4a591fa82269490f2f4ca7622b2cc3cda379cee24479dd626e3dcb4b91821c2dccbad7590f6639b42cfb6792ab48749355686885a
 DIST 5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar 2388361 SHA256 9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7 SHA512 04be4dfba3a21f3ab9d9e439a64958bd8e844a9f151b798383bd9e0dd6ebc416783ae7cb1d1dbb27fb7288ab9756b13b8338cdb8ceb41a10949c852ad45ab1f2 WHIRLPOOL 488b7b9af1d1d06cca163d43e7be190730e2f0421796c21a26ace11196ee37a16b1bdeea78a1e2e64f8ca0e87f67a2aecd066af21505f3dd92dd76de40a94fa0
@@ -62,6 +63,7 @@ DIST netbeans-trunk-nightly-201508180002-src.zip 208817240 SHA256 b497e33ddf1039
 DIST netbeans-trunk-nightly-201508190002-src.zip 208817531 SHA256 6594e5c2181ff7dfcf7eab3c7551571ea8e4cc6f3eb3f196a2b3b4bd7f394745 SHA512 84b4d1f1e77f1a4e2d97c14e2400381ce0d926dae2659cf38bbd4d2b7ae619d479ac1d73900f6d9cf10981b85982f7f19c00662974179e48cc4efb6e3481a82a WHIRLPOOL 7decfaa30422c8c588e8cfb65cd654119c3f80b60ffe3226074e5a1775648154a26a5ef267bd98f0a7720b107a0046b040652379bb6dd4a837d000863098ecd5
 DIST netbeans-trunk-nightly-201508200002-src.zip 208799494 SHA256 81de2b1f44baa32ffb769676ba38edab57124533bda1bb1dcda18b9be5dcb7c2 SHA512 1c68dbcff6bcfeb3566823749b57ce95c2de6a97333573897d78f5f6bc7fcfe2c06a2ff7805bfabea9dc9f60d9e5021d4c3d5aa720004d796caf3b163fb1699d WHIRLPOOL cc8344fb52507294d00071f967abdc5b77fcd37fd3989b81d0efdb7d35c0eca4349f86769f2a09915a72565e399852c40f21eaab89fb6a7c66a58960ecfefc39
 DIST netbeans-trunk-nightly-201508210002-src.zip 208800734 SHA256 c85c1f8027b3b9b03bbcc6743bb508899bc9050058c112f060d73daa544bbde6 SHA512 d8a3cbbc3f671d52bb5edcd2722c9ef847cdc160aecb4a9ee3283c2f64d82284c820c39a68e2aff2e7c3cd24fac618c1d3c48207b8323aa06f92524d0ab3a185 WHIRLPOOL b8938d9102fff59c5cc4f35db839492bbd1b1249d4e9c8da9eb4b2167c1e14d8906d49ba2bc9d301331e25d855b798883ee5f7aa51a5f00b272f55adae5339b3
+DIST netbeans-trunk-nightly-201508220002-src.zip 208858908 SHA256 eaeb7783c5302a6fb71c658071bf7283fe282bde2b18df8b6f07ed8cca69bc0d SHA512 c6687256e92c8447dd1d77b4dd678502d23ed7b6a799439f1a066371c672670bee25b46ba2ee2a090382ab157aae31641acc20373898f58fceac642a2a8aeebe WHIRLPOOL df6a09212c094d65f92004dd68ac857892308540c5ff9e914b683a40163ce784868c06214dd5636688c81549fd9e0e69b14df3c8ca268d1de517cb6ac4349594
 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
@@ -94,5 +96,6 @@ EBUILD netbeans-cnd-9999_p20150818.ebuild 4796 SHA256 e5058100f10f2aaf9b988cc9db
 EBUILD netbeans-cnd-9999_p20150819.ebuild 4796 SHA256 a9199e224db704e23d618597440c02100fa4cd2649ac81a2861713a958c6573c SHA512 e01cc4ecb78a0a290cd5bbf311af906904e45d3202d1ff267d44cf96f4f3b45becd71e7b28d3715006e9a739cfc4ecfaa10648105a9c3e6e0d54761e682828c0 WHIRLPOOL 1469a655305a6f8a0b1dac677352448ef9253fad43b001f3346524efcd92145451741b3a5724c498cf8c1bfb4c9e891b0b1b9f5d94fad0cfe3b64f082c879fa9
 EBUILD netbeans-cnd-9999_p20150820.ebuild 4796 SHA256 156f6905d06c2b0a90185db910171896811726b94be34b116eb7a95d63b324e4 SHA512 06cc4ab95cdb08600b3aea002187d272818c4d5ff98f45e3201d659d728f359e45e79feb7806ff76cb51cf121ebe40d1c61adaa29ba0197368e2cef9b197a712 WHIRLPOOL 2115a23d9634ff4ec0355f03961b742c52cd5244465057adcf07195347db0ec335857ccfe4d0e37451a689339c0b66b502e979a73440271819cc17d4046e56a5
 EBUILD netbeans-cnd-9999_p20150821.ebuild 4796 SHA256 27b93d128b00e74b2ce35c748c2dfbe9579a1c3bd1225e2ba2bfb4464c1bc674 SHA512 d42add7b1af05c407eaba501fc526aaa0b8f07163ae6d6837259a6d074605c89e213f9a2f5460eb841fb7fc1b5de49e4c57153be21a5027dc525ff80ea8b410c WHIRLPOOL ce893299d2ab72f0a65a7c0a7749b2b2e499bedad271585bd05c008ea87b716e0401ee6ce09148fa920a2a11d4acf3c92545edfb9b7b7c8e07c986cb1b084391
-MISC ChangeLog 168268 SHA256 f0b8cf2a2ffcf92a43c6d6855a838999a53e57e72b96bbe28ce06ab7161ddbd7 SHA512 4b3bab07f3a9f6728978171263acdbc507b42a2cc5d343880f01b2e70f61c395b680a3f74259b6bc7fec386dfc97a7c0fd703de83166f2effb65dc97aadd1bd5 WHIRLPOOL c520a193ef668c713a28b5395793a1c86bfa2ad79fe542a322f41190098a48fee0fcc864b041d5f9061d7b311211139d7a9653a7cc72c3930118faa8e7cafc9d
+EBUILD netbeans-cnd-9999_p20150822.ebuild 4796 SHA256 d8fe5d266ec91a985cc055edd7f2593affcaf00233f328358078204d7b16e5af SHA512 5f6b04ce87c24919c260be2bb1eb539e216689715c56466bd1cecdb6a1914368d8a30ee86b9d136a26058b5aaf7368f423ae66369964e545e113d5aea329e52b WHIRLPOOL 0cb6c0633ae2595da1586d0a486cbd46867ecab618792602dace6c5fcdd38da869bae65ddf55dfa9673a21d768fd371cfe0d50e49c2d531119d265d2e5204cee
+MISC ChangeLog 168436 SHA256 e8816d03e351032dd340848f28a6765076dec78837899978d33c55dd9a638cc8 SHA512 cb3e39750c596f775e0989a992deb20c17d93be3958dec957e0e0b0c8448fee2f83065abb7cc099c3f332de5dfe81b15b20a07dc28e4e59aabf5e85e6401007e WHIRLPOOL a59aa8b355b912f7e8ba095c7a875248d45d4464214b29d622ee234ad088233ffb3c1f26343ac793eb65e14b0d1f11579a7b99a9fd910424840c23e684fff3b9
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-dlight/ChangeLog b/dev-java/netbeans-dlight/ChangeLog
index afcc98e..b9202cf 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_p20150822 (22 Aug 2015)
+
+  22 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-dlight-9999_p20150822.ebuild:
+  updated to the latest sources
+
 *netbeans-dlight-9999_p20150821 (21 Aug 2015)
 
   21 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index c381b40..6584aa9 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -45,6 +45,7 @@ DIST netbeans-trunk-nightly-201508180002-src.zip 208817240 SHA256 b497e33ddf1039
 DIST netbeans-trunk-nightly-201508190002-src.zip 208817531 SHA256 6594e5c2181ff7dfcf7eab3c7551571ea8e4cc6f3eb3f196a2b3b4bd7f394745 SHA512 84b4d1f1e77f1a4e2d97c14e2400381ce0d926dae2659cf38bbd4d2b7ae619d479ac1d73900f6d9cf10981b85982f7f19c00662974179e48cc4efb6e3481a82a WHIRLPOOL 7decfaa30422c8c588e8cfb65cd654119c3f80b60ffe3226074e5a1775648154a26a5ef267bd98f0a7720b107a0046b040652379bb6dd4a837d000863098ecd5
 DIST netbeans-trunk-nightly-201508200002-src.zip 208799494 SHA256 81de2b1f44baa32ffb769676ba38edab57124533bda1bb1dcda18b9be5dcb7c2 SHA512 1c68dbcff6bcfeb3566823749b57ce95c2de6a97333573897d78f5f6bc7fcfe2c06a2ff7805bfabea9dc9f60d9e5021d4c3d5aa720004d796caf3b163fb1699d WHIRLPOOL cc8344fb52507294d00071f967abdc5b77fcd37fd3989b81d0efdb7d35c0eca4349f86769f2a09915a72565e399852c40f21eaab89fb6a7c66a58960ecfefc39
 DIST netbeans-trunk-nightly-201508210002-src.zip 208800734 SHA256 c85c1f8027b3b9b03bbcc6743bb508899bc9050058c112f060d73daa544bbde6 SHA512 d8a3cbbc3f671d52bb5edcd2722c9ef847cdc160aecb4a9ee3283c2f64d82284c820c39a68e2aff2e7c3cd24fac618c1d3c48207b8323aa06f92524d0ab3a185 WHIRLPOOL b8938d9102fff59c5cc4f35db839492bbd1b1249d4e9c8da9eb4b2167c1e14d8906d49ba2bc9d301331e25d855b798883ee5f7aa51a5f00b272f55adae5339b3
+DIST netbeans-trunk-nightly-201508220002-src.zip 208858908 SHA256 eaeb7783c5302a6fb71c658071bf7283fe282bde2b18df8b6f07ed8cca69bc0d SHA512 c6687256e92c8447dd1d77b4dd678502d23ed7b6a799439f1a066371c672670bee25b46ba2ee2a090382ab157aae31641acc20373898f58fceac642a2a8aeebe WHIRLPOOL df6a09212c094d65f92004dd68ac857892308540c5ff9e914b683a40163ce784868c06214dd5636688c81549fd9e0e69b14df3c8ca268d1de517cb6ac4349594
 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
@@ -77,5 +78,6 @@ EBUILD netbeans-dlight-9999_p20150818.ebuild 2995 SHA256 e956018e6ea80f7e91b7747
 EBUILD netbeans-dlight-9999_p20150819.ebuild 2995 SHA256 391b185359f7f97d0a51430a6538449e9b9215c88988ba88d6097adc3d7718a6 SHA512 3d74d62681a309c7dbe90f78c380d849d80792b7af4bf64f7c63ad8f32d90aecfd4e6f0f866e4e22d5236f7e8e20b52fdfa45fd515daa75bdf246ca71a930d91 WHIRLPOOL 85943e58bed8c9f4a3c524b1dc131c97bccd5933030163d40bd45f3b457b9168a846785a8c664e29283a23ff70d5fe87e2d76d54693909cb989d3ad940a0e383
 EBUILD netbeans-dlight-9999_p20150820.ebuild 2995 SHA256 8404588bf0f20627559e1b43e9f6c8718e7f2798eb15b2237b532b99b378093d SHA512 500ee4749d9ef5d73195d78203caf4ec8e6780a85be35deea17b1de389fce8211956e39d0a3b95536c54102215aa81af5dc4b3923e772cee6ea75fa9e282f0d0 WHIRLPOOL 6853ff408a0c907762cfaa4cb387172ec9f7266cd9af59edba5c157b3dffa6e524ce1236658eafede1c4e3fd81ac7aebf034799be25d9ec6a39044bf87edd482
 EBUILD netbeans-dlight-9999_p20150821.ebuild 2995 SHA256 b6ba7b4bcc22f51b3dfb34290484c9e5d0f027b6eab7094384dc62421f860ee3 SHA512 f41b3039d7fac4cb5aaa32a6968ee8f605b95d3a14ea9ac1b110edcb48daadd15fd35406edd8bf612bf0353725c6390ac70df26c968fee85ec48891a7a97310b WHIRLPOOL 3e18a7d156ce90748cacd8e4f0faf45f3b67ddaa3cd988da0e49599495cbbaa2b3e4d6004b165ac86e19e428b5971b24f6d1ab5ed5d3cb60ace63e9c2be634bc
-MISC ChangeLog 175646 SHA256 00bfaa99045670f7824cc1920fd1fccbc68db9acd9148a6e7369de98ec65d30b SHA512 fcc45c3edd7601f42d13c794c87822fa2c2189074de1204c1500339620f36e9ff452a55c86eb52504ae263006e75668aec30c8020e0a1c81172102f4e0adae3f WHIRLPOOL e4705c1cf3f3d939d3877c06de7cb41aa40718bfc0e0bc2a74af413e21499369da5067bb047d936a2c190131a7c4099ecbf27060b7bfa302a4f03003d6ff92f1
+EBUILD netbeans-dlight-9999_p20150822.ebuild 2995 SHA256 2595d53fe95e42db5f1fb8c5dad90d4a44ca9be47c1371573fec2af8b6735d99 SHA512 5caf11d89a44bba746319f899d184589ee4b3b7dd50a7bf4af377c7249769372805d47d81fac67afe85a9d962efac3f0b11ac3723d7b13c4db2ae10e8768dd4c WHIRLPOOL 7674f90481c261f73a0bcb7dacd32060ae8ceb5a93f12473469d28a816536b3f6f58ba86782e950049af374b4604d468f50fc4283aecc2b55e42901148ea514e
+MISC ChangeLog 175820 SHA256 f8d1a78efc7a14bd2be7458e2b6c6e13bd72df9c2d4a6ae3a6184ec8c1fcbb0e SHA512 76be0dec24ccc8ca6ea3e1c52e9cdf8b8b457359250c4b88d1e785e41c2a7d13e7034b897e8e475d8277953f11e1f918fe8595235f2ea29360683b5d5651ec52 WHIRLPOOL d7d359af23fb2c0ddf390ba6f06638775ee0282eea88cbdb2eb3967488475174bb769da92daecdecfde5fd1430e8d418264c9d1cc25c5e517ce1ad4dd9bfb36d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-enterprise/ChangeLog b/dev-java/netbeans-enterprise/ChangeLog
index 2e401bf..af368d4 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_p20150822 (22 Aug 2015)
+
+  22 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-enterprise-9999_p20150822.ebuild:
+  updated to the latest sources
+
 *netbeans-enterprise-9999_p20150821 (21 Aug 2015)
 
   21 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 53268fe..63c0040 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -127,6 +127,7 @@ DIST netbeans-trunk-nightly-201508180002-src.zip 208817240 SHA256 b497e33ddf1039
 DIST netbeans-trunk-nightly-201508190002-src.zip 208817531 SHA256 6594e5c2181ff7dfcf7eab3c7551571ea8e4cc6f3eb3f196a2b3b4bd7f394745 SHA512 84b4d1f1e77f1a4e2d97c14e2400381ce0d926dae2659cf38bbd4d2b7ae619d479ac1d73900f6d9cf10981b85982f7f19c00662974179e48cc4efb6e3481a82a WHIRLPOOL 7decfaa30422c8c588e8cfb65cd654119c3f80b60ffe3226074e5a1775648154a26a5ef267bd98f0a7720b107a0046b040652379bb6dd4a837d000863098ecd5
 DIST netbeans-trunk-nightly-201508200002-src.zip 208799494 SHA256 81de2b1f44baa32ffb769676ba38edab57124533bda1bb1dcda18b9be5dcb7c2 SHA512 1c68dbcff6bcfeb3566823749b57ce95c2de6a97333573897d78f5f6bc7fcfe2c06a2ff7805bfabea9dc9f60d9e5021d4c3d5aa720004d796caf3b163fb1699d WHIRLPOOL cc8344fb52507294d00071f967abdc5b77fcd37fd3989b81d0efdb7d35c0eca4349f86769f2a09915a72565e399852c40f21eaab89fb6a7c66a58960ecfefc39
 DIST netbeans-trunk-nightly-201508210002-src.zip 208800734 SHA256 c85c1f8027b3b9b03bbcc6743bb508899bc9050058c112f060d73daa544bbde6 SHA512 d8a3cbbc3f671d52bb5edcd2722c9ef847cdc160aecb4a9ee3283c2f64d82284c820c39a68e2aff2e7c3cd24fac618c1d3c48207b8323aa06f92524d0ab3a185 WHIRLPOOL b8938d9102fff59c5cc4f35db839492bbd1b1249d4e9c8da9eb4b2167c1e14d8906d49ba2bc9d301331e25d855b798883ee5f7aa51a5f00b272f55adae5339b3
+DIST netbeans-trunk-nightly-201508220002-src.zip 208858908 SHA256 eaeb7783c5302a6fb71c658071bf7283fe282bde2b18df8b6f07ed8cca69bc0d SHA512 c6687256e92c8447dd1d77b4dd678502d23ed7b6a799439f1a066371c672670bee25b46ba2ee2a090382ab157aae31641acc20373898f58fceac642a2a8aeebe WHIRLPOOL df6a09212c094d65f92004dd68ac857892308540c5ff9e914b683a40163ce784868c06214dd5636688c81549fd9e0e69b14df3c8ca268d1de517cb6ac4349594
 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_p20150818.ebuild 15937 SHA256 c482566b94bfc2d3ea
 EBUILD netbeans-enterprise-9999_p20150819.ebuild 15937 SHA256 f0ea1f11d183591bbfc0b2979ba12d5195e2ed800ce239e16d45be67522dfd61 SHA512 4b32d692560e37776662652335154519bed3d4b07c8b997cfc82afbf1027d219bbccdc1ae2646fb72c014aee1ae5afc23aaae2451ad2d534170e768436aeee15 WHIRLPOOL 6ae2343294f79ad2647f4eaa654307b4aedbc44e90ee624b1c54fab835fa9934683bb0ee9127830cb82a132d0a6d40eed457dc31b0aabc6f5d2f01f081c2e469
 EBUILD netbeans-enterprise-9999_p20150820.ebuild 15937 SHA256 bc44ebaa8843bde2d2c54d83b64dcc340d9aa4cd1b6504979b996374be0fe055 SHA512 d421322cf09f7de40028fa7354c9b9d1b000d5eb89da46e4fed3ab7c8031049666b387d54d6b3ce44f086fa95a9146273c1f654870e2a5c0ab228c180aa80317 WHIRLPOOL 5f917c892500877f6485e307536293cfc78dd3b7ecc7514efc19e53a1c37de48a49c20adb5b010ec6d1bd963f7550870fa8f766fa775b02445432165cf764cb0
 EBUILD netbeans-enterprise-9999_p20150821.ebuild 15937 SHA256 9fed836d93cf06b91ce39285837586a99046ee94fad849e4edfb66958dc64697 SHA512 673834f3edcd889729d9f3f70b4437228f8b3502778e880af1aafc7b264f0b960f66d73abeb08ce0a1b9fade3e293370986d12cab62c2bc288155083ca8b8ae6 WHIRLPOOL 43cccc11bf2d933dc1236e8bdb8b2b07a8c897ffca88d7113c0c5b2dc4cba901b8580760bbceda3bef3839dcd0c8de20aa75a157abb6b0436f21481c99a46a78
-MISC ChangeLog 185052 SHA256 6daf2842f0b543b4ba12b29dc48d5a21af62f872b8cdaf3a4a552f9c3dce5dd7 SHA512 79ef950978759089aca0eabfaf9e30c7ff284308661c1bd666915bef68594d9782c960e4a3b0dcd6a78cc0b14a06aeb607d4971d9e2a288c617833fe1b0c9d78 WHIRLPOOL ff833597ca19dbbd393a3985e10e2f3d420175c7ac8de2b04787d370314ca47669aa30c1de4c28d714738e3ef1ba7f075d700d97f934ee47243c1477ce55e96e
+EBUILD netbeans-enterprise-9999_p20150822.ebuild 15937 SHA256 4f8901d9b8f175a22e00ba38a960615055876b664e39b1ead9bb35c2be1c624f SHA512 c2123486bef94a05e9307ab14c4ed3beae02e532e37f31eca8c266035c327bbf0c196b95026ac313dffbc55636ca24f9fa0f0823be73fb2f3f688a046ec1a8d6 WHIRLPOOL a121e86e2e930bc8f378256800aba36497af498ea98a09d5ae8b3231aa762293bdbdc884886c9e8ddd94fb20f0a0473ba904603af74df43e50f4f614d5f2eaf0
+MISC ChangeLog 185234 SHA256 8942cd212085d595e389ae46641b7fc650ef67543f475b60e33330be40b05804 SHA512 a14a88a857229d74aaf95e9609720ab6370f2431051604da61ca94b86074a0d36d1aad4a76f1e00f6b70e06db3e0818109a4f3e2e6d6dea2731e491d45fb32e5 WHIRLPOOL 3ddb9d6425886b8d9ccb66f579183d882b9a1ee23d0b2ac74fd41f7a337c83fe5712226e27366c750e9fbd1b184c3413ceafca1103b7b8411b8c80f5268ecb92
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150822.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150822.ebuild
new file mode 100644
index 0000000..177eb5f
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150822.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Enterprise cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-08-22_00-02-28/zip/netbeans-trunk-nightly-201508220002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar
+	http://hg.netbeans.org/binaries/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar
+	http://hg.netbeans.org/binaries/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar
+	http://hg.netbeans.org/binaries/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar
+	http://hg.netbeans.org/binaries/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar
+	http://hg.netbeans.org/binaries/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar
+	http://hg.netbeans.org/binaries/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar
+	http://hg.netbeans.org/binaries/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar
+	http://hg.netbeans.org/binaries/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar
+	http://hg.netbeans.org/binaries/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar
+	http://hg.netbeans.org/binaries/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar
+	http://hg.netbeans.org/binaries/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar
+	http://hg.netbeans.org/binaries/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar
+	http://hg.netbeans.org/binaries/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar
+	http://hg.netbeans.org/binaries/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar
+	http://hg.netbeans.org/binaries/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar
+	http://hg.netbeans.org/binaries/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip
+	http://hg.netbeans.org/binaries/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar
+	http://hg.netbeans.org/binaries/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip
+	http://hg.netbeans.org/binaries/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip
+	http://hg.netbeans.org/binaries/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip
+	http://hg.netbeans.org/binaries/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar
+	http://hg.netbeans.org/binaries/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar
+	http://hg.netbeans.org/binaries/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip
+	http://hg.netbeans.org/binaries/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip
+	http://hg.netbeans.org/binaries/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar
+	http://hg.netbeans.org/binaries/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar
+	http://hg.netbeans.org/binaries/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip
+	http://hg.netbeans.org/binaries/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip
+	http://hg.netbeans.org/binaries/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip
+	http://hg.netbeans.org/binaries/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-profiler-${PV}
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-webcommon-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/commons-codec:0
+	dev-java/commons-fileupload:0
+	dev-java/commons-logging:0
+	dev-java/glassfish-deployment-api:1.2"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/jsr181:0
+	>=dev-java/junit-4.4:4
+	dev-java/tomcat-servlet-api:2.3"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}
+	dev-java/antlr:0[java]
+	dev-java/bsf:2.3
+	dev-java/cglib:3
+	dev-java/commons-beanutils:1.7
+	dev-java/commons-collections:0
+	dev-java/commons-digester:0
+	dev-java/commons-io:1
+	dev-java/commons-validator:0
+	dev-java/glassfish-persistence:0
+	dev-java/guava:14
+	dev-java/jakarta-oro:2.0
+	dev-java/osgi-core-api:0
+	dev-java/validation-api:1.0"
+#	dev-java/commons-chain:1.1 in overlay
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.enterprise -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar libs.amazon/external/aws-java-sdk-1.2.1.jar || die
+	ln -s "${DISTDIR}"/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar libs.elimpl/external/el-impl.jar || die
+	ln -s "${DISTDIR}"/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar web.jspparser/external/glassfish-jspparser-4.0.jar || die
+	ln -s "${DISTDIR}"/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar libs.glassfish_logging/external/glassfish-logging-2.0.jar || die
+	ln -s "${DISTDIR}"/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar libs.amazon/external/httpclient-4.1.1.jar || die
+	ln -s "${DISTDIR}"/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar libs.amazon/external/httpcore-4.1.jar || die
+	ln -s "${DISTDIR}"/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar javaee.api/external/javaee-api-6.0.jar || die
+	ln -s "${DISTDIR}"/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar javaee7.api/external/javaee-api-7.0.jar || die
+	ln -s "${DISTDIR}"/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar javaee.api/external/javaee-web-api-6.0.jar || die
+	ln -s "${DISTDIR}"/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar javaee7.api/external/javaee-web-api-7.0.jar || die
+	ln -s "${DISTDIR}"/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar j2ee.platform/external/javaee-doc-api.jar || die
+	ln -s "${DISTDIR}"/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar javaee.api/external/javax.annotation.jar || die
+	ln -s "${DISTDIR}"/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar javaee7.api/external/javax.annotation-api.jar || die
+	ln -s "${DISTDIR}"/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar javaee7.api/external/javax.xml.soap-api.jar || die
+	ln -s "${DISTDIR}"/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar javaee.api/external/jaxb-api-osgi.jar || die
+	ln -s "${DISTDIR}"/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar javaee7.api/external/jaxb-api-osgi.jar || die
+	ln -s "${DISTDIR}"/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip websvc.restlib/external/jaxrs-ri-2.5.1.zip || die
+	ln -s "${DISTDIR}"/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar javaee7.api/external/jaxws-api.jar || die
+	ln -s "${DISTDIR}"/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip web.jsf12/external/jsf-1.2.zip || die
+	ln -s "${DISTDIR}"/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip web.jsf20/external/jsf-2.2.zip || die
+	ln -s "${DISTDIR}"/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip web.jsf.editor/external/jsf-api-docs.zip || die
+	ln -s "${DISTDIR}"/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar libs.jstl/external/jstl-api.jar || die
+	ln -s "${DISTDIR}"/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar libs.jstl/external/jstl-impl.jar || die
+	ln -s "${DISTDIR}"/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip websvc.metro.lib/external/metro-1.4-doc.zip || die
+	ln -s "${DISTDIR}"/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip websvc.metro.lib/external/metro-2.0.zip || die
+	ln -s "${DISTDIR}"/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar web.primefaces/external/primefaces-5.0.jar || die
+	ln -s "${DISTDIR}"/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar servletjspapi/external/servlet3.1-jsp2.3-api.jar || die
+	ln -s "${DISTDIR}"/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip web.struts/external/struts-1.3.10-javadoc.zip || die
+	ln -s "${DISTDIR}"/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip web.struts/external/struts-1.3.10-lib.zip || die
+	ln -s "${DISTDIR}"/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip web.core.syntax/external/syntaxref20.zip || die
+	ln -s "${DISTDIR}"/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar javaee.api/external/webservices-api-osgi.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into j2eeapis/external glassfish-deployment-api-1.2 glassfish-deployment-api.jar jsr88javax.jar
+	java-pkg_jar-from --into libs.amazon/external commons-codec commons-codec.jar commons-codec-1.3.jar
+	java-pkg_jar-from --into libs.amazon/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
+	java-pkg_jar-from --into libs.commons_fileupload/external commons-fileupload commons-fileupload.jar commons-fileupload-1.3.jar
+	java-pkg_jar-from --build-only --into javaee7.api/external jsr181 jsr181.jar jsr181-api.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+	java-pkg_jar-from --build-only --into web.monitor/external tomcat-servlet-api-2.3 servlet.jar servlet-2.3.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-profiler-${SLOT} profiler || die
+	cat /usr/share/netbeans-profiler-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.profiler.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-webcommon-${SLOT} webcommon || die
+	cat /usr/share/netbeans-webcommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.webcommon.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/enterprise >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/enterprise$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-fileupload-1.3.jar && dosym /usr/share/commons-fileupload/lib/commons-fileupload.jar ${instdir}/commons-fileupload-1.3.jar || die
+	rm jsr88javax.jar && dosym /usr/share/glassfish-deployment-api-1.2/lib/glassfish-deployment-api.jar ${instdir}/jsr88javax.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/aws-sdk
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-codec-1.3.jar && dosym /usr/share/commons-codec/lib/commons-codec.jar ${instdir}/commons-codec-1.3.jar || die
+	rm commons-logging-1.1.1.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.1.1.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/javaee7-endorsed
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jersey2/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm cglib-2.2.0-b21.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.0-b21.jar || die
+	rm guava-14.0.1.jar && dosym /usr/share/guava-14/lib/guava.jar ${instdir}/guava-14.0.1.jar || die
+	rm org.osgi.core-4.2.0.jar && dosym /usr/share/osgi-core-api/lib/osgi-core-api.jar ${instdir}/org.osgi.core-4.2.0.jar || die
+	rm persistence-api-1.0.jar && dosym /usr/share/glassfish-persistence/lib/glassfish-persistence.jar ${instdir}/persistence-api-1.0.jar || die
+	rm validation-api-1.1.0.Final.jar && dosym /usr/share/validation-api-1.0/lib/validation-api.jar ${instdir}/validation-api-1.1.0.Final.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jsf-1_2
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-beanutils.jar && dosym /usr/share/commons-beanutils-1.7/lib/commons-beanutils.jar ${instdir}/commons-beanutils.jar || die
+	rm commons-collections.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections.jar || die
+	rm commons-digester.jar && dosym /usr/share/commons-digester/lib/commons-digester.jar ${instdir}/commons-digester.jar || die
+	rm commons-logging.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/struts
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm antlr-2.7.2.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.2.jar || die
+	rm bsf-2.3.0.jar && dosym /usr/share/bsf-2.3/lib/bsf.jar ${instdir}/bsf-2.3.0.jar || die
+	rm commons-beanutils-1.8.0.jar && dosym /usr/share/commons-beanutils-1.7/lib/commons-beanutils.jar ${instdir}/commons-beanutils-1.8.0.jar || die
+	rm commons-digester-1.8.jar && dosym /usr/share/commons-digester/lib/commons-digester.jar ${instdir}/commons-digester-1.8.jar || die
+	rm commons-fileupload-1.1.1.jar && dosym /usr/share/commons-fileupload/lib/commons-fileupload.jar ${instdir}/commons-fileupload-1.1.1.jar || die
+	rm commons-io-1.1.jar && dosym /usr/share/commons-io-1/lib/commons-io.jar ${instdir}/commons-io-1.1.jar || die
+	rm commons-logging-1.0.4.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.0.4.jar || die
+	rm commons-validator-1.3.1.jar && dosym /usr/share/commons-validator/lib/commons-validator.jar ${instdir}/commons-validator-1.3.1.jar || die
+	rm oro-2.0.8.jar && dosym /usr/share/jakarta-oro-2.0/lib/jakarta-oro.jar ${instdir}/oro-2.0.8.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/enterprise
+}

diff --git a/dev-java/netbeans-ergonomics/ChangeLog b/dev-java/netbeans-ergonomics/ChangeLog
index 287559c..a5f218a 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_p20150822 (22 Aug 2015)
+
+  22 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ergonomics-9999_p20150822.ebuild:
+  updated to the latest sources
+
 *netbeans-ergonomics-9999_p20150821 (21 Aug 2015)
 
   21 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 106d47b..c5539f5 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201508180002-src.zip 208817240 SHA256 b497e33ddf1039
 DIST netbeans-trunk-nightly-201508190002-src.zip 208817531 SHA256 6594e5c2181ff7dfcf7eab3c7551571ea8e4cc6f3eb3f196a2b3b4bd7f394745 SHA512 84b4d1f1e77f1a4e2d97c14e2400381ce0d926dae2659cf38bbd4d2b7ae619d479ac1d73900f6d9cf10981b85982f7f19c00662974179e48cc4efb6e3481a82a WHIRLPOOL 7decfaa30422c8c588e8cfb65cd654119c3f80b60ffe3226074e5a1775648154a26a5ef267bd98f0a7720b107a0046b040652379bb6dd4a837d000863098ecd5
 DIST netbeans-trunk-nightly-201508200002-src.zip 208799494 SHA256 81de2b1f44baa32ffb769676ba38edab57124533bda1bb1dcda18b9be5dcb7c2 SHA512 1c68dbcff6bcfeb3566823749b57ce95c2de6a97333573897d78f5f6bc7fcfe2c06a2ff7805bfabea9dc9f60d9e5021d4c3d5aa720004d796caf3b163fb1699d WHIRLPOOL cc8344fb52507294d00071f967abdc5b77fcd37fd3989b81d0efdb7d35c0eca4349f86769f2a09915a72565e399852c40f21eaab89fb6a7c66a58960ecfefc39
 DIST netbeans-trunk-nightly-201508210002-src.zip 208800734 SHA256 c85c1f8027b3b9b03bbcc6743bb508899bc9050058c112f060d73daa544bbde6 SHA512 d8a3cbbc3f671d52bb5edcd2722c9ef847cdc160aecb4a9ee3283c2f64d82284c820c39a68e2aff2e7c3cd24fac618c1d3c48207b8323aa06f92524d0ab3a185 WHIRLPOOL b8938d9102fff59c5cc4f35db839492bbd1b1249d4e9c8da9eb4b2167c1e14d8906d49ba2bc9d301331e25d855b798883ee5f7aa51a5f00b272f55adae5339b3
+DIST netbeans-trunk-nightly-201508220002-src.zip 208858908 SHA256 eaeb7783c5302a6fb71c658071bf7283fe282bde2b18df8b6f07ed8cca69bc0d SHA512 c6687256e92c8447dd1d77b4dd678502d23ed7b6a799439f1a066371c672670bee25b46ba2ee2a090382ab157aae31641acc20373898f58fceac642a2a8aeebe WHIRLPOOL df6a09212c094d65f92004dd68ac857892308540c5ff9e914b683a40163ce784868c06214dd5636688c81549fd9e0e69b14df3c8ca268d1de517cb6ac4349594
 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_p20150818.ebuild 2919 SHA256 3dd9409c708a052dfd6
 EBUILD netbeans-ergonomics-9999_p20150819.ebuild 2919 SHA256 23ac51ba17da7a9cb106572e53563681cf783c81974ae44c4fa077d3f2d9814a SHA512 bbe04a8bd8cb4b9385dc9f2f03f43be3d8d79f1acc834b97645534476d2146b255256ef39458735848f56e2821eb4ac418cdf15cb3803f4058f2373582a66d86 WHIRLPOOL 5f1f53b116c0e732879d36cad8f8f560efbdf01efd0f5c8816621e725e6107ee9abbd6c622e4fd345c6756b7c6e65bfb61d08c014d30061b491e6af6826673e0
 EBUILD netbeans-ergonomics-9999_p20150820.ebuild 2919 SHA256 00e570c73babfca6711fae50e7e3f4baec62402c198da3b935c9046f3fa02d2c SHA512 a5b935f4dda3c968c00cdd9a7978b9489a0a54149e5e8b107a97a5eff61d39c589f609443c76d4959d1044c09ac8b4af24aef7e984a32a1395b1e0233b804850 WHIRLPOOL 1f787170e7601fed6a00a4995bb736ff9ecdadab0a2908f11a3e958091346bb8ed15d01d338c1a35093c7d78ccf9a40e117ec73fc404dffb1023af3771cd7d1f
 EBUILD netbeans-ergonomics-9999_p20150821.ebuild 2919 SHA256 435aa4ff4a64808abda4f9eeb6b616fe3196b04ca4f222f19fd9486577179ddd SHA512 78b0b602c3d8ab9aa76a0fef005310a1236c976ab9eea5ca610ae234f78fa8739ae41c22c464b9ed4ceef32ab20cb73e3885ab7843a4f3e27dc8f3e68a2641f9 WHIRLPOOL a7dfa405c395ead7d416064a2d80bfec18cfd7670b59867e41b87c0fd9277046ec0ddee69090764e67732b7087137b51b58217e67e1765918e7fc7ac65905ecb
-MISC ChangeLog 184413 SHA256 44344704d2149b820b0ab5180fcfc252e0121f8f88c8a582012856bf116bf0e4 SHA512 e78996fe33bf6ab212feca70ae97e32e56fbba0c57b0405303f7a811f62c60c7ce4a24c1aca6bb0ccdd433ad8d868397521d68b8747d9e2d72f8cf193cbfc7e6 WHIRLPOOL 6e60a7b5c6c038b88eb0d136d2d458c3f73ed0339b734cfa39d3f4acfefeaa082cfb793a9c6a6b6c8cde359ec8b1dd8f238eb5b335e20dcecf898b720bc406b0
+EBUILD netbeans-ergonomics-9999_p20150822.ebuild 2919 SHA256 2e2f186c787d00b1125166ba5a52d5c31645d8f3663635cac97725e7937a3a34 SHA512 f38522dd4efa9cf9b6f5a546832d47a110475daf6b1b1c81d1b7a99c44ebd7e3d941ae9d59e45c60f5fd1bd410612cb8d3e08354641d3c87f4e3bd5c3b2c11f2 WHIRLPOOL fd28c3f008561e3c935f7465728d970651b03ee0d82516153ac4ffc6943db6fabf7e261e6a78191014b740ad8dcfb31f8e4d2f82bf545137f51c82a8e7dbfa5f
+MISC ChangeLog 184595 SHA256 bcd378f584a9c6b27ad58d730d7c0325fe158d7754596cd3ae376441ad18fb56 SHA512 4b285c7e175f0184967a7da31fad92fb7f1dafcdf795a92d4671ac27e77c3a28453fe36e507f55c482ecb63e746b67d4dcfee85a5ff08119f0df70ceaf589e3e WHIRLPOOL 833847c6f108ded0183b18fe3410d9f5c9582ef9d5eff32bc7e613013a0af9bd4411e134ee46d3dede9a51673a478d089019ab3cf61ae52df6f18e3dc400a0c4
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150822.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150822.ebuild
new file mode 100644
index 0000000..e70f9f1
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150822.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Ergonomics Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-08-22_00-02-28/zip/netbeans-trunk-nightly-201508220002-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 6800d09..99f3d1e 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_p20150822 (22 Aug 2015)
+
+  22 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-extide-9999_p20150822.ebuild:
+  updated to the latest sources
+
 *netbeans-extide-9999_p20150821 (21 Aug 2015)
 
   21 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index 2b28162..17382ac 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201508180002-src.zip 208817240 SHA256 b497e33ddf1039
 DIST netbeans-trunk-nightly-201508190002-src.zip 208817531 SHA256 6594e5c2181ff7dfcf7eab3c7551571ea8e4cc6f3eb3f196a2b3b4bd7f394745 SHA512 84b4d1f1e77f1a4e2d97c14e2400381ce0d926dae2659cf38bbd4d2b7ae619d479ac1d73900f6d9cf10981b85982f7f19c00662974179e48cc4efb6e3481a82a WHIRLPOOL 7decfaa30422c8c588e8cfb65cd654119c3f80b60ffe3226074e5a1775648154a26a5ef267bd98f0a7720b107a0046b040652379bb6dd4a837d000863098ecd5
 DIST netbeans-trunk-nightly-201508200002-src.zip 208799494 SHA256 81de2b1f44baa32ffb769676ba38edab57124533bda1bb1dcda18b9be5dcb7c2 SHA512 1c68dbcff6bcfeb3566823749b57ce95c2de6a97333573897d78f5f6bc7fcfe2c06a2ff7805bfabea9dc9f60d9e5021d4c3d5aa720004d796caf3b163fb1699d WHIRLPOOL cc8344fb52507294d00071f967abdc5b77fcd37fd3989b81d0efdb7d35c0eca4349f86769f2a09915a72565e399852c40f21eaab89fb6a7c66a58960ecfefc39
 DIST netbeans-trunk-nightly-201508210002-src.zip 208800734 SHA256 c85c1f8027b3b9b03bbcc6743bb508899bc9050058c112f060d73daa544bbde6 SHA512 d8a3cbbc3f671d52bb5edcd2722c9ef847cdc160aecb4a9ee3283c2f64d82284c820c39a68e2aff2e7c3cd24fac618c1d3c48207b8323aa06f92524d0ab3a185 WHIRLPOOL b8938d9102fff59c5cc4f35db839492bbd1b1249d4e9c8da9eb4b2167c1e14d8906d49ba2bc9d301331e25d855b798883ee5f7aa51a5f00b272f55adae5339b3
+DIST netbeans-trunk-nightly-201508220002-src.zip 208858908 SHA256 eaeb7783c5302a6fb71c658071bf7283fe282bde2b18df8b6f07ed8cca69bc0d SHA512 c6687256e92c8447dd1d77b4dd678502d23ed7b6a799439f1a066371c672670bee25b46ba2ee2a090382ab157aae31641acc20373898f58fceac642a2a8aeebe WHIRLPOOL df6a09212c094d65f92004dd68ac857892308540c5ff9e914b683a40163ce784868c06214dd5636688c81549fd9e0e69b14df3c8ca268d1de517cb6ac4349594
 EBUILD netbeans-extide-7.4.ebuild 3311 SHA256 8585e0b9eac3b9bb35d5b5e0152936f84708a824d76831930a3dfd3d196556b0 SHA512 19eceec7a634923b4712eb277a1ff9900a2eb4d9ac0a2c699175333c263f0c02baaf24eb30bd7919444f5c9df751186689b2d4359ca1c88dca02884d7c18c3cd WHIRLPOOL e64509f198c4d09851f98d5bd2ddd5b469b0a7c0f3122f391c17833e5d6d77b7a6c2fd9e942e34f2df42047504ad40593f97af9b2898450e769c7b012355c316
 EBUILD netbeans-extide-8.0.2.ebuild 3313 SHA256 d147df43b8e55de81e0429604a2497a82861864ae50fbb85368a3070e1c266c9 SHA512 8f2722ce12c1582ca6e9ed348fcb37b9969585037b5432e592e5dd6ef4b3e49c58783da5fe20f088bee07514e3b42de7aa36607900b285c32c4b91fa218df90c WHIRLPOOL 0fb074484787a5e0e688dc734efe027ff6dfd082dd63bc9bccc612f915fbbe33a4f93db6c43d345abc9c191e22ec196aada1e889d1240968916d54c69497a2d6
 EBUILD netbeans-extide-8.0.ebuild 3305 SHA256 b2d57e2e2d92760ead3d383fe4dd5b4fb9fc2807a9b58c6f40b44fc24072b8bb SHA512 6e7f12758188a564ef6b5cf8b0ffdf79e30d1021172d10f215d04e727bc4001e4385fd0961a26a6bb42638089e0919b1d4628a13ba11a3deac94d4693c7210d5 WHIRLPOOL adac8461de43669b7bb98ea8920c0a2944837211a37503b957221149d4b91c4bd92b6db160191990b838c474495c65f62c8a4bb9fdbcaa371b4648a335b1afa9
@@ -64,5 +65,6 @@ EBUILD netbeans-extide-9999_p20150818.ebuild 3383 SHA256 b98b3f8f5c0f264f99f2459
 EBUILD netbeans-extide-9999_p20150819.ebuild 3383 SHA256 81dfd6d1efc37ee35457bcf9a0079cce81bbeee57184fbbd66cc5f84770bc0b5 SHA512 a0789c9850679eb9f18eaeece582156b36b167cbcac61c393729cb597dba49e43b03f49144f534e4831e894971a69a78998de1454c9e9ba74cbc880cf753ae9d WHIRLPOOL 2b86388e439bc5939b3593a4c44f404cb207203d3a8c3f028cafb41e96caeaca1cf00bb0a5636ff40b639d07a354d1a7b8f6961c39dc5b07c79f19fa562241ca
 EBUILD netbeans-extide-9999_p20150820.ebuild 3383 SHA256 81402164752ff7675de036aed2c49a46ce930865895063c585643c71d06c3d30 SHA512 63407b82c9fed62fb7acb109995235d1e14a4f5531353586c03afc5ac4bde2ca5a47509a83437d10e598b234d5eae73b505239f592b1b262c3a2f58e8efac7fd WHIRLPOOL 54c928d60595cd9c4fc4247ff9169b4a276b15a07a7710bd8bccd74d2f57a27561e98e582441ee2d13f5dd2546371f96f581492018798a441ab04145b0e51b8f
 EBUILD netbeans-extide-9999_p20150821.ebuild 3383 SHA256 9d44f31ea00706ad35ec0ddf492b6b2a0ec6601f3e4017974a0ea6f6500c866e SHA512 c2db9642efad731b1c8e2eabfb072927a7afb62e3216d70cda3fa9137eab18adf8e2ae2b9939c56ab2aafa821ea4775ce29c454b10f653c7c7e0237ad060f131 WHIRLPOOL 46dbbd1e3f4d625ca823c33e4462e2ea7a53367a2d5a74b0f99effc622b87ad6c327888c5fe241609cab9c3630a6ba9a4055cb9483431095de8b4af55a24e2ff
-MISC ChangeLog 107556 SHA256 c4dc2f82b1754d5fa3267ef76896b4512e81ee89fdc2306555cb138f1e997c6b SHA512 7764f37499d45f14c13b3158fd0cbb08cea4a9617c7f0506d06a1a70d210e96a5244b371000e5a1a9ee685bd80faaf3a69cffbafbce78ef0110ca513e54eae84 WHIRLPOOL f6bf990900d7ee66dd05c1fd9172ceba49742b848ebd56053f57aea1a7ffc84c612a7b0bfc282b15e7fcf3d7b234072c54783208c92af7546d9974527d340214
+EBUILD netbeans-extide-9999_p20150822.ebuild 3383 SHA256 c44998bf71ce59f73b3313f9834b20abf0e0b4a2f9d33c95f7d0bdd85dddea3e SHA512 5cde5d4beea013c9db199e05de91b839630dad8d73ee2b75c118f8b36cc575f12bc35bfe78db72a50d6cd0263e19f4b9f99179a23c098d06d48852ce5296ca1b WHIRLPOOL 4aa23f3f6856210ffd39c46cb8252d986b45c56d06fbc36ee11e2402d00d84cab9ad6d1c98ebab0e10a12f0584083f1af0f31585ac78ba5b0348838c073dc9cf
+MISC ChangeLog 107730 SHA256 d3237c57222cbe6f259ffd9ca5d17d3057eedb75e39fd971d445ab83334bbb8f SHA512 893a7a459899484cd623391df0a5f155411ecf4957e95a8f36e058df68ceb63f5d291b08676f3b9f4029e4b41f9784d254e02382e03b12c9c5b090788e3a3b73 WHIRLPOOL a79340f792d4eb2952f85fb46f5d00a858c486994e4fcc60cd8a8658022e7aebf908741ffbcf6c12e8e0f2daca2b57615d74236c1113edf324888dfc18da0382
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20150822.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20150822.ebuild
new file mode 100644
index 0000000..b418997
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20150822.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans ExtIDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-08-22_00-02-28/zip/netbeans-trunk-nightly-201508220002-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 11adfd5..ca29657 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_p20150822 (22 Aug 2015)
+
+  22 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-groovy-9999_p20150822.ebuild:
+  updated to the latest sources
+
 *netbeans-groovy-9999_p20150821 (21 Aug 2015)
 
   21 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index f23bbb6..d2f7d2c 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -42,6 +42,7 @@ DIST netbeans-trunk-nightly-201508180002-src.zip 208817240 SHA256 b497e33ddf1039
 DIST netbeans-trunk-nightly-201508190002-src.zip 208817531 SHA256 6594e5c2181ff7dfcf7eab3c7551571ea8e4cc6f3eb3f196a2b3b4bd7f394745 SHA512 84b4d1f1e77f1a4e2d97c14e2400381ce0d926dae2659cf38bbd4d2b7ae619d479ac1d73900f6d9cf10981b85982f7f19c00662974179e48cc4efb6e3481a82a WHIRLPOOL 7decfaa30422c8c588e8cfb65cd654119c3f80b60ffe3226074e5a1775648154a26a5ef267bd98f0a7720b107a0046b040652379bb6dd4a837d000863098ecd5
 DIST netbeans-trunk-nightly-201508200002-src.zip 208799494 SHA256 81de2b1f44baa32ffb769676ba38edab57124533bda1bb1dcda18b9be5dcb7c2 SHA512 1c68dbcff6bcfeb3566823749b57ce95c2de6a97333573897d78f5f6bc7fcfe2c06a2ff7805bfabea9dc9f60d9e5021d4c3d5aa720004d796caf3b163fb1699d WHIRLPOOL cc8344fb52507294d00071f967abdc5b77fcd37fd3989b81d0efdb7d35c0eca4349f86769f2a09915a72565e399852c40f21eaab89fb6a7c66a58960ecfefc39
 DIST netbeans-trunk-nightly-201508210002-src.zip 208800734 SHA256 c85c1f8027b3b9b03bbcc6743bb508899bc9050058c112f060d73daa544bbde6 SHA512 d8a3cbbc3f671d52bb5edcd2722c9ef847cdc160aecb4a9ee3283c2f64d82284c820c39a68e2aff2e7c3cd24fac618c1d3c48207b8323aa06f92524d0ab3a185 WHIRLPOOL b8938d9102fff59c5cc4f35db839492bbd1b1249d4e9c8da9eb4b2167c1e14d8906d49ba2bc9d301331e25d855b798883ee5f7aa51a5f00b272f55adae5339b3
+DIST netbeans-trunk-nightly-201508220002-src.zip 208858908 SHA256 eaeb7783c5302a6fb71c658071bf7283fe282bde2b18df8b6f07ed8cca69bc0d SHA512 c6687256e92c8447dd1d77b4dd678502d23ed7b6a799439f1a066371c672670bee25b46ba2ee2a090382ab157aae31641acc20373898f58fceac642a2a8aeebe WHIRLPOOL df6a09212c094d65f92004dd68ac857892308540c5ff9e914b683a40163ce784868c06214dd5636688c81549fd9e0e69b14df3c8ca268d1de517cb6ac4349594
 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_p20150818.ebuild 3422 SHA256 8c9372121900975fdc4bd8b
 EBUILD netbeans-groovy-9999_p20150819.ebuild 3422 SHA256 632ae3b01af54e5167cf1be4adec3cbc771e8c1f8d4a3111c0a228516436a7af SHA512 265bb16355ce74bd0d5a9837eaeb058fbc8befac9d3681f504eec70fbe8351cb6ba4900ab1285db133efcb5ef94d668a97b1194463cf8b7b1b0329dd2f24db11 WHIRLPOOL 87c51462889b58d141205632e453d86044aee1cedef6d91105933c45e6a53f3ae5665646d585411409dec7c6574baf1148d14acf4a0c39272bee9c7e6df66a2f
 EBUILD netbeans-groovy-9999_p20150820.ebuild 3422 SHA256 982c95ace4df4eed18baf2afafdf837aac07b1a1b976ea645f5766afe96f7945 SHA512 80a719344a5763fbb44fe25207d563ce3a5a3df59d14e2ea25f575e53106384825495cef31252f6bced65156ff87779e7c5b9f637bfee9d0b929d26253c0b652 WHIRLPOOL 9acd106f6112a114dc18bfb74f7a0f84cbcea534897cb24821632e70f8f8022427e06c7cfe832395d5d7af9dac3d0b275ac9918b5bcc50f9423cc02ce7bdb8ba
 EBUILD netbeans-groovy-9999_p20150821.ebuild 3422 SHA256 66fcc10c9306b8b173fdea73c4e199c0cd831f12252adc17ea683f4af3939acd SHA512 be78f90babe12bfa337353d1f3b11c7031bcb221a340e799841064f770fe3342e414ebdd729ac6635a4891b518db7910a18f7904b496e16041a416f54171690c WHIRLPOOL 32ddef956b685d638524baa91bbd85c9ba4745d122c02b56455791b703dbfbfa8a16044598795d4c77662c4f7b2258294c88f013b5e79fd877816bdafcea71c1
-MISC ChangeLog 175536 SHA256 2ff05292a3347d7ac16a30bc8d6e79b9ab17137d0f304b93a18b4ec3186a97d8 SHA512 18bba9d9bbd60721f6165ed16828d9f96fd7694ace47c6dadf1fee8a6057baf40cb671d337c33fd27959cf66caf4345b70a09b306e3fae531f41bbafcc6c3896 WHIRLPOOL dba5316c198bcc3c630028caa90aa6fb86d36723cd6d543c5fd2a1d7fb29deebb2415aedb495bee747f186e85caec8b4aafc284d999ebed7776ca9983f56f9d7
+EBUILD netbeans-groovy-9999_p20150822.ebuild 3422 SHA256 69dc0a4541fd5e4d2a3dc17bbc1024ef7131c04aea99fc8804056cb2208e8f42 SHA512 da31a2cd2a036471c3e70dcaf1556b61aa09411ae5386937d6edb78bfda5735eee2862139e54ed9eb53eea2c703dd77ee436b9750dd1ed8a46ee5b537116fa43 WHIRLPOOL 2c50b097ddb68010bc6984e10814899a9975d7432fac2128e1597cb62d75a6ed934e2b3c44d64c0507825209b914304da2cf5468d3fbff3c0ad256219b7bbeca
+MISC ChangeLog 175710 SHA256 148d0b3700e1e1a0bdc05d94c99a7094ae212526d01d218533b2ad6bdfea6584 SHA512 421b4bfb90ad957cac64b18930dfbeec56fc61f8909748d625f18f810ea8f50a451ec8ab531dea96f7e62aeafa30a1ba4d4d33aa6a566d17e7655f3121273af1 WHIRLPOOL d9dd51c12401a58e5f40bf05f83ebaf6a4b2c614c48f879b0421787bdb2e1207f6c368b49241b14a121edd0b841b4e956ea3fc6b1018aed0e92f77e380be81c0
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150822.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150822.ebuild
new file mode 100644
index 0000000..2184166
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150822.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Groovy Cluster"
+HOMEPAGE="http://netbeans.org/projects/groovy"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-08-22_00-02-28/zip/netbeans-trunk-nightly-201508220002-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 bd67f16..450199a 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_p20150822 (22 Aug 2015)
+
+  22 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-harness-9999_p20150822.ebuild:
+  updated to the latest sources
+
 *netbeans-harness-9999_p20150821 (21 Aug 2015)
 
   21 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 44366b0..58de753 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -44,6 +44,7 @@ DIST netbeans-trunk-nightly-201508180002-src.zip 208817240 SHA256 b497e33ddf1039
 DIST netbeans-trunk-nightly-201508190002-src.zip 208817531 SHA256 6594e5c2181ff7dfcf7eab3c7551571ea8e4cc6f3eb3f196a2b3b4bd7f394745 SHA512 84b4d1f1e77f1a4e2d97c14e2400381ce0d926dae2659cf38bbd4d2b7ae619d479ac1d73900f6d9cf10981b85982f7f19c00662974179e48cc4efb6e3481a82a WHIRLPOOL 7decfaa30422c8c588e8cfb65cd654119c3f80b60ffe3226074e5a1775648154a26a5ef267bd98f0a7720b107a0046b040652379bb6dd4a837d000863098ecd5
 DIST netbeans-trunk-nightly-201508200002-src.zip 208799494 SHA256 81de2b1f44baa32ffb769676ba38edab57124533bda1bb1dcda18b9be5dcb7c2 SHA512 1c68dbcff6bcfeb3566823749b57ce95c2de6a97333573897d78f5f6bc7fcfe2c06a2ff7805bfabea9dc9f60d9e5021d4c3d5aa720004d796caf3b163fb1699d WHIRLPOOL cc8344fb52507294d00071f967abdc5b77fcd37fd3989b81d0efdb7d35c0eca4349f86769f2a09915a72565e399852c40f21eaab89fb6a7c66a58960ecfefc39
 DIST netbeans-trunk-nightly-201508210002-src.zip 208800734 SHA256 c85c1f8027b3b9b03bbcc6743bb508899bc9050058c112f060d73daa544bbde6 SHA512 d8a3cbbc3f671d52bb5edcd2722c9ef847cdc160aecb4a9ee3283c2f64d82284c820c39a68e2aff2e7c3cd24fac618c1d3c48207b8323aa06f92524d0ab3a185 WHIRLPOOL b8938d9102fff59c5cc4f35db839492bbd1b1249d4e9c8da9eb4b2167c1e14d8906d49ba2bc9d301331e25d855b798883ee5f7aa51a5f00b272f55adae5339b3
+DIST netbeans-trunk-nightly-201508220002-src.zip 208858908 SHA256 eaeb7783c5302a6fb71c658071bf7283fe282bde2b18df8b6f07ed8cca69bc0d SHA512 c6687256e92c8447dd1d77b4dd678502d23ed7b6a799439f1a066371c672670bee25b46ba2ee2a090382ab157aae31641acc20373898f58fceac642a2a8aeebe WHIRLPOOL df6a09212c094d65f92004dd68ac857892308540c5ff9e914b683a40163ce784868c06214dd5636688c81549fd9e0e69b14df3c8ca268d1de517cb6ac4349594
 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_p20150818.ebuild 4131 SHA256 a95b7cdadaea6c635e6f7a
 EBUILD netbeans-harness-9999_p20150819.ebuild 4131 SHA256 65d7dfbe3d83ce708dbfe6ca5ee1ab836acb2503035c90bbb9075a17ccf3ceee SHA512 82e9242c4e747fc2d30109495bac5bfcd79ad08e8767e63014ed4941eb36d48bd4b9f29cac6cc9f89364f859dbdaefd73684c0450539949ae952f7947b24b641 WHIRLPOOL 71c191bed845bd411eebe8b93d828858f53f48a6edc3a01bc96ec3b1a01066d4117eaea7d9c7c41508dcb47c30950e418b1c7dc67e2636598b2a809d1915210c
 EBUILD netbeans-harness-9999_p20150820.ebuild 4131 SHA256 3100a435fea79e2c34a31df5235a2aa92f6629f9209291c61eb21e19f6c8daab SHA512 722200b14fb244e6b0344bdb6e36eae9b76c20878aa8397e1a245c07e2b9b5f580a7f8e81f4cf4b8e3c61919b38926b75f1a8d57cafcaeabbca8320e0cae48c8 WHIRLPOOL 3b923ba8388a5127a2cfa892cc8025cee4afab55aa9969a56022962b75d31c41fe76e13213668855d78c343154c264ac2a11dceed5a9f53d08bb9a240345bedb
 EBUILD netbeans-harness-9999_p20150821.ebuild 4131 SHA256 fbec067a3a91109661e584d957356b94a5c2ade36c454c83f223dec31061a9ee SHA512 3b23ec931c89a7804fee07b134dc500185a210b6486aa0d21538382062411dafb27796b1b9380a5d5eb6dd2d8f0d68d0694b737d7aa040b159b1a42d50353f8b WHIRLPOOL dfdf8ffa501d87a9b8f5ccf3daf84dbc1f458dd14720c88f97168973477a5794c090780b0579f0f01f6bf595ae2b39243c7c5ce2f4d8d51a6c35bffc79a29c1c
-MISC ChangeLog 177784 SHA256 259aa3b7c2a28c2a2ad4536fb955c8396ae52d0b77a2f8ed5d2ad7cccb04d2e4 SHA512 8bc52cc6dfba82d55a59f8c9c0c5c94722127bb97eba5037b914233071941653376fa8b3575cdf504ac920268891bf9957f8cfe4f8d2a699e6caa8feb473e198 WHIRLPOOL 4686a757a747e5e1d8e5dc4e259cb478725a66fff0b5efcbcbf333661afabc9a4599fc73a07d0f071a1b6c2efd0ac0bbd3763d8d455c21fc6fb4eb2f2728e034
+EBUILD netbeans-harness-9999_p20150822.ebuild 4131 SHA256 3bd986739a106e30086ca6bc819bb5fb1245606021889942d7f8a61823316f90 SHA512 184fb37ebcd977a7857d677ea179e2df8064054d66feb6ed6b1f592d19eb08de89a6b21958aa89b3c21c5eeb440fa4f6b7eb03be74b72c10d333debc1eb262ad WHIRLPOOL b54d6c4c8bcdac290502a4d3fadaef9eb883c8868ba704dc804c03dec03b4efdd8545e5a4f7ec8a0daf97271459b54b1d9f9bb3988a1db5f953cbe1a7be964b2
+MISC ChangeLog 177960 SHA256 452834d97dc09937f3faac52fa24cbdf927b187a10546d7aa4a88c16f6b65c71 SHA512 f067f21eabcea267b17d91c53242bc2f3bfbc59c169cf39637ec5aed4e08ec5bb41f4e64711f407f075033870b544468874bb5c32da4d06524df1e95aceb2f1e WHIRLPOOL 365ec90086424d6724f64a51b62524332f1d09420d3465e5e9621263d595e27e1a8091d1ce2977c8afb1f9637187740e9f39bf42df32b88875a57a4f6d201d19
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20150822.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20150822.ebuild
new file mode 100644
index 0000000..295edb6
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20150822.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Harness"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-08-22_00-02-28/zip/netbeans-trunk-nightly-201508220002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
+	http://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar
+	http://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip
+	http://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip
+	http://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	dev-java/javahelp:0"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	>=dev-java/junit-4.4:4"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.harness -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar apisupport.harness/external/bindex-2.2.jar || die
+	ln -s "${DISTDIR}"/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar apisupport.harness/external/jnlp-servlet.jar || die
+	ln -s "${DISTDIR}"/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar jemmy/external/jemmy-2.3.1.1.jar || die
+	ln -s "${DISTDIR}"/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip jemmy/external/jemmy-2.3.1.1-doc.zip || die
+	ln -s "${DISTDIR}"/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip jemmy/external/jemmy-2.3.1.1-src.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into apisupport.harness/external javahelp jsearch.jar jsearch-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/harness >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/harness$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	fperms 755 launchers/app.sh
+	find "${D}" -name "*.exe" -type f -delete
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/antlib
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsearch-2.0_05.jar && dosym /usr/share/javahelp/lib/jsearch.jar ${instdir}/jsearch-2.0_05.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/harness
+}

diff --git a/dev-java/netbeans-ide/ChangeLog b/dev-java/netbeans-ide/ChangeLog
index d75d42e..3eace1e 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_p20150822 (22 Aug 2015)
+
+  22 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ide-9999_p20150822.ebuild:
+  updated to the latest sources
+
 *netbeans-ide-9999_p20150821 (21 Aug 2015)
 
   21 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 6878dbe..d9dbab9 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -249,6 +249,7 @@ DIST netbeans-trunk-nightly-201508180002-src.zip 208817240 SHA256 b497e33ddf1039
 DIST netbeans-trunk-nightly-201508190002-src.zip 208817531 SHA256 6594e5c2181ff7dfcf7eab3c7551571ea8e4cc6f3eb3f196a2b3b4bd7f394745 SHA512 84b4d1f1e77f1a4e2d97c14e2400381ce0d926dae2659cf38bbd4d2b7ae619d479ac1d73900f6d9cf10981b85982f7f19c00662974179e48cc4efb6e3481a82a WHIRLPOOL 7decfaa30422c8c588e8cfb65cd654119c3f80b60ffe3226074e5a1775648154a26a5ef267bd98f0a7720b107a0046b040652379bb6dd4a837d000863098ecd5
 DIST netbeans-trunk-nightly-201508200002-src.zip 208799494 SHA256 81de2b1f44baa32ffb769676ba38edab57124533bda1bb1dcda18b9be5dcb7c2 SHA512 1c68dbcff6bcfeb3566823749b57ce95c2de6a97333573897d78f5f6bc7fcfe2c06a2ff7805bfabea9dc9f60d9e5021d4c3d5aa720004d796caf3b163fb1699d WHIRLPOOL cc8344fb52507294d00071f967abdc5b77fcd37fd3989b81d0efdb7d35c0eca4349f86769f2a09915a72565e399852c40f21eaab89fb6a7c66a58960ecfefc39
 DIST netbeans-trunk-nightly-201508210002-src.zip 208800734 SHA256 c85c1f8027b3b9b03bbcc6743bb508899bc9050058c112f060d73daa544bbde6 SHA512 d8a3cbbc3f671d52bb5edcd2722c9ef847cdc160aecb4a9ee3283c2f64d82284c820c39a68e2aff2e7c3cd24fac618c1d3c48207b8323aa06f92524d0ab3a185 WHIRLPOOL b8938d9102fff59c5cc4f35db839492bbd1b1249d4e9c8da9eb4b2167c1e14d8906d49ba2bc9d301331e25d855b798883ee5f7aa51a5f00b272f55adae5339b3
+DIST netbeans-trunk-nightly-201508220002-src.zip 208858908 SHA256 eaeb7783c5302a6fb71c658071bf7283fe282bde2b18df8b6f07ed8cca69bc0d SHA512 c6687256e92c8447dd1d77b4dd678502d23ed7b6a799439f1a066371c672670bee25b46ba2ee2a090382ab157aae31641acc20373898f58fceac642a2a8aeebe WHIRLPOOL df6a09212c094d65f92004dd68ac857892308540c5ff9e914b683a40163ce784868c06214dd5636688c81549fd9e0e69b14df3c8ca268d1de517cb6ac4349594
 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
@@ -283,5 +284,6 @@ EBUILD netbeans-ide-9999_p20150818.ebuild 30340 SHA256 dbf42f1076a10ceb0b9e74f0f
 EBUILD netbeans-ide-9999_p20150819.ebuild 30340 SHA256 ac8bfcec41b5c0af5477d9e0a8627824eb93209a790821b0e18065bd6ec4f053 SHA512 6f8f4f393cc241e1e254ac77c67b8273f25342c90044da4d373ce9db61288eae7eb58d7634f28276a0d63dae06a25997f834ac9c7e0cb8e9f117d57f2fd34d38 WHIRLPOOL 0947fa2748d86b7527f24b6d1128d52ade5922a1c8572f96ecf6dfec33ea96301260e272d19968581809808667db45ca539fd25b673dcb26090ab5fbef6b2441
 EBUILD netbeans-ide-9999_p20150820.ebuild 30340 SHA256 f2a3cafa2c2d545558e40c6db7a6d40efeadf319daf2e12e143e3adc422d9a23 SHA512 6f5916ef58fe9c6ef46248eb0f9d29460c3c4de5e070018de98688f73b9eb6b4125a3485fb49fe6fd657ba4e4f7e8108b0a2c5d16d7c55c063eac8e5b66dc62a WHIRLPOOL 0e0eb750418c41d7bfd68da23c3ed5bd282d384956269989abad57fad036850d20798b9a6a89feb70c2445349b21c385ef20ebf4c1f118c6b9904f8d9b716d3f
 EBUILD netbeans-ide-9999_p20150821.ebuild 30340 SHA256 8733237500f2791768b073f634360423a3c8f69a971518c57cce0c9331c191f8 SHA512 d4e6b9bedbccd87345b07e1b680cd129dbce1f9ae94f9b2865358abd10267bf08657f54648d4cea0c3c4db5ff29f1d050cf60a1b92f79de8d642b444149fc887 WHIRLPOOL 8f6b99001e1c2b66a4d0864fb797ede676fc48644c947ee37cb0cd788577d2724114af70b8bbddecbfabd01d645565ad34690ab99e947af2af696ccb6edebda6
-MISC ChangeLog 169190 SHA256 ed9b8b58fd841c486b7ac52ca11ae37723df731345566e51f18dc0a85ce39f8e SHA512 27c9c4682ca613164b42206334b0c8b81de17756931f41f29861187b69eac5881933ad4167b03f8eb34ef12e277bb4dbcd0e43a6b9c590e14506e49adcc2def6 WHIRLPOOL 30ffb2e0df676f43eefe597c27622597658368b597ea8877057d729f8e97aa75d27d54960bfa784d6b593859011af69a99eb1ccb38e5bed83e03a2c5edd043e4
+EBUILD netbeans-ide-9999_p20150822.ebuild 30340 SHA256 0cf7d935d1433737783a5772a51c9337045be5ce323f154d87379f9b2f15d60e SHA512 c9756049c6890335fd8e41d3ebd92537bfafc3ea72ab36a591cfd9f14b084324da420e49842a044defad2f2ff812dbd98ffb084be0bf1e1e546a647b44dc5a3d WHIRLPOOL 08460632c1d5dd957ea0ea3e365d9e9be4a236bf9cb0e3d3cfb3bed3ada5e91481ba946cf7eb57968e2da95e57814cfb59f1fd00d81735a55078f360b767b564
+MISC ChangeLog 169358 SHA256 adcc7e70e6cfde92974c0d8a9e0dd001bbf7343e62b9277384a43dd8cac726f9 SHA512 204ecc4981313d0daaa32f025c0f81552530a1f2e694812c5ab2754340c18b62722496c1ce8bc0df634c22b88b6bea19cdabbd45e09735b07adce9dfb95a4ba3 WHIRLPOOL 6afb5be9cffde2fefe373adeb7115b10d5387cf3b6549c48b92e9a7ba56982cc4351eadec483bc2cc2f7f79744c17d592cbdcf5d6bdd50c21044420f04be21b2
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-java/ChangeLog b/dev-java/netbeans-java/ChangeLog
index 8ebc31c..984f6a7 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_p20150822 (22 Aug 2015)
+
+  22 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-java-9999_p20150822.ebuild:
+  updated to the latest sources
+
 *netbeans-java-9999_p20150821 (21 Aug 2015)
 
   21 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 2069746..7fefd8f 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -124,6 +124,7 @@ DIST netbeans-trunk-nightly-201508180002-src.zip 208817240 SHA256 b497e33ddf1039
 DIST netbeans-trunk-nightly-201508190002-src.zip 208817531 SHA256 6594e5c2181ff7dfcf7eab3c7551571ea8e4cc6f3eb3f196a2b3b4bd7f394745 SHA512 84b4d1f1e77f1a4e2d97c14e2400381ce0d926dae2659cf38bbd4d2b7ae619d479ac1d73900f6d9cf10981b85982f7f19c00662974179e48cc4efb6e3481a82a WHIRLPOOL 7decfaa30422c8c588e8cfb65cd654119c3f80b60ffe3226074e5a1775648154a26a5ef267bd98f0a7720b107a0046b040652379bb6dd4a837d000863098ecd5
 DIST netbeans-trunk-nightly-201508200002-src.zip 208799494 SHA256 81de2b1f44baa32ffb769676ba38edab57124533bda1bb1dcda18b9be5dcb7c2 SHA512 1c68dbcff6bcfeb3566823749b57ce95c2de6a97333573897d78f5f6bc7fcfe2c06a2ff7805bfabea9dc9f60d9e5021d4c3d5aa720004d796caf3b163fb1699d WHIRLPOOL cc8344fb52507294d00071f967abdc5b77fcd37fd3989b81d0efdb7d35c0eca4349f86769f2a09915a72565e399852c40f21eaab89fb6a7c66a58960ecfefc39
 DIST netbeans-trunk-nightly-201508210002-src.zip 208800734 SHA256 c85c1f8027b3b9b03bbcc6743bb508899bc9050058c112f060d73daa544bbde6 SHA512 d8a3cbbc3f671d52bb5edcd2722c9ef847cdc160aecb4a9ee3283c2f64d82284c820c39a68e2aff2e7c3cd24fac618c1d3c48207b8323aa06f92524d0ab3a185 WHIRLPOOL b8938d9102fff59c5cc4f35db839492bbd1b1249d4e9c8da9eb4b2167c1e14d8906d49ba2bc9d301331e25d855b798883ee5f7aa51a5f00b272f55adae5339b3
+DIST netbeans-trunk-nightly-201508220002-src.zip 208858908 SHA256 eaeb7783c5302a6fb71c658071bf7283fe282bde2b18df8b6f07ed8cca69bc0d SHA512 c6687256e92c8447dd1d77b4dd678502d23ed7b6a799439f1a066371c672670bee25b46ba2ee2a090382ab157aae31641acc20373898f58fceac642a2a8aeebe WHIRLPOOL df6a09212c094d65f92004dd68ac857892308540c5ff9e914b683a40163ce784868c06214dd5636688c81549fd9e0e69b14df3c8ca268d1de517cb6ac4349594
 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
@@ -159,5 +160,6 @@ EBUILD netbeans-java-9999_p20150818.ebuild 14824 SHA256 7c7254783513cc6413cf0e50
 EBUILD netbeans-java-9999_p20150819.ebuild 14824 SHA256 81421966c3836e92f7a147f32c4a5d81ddeaf15a18d9389a129cf6a8485b3e10 SHA512 78e03e1aa9d0fb7e6f335289fca4920f015d8fc6585e122f84bb844c3c7f289a6bfaca77e32484b38863bd6875682cf7c382c0dc3c76250ea5dd5a1290a88f0b WHIRLPOOL bac21947d47b2e378083dfa9a54569bff1ead2d815736e622a6edac4c927e918ea79fa821538a88910097921971a80e85f3368fc5811e1eeae3748f2acb3ab06
 EBUILD netbeans-java-9999_p20150820.ebuild 14824 SHA256 26bfacfe731bbb607e8434574df66acb995c713cb2189e482f47b09aa319f166 SHA512 8de80663d88de24d1b5d4296afdbde59d24fa323c13725d38852fe2788b3be374e2d119a0bdeac60e2a7ec4fe8e7771c48d1fbe65802b4dc336aeac3e2a29dda WHIRLPOOL 5fd17e5bb1f1b469f2e2c42673b1fd779ba98d1a1b3f8b706ba8ffc4abf6089fb3e1fbbf55afb70ff75cfb3be92b08860a67c8b975b42b4efd0a43ca42aad243
 EBUILD netbeans-java-9999_p20150821.ebuild 14824 SHA256 237dcd04c4f91fc0960ee8c7f9e5200bc104f492737d8a7e56e495fe0eff6710 SHA512 bf1ca37d0a14082b763dba1452b1862d76fb33939c7d6f416f6f35bc2cb9097d97da5ae588fccefa9c4412074372b12454e09bccea8afcd8e0a0f30a47d4a511 WHIRLPOOL 9c9dfa689d773c156e2613fdddd39b5b533b832320526de9c77796a27c38a5a1193ba64a72210d11db822a66e83350156209cc99534ae51662544ee996610fd4
-MISC ChangeLog 172703 SHA256 c701f9da9e99a3b9b059b5dbe8647e87eae48045e0bf5055573ce9eee53d9e86 SHA512 33c5b708a6b90fe5c8bc9b1e650cae848bdef1c2cc094023df98412d2a8390e0c656c51f2f9efb278a9e6d8f83d3432348b53a8af32dc92c02c0030cc23b97c0 WHIRLPOOL efc3de6218db809db2cedac0a8eeda1574249d7d0031723b0b0a0bc3304687095b30fb04ce24f7f3f612f5adb8f59f909c9d02412ae9ff89a0549aae734f07dc
+EBUILD netbeans-java-9999_p20150822.ebuild 14824 SHA256 e117c47437abb9180c7534135c0780458d85cb944880e63502347254006b7fcc SHA512 70d2cd35e4e81f70f6d9a3c3f8680bd6f57be8f275d8c3e0066dd0eddcd4d8913ad9bfe71144e81e550f373e48039b769c1536c2a09fb897c98b601d678863f8 WHIRLPOOL a54aad6219b725176429722393c9183defcb526432172a3536144eea87f5f14b3dbc1469b7d5036e95cd72a6ab05b5bff3c4c986a73fb25176fad1f316a65215
+MISC ChangeLog 172873 SHA256 9e44725d69fb85f2be526f0393131d715dfb9289343c34d05b383cf54630d73a SHA512 01ed11d2fa45f18673c841baaf93cc19d06ffc45d28a623417153743e995f31447e45cab96e2ee7c64a7f388a78a498b356ee43054ed6949bcd0fb6af148ae0e WHIRLPOOL e72e023c5a5bd5f37d08e093a3672c4124b8d438b590be8a6c0d870f390eb7f00ce01724cb332c458049ebfbd532a845e58a8d65fea12713668a84c5ac635953
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-javacard/ChangeLog b/dev-java/netbeans-javacard/ChangeLog
index 2052a5d..6aa4965 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_p20150822 (22 Aug 2015)
+
+  22 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javacard-9999_p20150822.ebuild:
+  updated to the latest sources
+
 *netbeans-javacard-9999_p20150821 (21 Aug 2015)
 
   21 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index c2d2f8d..747ca7b 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -41,6 +41,7 @@ DIST netbeans-trunk-nightly-201508180002-src.zip 208817240 SHA256 b497e33ddf1039
 DIST netbeans-trunk-nightly-201508190002-src.zip 208817531 SHA256 6594e5c2181ff7dfcf7eab3c7551571ea8e4cc6f3eb3f196a2b3b4bd7f394745 SHA512 84b4d1f1e77f1a4e2d97c14e2400381ce0d926dae2659cf38bbd4d2b7ae619d479ac1d73900f6d9cf10981b85982f7f19c00662974179e48cc4efb6e3481a82a WHIRLPOOL 7decfaa30422c8c588e8cfb65cd654119c3f80b60ffe3226074e5a1775648154a26a5ef267bd98f0a7720b107a0046b040652379bb6dd4a837d000863098ecd5
 DIST netbeans-trunk-nightly-201508200002-src.zip 208799494 SHA256 81de2b1f44baa32ffb769676ba38edab57124533bda1bb1dcda18b9be5dcb7c2 SHA512 1c68dbcff6bcfeb3566823749b57ce95c2de6a97333573897d78f5f6bc7fcfe2c06a2ff7805bfabea9dc9f60d9e5021d4c3d5aa720004d796caf3b163fb1699d WHIRLPOOL cc8344fb52507294d00071f967abdc5b77fcd37fd3989b81d0efdb7d35c0eca4349f86769f2a09915a72565e399852c40f21eaab89fb6a7c66a58960ecfefc39
 DIST netbeans-trunk-nightly-201508210002-src.zip 208800734 SHA256 c85c1f8027b3b9b03bbcc6743bb508899bc9050058c112f060d73daa544bbde6 SHA512 d8a3cbbc3f671d52bb5edcd2722c9ef847cdc160aecb4a9ee3283c2f64d82284c820c39a68e2aff2e7c3cd24fac618c1d3c48207b8323aa06f92524d0ab3a185 WHIRLPOOL b8938d9102fff59c5cc4f35db839492bbd1b1249d4e9c8da9eb4b2167c1e14d8906d49ba2bc9d301331e25d855b798883ee5f7aa51a5f00b272f55adae5339b3
+DIST netbeans-trunk-nightly-201508220002-src.zip 208858908 SHA256 eaeb7783c5302a6fb71c658071bf7283fe282bde2b18df8b6f07ed8cca69bc0d SHA512 c6687256e92c8447dd1d77b4dd678502d23ed7b6a799439f1a066371c672670bee25b46ba2ee2a090382ab157aae31641acc20373898f58fceac642a2a8aeebe WHIRLPOOL df6a09212c094d65f92004dd68ac857892308540c5ff9e914b683a40163ce784868c06214dd5636688c81549fd9e0e69b14df3c8ca268d1de517cb6ac4349594
 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_p20150818.ebuild 4982 SHA256 b69ab63c03a07a173cd69
 EBUILD netbeans-javacard-9999_p20150819.ebuild 4982 SHA256 7a2ddddf10176df20096b54799d7bd13fb9412ecce1c618874ec95fb0c71805c SHA512 6329b4046d5448cefcdb91a6b25d5374f51d404acd5c7f9fc003ad2a48a4af5335cb793874ff6d1704858a7b46b015fdad05f9241310f018102586b97bdc13f2 WHIRLPOOL 474155c9fd37d0e4371c83131fb3a07dd2e553145115b8f0b1f6db962540b1c8aa66d22924537aa4bc165835bc84d64411ce1dae20789a45e7e2267be1cdfe3e
 EBUILD netbeans-javacard-9999_p20150820.ebuild 4982 SHA256 189e89f79b90858465627a2a32a6b031b2f83773a39849c0884c46adc3c69d5f SHA512 0bf1d3ad9519b7925d193e2f6d264ad70c5a893f51b5a763845ce50d99039884c55d6bf2c538e964e9896bc0f24cf174a31029b949b306614af08a5f0759bd0e WHIRLPOOL fbaba9cca66226ac95ea3b74fd6492b8317a3d9d2ba669f95f1e9941a1155e55bba5c51e66b722f49ebb77006fec48cf78dce2b2a56ad97139a6e8504082549d
 EBUILD netbeans-javacard-9999_p20150821.ebuild 4982 SHA256 dc225fda9a7804d300fdcef402d12d9cc278c3958dced1d1c00eab75683cec3c SHA512 70dedd954c2d88d543e750744eaa486f1271c2e3fdc0a3bf6ffac22a44228464e8c7a942178127ea6ff74a15835f7c75c275a2f54a88b3f4e0dbaa24abfb84e6 WHIRLPOOL b941babddf8c297311364735098c7eb48d246e799d03cb75232401c20ac5580339eda27033167ef846962bd3fbaa51b70577b93615f24a5cf057c9cc05598b55
-MISC ChangeLog 180032 SHA256 8c5bcf83308f85a451e324cb309113db454ad3365990aa5646b775fc4da60807 SHA512 bd425cfe74a561ced48d6362a9f52347f15ec7bba8a94034756f1a9aa22706e566d604b8d1864db342579d0bfffd4db6df2eecc39c5d7f7e5932ea9d03e1d42c WHIRLPOOL 885bec1fa4158917e36702a5a672a32c88f06bd5faeb33fa127638e3d8152f9bf035c632cbb2eed48ce4ff28e2ff1b682fee4d9d4a12e74e5b24050e395e7c1e
+EBUILD netbeans-javacard-9999_p20150822.ebuild 4982 SHA256 622cb24ed106386106f6dee351608fea56ef7cd2765fd3d5636668701aef4e9e SHA512 45e5a2d30c366de0d53cbda109dca47f6dc7d83057c614590253f3f7be2a7335e244eb0ea27dac3ce79e016c51295d8d3aed890a7c4c76445bbc7df6cc5fb98c WHIRLPOOL 39fe008ce3bd45a89808ae2477b954e8c12152021e7211ac55fa2be1e913cb57e962f9ccbf4290b854037e74223d74222ccb8ba6c119b2f8ce6a0390e26c9520
+MISC ChangeLog 180210 SHA256 005d4c1a738a94e32bd9122821af1ba0570ea4b182c567d0204ebfd847aef1ca SHA512 b3d7d186aa18ade18715fd8a6bb562538cb549b9981e8b9402905f32cecfc79e8c2d2b2952790b987f5c0b87909a361c07f3abfd91ad488eabc540024f544335 WHIRLPOOL 223fabdc3bcc57174dda2dec4a04aa6ed85187b4ed5c8f5e5dd7f71fe4704d333c05d8536e85909ec554226847c51326ea660534df065724bb477184c5393ef2
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150822.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150822.ebuild
new file mode 100644
index 0000000..2acabfe
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150822.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaCard Cluster"
+HOMEPAGE="http://netbeans.org/projects/javacard"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-08-22_00-02-28/zip/netbeans-trunk-nightly-201508220002-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 428cc24..9c66d11 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_p20150822 (22 Aug 2015)
+
+  22 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javadoc-9999_p20150822.ebuild:
+  updated to the latest sources
+
 *netbeans-javadoc-9999_p20150821 (21 Aug 2015)
 
   21 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index a4d2463..fc87979 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -44,6 +44,7 @@ DIST netbeans-trunk-nightly-201508180002-src.zip 208817240 SHA256 b497e33ddf1039
 DIST netbeans-trunk-nightly-201508190002-src.zip 208817531 SHA256 6594e5c2181ff7dfcf7eab3c7551571ea8e4cc6f3eb3f196a2b3b4bd7f394745 SHA512 84b4d1f1e77f1a4e2d97c14e2400381ce0d926dae2659cf38bbd4d2b7ae619d479ac1d73900f6d9cf10981b85982f7f19c00662974179e48cc4efb6e3481a82a WHIRLPOOL 7decfaa30422c8c588e8cfb65cd654119c3f80b60ffe3226074e5a1775648154a26a5ef267bd98f0a7720b107a0046b040652379bb6dd4a837d000863098ecd5
 DIST netbeans-trunk-nightly-201508200002-src.zip 208799494 SHA256 81de2b1f44baa32ffb769676ba38edab57124533bda1bb1dcda18b9be5dcb7c2 SHA512 1c68dbcff6bcfeb3566823749b57ce95c2de6a97333573897d78f5f6bc7fcfe2c06a2ff7805bfabea9dc9f60d9e5021d4c3d5aa720004d796caf3b163fb1699d WHIRLPOOL cc8344fb52507294d00071f967abdc5b77fcd37fd3989b81d0efdb7d35c0eca4349f86769f2a09915a72565e399852c40f21eaab89fb6a7c66a58960ecfefc39
 DIST netbeans-trunk-nightly-201508210002-src.zip 208800734 SHA256 c85c1f8027b3b9b03bbcc6743bb508899bc9050058c112f060d73daa544bbde6 SHA512 d8a3cbbc3f671d52bb5edcd2722c9ef847cdc160aecb4a9ee3283c2f64d82284c820c39a68e2aff2e7c3cd24fac618c1d3c48207b8323aa06f92524d0ab3a185 WHIRLPOOL b8938d9102fff59c5cc4f35db839492bbd1b1249d4e9c8da9eb4b2167c1e14d8906d49ba2bc9d301331e25d855b798883ee5f7aa51a5f00b272f55adae5339b3
+DIST netbeans-trunk-nightly-201508220002-src.zip 208858908 SHA256 eaeb7783c5302a6fb71c658071bf7283fe282bde2b18df8b6f07ed8cca69bc0d SHA512 c6687256e92c8447dd1d77b4dd678502d23ed7b6a799439f1a066371c672670bee25b46ba2ee2a090382ab157aae31641acc20373898f58fceac642a2a8aeebe WHIRLPOOL df6a09212c094d65f92004dd68ac857892308540c5ff9e914b683a40163ce784868c06214dd5636688c81549fd9e0e69b14df3c8ca268d1de517cb6ac4349594
 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_p20150818.ebuild 6234 SHA256 b49b91e6191d348c377f9b
 EBUILD netbeans-javadoc-9999_p20150819.ebuild 6234 SHA256 9a4d900e292a8b3777b6f7bc4655d09c08d25058ee3e7b4a5e41377004fd66f7 SHA512 29b0fc98def5d67b970717ba1d6325014a6d49757d4ee9ee29f51be1f6536418a7955deadca6c109246f4fe63fd7387a34e7a316a89865b973015215f1d9a8d1 WHIRLPOOL 2b0f78c67656320c2e5c3e4bee9c0956daa56f93412dba900f3e9e5c9b429887a4174c6759c1cf230ca73ae4083e5c8cf403e244cbcbd4bfcdd469176b352be4
 EBUILD netbeans-javadoc-9999_p20150820.ebuild 6234 SHA256 006843b32fff1b817e6a910f839dfd4ab778d8234fe88e24d151c826501697ba SHA512 e8b45072c496d80182b3cfb6887d7bd7df64bcaf7e57d94b597fe8ec6bda864246269eccb88980088f4d25a1d532cd81a7d25888b395f04b79bd129b1c505993 WHIRLPOOL 4cc2415a0eb5ccfdbc41afa7f27db3a5840e5e2b7dbb70f7a30be356c22d337bf1fa8e64c513f70e3118204373801a6368d7a402517dc984dd34c15af9a1f758
 EBUILD netbeans-javadoc-9999_p20150821.ebuild 6234 SHA256 92cd97a21814051a80856e7ad47bde96d9168aba4684a59d6bf0ff4b38265e36 SHA512 4ca5235d696a295f0b2a96f89eef81613a924d5d2e049db94c53e1ef7943954619b10ecbf9ef35974758ce15524cc4bdec8f9dc55e158eb9cb129ebf560e45c4 WHIRLPOOL 6ff984a28e18c85d53bca0a4a9acca4224f004c15353dc314a62d48a3146a91d278cad99aab64ab435813298a0c4274f3bab5a28cdadd1936c02dcf297ca5703
-MISC ChangeLog 177610 SHA256 eb2e6b24d7ef33ce94df22e6d589e3dca97b61fd513430a3719cc1c2d92cd8c3 SHA512 cc168b5b6fb33a780f3b2e9e554f65dd629750a2b78757e96b6caacdffbc10d239995170211b93103ff0d64dae03ffcfb1b755691cdc620c6567e1838c0985c3 WHIRLPOOL 89604bbe3243dfe65b7932e55cdec1e44215601d5c00c5a27f7bc1a632fedf2be10470c44df97de07d9853081a499a87c5ed53fbeb034064fc5ea2a8dd9732e6
+EBUILD netbeans-javadoc-9999_p20150822.ebuild 6234 SHA256 3f7a65a557a3924d3a1709bf18e6b823e852afac7b239cedb73517965b36cd9d SHA512 dab14297241b2f2358c92c4f6607c7bdff6e0479c9a7a6374e2e5143435784c087bef0958c3dbbc0c74d9d1bdf7d3a227c2fb442022e05d3b201b16ab425763b WHIRLPOOL c2e00fcc115859ac5fbaec8eed057c60dbb6a40d67b09315f54a16da778ae1566f654d027fcfaed40b1ad8f8c2497eb64c3bb7ee942a13214e444177dda33780
+MISC ChangeLog 177786 SHA256 e79ef49897516e6921325d4f75308881d80582a14e9471bf91504ad0a9a3fb96 SHA512 175ca5bd85eb7971d8c32accaf2808cd0fbffc1362e8a7388bef422db9f1114c334f45852a9e815625c529614f44e30f82d2f101ebf7b56740cc7bb8eb673feb WHIRLPOOL b7d9c146f50ac3c81697c289e641fc3cf3f1bd8370a2afa7e596a809118733e7005b449a9892f0c7c842c36e8da2229a29c97cbfcdd395bb15addb135942d6f3
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150822.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150822.ebuild
new file mode 100644
index 0000000..a640aa1
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150822.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaDocs"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-08-22_00-02-28/zip/netbeans-trunk-nightly-201508220002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+# oracle-jdk-bin is needed because other jdks do not contain jre/lib/ext/jfxrt.jar
+DEPEND="dev-java/oracle-jdk-bin:1.7
+	app-arch/unzip
+	dev-java/javahelp:0
+	dev-java/junit:4
+	~dev-java/netbeans-apisupport-${PV}
+	~dev-java/netbeans-cnd-${PV}
+	~dev-java/netbeans-dlight-${PV}
+	~dev-java/netbeans-enterprise-${PV}
+	~dev-java/netbeans-ergonomics-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-groovy-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-javacard-${PV}
+	~dev-java/netbeans-mobility-${PV}
+	~dev-java/netbeans-nb-${PV}
+	~dev-java/netbeans-php-${PV}
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-profiler-${PV}
+	~dev-java/netbeans-websvccommon-${PV}"
+RDEPEND=""
+
+JAVA_PKG_BSFIX="off"
+JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.7"
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip o.apache.tools.ant.module/external/ant-libs-1.9.4.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-apisupport-${SLOT} apisupport || die
+	cat /usr/share/netbeans-apisupport-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.apisupport.built
+
+	ln -s /usr/share/netbeans-cnd-${SLOT} cnd || die
+	cat /usr/share/netbeans-cnd-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.cnd.built
+
+	ln -s /usr/share/netbeans-dlight-${SLOT} dlight || die
+	cat /usr/share/netbeans-dlight-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.dlight.built
+
+	ln -s /usr/share/netbeans-enterprise-${SLOT} enterprise || die
+	cat /usr/share/netbeans-enterprise-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.enterprise.built
+
+	ln -s /usr/share/netbeans-ergonomics-${SLOT} ergonomics || die
+	cat /usr/share/netbeans-ergonomics-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ergonomics.built
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-groovy-${SLOT} groovy || die
+	cat /usr/share/netbeans-groovy-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.groovy.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-javacard-${SLOT} javacard || die
+	cat /usr/share/netbeans-javacard-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.javacard.built
+
+	ln -s /usr/share/netbeans-mobility-${SLOT} mobility || die
+	cat /usr/share/netbeans-mobility-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.mobility.built
+
+	ln -s /usr/share/netbeans-nb-${SLOT}/nb nb || die
+	cat /usr/share/netbeans-nb-${SLOT}/nb/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.nb.built
+
+	ln -s /usr/share/netbeans-php-${SLOT} php || die
+	cat /usr/share/netbeans-php-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.php.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-profiler-${SLOT} profiler || die
+	cat /usr/share/netbeans-profiler-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.profiler.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	eant -f nbbuild/build.xml bootstrap || die
+	ANT_OPTS="-Xmx1536m" eant -f nbbuild/javadoctools/build.xml build-javadoc
+}
+
+src_install() {
+	rm nbbuild/build/javadoc/*.zip
+	java-pkg_dojavadoc nbbuild/build/javadoc
+}

diff --git a/dev-java/netbeans-javafx/ChangeLog b/dev-java/netbeans-javafx/ChangeLog
index a6d9238..bf5eaa9 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_p20150822 (22 Aug 2015)
+
+  22 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javafx-9999_p20150822.ebuild:
+  updated to the latest sources
+
 *netbeans-javafx-9999_p20150821 (21 Aug 2015)
 
   21 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 76d2007..197f8aa 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -44,6 +44,7 @@ DIST netbeans-trunk-nightly-201508180002-src.zip 208817240 SHA256 b497e33ddf1039
 DIST netbeans-trunk-nightly-201508190002-src.zip 208817531 SHA256 6594e5c2181ff7dfcf7eab3c7551571ea8e4cc6f3eb3f196a2b3b4bd7f394745 SHA512 84b4d1f1e77f1a4e2d97c14e2400381ce0d926dae2659cf38bbd4d2b7ae619d479ac1d73900f6d9cf10981b85982f7f19c00662974179e48cc4efb6e3481a82a WHIRLPOOL 7decfaa30422c8c588e8cfb65cd654119c3f80b60ffe3226074e5a1775648154a26a5ef267bd98f0a7720b107a0046b040652379bb6dd4a837d000863098ecd5
 DIST netbeans-trunk-nightly-201508200002-src.zip 208799494 SHA256 81de2b1f44baa32ffb769676ba38edab57124533bda1bb1dcda18b9be5dcb7c2 SHA512 1c68dbcff6bcfeb3566823749b57ce95c2de6a97333573897d78f5f6bc7fcfe2c06a2ff7805bfabea9dc9f60d9e5021d4c3d5aa720004d796caf3b163fb1699d WHIRLPOOL cc8344fb52507294d00071f967abdc5b77fcd37fd3989b81d0efdb7d35c0eca4349f86769f2a09915a72565e399852c40f21eaab89fb6a7c66a58960ecfefc39
 DIST netbeans-trunk-nightly-201508210002-src.zip 208800734 SHA256 c85c1f8027b3b9b03bbcc6743bb508899bc9050058c112f060d73daa544bbde6 SHA512 d8a3cbbc3f671d52bb5edcd2722c9ef847cdc160aecb4a9ee3283c2f64d82284c820c39a68e2aff2e7c3cd24fac618c1d3c48207b8323aa06f92524d0ab3a185 WHIRLPOOL b8938d9102fff59c5cc4f35db839492bbd1b1249d4e9c8da9eb4b2167c1e14d8906d49ba2bc9d301331e25d855b798883ee5f7aa51a5f00b272f55adae5339b3
+DIST netbeans-trunk-nightly-201508220002-src.zip 208858908 SHA256 eaeb7783c5302a6fb71c658071bf7283fe282bde2b18df8b6f07ed8cca69bc0d SHA512 c6687256e92c8447dd1d77b4dd678502d23ed7b6a799439f1a066371c672670bee25b46ba2ee2a090382ab157aae31641acc20373898f58fceac642a2a8aeebe WHIRLPOOL df6a09212c094d65f92004dd68ac857892308540c5ff9e914b683a40163ce784868c06214dd5636688c81549fd9e0e69b14df3c8ca268d1de517cb6ac4349594
 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
@@ -75,5 +76,6 @@ EBUILD netbeans-javafx-9999_p20150818.ebuild 4723 SHA256 7117783d497b2caf50c7b6f
 EBUILD netbeans-javafx-9999_p20150819.ebuild 4723 SHA256 4f11177f0f8681a1dd9788f1314c4409b306d2636a5ccfdc7c70f589f159844b SHA512 8f4a89e1b959944a1baed237b0a57290c3125b3d1de5e6f352aec8a8d00ac2258226f4939e9a2879feebaaf89cad6679b535c9f031a9745211117db6d5c8e819 WHIRLPOOL e45d9ec491ed9c96a9f90be84c3b9b3d978d1b02e30f5012d658b961d8d929bc84b1f06e7c67a087689a3a98c45347e29ad987e77759686efadbc1d4f395b638
 EBUILD netbeans-javafx-9999_p20150820.ebuild 4723 SHA256 e2b8e32baa1c4b230dc0e9c536143cc1a47fbf17643cba6488d370745afa756f SHA512 2601f5727b8bf7918f4fb36affb0c0ff2ad1007622a29254b0676d179dea0e5f81b44369aa630b16bb72d0c9b66aa47fbdfbc70c084102dac24f5bad4db461f4 WHIRLPOOL 53c9b8824c95bdd28c2ddf0130181203858344dbceadb15d5f4d19bfbc1b2b7e86013fdfc9aabff50d941bcd2825bd5ad68fd91ccd33e5e394c99486f5a438b6
 EBUILD netbeans-javafx-9999_p20150821.ebuild 4723 SHA256 34aa5f7eda021f576fe2232602301c1945c325e1194ed238b6d363d13645d1f6 SHA512 de4ca7b8f056cfc46eea3bdb48593601c5efecae956121e193058bff60db2d46994bb80cd681cf26335c18dbb06e67d9e834f3c3b7762c0c28202d1dc8cd86cc WHIRLPOOL dc5db27b106fbba4e44d0928cc0d9244c264fbcd39afdec6b13e824e1c0db77cbb42e8837cf8c7e4d8492fb28b1747650867c29cfef561d27bcca2155ce13bb0
-MISC ChangeLog 162055 SHA256 9bc3aabd024f110c008485bc5e3f29af9e83756aa4345ed5c4204881865d4822 SHA512 775fc1d87a63e4d7bb3d0a0e7b352bafb8b560ef3aaa183bd2710faa5c5f91e81c72b8a376e867c2348297a3cbafcf15f427fa94858b61bf988a10b87a2776c0 WHIRLPOOL 59003146f9773751b22c57f2b08c2f4ba37370dcadaf65b9724732e941fd52154d2f9474f101514bf61e9529ec46aced2aaf3d4008737c44f205e7b6397ab0e8
+EBUILD netbeans-javafx-9999_p20150822.ebuild 4723 SHA256 6993e85a9d87bfb8ea63ed088e613528b42f45bdd1bb1a5860d7f1a94a60f4f2 SHA512 3999609c256050c765eca729cd5d2ddf35fcb020f8f235f8930c4f6e574fa08aafdfe296651d6b96fa5d41801597e359793e26ab213e23fc6cb854fa3b70a575 WHIRLPOOL 5bf949467619385c764b5db1fa88ce5c5f37583fd57a0b8e85544aa5dc0c776c8cce4a20b7feb49157ef110ef97e90f3a53ba1d008c493eebf3ba053e6f46092
+MISC ChangeLog 162229 SHA256 c43499232cded4920fcc30f0a0c755cf0460cd6e1675f3fb86d389f51133958c SHA512 a744d2d810fbd99347c4937c38cc3cfd03e24777c935d3cba50663fe55b8887aa4d7186a4bea37dc2379ec14ac4f3f8ef64a149711aecde3ca8f6ec09b054d29 WHIRLPOOL db9f7b7e766706ae688866fae62c43c0a2ffc16a29297da2a0f857bd57b08391c1e00980e0f2799f582c9ea5d5aa35c63f86489b4c612795a02bf27a9ba267e2
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-mobility/ChangeLog b/dev-java/netbeans-mobility/ChangeLog
index 6ef5473..13d6715 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_p20150822 (22 Aug 2015)
+
+  22 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-mobility-9999_p20150822.ebuild:
+  updated to the latest sources
+
 *netbeans-mobility-9999_p20150821 (21 Aug 2015)
 
   21 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 788df24..8b7ad74 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -47,6 +47,7 @@ DIST netbeans-trunk-nightly-201508180002-src.zip 208817240 SHA256 b497e33ddf1039
 DIST netbeans-trunk-nightly-201508190002-src.zip 208817531 SHA256 6594e5c2181ff7dfcf7eab3c7551571ea8e4cc6f3eb3f196a2b3b4bd7f394745 SHA512 84b4d1f1e77f1a4e2d97c14e2400381ce0d926dae2659cf38bbd4d2b7ae619d479ac1d73900f6d9cf10981b85982f7f19c00662974179e48cc4efb6e3481a82a WHIRLPOOL 7decfaa30422c8c588e8cfb65cd654119c3f80b60ffe3226074e5a1775648154a26a5ef267bd98f0a7720b107a0046b040652379bb6dd4a837d000863098ecd5
 DIST netbeans-trunk-nightly-201508200002-src.zip 208799494 SHA256 81de2b1f44baa32ffb769676ba38edab57124533bda1bb1dcda18b9be5dcb7c2 SHA512 1c68dbcff6bcfeb3566823749b57ce95c2de6a97333573897d78f5f6bc7fcfe2c06a2ff7805bfabea9dc9f60d9e5021d4c3d5aa720004d796caf3b163fb1699d WHIRLPOOL cc8344fb52507294d00071f967abdc5b77fcd37fd3989b81d0efdb7d35c0eca4349f86769f2a09915a72565e399852c40f21eaab89fb6a7c66a58960ecfefc39
 DIST netbeans-trunk-nightly-201508210002-src.zip 208800734 SHA256 c85c1f8027b3b9b03bbcc6743bb508899bc9050058c112f060d73daa544bbde6 SHA512 d8a3cbbc3f671d52bb5edcd2722c9ef847cdc160aecb4a9ee3283c2f64d82284c820c39a68e2aff2e7c3cd24fac618c1d3c48207b8323aa06f92524d0ab3a185 WHIRLPOOL b8938d9102fff59c5cc4f35db839492bbd1b1249d4e9c8da9eb4b2167c1e14d8906d49ba2bc9d301331e25d855b798883ee5f7aa51a5f00b272f55adae5339b3
+DIST netbeans-trunk-nightly-201508220002-src.zip 208858908 SHA256 eaeb7783c5302a6fb71c658071bf7283fe282bde2b18df8b6f07ed8cca69bc0d SHA512 c6687256e92c8447dd1d77b4dd678502d23ed7b6a799439f1a066371c672670bee25b46ba2ee2a090382ab157aae31641acc20373898f58fceac642a2a8aeebe WHIRLPOOL df6a09212c094d65f92004dd68ac857892308540c5ff9e914b683a40163ce784868c06214dd5636688c81549fd9e0e69b14df3c8ca268d1de517cb6ac4349594
 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_p20150818.ebuild 4418 SHA256 a2c520b371270ebbd8ede
 EBUILD netbeans-mobility-9999_p20150819.ebuild 4418 SHA256 dfe3f4e82227de8d8e956a3720da8662b41e232052702e85e27173a3ff8b44ee SHA512 0c1fec331018aff990f2208902e52fb1010b2847c0265c61c07c464b7af7a86e9f4a3a2538a55e1cbdfb81f983dfe1b7a7a713b0702d67d5491da8d2da6302fa WHIRLPOOL 0e8770c6526b7a6e0bced9871c85df876ed24e4bbec99ac3dd29112db9522d01105aa6899af20e9f0ba8d6b94f36207cf821a59dcf3b3f979685a9ee7e07583b
 EBUILD netbeans-mobility-9999_p20150820.ebuild 4418 SHA256 0b5399cc1dda0566be0ee7b0c2e567491d226119a98a00a97e1c7f4b70cdd2ed SHA512 59d9ff373d59c7fcb1ca446d65077b2caefa6293917d11797f8c14940ad0d7f32ac994f44121eecf227fb590f5ff1655a01d1dc7f7ed551583383356cd5edde5 WHIRLPOOL 51d2a5449978d57c2f830b8ffc544d13d5e87e68b9550199108c4f22de3ff59a9f7e7a0e9fb8916f6d5d18e76b33047bf46875505801ab1e828f1b7ba41495dd
 EBUILD netbeans-mobility-9999_p20150821.ebuild 4418 SHA256 c6ebab7d381720432608e382c95279a6cf53a72f5bc72c2b3fd68aada8d9df0c SHA512 f015c3c90f2f8bc82646fe974631f013a772bc3612a5831a5c4cf92b83b99a8a6d7929548a5c18d7eb8f62f6c22c99f755934edeceaac71e65f4b6f142f9d9ed WHIRLPOOL 73d620e7a228e7211b3774d84c5468dd9ac0967d1f46872f8267bae2ffabc09353c0de3edcc13e41691ed3ee604de4fc2a68862c0bc9aa154e57b2cfaa1945d0
-MISC ChangeLog 180173 SHA256 de7b4711c5e742bc3bb266e41bc9a5401c3412b788ba7681866298d949b945c3 SHA512 c0ede2dceccddcfb8fe95b44cde27075e1d2b57d0fec3feb19c41a952401401fa796e9391534f24c82a2637077f3bce27e4fefd0d4a1518b69ec50010c52f3cd WHIRLPOOL c24d53a5eb6b31767a076215c29d5d9c24c248955635d7b5cb7340f102a618b4ae5f51b473890faa5019fc1d867f1cdbb4ceff946479acefd0b404a19f84d399
+EBUILD netbeans-mobility-9999_p20150822.ebuild 4418 SHA256 8a6310d102c7e5c6ed77a3ba8f709b34d4a79411b28ab23cc5751cb7bea27d34 SHA512 2a34b9373d452e38858b2b330f504818daa9cb18c99927ae5ee698968149646ed2697cbf16632fc4a34e065bfa1dd3ad6ab8ed7bbd4547f762eefd0c0d2b4a1a WHIRLPOOL 7ef7fcca7b4ccf2755d3caf3bb428be9d6d14e16904b9cff9da02a9494d2e2066a9eebc68272580a0c790e76da0d7de2679001c992252864cd3dcdb837f69fa3
+MISC ChangeLog 180351 SHA256 f5ca2640e7b9c395c0e0080a85f3351ec0caaa1c3337cc3c3d0708f13e2b2286 SHA512 54aef9b4bca56f5800f680d0da22ea68a7f7ff9f34fd22d1eaed3e7f52e0ef24b198b9a2d7819665415c967dde50031ad09ebae4d1fc066c3a3a09647276895e WHIRLPOOL 03ac5e9c5e74ddbf1d162580e83478fc0a747d4f283b248d1c328f7ae91b01c90763320ba54aa44eea7574fbca86c31059db82b58b7156dd20f34032cae77318
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150822.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150822.ebuild
new file mode 100644
index 0000000..bf39b32
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150822.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Mobility Cluster"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-08-22_00-02-28/zip/netbeans-trunk-nightly-201508220002-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 c74da85..aefe7e6 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_p20150822 (22 Aug 2015)
+
+  22 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-nb-9999_p20150822.ebuild:
+  updated to the latest sources
+
 *netbeans-nb-9999_p20150821 (21 Aug 2015)
 
   21 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index ff49cfe..ce8ddcb 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -46,6 +46,7 @@ DIST netbeans-trunk-nightly-201508180002-src.zip 208817240 SHA256 b497e33ddf1039
 DIST netbeans-trunk-nightly-201508190002-src.zip 208817531 SHA256 6594e5c2181ff7dfcf7eab3c7551571ea8e4cc6f3eb3f196a2b3b4bd7f394745 SHA512 84b4d1f1e77f1a4e2d97c14e2400381ce0d926dae2659cf38bbd4d2b7ae619d479ac1d73900f6d9cf10981b85982f7f19c00662974179e48cc4efb6e3481a82a WHIRLPOOL 7decfaa30422c8c588e8cfb65cd654119c3f80b60ffe3226074e5a1775648154a26a5ef267bd98f0a7720b107a0046b040652379bb6dd4a837d000863098ecd5
 DIST netbeans-trunk-nightly-201508200002-src.zip 208799494 SHA256 81de2b1f44baa32ffb769676ba38edab57124533bda1bb1dcda18b9be5dcb7c2 SHA512 1c68dbcff6bcfeb3566823749b57ce95c2de6a97333573897d78f5f6bc7fcfe2c06a2ff7805bfabea9dc9f60d9e5021d4c3d5aa720004d796caf3b163fb1699d WHIRLPOOL cc8344fb52507294d00071f967abdc5b77fcd37fd3989b81d0efdb7d35c0eca4349f86769f2a09915a72565e399852c40f21eaab89fb6a7c66a58960ecfefc39
 DIST netbeans-trunk-nightly-201508210002-src.zip 208800734 SHA256 c85c1f8027b3b9b03bbcc6743bb508899bc9050058c112f060d73daa544bbde6 SHA512 d8a3cbbc3f671d52bb5edcd2722c9ef847cdc160aecb4a9ee3283c2f64d82284c820c39a68e2aff2e7c3cd24fac618c1d3c48207b8323aa06f92524d0ab3a185 WHIRLPOOL b8938d9102fff59c5cc4f35db839492bbd1b1249d4e9c8da9eb4b2167c1e14d8906d49ba2bc9d301331e25d855b798883ee5f7aa51a5f00b272f55adae5339b3
+DIST netbeans-trunk-nightly-201508220002-src.zip 208858908 SHA256 eaeb7783c5302a6fb71c658071bf7283fe282bde2b18df8b6f07ed8cca69bc0d SHA512 c6687256e92c8447dd1d77b4dd678502d23ed7b6a799439f1a066371c672670bee25b46ba2ee2a090382ab157aae31641acc20373898f58fceac642a2a8aeebe WHIRLPOOL df6a09212c094d65f92004dd68ac857892308540c5ff9e914b683a40163ce784868c06214dd5636688c81549fd9e0e69b14df3c8ca268d1de517cb6ac4349594
 EBUILD netbeans-nb-7.0.1.ebuild 5106 SHA256 3c68751bf5face5f80e2d7dcedb7466e69343f2d06c0a4dd30a722a987fbb207 SHA512 d79343e0ca8655b074a8f96b9898e4bc0123d60e346602ba8d7a239597993cadb33a036b43862ef1a39630e4f0ba7e79892d8b2eed8b30535f12a5d0b9f4b581 WHIRLPOOL 9f2cd645e34fbcfa8f0059fbda4f355f411aaff7966121360dfe5b3c769966c5a4586bbc04142b279e3a3fa323bc4b51a6349cf3eafe89063db44fcae58ef119
 EBUILD netbeans-nb-7.1.2.ebuild 4977 SHA256 265f9e4a9490937a65632ddaef48e3a731154b07b9ee5f9536a991181fc2fcbd SHA512 65d1065993dba3b1fece428beb1b75f17d89eddb08aacd2cbf5ecd3ee5ca844e75e9100c324ecdeeed5b138b1da4ab8cd5a4598e584a17545ffc2c52ea763779 WHIRLPOOL 9b63f2b5671bd38d24ff6b280de37fc19c74170bf80c22818da5e8af415a85211c6cfcf690e68d7697c41a1b749a3c7b48ec9b362782df140856f892d381e360
 EBUILD netbeans-nb-7.2.ebuild 4960 SHA256 bef2020a6e0d722ca77c0931b9a06014cedc822f14a21d8d916200e358dcdfb8 SHA512 988d902bbef52e123b5800e56049210d69c4dd6dbeca80396aeac58c70d90b76da65b338e664368ea3f9a3973b7b94ffd0a47a77b01be53452c2cc04c4067442 WHIRLPOOL a27fa8a1a066499a3fc2cb82e955b6b18b1725889b088ea1e94528cde3ec58f3b46c1e757fa597af6ad4ba96218dacfacff9561799f46add316e233d46127d28
@@ -78,5 +79,6 @@ EBUILD netbeans-nb-9999_p20150818.ebuild 5003 SHA256 a151ebd58a596510fdc94c6e0fd
 EBUILD netbeans-nb-9999_p20150819.ebuild 5003 SHA256 d7c46dc51e1798bff454ba509c326eda4a004c1a3780ac51ded8ede1cdea9e5d SHA512 be469c7af09065ca40a73ec263b0693981aca9ce5b4ac7c7598912cfa32fb5f56f53dd3a59172ae254ab38e2ccfcfac6087bdecb2dba956adb56020f824ce96c WHIRLPOOL b8f2ed3c95188b906a83e17ffa115ed4ead9fafa76890d72b59f37a93580f3be84dc4e4c38dec16ebc5e94a34c1035b9bfa6d6b0974e4c342108670b259ad3e9
 EBUILD netbeans-nb-9999_p20150820.ebuild 5003 SHA256 d4e8163cbeb98f085919acf8b8ab7a3659e1ba4b5008653aa1a983471acfbd86 SHA512 3413afa0f149aa201a1ec0ed3c78c09749bc66f4155161e3d200453e1abc5badb9aba345bce241f1a1bab5b79db82219eea7edff0a1abe9d778d2cf14929ea01 WHIRLPOOL e2fd6f26ab1330669bc282678f339c222d3320596edfd14c33431fc7469bc0dbb5f88927bfacd5d7ceecdb031c8324da9d1145067d4a752bc97ec337ed95bd0f
 EBUILD netbeans-nb-9999_p20150821.ebuild 5003 SHA256 cbc45fbbb0f2fd4933b8f7c900d3fbc1f4f0a56c2b9d91d4d92970a406df3718 SHA512 22914f4431a29d72f29c49adf3dbf80fea39cbc1f2df329e927a30f99561b23d032ef2e69873bdc8c3aebbeefa0c7e00f0821cf6c17d1f105e5cbc466bee49be WHIRLPOOL d68658fa724858a26dc7b70382c3d6912125b885fba1cfc6768440d2ba7e039919d846dfaf31fcd6dbb0e6c5c0310a802c8287c95b238a34e4919731394d6e33
-MISC ChangeLog 168139 SHA256 2a680f69a8881cc97456e4af0075138bda27a4053d708396b8d4775eb2b366f6 SHA512 8190a54d91a38c3d29db954595d34199cb35843403f5c1a7ad5ce8bc952c276d0daa473ae339e0fae5fa359c03b2f8b53a25e5c4b1f61310e6bd0af9e1b4d13d WHIRLPOOL aaf0332c17076121d5f6311e86e3c51b5b1edc36b9a84757c9e19afef9a37cac2a87c11a9be2754cb1e08b66ede893ae3b1a068d9c9aa12ca067678fb0770a9b
+EBUILD netbeans-nb-9999_p20150822.ebuild 5003 SHA256 3d250fc895ca1ea7da9d3b02beff6748ce251cb38877be0eaa9ee6e21b8d8f32 SHA512 5579ece436dc12b772badb2b606c8145029eeb700cc9bdaf2e1b677e551fe236c23323eaa9b64d0e05d3b1c3f1f697c7b746574baa3c5c2f1622f4e6eddd2a5b WHIRLPOOL 953590da9236e7eac6af75a81f6bb67d781ae80f4b73cdf93fef284aeec827f00e98d553d814fe5774ecec177a01900cf4d5cdd878593113b9736217354291a7
+MISC ChangeLog 168305 SHA256 639022bb2ab491a6e023c6512cd9071eea317527c9ad77c9dbc48d2922daf0b4 SHA512 a36d6080b4953a2e08cde368bf336f49c2fecf1546e9f0118d3f8bfd73635467b3c8ad424083aaca781b2ab75f34ed266d01ad0337750d09469ebaa682b9867c WHIRLPOOL 881c40639ac4a6ec331834d03665bdd955208e64323701b1bfa93e8829d6c86038d22012959cebd463a9e70b3d3b47da151443147888283c11d7951c06740212
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20150822.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20150822.ebuild
new file mode 100644
index 0000000..d56f995
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20150822.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Branding"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-08-22_00-02-28/zip/netbeans-trunk-nightly-201508220002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE="keychain"
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}
+	keychain? (
+		net-misc/keychain:0
+		net-misc/x11-ssh-askpass:0
+	)"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster create-netbeans-import finish-build"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.nb -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+	use keychain && epatch "${FILESDIR}"/${SLOT}/keychain-support.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans >/dev/null || die
+
+	insinto ${INSTALL_DIR}/nb
+
+	grep -E "/nb$" moduleCluster.properties > "${D}"/${INSTALL_DIR}/nb/moduleCluster.properties || die
+
+	insinto ${INSTALL_DIR}
+	doins -r nb
+	dodoc *.txt
+	dohtml *.html *.css
+
+	insinto ${INSTALL_DIR}/bin
+	doins bin/netbeans
+	dosym ${INSTALL_DIR}/bin/netbeans /usr/bin/netbeans-${SLOT}
+	fperms 755 ${INSTALL_DIR}/bin/netbeans
+
+	insinto /etc/netbeans-${SLOT}
+	doins etc/*
+	dosym /etc/netbeans-${SLOT} ${INSTALL_DIR}/etc
+
+	# fix paths per bug# 163483
+	if [[ -e "${D}"/${INSTALL_DIR}/bin/netbeans ]]; then
+		sed -i -e "s:\"\$progdir\"/../etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans
+		sed -i -e "s:\"\${userdir}\"/etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans
+	fi
+
+	dodir /usr/share/icons/hicolor/32x32/apps
+	dosym ${INSTALL_DIR}/nb/netbeans.png /usr/share/icons/hicolor/32x32/apps/netbeans-${SLOT}.png
+	dodir /usr/share/icons/hicolor/128x128/apps
+	cp "${DISTDIR}"/netbeans-7.0.png "${D}"/usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png || die
+	dosym /usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png /usr/share/pixmaps/netbeans-${SLOT}.png
+
+	popd >/dev/null || die
+
+	make_desktop_entry netbeans-${SLOT} "Netbeans ${PV}" netbeans-${SLOT} Development
+
+	mkdir -p  "${D}"/${INSTALL_DIR}/nb/config || die
+	echo "NBGNT" > "${D}"/${INSTALL_DIR}/nb/config/productid || die
+}
+
+pkg_postinst() {
+	if use keychain ; then
+		einfo "You enabled keychain support, that means NetBeans will use keychain for managing"
+		einfo "your keys while connecting to ssh protected repositories. If you want to load some"
+		einfo "keys on NetBeans startup, create file keychain-keys.txt in your userdir"
+		einfo "(~/.netbeans/${SLOT}/keychain-keys.txt) and put names of your keys in the file,"
+		einfo "each key on single line, for example:"
+		einfo "id_dsa"
+		einfo "id_dsa_gentoo"
+		einfo "If on NetBeans startup key will not be handled by keychain yet, you will be asked"
+		einfo "for key password (only this time and never again). You can find more information"
+		einfo "about keychain at https://wiki.gentoo.org/wiki/Keychain"
+	fi
+}

diff --git a/dev-java/netbeans-php/ChangeLog b/dev-java/netbeans-php/ChangeLog
index fcd3457..1d3df03 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_p20150822 (22 Aug 2015)
+
+  22 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-php-9999_p20150822.ebuild:
+  updated to the latest sources
+
 *netbeans-php-9999_p20150821 (21 Aug 2015)
 
   21 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index cc7df52..b62da5f 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -50,6 +50,7 @@ DIST netbeans-trunk-nightly-201508180002-src.zip 208817240 SHA256 b497e33ddf1039
 DIST netbeans-trunk-nightly-201508190002-src.zip 208817531 SHA256 6594e5c2181ff7dfcf7eab3c7551571ea8e4cc6f3eb3f196a2b3b4bd7f394745 SHA512 84b4d1f1e77f1a4e2d97c14e2400381ce0d926dae2659cf38bbd4d2b7ae619d479ac1d73900f6d9cf10981b85982f7f19c00662974179e48cc4efb6e3481a82a WHIRLPOOL 7decfaa30422c8c588e8cfb65cd654119c3f80b60ffe3226074e5a1775648154a26a5ef267bd98f0a7720b107a0046b040652379bb6dd4a837d000863098ecd5
 DIST netbeans-trunk-nightly-201508200002-src.zip 208799494 SHA256 81de2b1f44baa32ffb769676ba38edab57124533bda1bb1dcda18b9be5dcb7c2 SHA512 1c68dbcff6bcfeb3566823749b57ce95c2de6a97333573897d78f5f6bc7fcfe2c06a2ff7805bfabea9dc9f60d9e5021d4c3d5aa720004d796caf3b163fb1699d WHIRLPOOL cc8344fb52507294d00071f967abdc5b77fcd37fd3989b81d0efdb7d35c0eca4349f86769f2a09915a72565e399852c40f21eaab89fb6a7c66a58960ecfefc39
 DIST netbeans-trunk-nightly-201508210002-src.zip 208800734 SHA256 c85c1f8027b3b9b03bbcc6743bb508899bc9050058c112f060d73daa544bbde6 SHA512 d8a3cbbc3f671d52bb5edcd2722c9ef847cdc160aecb4a9ee3283c2f64d82284c820c39a68e2aff2e7c3cd24fac618c1d3c48207b8323aa06f92524d0ab3a185 WHIRLPOOL b8938d9102fff59c5cc4f35db839492bbd1b1249d4e9c8da9eb4b2167c1e14d8906d49ba2bc9d301331e25d855b798883ee5f7aa51a5f00b272f55adae5339b3
+DIST netbeans-trunk-nightly-201508220002-src.zip 208858908 SHA256 eaeb7783c5302a6fb71c658071bf7283fe282bde2b18df8b6f07ed8cca69bc0d SHA512 c6687256e92c8447dd1d77b4dd678502d23ed7b6a799439f1a066371c672670bee25b46ba2ee2a090382ab157aae31641acc20373898f58fceac642a2a8aeebe WHIRLPOOL df6a09212c094d65f92004dd68ac857892308540c5ff9e914b683a40163ce784868c06214dd5636688c81549fd9e0e69b14df3c8ca268d1de517cb6ac4349594
 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
@@ -82,5 +83,6 @@ EBUILD netbeans-php-9999_p20150818.ebuild 4423 SHA256 84da8930b91399c1aa7a9b058d
 EBUILD netbeans-php-9999_p20150819.ebuild 4423 SHA256 52e8067eb3fca9a03311dc41430ca33e2f99ef333c0bfee9abcf1e8b8651f653 SHA512 a530c51e3e82a4e632183b5c517d9d98bada8026d5cd9f90b5356ef46a546e96d30082bfbca5f9e9dc22f443ad002f99affac386cabe0e4774561a788f6023a5 WHIRLPOOL 90180538fdee9613e56a82a60891ee91800130d4226b93085a0ff739472ec0003560ba4099dc5789647daf8e492db6f09bd74317333edbc21466baa3ec8bb12d
 EBUILD netbeans-php-9999_p20150820.ebuild 4423 SHA256 3ce3ac9bef4e1322d4f2a4b54e670ed0f213d0daa6f5f284b191c69b80c45f5b SHA512 dfd15d4bbfd07904720934f37dbd06fb18d2cbf41f27bc4f9ecb89cfcb02f3b9f3f43089b739d8b433763f40189adc62947b5667bdc8e0d4324c7fd927d6bf62 WHIRLPOOL 8934a8de813d8c09702a002e5a755a37aa3eda79ebd3b40cce80b9a81f0fd49fdc19aa58973907f96a8d11a4d29846889f64d315a341868107c90fa10399ac0a
 EBUILD netbeans-php-9999_p20150821.ebuild 4423 SHA256 436a2ddcba985e47e3ba10f9d5db9626b25a4407870512c88a8632457b5212a7 SHA512 aac95fd96a69d6eb45ed9e8a5277e89df32d8e88934eea976d5262ab5a90125b517ddcac215555b776ef61045b9488778907b4d03eb0a5b01684f89b78342fb9 WHIRLPOOL a71b6124806db74d6e85ac779821fda58aff857f1cfa73cfc00382de946555693d62d5148f3307b36926d3a75f35f916b414b2788d470eea81fc461b84cfbe4c
-MISC ChangeLog 168019 SHA256 ecbaa1786a401a346894ca025b3227a3b1de451b156381ef094b72de03a451b6 SHA512 6280b5f22fec2878b5888f0f5605fd55714858fddf79ebbe204fb7fa84b220d0aff61eb1dd82f377f1357ae01960af9d4d9c78272d4c109b56d3a9444d6f69e6 WHIRLPOOL 99a1b3b7ffc7aa564dbfbdbae3e8243005547819724fe1c82e02fa69545540530d7d907e97de65c63dc0e5205b3450a9b448bf513950e4254d660968fa84922f
+EBUILD netbeans-php-9999_p20150822.ebuild 4423 SHA256 e33d84430798dca6489544f7a33659851ff46d774f53b9f9e4230076e53a94df SHA512 84efc01c1b1d9df5aaf42f80a28f4d883a9868d2f0448c6d21ad596cdd00b2814497d9148e33b02b65e22d5a17df2b8e3079966a3530976afe14ef2707e2e9f5 WHIRLPOOL 527bf688a1853aaed92a6cfcd2175d5ace7d9888d067918851c9e4731f9dcdf7caa72366e954b5db4c083a02bb72f52a523c817e9898910752f8b18c3d6563a3
+MISC ChangeLog 168187 SHA256 bfa01ad2b998b29dfdb9b94a304c39765ae38470cdee09e82194d6d8fb7a3d67 SHA512 cef860c08cbaab169cbfcbbe904ff8428518388514ecb0e99203ced26e809c913e01c4ee6162ec6245021a977aef0d1d18bb7ff1a55b9d2732d89a29e80fc435 WHIRLPOOL f80bb586bfe796e97bb27ceafb0a99ebc6d73fd4fa005ce81a9b5deaaddf5382f5fb149ff123283c2e95645aa814820de64b4ac60464a4b40f923c3ce59ce9c2
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-platform/ChangeLog b/dev-java/netbeans-platform/ChangeLog
index b8d1319..5bc0892 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_p20150822 (22 Aug 2015)
+
+  22 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-platform-9999_p20150822.ebuild:
+  updated to the latest sources
+
 *netbeans-platform-9999_p20150821 (21 Aug 2015)
 
   21 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index cb825e8..49ee555 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -64,6 +64,7 @@ DIST netbeans-trunk-nightly-201508180002-src.zip 208817240 SHA256 b497e33ddf1039
 DIST netbeans-trunk-nightly-201508190002-src.zip 208817531 SHA256 6594e5c2181ff7dfcf7eab3c7551571ea8e4cc6f3eb3f196a2b3b4bd7f394745 SHA512 84b4d1f1e77f1a4e2d97c14e2400381ce0d926dae2659cf38bbd4d2b7ae619d479ac1d73900f6d9cf10981b85982f7f19c00662974179e48cc4efb6e3481a82a WHIRLPOOL 7decfaa30422c8c588e8cfb65cd654119c3f80b60ffe3226074e5a1775648154a26a5ef267bd98f0a7720b107a0046b040652379bb6dd4a837d000863098ecd5
 DIST netbeans-trunk-nightly-201508200002-src.zip 208799494 SHA256 81de2b1f44baa32ffb769676ba38edab57124533bda1bb1dcda18b9be5dcb7c2 SHA512 1c68dbcff6bcfeb3566823749b57ce95c2de6a97333573897d78f5f6bc7fcfe2c06a2ff7805bfabea9dc9f60d9e5021d4c3d5aa720004d796caf3b163fb1699d WHIRLPOOL cc8344fb52507294d00071f967abdc5b77fcd37fd3989b81d0efdb7d35c0eca4349f86769f2a09915a72565e399852c40f21eaab89fb6a7c66a58960ecfefc39
 DIST netbeans-trunk-nightly-201508210002-src.zip 208800734 SHA256 c85c1f8027b3b9b03bbcc6743bb508899bc9050058c112f060d73daa544bbde6 SHA512 d8a3cbbc3f671d52bb5edcd2722c9ef847cdc160aecb4a9ee3283c2f64d82284c820c39a68e2aff2e7c3cd24fac618c1d3c48207b8323aa06f92524d0ab3a185 WHIRLPOOL b8938d9102fff59c5cc4f35db839492bbd1b1249d4e9c8da9eb4b2167c1e14d8906d49ba2bc9d301331e25d855b798883ee5f7aa51a5f00b272f55adae5339b3
+DIST netbeans-trunk-nightly-201508220002-src.zip 208858908 SHA256 eaeb7783c5302a6fb71c658071bf7283fe282bde2b18df8b6f07ed8cca69bc0d SHA512 c6687256e92c8447dd1d77b4dd678502d23ed7b6a799439f1a066371c672670bee25b46ba2ee2a090382ab157aae31641acc20373898f58fceac642a2a8aeebe WHIRLPOOL df6a09212c094d65f92004dd68ac857892308540c5ff9e914b683a40163ce784868c06214dd5636688c81549fd9e0e69b14df3c8ca268d1de517cb6ac4349594
 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
@@ -96,5 +97,6 @@ EBUILD netbeans-platform-9999_p20150818.ebuild 9244 SHA256 3a05649d1433c508bda2a
 EBUILD netbeans-platform-9999_p20150819.ebuild 9244 SHA256 28263f1227759ccd3e24248eef7dcac200b27c41f2b27faef5c82a7b7c4f8292 SHA512 4f4cef7d07388b105e69a37cf0fcdcb1419aa07bc5800ebd8863aa1d29970924f14095a16527e49e5178f314d1fe4e6b2ebb99f577e37cde85a6f6c27a141a94 WHIRLPOOL c51df0f973bfce786c1ea4128055517685d7ec6ae2560471760a388b7a36f298230dda142b53cc2654759e7dffcc67325e7ab6def1b5f181981acd63fd3bc4fe
 EBUILD netbeans-platform-9999_p20150820.ebuild 9244 SHA256 cfaf37a8c2ad54ef1bc0732581d786a718c47dfce1e4e8dcce3cf7c64385130a SHA512 44db520e46dc71e2b74331f978e0acd431a4c958f9ff51226583e3a4e63020de9be61dc971c78c3d1d8257a39948994473ff95387e2f2e831e5e5c407df07e43 WHIRLPOOL e54d0b3eaff2ef280bb3f22fcfe2490d994d54edacf7640b2ecdf5724fbdabf9658c5da02abc47abb42560076d3f8fdb3c38e32e212c1ddf83f85d44e5facec4
 EBUILD netbeans-platform-9999_p20150821.ebuild 9244 SHA256 54217ef905cb92b5caf4d6f45b67b2deede95c801c9d66042e739fac31dd1a25 SHA512 a48765166b70a7586441a94cb487e02e3879245a0e6cec078ccdd098c1da2b97dce924ec48e1bea29c4d296640921d4dcce45e9855f013ff16ea58004af5d912 WHIRLPOOL 007a6bf5a9bb4d977ce9aa95e3ef2acb94a06b283385e3a0447d636b0fc1225ff911c6b5895aeb6ae49c2f65ef6335b4bd2059d1c7ccb631835ec5eb41bde4b5
-MISC ChangeLog 180769 SHA256 e891f6ad3667d241df33c6425878fe10f06c2929ea72f832aa4bb796f558ee1b SHA512 0214e47b4900a7081f91d5cdc1803d51b92ecd02803dc5d0ea750e6cff0e7fa16da4ec338e6feda4f7d770abe15014924caea2d520243820867a59eff5925c8e WHIRLPOOL 3823a7d9385ae1c02d4867e9024acff081d9e067ebe0464c2378303e8f1b983d19f8d2f9d552332166d163e9077bd2f849085e9842ee96d360aeaf3e7bc106ee
+EBUILD netbeans-platform-9999_p20150822.ebuild 9244 SHA256 714863285bdfa7b14ce847fd083bede9a0dff329d88edd0bbfeb13bba06bb36e SHA512 f8dd52d52b636fb2b59ca2295e73eb9c99c26a8bc658f9788855f89b6219fd9854d09b5338ac3e13f9673ac9d48b887ec38f9c4d55a0ac0f10dae70768a4df9b WHIRLPOOL 67b63caeff204e88f65aaff88722f7dfa47b087f8645f6fd75fc3666783cc5a7b2e0a9ef2010922bf3c779c0f4ce9871abe1b145bc4b4e49e14d2327c3b27092
+MISC ChangeLog 180947 SHA256 b1b17410948957f529115e7043472bf4b87f03abad8ba65dd3029a90464d2d01 SHA512 408d043cebdd61272bff1ff7d3ba767a3993ef3c65722e9d868cc2de200df1fb66da3c5d2666c96989d5a6ec57414a385d17d20d725e0e1af8eda85ad0566a0c WHIRLPOOL 4cc86cc8df8afcfa322e0367217f1ad2c64448e881066fc0269ad3f7d8b76d1be1f74e408da66a3d9fa493e241cf85ebf2df6d53a2c25a4a7a11b91e03156f56
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20150822.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20150822.ebuild
new file mode 100644
index 0000000..cdac695
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20150822.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Platform"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-08-22_00-02-28/zip/netbeans-trunk-nightly-201508220002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar
+	http://hg.netbeans.org/binaries/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar
+	http://hg.netbeans.org/binaries/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar
+	http://hg.netbeans.org/binaries/B250509C67194E89C3A27F96933DB7EB0E027E56-ko4j.jar
+	http://hg.netbeans.org/binaries/E556F74DF0942B304F94D9F82CAA8102FED6356E-net-java-html.jar
+	http://hg.netbeans.org/binaries/C74AC1ED160379872826FDC4A3C0CA924A3A0A83-net-java-html-boot.jar
+	http://hg.netbeans.org/binaries/03FE10857B0689B1F98B8D96DE87E80DF5D87A69-net-java-html-boot-fx.jar
+	http://hg.netbeans.org/binaries/31C9329E78A222E38CB86716ACFCEF81EF0BA1FD-net-java-html-boot-script.jar
+	http://hg.netbeans.org/binaries/24ED356FF3C72665CB5FB972B428824FABBC1987-net-java-html-geo.jar
+	http://hg.netbeans.org/binaries/432EDFB05C0F44E6ADAC4B1F3E08C67D1F52FB4B-net-java-html-json.jar
+	http://hg.netbeans.org/binaries/A7B6C3470DB8821A3587CE04844FF504A7C62354-net-java-html-sound.jar
+	http://hg.netbeans.org/binaries/B27F1304F18FEDE876F940AEFA6C9EB5632619D7-org.eclipse.osgi_3.9.1.v20140110-1610.jar
+	http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip
+	http://hg.netbeans.org/binaries/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="dev-java/hamcrest-core:1.3
+	dev-java/javahelp:0
+	>=dev-java/jna-3.4:0
+	dev-java/junit:4[source]
+	>=dev-java/osgi-core-api-5:0
+	dev-java/osgi-compendium:0
+	dev-java/swing-layout:1[source]
+	dev-java/testng:0"
+# oracle-jdk-bin is needed because other jdks do not contain file jre/lib/ext/jfxrt.jar
+# the error:
+#  [parseprojectxml] Distilling /var/tmp/portage/dev-java/netbeans-platform-9999_p20140922/work/nbbuild/build/public-package-jars/org-netbeans-libs-javafx.jar from [/var/tmp/portage/dev-java/netbeans-platform-9999_p20140922/work/nbbuild/netbeans/platform/modules/org-netbeans-libs-javafx.jar, /opt/icedtea-bin-7.2.4.7/jre/lib/ext/jfxrt.jar]
+#  [parseprojectxml] Classpath entry /opt/icedtea-bin-7.2.4.7/jre/lib/ext/jfxrt.jar does not exist; skipping
+#  [nbmerge] Failed to build target: all-api.html4j
+
+DEPEND="dev-java/oracle-jdk-bin:1.7
+	app-arch/unzip
+	${CDEPEND}"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.platform -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.7"
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar libs.asm/external/asm-all-5.0.1.jar || die
+	ln -s "${DISTDIR}"/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar libs.felix/external/felix-4.2.1.jar || die
+	ln -s "${DISTDIR}"/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar junitlib/external/junit-4.12-javadoc.jar || die
+	ln -s "${DISTDIR}"/B250509C67194E89C3A27F96933DB7EB0E027E56-ko4j.jar o.n.html.ko4j/external/ko4j.jar || die
+	ln -s "${DISTDIR}"/E556F74DF0942B304F94D9F82CAA8102FED6356E-net-java-html.jar net.java.html/external/net-java-html.jar || die
+	ln -s "${DISTDIR}"/C74AC1ED160379872826FDC4A3C0CA924A3A0A83-net-java-html-boot.jar net.java.html.boot/external/net-java-html-boot.jar || die
+	ln -s "${DISTDIR}"/03FE10857B0689B1F98B8D96DE87E80DF5D87A69-net-java-html-boot-fx.jar net.java.html.boot.fx/external/net-java-html-boot-fx.jar || die
+	ln -s "${DISTDIR}"/31C9329E78A222E38CB86716ACFCEF81EF0BA1FD-net-java-html-boot-script.jar net.java.html.boot.script/external/net-java-html-boot-script.jar || die
+	ln -s "${DISTDIR}"/24ED356FF3C72665CB5FB972B428824FABBC1987-net-java-html-geo.jar net.java.html.geo/external/net-java-html-geo.jar || die
+	ln -s "${DISTDIR}"/432EDFB05C0F44E6ADAC4B1F3E08C67D1F52FB4B-net-java-html-json.jar net.java.html.json/external/net-java-html-json.jar || die
+	ln -s "${DISTDIR}"/A7B6C3470DB8821A3587CE04844FF504A7C62354-net-java-html-sound.jar net.java.html.sound/external/net-java-html-sound.jar || die
+	ln -s "${DISTDIR}"/B27F1304F18FEDE876F940AEFA6C9EB5632619D7-org.eclipse.osgi_3.9.1.v20140110-1610.jar netbinox/external/org.eclipse.osgi_3.9.1.v20140110-1610.jar || die
+	ln -s "${DISTDIR}"/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip o.jdesktop.layout/external/swing-layout-1.0.4-doc.zip || die
+	ln -s "${DISTDIR}"/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip libs.testng/external/testng-6.8.1-javadoc.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	# upstream jna jar contains bundled binary libraries so we disable that feature
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --into libs.junit4/external hamcrest-core-1.3 hamcrest-core.jar hamcrest-core-1.3.jar
+	java-pkg_jar-from --into libs.jna.platform/external jna platform.jar jna-platform-4.1.0.jar
+	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.jna/external jna jna.jar jna-4.1.0.jar
+	java-pkg_jar-from --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+	ln -s /usr/share/junit-4/sources/junit-src.zip junitlib/external/junit-4.12-sources.jar || die
+	java-pkg_jar-from --into libs.osgi/external osgi-core-api osgi-core-api.jar osgi.core-5.0.0.jar
+	java-pkg_jar-from --into libs.osgi/external osgi-compendium osgi-compendium.jar osgi.cmpn-4.2.jar
+	java-pkg_jar-from --into o.jdesktop.layout/external swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
+	ln -s /usr/share/swing-layout-1/sources/swing-layout-src.zip o.jdesktop.layout/external/swing-layout-1.0.4-src.zip || die
+	java-pkg_jar-from --into libs.testng/external testng testng.jar testng-6.8.1-dist.jar
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	unset DISPLAY
+	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+	pushd nbbuild/netbeans/platform >/dev/null || die
+
+	java-pkg_dojar lib/*.jar
+	grep -E "/platform$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	insinto ${INSTALL_DIR}
+	doins -r *
+	rm "${D}"/${INSTALL_DIR}/docs/junit-4.12-sources.jar || die
+	dosym /usr/share/junit-4/sources/junit-src.zip ${INSTALL_DIR}/docs/junit-4.12-sources.jar
+	rm "${D}"/${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip || die
+	dosym /usr/share/swing-layout-1/sources/swing-layout-src.zip ${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip
+	find "${D}"/${INSTALL_DIR} -name "*.exe" -delete
+	find "${D}"/${INSTALL_DIR} -name "*.dll" -delete
+	rm -fr "${D}"/modules/lib || die
+
+	popd >/dev/null || die
+
+	fperms 775 ${INSTALL_DIR}/lib/nbexec
+	dosym ${INSTALL_DIR}/lib/nbexec /usr/bin/nbexec-${SLOT}
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm hamcrest-core-1.3.jar && dosym /usr/share/hamcrest-core-1.3/lib/hamcrest-core.jar ${instdir}/hamcrest-core-1.3.jar || die
+	rm jhall-2.0_05.jar && dosym /usr/share/javahelp/lib/jhall.jar ${instdir}/jhall-2.0_05.jar || die
+	rm jna-4.1.0.jar && dosym /usr/share/jna/lib/jna.jar ${instdir}/jna-4.1.0.jar || die
+	rm jna-platform-4.1.0.jar && dosym /usr/share/jna/lib/platform.jar ${instdir}/jna-platform-4.1.0.jar || die
+	rm junit-4.12.jar && dosym /usr/share/junit-4/lib/junit.jar ${instdir}/junit-4.12.jar || die
+	rm osgi.cmpn-4.2.jar && dosym /usr/share/osgi-compendium/lib/osgi-compendium.jar ${instdir}/osgi.cmpn-4.2.jar || die
+	rm osgi.core-5.0.0.jar && dosym /usr/share/osgi-core-api/lib/osgi-core-api.jar ${instdir}/osgi.core-5.0.0.jar || die
+	rm swing-layout-1.0.4.jar && dosym /usr/share/swing-layout-1/lib/swing-layout.jar ${instdir}/swing-layout-1.0.4.jar || die
+	rm testng-6.8.1-dist.jar && dosym /usr/share/testng/lib/testng.jar ${instdir}/testng-6.8.1-dist.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/platform
+}

diff --git a/dev-java/netbeans-profiler/ChangeLog b/dev-java/netbeans-profiler/ChangeLog
index 3b94702..882b6d3 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_p20150822 (22 Aug 2015)
+
+  22 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-profiler-9999_p20150822.ebuild:
+  updated to the latest sources
+
 *netbeans-profiler-9999_p20150821 (21 Aug 2015)
 
   21 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 145fc59..5ee2fa7 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201508180002-src.zip 208817240 SHA256 b497e33ddf1039
 DIST netbeans-trunk-nightly-201508190002-src.zip 208817531 SHA256 6594e5c2181ff7dfcf7eab3c7551571ea8e4cc6f3eb3f196a2b3b4bd7f394745 SHA512 84b4d1f1e77f1a4e2d97c14e2400381ce0d926dae2659cf38bbd4d2b7ae619d479ac1d73900f6d9cf10981b85982f7f19c00662974179e48cc4efb6e3481a82a WHIRLPOOL 7decfaa30422c8c588e8cfb65cd654119c3f80b60ffe3226074e5a1775648154a26a5ef267bd98f0a7720b107a0046b040652379bb6dd4a837d000863098ecd5
 DIST netbeans-trunk-nightly-201508200002-src.zip 208799494 SHA256 81de2b1f44baa32ffb769676ba38edab57124533bda1bb1dcda18b9be5dcb7c2 SHA512 1c68dbcff6bcfeb3566823749b57ce95c2de6a97333573897d78f5f6bc7fcfe2c06a2ff7805bfabea9dc9f60d9e5021d4c3d5aa720004d796caf3b163fb1699d WHIRLPOOL cc8344fb52507294d00071f967abdc5b77fcd37fd3989b81d0efdb7d35c0eca4349f86769f2a09915a72565e399852c40f21eaab89fb6a7c66a58960ecfefc39
 DIST netbeans-trunk-nightly-201508210002-src.zip 208800734 SHA256 c85c1f8027b3b9b03bbcc6743bb508899bc9050058c112f060d73daa544bbde6 SHA512 d8a3cbbc3f671d52bb5edcd2722c9ef847cdc160aecb4a9ee3283c2f64d82284c820c39a68e2aff2e7c3cd24fac618c1d3c48207b8323aa06f92524d0ab3a185 WHIRLPOOL b8938d9102fff59c5cc4f35db839492bbd1b1249d4e9c8da9eb4b2167c1e14d8906d49ba2bc9d301331e25d855b798883ee5f7aa51a5f00b272f55adae5339b3
+DIST netbeans-trunk-nightly-201508220002-src.zip 208858908 SHA256 eaeb7783c5302a6fb71c658071bf7283fe282bde2b18df8b6f07ed8cca69bc0d SHA512 c6687256e92c8447dd1d77b4dd678502d23ed7b6a799439f1a066371c672670bee25b46ba2ee2a090382ab157aae31641acc20373898f58fceac642a2a8aeebe WHIRLPOOL df6a09212c094d65f92004dd68ac857892308540c5ff9e914b683a40163ce784868c06214dd5636688c81549fd9e0e69b14df3c8ca268d1de517cb6ac4349594
 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_p20150818.ebuild 3478 SHA256 7153012633b003c728c4f
 EBUILD netbeans-profiler-9999_p20150819.ebuild 3478 SHA256 cdd511e2d0643bf5ac0896eb62e68f50d44914ee936a70343c783b47ccbb59a9 SHA512 b4baa7add5c68b1f171ef29f4a72080e1c368edcbed66385951be3a9e919299b4bbc819ca49da295da6b8b2679fad46d609edbbe7d7240cb9546e4644a45bf60 WHIRLPOOL 86a7f8a5df0109eb71c64cea1af3b2f74c35633122f1ce966969f18e24229a9235e985bdc43b3ab1bf4bf714d45eb427d7573cd640ebab981339e0a2e15744b7
 EBUILD netbeans-profiler-9999_p20150820.ebuild 3478 SHA256 e0b8cbbf5c3fef55e436fad97b5d268ce8647ea27b6b91f9938ee4391cdbca5b SHA512 57a8053a3732104cdbb09df25c336b7f5688f32ccc93fff821d9e0d7cb3d2ce753a0f0ed59d1dca9381da4904702e9f398a26f2daaf6b524b023f22f046bf84e WHIRLPOOL 0bc46a134feb074facf7807088f449d45052dfc5b70a1079dfaab91ae2fbc0783a8009eaf85ab931365e4d320fdb5e92cd0c8ef18a345591f887e64172900b33
 EBUILD netbeans-profiler-9999_p20150821.ebuild 3478 SHA256 2da6c8646e8c14e52240cbdc6b493143279caaa791d1b3bea70bba0341059516 SHA512 18029ede662853845f80b0e3f198b5686a267927724d1363572d9058e29efd025b36a537ecc9f2995e843c45c6d9d3f002b5227fc05d47f4d3cd42d2b884ad91 WHIRLPOOL 1052edd4d7d80a63cb311a6b37154fa3d269bb333dbeea4b98a795b0c37144fd45a446b0df88791b89ecbf6dcbebdf1f565b166a40a030799d243b75bf1c4963
-MISC ChangeLog 180230 SHA256 da4dc437660a6eb8bc4fc6a1657ee837c7b502645c56c943bac0cb03d0815236 SHA512 6a6cb0cc9746fce428a82cbaa9d084ff98ca26606d1ed8d141382e6161840897c35da987fa85132b24588519284af1635c5015718e51b384b2f478c70961ad45 WHIRLPOOL 3865fddabc77cf7864d06beb8dc928a374974834a083fa0387f1df8c5308b457357f671db35c06d0248c6208aae9c797ff5ae97f41f70a6cb58d3ef123d55ff4
+EBUILD netbeans-profiler-9999_p20150822.ebuild 3478 SHA256 3bddec1b7152efb184b1b9c8b4707f0b864d6c439dbd3b15e1a3d8345637b7e7 SHA512 129778e6a9afd717a96e187e863a2457ed9473c06bbb921657aaa851f20e054925c4e90b15f0c55c6330b6d629aa6b436d642bac7ca761d04be956ff422741f0 WHIRLPOOL 8d5bfbeada4acbebbfbe479420d613ec0d3094f91e807c2e99ccd63bdb474ab2bc384d598173038474906edcdf918342899a1b612658cb47b9f6436af72ed801
+MISC ChangeLog 180408 SHA256 3c771d759d6d9dfb92e56bccb1b902a1a77b7621549460c363b3921aca7bb7c5 SHA512 66468d3c1311043f531f8c1d1e305bd994fab6c96d1091a682d48ba6b77625e434b0d13c907ce4b2459fa3a0002d92cd2cbcde6464f7eee1cc637636253a38a1 WHIRLPOOL 9c356e975df2e6c9e0a6d8da9674c8b6d22c75c7477416693112d462a8f7b5a48c24712168a2dd76c00fc1a835c8f282cd6046d763d435d28b8f30b71f5c500a
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150822.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150822.ebuild
new file mode 100644
index 0000000..4c766f8
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150822.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Profiler Cluster"
+HOMEPAGE="http://netbeans.org/projects/profiler"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-08-22_00-02-28/zip/netbeans-trunk-nightly-201508220002-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 c18fe3d..c8cba0d 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_p20150822 (22 Aug 2015)
+
+  22 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-webcommon-9999_p20150822.ebuild:
+  updated to the latest sources
+
 *netbeans-webcommon-9999_p20150821 (21 Aug 2015)
 
   21 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index 140a693..949800a 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -44,6 +44,7 @@ DIST netbeans-trunk-nightly-201508180002-src.zip 208817240 SHA256 b497e33ddf1039
 DIST netbeans-trunk-nightly-201508190002-src.zip 208817531 SHA256 6594e5c2181ff7dfcf7eab3c7551571ea8e4cc6f3eb3f196a2b3b4bd7f394745 SHA512 84b4d1f1e77f1a4e2d97c14e2400381ce0d926dae2659cf38bbd4d2b7ae619d479ac1d73900f6d9cf10981b85982f7f19c00662974179e48cc4efb6e3481a82a WHIRLPOOL 7decfaa30422c8c588e8cfb65cd654119c3f80b60ffe3226074e5a1775648154a26a5ef267bd98f0a7720b107a0046b040652379bb6dd4a837d000863098ecd5
 DIST netbeans-trunk-nightly-201508200002-src.zip 208799494 SHA256 81de2b1f44baa32ffb769676ba38edab57124533bda1bb1dcda18b9be5dcb7c2 SHA512 1c68dbcff6bcfeb3566823749b57ce95c2de6a97333573897d78f5f6bc7fcfe2c06a2ff7805bfabea9dc9f60d9e5021d4c3d5aa720004d796caf3b163fb1699d WHIRLPOOL cc8344fb52507294d00071f967abdc5b77fcd37fd3989b81d0efdb7d35c0eca4349f86769f2a09915a72565e399852c40f21eaab89fb6a7c66a58960ecfefc39
 DIST netbeans-trunk-nightly-201508210002-src.zip 208800734 SHA256 c85c1f8027b3b9b03bbcc6743bb508899bc9050058c112f060d73daa544bbde6 SHA512 d8a3cbbc3f671d52bb5edcd2722c9ef847cdc160aecb4a9ee3283c2f64d82284c820c39a68e2aff2e7c3cd24fac618c1d3c48207b8323aa06f92524d0ab3a185 WHIRLPOOL b8938d9102fff59c5cc4f35db839492bbd1b1249d4e9c8da9eb4b2167c1e14d8906d49ba2bc9d301331e25d855b798883ee5f7aa51a5f00b272f55adae5339b3
+DIST netbeans-trunk-nightly-201508220002-src.zip 208858908 SHA256 eaeb7783c5302a6fb71c658071bf7283fe282bde2b18df8b6f07ed8cca69bc0d SHA512 c6687256e92c8447dd1d77b4dd678502d23ed7b6a799439f1a066371c672670bee25b46ba2ee2a090382ab157aae31641acc20373898f58fceac642a2a8aeebe WHIRLPOOL df6a09212c094d65f92004dd68ac857892308540c5ff9e914b683a40163ce784868c06214dd5636688c81549fd9e0e69b14df3c8ca268d1de517cb6ac4349594
 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_p20150818.ebuild 4997 SHA256 5e12e250acbef9e0ba5c
 EBUILD netbeans-webcommon-9999_p20150819.ebuild 4997 SHA256 c90351603f296e13d269e8bf8edea7cdb2781af8e5c4aac643d7a25cd712a943 SHA512 f9e1b4b71fe8acffa365c56935850f20240ad3dcb584d9ff1f5d5bdf160457b38e89fb3281551b9ca75730d40b5c1d97a537a4ed1cee136177502103d77ae82c WHIRLPOOL 439550139102bd21f26b9375c696c8123d437cdfcce626a19c8dcb9cb7727cab602c61b7cd29a50788f3d3b41532059354f384c11a277611ae1a367b13f11469
 EBUILD netbeans-webcommon-9999_p20150820.ebuild 4997 SHA256 a8dbbc0f72440d6e5ac5a8f465d40be24712ea7219774bbea11f4710939fc53c SHA512 3b8350b4b1df36f5be41638f5416ccba4ebb30a7870d6661367d3f864df927d098a25d3cd8d80accc3d6ff9de4eba6a24d38802d972e9e4aef5b67407a135b7f WHIRLPOOL 58302fca9c79a582367e7dff3a7497059a650ec41f8316eda8e8492492db93cb4b181abb321b2970b5673823043156ba42464be3686a6314e61ab448698c9bc2
 EBUILD netbeans-webcommon-9999_p20150821.ebuild 4997 SHA256 7112250c3e6b930f7e3a0adb98c844c20ae3b8b41277932a26cdcb3d058534bf SHA512 c8c39f609d986bfa881352ab5f543974040c051e7f01f1be9e8b1aa036b5695b247076b3ca8a56fe6245993aba0204e8957f3e18042711790bca89019378151f WHIRLPOOL 56e42deeb76dcd7510687e37ffefc4a15bfb9199b8de2483d4b323600927dc9373bf5d05f3f1f015d078acbbb894674e07abf7c701b77672e51167689398fe6c
-MISC ChangeLog 153465 SHA256 2e97ab36b6f6fd557e8ac86cc4d0e01ad734adc6d687989074dad43a7ebefd31 SHA512 ba5495c9d4568f72d379d39f37b02efd2e20de834379ff53119c37cf7fde26068f21bd1e4ff6cc45772dbce5aad32a89b36edc295ab1c04e3c129e5c0ccedfbc WHIRLPOOL a20cb908027bf3eb6d3520e63c7a9a5ef4072b884cb4f60ed54ab57b7691e2c53d490b8c09e5aa133d713771ac179f6543b5d17819f719a0cf5f4edfce33d9f1
+EBUILD netbeans-webcommon-9999_p20150822.ebuild 4997 SHA256 724a17c263667272e36db8a75f8d6477460877d49b60718b3e6b3b40f129b3e8 SHA512 a55b5da808160e79302f6151e4d91acd07fa4586c71c3ae47320ab532da209b70f3f55823f4937b170bc94ea072e2a793ca42094ecadf9906cd20d6abbb6b749 WHIRLPOOL 8df550da756356235d4c9546dd5888b592c024f6eb9c8139546ac9ba5cfe3c7855ea63c3d59e9cfec5604b681b233d56a45bf930b1a1bab53c4f3a58dc4e19ec
+MISC ChangeLog 153645 SHA256 a890f44b4c128cb0a1a6dd06bf7e5f4535a5d15cd8b1e6cf291285a482c261d4 SHA512 71e3688e5b1f6ac21028f29a475ae7adb23ba86ff42b9a6b004b24b01f327677fd4a1d85bc3e529363abba4af81969774514f55cb08b2e51e011edbea3c29c1e WHIRLPOOL 448778f45ed0802ad23958a664197e676f720d3fbcf4f3fd966be42909f07a19ecc01dbe998edaf9bcc73fc6978e00b719be6a8c2836eb0dbe74d22dcaa78146
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150822.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150822.ebuild
new file mode 100644
index 0000000..0b58bac
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150822.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-08-22_00-02-28/zip/netbeans-trunk-nightly-201508220002-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 bedd3eb..99e2bc3 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_p20150822 (22 Aug 2015)
+
+  22 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-websvccommon-9999_p20150822.ebuild:
+  updated to the latest sources
+
 *netbeans-websvccommon-9999_p20150821 (21 Aug 2015)
 
   21 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 05644fb..395927e 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201508180002-src.zip 208817240 SHA256 b497e33ddf1039
 DIST netbeans-trunk-nightly-201508190002-src.zip 208817531 SHA256 6594e5c2181ff7dfcf7eab3c7551571ea8e4cc6f3eb3f196a2b3b4bd7f394745 SHA512 84b4d1f1e77f1a4e2d97c14e2400381ce0d926dae2659cf38bbd4d2b7ae619d479ac1d73900f6d9cf10981b85982f7f19c00662974179e48cc4efb6e3481a82a WHIRLPOOL 7decfaa30422c8c588e8cfb65cd654119c3f80b60ffe3226074e5a1775648154a26a5ef267bd98f0a7720b107a0046b040652379bb6dd4a837d000863098ecd5
 DIST netbeans-trunk-nightly-201508200002-src.zip 208799494 SHA256 81de2b1f44baa32ffb769676ba38edab57124533bda1bb1dcda18b9be5dcb7c2 SHA512 1c68dbcff6bcfeb3566823749b57ce95c2de6a97333573897d78f5f6bc7fcfe2c06a2ff7805bfabea9dc9f60d9e5021d4c3d5aa720004d796caf3b163fb1699d WHIRLPOOL cc8344fb52507294d00071f967abdc5b77fcd37fd3989b81d0efdb7d35c0eca4349f86769f2a09915a72565e399852c40f21eaab89fb6a7c66a58960ecfefc39
 DIST netbeans-trunk-nightly-201508210002-src.zip 208800734 SHA256 c85c1f8027b3b9b03bbcc6743bb508899bc9050058c112f060d73daa544bbde6 SHA512 d8a3cbbc3f671d52bb5edcd2722c9ef847cdc160aecb4a9ee3283c2f64d82284c820c39a68e2aff2e7c3cd24fac618c1d3c48207b8323aa06f92524d0ab3a185 WHIRLPOOL b8938d9102fff59c5cc4f35db839492bbd1b1249d4e9c8da9eb4b2167c1e14d8906d49ba2bc9d301331e25d855b798883ee5f7aa51a5f00b272f55adae5339b3
+DIST netbeans-trunk-nightly-201508220002-src.zip 208858908 SHA256 eaeb7783c5302a6fb71c658071bf7283fe282bde2b18df8b6f07ed8cca69bc0d SHA512 c6687256e92c8447dd1d77b4dd678502d23ed7b6a799439f1a066371c672670bee25b46ba2ee2a090382ab157aae31641acc20373898f58fceac642a2a8aeebe WHIRLPOOL df6a09212c094d65f92004dd68ac857892308540c5ff9e914b683a40163ce784868c06214dd5636688c81549fd9e0e69b14df3c8ca268d1de517cb6ac4349594
 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_p20150818.ebuild 2727 SHA256 fda2112012261ccf8
 EBUILD netbeans-websvccommon-9999_p20150819.ebuild 2727 SHA256 0d693bc256f42d967e4bf883a333a18ee85e4d329c234292cf4cebb803fa7209 SHA512 d3a34eaae19d4c4eea58d9c4db739f0a06d25825731090806cf16b766a960e292e45d275868470bec65c1cafb4c727c924c6401e1ce2745e6fff807dc668bfa9 WHIRLPOOL e285179527918447dc87ab12289ecbf7ff805f6b79a24d0aa00467528ce923d05a4e687ffe5e26ecbc8dc728fa10c494760c42297d16123190e251bd86dd5d79
 EBUILD netbeans-websvccommon-9999_p20150820.ebuild 2727 SHA256 9b7a9ef3401abdf00869fa783550893fc71353af12a9f3e7d0f20c7ad3771aeb SHA512 e4897cb04ef924dfc583814dd951e18c476a205030ff651eceab26ceae30c4f89732534798b228fba4cc8196af69af0872a1ae6953d1380afa9a43491eddb993 WHIRLPOOL 340212144f82771463b93ab1fb74e4876484294f9956507019ff0a4c07ebd1e40dcf7f3206bc03809c69dc5c32e0adcace3439b625956c1dd349424bf1929256
 EBUILD netbeans-websvccommon-9999_p20150821.ebuild 2727 SHA256 ae0fee947feae887de4174851d9140e01ff61a0a610bff474f48d5ebc7c570ea SHA512 61de914f268a9d8b328e7b66ec3100aad46452bbe9296a60ae35d65293476f179e14f477e50b6a271cba5ceeba1efa838dd5fabb1ce302e6e79273f90a1f3e85 WHIRLPOOL 05aca1c24aedc6f1ec2d650c596fdabbd26e2377bd16aa8ef657cb9aa7d47ad6209b184911e84aaab26883f2bd83e2f6948ddf6c594585c14ab7e6045ca8b029
-MISC ChangeLog 189088 SHA256 3499bf5dd51bea949665c25bfeb802c20b16273606f7b1bfafbbe7f1f3ec64d9 SHA512 60905e94445b3fc97240d96366daae84220108153c5fb1a1f025794bb50cbfe38ac988f6f75b4842df9ba4688cd770582cce62e25c3dc9d9a88dc8e3460dc64b WHIRLPOOL 983634f98b560e3a402c8d5909b1cc194d84e23409425c46e98ce2cf377ea9caf38770d6485846609ef809cde5bb1b512582ed813e46cfbfaffd216dcc98ca60
+EBUILD netbeans-websvccommon-9999_p20150822.ebuild 2727 SHA256 70654f3fbae7b1cf4e3198525555faeacf5cbfc36621b61f80391df7c8e4b670 SHA512 4519c552603212b48dacf3ec8bb2191d157f444b8a87b54269eaae35a040a03397aacc676a70f7f532f3d09c2a08288557eb70c7dc0ca8e963783fe5072597d9 WHIRLPOOL e7a446c7d972a31aafd756a4cc3bfc061b2ed757e892d01f83ba862d7b8684d75eb9efd56c2f4cd1b46c4e5d1e9dc02b9df8497ebace623acac58f18a6b3d0e7
+MISC ChangeLog 189274 SHA256 0957a1ea78875761dc89375f0259db8dd6785462acb898d7cb434f585dc3998d SHA512 8444db7c8bf5a91a34fe2e6f9bb460b6a00a313d560a57bef064034e8773ef4fbb5a851ef245e47ba5e3f8f74d44e6a94abeba288565c68efcefa424a3ce6bdb WHIRLPOOL 4b1d3d89cfd53fdc86821644d8a1fade33d1f77ccd559af2e5820c149e0d3eb763f6a79ba383c555c2bc00ecac957a22576b4f1b555b6e09da19487363a382ca
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150822.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150822.ebuild
new file mode 100644
index 0000000..d148b6a
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150822.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Common Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-08-22_00-02-28/zip/netbeans-trunk-nightly-201508220002-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 ba4b489..439eb09 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_p20150822 (22 Aug 2015)
+
+  22 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-9999_p20150822.ebuild:
+  updated to the latest sources
+
 *netbeans-9999_p20150821 (21 Aug 2015)
 
   21 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index e446fc1..dd191dc 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -46,6 +46,7 @@ DIST netbeans-trunk-nightly-201508180002-src.zip 208817240 SHA256 b497e33ddf1039
 DIST netbeans-trunk-nightly-201508190002-src.zip 208817531 SHA256 6594e5c2181ff7dfcf7eab3c7551571ea8e4cc6f3eb3f196a2b3b4bd7f394745 SHA512 84b4d1f1e77f1a4e2d97c14e2400381ce0d926dae2659cf38bbd4d2b7ae619d479ac1d73900f6d9cf10981b85982f7f19c00662974179e48cc4efb6e3481a82a WHIRLPOOL 7decfaa30422c8c588e8cfb65cd654119c3f80b60ffe3226074e5a1775648154a26a5ef267bd98f0a7720b107a0046b040652379bb6dd4a837d000863098ecd5
 DIST netbeans-trunk-nightly-201508200002-src.zip 208799494 SHA256 81de2b1f44baa32ffb769676ba38edab57124533bda1bb1dcda18b9be5dcb7c2 SHA512 1c68dbcff6bcfeb3566823749b57ce95c2de6a97333573897d78f5f6bc7fcfe2c06a2ff7805bfabea9dc9f60d9e5021d4c3d5aa720004d796caf3b163fb1699d WHIRLPOOL cc8344fb52507294d00071f967abdc5b77fcd37fd3989b81d0efdb7d35c0eca4349f86769f2a09915a72565e399852c40f21eaab89fb6a7c66a58960ecfefc39
 DIST netbeans-trunk-nightly-201508210002-src.zip 208800734 SHA256 c85c1f8027b3b9b03bbcc6743bb508899bc9050058c112f060d73daa544bbde6 SHA512 d8a3cbbc3f671d52bb5edcd2722c9ef847cdc160aecb4a9ee3283c2f64d82284c820c39a68e2aff2e7c3cd24fac618c1d3c48207b8323aa06f92524d0ab3a185 WHIRLPOOL b8938d9102fff59c5cc4f35db839492bbd1b1249d4e9c8da9eb4b2167c1e14d8906d49ba2bc9d301331e25d855b798883ee5f7aa51a5f00b272f55adae5339b3
+DIST netbeans-trunk-nightly-201508220002-src.zip 208858908 SHA256 eaeb7783c5302a6fb71c658071bf7283fe282bde2b18df8b6f07ed8cca69bc0d SHA512 c6687256e92c8447dd1d77b4dd678502d23ed7b6a799439f1a066371c672670bee25b46ba2ee2a090382ab157aae31641acc20373898f58fceac642a2a8aeebe WHIRLPOOL df6a09212c094d65f92004dd68ac857892308540c5ff9e914b683a40163ce784868c06214dd5636688c81549fd9e0e69b14df3c8ca268d1de517cb6ac4349594
 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_p20150818.ebuild 7216 SHA256 35084c73bb40b4ca55cdbf16b840f1
 EBUILD netbeans-9999_p20150819.ebuild 7216 SHA256 92edb5673b91df9a9d57804987daa09f0bc105f65add93a99e37483fd8406325 SHA512 e2c3e90a9b74255a3feca378060f529cf4c41b703e131b8eec538789a891b808ae00fea37e716440f35e2086fcccd70b42b514d60503cdfaf8781dbf86e7c4eb WHIRLPOOL 8c402febb7c32a5163852fc55dbafc96224b375e280e2cbbbe463c2f35909799b30b1fe5e812c708ee3a7926796c163d1eef522221ec14aae06122e5be15aea1
 EBUILD netbeans-9999_p20150820.ebuild 7216 SHA256 c65314aadad93241ac2f5d42a26e74b48dbf832b35c69656f520c51fb05458ea SHA512 87bb92fcd4af1fde2165b5020becf73ec2eff7f48d16864882b0995c5ccca733daa4d3c046724db8ecfcb3553ca7f3e8c9b5f76ba6ac612b50848fa38e8c0ffe WHIRLPOOL db05c182299845091cdb4722b85de3f61154b23b56ed4be62a3300e46683e93348e19a04f9ccca7fb772066fdec83d4e4c87041f07753f5049a9a98ed2b30a5c
 EBUILD netbeans-9999_p20150821.ebuild 7216 SHA256 8c0a0f50dc29df76d523b9b8ab223d58e8fe9b6f8929c7cdb04abd38f3fb033c SHA512 1d18181b6a5b1d655d5ad20534e693d67eb37fb15bab9c69e36ef4a2098430b4ee1575f67355c4d22236b2fa759a43ce87ed76e836cc4d0fe863c3d03e9f7a2f WHIRLPOOL 2a1c143b7763ea25a243468ad3ed4f3b79c30bb821f53fc35ff96ee149857551a2a84c60f8f29fe1bc13e8f8a4ea06e65482b643b759c8624eab5c8e0acd8b94
-MISC ChangeLog 160412 SHA256 0aec26e3b21ef4bb0cbafee6740fc0e04a2bbf459bb0952a1f5d21c56ac70a14 SHA512 94ba8dc16702ee331c736b213b26ee8433d22f4e82d0b68042ddab3a3fec6f49ea787d9692738d6f832997d756c7edf907d2ac5d4ed39e374c1d7a80ae3ecf53 WHIRLPOOL 98ffcff248a3f7c634d84f16a2db0b2c352f91f8db164e1c942b5e8745da0e4b925241d8f07f2edfb9c66b3bcb3957671f650a90b6fb1845c7fe151ffb1f329f
+EBUILD netbeans-9999_p20150822.ebuild 7216 SHA256 8c060048adff4181106d74b65361ae975585d75a3b68676570dd4b469338442d SHA512 caa7a3854f96a9b5cb77297d9f2c10a16c127441c82d92b8311140db9467a9ffe75d603bcd7f41cdeef2a2faf703f87a556841543c8e20c48b3aff5152814c9b WHIRLPOOL 35a5bc23f5ceb65aa6ec68cacc4419b3da685ac96f17b8d1c048a9d16fac666fc146b36035968c61d98d8e03c7c82aa37ff28de6e43960de7e12b0b963fdcc59
+MISC ChangeLog 160572 SHA256 aff61a1168ead9053884a707c80de06a9d0dab0c784bc89f07a8af206e9ea032 SHA512 246098681251cb932dd49847856dbe2ce854b7db6aeec833132a3d71ef230219b34d7a28ece75d6aa02bc58f56eb4e781b401c0ab8d0b6a3cf1df221131a4f54 WHIRLPOOL 8bfae29bf81434d9fcaf130972c0b2947d6d0730944a034a7f11f894cbb704465bc2be26ccef3bc62f7a9a34923a5d6eb6896f625b621bd5421d408f50016515
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

diff --git a/dev-util/netbeans/netbeans-9999_p20150822.ebuild b/dev-util/netbeans/netbeans-9999_p20150822.ebuild
new file mode 100644
index 0000000..f2a0098
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20150822.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-08-22_00-02-28/zip/netbeans-trunk-nightly-201508220002-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-websvccommon/, dev-java/netbeans-groovy/, ...
@ 2015-12-09 11:01 Miroslav Šulc
  0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2015-12-09 11:01 UTC (permalink / raw
  To: gentoo-commits

commit:     bca1329408dab74f116b47a628db3622fd301b29
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  9 11:01:07 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Dec  9 11:01:07 2015 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=bca13294

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.2.26

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index b535ed8..0aec31a 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201512030002-src.zip 209171687 SHA256 d79cd2853d8d34
 DIST netbeans-trunk-nightly-201512040002-src.zip 209178833 SHA256 9fbb70be4c026ac0ef12f1a44a361fdee99cce6234920c68b045526d00d4fd75 SHA512 90bc8fb97442a61215613021d27bd20e71e5b5ecd63ce41710d761f70faba8d4229ff6e5d023439070a62ad862e497b7f2e4b244e2b7b1183f55c217572b01ca WHIRLPOOL c231908df004a9e519e92827b36aaed93aca4a7802c8b85593c2849c94bfa422744fdb015ac38c07eeac56304443068b612f426fd5455c25b822f68ed8ad0bc1
 DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc64965bd5b8803c50b183bde52daab55dd4a4aa6c7b29bb624f83a SHA512 33072bd5bf9251678c2a28f7418e23569f2012d41c6b9518f3099f58abef39ef7da8285cfd3d96ae4dbb01258a4b6656d6bcc3ea26439eba3fb4b504ef61d761 WHIRLPOOL dac893869ef4aa8f582de77ce8d7117682a981e0e4f68156426eb41d31d2f0a55b08438979e9ad176efe0f86285d0af43ada75f34283a7deb40f56a8827d00fd
 DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd2312ceee02e5b5175bf7f94ee13b0552e02be72250922326ae4d1 SHA512 f7a48ace418b6dfcb52c4dacbade6d7c675f431606927fb8a201ae091b6a2366cade7eaf756b108e5b0eb4f285c94d6228e74878d7fa5d3117c28e77df2caae1 WHIRLPOOL aeb5eafcedb7f2d108713f801cdc1f3972dbc1f9589d29f7d84f7eeebab6a970a48b05f2672eda41bf282faf3a6ed987917cfbfc30b0b1bf873af894c5bf18af
+DIST netbeans-trunk-nightly-201512090002-src.zip 209228578 SHA256 dedd023e1e8fe3ad332bf923abf62814f76a02e484733b724d16754f3da958a1 SHA512 c7aa770074a8f4f4fa13190a4facf829d2dc6de5a3c8045ba79e9f5689332b506ff1330470dea33b38b1b7cb9e17361eff71d2b221f0fc906bdb8cd918ff2e8b WHIRLPOOL 96be2ab1293f0ab957b7da2c3266f2b4d77ec7b724a9c1c40045f512ad7ec9c99919d29643aaf1ecd8a7667321d0468eebb71f3219e117d214da618ca105dedb
 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_p20151101.ebuild 3384 SHA256 b3f926315b537a1251a52f68858d9dd21d2b77c54366aa23825b90c4d954bd77 SHA512 24367c9d4c2be458fa0aaf1e1d367834a32fce2db8853384b590643005371355a1ff98b5f3da5417cf4e316485cd18528779db2b6ae7ae857eb6fe6888ca99a0 WHIRLPOOL 295d1ad2b6c0c714aa77647feec6c3f9183325884a49142e49c787389b390481bee547287d3539508b3aef69e9141440d2dfefee393ab3333c5e3e6715d04249
@@ -65,4 +66,5 @@ EBUILD netbeans-apisupport-9999_p20151203.ebuild 3384 SHA256 156c211322547df6493
 EBUILD netbeans-apisupport-9999_p20151204.ebuild 3384 SHA256 b8c6ab3ec620cf4f7428f72d9dd27687587430e5540d2912f9655af29947828a SHA512 021d7584df6460e2ca35386ede5d56566af1cc1bbbea61c30ca3a24e1c14e06b778c7528ff978952204e4e5c96553ba416c2a2ffe511562fe44b23cfa5f1a71a WHIRLPOOL c71112170e0526f837f8d4bc0a7005403ab3d83ed4857658116b5c2a7470c24016430434eb9cafc0f404217962bb6a21f5279b54de5a3e722bdbdc476fe71cf7
 EBUILD netbeans-apisupport-9999_p20151207.ebuild 3384 SHA256 dbcd0e96f73e86641ef181083643ff9cb78f595c82dad006a2dd83603bdc5ca8 SHA512 f61a593866ffc58ca54df3f34675549f653bf28139a4ec1c75a9681f76767d165803507131b88780ea3bcd06b3708ced24d9fb63725dcc7b39e38051e6bb9b1b WHIRLPOOL 19d8dd2d65f42056db70358ae2f3244a595dea8881c0455e817079b8928ad0c74457468ec972c614e371d66b46342ba3f15814f62ec719a668c39ecfb7af304f
 EBUILD netbeans-apisupport-9999_p20151208.ebuild 3384 SHA256 8423ef681314c69c97817673ca84832a36cc1e7ef081f8cb297dcc1e6f5feddb SHA512 9d5a17df154fbabf6ae5c96e7e403892e53d2ccf70c40fcc99002518e65e86d192eb27731bfc35e4d7cb79ed21cfc6aefbbf41eef9ca40a0983955a17b963fe9 WHIRLPOOL fdebb42bf6e877969768846b96e914368ba09e2b39f18666babb43d1a5b78b3af442db35649f3c10b70c137ef3abf3e12985cdfd774c7850ec94b03f3f885997
+EBUILD netbeans-apisupport-9999_p20151209.ebuild 3384 SHA256 808e7a88e35dd567d02d669dcea1ede30e156bbe934f30b258f7920e3e0494ff SHA512 86c295df60b4aeea7890a4756a53b2f027ee3f64438acb2bb2ff3ffd33f0607b0421163bf3b53144af4ef78b5b536abc2acb238a8184086e6f09590e2c5c49bb WHIRLPOOL eaf8bea7415662abea3b6d532ae1d73e2e9bb77aa44d896a68ab74abffbbf485cb77a18440a9642c9f066ab10450759940983ae80eec478444c6624ad5722097
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20151209.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20151209.ebuild
new file mode 100644
index 0000000..b933581
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20151209.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-12-09_00-02-04/zip/netbeans-trunk-nightly-201512090002-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 2309009..f6f9ccb 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -44,6 +44,7 @@ DIST netbeans-trunk-nightly-201512030002-src.zip 209171687 SHA256 d79cd2853d8d34
 DIST netbeans-trunk-nightly-201512040002-src.zip 209178833 SHA256 9fbb70be4c026ac0ef12f1a44a361fdee99cce6234920c68b045526d00d4fd75 SHA512 90bc8fb97442a61215613021d27bd20e71e5b5ecd63ce41710d761f70faba8d4229ff6e5d023439070a62ad862e497b7f2e4b244e2b7b1183f55c217572b01ca WHIRLPOOL c231908df004a9e519e92827b36aaed93aca4a7802c8b85593c2849c94bfa422744fdb015ac38c07eeac56304443068b612f426fd5455c25b822f68ed8ad0bc1
 DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc64965bd5b8803c50b183bde52daab55dd4a4aa6c7b29bb624f83a SHA512 33072bd5bf9251678c2a28f7418e23569f2012d41c6b9518f3099f58abef39ef7da8285cfd3d96ae4dbb01258a4b6656d6bcc3ea26439eba3fb4b504ef61d761 WHIRLPOOL dac893869ef4aa8f582de77ce8d7117682a981e0e4f68156426eb41d31d2f0a55b08438979e9ad176efe0f86285d0af43ada75f34283a7deb40f56a8827d00fd
 DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd2312ceee02e5b5175bf7f94ee13b0552e02be72250922326ae4d1 SHA512 f7a48ace418b6dfcb52c4dacbade6d7c675f431606927fb8a201ae091b6a2366cade7eaf756b108e5b0eb4f285c94d6228e74878d7fa5d3117c28e77df2caae1 WHIRLPOOL aeb5eafcedb7f2d108713f801cdc1f3972dbc1f9589d29f7d84f7eeebab6a970a48b05f2672eda41bf282faf3a6ed987917cfbfc30b0b1bf873af894c5bf18af
+DIST netbeans-trunk-nightly-201512090002-src.zip 209228578 SHA256 dedd023e1e8fe3ad332bf923abf62814f76a02e484733b724d16754f3da958a1 SHA512 c7aa770074a8f4f4fa13190a4facf829d2dc6de5a3c8045ba79e9f5689332b506ff1330470dea33b38b1b7cb9e17361eff71d2b221f0fc906bdb8cd918ff2e8b WHIRLPOOL 96be2ab1293f0ab957b7da2c3266f2b4d77ec7b724a9c1c40045f512ad7ec9c99919d29643aaf1ecd8a7667321d0468eebb71f3219e117d214da618ca105dedb
 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_p20151101.ebuild 4790 SHA256 94dacae8078cd932314c67fddf63b942d26f2be2cd253c7c7edf4474f7a6a9cf SHA512 503d648dc3116dd856e4e8df0c73c8ced5c05cf590e6ba959bb4b217c48c9b3fb901e9a87ccf7646f5f7a3d373fb503e63d585d1a2c47c94354dbe85ff696a83 WHIRLPOOL d8f6bd7e0af32c57776e4c5bf9d7741c4f74b331124e7a62e76c70e296c3d73b17c36e2c84fe9e9f3ffb90837e8764d30b5628c9312be8b1aa7fea51d11a0220
@@ -76,4 +77,5 @@ EBUILD netbeans-cnd-9999_p20151203.ebuild 4790 SHA256 f43035b11a89035b352aaac1d3
 EBUILD netbeans-cnd-9999_p20151204.ebuild 4790 SHA256 ef98f2558a13e241a72fcd51fbe73a62ce2e43b8d1602523da432da7af6f58a5 SHA512 2d9ad5bdefe982a8047544e3c489fb14d0474815b1d517b56d41a3170cb552baa1574b5d287eaa8d93007ee6e080caad76fba9b7c7cd6c6babef0ae46bf3e8bd WHIRLPOOL 5bdf4c4b62ce39a3958f7a0e20dad53e78385cd85747f4dbb2d3d363389022a180239b77320e651c7ad220070d18e484706400fd89ef381ebcbce05502c51de7
 EBUILD netbeans-cnd-9999_p20151207.ebuild 4790 SHA256 a7c2735a4a90e20a509cea1a82ecc5a10ce5c620bfd69459c434766b129a448b SHA512 7c740b59902520b4c743bf31830595eb8a7be6a3bfa216c47a84acea5275b5f13cd10b37c3aa391d7c095572335b074bf900a89cc63d157fbab63c2ccaf1fdd9 WHIRLPOOL 4d942e74919b077b3de2303dd862a8262d0630264bec2816f9e3c353c41e8b3c8d66fb49063c4ae53255f4c2fdabc9dbfdc865e5c358803607467d4a89a36157
 EBUILD netbeans-cnd-9999_p20151208.ebuild 4790 SHA256 417a8c7790a36f8c407390ec8c2e17ad83a56deb10b74ea700004eaa16c3a520 SHA512 e8ec7cfad2efc699a8cd62a4c603c5fb9166ab096c5eee8aee1c193585359aaf1575b0675c558767290dba879200d9ec7236bc6e1f2e5e98178a242cc3e4cd58 WHIRLPOOL ccd282f51bdacc2f4e751bb60a4fa13ffb6dfaacd1f9fdbe6bfa40276066ed3f65823f9fb2210e2946719fc2230512ca9893e757c83f7e0c5e7cdc6757d651d1
+EBUILD netbeans-cnd-9999_p20151209.ebuild 4790 SHA256 182e98298b62601fdd3d03207e292a7c858ca09ffab4de277dd4ec0ff60e4fb4 SHA512 eebf6afd8e3790ca8ea9b2f68b1e11dea9fffcb3f263e36622a4c15779edc3f5fc44fde1ddfbb94a647ec90a2b4baed78f7a45947f2d63809b52023767820197 WHIRLPOOL b2fd3b9746fd0cc53b96c5d376d6431c063909880894c88e827583560ac06a286792a325c17144d9eea5214b2a0543f27d6d0d027581f06e53b17623c2ebd301
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20151209.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20151209.ebuild
new file mode 100644
index 0000000..c1cbb1f
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20151209.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-12-09_00-02-04/zip/netbeans-trunk-nightly-201512090002-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/9A133B99ABDA40B3A17B23DFA79A91AF5FC429B1-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}"/9A133B99ABDA40B3A17B23DFA79A91AF5FC429B1-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 0f258d5..9763142 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201512030002-src.zip 209171687 SHA256 d79cd2853d8d34
 DIST netbeans-trunk-nightly-201512040002-src.zip 209178833 SHA256 9fbb70be4c026ac0ef12f1a44a361fdee99cce6234920c68b045526d00d4fd75 SHA512 90bc8fb97442a61215613021d27bd20e71e5b5ecd63ce41710d761f70faba8d4229ff6e5d023439070a62ad862e497b7f2e4b244e2b7b1183f55c217572b01ca WHIRLPOOL c231908df004a9e519e92827b36aaed93aca4a7802c8b85593c2849c94bfa422744fdb015ac38c07eeac56304443068b612f426fd5455c25b822f68ed8ad0bc1
 DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc64965bd5b8803c50b183bde52daab55dd4a4aa6c7b29bb624f83a SHA512 33072bd5bf9251678c2a28f7418e23569f2012d41c6b9518f3099f58abef39ef7da8285cfd3d96ae4dbb01258a4b6656d6bcc3ea26439eba3fb4b504ef61d761 WHIRLPOOL dac893869ef4aa8f582de77ce8d7117682a981e0e4f68156426eb41d31d2f0a55b08438979e9ad176efe0f86285d0af43ada75f34283a7deb40f56a8827d00fd
 DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd2312ceee02e5b5175bf7f94ee13b0552e02be72250922326ae4d1 SHA512 f7a48ace418b6dfcb52c4dacbade6d7c675f431606927fb8a201ae091b6a2366cade7eaf756b108e5b0eb4f285c94d6228e74878d7fa5d3117c28e77df2caae1 WHIRLPOOL aeb5eafcedb7f2d108713f801cdc1f3972dbc1f9589d29f7d84f7eeebab6a970a48b05f2672eda41bf282faf3a6ed987917cfbfc30b0b1bf873af894c5bf18af
+DIST netbeans-trunk-nightly-201512090002-src.zip 209228578 SHA256 dedd023e1e8fe3ad332bf923abf62814f76a02e484733b724d16754f3da958a1 SHA512 c7aa770074a8f4f4fa13190a4facf829d2dc6de5a3c8045ba79e9f5689332b506ff1330470dea33b38b1b7cb9e17361eff71d2b221f0fc906bdb8cd918ff2e8b WHIRLPOOL 96be2ab1293f0ab957b7da2c3266f2b4d77ec7b724a9c1c40045f512ad7ec9c99919d29643aaf1ecd8a7667321d0468eebb71f3219e117d214da618ca105dedb
 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_p20151101.ebuild 2968 SHA256 06c21031f7d09c2e9370e34a30a3b16221ccfdc7f46a2df689eb4da864f3f5ce SHA512 b10e952eaaefdd08d70e4e5ecc03fb8aa9ee82ff55b141907cad269144c89cd97b7a10135e586bf814d4bf5f060c88dcd009a57ed6f5ab55e4784b36b77c0179 WHIRLPOOL 84038d5517651f7f92856e57d4847041ed8105ca606723121b548a20ae973f058497aa910d4ec244d29e3c8f56dd54fac1568ac108405ae007115496d2e65f0a
@@ -68,4 +69,5 @@ EBUILD netbeans-dlight-9999_p20151203.ebuild 2968 SHA256 4a24c3ce471e5ac85820e27
 EBUILD netbeans-dlight-9999_p20151204.ebuild 2968 SHA256 93bef6707831b30b39d030088704e2e4b9b1f0ad78bd3c6eb02463dc799540c2 SHA512 ad47946ef23d14ceac87c60d9870886d762626065bda08db638e5dd8585bab414d5ad22e3d0dae6d68e7926db1fdb7b9b01b7506ac4c851536fae450aa0e65d0 WHIRLPOOL 7c829f1595b26ebd0b3b0da1ebcb707f83dac377744bea4bc4576f2c6201880aa0ca6337dcc1dee47c32633a86602c2c01ffb3d6f33e8a6df32e43feee7c47a6
 EBUILD netbeans-dlight-9999_p20151207.ebuild 2968 SHA256 a1ce05646b14c2f90ae9dfc3a3fe0fac72a635dd88379de7a2d1beb5fc6bb045 SHA512 b4146704af1b25c37f0af80a8fe59628eebfc1657942d3d841bc65e5c19dd3f4951b1e4c59e5ce53a31579bff26ed984f57c2db68ca319bcdf56f18e6fb0a7c2 WHIRLPOOL 397eace446f0a06f474d94e16e3a23d6b4f63e79a6f2c242ec81d920caaffa39b77f73c2f03c51de451d24e7a8b4ddc7e26ba48a5d941a69091d2fbd4320ba65
 EBUILD netbeans-dlight-9999_p20151208.ebuild 2968 SHA256 d71feb506bfc89c2d439e201c567a161bbb586c555267af5c124dd2fb3ec0cfe SHA512 c9d2de53126ae75e67564a38b835f4d4eb09414d4cf4bd4359f4a3d74a67d8607b3754ec667b654b5a5c097ce4da98470f3bbe5c687fe58703738ef04d945433 WHIRLPOOL 5800e21ffca3a72ecbc6d50e383fc069317f56df26780ea44b00bbf9b8e8260b00a25b347d34ab38a5d60056e2ee1bfd7b3711a02d51a18187c145c1c13c5e3f
+EBUILD netbeans-dlight-9999_p20151209.ebuild 2968 SHA256 2418a3b96a05e717e9e5da15eaa2a86b05878a15c52c5922946895f57210bfce SHA512 b2c16c1518361ac989a67dd6fd45ad26f2389edc813e444a61131494b999e2ff6ccd498a16c0bded9052009a63e5383c2e098e8c348bbf66a9cc8bb303388054 WHIRLPOOL 8447baea8e1e636d8da048bb0eb1258ebf0c4c90ddeaa165bc6ab9faa731a912bb8a49e3cb6e5a5335b4ea0ae4997919bf0c724c8749c28af4d8869edabfa0f0
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 1cb1ad6..a0993cf 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -65,6 +65,7 @@ DIST netbeans-trunk-nightly-201512030002-src.zip 209171687 SHA256 d79cd2853d8d34
 DIST netbeans-trunk-nightly-201512040002-src.zip 209178833 SHA256 9fbb70be4c026ac0ef12f1a44a361fdee99cce6234920c68b045526d00d4fd75 SHA512 90bc8fb97442a61215613021d27bd20e71e5b5ecd63ce41710d761f70faba8d4229ff6e5d023439070a62ad862e497b7f2e4b244e2b7b1183f55c217572b01ca WHIRLPOOL c231908df004a9e519e92827b36aaed93aca4a7802c8b85593c2849c94bfa422744fdb015ac38c07eeac56304443068b612f426fd5455c25b822f68ed8ad0bc1
 DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc64965bd5b8803c50b183bde52daab55dd4a4aa6c7b29bb624f83a SHA512 33072bd5bf9251678c2a28f7418e23569f2012d41c6b9518f3099f58abef39ef7da8285cfd3d96ae4dbb01258a4b6656d6bcc3ea26439eba3fb4b504ef61d761 WHIRLPOOL dac893869ef4aa8f582de77ce8d7117682a981e0e4f68156426eb41d31d2f0a55b08438979e9ad176efe0f86285d0af43ada75f34283a7deb40f56a8827d00fd
 DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd2312ceee02e5b5175bf7f94ee13b0552e02be72250922326ae4d1 SHA512 f7a48ace418b6dfcb52c4dacbade6d7c675f431606927fb8a201ae091b6a2366cade7eaf756b108e5b0eb4f285c94d6228e74878d7fa5d3117c28e77df2caae1 WHIRLPOOL aeb5eafcedb7f2d108713f801cdc1f3972dbc1f9589d29f7d84f7eeebab6a970a48b05f2672eda41bf282faf3a6ed987917cfbfc30b0b1bf873af894c5bf18af
+DIST netbeans-trunk-nightly-201512090002-src.zip 209228578 SHA256 dedd023e1e8fe3ad332bf923abf62814f76a02e484733b724d16754f3da958a1 SHA512 c7aa770074a8f4f4fa13190a4facf829d2dc6de5a3c8045ba79e9f5689332b506ff1330470dea33b38b1b7cb9e17361eff71d2b221f0fc906bdb8cd918ff2e8b WHIRLPOOL 96be2ab1293f0ab957b7da2c3266f2b4d77ec7b724a9c1c40045f512ad7ec9c99919d29643aaf1ecd8a7667321d0468eebb71f3219e117d214da618ca105dedb
 EBUILD netbeans-enterprise-8.0.2-r1.ebuild 15075 SHA256 41d376117ad1d8d59c8194debfd29dc42f5fd4de70aee12a2134ec143a604dda SHA512 4cd9de88e9a401cc0be88e3e2605abc411c47307818376b2bcc00f9ae570b21324f2bf00fd83e819bfa076da0fb07811fa1f0f9362a6cd0ee05b63221a199000 WHIRLPOOL 73f4518c14430fe7aa3614ebf1b11a06ba0e9bce7479af2770db3a114f149d575a16a655218f757ed416b5149228ac56dac700f5a8d5e034cc838bfa4092e636
 EBUILD netbeans-enterprise-8.0.2.ebuild 15071 SHA256 84621e3bb946cfa254bb70ca3c3f61202882a7e6d631769ad2f0f4639b0de875 SHA512 6ad38e840764661e6bc5b89b5925e9665871009ba0b640c0a78c555ec104214dbee1200a93cb48e655bc620e07bb6e4d8932b23a00fe458f8a5e9e5c3200d79d WHIRLPOOL b2c2bbf2ff72f8cd9b4cdbe039fdbf7cd074b0fdc20f634aa0b6f79f5c639be358c61fab30854a6e3ab9714a285d9461ac4e39e94e10c14c5068422d6c873c56
 EBUILD netbeans-enterprise-8.1-r1.ebuild 15888 SHA256 d4c04ccfee01a46819020cb7cf8fd8297618f3c0431ae2d9dd7eec8131f988ab SHA512 6c7c39c378cb79d3f382cb80d07710a8c5233aaf0df8fb58889ee6aa6bde73624efa6aa49b43f84105685094a7aff89e4b6367ffd1fd113da27b42d50d07e983 WHIRLPOOL e678e2a6957e428c1b6e51469c0e7cc6a08da2c797f1575b6bb660a7f3281c00f071179de459e27c983304915b005baaf94ad4fae0a4c08162f218bf53b7d821
@@ -99,4 +100,5 @@ EBUILD netbeans-enterprise-9999_p20151203.ebuild 15931 SHA256 4f5ac6510345a99bd0
 EBUILD netbeans-enterprise-9999_p20151204.ebuild 15931 SHA256 3b8a45e6d080d799a599ae19e64782e3261e9f48a54a00b21c497b5846a6bed6 SHA512 602be79fc3dca4b21d9ce6bf5b399c8c81ae3f54374affb4e6572242e6670dcd00a951072420be103d628c8d186fda19f41dc79550bfe26a0ffd80cf79881ff6 WHIRLPOOL a6d70b2a7a2c47e9ba5754342d398c108a6ff78a2d6f8cb2b0354922a14edce2f98221cce7ed73ea3276d651760bc24dd8f67fc9b1a5051af240cd88b9c5dec7
 EBUILD netbeans-enterprise-9999_p20151207.ebuild 15936 SHA256 d0df2f25fbd06b8f8bb3f8dfea972c77dc14a3df0ba2b0debae16ec2dbabc3be SHA512 486aaf4f5164046a43b0fada4016ce678837a6633e1438c369c8acfc3ea7b32741183292db9a094d305d7106935960aa399087ee8332c99e141ebfe02f8194d8 WHIRLPOOL 2ec44aebd99be8bf99d4af3b8c78bbe0dafaf2fd92b62f2108ad7df8b1cc8d464354b17e278d5cef4f52af1c617261bd862ee54121d7af489049ba2ed718bfee
 EBUILD netbeans-enterprise-9999_p20151208.ebuild 15936 SHA256 a3dbc3edeb761078c8ddd1aa2dcd75048539a0413ec36c26b2a4f1ceb6f7af41 SHA512 261aea85cebf3d5cc933c79daef79c9a547a8e5a4f6758895ceef834e701bfee0af3b970b71e6f75156b0ccd03de24adb82ed8db81b0d59648f91c615906395e WHIRLPOOL 0c5e360badbf350dcad3f641e504a956673b34c46add461db19d74da0f669b28965c4a9ac1fd208bc2edea2258e50a44909e2c790c2ac25e9671cd37ec6df4bd
+EBUILD netbeans-enterprise-9999_p20151209.ebuild 15936 SHA256 e7e73e9a9e3154367d6d6f032231ab847673032748c38dbb6d465143f2e933af SHA512 e481855803571f98bdcd2a9b38ddaa137ce554bb0c5d920acb6e826f2005bc2ade80e7fdf7d53823c9b382e2d8c0e21ae46e40aaa41b408b244d9d7c10fd41c1 WHIRLPOOL ed3ff0699f174591d89e12f94b047140df3b65310a5c1a7380175aa0213b31c03c42b6a66fa7321d9deab699dd057fe543ff1ba2f16602d1d1be504ac9f90197
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151209.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151209.ebuild
new file mode 100644
index 0000000..3b842c0
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151209.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-12-09_00-02-04/zip/netbeans-trunk-nightly-201512090002-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-2.7.7-r7:0
+	dev-java/bsf:2.3
+	dev-java/cglib:3
+	dev-java/commons-beanutils:1.7
+	dev-java/commons-collections:0
+	dev-java/commons-digester:0
+	dev-java/commons-io:1
+	dev-java/commons-validator:0
+	dev-java/glassfish-persistence:0
+	dev-java/guava:14
+	dev-java/jakarta-oro:2.0
+	dev-java/osgi-core-api:0
+	dev-java/validation-api:1.0"
+#	dev-java/commons-chain:1.1 in overlay
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.enterprise -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar libs.amazon/external/aws-java-sdk-1.2.1.jar || die
+	ln -s "${DISTDIR}"/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar libs.elimpl/external/el-impl.jar || die
+	ln -s "${DISTDIR}"/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar web.jspparser/external/glassfish-jspparser-4.0.jar || die
+	ln -s "${DISTDIR}"/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar libs.glassfish_logging/external/glassfish-logging-2.0.jar || die
+	ln -s "${DISTDIR}"/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar libs.amazon/external/httpclient-4.1.1.jar || die
+	ln -s "${DISTDIR}"/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar libs.amazon/external/httpcore-4.1.jar || die
+	ln -s "${DISTDIR}"/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar javaee.api/external/javaee-api-6.0.jar || die
+	ln -s "${DISTDIR}"/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar javaee7.api/external/javaee-api-7.0.jar || die
+	ln -s "${DISTDIR}"/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar javaee.api/external/javaee-web-api-6.0.jar || die
+	ln -s "${DISTDIR}"/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar javaee7.api/external/javaee-web-api-7.0.jar || die
+	ln -s "${DISTDIR}"/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar j2ee.platform/external/javaee-doc-api.jar || die
+	ln -s "${DISTDIR}"/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar javaee.api/external/javax.annotation.jar || die
+	ln -s "${DISTDIR}"/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar javaee7.api/external/javax.annotation-api.jar || die
+	ln -s "${DISTDIR}"/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar javaee7.api/external/javax.xml.soap-api.jar || die
+	ln -s "${DISTDIR}"/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar javaee.api/external/jaxb-api-osgi.jar || die
+	ln -s "${DISTDIR}"/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar javaee7.api/external/jaxb-api-osgi.jar || die
+	ln -s "${DISTDIR}"/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip websvc.restlib/external/jaxrs-ri-2.5.1.zip || die
+	ln -s "${DISTDIR}"/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar javaee7.api/external/jaxws-api.jar || die
+	ln -s "${DISTDIR}"/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip web.jsf12/external/jsf-1.2.zip || die
+	ln -s "${DISTDIR}"/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip web.jsf20/external/jsf-2.2.zip || die
+	ln -s "${DISTDIR}"/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip web.jsf.editor/external/jsf-api-docs.zip || die
+	ln -s "${DISTDIR}"/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar libs.jstl/external/jstl-api.jar || die
+	ln -s "${DISTDIR}"/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar libs.jstl/external/jstl-impl.jar || die
+	ln -s "${DISTDIR}"/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip websvc.metro.lib/external/metro-1.4-doc.zip || die
+	ln -s "${DISTDIR}"/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip websvc.metro.lib/external/metro-2.0.zip || die
+	ln -s "${DISTDIR}"/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar web.primefaces/external/primefaces-5.0.jar || die
+	ln -s "${DISTDIR}"/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar servletjspapi/external/servlet3.1-jsp2.3-api.jar || die
+	ln -s "${DISTDIR}"/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip web.struts/external/struts-1.3.10-javadoc.zip || die
+	ln -s "${DISTDIR}"/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip web.struts/external/struts-1.3.10-lib.zip || die
+	ln -s "${DISTDIR}"/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip web.core.syntax/external/syntaxref20.zip || die
+	ln -s "${DISTDIR}"/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar javaee.api/external/webservices-api-osgi.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into j2eeapis/external glassfish-deployment-api-1.2 glassfish-deployment-api.jar jsr88javax.jar
+	java-pkg_jar-from --into libs.amazon/external commons-codec commons-codec.jar commons-codec-1.3.jar
+	java-pkg_jar-from --into libs.amazon/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
+	java-pkg_jar-from --into libs.commons_fileupload/external commons-fileupload commons-fileupload.jar commons-fileupload-1.3.jar
+	java-pkg_jar-from --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 b3b2b9e..54340dc 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201512030002-src.zip 209171687 SHA256 d79cd2853d8d34
 DIST netbeans-trunk-nightly-201512040002-src.zip 209178833 SHA256 9fbb70be4c026ac0ef12f1a44a361fdee99cce6234920c68b045526d00d4fd75 SHA512 90bc8fb97442a61215613021d27bd20e71e5b5ecd63ce41710d761f70faba8d4229ff6e5d023439070a62ad862e497b7f2e4b244e2b7b1183f55c217572b01ca WHIRLPOOL c231908df004a9e519e92827b36aaed93aca4a7802c8b85593c2849c94bfa422744fdb015ac38c07eeac56304443068b612f426fd5455c25b822f68ed8ad0bc1
 DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc64965bd5b8803c50b183bde52daab55dd4a4aa6c7b29bb624f83a SHA512 33072bd5bf9251678c2a28f7418e23569f2012d41c6b9518f3099f58abef39ef7da8285cfd3d96ae4dbb01258a4b6656d6bcc3ea26439eba3fb4b504ef61d761 WHIRLPOOL dac893869ef4aa8f582de77ce8d7117682a981e0e4f68156426eb41d31d2f0a55b08438979e9ad176efe0f86285d0af43ada75f34283a7deb40f56a8827d00fd
 DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd2312ceee02e5b5175bf7f94ee13b0552e02be72250922326ae4d1 SHA512 f7a48ace418b6dfcb52c4dacbade6d7c675f431606927fb8a201ae091b6a2366cade7eaf756b108e5b0eb4f285c94d6228e74878d7fa5d3117c28e77df2caae1 WHIRLPOOL aeb5eafcedb7f2d108713f801cdc1f3972dbc1f9589d29f7d84f7eeebab6a970a48b05f2672eda41bf282faf3a6ed987917cfbfc30b0b1bf873af894c5bf18af
+DIST netbeans-trunk-nightly-201512090002-src.zip 209228578 SHA256 dedd023e1e8fe3ad332bf923abf62814f76a02e484733b724d16754f3da958a1 SHA512 c7aa770074a8f4f4fa13190a4facf829d2dc6de5a3c8045ba79e9f5689332b506ff1330470dea33b38b1b7cb9e17361eff71d2b221f0fc906bdb8cd918ff2e8b WHIRLPOOL 96be2ab1293f0ab957b7da2c3266f2b4d77ec7b724a9c1c40045f512ad7ec9c99919d29643aaf1ecd8a7667321d0468eebb71f3219e117d214da618ca105dedb
 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_p20151101.ebuild 2913 SHA256 e64dee7f488bc65ba05180351382835cda20706db8003176f2b222f44bd3a640 SHA512 2b96d3ba92763a5a4e3ab74ce3a36a3a8fda683773707655887d5e3648762ee179604898ac4eead36bbc407f6cf6575ccbb2eaf3ecd121699d15a71bfc28d7c5 WHIRLPOOL a46077092b9fee72f162c841db3f0ef1cd56b92ae3ef830982cc1149c21abae2fc59069199c57eefa3c46919cb7b7b22e354222aac3d02815a02bc05c5563518
@@ -65,4 +66,5 @@ EBUILD netbeans-ergonomics-9999_p20151203.ebuild 2913 SHA256 fbd211427699be2d2b9
 EBUILD netbeans-ergonomics-9999_p20151204.ebuild 2913 SHA256 b0f6fe2b939846e0c51464fb0b64e0319707c874264b08c6f924d6b504d23f65 SHA512 03a541e6cc26ed59ffefcf558c7622bb0224ae650070608b49a617749e6340b9bb96fb1a0c03fdc94d5c8febd969bbd39d9ec9b5e589e85cde50c68fd2d7d658 WHIRLPOOL d640309856df1c2a1fd1fdb97b5ce7a1ee354c6791953ea76d17f36b5489771f781f0fd546e6a06c5b29912798323bebd41cdc4618ba44d60db3372c5f414776
 EBUILD netbeans-ergonomics-9999_p20151207.ebuild 2913 SHA256 a5f0d445d144c808adf1da66456da2fa9a3ade308ca7f8ac75b0b1bf406bb3e9 SHA512 9191bf223438c57b4b04ff40f83fb9391ced8bb9213a662be2283a925c30acea212c6218abef458fc6d79d23b47e4168f4613e41f6f6b23fb44f324471c99805 WHIRLPOOL e0fd77105c9bbafabfadadd46a4251b43e4acc33a8945a713e7b4e4e4599591252e1543d3e43682892d477313155e95ca1bd4e530f273acee9455a2a171fc176
 EBUILD netbeans-ergonomics-9999_p20151208.ebuild 2913 SHA256 a37a47c51effa8d5427be1f7303cea9f6bbfe19b658d4c6b3c3687c1048dea8d SHA512 93167f7f8921e062a54f94b2f09127278512288ffb43690d41d0dccf508599caf94615b5fd8dbfa81ba475b9dffc775a17249804768bc097a308217abe15d282 WHIRLPOOL d8386fb7c41ed7d59ac5519247b7ddcfb3cc781e11c2559b4e634a9350b510bbe392cff44b155b2782c8c667c5387e9b51640e9896e5c31674907fe842a495f2
+EBUILD netbeans-ergonomics-9999_p20151209.ebuild 2913 SHA256 1ff83b56a86b49d0a2cb33935e257dc29bac915b3587dacb6d8761c741a50573 SHA512 b6b33a0118281c3cc98949cb386bd011f78532c731fdee41e44f42e5c79f0ea90453dead4b7bad1b593055133d82cfbd5bd302010f6b16bc2df56004a1313beb WHIRLPOOL 5d1cd2b5f6ded4aca1cb9f7b68dfb0169360bec4ce8fce98a06a03aa5a49efea311ea3439572f0973435cf0f898711093da491ffd2ea7fc04d4555c43c1b6b81
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20151209.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20151209.ebuild
new file mode 100644
index 0000000..a9771e5
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20151209.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-12-09_00-02-04/zip/netbeans-trunk-nightly-201512090002-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 8fb829f..7e1e9dd 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201512030002-src.zip 209171687 SHA256 d79cd2853d8d34
 DIST netbeans-trunk-nightly-201512040002-src.zip 209178833 SHA256 9fbb70be4c026ac0ef12f1a44a361fdee99cce6234920c68b045526d00d4fd75 SHA512 90bc8fb97442a61215613021d27bd20e71e5b5ecd63ce41710d761f70faba8d4229ff6e5d023439070a62ad862e497b7f2e4b244e2b7b1183f55c217572b01ca WHIRLPOOL c231908df004a9e519e92827b36aaed93aca4a7802c8b85593c2849c94bfa422744fdb015ac38c07eeac56304443068b612f426fd5455c25b822f68ed8ad0bc1
 DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc64965bd5b8803c50b183bde52daab55dd4a4aa6c7b29bb624f83a SHA512 33072bd5bf9251678c2a28f7418e23569f2012d41c6b9518f3099f58abef39ef7da8285cfd3d96ae4dbb01258a4b6656d6bcc3ea26439eba3fb4b504ef61d761 WHIRLPOOL dac893869ef4aa8f582de77ce8d7117682a981e0e4f68156426eb41d31d2f0a55b08438979e9ad176efe0f86285d0af43ada75f34283a7deb40f56a8827d00fd
 DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd2312ceee02e5b5175bf7f94ee13b0552e02be72250922326ae4d1 SHA512 f7a48ace418b6dfcb52c4dacbade6d7c675f431606927fb8a201ae091b6a2366cade7eaf756b108e5b0eb4f285c94d6228e74878d7fa5d3117c28e77df2caae1 WHIRLPOOL aeb5eafcedb7f2d108713f801cdc1f3972dbc1f9589d29f7d84f7eeebab6a970a48b05f2672eda41bf282faf3a6ed987917cfbfc30b0b1bf873af894c5bf18af
+DIST netbeans-trunk-nightly-201512090002-src.zip 209228578 SHA256 dedd023e1e8fe3ad332bf923abf62814f76a02e484733b724d16754f3da958a1 SHA512 c7aa770074a8f4f4fa13190a4facf829d2dc6de5a3c8045ba79e9f5689332b506ff1330470dea33b38b1b7cb9e17361eff71d2b221f0fc906bdb8cd918ff2e8b WHIRLPOOL 96be2ab1293f0ab957b7da2c3266f2b4d77ec7b724a9c1c40045f512ad7ec9c99919d29643aaf1ecd8a7667321d0468eebb71f3219e117d214da618ca105dedb
 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_p20151101.ebuild 3377 SHA256 50670db3b1a181e311ca642fdf2a0aefad271252e2db7b25c60197997fe789ad SHA512 74e53c74b461ffe9baa000a079909373851a5f2289f74df9e9b8cddff9c3a17205c0098c6ac446fa5a349cc0763c56d197bec4ffb96c494e4c64436e9aa1f235 WHIRLPOOL 4f50a5f170721bc52784510cdc55ef87e2a65e14bed00831d100920fd696effba0f7a9f3752244e7eb0fb7daa326dc12c4777b76eea95959701517e5e6af20aa
@@ -67,4 +68,5 @@ EBUILD netbeans-extide-9999_p20151203.ebuild 3377 SHA256 2699cfeedb2a98a97155f54
 EBUILD netbeans-extide-9999_p20151204.ebuild 3377 SHA256 1d3eabc7f609c1e51ca01c9abfc9afde2c07e9b0612304fac4d3730df17acfbc SHA512 ab42dca1b582c40876fe5cf0bb163acce8b9c711423181cdccbea85cf5beebbafdd90477dfd0d22500c149f60e95c554dedf2496b8522b2724598b99a2381aee WHIRLPOOL c7d1d91002e65626dd775d6f6898865313c3185bfec884023673a06bdaac224998171e3ecec0ebb7b33b26c97ccfb649cbdd2c833f007fe523aa344da5f3cdd1
 EBUILD netbeans-extide-9999_p20151207.ebuild 3377 SHA256 95ddb8bc31ba9277a7c61093ec4b027c0e95ce91eedf7873d6fa82a1bf5b74d6 SHA512 3413900e32a97e98b337396cbdb7cc943b34318c8c0eb48d3dd2d24c235a6c3ecc2f2e70438613917052be8a56adae7b3e4277f146a9302def109a83b620a716 WHIRLPOOL efe90a2502c1f39e6d688e61c6e7849d35ac22b013d99d482a6b69cd3bc2b1fa45cca745d98bed03c3392ea01ef6fb3f9cf107d97edda27598d3bc081476dbcb
 EBUILD netbeans-extide-9999_p20151208.ebuild 3377 SHA256 b0011a68d558f7eacc310f8b77d514c18609e253dd086ba353cfac8ca970120e SHA512 7cbbe1cd2a9a872b0dd84ed27521e3f00829978963a830cfc3349a2cee1f563b67b3f06799cdb160aedfa6b2fe5852ceff16134b656549aac62a5943175aa0cd WHIRLPOOL 5917a1f5930f3557188a9b60e569bab7b1108d672ecea1fb5a0b1f8399458abc10bb9241873fac4db9982fe1c8e442847f943fc017cffc92483a96a63a05c858
+EBUILD netbeans-extide-9999_p20151209.ebuild 3377 SHA256 0a7bb82f7fc3e9fffb249dee9e7ce60a1f87df86eb94da956562b808b3759d0d SHA512 1878a9cdab10754f58b2d6c50909fa0bc2d4025a400b4d59d0e1c10f59b243e60db73c77a8973eaa748a092ad49193e8621e8c8fc14300d18d6e94ef095aa0b7 WHIRLPOOL d6180ead44195d9c273bffa0afce5774de1dd2683b5af4ca566abd62f64050ca6faedecbc9892ffd4481a8129984767899b0d6c00069466ab025dcdb60b6663d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20151209.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20151209.ebuild
new file mode 100644
index 0000000..63a83f3
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20151209.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-12-09_00-02-04/zip/netbeans-trunk-nightly-201512090002-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 47e77d7..93e6485 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201512030002-src.zip 209171687 SHA256 d79cd2853d8d34
 DIST netbeans-trunk-nightly-201512040002-src.zip 209178833 SHA256 9fbb70be4c026ac0ef12f1a44a361fdee99cce6234920c68b045526d00d4fd75 SHA512 90bc8fb97442a61215613021d27bd20e71e5b5ecd63ce41710d761f70faba8d4229ff6e5d023439070a62ad862e497b7f2e4b244e2b7b1183f55c217572b01ca WHIRLPOOL c231908df004a9e519e92827b36aaed93aca4a7802c8b85593c2849c94bfa422744fdb015ac38c07eeac56304443068b612f426fd5455c25b822f68ed8ad0bc1
 DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc64965bd5b8803c50b183bde52daab55dd4a4aa6c7b29bb624f83a SHA512 33072bd5bf9251678c2a28f7418e23569f2012d41c6b9518f3099f58abef39ef7da8285cfd3d96ae4dbb01258a4b6656d6bcc3ea26439eba3fb4b504ef61d761 WHIRLPOOL dac893869ef4aa8f582de77ce8d7117682a981e0e4f68156426eb41d31d2f0a55b08438979e9ad176efe0f86285d0af43ada75f34283a7deb40f56a8827d00fd
 DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd2312ceee02e5b5175bf7f94ee13b0552e02be72250922326ae4d1 SHA512 f7a48ace418b6dfcb52c4dacbade6d7c675f431606927fb8a201ae091b6a2366cade7eaf756b108e5b0eb4f285c94d6228e74878d7fa5d3117c28e77df2caae1 WHIRLPOOL aeb5eafcedb7f2d108713f801cdc1f3972dbc1f9589d29f7d84f7eeebab6a970a48b05f2672eda41bf282faf3a6ed987917cfbfc30b0b1bf873af894c5bf18af
+DIST netbeans-trunk-nightly-201512090002-src.zip 209228578 SHA256 dedd023e1e8fe3ad332bf923abf62814f76a02e484733b724d16754f3da958a1 SHA512 c7aa770074a8f4f4fa13190a4facf829d2dc6de5a3c8045ba79e9f5689332b506ff1330470dea33b38b1b7cb9e17361eff71d2b221f0fc906bdb8cd918ff2e8b WHIRLPOOL 96be2ab1293f0ab957b7da2c3266f2b4d77ec7b724a9c1c40045f512ad7ec9c99919d29643aaf1ecd8a7667321d0468eebb71f3219e117d214da618ca105dedb
 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_p20151101.ebuild 3416 SHA256 2513cc485b3ab336ca2cba343e13a040690933fc67db717b5ad998f1c0fadebd SHA512 a662009f5fe30f174ecd56d48e2944ca8b2015cb055e165b37b9bf74b00d5eafb028acf1a29033cc93671d2354e12515d76f63ea4c37b0183bbbfe03058cde91 WHIRLPOOL 9fe7eb4a9206ccb18573d885d17333417bd19bb5ba543e658c18dd58150f768c356b8590e323d0fccb14f2adf65fd6d54c7a3ef07d88e6a7138927e646153ef1
@@ -66,4 +67,5 @@ EBUILD netbeans-groovy-9999_p20151203.ebuild 3416 SHA256 2e8908b04228bc44397a916
 EBUILD netbeans-groovy-9999_p20151204.ebuild 3416 SHA256 bcbc7c377f32f00ab955a63efd419ebf142a331b2470150f929be102a9ee4716 SHA512 617678f7079f2c5e9f105632bd9175f808927489a0215d496fc788afc078ab1826b59d7e0643416cd91a4d6e5bd9ac487efe019b6eea85bddb9cde552dc5773f WHIRLPOOL 454912dfd9e2545b95240f1eee576d02d3c5de019cbd000350c367b3236f70412105c8e9412329353072d900fe5d2543ec691a02e7ba79d585f577de6325656b
 EBUILD netbeans-groovy-9999_p20151207.ebuild 3416 SHA256 88634cc16af83497755e56c5226c1c5ace9a3dd34813bf113b5e9f7f370c3e7d SHA512 cc64e85998d122bea6a2e63407df9c266bb739f7557be9925dd0f0607dd2fbb42b08385f5a7736f2ac7158d95e4bca7b51c85503d0e8a3b17499802183f95bf4 WHIRLPOOL b3f561142a832217b73f7d26e876236031fd7eb24ff9991dae2abd61cb02f081d31e9e1af4080a8b8aae750bf2b557ce2457dfc47098ee029b4720f6c49a065f
 EBUILD netbeans-groovy-9999_p20151208.ebuild 3416 SHA256 bb48440d3492a350625be02e6adc7848a6eca433ed23c69b8e2869a8a3acb9e4 SHA512 17d43ed8e76342ca6bd329fa28ed1cc621ff12a9e13753fe95211071e281e0a2a15eb5d2c28b1ff359735352b816697208db3b351e850cb24b7f9f52c0059e90 WHIRLPOOL b2c884d7f1697ecefaab7d43b838cd9104ba9594e2c2323c692d2e4530f40f75cb852dcd6bac8afef897d6b1fa5a6b553201b1e8dd5ead1a3d44c8c0f05bea15
+EBUILD netbeans-groovy-9999_p20151209.ebuild 3416 SHA256 0e308947517cee94d4cf470c015464c5ee7f5d26851729eda68b6d4060c5da5f SHA512 dac269f8d9ef64bd54139d25caa53275c84ed2d89745188a48115e039adc879cbb3966852e32cbdb0b6e2fff5e9f489d405612093514a85f1618973b82d2a0f3 WHIRLPOOL 7cb5c07aceee2d21fbae897ac26b6480f1690d4f3aeb7b0aa2a37a14753dfa70c88c54b471b7a5228a11a47357f0ef527fc2c25f15625a6151f3df1d7a5ec3b1
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20151209.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20151209.ebuild
new file mode 100644
index 0000000..e2d9c2c
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20151209.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-12-09_00-02-04/zip/netbeans-trunk-nightly-201512090002-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 87e006c..32fabf5 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201512030002-src.zip 209171687 SHA256 d79cd2853d8d34
 DIST netbeans-trunk-nightly-201512040002-src.zip 209178833 SHA256 9fbb70be4c026ac0ef12f1a44a361fdee99cce6234920c68b045526d00d4fd75 SHA512 90bc8fb97442a61215613021d27bd20e71e5b5ecd63ce41710d761f70faba8d4229ff6e5d023439070a62ad862e497b7f2e4b244e2b7b1183f55c217572b01ca WHIRLPOOL c231908df004a9e519e92827b36aaed93aca4a7802c8b85593c2849c94bfa422744fdb015ac38c07eeac56304443068b612f426fd5455c25b822f68ed8ad0bc1
 DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc64965bd5b8803c50b183bde52daab55dd4a4aa6c7b29bb624f83a SHA512 33072bd5bf9251678c2a28f7418e23569f2012d41c6b9518f3099f58abef39ef7da8285cfd3d96ae4dbb01258a4b6656d6bcc3ea26439eba3fb4b504ef61d761 WHIRLPOOL dac893869ef4aa8f582de77ce8d7117682a981e0e4f68156426eb41d31d2f0a55b08438979e9ad176efe0f86285d0af43ada75f34283a7deb40f56a8827d00fd
 DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd2312ceee02e5b5175bf7f94ee13b0552e02be72250922326ae4d1 SHA512 f7a48ace418b6dfcb52c4dacbade6d7c675f431606927fb8a201ae091b6a2366cade7eaf756b108e5b0eb4f285c94d6228e74878d7fa5d3117c28e77df2caae1 WHIRLPOOL aeb5eafcedb7f2d108713f801cdc1f3972dbc1f9589d29f7d84f7eeebab6a970a48b05f2672eda41bf282faf3a6ed987917cfbfc30b0b1bf873af894c5bf18af
+DIST netbeans-trunk-nightly-201512090002-src.zip 209228578 SHA256 dedd023e1e8fe3ad332bf923abf62814f76a02e484733b724d16754f3da958a1 SHA512 c7aa770074a8f4f4fa13190a4facf829d2dc6de5a3c8045ba79e9f5689332b506ff1330470dea33b38b1b7cb9e17361eff71d2b221f0fc906bdb8cd918ff2e8b WHIRLPOOL 96be2ab1293f0ab957b7da2c3266f2b4d77ec7b724a9c1c40045f512ad7ec9c99919d29643aaf1ecd8a7667321d0468eebb71f3219e117d214da618ca105dedb
 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_p20151101.ebuild 4125 SHA256 2f6a68f7628e7fc73a6f852e5e0d372e8f922d3d14d3aa510bd3654ad4f2ad1d SHA512 b4e74e591ca42f4129e56fd882ec31c620eb211553091451adab0f494cac91dd8bb81fb3895dc15886b523f4d018994b195ae30aa192f9c98aa885d1ccc33d69 WHIRLPOOL 3559903610cf06401108e6fbae3651ff2eea5b923317e0837413bf262b24938eafa13f2e0d8effe7b86d44362fe586d58575ff8eaf72996df240820cfa504e6f
@@ -70,4 +71,5 @@ EBUILD netbeans-harness-9999_p20151203.ebuild 4125 SHA256 6a85243c2cfd2cac93a479
 EBUILD netbeans-harness-9999_p20151204.ebuild 4125 SHA256 62d55aa91e87e1c70b4312528d07dfc269141e92d7899369e3d6f97cf3766e0f SHA512 59cbc4a92536ee1fafefb99db91196574672e0b6a3f289f76ebc1a3152f63618c5da243120ed44f2f7953843f4739d7f4e6986fc107638f8849241f072c9454f WHIRLPOOL ec4fd2334bf565cea7f73ee69b983f439adb71532640890eb2cee943b82d9529ab3cf4e7d4684e00ec4df0389f78fad2f4479dc4312499402ce945689198a774
 EBUILD netbeans-harness-9999_p20151207.ebuild 4125 SHA256 68f32c6a67fbd8f1ff45a9099b8b3ead7444539caab2e9cee524e54f1f58ccb5 SHA512 634b123dea44d9f295f2cc7ece2d5f5f0c72e8ac0cf6a5e41a65bd94121ddb0fc6f38400cc2a07de5f8fe521fd5f857c08d5279f38a05a25efcd6fdb3fee499b WHIRLPOOL fc3ec5b8e96433238b3edf946c1fdd08761c9aed98239e1cd8593ddd1175b2295e0f93667088fbee94190c1b7d776a0416a84771db9e4354714bb9015622f68a
 EBUILD netbeans-harness-9999_p20151208.ebuild 4125 SHA256 3a05e0258ab5a4fb99f09ac043092d6bf0fbbf64446f1b7b17de61cbd53216f5 SHA512 9e283b72dee9294ab634561188830642fec7ff8b5d4faba02ee2a1bf4500ceb8228c842dfcb41c0966240b345e57460a9f5f0af6c9407a3215abc773bf27ff79 WHIRLPOOL dfad8037522d4c2fa98dd0baf9a53cc158cc8b38c9faa76c3f0d76674c8711033596517781ee0047b6efc9ccb7b38f51a4d9eabf58089c7f201b1327f21333df
+EBUILD netbeans-harness-9999_p20151209.ebuild 4125 SHA256 e05d07c3bbff98572ad218ded02752944c7de422b9330186541319a743812d99 SHA512 cfa090426a8ae44a90ea8eb532748a93c30dc9ab49ad751dfd14ed2efea5b60a6ac3d0d3328aa33861d5a994ef552bad88aec4f8a2c3c5f1b994a05d4b78f34a WHIRLPOOL 17343468f68d665db81581343bd57b44c64c0f9b4112014312a8942d3bec96b5284f28a30641b1266a376a6a76ec11f9569e5d87b191cb4a1152ed1b0effcb1f
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20151209.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20151209.ebuild
new file mode 100644
index 0000000..a8a30bf
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20151209.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-12-09_00-02-04/zip/netbeans-trunk-nightly-201512090002-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 c043f75..0acc2dd 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -8,10 +8,14 @@ DIST 0FFB9B1D7CD992CE6C8AAEEC2F6F98DFBB1D2F91-org.eclipse.equinox.security-1.1.1
 DIST 105DC9A1A93E6EA9A6CD368AD12897B1F247D6AE-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar 63304 SHA256 ba13782c94df1fe0781e98126a0bb53386a648224f85c8e6346566fcbf8cbd5b SHA512 47740926f159a260d12880b1fdc03c9583524e478dbd085c4e353c791be0fe84e52d0bd2b8b675d5d4a1439c95067f416ffa2452c26376b865e6474f393448ef WHIRLPOOL 078251311547ccea46f87ff7507b994e79de11db987c4dea3104e93fa0d536dd59eb545ebb823948d5a70999b18bf995524accc7578abb3111c7ff9754d2ee79
 DIST 11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar 82072 SHA256 69a649764da634a6fd30d3d4e0d0e2ad330e1836e5ba0eb04c6494459014cfd4 SHA512 b213dff423d636429fceec190664d4493c94ea828361d4b6296c5bfd796bc33662d56a3b36423ca7c3c712e21c69bcdcc42dab33a9c88de29651f07539b8c645 WHIRLPOOL 2629d0190a1f5a331e731c74b60fc37422aed5874a887dac6db2088f4edb5a01e19eb1c2f93cca665599eca0244281a7f03ec37e15bdd1de8da4c8daba655eca
 DIST 136A7EB3BB9B2559C5F9184B438F108C959B3C03-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116.jar 46335 SHA256 695258f8e819d274fba3356c035ddfe12a39464a770e7b0a9bee30ad45233d01 SHA512 bd51d73f0afe58a6ce61566427b46dfdfe877aff401233fb5c58f9bce4b0e7fe8c30bffb16595bca1af6bf36cf9c2f4f1f3c841419c506b1484f5566658a818f WHIRLPOOL 7475afda3af8e12113ee19d87ba6f3098dc2a737661fcb6d095c4067c5efc83e0219daf5991b5ce52db9232365b54165e4273bcc68b0d7a3c825f0e44fbf89f1
+DIST 1605B38BB28EAE32C11EAB8F9E238A497754A5B8-org.eclipse.core.jobs-3.5.101_nosignature.jar 82875 SHA256 ff835966ecf297be4440f12ef386368ebf67f3dfdaf67a8b5659b83f81c0431b SHA512 093aef080bdb72a6c5b38d4d6906ad1d51fdc5454ec99989205cd47fa011caaf469a58a8d9f3e3ae3c8bbf4389bca55a6a2e09998846084e5261abce6913e430 WHIRLPOOL 316a10e7e20c6f32de6fcf28a975822f69f6d1dd8f3753ae961dfd09be128c0214d1f1608f523caa1c8c6c7af70d2b58611fc265a5140af030ab1bb1f00d3a5d
+DIST 16507EAFDC2B95121AA718895BDB54D616EE4B0F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar 17771 SHA256 488faae36e1e47c5e349e940a9327be01941d6fe3c1073b76ef6b5b235b5fd00 SHA512 fe7d7855893db867d75ab75f15c128ecba54fab48b15ad541dc042588a96dd965b1278331f114e55b853e0764c0291823acb73f5e2a48eeeaf2f8a985222d82e WHIRLPOOL aed1bf518c8ac74ec35bf10c98fc884eff012cc204ebb4ada464af239fccf2b26f5242073801645456dfb338e2cc1896c939d1271349845d5641a10e01caebff
 DIST 19D64C17A692D2023E22B16AD515118DF6427790-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710.jar 121404 SHA256 51d2484ea7077a10df7b932f8eafe503b5f299b5c6b186d78ebdb12905828e5f SHA512 9e6c2ec92f4e2ae48f73ed8a83ed0e7b5097f4e4afc22a9f30bda56d06e272570f6dc77ed8c62f1ef254e7d94b1463e9735fea11325490da7cca4981cadefa48 WHIRLPOOL 8d43115a28b3e644967a238afb1a85b0cf7aa34d7c660d571c53dddcbfaad5259dc9153efbbdbc09a62bd2e45aa0ebedcc8492bc9047dbdef36dbabeaf72f4bd
 DIST 1B9CBEC0FCB47C279519E52D360199C24EC99B01-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar 39517 SHA256 e02cb20f11208d78e62d08c5b5910bc502a4c4a5ca72432dbbdf33dc7064d578 SHA512 71df29acfc15724586d01a5590785404a0c71b794eed27f161ed946a47e7d7192d374388ab779d2d51b8dd777f1811fe5301e441f7f14c8d5f71890bdc48e9eb WHIRLPOOL 4e07f1b4211e725fb709329bbf3404a9a45f15d8e50626adbe8d5187868b77e87adf286bedc472d0749a13bf2b75a0afd2d13066e1b1220b29590b49a27be37d
 DIST 1FC011B8A350B70950B3F1D722D7F2890C6E76D8-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055.jar 376801 SHA256 9eef4f5c8a3fd617e718b8fb90354d6e5a0871d7ed3b246f0db01311cb0f7c7a SHA512 e21f9f0c5ebe342ec2effa9a3a99404cfbef5e6fe99ff761274dce16af95a0d6ca3c2ea9af928d2538b11ab3aa17ffbc360a1d69f787d2ffea4e7b3544188bf9 WHIRLPOOL 1347011b54f33d03dc699be266bc5b1dbbb6917db541d596bb927d1287794637ebc415c49ce44727a4fc3a6ce89f705f73380c272b3034e2e8e232d0a9d4e03c
+DIST 20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar 62050 SHA256 eb91ad9757701994efc5518d7fecb1d5eedf5a96e165cb644c578b4918ea6de2 SHA512 d38d8675481e3881490f825bfa02da4ca64bed62d06ec75e8ae386d40f4827f8a65c0442edad990069303a03667e8aba9143cea877774458c791d2561a66977c WHIRLPOOL f3eb1b567e192dc96a945e1c333cc52e2ad16ea6fea741ebec678c179540853caacccf4be56c93969990755aa372e148aff9d2d052a79466bfc2e063463c40be
 DIST 23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip 401328 SHA256 c0b63e8b5f246574ce5571e1fbc6b716b68a9e64bf9433800a61777e5ccaf3e2 SHA512 e76ae7f1cb6679bc69534ca9d24dc72f545f8e8fd849f57f746cbc73762729bd872f79c524e2dfd3f481d9d9cbe60a08bd85f383e843ccd39bcbf777db786e9f WHIRLPOOL a53f65f3017cc8619b570e563fbac4185fdc0d52c451386c35dabfa7f23f02544c8493e3d0b9bb4de332cc60858a3b87fe95bba76c5e3149ed9e91e61631da49
+DIST 244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar 17184 SHA256 90949ac61aac971dddb9252044ad5d927caf5c2626f0f1c8ec777a5a380e9ec9 SHA512 a441cb77ac764769695e819a4a10c3ec58491a380489897e5589eed94839c15f9c793a23e35bfe2d9e7bde40e4cb104bbf633a7142b54b3fe1870a246c848173 WHIRLPOOL dddebe6574a0945939d4c9c576d378a68d25b1962b03a502240b42d82feef3ff699413ccbb871443e79aa7197ccf619018021397d0c17c07313e435caeb4258d
 DIST 24A15BD37950663933CC4975EE6E518BEB2C28A3-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar 69218 SHA256 ae22c39cc6f0ab95a34da6a9190734d1b05ad16c1ee8f3db72ccf96390a2aea4 SHA512 b071d3d50443a64bb09a860acd9e18f298ef94f4b264f243b31baaadd0c22bd8d0bd90e1878001d414f3cc888fbe139480fdb838ada90a4b095fd7ecc00e3437 WHIRLPOOL 01e541548ce737ad0f9f2cf58e739f542579c84770ecb70aa25ec64e13f6ba872d901f9cbc8bba00a3bc6b040d7bbf01e93b661f58eeda9c089f6e057f546ada
 DIST 24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.jar 192528 SHA256 14a00bf150c00853ad66bcdca91e446410df1014b2843727eb8249b609ba6d01 SHA512 eee56bdcc0cdfb94914a0e5e075c45a768b7e449f894363e15c5f106bb0038b57be0d3ba802a36038a70a848a09271d90aac118fd6e9c6f422391afed21ebf86 WHIRLPOOL a8ad7690c8615ffef9dee07a2ee63bba2f52119122ddfdd4e90111fcd95988985a069d226556f0378a895d0ede2160b575cd8e66005430d34647ef04f4ba9a68
 DIST 2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip 1530055 SHA256 d36f70cc23578d357ee41f289b43fb76bd78b19b90e8866674061e33acd6326a SHA512 86f6254f45f7cd4cf90fe94f5fdea0bdabe7b547e4e4cff91f27e58ada0fdd17a4ee2f9dcf1983be468da5fd452664e09d0fc759507344f7861b28a317d95792 WHIRLPOOL 757e709747f953cf8ec32eaa0e07fbb8ae2ec81d9bb45dc7d4fd9574e0592a2af80c66b3e00b7f218d34526c7ff3c3ca6f2d9d14e9569eb9a3366ba61b1f0ff0
@@ -31,6 +35,7 @@ DIST 483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar 594732 SHA256 0131ee193a5
 DIST 49F1EFEBC8CECA5D514209BE18A048EB5707C0A7-org.eclipse.jgit.java7-3.4.1.201406201815-r.jar 20417 SHA256 919308457780ea0d905765659715394fce357f58529e0e97986302a652eb487d SHA512 cc011b389cd93c30453a25cf10f7c32bf5967f2411b2a854633bcdaef6c5949b2e4abc8bfb4e252519c90215656c2c4c72934324db9a61d82b039c43e64e00a2 WHIRLPOOL 3a76663ef0c18b60a70b1f385cbcc202fefd8dadd873fe5af94aa32b91896c508766f4b30bc9f54dbfe70b723308c586e1e5f22398bbe1a3f984902981a7a2f0
 DIST 4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar 84793 SHA256 1ee4a742b37818e1bd8c6933f4150439f21d283424067731bf1f44e674a2ce9c SHA512 193fa461f0bf438ee472a738aa29411af5ebeb8f757a3533db8553318ada5770a21b831696ac32dd1576f38d1f83b01ee8b6d1e0f4f23a52d27cd097b1a02a70 WHIRLPOOL 09a4aa03e01e14471f839296bd7aa8d9a06b19c31fec594be5d864b6a27a3703674471c942ae608fa221b79b98221d20ca2167c8a0ffe3e19f2263e147f43ade
 DIST 4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar 164365 SHA256 8633aa79a2566f51a089195e09a4581af3ee71bfc13eb234af5e0cf6383078b4 SHA512 f1300e2d1e47659f6113a0a3dcc953766b5a8ab32f13bedf4d6ac652ffcf828c17474d47edec08d7ad9039d7abb8570770b48fa53b8ff6b47a028836490777bc WHIRLPOOL 765c87803d9cf622ae7936cb922ad9bff8823a09baf01a6c8b4a81df8ba5fd7cd17b513b36da9910b75349de45185f4641680f35be8335e08b9c30283b6d3345
+DIST 4EE275AE73A140A403903D7E4DBA68C8FBB07001-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar 96271 SHA256 f87ba6bf5b25036b324efb1ee611f90f4fb8713375efd1e7d34ac4c9c6f62515 SHA512 ce5cef3b016e6a4353f6eda2f1b672f4f9369d1b2674bef01710c9a285dfab476c1a9d3a9a48023c54e88dcada40049f02fe7c16f5e9fe3e7ad90763c504bae2 WHIRLPOOL 9649759d0a3c158d0f3001e960db1fd7852b00833e1b8da23cd513d10d8d3ad87a9fc06a2b6343ae9d444cbff70248d63edfb4a32ab7254a9011f916d6957f82
 DIST 4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar 454045 SHA256 b2b787575a661911d5e42b7eedadbbb4276e3c7399a303f599668230f8855684 SHA512 dc990c8ccc65825f69244cca1cb37bbd947026da1f5e28229be28c58d82326a37d411e26691d7818a0024aaf8a957311229e72cc6afc3c700559756f067fa7ee WHIRLPOOL 96d39c73424cd231ab2033ff5fbe0f17128ff28136b8605f1faf7d2df9dcb235057bed903d86cf9d1ada60f0dbf6ea1c261b7f1708432f1d236a643efd1e9345
 DIST 4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar 3778995 SHA256 db07fac55e4d689ab4e4107c67679aff116788f488caf35980bfcf7792641651 SHA512 3d9f273fbf1187c69f88a8d5741841f9b6ac0edeb8dd9df0610390bc4f7bbafc63d872621e26c5093dcb792986657ae2d0f691caedd249f7b861d0a552134d58 WHIRLPOOL 7704b47754260e085a1fcfc2a03389e25e7896d4c64babc7b663b510c7eb4dd3289b7e0e8a8f65fc5093eeb8a6e5517ace9d1111083fcc937501555395baced7
 DIST 50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar 37606 SHA256 58358c9e5ecc72ab83ed44b3ec3e95b93302a1337f5885c7055debfce1855a32 SHA512 3cc7744b9a99a3ac9930ea9bd4f8c319bd05838624384dadc22a16ae49490b16fa55b7e18079d5bf845cf45fae4b0144403ec210b71f9c9afc5391bf27825c50 WHIRLPOOL 17ffc2bf97e59cdab5e584578862a13fbca297a950f049ded39de768c808a776d75a15bc7676c932626ed3bbba83f80103e65863fb9187da89cbaf7ac77eaaa1
@@ -69,6 +74,7 @@ DIST 8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar 96879 SHA256 1c0c8
 DIST 8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar 98051 SHA256 44a727d765c92ff87e936531e26407e050a4df659950b7c721f7bbce75b5fe37 SHA512 d5af6d069e31c4e207c342d4808ff7ae83a8bb5a1b51dd5aa3382c11a5268c4705ba27b479e4e1ac0a977eb30ea942c2b1477586374e4b10d909473591f50557 WHIRLPOOL 6897a92a8ad55ece8b30aa49c14fdc65759acf79801d726920c91b93c814941a1786dbf81db2e103694cb122a72bcaf00e5e967b5a570384b993a6a30c96ee31
 DIST 901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip 912288 SHA256 747aae4b1055f3690019794d1fee2dae9a1446d0a06d5c1d3125959f87a1cf58 SHA512 d4dc458485065a1a66b2453d54e2229e3d65fcdfc4b1ce1735e1c1528883c45bf570fb7cd07f0bfed40967ca696542113164f92f7316c81e387979f13e8e170d WHIRLPOOL ac7b10c0d31f5333baba287cac0e3ddf5f7545c0cfd4e9ac89779216d182c7ed014f08d0254b17c60c8b805e55f572ae288c0e43c2e2d3d7b4cbca2d9af2e25b
 DIST 9039A0C1FA0E56CB56A1A192908814478FA747C5-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar 17558 SHA256 88154ba9c36e96a91c57a095faecb1ec47d2d719adab63cf4b0badf1fb61f65f SHA512 442a0ac2aaf374330465a38095904deb211f08a26f4d29a66b3ecf3092208059015206ef469d700082ce4b3fc43b186d6698bdc33e2e6e753836b8c76ab0a8c2 WHIRLPOOL b62f8925ab8b987ba66792faec36a5005b2a91f640fa0745ff309460ba185002d510a9112da2b1df5397c4045039510e74d74fb1c23f0e8f97e97d6023133838
+DIST 9267CF311F979078211A70C1B19AF8A8EE71DC8E-org.eclipse.equinox.security-1.1.1_nosignature.jar 96151 SHA256 ddc8c97ced2ab764fad852c7eea13b7b4b24be81dd0359ec46cc5daa407907b3 SHA512 76bdf219668cc82fabfb2fcd8ae91bccdcb86a97328b7aec1a461bd325813ea5d721b645f5baba062fc8a100a4c0711dc2afb4989d0b3acf041d1e119e7d0435 WHIRLPOOL a300a071b74a70c1de7e6f30eff8798564cd61f830c1f25a0802a021953a017e2564b09f13892c1652c85bb6a6f693e13f37d0056190e3911d6713ee34b836e5
 DIST 98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar 212767 SHA256 3a927e615f0b521ea10e051d38030cc50a7cd2bc8f716b959050c178792b6e82 SHA512 4bc5a2c5b7a630340543141c399ad6d01a18f063e85623098455b9acc81a98fddd3fd58afcf9f5763d6c0d993b231bb2894ed5aa4665742a6ea8a4608d7a4d67 WHIRLPOOL f1a98da2eaf39ac033e0745f0096187ba5207fe57df4161873abf0e289c350267b2149be0c0f9d450cf4a38ca6d4ef516635ccf809c5023d08929aa8f5d72dea
 DIST 997BF4A93B8A99E37AB51C9016D1D18CF5FF4B60-js-domstubs.zip 133018 SHA256 a23589a51a7c4fefd6a0b744a635e1ae59c471646baf6e231c5ea2815fa17b7a SHA512 fa9673fb00294bf76567218d885ac7179732cedc7a7602fa7c730e39fc3f3b57811f1db90011e7af1fa29c179caa1df6b3c6f49e72dd1329d3390e428a4ba169 WHIRLPOOL 3b89a9f4795a7213be0045c402459f69e67eb09edf79485efde3e445a354fa9f93851ea7be08e50ecd9cc40fad09b240f54145d5bdf4f79e95fd911373400357
 DIST 9BC512C5BB9A9F5276B9E8672F6B30AD0BD97D88-org.eclipse.core.jobs-3.5.101_nosignature.jar 84573 SHA256 8d2d7d433b9d65b80f8bcb9d8ff24824f0c157a5586e4f4fa7168dd0dd341d6d SHA512 4003a15c1d83b0c27a26415323ef2af264db79106cae2b64736db3896473e7bce5089bc34d791dd98c72f95051dc813c345e5f58894004479d17597781a1e612 WHIRLPOOL d408defc631a20c471f976875bf488877e782239ba216c4c6fb252e8821e1f1123bc89fc23bb0e81709a98dffd026c0b01d4f848e0974f9d1f4acd0efda5405a
@@ -81,15 +87,20 @@ DIST A723CD3E76C92CFE563B602035532C1C9D3D7192-js-reststubs.zip 10071 SHA256 d480
 DIST A7953EEE9D4D7CD896C7D0AD6D21902E6259979B-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar 98448 SHA256 1f13fa64ddc18275827f979ad3dac8fc49bd1c9c3144708cbda12502cb0a138d SHA512 db0588025b7383c2e37262321dd254f6c8330a96bab8ee19ddb72f7e7daa43ad8cb570c3d9ad97f141ce1e4671d87753a22cad383e66feb98e6b383d82c05058 WHIRLPOOL a926e102ceb1dded9ed73a9cf46f8349969c02081c510f0dbc1ba7d551d3223b4e9866baad4c2e56d344e7adab2e71e7e69298e6b66425545fa594b29252e457
 DIST A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar 109043 SHA256 a7f713593007813bf07d19bd1df9f81c86c0719e9a0bb2ef1b98b78313fc940d SHA512 a1cc0feb2805e08d49229a20cc4423bb52d6800aab3f65723a28ed7d3429455a3f6ef80daaabad7aa89bfb70e4d3c362b268401e636505d1c89bfa7baf871d94 WHIRLPOOL f65a7272e27c16d11313945a241f1b62e5144db32449d1e7a9fe4733a9bc19f37868271458841930b3376149bcb57b4126907845794e8d4f09cfe3fcae0d9328
 DIST A94F8F805202B28236FFBC03C1CA149129DAEA1C-org.eclipse.mylyn.bugzilla.core_3.10.0.20131024-1218.jar 263515 SHA256 9d57ba7cdd807346f20d3eb63e48b95caeb28ecb0fd43bc705332d8fc8c32126 SHA512 e7119eff27beb1405a35515860ee1708dfbff77f4ffdf5547d6f188a6ad93ae0f27a39ff5084c65a9ba657576e7b1ab564199888fd8c6732c567e4ba6292a29f WHIRLPOOL 46816dac02fb160b11fe69b2a3f1ea4890b5cef2204dff4af4913a70704285f5ace636a7b43cddfb688269e6ee8bced5c4072c9544813ffccac8dd14be55a2f1
+DIST AA2671239EBB762FEEE8B908E9F35473A72AFE1B-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar 83249 SHA256 0e17d97a214c48b80862a9d67fced2278923a87dd54e85cdd77c039e44f87fdf SHA512 c2a498cd1e45e5bc815d24370cd3abb1c46a8165fa4b1d57493fe1e24c727c74570ac203fbf23a8ac8c25d121f52450d61d0386dd69a45597dba42736509b9a5 WHIRLPOOL c4759110596f72d7b7541c5915daf17e212215f6377959d99e38c0e655a96ab1b0af1f054c5f919c242ec67a1221b468cb76c7784701ead52bcebe2cf263d796
 DIST ACAB7C860DF78C4A528FD8A64F2C62A0A96639E5-com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar 250812 SHA256 36973ee0366af03f63580a450749d99c9d67d997e9aa877edce4aaadfece7b80 SHA512 303be274fdea65dbb4e322b28dec1e2235d77f6ecefb48c5e85abd9724cfd651c0b50dce4718b7f900e653b050558814bce3644c2cd84a4a267c4a6c45c3e085 WHIRLPOOL eeef4cb475667b328e839967b02f073fed93f444fbf84f0a684ceccc0a4d6773ee387fc46535a72514d41dcdf95db16325f36c6f114a49e82aefbc275a6e1db1
 DIST B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar 90859 SHA256 b3b421fd586c67e0c7f04b879ad527a8a295de222392ded6e68c62b9af669d11 SHA512 8ad97ed698a2dc6a8fe94dcafa142a3794a1497b7c67497c9d7345fdbbc41fe58a7181e5e38be186a988c5b70cbaa97a16f79299982da414c176b1e07bddaa2d WHIRLPOOL 989f8209bd9369330f4cdba8cdce15f9242c02b3ffa0c8a3a7e2981b77f5186b5e9905f84cb162a045201c31baad9607c8d36064201d630339ae0a5128e0f646
 DIST B19A4D998C76FE7A30830C96B9E3A47682F320FC-org.eclipse.core.jobs-3.5.101.jar 91069 SHA256 b0be6467c50f5e4a25621b6bca0a71c58cb7d4e6d621f2b0c4e68f201d5f3716 SHA512 7d7ab2c32c79895ae78a54c27ae2aabc1ac5c36513f92b568c3e09369851285a848c0bd93bbfc1b9353f861889169972e336b470c0330bde81f9c5705e201d2d WHIRLPOOL 2ae21f664ee1685051d34273e38bd7f6edb4f8488706279026c40ad882d80a6c8a02d78bd16ea3011d5c6bf2b4a9aab62324514187cf0673d43e10228d1a8b88
 DIST B28B8EE777232102471EA5334FD70E20851845DD-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar 415360 SHA256 08e4927041f40b649f1c7b3007ea7ed26343832d527243ef9e84c5e1e714806b SHA512 b402fe59dfcb283b82222527fb25830439249b4645eca4943c2f3cbced2ba725410d21348eb2c14f79eb972cd8acc08a016dbb89bfb5ae0ffd936620aff8b77f WHIRLPOOL f579a99ac56c82bea3db9ae410cfb76f0a5964253fbeb1fdc556cc790ee1e69a95da29d328dcddff9bd9533bef48fc84c52baea52093e13cf3106bb26a2447b5
 DIST B43E7CE55F0DECA3BE1A6E695A3E3ABC6D62567F-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar 75182 SHA256 73ccd0337d09f122923ea316709fb8ea1d78ad125b69c6533d367534c6f40ca0 SHA512 fa50a0158d1e0c32453f9a19c2ff0d3431447e1ea5399cdbb0db607718f847c17a692a5ed573c916af50790a0ef01bac27ed5101c42c12a27dd0aa1561185a28 WHIRLPOOL 14fd059614a1d6cb0374214b2b4e4670e0a96e41b60b1dde32959450ead56c6121e320dd21964d35e2cd39fdb4ad9e89f2fd9872b5fd64ba4b4b5dfb44d9c702
+DIST B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar 1855307 SHA256 87c41cb4f4b0a3eef52c95bb7ffe336bad3cae489feb1bd967cab1db84e09377 SHA512 6de9c15374c83625d08eecd7cc1a95bb8dcfeb1f144246709b955178461bb344ffe9a8abeda01c77ba4c9cd0fe8074bdbee5196087d5ea1d548f14fdb27941c7 WHIRLPOOL 176d7fe2afe0e97be0849a720802983bf801249fec20f20ad7dface52804aabc52c2f96f04d61ec4e9844af45847f525993cdc6a3f6e7a18cce584d7170e2b7b
+DIST B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-org.eclipse.equinox.preferences-3.4.2_nosignature.jar 103974 SHA256 bf30e8fba29938d17aaf8f09697abc370f44adadf7bb6eb51e0211dfa12b84c6 SHA512 7644f75ac0ea9b0caeeb0657e9d05624c61d86660c3a9b33bf04ffc58b8e7c21adf74443e52fecdf434458b32ceabcc0f9919ad5671b2f526a02d7160e2c6570 WHIRLPOOL 122d90bb497911cbd7b9896d3b79ab3248b2a8a3d765235458128454f028039143999c683339ec36927c5137bf90d6e11429b64497e8c314e3ad0cd82f7eac71
+DIST BD55836AABD558DC643A7844B78866AD990544BC-org.eclipse.equinox.app-1.3.100_nosignature.jar 77903 SHA256 52bf777bc26627923e56d28d0089962cb1c953b1266113745e5974a7b40b83b3 SHA512 b1e2ac5dfce90d9d8c7a8ad0a9ab2a7e8d5d5e7c7dd64a565ed564f90243940e577fa1d2618301f12f9f69393339f6b9a4d3e93e16cad65f4a7103bc4c3e6929 WHIRLPOOL c32b0f5a1696c00be4787a5fc95eb225b7885795c76387b5307aa92ca773b80c35401304c7cc69d134bffed580eaaf6db589b86f38d004dc9f747d6ba0e772fd
 DIST C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar 1487304 SHA256 5bc8bb080fdf3ef968485ae90f7877fbcfc05b2cfe4753824acb5a36a1ee2036 SHA512 7c1bec8fc317a13a0353ae95320bf57afb81997e4bcf484b365ad12940c4eeed2e414ec01ded4d9b6bcb4239d59baaf78e2b51829fbd28dd034d768193d87a7d WHIRLPOOL d93252d0c59913213cedd26adefcf9834ab45be5fbcde2a3406c7af74fab31d73ff422a49695911cfcee3e2247e9dfea872eba66b4901c35315f644983c40f7f
 DIST C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar 90597 SHA256 497ffbcae6d078d60f5f4b58f1183c969017bcd5ef36dce3e28bc9c5816d6006 SHA512 f885dbab5f03508ca4d144558f8db5b855d643cf037e7c136b5a814826613204c7e22c8f77d3e696e1cec28fdef3b84230f132344829996c5a123716476d7bbd WHIRLPOOL ba621c752a6ba520cc410a81e32150254610669f9d1296ad12e96d8245c1a780b1ce89a401fa160d73a987d6f3ca9914b875651c209bfc362b1513735e108d1d
 DIST C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar 3476101 SHA256 80784f12a5fe3d459af3c577cc58b7a8aca59000263ce4ee190319332b4f7941 SHA512 6b363137fd38afa1e860749ffbac3909ab921c45de657ea4eee8cdae58726a822be6d9beb15c3e8a4928e28ea1d52d2d53c39d85ef068547ca3dc669f2874fcf WHIRLPOOL 0a7da8651a9f4101089ecfe39100b3e6b7cb4bcc34f28062da4864459b9a300ee6314eefb19255133625ed1242f387537edb5f9ab4107aca0ab81e70c1879dd2
 DIST C40DFDACDF892D1BA14B540B32C11B6F34659931-exechlp-1.0.zip 272104 SHA256 953d0058c729948f3220a852d72757b30364537a409796a36d1fb91f5b1471e7 SHA512 b0a6e0123862b048ddf91efd032c684fd395e32986752aceb98637c686c5d01c4c877850b74badd512019f026f14e7bf7923b7f0eb42fc89394f94d8c8745180 WHIRLPOOL 9e665d533c14b67d94dee5ecbd6b0c994873256e0ae9e526f199df352badc317db9935314e55afa0a51e843b019b81ce107faa16a125c0a448f66be9bbda77ce
+DIST C647079E36A4EB7A24AED2C545E4F0F94194C4D1-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar 170502 SHA256 a18562ad3f2766d38c687883158a00f6670e2ce2773c63c1def8b28118d07835 SHA512 9e08442c20537cd5ef788f623792e83429e9a534bf14d1c48c8031393f25c96fcbf2cd87ff9a37eac6908bd4fb2a4bc478fad95f38779d773e1ecd842d5807aa WHIRLPOOL 20f1e80e239aca57e1655a7b0fadfb9108ec5487736d25e8e39e47983c03815afa32e37beefe7e385b6275d42cb553581ec25ac6842648629bf966372706d214
 DIST C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar 18627 SHA256 a8fdf6cc2afb7e11c7ddc28cc8e7242e7678c65186a78429b81a0bffec9a200f SHA512 378028472842c9c8b029da44ae27b55dba7b3018ec15dff874798530792a03d4f4949ac644f6a172e7b47702b748fde0e652c9089f51a3f6a03c06ff2b356f8c WHIRLPOOL ba5960542254d4e11290811000bf010e1716d71698942be6f27dac3fdf5ed6a3956ef8280891ba975cb5ee896229305db15430a5e7c021776546317a04990c35
 DIST C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip 205743 SHA256 d8188e5dbebbc90dc08a65013fa3b1535efb919ed739d7d0e9e7d927cfe7d796 SHA512 17555962d99e880478083f2eedb65e5e07288d23f541971161e433768928b19f9864592bdd5a06c789cf35e7b1faa18296ae0832fc5d38f6e6531d754b12e816 WHIRLPOOL 23f84b52112ca62d05ee391e4c0aa46319ca92bb19f4a5856868374ee266f1670b753530c317fe9ed0fe9b10a57f60aa24b17e922155c6aebb759608240c8e92
 DIST CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar 280983 SHA256 b35ad597f17a6f221575df2f729a9de8f70390509e047680771e713bad713fb9 SHA512 680c2072b301cdf19bcb3525a5292874d4903dd1cd0fd83b9affb46354894cea4a2fe192414da5c82ed125063365b8a1f1a8f23849e8ed7e4a2378e8a9249ea9 WHIRLPOOL 2d8b07f197426a7178599d8596b5a743934905d7b4d4fe2dc01943d4083077e75895951f7b945479fc0a6881436be3f0fe7583f92c8377df2a440c93a513b1a2
@@ -97,6 +108,7 @@ DIST CD5919A707EB6B5C1FC29964C8EF5E2CF3F5A3D4-org.eclipse.equinox.registry_3.5.2
 DIST CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar 406767 SHA256 4525fe21d3889dcc8b8b4edf17310e7b361696fcee2006349464aac794b535e0 SHA512 1d8b502956520c98bf9084cc63dc1e926e8061b5fc01931d6fca67274edf1c4f7d8524e942a0f911baaa95a3cc285212a938a67fd92899630ecbcfaa10072321 WHIRLPOOL c052dc3c571dc07e5421ef2e2d60015e23c1c2641d3f07ac2c3a438290aa6e138ea1f85370f5ac2d300ec5bb4939fbcef87fdd24890f380260307113287b6d96
 DIST CE9A1C96875443F2FDD5127B750DA39CF4CE818B-com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.jar 250793 SHA256 cfbcb0db40e6b06f638ac44ab076a88dc7c10fa9b3390825dd366894314f3f3e SHA512 5802e166d9d5a543c243edb8da35cfa32c0d492802e0810f96b877f8b581c3046c9250b790ce8a10c92c442039b6a60f17f17e491333bfd0db90270f522890d4 WHIRLPOOL 4cf80f38ff63e072581cd3c77222cd376f5502d150571a55fafb67af96ad59296c98e64860e96c9cb19488cd7880e5caecd2c6dbfa13134c14b510d2d4551b31
 DIST D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar 91192 SHA256 7773cf51c1ca92e52bd4565198194ef4f005fca565b32596cc732d4b6e072943 SHA512 b9345b5ae4581169783652af7b1975cf6a67b2bef645251ee10b47d7b6e89c1516acfa0599a507ba57e95a5a82afdcb32321a2e17abc2e1ee5545f24b112deaa WHIRLPOOL 167e3fdb36e5045d326166b639b915e68510c0e1624172baa10f131f29d2a7f3e4d71808fc2082cb3e83e9f513bf2fd83974adc0824b71c0511833fed846641f
+DIST D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-org.eclipse.core.runtime-3.7.0_nosignature.jar 63557 SHA256 8db5158b094a8841fd21d15d9e20be975785b539cb8d349dc5b39f170c3055db SHA512 b1db7cfe17a592d49e3e751ab48533236f397ddb453f3d0232232d723d0ed0204d46dee7ced39d0611a18fdcb9b4531001142770cb2dcc1973588f3c845d866e WHIRLPOOL f443fee929a1170851c739a4d1059a277757aad2508e7af08f88510d9ba38e2095f9f7731b280871e4e5bb2074448c387e3f2274158827f315f0f803a8bcf980
 DIST D3ED088A49DE9E5163457E9279181DD4185BFBE6-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023.jar 434027 SHA256 0f27e304afffa14dae2932fb16588846f1f8b78b11e9bc5562ebb40c6c33c237 SHA512 f0758b9bce6ddef27f8bd60cce8ed9b4874b45307a64d9b9ff6a62519fde5b19733c3c236686bde4a1d87a94e7a2dfc08cc8d03bd3bb28a6b297bd40a8272fd4 WHIRLPOOL ef9c2a9751ceec4108a9523f29d7401bcdc6cb79f6cfb9d2a55b2b2d3236764da3606fc128a469ee03a6800f1d03aaec59934910a112813d6101686238e135b8
 DIST D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar 124303 SHA256 365d5bdef863bdc5104784da6c67cc4cac399f9a87e6d5a60a8471945a14a02c SHA512 97af2b5023748d8ac63c0aafba06073cbac9a30919e53fe8fa628822de54bdc5602770736fd32fc1e8dccf0e1fef8d826a1322ba6e2eded6ca830115f1c0394b WHIRLPOOL 924ebfa72c4d2cfa4b26fdcde7b57d122b39a3b663d8d94ef53abdfb40465502cd16a979de3b8e11834b98569eefdc9329cfe07f19c85abb98e2f4af42ba9725
 DIST D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar 290305 SHA256 5a66f5d12058cdaddf6f945b419c3b2f7fcddbd5e6d3a933ccbebaad569452c7 SHA512 ea583899ebb31f7f55ba5f4e53008bdf8a2e79d472741f288d6b26b259aad788e0c67b197dba5445cc5c269ef9872c6c11b023212482ac7b0a160c777e7be597 WHIRLPOOL 54b52d3946db645db2e9ce608c965abf780e3cf282bb7c4b4ea715905a3ecb148399c62015fa50b8cd098692ab9392f18f8e17340553242829b4a98955235627
@@ -152,6 +164,7 @@ DIST netbeans-trunk-nightly-201512030002-src.zip 209171687 SHA256 d79cd2853d8d34
 DIST netbeans-trunk-nightly-201512040002-src.zip 209178833 SHA256 9fbb70be4c026ac0ef12f1a44a361fdee99cce6234920c68b045526d00d4fd75 SHA512 90bc8fb97442a61215613021d27bd20e71e5b5ecd63ce41710d761f70faba8d4229ff6e5d023439070a62ad862e497b7f2e4b244e2b7b1183f55c217572b01ca WHIRLPOOL c231908df004a9e519e92827b36aaed93aca4a7802c8b85593c2849c94bfa422744fdb015ac38c07eeac56304443068b612f426fd5455c25b822f68ed8ad0bc1
 DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc64965bd5b8803c50b183bde52daab55dd4a4aa6c7b29bb624f83a SHA512 33072bd5bf9251678c2a28f7418e23569f2012d41c6b9518f3099f58abef39ef7da8285cfd3d96ae4dbb01258a4b6656d6bcc3ea26439eba3fb4b504ef61d761 WHIRLPOOL dac893869ef4aa8f582de77ce8d7117682a981e0e4f68156426eb41d31d2f0a55b08438979e9ad176efe0f86285d0af43ada75f34283a7deb40f56a8827d00fd
 DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd2312ceee02e5b5175bf7f94ee13b0552e02be72250922326ae4d1 SHA512 f7a48ace418b6dfcb52c4dacbade6d7c675f431606927fb8a201ae091b6a2366cade7eaf756b108e5b0eb4f285c94d6228e74878d7fa5d3117c28e77df2caae1 WHIRLPOOL aeb5eafcedb7f2d108713f801cdc1f3972dbc1f9589d29f7d84f7eeebab6a970a48b05f2672eda41bf282faf3a6ed987917cfbfc30b0b1bf873af894c5bf18af
+DIST netbeans-trunk-nightly-201512090002-src.zip 209228578 SHA256 dedd023e1e8fe3ad332bf923abf62814f76a02e484733b724d16754f3da958a1 SHA512 c7aa770074a8f4f4fa13190a4facf829d2dc6de5a3c8045ba79e9f5689332b506ff1330470dea33b38b1b7cb9e17361eff71d2b221f0fc906bdb8cd918ff2e8b WHIRLPOOL 96be2ab1293f0ab957b7da2c3266f2b4d77ec7b724a9c1c40045f512ad7ec9c99919d29643aaf1ecd8a7667321d0468eebb71f3219e117d214da618ca105dedb
 EBUILD netbeans-ide-8.0.2.ebuild 29317 SHA256 42218788ab0fc7c7cd1bb42a8b0c72a66543a3260b752aa55365833c355bcc63 SHA512 c712b66b6bee654390a45e5c616479df2be624bb770f3838d4fcce875f71a8d165703dffd55c4fd7d30e19c392784203e5fe01e2404907d88c935d439efaf578 WHIRLPOOL 67763e4a36215ac002fd321556ce2269affc15ba48ad5069d7ccc746d918179994f174e09305a9d9ddadddbea690778c2769e0ea1993eafc09e01580485e2292
 EBUILD netbeans-ide-8.1.ebuild 30288 SHA256 783332022c33a787ededc22d5250e30e1a91676508076fddc69ec64bbe5a6e7c SHA512 402d72f8b1a4e849dfe86054d466afeb0ab3987cd5ee747d3173874cd875fe3572be9e3ccd639fadf9e329db92e7543fd68dffc497805aa4d40b1d008c4a79ad WHIRLPOOL fd2cd798a1763af3fae44bb0eef0a4c4d932ffead6427e27d3483639348d969598b9c81d8949a3950ace1e68d3dfa0e08fe0c787b201b0cc9a95ea0040d156bf
 EBUILD netbeans-ide-9999_p20151101.ebuild 30334 SHA256 72a40468cc80008e8aaf6351b8f473e976e96e554b4c7d685874089571548d1a SHA512 bf57fd175dddb4f6590f011aff65af9464b48cdb5332f73b6e486d4dbd9e4d65f3bc65727493b47fad701f91b61e6b9d2435f419ee67e0977fe11ed378e84305 WHIRLPOOL 32c8b9f2887c68105b9cb19bb8c747efabfc9a89e9c28f763a37c5cb4e09e935f16aef6d078817ae3093adffe0e6986718c77e74b2ae51512d5cc30f73be2ee0
@@ -184,4 +197,5 @@ EBUILD netbeans-ide-9999_p20151203.ebuild 30890 SHA256 ffa707e76fba78af941f6b185
 EBUILD netbeans-ide-9999_p20151204.ebuild 30890 SHA256 9732c676d4f448e5ee8c7795ec04487465b4bb172197ffbafe4d678678ce92c3 SHA512 a6cdc35c9c8d2bf7b26adcf7ca9c3cd90cea4677e1cde8bd7b852000b6f7eaaf838f75be4d5f629f06e1f378d1dd98c8021e55ab8c34e269dbd842640ef23520 WHIRLPOOL c0bb6a9be9a2dc69b335b50b42b952aa8ad0190b26362b69217521185dd2c6e585e1dcc7ffaa13d6fb629b23ec99467b2b9e277f2fb717511aceb8ffdf8fa475
 EBUILD netbeans-ide-9999_p20151207.ebuild 30890 SHA256 936670a38886b870408db0b76e6facbd72650acba1c266e8968f8b3c8157f82c SHA512 3bbd3607d00e0e408670e4160e421c2471e4f9d4fe2e12beb2a73e26a246f61b6f660d555369be32f3f33209257291179d56c1a3ff2d0221b9f6c13e577de03a WHIRLPOOL 9fb436d024c1146ff5e0f8f6e1e077d1e13fe2fc2a9b65bfcaea4bbdd8a5333cccce57ef427e322d1c3783119b505ac326f278c36d6b1b03a7e3fe84ed986a5f
 EBUILD netbeans-ide-9999_p20151208.ebuild 30890 SHA256 b9afda72df571a38f28518313694e0d23fe44232986b9461dcc37f7fbe1c20b9 SHA512 b8400349c5060e7211bd3157992f2ab0e9a4f94908af20f2c28d1015af82f9f5bf51dde5dc0998202f463e0c0bea3d9501ee578ed5031924bf1e1ce7649be773 WHIRLPOOL 4d6303e52fb4a2bd367442618a309b4f8f5bc888ab6ad47b49b18920f29f91d5337c0573ae258860fdb850730f49b811396ecf207bab302bb462056e3a2f8972
+EBUILD netbeans-ide-9999_p20151209.ebuild 30890 SHA256 4f4ea0a40dc095bf0aac7b472bce1442dfceb365f380dd5f8df800651152ab80 SHA512 8cee4736cc52f2fdc31a1e8fde06e31b3db02456ceb503666c6029e6292b4c223a36ffd76c82deb1980181890df33df18ec81dae0ec62f89e881e8b145b4cb6a WHIRLPOOL 052463f32b4f857500780fbb244cb1aef17aec914ba1c272af267d6d9b88693a67eabce123f97b93a74183228ce68c1de7b7bc8f88d721b4be2fa4830ece31c5
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20151209.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20151209.ebuild
new file mode 100644
index 0000000..da84ed0
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20151209.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+# Maven cannot be unbundled because it depends on exact maven version and exact content of maven directory
+
+DESCRIPTION="Netbeans Java Cluster"
+HOMEPAGE="http://netbeans.org/projects/java"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-12-09_00-02-04/zip/netbeans-trunk-nightly-201512090002-src.zip"
+# jarjar-1.4 contains also asm libraries
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar
+	http://hg.netbeans.org/binaries/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip
+	http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
+	http://hg.netbeans.org/binaries/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar
+	http://hg.netbeans.org/binaries/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip
+	http://hg.netbeans.org/binaries/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar
+	http://hg.netbeans.org/binaries/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar
+	http://hg.netbeans.org/binaries/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar
+	http://hg.netbeans.org/binaries/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar
+	http://hg.netbeans.org/binaries/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip
+	http://hg.netbeans.org/binaries/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip
+	http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip
+	http://hg.netbeans.org/binaries/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip
+	http://hg.netbeans.org/binaries/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar
+	http://hg.netbeans.org/binaries/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar
+	http://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar
+	http://hg.netbeans.org/binaries/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar
+	http://hg.netbeans.org/binaries/700901A0DEADED8B0CB89B6B3DFE3F52B030C061-nb-javac-impl.jar
+	http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
+	http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar
+	http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip
+	http://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip
+	http://hg.netbeans.org/binaries/B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/beansbinding:0
+	dev-java/cglib:3
+	dev-java/jdom:0"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/json-simple:0
+	dev-java/junit:4"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}
+	dev-java/absolutelayout:0
+	>=dev-java/antlr-2.7.7-r7:0
+	dev-java/c3p0:0
+	dev-java/commons-cli:1
+	dev-java/commons-collections:0
+	dev-java/dom4j:1
+	dev-java/fastinfoset:0
+	dev-java/glassfish-transaction-api:0
+	dev-java/javassist:3
+	dev-java/jboss-logging:0
+	dev-java/jsr67:0
+	dev-java/jsr181:0
+	dev-java/jtidy:0
+	dev-java/log4j:0
+	dev-java/mimepull:0
+	dev-java/oracle-javamail:0
+	dev-java/saaj:0
+	dev-java/slf4j-api:0
+	dev-java/slf4j-log4j12:0
+	dev-java/slf4j-simple:0
+	dev-java/stax-ex:0
+	dev-java/stax2-api:0
+	dev-java/xmlstreambuffer:0"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.java -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+pkg_pretend() {
+	local die_now=""
+
+	if [ -d /usr/share/netbeans-java-${SLOT}/ant ]; then
+		if [ -n "$(find /usr/share/netbeans-java-${SLOT}/ant -type l)" ]; then
+			eerror "Please remove following symlinks and run emerge again:"
+			find /usr/share/netbeans-java-${SLOT}/ant -type l
+			die_now="1"
+		fi
+	fi
+
+	if [ -L /usr/share/netbeans-java-${SLOT}/maven ]; then
+		if [ -z "${die_now}" ]; then
+			eerror "Please remove following symlinks and run emerge again:"
+		fi
+
+		echo "/usr/share/netbeans-java-${SLOT}/maven"
+		die_now="1"
+	fi
+
+	if [ -n "${die_now}" ]; then
+		die "Symlinks exist"
+	fi
+}
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar maven/external/aether-api-1.0.2.v20150114.jar || die
+	ln -s "${DISTDIR}"/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip maven.embedder/external/apache-maven-3.0.5-bin.zip || die
+	ln -s "${DISTDIR}"/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip o.jdesktop.beansbinding/external/beansbinding-1.2.1-doc.zip || die
+	ln -s "${DISTDIR}"/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar j2ee.eclipselink/external/eclipselink.jar || die
+	ln -s "${DISTDIR}"/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip hibernate4lib/external/hibernate-release-4.3.1-lib.zip || die
+	ln -s "${DISTDIR}"/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar maven.indexer/external/indexer-artifact-5.1.1.jar || die
+	ln -s "${DISTDIR}"/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar maven.indexer/external/indexer-core-5.1.1-patched.jar || die
+	ln -s "${DISTDIR}"/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar maven/external/jarjar-1.4.jar || die
+	ln -s "${DISTDIR}"/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar j2ee.eclipselink/external/javax.persistence_2.1.0.v201304241213.jar || die
+	ln -s "${DISTDIR}"/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip websvc.jaxws21/external/jaxws-2.2.6.zip || die
+	ln -s "${DISTDIR}"/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip websvc.jaxws21api/external/jaxws-2.2.6-api.zip || die
+	ln -s "${DISTDIR}"/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip websvc.jaxws21/external/jaxws-api-doc.zip || die
+	ln -s "${DISTDIR}"/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip j2ee.eclipselink/external/JPAjavadocs04032013.zip || die
+	ln -s "${DISTDIR}"/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar maven.indexer/external/lucene-core-3.6.2.jar || die
+	ln -s "${DISTDIR}"/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar maven.indexer/external/lucene-highlighter-3.6.2.jar || die
+	ln -s "${DISTDIR}"/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar maven.embedder/external/maven-dependency-tree-2.0.jar || die
+	ln -s "${DISTDIR}"/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
+	ln -s "${DISTDIR}"/700901A0DEADED8B0CB89B6B3DFE3F52B030C061-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/jtidy.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 6f8fa7e..9f1d384 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201512030002-src.zip 209171687 SHA256 d79cd2853d8d34
 DIST netbeans-trunk-nightly-201512040002-src.zip 209178833 SHA256 9fbb70be4c026ac0ef12f1a44a361fdee99cce6234920c68b045526d00d4fd75 SHA512 90bc8fb97442a61215613021d27bd20e71e5b5ecd63ce41710d761f70faba8d4229ff6e5d023439070a62ad862e497b7f2e4b244e2b7b1183f55c217572b01ca WHIRLPOOL c231908df004a9e519e92827b36aaed93aca4a7802c8b85593c2849c94bfa422744fdb015ac38c07eeac56304443068b612f426fd5455c25b822f68ed8ad0bc1
 DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc64965bd5b8803c50b183bde52daab55dd4a4aa6c7b29bb624f83a SHA512 33072bd5bf9251678c2a28f7418e23569f2012d41c6b9518f3099f58abef39ef7da8285cfd3d96ae4dbb01258a4b6656d6bcc3ea26439eba3fb4b504ef61d761 WHIRLPOOL dac893869ef4aa8f582de77ce8d7117682a981e0e4f68156426eb41d31d2f0a55b08438979e9ad176efe0f86285d0af43ada75f34283a7deb40f56a8827d00fd
 DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd2312ceee02e5b5175bf7f94ee13b0552e02be72250922326ae4d1 SHA512 f7a48ace418b6dfcb52c4dacbade6d7c675f431606927fb8a201ae091b6a2366cade7eaf756b108e5b0eb4f285c94d6228e74878d7fa5d3117c28e77df2caae1 WHIRLPOOL aeb5eafcedb7f2d108713f801cdc1f3972dbc1f9589d29f7d84f7eeebab6a970a48b05f2672eda41bf282faf3a6ed987917cfbfc30b0b1bf873af894c5bf18af
+DIST netbeans-trunk-nightly-201512090002-src.zip 209228578 SHA256 dedd023e1e8fe3ad332bf923abf62814f76a02e484733b724d16754f3da958a1 SHA512 c7aa770074a8f4f4fa13190a4facf829d2dc6de5a3c8045ba79e9f5689332b506ff1330470dea33b38b1b7cb9e17361eff71d2b221f0fc906bdb8cd918ff2e8b WHIRLPOOL 96be2ab1293f0ab957b7da2c3266f2b4d77ec7b724a9c1c40045f512ad7ec9c99919d29643aaf1ecd8a7667321d0468eebb71f3219e117d214da618ca105dedb
 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_p20151101.ebuild 4976 SHA256 74dfe35637320661d3f26c0de6a0459e67abb6c79754fa85213ed2ad9eac872a SHA512 fe707726a2a25f8e85509246facaddabc57d540f7971971714f3a1c5ea9ddca59c14f7211103d227b3b27f3d05f50c03cc132f587ecaed26ced0bf1416be4b72 WHIRLPOOL 7f194c4f154b65f110be8f9ef230c7cfc1a308361573dd576e8d7a0765f12d72130fddcb564b25da92f0c077764710c6d9a4731428aacd6d18e8ac80630d7cfa
@@ -68,4 +69,5 @@ EBUILD netbeans-javacard-9999_p20151203.ebuild 4976 SHA256 1116148261dbe80f672b6
 EBUILD netbeans-javacard-9999_p20151204.ebuild 4976 SHA256 b6a55692327e63f53e1a8a26cca5df10eb6660946835ef65276ec3cab4f3448a SHA512 00727c8b13e7529032ac60d1c804f89509a8dab7202e61b27a5e7b73c5ed52036b4d9389e17a73d8998f152e331abeaf6e0da0ea83f9478f4a8c30ec5c1b42b9 WHIRLPOOL 0e8fc0defb09b2304d40bd4add6242b6ea2f3d890d7e2fa4af4bb26f3bc7f26778bc257c290375b4081e933e1387ff769778aec54357ebcf321a3d0169e33b00
 EBUILD netbeans-javacard-9999_p20151207.ebuild 4976 SHA256 7a2801f10de550be0f3bef976fa94fd86b8ed01eed31c76d0e954572174dd0a1 SHA512 afd95d1b829f39069c52cfa9f05533d163b1d0b9fd37b01c76917963df0ca45975fe8c5ae8f5d3a13426c391fb74c65a9c7c3f7668830aa37b1ced6c71710123 WHIRLPOOL 5be8de66a1bddbfec7a66d2596ea0eba0cb12cf56b7a5f672e3da4c40b3ed9e2d44568a9b9cadcccd3465c2001c4b45410c2cff15cf47998451143bf536a5580
 EBUILD netbeans-javacard-9999_p20151208.ebuild 4976 SHA256 e51df73075fbc3d1aa3d9448c31335f400d0e78284bf025ef9697bf8e5e413df SHA512 9cb7819032dba4fd1bba944bec8f1f174e9c490357188f612bc7ffdb7f4607c8286d1578c0a54b381393e0f2ddbca2d098d29bba9529f587427f038bf48f1db1 WHIRLPOOL 0bbd424b6b0cb2d49bb25cbf29cb97e804f260f0716599c0cae7632b47a29fda39501e7e183438287117e0d5022b4e0e60947a9c4b429053ade2b23fbd687108
+EBUILD netbeans-javacard-9999_p20151209.ebuild 4976 SHA256 976f26760de8aa7d71229ffebd441cdeca7eb54dee289e766d574a1d4196879e SHA512 1964ec1b2b7a06718d58e20b6023b4d7a1de9d5ae546a7f560e096e4dc4b0f02319489ff24c3a4ce1885f9cebb747c82829cbf24d452c55458f2e62435fd5c6e WHIRLPOOL d27ec64b2df5caf7b383718107c97c781bbb3b79ddc1b49b36043b4182ffe9613240a3ce5370b86e2e893d43d83c9d04dce2b4e13a19bb4fcf18e1480500b7c5
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151209.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151209.ebuild
new file mode 100644
index 0000000..4ee3907
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151209.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-12-09_00-02-04/zip/netbeans-trunk-nightly-201512090002-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 caf7d6e..ae62c92 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201512030002-src.zip 209171687 SHA256 d79cd2853d8d34
 DIST netbeans-trunk-nightly-201512040002-src.zip 209178833 SHA256 9fbb70be4c026ac0ef12f1a44a361fdee99cce6234920c68b045526d00d4fd75 SHA512 90bc8fb97442a61215613021d27bd20e71e5b5ecd63ce41710d761f70faba8d4229ff6e5d023439070a62ad862e497b7f2e4b244e2b7b1183f55c217572b01ca WHIRLPOOL c231908df004a9e519e92827b36aaed93aca4a7802c8b85593c2849c94bfa422744fdb015ac38c07eeac56304443068b612f426fd5455c25b822f68ed8ad0bc1
 DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc64965bd5b8803c50b183bde52daab55dd4a4aa6c7b29bb624f83a SHA512 33072bd5bf9251678c2a28f7418e23569f2012d41c6b9518f3099f58abef39ef7da8285cfd3d96ae4dbb01258a4b6656d6bcc3ea26439eba3fb4b504ef61d761 WHIRLPOOL dac893869ef4aa8f582de77ce8d7117682a981e0e4f68156426eb41d31d2f0a55b08438979e9ad176efe0f86285d0af43ada75f34283a7deb40f56a8827d00fd
 DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd2312ceee02e5b5175bf7f94ee13b0552e02be72250922326ae4d1 SHA512 f7a48ace418b6dfcb52c4dacbade6d7c675f431606927fb8a201ae091b6a2366cade7eaf756b108e5b0eb4f285c94d6228e74878d7fa5d3117c28e77df2caae1 WHIRLPOOL aeb5eafcedb7f2d108713f801cdc1f3972dbc1f9589d29f7d84f7eeebab6a970a48b05f2672eda41bf282faf3a6ed987917cfbfc30b0b1bf873af894c5bf18af
+DIST netbeans-trunk-nightly-201512090002-src.zip 209228578 SHA256 dedd023e1e8fe3ad332bf923abf62814f76a02e484733b724d16754f3da958a1 SHA512 c7aa770074a8f4f4fa13190a4facf829d2dc6de5a3c8045ba79e9f5689332b506ff1330470dea33b38b1b7cb9e17361eff71d2b221f0fc906bdb8cd918ff2e8b WHIRLPOOL 96be2ab1293f0ab957b7da2c3266f2b4d77ec7b724a9c1c40045f512ad7ec9c99919d29643aaf1ecd8a7667321d0468eebb71f3219e117d214da618ca105dedb
 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_p20151101.ebuild 6228 SHA256 dad5cb4a17d24ac57e3d35b1c359acc75c81b122d382fa352d09a10c8a962b1b SHA512 e328af4b6650d46dfce20174f116447806dc06c8c9bca5faeb04bf7dd4d8ffccccd4decb47fc8b5e16e3182509d14a05004d098309a5098ddcb84b2493596424 WHIRLPOOL 759cce5b290a643f421bc2da40c3b6ebe2616948d6a537858fb83c9d8e6822b83575e743307dd6b1a314bfd87a8720d405b6a028214d62b58c223fe50375086a
@@ -66,4 +67,5 @@ EBUILD netbeans-javadoc-9999_p20151203.ebuild 6293 SHA256 b527430a761d83ddce339d
 EBUILD netbeans-javadoc-9999_p20151204.ebuild 6293 SHA256 6dc87090bd3e093cc2ba25c85cf7c7b0db47562604d9fadb57919dad0e46046e SHA512 59be219d4d73c53e0e82e7c692e7ccc1d061da91c1010a40bf71b77babb15cfc97405017fdb98561398f92727ef7f6e65b3c5b4508510431d6c738ef7bf6c415 WHIRLPOOL dc6e460f022694725f8f1c28b1765745f732202e99a9e91f17423efb594518acc2a6ca27faed625f1fb149296ce5f4a5baab87edd765e93eee16d19ad4ec89f4
 EBUILD netbeans-javadoc-9999_p20151207.ebuild 6293 SHA256 d333a1ce7e3bc4e68591a9c1407bcfc13dd20acbd817230c7a7ac1217be71e8b SHA512 33318407cf8d8e76347c1de6d1fc57e4646c6c0fa85988ee2623696867eab211761019ad1dae8ef3b0640b24be04bedc4be129afeda50790c5627c17bf6db0e2 WHIRLPOOL 77725d5d00a362ff40d9079cf45fb80cd89d60d8803ef9026dfbadd9f7eeab3c4535a53e79490f060b86570e0391e662f225bdba5b5f916088e44cede7527e5c
 EBUILD netbeans-javadoc-9999_p20151208.ebuild 6293 SHA256 2c848c37c910372d392a0bb53f04fc0928692be668ee94886dcbb6918890e78c SHA512 2fdd72ab9de0f97a47cdefca4f91cc76c05b9a7e76b00bdc4fd3793a6f9f1f075ca27132ba98f4f048dce4a38cf05b8f0f9a66360c5820a9b8437f9e7e1a6721 WHIRLPOOL b035b930ebad6ef6a99a75a7bdf175230c424badfa18df23da12359f13be98253a53a0995ee9c4078b26f97ee6c2eb0c42fb1645ee108de90acfb329796eecb6
+EBUILD netbeans-javadoc-9999_p20151209.ebuild 6293 SHA256 cca92611983b925b9d052e7aa0986d62f80950fd84b02219c613b75efc789b4a SHA512 b67989062a556763be45f1eb9174da6677ab1c3cb32874073abb29000c460a87593b5dfd92db18a7036543a94d5fdee311054d4bbbb2d489239f3e32a376bbe7 WHIRLPOOL bd65f49b10d1838ccd6d98b2a52e9b890b0b1aa912efb389429fb5c6f975ef60b0b37d3a7d8e563b011a939addb5413e055d04ce18ee2033c38fd6e298737d0a
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20151209.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20151209.ebuild
new file mode 100644
index 0000000..874f1f2
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20151209.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-12-09_00-02-04/zip/netbeans-trunk-nightly-201512090002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+# oracle-jdk-bin is needed because of javafx which is not currently packaged separately
+DEPEND="dev-java/oracle-jdk-bin:1.8[javafx]
+	app-arch/unzip
+	dev-java/javahelp:0
+	dev-java/junit:4
+	~dev-java/netbeans-apisupport-${PV}
+	~dev-java/netbeans-cnd-${PV}
+	~dev-java/netbeans-dlight-${PV}
+	~dev-java/netbeans-enterprise-${PV}
+	~dev-java/netbeans-ergonomics-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-groovy-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-javacard-${PV}
+	~dev-java/netbeans-mobility-${PV}
+	~dev-java/netbeans-nb-${PV}
+	~dev-java/netbeans-php-${PV}
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-profiler-${PV}
+	~dev-java/netbeans-websvccommon-${PV}"
+RDEPEND=""
+
+JAVA_PKG_BSFIX="off"
+JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.8"
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip o.apache.tools.ant.module/external/ant-libs-1.9.4.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-apisupport-${SLOT} apisupport || die
+	cat /usr/share/netbeans-apisupport-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.apisupport.built
+
+	ln -s /usr/share/netbeans-cnd-${SLOT} cnd || die
+	cat /usr/share/netbeans-cnd-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.cnd.built
+
+	ln -s /usr/share/netbeans-dlight-${SLOT} dlight || die
+	cat /usr/share/netbeans-dlight-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.dlight.built
+
+	ln -s /usr/share/netbeans-enterprise-${SLOT} enterprise || die
+	cat /usr/share/netbeans-enterprise-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.enterprise.built
+
+	ln -s /usr/share/netbeans-ergonomics-${SLOT} ergonomics || die
+	cat /usr/share/netbeans-ergonomics-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ergonomics.built
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-groovy-${SLOT} groovy || die
+	cat /usr/share/netbeans-groovy-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.groovy.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-javacard-${SLOT} javacard || die
+	cat /usr/share/netbeans-javacard-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.javacard.built
+
+	ln -s /usr/share/netbeans-mobility-${SLOT} mobility || die
+	cat /usr/share/netbeans-mobility-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.mobility.built
+
+	ln -s /usr/share/netbeans-nb-${SLOT}/nb nb || die
+	cat /usr/share/netbeans-nb-${SLOT}/nb/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.nb.built
+
+	ln -s /usr/share/netbeans-php-${SLOT} php || die
+	cat /usr/share/netbeans-php-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.php.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-profiler-${SLOT} profiler || die
+	cat /usr/share/netbeans-profiler-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.profiler.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	eant -Dpermit.jdk8.builds=true -f nbbuild/build.xml bootstrap || die
+	ANT_OPTS="-Xmx1536m" eant -Dpermit.jdk8.builds=true -f nbbuild/javadoctools/build.xml build-javadoc
+}
+
+src_install() {
+	rm nbbuild/build/javadoc/*.zip
+	java-pkg_dojavadoc nbbuild/build/javadoc
+}

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index d0445e0..11bbaa5 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -42,6 +42,7 @@ DIST netbeans-trunk-nightly-201512030002-src.zip 209171687 SHA256 d79cd2853d8d34
 DIST netbeans-trunk-nightly-201512040002-src.zip 209178833 SHA256 9fbb70be4c026ac0ef12f1a44a361fdee99cce6234920c68b045526d00d4fd75 SHA512 90bc8fb97442a61215613021d27bd20e71e5b5ecd63ce41710d761f70faba8d4229ff6e5d023439070a62ad862e497b7f2e4b244e2b7b1183f55c217572b01ca WHIRLPOOL c231908df004a9e519e92827b36aaed93aca4a7802c8b85593c2849c94bfa422744fdb015ac38c07eeac56304443068b612f426fd5455c25b822f68ed8ad0bc1
 DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc64965bd5b8803c50b183bde52daab55dd4a4aa6c7b29bb624f83a SHA512 33072bd5bf9251678c2a28f7418e23569f2012d41c6b9518f3099f58abef39ef7da8285cfd3d96ae4dbb01258a4b6656d6bcc3ea26439eba3fb4b504ef61d761 WHIRLPOOL dac893869ef4aa8f582de77ce8d7117682a981e0e4f68156426eb41d31d2f0a55b08438979e9ad176efe0f86285d0af43ada75f34283a7deb40f56a8827d00fd
 DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd2312ceee02e5b5175bf7f94ee13b0552e02be72250922326ae4d1 SHA512 f7a48ace418b6dfcb52c4dacbade6d7c675f431606927fb8a201ae091b6a2366cade7eaf756b108e5b0eb4f285c94d6228e74878d7fa5d3117c28e77df2caae1 WHIRLPOOL aeb5eafcedb7f2d108713f801cdc1f3972dbc1f9589d29f7d84f7eeebab6a970a48b05f2672eda41bf282faf3a6ed987917cfbfc30b0b1bf873af894c5bf18af
+DIST netbeans-trunk-nightly-201512090002-src.zip 209228578 SHA256 dedd023e1e8fe3ad332bf923abf62814f76a02e484733b724d16754f3da958a1 SHA512 c7aa770074a8f4f4fa13190a4facf829d2dc6de5a3c8045ba79e9f5689332b506ff1330470dea33b38b1b7cb9e17361eff71d2b221f0fc906bdb8cd918ff2e8b WHIRLPOOL 96be2ab1293f0ab957b7da2c3266f2b4d77ec7b724a9c1c40045f512ad7ec9c99919d29643aaf1ecd8a7667321d0468eebb71f3219e117d214da618ca105dedb
 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_p20151101.ebuild 4717 SHA256 bea25b3b5c80353aa32794ac60d83a291a3e46c3fa39979f0b47d9a6f3ca8213 SHA512 ddc6a5e580b4e868b089d376875fd55680795853156dcf9cfb28021d38383f81068474d06491dd5401f96df6e6e5efc46056247cb7f90c6632e076305ed89b02 WHIRLPOOL f1322bec9fbc6f93a1964b469860e86bfeac88b700d66db25069d2dd9268fde7ee756299d9ddc790173d48a4fb2b18cf65b2b4c350332a45c56d9ea5b09ffcf1
@@ -74,4 +75,5 @@ EBUILD netbeans-javafx-9999_p20151203.ebuild 4717 SHA256 3f8995931045c1298b6b839
 EBUILD netbeans-javafx-9999_p20151204.ebuild 4717 SHA256 70ab18a9f6ae96d4d916842cbbbd63c6cbe2e5a2febde0e6107b8636b8846d89 SHA512 1d6db63eebf3595e901cb59c64e323fe870a0790cf80cfeae249bd78b3be9417b498a9d89d59fd9b46ed5c825f47e0faa0b2391c95e3216be8319fc85b5dcb11 WHIRLPOOL 1f0238a56715dfa57f3806e343b1b7bee7320e2727996760ae9232415f0567fe05bffa849d0c5f97d3f93bf3e7b4794833e3adad0e5ca953fb01ee8faa04b2a8
 EBUILD netbeans-javafx-9999_p20151207.ebuild 4717 SHA256 3cb8d54e102662ddf8ca83772e7c48db1ff3f16c13a207755bf3c9e64970ec54 SHA512 e23f095a782d965fb8cf40621d8f373fe3f650fa6984b7e7af2026210d00ecfa8f157c9c1e4c28ddb4f1732f758201b28aaef3721fcd6e10845526d3e1975118 WHIRLPOOL 88f7d8678dbaf76862884b7af66e03aeba78ac3367c0ca326d89dcf65642974c22cbd200c964611c6c315095a2bfaf1a4361bbd6fdb098b6f588b92ef9ae48b4
 EBUILD netbeans-javafx-9999_p20151208.ebuild 4717 SHA256 127bd9de9b83acce1e716b01fadbca29abde60cb47b1e5fafe8b02ea4ec32d7d SHA512 b6b30d3e0e31bd2ddbc01d7d97a5adb2fa59c49a5a46c9654e248f8e1bc06fb0fbf3e6b347ca9ebcd8796aa8c19f40022e76325f1904ce866a97d6453bc4569a WHIRLPOOL b7e52ace0e01d1508cb9e7bcd26f7db4bb6714ab651142dfaec9c20e7835313ebfba4627db257e95242423621dd7321ce2d3ceb1f988c8a996c3c4531bc76f86
+EBUILD netbeans-javafx-9999_p20151209.ebuild 4717 SHA256 1612965449b1772a1e354594645a57b4ae8a6e850f783f4b616e6f57e8ea7fc9 SHA512 173d6e31fcfab3e814b4aa2fa8984e0afc25d685f454c6c5301fe9aa6d65df253ccc65eeb74fbdc2efaa16838985c3942b0f5aaa354fd75d43a1c9f459b84819 WHIRLPOOL f5e41376362f2635eee8d6d3d5815eecba4673deb162c7d742d2f49a1dfbfd03bd9a6071fe215576a9111aaed21ef6d6d467cdf0b83029193ee9ac7b74c1ba60
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index d4f1b15..3a11894 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201512030002-src.zip 209171687 SHA256 d79cd2853d8d34
 DIST netbeans-trunk-nightly-201512040002-src.zip 209178833 SHA256 9fbb70be4c026ac0ef12f1a44a361fdee99cce6234920c68b045526d00d4fd75 SHA512 90bc8fb97442a61215613021d27bd20e71e5b5ecd63ce41710d761f70faba8d4229ff6e5d023439070a62ad862e497b7f2e4b244e2b7b1183f55c217572b01ca WHIRLPOOL c231908df004a9e519e92827b36aaed93aca4a7802c8b85593c2849c94bfa422744fdb015ac38c07eeac56304443068b612f426fd5455c25b822f68ed8ad0bc1
 DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc64965bd5b8803c50b183bde52daab55dd4a4aa6c7b29bb624f83a SHA512 33072bd5bf9251678c2a28f7418e23569f2012d41c6b9518f3099f58abef39ef7da8285cfd3d96ae4dbb01258a4b6656d6bcc3ea26439eba3fb4b504ef61d761 WHIRLPOOL dac893869ef4aa8f582de77ce8d7117682a981e0e4f68156426eb41d31d2f0a55b08438979e9ad176efe0f86285d0af43ada75f34283a7deb40f56a8827d00fd
 DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd2312ceee02e5b5175bf7f94ee13b0552e02be72250922326ae4d1 SHA512 f7a48ace418b6dfcb52c4dacbade6d7c675f431606927fb8a201ae091b6a2366cade7eaf756b108e5b0eb4f285c94d6228e74878d7fa5d3117c28e77df2caae1 WHIRLPOOL aeb5eafcedb7f2d108713f801cdc1f3972dbc1f9589d29f7d84f7eeebab6a970a48b05f2672eda41bf282faf3a6ed987917cfbfc30b0b1bf873af894c5bf18af
+DIST netbeans-trunk-nightly-201512090002-src.zip 209228578 SHA256 dedd023e1e8fe3ad332bf923abf62814f76a02e484733b724d16754f3da958a1 SHA512 c7aa770074a8f4f4fa13190a4facf829d2dc6de5a3c8045ba79e9f5689332b506ff1330470dea33b38b1b7cb9e17361eff71d2b221f0fc906bdb8cd918ff2e8b WHIRLPOOL 96be2ab1293f0ab957b7da2c3266f2b4d77ec7b724a9c1c40045f512ad7ec9c99919d29643aaf1ecd8a7667321d0468eebb71f3219e117d214da618ca105dedb
 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_p20151101.ebuild 4412 SHA256 e25b7d637bc5cd7559b322247edb504909a865ee29190103a06a89fd1e7d259a SHA512 68666ff1854f0529e6919069c4e4e5c05efd639e327787cfd031e7f8d19c8d86e3617ad112714225486250f07e7e3c8b4c14a91f9217e0a7e97a7b78af8695e1 WHIRLPOOL 72302d7a42ceae3d1e671a0955d0777c66b1343a3b7eed66fdd41e82a15508c1a0a71af2c5055dbfa724ed99bdd045d769ab3582f88092ee7db56bcb54b05192
@@ -65,4 +66,5 @@ EBUILD netbeans-mobility-9999_p20151203.ebuild 4412 SHA256 76fdb528d4aac18c096e9
 EBUILD netbeans-mobility-9999_p20151204.ebuild 4412 SHA256 1a3dd0501e35502689f8d34a6f7b2be2788a496bae64c33aeb1604d5fbdf236a SHA512 0057bc977d2baf83603b1f5c19a96f2bbc7f7f1e8f6951732f1c75dcaf9009ebe5ab04657aaa03b4fd3255d0dfc4a843be2a392fac893fe5a3ea743481e8c0c9 WHIRLPOOL 1025f8ed544e7d6dbdb2d71414cbfb6efac8414ce9b5a310edb8dadb15d3ecf1d5de366088d91aa5ed17d145a6b55b2811f74c793b0e49aa6dd24750e8d75567
 EBUILD netbeans-mobility-9999_p20151207.ebuild 4412 SHA256 0b5a060406dde1e986fb6b936bf42f35d6bc3ef6058880fb9d70b20920481aab SHA512 c8389cd146eea72bb9b3a1e4bc9a4577b9920efada66ff7b5c2f6524ff17781e8c9854a7801c0c634608f3ebe16315a6eba1ad40c77d033dc2ecdad129d1c3ba WHIRLPOOL 93cdb3667b393d8be6508569db90ab5ece1b8b096f80ca038eaf42b03e91aadd750c0ee8685f72f57add39cc2e9b337b6210be9f57c7fdc3e26671c2e1a847c8
 EBUILD netbeans-mobility-9999_p20151208.ebuild 4412 SHA256 2ca425d5b080a13ad206d50ead094dfff55f36de136d90ebb5655bd613d7ff1a SHA512 85f8843ad849c9004adfa3f27836ec5dedd095e30c2b9fbbefbeaab6c2fa6ffa3980050fd895c992ae7cc55e845098e8e9ae9193257571ed29358aaa138565bd WHIRLPOOL cccbd3fdf98267d67fe9a04b914fb20928bb8e4e2f373444cc5a29451a609bb6fd9f5ca1666e547e658496f7d0220de1ee0310bcc457aa518a0cd96367341650
+EBUILD netbeans-mobility-9999_p20151209.ebuild 4412 SHA256 f51333786854a908e56d1b09ebe2d026a9b90474d56042b7245334e7eb55d1d0 SHA512 e8f051ce8b9a28d2159851b749bf0e9c46ade71df40e7b9b993a5a17fb979ae5d4d80c71cb9581fcbb4d565a6f8e855f6dc1f5e7e5ad74b858d3c02ef41aad31 WHIRLPOOL f6bf882566307b3f71a812428659ab9b090b5822cb78ee1a443198a52664f537bbce022b659ac5eda1fb74d332f8736fad87a238cd5fc3555270e84e11948478
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20151209.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20151209.ebuild
new file mode 100644
index 0000000..faef76d
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20151209.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-12-09_00-02-04/zip/netbeans-trunk-nightly-201512090002-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 fe1b270..a8c6125 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201512030002-src.zip 209171687 SHA256 d79cd2853d8d34
 DIST netbeans-trunk-nightly-201512040002-src.zip 209178833 SHA256 9fbb70be4c026ac0ef12f1a44a361fdee99cce6234920c68b045526d00d4fd75 SHA512 90bc8fb97442a61215613021d27bd20e71e5b5ecd63ce41710d761f70faba8d4229ff6e5d023439070a62ad862e497b7f2e4b244e2b7b1183f55c217572b01ca WHIRLPOOL c231908df004a9e519e92827b36aaed93aca4a7802c8b85593c2849c94bfa422744fdb015ac38c07eeac56304443068b612f426fd5455c25b822f68ed8ad0bc1
 DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc64965bd5b8803c50b183bde52daab55dd4a4aa6c7b29bb624f83a SHA512 33072bd5bf9251678c2a28f7418e23569f2012d41c6b9518f3099f58abef39ef7da8285cfd3d96ae4dbb01258a4b6656d6bcc3ea26439eba3fb4b504ef61d761 WHIRLPOOL dac893869ef4aa8f582de77ce8d7117682a981e0e4f68156426eb41d31d2f0a55b08438979e9ad176efe0f86285d0af43ada75f34283a7deb40f56a8827d00fd
 DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd2312ceee02e5b5175bf7f94ee13b0552e02be72250922326ae4d1 SHA512 f7a48ace418b6dfcb52c4dacbade6d7c675f431606927fb8a201ae091b6a2366cade7eaf756b108e5b0eb4f285c94d6228e74878d7fa5d3117c28e77df2caae1 WHIRLPOOL aeb5eafcedb7f2d108713f801cdc1f3972dbc1f9589d29f7d84f7eeebab6a970a48b05f2672eda41bf282faf3a6ed987917cfbfc30b0b1bf873af894c5bf18af
+DIST netbeans-trunk-nightly-201512090002-src.zip 209228578 SHA256 dedd023e1e8fe3ad332bf923abf62814f76a02e484733b724d16754f3da958a1 SHA512 c7aa770074a8f4f4fa13190a4facf829d2dc6de5a3c8045ba79e9f5689332b506ff1330470dea33b38b1b7cb9e17361eff71d2b221f0fc906bdb8cd918ff2e8b WHIRLPOOL 96be2ab1293f0ab957b7da2c3266f2b4d77ec7b724a9c1c40045f512ad7ec9c99919d29643aaf1ecd8a7667321d0468eebb71f3219e117d214da618ca105dedb
 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_p20151101.ebuild 4997 SHA256 9c42522f7debe07d0511b8127fcd144fee5acb66fc17888eed697d0723e4ebf1 SHA512 6c34b949c1b8e6c7263fa5c463e43bdedd832d4ff0e82272da4d53f6971a82fc086869309332757a44ac25e68909392b1a37f270bd389cb089418679e133f34c WHIRLPOOL 2ed2078031e3cfb031eb6a06536835269b3dd568740cd083b4bbaee92d1f70c60a795d143c4e6b9e271eea1a023e249732b03c97fbab9af876b7175fced04139
@@ -68,4 +69,5 @@ EBUILD netbeans-nb-9999_p20151203.ebuild 4111 SHA256 8d3fddf5fbe888b2da5bf5fc615
 EBUILD netbeans-nb-9999_p20151204.ebuild 4111 SHA256 5ea4bea92f6da91731c7a05c7686c3c5025339bd2483340863b03bac248e6550 SHA512 cf3aea409c9e068205e523d57c5f1fa3365ef28b2819d5a8bde9141ad78b00482c02765c975698a092b2cb5f3cdb8dcc1c8ea0eea463b351af86e58e51513b64 WHIRLPOOL 1f660a2afa8610acb58835d44344de4db5d2107e570ae41824c2410058145e842b2568181b02163e7307221a55006301f7799962d1222ac8c688e8c608461e03
 EBUILD netbeans-nb-9999_p20151207.ebuild 4111 SHA256 9a9d3685c7825825b99a5a545cd33158d6d38ca6eda4f8b81ff272e8fb453055 SHA512 8e94c30243dde85d6763d5e86870a13e30710ff9b7d753d83974479046c1a417f3f816cc2d53abe9204bfcc86c720f5630de9e4aed539d251ca666c1c4410cc2 WHIRLPOOL 7b4b2aa426c2938ffd2a1c5ecadb01243cb5c53cd5a246880204b4aab2a86d4ff353cf21af04b04e0f216996c7c68481e42141126824efcc01b09ff0d5121daa
 EBUILD netbeans-nb-9999_p20151208.ebuild 4111 SHA256 3a9629e60cd92a3db9a6456ce888d301cf33bb45454a8f9d08eecab6d599f34c SHA512 16041ebce8c9649b60d4375b7f43145d27d2d16b8b77d4d4d5dc9b793205506c9bfd9b07086dee6e90d050cc7882eeee38c5fcf0f33b7e3f8468d43367da6dd7 WHIRLPOOL 6310db4f82b93ead0e2cf864fc1991b8f71925b2a4f60ecb51b270023c498d42d5bcb9d33a793c1e6950f426f15dc61ddd42aee02761aea8fdc547f1295a3b13
+EBUILD netbeans-nb-9999_p20151209.ebuild 4111 SHA256 70264bb632f7a011078ab38adb8f68ceedf11e70d9e27b5d20a2106195d0f38a SHA512 8a1292f169c3211bdf3d10db6c366655a2caec78b3b7fc3e09a80ee3ec311d986f1ec9d1be0dd7827394431a420c2d3b9879a31f2a47faae2bae896b044fe72c WHIRLPOOL e571ac29879db7693d55b87a86236f1392d2bc53538b78ee243a4d4837c1c5a28ad3f2dbf8b1ceb6bdcb11edfc1d09ca0bd253065c5c78154ecdcabef9863b5f
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20151209.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20151209.ebuild
new file mode 100644
index 0000000..46f11d6
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20151209.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Branding"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-12-09_00-02-04/zip/netbeans-trunk-nightly-201512090002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster create-netbeans-import finish-build"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.nb -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans >/dev/null || die
+
+	insinto ${INSTALL_DIR}/nb
+
+	grep -E "/nb$" moduleCluster.properties > "${D}"/${INSTALL_DIR}/nb/moduleCluster.properties || die
+
+	insinto ${INSTALL_DIR}
+	doins -r nb
+	dodoc *.txt
+	dohtml *.html *.css
+
+	insinto ${INSTALL_DIR}/bin
+	doins bin/netbeans
+	dosym ${INSTALL_DIR}/bin/netbeans /usr/bin/netbeans-${SLOT}
+	fperms 755 ${INSTALL_DIR}/bin/netbeans
+
+	insinto /etc/netbeans-${SLOT}
+	doins etc/*
+	dosym /etc/netbeans-${SLOT} ${INSTALL_DIR}/etc
+
+	# fix paths per bug# 163483
+	if [[ -e "${D}"/${INSTALL_DIR}/bin/netbeans ]]; then
+		sed -i -e "s:\"\$progdir\"/../etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans
+		sed -i -e "s:\"\${userdir}\"/etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans
+	fi
+
+	dodir /usr/share/icons/hicolor/32x32/apps
+	dosym ${INSTALL_DIR}/nb/netbeans.png /usr/share/icons/hicolor/32x32/apps/netbeans-${SLOT}.png
+	dodir /usr/share/icons/hicolor/128x128/apps
+	cp "${DISTDIR}"/netbeans-7.0.png "${D}"/usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png || die
+	dosym /usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png /usr/share/pixmaps/netbeans-${SLOT}.png
+
+	popd >/dev/null || die
+
+	make_desktop_entry netbeans-${SLOT} "Netbeans ${PV}" netbeans-${SLOT} Development
+
+	mkdir -p  "${D}"/${INSTALL_DIR}/nb/config || die
+	echo "NBGNT" > "${D}"/${INSTALL_DIR}/nb/config/productid || die
+}

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index f28d3bd..d7a3075 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -37,6 +37,7 @@ DIST netbeans-trunk-nightly-201512030002-src.zip 209171687 SHA256 d79cd2853d8d34
 DIST netbeans-trunk-nightly-201512040002-src.zip 209178833 SHA256 9fbb70be4c026ac0ef12f1a44a361fdee99cce6234920c68b045526d00d4fd75 SHA512 90bc8fb97442a61215613021d27bd20e71e5b5ecd63ce41710d761f70faba8d4229ff6e5d023439070a62ad862e497b7f2e4b244e2b7b1183f55c217572b01ca WHIRLPOOL c231908df004a9e519e92827b36aaed93aca4a7802c8b85593c2849c94bfa422744fdb015ac38c07eeac56304443068b612f426fd5455c25b822f68ed8ad0bc1
 DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc64965bd5b8803c50b183bde52daab55dd4a4aa6c7b29bb624f83a SHA512 33072bd5bf9251678c2a28f7418e23569f2012d41c6b9518f3099f58abef39ef7da8285cfd3d96ae4dbb01258a4b6656d6bcc3ea26439eba3fb4b504ef61d761 WHIRLPOOL dac893869ef4aa8f582de77ce8d7117682a981e0e4f68156426eb41d31d2f0a55b08438979e9ad176efe0f86285d0af43ada75f34283a7deb40f56a8827d00fd
 DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd2312ceee02e5b5175bf7f94ee13b0552e02be72250922326ae4d1 SHA512 f7a48ace418b6dfcb52c4dacbade6d7c675f431606927fb8a201ae091b6a2366cade7eaf756b108e5b0eb4f285c94d6228e74878d7fa5d3117c28e77df2caae1 WHIRLPOOL aeb5eafcedb7f2d108713f801cdc1f3972dbc1f9589d29f7d84f7eeebab6a970a48b05f2672eda41bf282faf3a6ed987917cfbfc30b0b1bf873af894c5bf18af
+DIST netbeans-trunk-nightly-201512090002-src.zip 209228578 SHA256 dedd023e1e8fe3ad332bf923abf62814f76a02e484733b724d16754f3da958a1 SHA512 c7aa770074a8f4f4fa13190a4facf829d2dc6de5a3c8045ba79e9f5689332b506ff1330470dea33b38b1b7cb9e17361eff71d2b221f0fc906bdb8cd918ff2e8b WHIRLPOOL 96be2ab1293f0ab957b7da2c3266f2b4d77ec7b724a9c1c40045f512ad7ec9c99919d29643aaf1ecd8a7667321d0468eebb71f3219e117d214da618ca105dedb
 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_p20151101.ebuild 4417 SHA256 599a80da65a7ae6b22860d0b70acb49a8c55ab034ffc56352074fc434b54f74b SHA512 e0e7105401c7bab851e7e917c5a6ba4530fe24961084c20051adebff4691bd1e01bf7c885ac5aca6ae7326675190208aa0bc18fda6afc4d525490e1bd69015d9 WHIRLPOOL e0f3c7fceaa1b782320e938a6b246855f1b8b419f3991a43e5f3208b306b37b4bba29bd80bb58a1fff0998fe781c70d0ef036468001a21edac79ccb460ea4399
@@ -69,4 +70,5 @@ EBUILD netbeans-php-9999_p20151203.ebuild 4417 SHA256 0012163173c92bb380460e4ce0
 EBUILD netbeans-php-9999_p20151204.ebuild 4417 SHA256 ea48a1680c940cc8d677bf07e7f08ccd0ee9f4662c51385d21fcc27020e06602 SHA512 4b277859f728083320e0a43d1ee8c043cc23187e8d0918dddb7ac49310377a16134a8fad687ed3514fe0be30d3c6d68c4661380ebb4c58bce014e9f031406b22 WHIRLPOOL fdae4fcb13f97ec1aaf3bf954da6ced76dd467a253e548226b2146d1e087cab8bba1f1d7f00ef8722ebd74293966efe5d72a2ea3e098ead1964f1032aabec58a
 EBUILD netbeans-php-9999_p20151207.ebuild 4417 SHA256 6c180873b454acb18871518ac6f4af3572ac1c9faa3110aabb63318fe762aaba SHA512 641b7ec1c598cb866e7334a3f590cd9b8d10fd0d03b348c0d89bf71c5fbb87169b60b9508a6aa313fe2af346ae79eee26a35c9b0730bbdf5dc138f62be0a55cc WHIRLPOOL 44578d745a2d7170249409eba752e7443afb8345711ea9bf7d5883870305ef40e2754979b0399b6621b654610e4242380336635f0152457b381862904113008e
 EBUILD netbeans-php-9999_p20151208.ebuild 4417 SHA256 cf9c79d65e3a3a5ab1f55871cc5ebd80eaf7b14b3c045ad48d6f4f20017ddd50 SHA512 ef1b93609811c893e630a064b8a445819fd40726444cb1ad80d288ae8c6960167234a044e9f808294797855ebaea71a119910b7f1326b7edf3d0660a1c2907b3 WHIRLPOOL d880121e0d4e088439633d442a4e9ebc3de7bd85359753cf6762c9a7904c52d0fb55c03080222f5903d94a3e47983b634601411b6a80fb08cf45883772c6a8d8
+EBUILD netbeans-php-9999_p20151209.ebuild 4417 SHA256 346c9093386643585e28d4543ff407735db5022ba7f0bf47ca0bd3c48eb44eab SHA512 143485c1cc0ecd68cf098e5bf915039688f99365dd1ee8abad2472447bfff8a099574db72e60e6717a449f7172354644cec090556132a02301515fbc1d24395b WHIRLPOOL b3d82fddb958d74475e9a302dd955b97bc7eaf76c7e61000b00586e89de65ba569859e6edf02e87067b4e52d8ffab8309b023442394ff38cb9a8813b029cf510
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20151209.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20151209.ebuild
new file mode 100644
index 0000000..b312749
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20151209.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-12-09_00-02-04/zip/netbeans-trunk-nightly-201512090002-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 78092af..9f10f9d 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -50,6 +50,7 @@ DIST netbeans-trunk-nightly-201512030002-src.zip 209171687 SHA256 d79cd2853d8d34
 DIST netbeans-trunk-nightly-201512040002-src.zip 209178833 SHA256 9fbb70be4c026ac0ef12f1a44a361fdee99cce6234920c68b045526d00d4fd75 SHA512 90bc8fb97442a61215613021d27bd20e71e5b5ecd63ce41710d761f70faba8d4229ff6e5d023439070a62ad862e497b7f2e4b244e2b7b1183f55c217572b01ca WHIRLPOOL c231908df004a9e519e92827b36aaed93aca4a7802c8b85593c2849c94bfa422744fdb015ac38c07eeac56304443068b612f426fd5455c25b822f68ed8ad0bc1
 DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc64965bd5b8803c50b183bde52daab55dd4a4aa6c7b29bb624f83a SHA512 33072bd5bf9251678c2a28f7418e23569f2012d41c6b9518f3099f58abef39ef7da8285cfd3d96ae4dbb01258a4b6656d6bcc3ea26439eba3fb4b504ef61d761 WHIRLPOOL dac893869ef4aa8f582de77ce8d7117682a981e0e4f68156426eb41d31d2f0a55b08438979e9ad176efe0f86285d0af43ada75f34283a7deb40f56a8827d00fd
 DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd2312ceee02e5b5175bf7f94ee13b0552e02be72250922326ae4d1 SHA512 f7a48ace418b6dfcb52c4dacbade6d7c675f431606927fb8a201ae091b6a2366cade7eaf756b108e5b0eb4f285c94d6228e74878d7fa5d3117c28e77df2caae1 WHIRLPOOL aeb5eafcedb7f2d108713f801cdc1f3972dbc1f9589d29f7d84f7eeebab6a970a48b05f2672eda41bf282faf3a6ed987917cfbfc30b0b1bf873af894c5bf18af
+DIST netbeans-trunk-nightly-201512090002-src.zip 209228578 SHA256 dedd023e1e8fe3ad332bf923abf62814f76a02e484733b724d16754f3da958a1 SHA512 c7aa770074a8f4f4fa13190a4facf829d2dc6de5a3c8045ba79e9f5689332b506ff1330470dea33b38b1b7cb9e17361eff71d2b221f0fc906bdb8cd918ff2e8b WHIRLPOOL 96be2ab1293f0ab957b7da2c3266f2b4d77ec7b724a9c1c40045f512ad7ec9c99919d29643aaf1ecd8a7667321d0468eebb71f3219e117d214da618ca105dedb
 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_p20151101.ebuild 9382 SHA256 caf47d0f6b7b4e6aa9db3f4f9ba522dfbf8bfeee811dff5133087657432f0b35 SHA512 0b737b39c8122b84dcd8311c51146cedcaa5c69ceaa159abe305d773c300be913cd3c1d3de14391cf75e5d4b06f8489edf66fe555efe5a44db95fea80e74c97a WHIRLPOOL d1dd018cbe4741f126e3408f041f8377f4fa1af914353cd248f5d70b5a6c6fcb3a481cc9bffe06617e45911d462d79dd40c8ac15fb0650d0a7db0a13e1d4bbde
@@ -82,4 +83,5 @@ EBUILD netbeans-platform-9999_p20151203.ebuild 9367 SHA256 cfdf9284f9dfb5f16cbb1
 EBUILD netbeans-platform-9999_p20151204.ebuild 9367 SHA256 0a2ed298a22e2caac321d1a17e9ab89e305ea7d91c82f51c36809ba3de4813ec SHA512 37dd492d427384561075157670d98e5577bf592176b16ebfdf5851547be80dfe652e433ae816d731ad6b4721ed9a6efbfedbbb37e7142b471c769fdec3913d37 WHIRLPOOL 20cfa57a697060809e4e2e944901707d43bdb35a6fc6f063cab70354e032cd06c9fb923ae12388f37108e195b5bb1a3bb7e6597a020d398328b09a5f0fdad755
 EBUILD netbeans-platform-9999_p20151207.ebuild 9367 SHA256 b5f4e4041fd3147045c8311ce31c4b0e69f8059b8a00efaed0a4035e5b0e5189 SHA512 45af527f5ed13d444beea99d137f09d86b5202cb0f9794810b7e8beed8719a4d68c67a17f3c606d0ce9150668b69bbd34f3bb7c11d59c14cd4dfdd052bc4a67e WHIRLPOOL 95ca2cbc2bcd50103266d2cd01bad184e3509ae6dd0c1b6d4e1943a4da7188f76e548915719c23a22e976ae27a03479d834b85769d35fa069c1ac0a70ad1bf02
 EBUILD netbeans-platform-9999_p20151208.ebuild 9367 SHA256 65be17e12f8cd8dc3918dd21e9bb684e3e2658cb4fd1abeec4e72472db07596d SHA512 4b54ff3f5da1e153fc47b2504390864bb08d8ccf087923f438e5cb26ed9f8183c0b6b31f660d48a9312aa31d5dc5dbed071bb1d7f383939dbdb4bdd183aa03c1 WHIRLPOOL 0f306216758e1231d43aed2bf54914c7387110eeca23b69a92fa1212521a7db49cec737b202f3b84acefcb27f5cede733fdb664eb4e5c8ae3b20c7cf4c6de87b
+EBUILD netbeans-platform-9999_p20151209.ebuild 9367 SHA256 696bdb169fadab488309f1cd152c0c1d1f7e2688f1a707cad6ab36b4706378e4 SHA512 67e5e7d6832b4dd2ba68e74a9ff705ce6c1d9fa17e90211e3a4bd2667de3fe7e968fc790a39626303dc66d90a27ae0e3ecc3b402dd79133cd0e77a059ff91476 WHIRLPOOL d1b161f337e75fcc384fc914b62fcc250889d732bf9edff71d0ce7b216a6fa3bab5215e40d6ea649f32a1fdc0fa6aaafda2fa202b4225cc4b62ad4c40f0498a1
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20151209.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20151209.ebuild
new file mode 100644
index 0000000..ed13ae3
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20151209.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Platform"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-12-09_00-02-04/zip/netbeans-trunk-nightly-201512090002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar
+	http://hg.netbeans.org/binaries/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar
+	http://hg.netbeans.org/binaries/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar
+	http://hg.netbeans.org/binaries/A3432F57D9B3B4AD62CB0B294EEC43D12FCF3F62-ko4j-1.2.3.jar
+	http://hg.netbeans.org/binaries/78DD1C0B4EDC348FF4DCD0616597BB809AAE248D-net.java.html-1.2.3.jar
+	http://hg.netbeans.org/binaries/7BA1E1C450BCD0AD9D0D2F6797A2EB50A4822E0E-net.java.html.boot-1.2.3.jar
+	http://hg.netbeans.org/binaries/068B9902E65F2292C9EA30E5423E41FB6B30D8AA-net.java.html.boot.fx-1.2.3.jar
+	http://hg.netbeans.org/binaries/8621531E83EC4850DA61AA2266FE41105C304F40-net.java.html.boot.script-1.2.3.jar
+	http://hg.netbeans.org/binaries/24824B1E8C2A2D3A5C471F5875BF61F27E8916DB-net.java.html.geo-1.2.3.jar
+	http://hg.netbeans.org/binaries/F41518385DA4B5682C864F19B82C3BA4AF65AE83-net.java.html.json-1.2.3.jar
+	http://hg.netbeans.org/binaries/989A81454D4FA962EB1C158FE794D2EB060AB9F6-net.java.html.sound-1.2.3.jar
+	http://hg.netbeans.org/binaries/E5DDC5E827D3D62E7BE9F7E32927CA01F2839971-org.eclipse.osgi_3.9.1.v20140110-1610.jar
+	http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip
+	http://hg.netbeans.org/binaries/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+# oracle-jdk-bin is needed for now because of javafx which is not packaged separately yet
+# [parseprojectxml] Distilling /var/tmp/portage/dev-java/netbeans-platform-9999_p20151108/work/nbbuild/build/public-package-jars/org-netbeans-libs-javafx.jar from [/var/tmp/portage/dev-java/netbeans-platform-9999_p20151108/work/nbbuild/netbeans/platform/modules/org-netbeans-libs-javafx.jar, /usr/lib64/icedtea8/jre/lib/ext/jfxrt.jar]
+# [parseprojectxml] Classpath entry /usr/lib64/icedtea8/jre/lib/ext/jfxrt.jar does not exist; skipping
+#  [nbmerge] Failed to build target: all-api.htmlui
+
+CDEPEND="dev-java/hamcrest-core:1.3
+	dev-java/javahelp:0
+	>=dev-java/jna-3.4:0
+	dev-java/junit:4[source]
+	>=dev-java/osgi-core-api-5:0
+	dev-java/osgi-compendium:0
+	dev-java/swing-layout:1[source]
+	dev-java/testng:0"
+DEPEND="dev-java/oracle-jdk-bin:1.8[javafx]
+	app-arch/unzip
+	${CDEPEND}"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.platform -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.8"
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar libs.asm/external/asm-all-5.0.1.jar || die
+	ln -s "${DISTDIR}"/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar libs.felix/external/felix-4.2.1.jar || die
+	ln -s "${DISTDIR}"/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar junitlib/external/junit-4.12-javadoc.jar || die
+	ln -s "${DISTDIR}"/A3432F57D9B3B4AD62CB0B294EEC43D12FCF3F62-ko4j-1.2.3.jar o.n.html.ko4j/external/ko4j-1.2.3.jar || die
+	ln -s "${DISTDIR}"/78DD1C0B4EDC348FF4DCD0616597BB809AAE248D-net.java.html-1.2.3.jar net.java.html/external/net.java.html-1.2.3.jar || die
+	ln -s "${DISTDIR}"/7BA1E1C450BCD0AD9D0D2F6797A2EB50A4822E0E-net.java.html.boot-1.2.3.jar net.java.html.boot/external/net.java.html.boot-1.2.3.jar || die
+	ln -s "${DISTDIR}"/068B9902E65F2292C9EA30E5423E41FB6B30D8AA-net.java.html.boot.fx-1.2.3.jar net.java.html.boot.fx/external/net.java.html.boot.fx-1.2.3.jar || die
+	ln -s "${DISTDIR}"/8621531E83EC4850DA61AA2266FE41105C304F40-net.java.html.boot.script-1.2.3.jar net.java.html.boot.script/external/net.java.html.boot.script-1.2.3.jar || die
+	ln -s "${DISTDIR}"/24824B1E8C2A2D3A5C471F5875BF61F27E8916DB-net.java.html.geo-1.2.3.jar net.java.html.geo/external/net.java.html.geo-1.2.3.jar || die
+	ln -s "${DISTDIR}"/F41518385DA4B5682C864F19B82C3BA4AF65AE83-net.java.html.json-1.2.3.jar net.java.html.json/external/net.java.html.json-1.2.3.jar || die
+	ln -s "${DISTDIR}"/989A81454D4FA962EB1C158FE794D2EB060AB9F6-net.java.html.sound-1.2.3.jar net.java.html.sound/external/net.java.html.sound-1.2.3.jar || die
+	ln -s "${DISTDIR}"/E5DDC5E827D3D62E7BE9F7E32927CA01F2839971-org.eclipse.osgi_3.9.1.v20140110-1610.jar netbinox/external/org.eclipse.osgi_3.9.1.v20140110-1610.jar || die
+	ln -s "${DISTDIR}"/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip o.jdesktop.layout/external/swing-layout-1.0.4-doc.zip || die
+	ln -s "${DISTDIR}"/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip libs.testng/external/testng-6.8.1-javadoc.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	# upstream jna jar contains bundled binary libraries so we disable that feature
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --into libs.junit4/external hamcrest-core-1.3 hamcrest-core.jar hamcrest-core-1.3.jar
+	java-pkg_jar-from --into libs.jna.platform/external jna platform.jar jna-platform-4.1.0.jar
+	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.jna/external jna jna.jar jna-4.1.0.jar
+	java-pkg_jar-from --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+	ln -s /usr/share/junit-4/sources/junit-src.zip junitlib/external/junit-4.12-sources.jar || die
+	java-pkg_jar-from --into libs.osgi/external osgi-core-api osgi-core-api.jar osgi.core-5.0.0.jar
+	java-pkg_jar-from --into libs.osgi/external osgi-compendium osgi-compendium.jar osgi.cmpn-4.2.jar
+	java-pkg_jar-from --into o.jdesktop.layout/external swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
+	ln -s /usr/share/swing-layout-1/sources/swing-layout-src.zip o.jdesktop.layout/external/swing-layout-1.0.4-src.zip || die
+	java-pkg_jar-from --into libs.testng/external testng testng.jar testng-6.8.1-dist.jar
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	unset DISPLAY
+	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+	pushd nbbuild/netbeans/platform >/dev/null || die
+
+	java-pkg_dojar lib/*.jar
+	grep -E "/platform$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	insinto ${INSTALL_DIR}
+	doins -r *
+	rm "${D}"/${INSTALL_DIR}/docs/junit-4.12-sources.jar || die
+	dosym /usr/share/junit-4/sources/junit-src.zip ${INSTALL_DIR}/docs/junit-4.12-sources.jar
+	rm "${D}"/${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip || die
+	dosym /usr/share/swing-layout-1/sources/swing-layout-src.zip ${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip
+	find "${D}"/${INSTALL_DIR} -name "*.exe" -delete
+	find "${D}"/${INSTALL_DIR} -name "*.dll" -delete
+	rm -fr "${D}"/modules/lib || die
+
+	popd >/dev/null || die
+
+	fperms 775 ${INSTALL_DIR}/lib/nbexec
+	dosym ${INSTALL_DIR}/lib/nbexec /usr/bin/nbexec-${SLOT}
+
+	local instdir=${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 1350e84..8e40006 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201512030002-src.zip 209171687 SHA256 d79cd2853d8d34
 DIST netbeans-trunk-nightly-201512040002-src.zip 209178833 SHA256 9fbb70be4c026ac0ef12f1a44a361fdee99cce6234920c68b045526d00d4fd75 SHA512 90bc8fb97442a61215613021d27bd20e71e5b5ecd63ce41710d761f70faba8d4229ff6e5d023439070a62ad862e497b7f2e4b244e2b7b1183f55c217572b01ca WHIRLPOOL c231908df004a9e519e92827b36aaed93aca4a7802c8b85593c2849c94bfa422744fdb015ac38c07eeac56304443068b612f426fd5455c25b822f68ed8ad0bc1
 DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc64965bd5b8803c50b183bde52daab55dd4a4aa6c7b29bb624f83a SHA512 33072bd5bf9251678c2a28f7418e23569f2012d41c6b9518f3099f58abef39ef7da8285cfd3d96ae4dbb01258a4b6656d6bcc3ea26439eba3fb4b504ef61d761 WHIRLPOOL dac893869ef4aa8f582de77ce8d7117682a981e0e4f68156426eb41d31d2f0a55b08438979e9ad176efe0f86285d0af43ada75f34283a7deb40f56a8827d00fd
 DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd2312ceee02e5b5175bf7f94ee13b0552e02be72250922326ae4d1 SHA512 f7a48ace418b6dfcb52c4dacbade6d7c675f431606927fb8a201ae091b6a2366cade7eaf756b108e5b0eb4f285c94d6228e74878d7fa5d3117c28e77df2caae1 WHIRLPOOL aeb5eafcedb7f2d108713f801cdc1f3972dbc1f9589d29f7d84f7eeebab6a970a48b05f2672eda41bf282faf3a6ed987917cfbfc30b0b1bf873af894c5bf18af
+DIST netbeans-trunk-nightly-201512090002-src.zip 209228578 SHA256 dedd023e1e8fe3ad332bf923abf62814f76a02e484733b724d16754f3da958a1 SHA512 c7aa770074a8f4f4fa13190a4facf829d2dc6de5a3c8045ba79e9f5689332b506ff1330470dea33b38b1b7cb9e17361eff71d2b221f0fc906bdb8cd918ff2e8b WHIRLPOOL 96be2ab1293f0ab957b7da2c3266f2b4d77ec7b724a9c1c40045f512ad7ec9c99919d29643aaf1ecd8a7667321d0468eebb71f3219e117d214da618ca105dedb
 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_p20151101.ebuild 3472 SHA256 2c453e505d57cb36f64db7c697a5abd69b230a177264d581db7c74827773ec3a SHA512 568e1855872d4ee90609a8b2f0dce9963d78ac4d43f3abc30adacf00a958e388f2742d55c284583501049b98e95d9d50e989c14495ee3ca0a928c6a68e7818e5 WHIRLPOOL a35708d9626767c3a1385292af47c44589784e18d62c4f8c7551c7210fff535613831ddde45992658778fbcdec389ac4dc5cc7921dbad2e70d7dba5ade8f3da8
@@ -65,4 +66,5 @@ EBUILD netbeans-profiler-9999_p20151203.ebuild 3472 SHA256 599301b838d23b52de1a1
 EBUILD netbeans-profiler-9999_p20151204.ebuild 3472 SHA256 6eabb02129c81b7846d864abed5ed421d523c2b46b6ce9f55d943f2ab07911f9 SHA512 d71c993098df40de26abaaf12adf35aad3f698cac6061945e013c83ec1611d437c979173ac5d3d9845909990d96477a023842ce4e049111c41e7903c81e5303f WHIRLPOOL ff1496a757c22c860edf962ceab198a8e3cd92b2ab6c595eb8c19c493c32a1bfafd689cb4347cc3bc6e90d788384117d2ad152e2a177d5c31d4d90ad5c727c46
 EBUILD netbeans-profiler-9999_p20151207.ebuild 3472 SHA256 01a60410a6ccd20f7b34aa9ef02d9de87e2802fea74a829efebc0a9e0b9a4998 SHA512 b142787445ae08bf86b8d5173cbd7ea191bc78f9ebd5f95d89eb7836d4120b6fe607d711e1b504bd1ee21296c9931b685691bb37b2f7e96a31bff82659044934 WHIRLPOOL b33c8b816f51d4737bf8ba6c57e31430a76ee8c4a28eac3a1c6835dd595273dc75f82c440368a858f766a705fa7f4e9d811097cc7ca36c64979964f3cd3f2dbe
 EBUILD netbeans-profiler-9999_p20151208.ebuild 3472 SHA256 12064cc2c9fad68586559a097d690db00819e08dc1b8618c10c4c8010e2b85b5 SHA512 03b952aa54a0fa2c5d3add7883a6ce417c8aa5d5f0c261c4214804e43c307a1a9904bde024c4f6f98973bf18bdfa5bfb3ff1d98a5e7bc9d6f62e6ab61efa2912 WHIRLPOOL 4a4e49d4fd85e2385b70db1f6ef727a0083e59cdac004759896894c1b0cf18bfd446910b18b25213ed9cd11f3118302c9bbd7451cfdd922b9135df04af9a2a61
+EBUILD netbeans-profiler-9999_p20151209.ebuild 3472 SHA256 9fcb04294cb3340227b7e8384ac308d576290adfcb336c928394d1b531badd81 SHA512 28e794d35255cb1ddfa2071cb6e7885ecf734dc48654fb52a6c521748c0a2a807d92d3647b4cb28d442f85d1a80300c72125019c53f88338a072af05a30993a3 WHIRLPOOL 6634e6e16e3addf23d2b47e12d1b4ca39cfa147003c3ce7b71efc4fa14e2213a54af555ee077414d8cdfd07c102f08843b48982ef11942fb2545725c0442c2b2
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20151209.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20151209.ebuild
new file mode 100644
index 0000000..c6b361d
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20151209.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-12-09_00-02-04/zip/netbeans-trunk-nightly-201512090002-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 212b1a4..c26a6cf 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -42,6 +42,7 @@ DIST netbeans-trunk-nightly-201512030002-src.zip 209171687 SHA256 d79cd2853d8d34
 DIST netbeans-trunk-nightly-201512040002-src.zip 209178833 SHA256 9fbb70be4c026ac0ef12f1a44a361fdee99cce6234920c68b045526d00d4fd75 SHA512 90bc8fb97442a61215613021d27bd20e71e5b5ecd63ce41710d761f70faba8d4229ff6e5d023439070a62ad862e497b7f2e4b244e2b7b1183f55c217572b01ca WHIRLPOOL c231908df004a9e519e92827b36aaed93aca4a7802c8b85593c2849c94bfa422744fdb015ac38c07eeac56304443068b612f426fd5455c25b822f68ed8ad0bc1
 DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc64965bd5b8803c50b183bde52daab55dd4a4aa6c7b29bb624f83a SHA512 33072bd5bf9251678c2a28f7418e23569f2012d41c6b9518f3099f58abef39ef7da8285cfd3d96ae4dbb01258a4b6656d6bcc3ea26439eba3fb4b504ef61d761 WHIRLPOOL dac893869ef4aa8f582de77ce8d7117682a981e0e4f68156426eb41d31d2f0a55b08438979e9ad176efe0f86285d0af43ada75f34283a7deb40f56a8827d00fd
 DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd2312ceee02e5b5175bf7f94ee13b0552e02be72250922326ae4d1 SHA512 f7a48ace418b6dfcb52c4dacbade6d7c675f431606927fb8a201ae091b6a2366cade7eaf756b108e5b0eb4f285c94d6228e74878d7fa5d3117c28e77df2caae1 WHIRLPOOL aeb5eafcedb7f2d108713f801cdc1f3972dbc1f9589d29f7d84f7eeebab6a970a48b05f2672eda41bf282faf3a6ed987917cfbfc30b0b1bf873af894c5bf18af
+DIST netbeans-trunk-nightly-201512090002-src.zip 209228578 SHA256 dedd023e1e8fe3ad332bf923abf62814f76a02e484733b724d16754f3da958a1 SHA512 c7aa770074a8f4f4fa13190a4facf829d2dc6de5a3c8045ba79e9f5689332b506ff1330470dea33b38b1b7cb9e17361eff71d2b221f0fc906bdb8cd918ff2e8b WHIRLPOOL 96be2ab1293f0ab957b7da2c3266f2b4d77ec7b724a9c1c40045f512ad7ec9c99919d29643aaf1ecd8a7667321d0468eebb71f3219e117d214da618ca105dedb
 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_p20151101.ebuild 4991 SHA256 57d2c07add5da1320895fd12fb6a4d3472a5bc94dd6725779fcc2b7c7f3f00e7 SHA512 071ecbf0f2c0af22ad78c0f5fc65df75861029b0769271233b84ca4b750a36df2e6aaa771283ed451f841faf437ba5b28c4ace809e7797352b17fa31287c0366 WHIRLPOOL be27b42140da851ad5cf395edcf3075dc65517da0db88046d1c2b9245bc7214e77acf0441690fc7cc0cf397146657568db3a597148d6b7b54961a088dd36a74d
@@ -74,4 +75,5 @@ EBUILD netbeans-webcommon-9999_p20151203.ebuild 4590 SHA256 034ffedd026ad9c6809a
 EBUILD netbeans-webcommon-9999_p20151204.ebuild 4590 SHA256 5f8cb9c39e158e9cb19867a37619f69ac1bb35c3f65e391bd700051ce4641834 SHA512 0437baa39a9f64bca911c6665e96962e9ddb4275e9295b429aa27bdab5b6bdb846eed848fcc5f0d9a755ac69ab5c86d053218846b76028ee02ddd548c67c4175 WHIRLPOOL 882c8978d3d17eb6bcfd34511fcb271aecf8156365f7e7470d3579596091e8fa000abdf74e41ed2fe86775cda1ec0ffc6bb4cc2d86975d0a4b1b2c2ced30d3ce
 EBUILD netbeans-webcommon-9999_p20151207.ebuild 4590 SHA256 83f3423ebedcba37f457231149c44365d1fe62dd2563ae8349997d65cf61bedd SHA512 3b7b75854baa68ef0412d88a82a546aa9c796ca10fe103e3bbf86be2886e0dfcefa90d105a67a3af078e6f7c612f1e8335a6cfa99521a70be5435dbd5ec877a6 WHIRLPOOL 24f1c9ea0b0e843e4b750da5fd8b221da0b3c966ed531775d2adb78779788a801d05a3ab3a3283f404c652868c869d39730e583c86a790ad42d51f0c52e853cb
 EBUILD netbeans-webcommon-9999_p20151208.ebuild 4590 SHA256 70aca054ee50ae9e1687fd0713f67e8823c42a1f6f6c1210244d8b3afa3fd32f SHA512 38efe62557788a23a23e93aa4575c34c33cf515cc7d8f93f8809bd56765937d129eaf540e0133c1887ff91757024f47dcf1eeda96af71a1d4d9161e3ea7b1b4b WHIRLPOOL 63b04f9e0f0b8b121d5855b806419add86fe63959a9ca0269bb2539386c5e089a8ec57647394aaf99e0155bd44a4cabfa50db973cca56b68c82f153a1397bdab
+EBUILD netbeans-webcommon-9999_p20151209.ebuild 4590 SHA256 7ede7f60d16ec3919a1be694477c90800d93df65d1ebba21cb5d4b7210a05daa SHA512 06a8c9d381985b6e3c497cf51b2e6ad3ff243115eece071a08cd5f18d6618bafeea6e52904960b4139ca1df074c34e6f2f58b77665fa9c2dabe72cab3114f1ad WHIRLPOOL d30e18aff9f2219028e5ff27802dff816ee3a1c9c7853e55ff40cc9aac98b99d59420439244a9e4debb9ead0a706f96339ddcc178ba7f0fe0e221ad0cc4dfc38
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20151209.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20151209.ebuild
new file mode 100644
index 0000000..3df254f
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20151209.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-12-09_00-02-04/zip/netbeans-trunk-nightly-201512090002-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}"
+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 --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/webcommon >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+	grep -E "/webcommon$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/webcommon
+}

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 1762124..a953375 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201512030002-src.zip 209171687 SHA256 d79cd2853d8d34
 DIST netbeans-trunk-nightly-201512040002-src.zip 209178833 SHA256 9fbb70be4c026ac0ef12f1a44a361fdee99cce6234920c68b045526d00d4fd75 SHA512 90bc8fb97442a61215613021d27bd20e71e5b5ecd63ce41710d761f70faba8d4229ff6e5d023439070a62ad862e497b7f2e4b244e2b7b1183f55c217572b01ca WHIRLPOOL c231908df004a9e519e92827b36aaed93aca4a7802c8b85593c2849c94bfa422744fdb015ac38c07eeac56304443068b612f426fd5455c25b822f68ed8ad0bc1
 DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc64965bd5b8803c50b183bde52daab55dd4a4aa6c7b29bb624f83a SHA512 33072bd5bf9251678c2a28f7418e23569f2012d41c6b9518f3099f58abef39ef7da8285cfd3d96ae4dbb01258a4b6656d6bcc3ea26439eba3fb4b504ef61d761 WHIRLPOOL dac893869ef4aa8f582de77ce8d7117682a981e0e4f68156426eb41d31d2f0a55b08438979e9ad176efe0f86285d0af43ada75f34283a7deb40f56a8827d00fd
 DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd2312ceee02e5b5175bf7f94ee13b0552e02be72250922326ae4d1 SHA512 f7a48ace418b6dfcb52c4dacbade6d7c675f431606927fb8a201ae091b6a2366cade7eaf756b108e5b0eb4f285c94d6228e74878d7fa5d3117c28e77df2caae1 WHIRLPOOL aeb5eafcedb7f2d108713f801cdc1f3972dbc1f9589d29f7d84f7eeebab6a970a48b05f2672eda41bf282faf3a6ed987917cfbfc30b0b1bf873af894c5bf18af
+DIST netbeans-trunk-nightly-201512090002-src.zip 209228578 SHA256 dedd023e1e8fe3ad332bf923abf62814f76a02e484733b724d16754f3da958a1 SHA512 c7aa770074a8f4f4fa13190a4facf829d2dc6de5a3c8045ba79e9f5689332b506ff1330470dea33b38b1b7cb9e17361eff71d2b221f0fc906bdb8cd918ff2e8b WHIRLPOOL 96be2ab1293f0ab957b7da2c3266f2b4d77ec7b724a9c1c40045f512ad7ec9c99919d29643aaf1ecd8a7667321d0468eebb71f3219e117d214da618ca105dedb
 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_p20151101.ebuild 2721 SHA256 959463c779becd38e659a2f1d1d269c2513198340e73ac0e660f3d4ecd24d11a SHA512 2880822c6d429cbff2711cd206ce551cabb8be4b65c3c2c6f82f33810608670f7b4b755a5f87d104678f87386031845a88e4a5dfabfc6bff531ba7c27d50664c WHIRLPOOL 071067ddd51734eddd427511073b2762086e8f5031bad54d3f2de15390a558d5028500d2238836cd269844c30d83348377e5d9a5758e0af0aa5348dd6924c1a9
@@ -65,4 +66,5 @@ EBUILD netbeans-websvccommon-9999_p20151203.ebuild 2721 SHA256 71f29055fc3d76261
 EBUILD netbeans-websvccommon-9999_p20151204.ebuild 2721 SHA256 e782964ee7456cfeb4c2c6432210ea8523f033fbbbd3f44c1a3181f61e209a97 SHA512 a9a5a59a0a312c2bc480a92b61499c1e83e79e293c3a6679af69f7dd9206f596c8d7ca654674bcb817b201bbd94e6eee820b3823eaa449108a93b57a279acbd4 WHIRLPOOL 97c868198b88a9a3c1b064400e1eb656c404c47d0c674b7464b71367902ef37a19a087410b023c0a6c11dc2d087f966f4d0b377ec3c7732d1a44d479dca9234a
 EBUILD netbeans-websvccommon-9999_p20151207.ebuild 2721 SHA256 f2cc1397326d95920aecd5fdb92f73563e9d91dcace56084d978b1e5d2eb5aee SHA512 cc42d429c8e42d3d87fc1d6e6164533be948f427b4497de889aad8fd63dd41a253edf6726dbe76acabe3ebc60de8c68c866078c3822e589584926ddbac76471c WHIRLPOOL ffeacec3ab4ba8ed4588255303447f26e2c6180ffa204e53359c0d8deb7864aea39c22287b08154fee6821bb0a89435ef0a348079f95245b77fc07ad0706b3cb
 EBUILD netbeans-websvccommon-9999_p20151208.ebuild 2721 SHA256 6b1b9f15fa7895faad398fcd33486f8a78d42562b4cf2b3bf2de715783109273 SHA512 49a90f72dce22bbab059c5c4611028a82841dd55b353316754b0b7c9cf2d81ea7afba08300cb1bb292c877fb327b813ef08d1672f0ded70d26e83f3ef625a214 WHIRLPOOL a5e904559b7e5e3adeb45ec775354b1cd5df3564a19e4de8a3f1870398a490836c161a978e29ad8ef65d56b2a360d614f39d03e3551c77c2b6a36c287fc4a77d
+EBUILD netbeans-websvccommon-9999_p20151209.ebuild 2721 SHA256 fe4c3c202ea8decc24de3d1ed81ff1e53bacde414e76efc6b48c6098590190c3 SHA512 f29252ed0aa5ecb967b2db31b647674ef359005d06918f4a6d2fbf25c21f1fc63e72b437193c0e7901d90a898ed44193c063539a115a7d2fbd15aca27d807051 WHIRLPOOL a797f1885940b4269f80932917ca6dd18b2288ea1bdda06baa7dbc0670955f107c7e7d57e18ef124c917dab8aa064df125c3d99ef66eee9686538012ea0c7009
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151209.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151209.ebuild
new file mode 100644
index 0000000..57d43b9
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151209.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-12-09_00-02-04/zip/netbeans-trunk-nightly-201512090002-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 f219fe4..89c9f15 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201512030002-src.zip 209171687 SHA256 d79cd2853d8d34
 DIST netbeans-trunk-nightly-201512040002-src.zip 209178833 SHA256 9fbb70be4c026ac0ef12f1a44a361fdee99cce6234920c68b045526d00d4fd75 SHA512 90bc8fb97442a61215613021d27bd20e71e5b5ecd63ce41710d761f70faba8d4229ff6e5d023439070a62ad862e497b7f2e4b244e2b7b1183f55c217572b01ca WHIRLPOOL c231908df004a9e519e92827b36aaed93aca4a7802c8b85593c2849c94bfa422744fdb015ac38c07eeac56304443068b612f426fd5455c25b822f68ed8ad0bc1
 DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc64965bd5b8803c50b183bde52daab55dd4a4aa6c7b29bb624f83a SHA512 33072bd5bf9251678c2a28f7418e23569f2012d41c6b9518f3099f58abef39ef7da8285cfd3d96ae4dbb01258a4b6656d6bcc3ea26439eba3fb4b504ef61d761 WHIRLPOOL dac893869ef4aa8f582de77ce8d7117682a981e0e4f68156426eb41d31d2f0a55b08438979e9ad176efe0f86285d0af43ada75f34283a7deb40f56a8827d00fd
 DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd2312ceee02e5b5175bf7f94ee13b0552e02be72250922326ae4d1 SHA512 f7a48ace418b6dfcb52c4dacbade6d7c675f431606927fb8a201ae091b6a2366cade7eaf756b108e5b0eb4f285c94d6228e74878d7fa5d3117c28e77df2caae1 WHIRLPOOL aeb5eafcedb7f2d108713f801cdc1f3972dbc1f9589d29f7d84f7eeebab6a970a48b05f2672eda41bf282faf3a6ed987917cfbfc30b0b1bf873af894c5bf18af
+DIST netbeans-trunk-nightly-201512090002-src.zip 209228578 SHA256 dedd023e1e8fe3ad332bf923abf62814f76a02e484733b724d16754f3da958a1 SHA512 c7aa770074a8f4f4fa13190a4facf829d2dc6de5a3c8045ba79e9f5689332b506ff1330470dea33b38b1b7cb9e17361eff71d2b221f0fc906bdb8cd918ff2e8b WHIRLPOOL 96be2ab1293f0ab957b7da2c3266f2b4d77ec7b724a9c1c40045f512ad7ec9c99919d29643aaf1ecd8a7667321d0468eebb71f3219e117d214da618ca105dedb
 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_p20151101.ebuild 7210 SHA256 ce70a22341c06aee959f4c4174364727ca76ec31040c0d36837d29c89cdc379a SHA512 75dd70f7da4e719cf1c8e95ff5e84d8a17d538cfc8cb7f084898f18a37dca0650b91d9e2e3de5718c5ca743e6eb0f4ead21fe5a794477aac9ae59c5082430850 WHIRLPOOL 8ecbf1297f6a3764ed4ddff7745b53083f9e1cf3ace71254944bff18fa28d2155e2f45ae1a4b50611ed8fe2f58b1a78ce449b550f95057cdffabc08c75f7eb4a
@@ -68,4 +69,5 @@ EBUILD netbeans-9999_p20151203.ebuild 6938 SHA256 da3c6c66e618429f94bb9a2164d42b
 EBUILD netbeans-9999_p20151204.ebuild 6938 SHA256 788cd72729057a8bd0cc54db9bce1bc67726d4ceade9b4978a01c5d855c22760 SHA512 214984459897ef42441598dc98d770ef6c7a626ed0079c5f13d90e5f5361fe6d17217444782dbf5d9cafb15d7a58bcacc28ff9dfcc355b0359544adee6fe1a69 WHIRLPOOL c96a1bb5852e3ab2024530de9ce95918c0bc44d748372b75d735e14c2d8ac19ca0b47ffb46cc7e469b0baadb7d99db3ed1281793c5d01c2586b83bf964e9985a
 EBUILD netbeans-9999_p20151207.ebuild 6938 SHA256 7ac11fbcaf3edce5b7a8e137c46454b92d9c97278a46dc4dd1a17fd3a4ffd633 SHA512 b798790408dac52685cbb15c55cfa5ed3a7b3d25aa39807d14b2c5c5218de4e0cc328023f2c32fa59cb331652f7d542588997c35fc6962095a56db8db6cf3326 WHIRLPOOL de57f69a4740a1012eea6aefa9bb47ec6b9adc6f64d4d7b638d724751413370899f11c00f37a5658b5e3828606d30687e69604cc1a44af6f109a2306ff95dbba
 EBUILD netbeans-9999_p20151208.ebuild 6938 SHA256 6c6d3bdf12e570a411aecb3f0bd54268aaeb1293a264b7aa28350bcd6f25e382 SHA512 351ddb9fe2c421454fcbefa89f46f6c792db5a38de76fa61571d101ece5b25d1e8eaf45e591b2f44dfacc08e59d2cb81450093aa06834edec8f63a1628ceaada WHIRLPOOL 691646e4103a60a4f343e875294f533b30284abfdbc8d3447516181f19e3e4b74c03b77ca3ffe8d1ea2454b479678b5446334cb9d915d27957feaab2516ef2e4
+EBUILD netbeans-9999_p20151209.ebuild 6938 SHA256 1effd8addb5cdd60454605e6353dffd3a8deb208b72c88687d88a76dcdaaf718 SHA512 c862525835100b2f7ecdd9b8b35aedc8fef14ba8f7233c97fe2ebeb621d9b15245b131562ad55e89646de2c004366d1e6289b5c780056138e51887c529f94f7a WHIRLPOOL 65b50bf9e347b375d8a9080175a8a20cc407f30ca403095f9e92cc3601df9bf39b1a7600300be58b8a18db2a89c05bd42772b1c697cb8b0d2cda476cf27aead6
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

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


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

end of thread, other threads:[~2015-12-09 11:01 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-09 11:01 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-websvccommon/, dev-java/netbeans-groovy/, Miroslav Šulc
  -- strict thread matches above, loose matches on Subject: below --
2015-08-22  8:46 Miroslav Šulc
2015-01-18 10:10 Miroslav Šulc

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