[gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-webcommon/, dev-java/netbeans-javadoc/, ...

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-webcommon/, dev-java/netbeans-javadoc/, ...
@ 2015-01-29  8:06 Miroslav Šulc
  0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2015-01-29  8:06 UTC (permalink / raw
  To: gentoo-commits

commit:     8a303bfe579bc6213b15013ff34c213d766a1664
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 29 08:05:56 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Jan 29 08:05:56 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/fordfrog.git;a=commit;h=8a303bfe

netbeans: bumped to the latest sources

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

diff --git a/dev-java/netbeans-apisupport/ChangeLog b/dev-java/netbeans-apisupport/ChangeLog
index 5ef5aac..184d3ea 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_p20150129 (29 Jan 2015)
+
+  29 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-apisupport-9999_p20150129.ebuild:
+  bumped to the latest sources
+
   29 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
   -netbeans-apisupport-9999_p20141223.ebuild,
   -netbeans-apisupport-9999_p20141225.ebuild:

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 1e720a9..fd42b9f 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -45,6 +45,7 @@ DIST netbeans-trunk-nightly-201501250002-src.zip 201455903 SHA256 a758db1b55fe99
 DIST netbeans-trunk-nightly-201501260002-src.zip 201455903 SHA256 9ee86145eb73ec82f7192d38f986f316e1fe604e77c27d2ef8d7734869aef4b3 SHA512 4ed99062c874cdaf336fd6a5fd5e7aaa52eafb25c710c14a0800639433dbb2d4998061f3d92dfa3896c8e909577a281523635e93d54edb080667713e432f9f54 WHIRLPOOL c1d53d25cd0bbe1179ef2acdd78f57a420f3f0ff239d7c988a39bc225b6d4d92ee09bcc8b583bf0e7be1e233f9cb4917688b6304161090ed69ed214e092bbcc7
 DIST netbeans-trunk-nightly-201501270002-src.zip 201460403 SHA256 60dfa824eb558b0f538f4ae578c8835cb47950830f1738a22641917b566df358 SHA512 137e8d4d2333ef39b9a6bc34fd56ee239b9573e098d6aa3b08c1f6130e7ea816816563b8750fb734c1b24835c9e8c5c661542045f08792173eda1309e2ec9145 WHIRLPOOL 288a5e89d0cb5849b881acecaf858f90dd6fbf6750eb64753328a7972a367481c64eb248ca7e7399d93ee12e1715c047cc0e04d34367bceca0af2b64153187dc
 DIST netbeans-trunk-nightly-201501280002-src.zip 201449292 SHA256 b09bc8e7245306558fe57aed376d11418d096349f010bc3c59c6dc5a0a1f5e52 SHA512 1d0d33fa15aebdc6aa362158c2cefef946728ead5827e96afa845d9fb57fc8894ccf34855817dc74493d6122acd704d913ae16b93a5b8f902f05b0527e6b51bd WHIRLPOOL 5e703502eb1100f3c8366669b385c48f440f422777ccd6c52166d3455c3910e6025d74f27a9e6714649fb135bb80c3139a7bd05da201b7c34d11d6a37abdbd8e
+DIST netbeans-trunk-nightly-201501290002-src.zip 201615638 SHA256 11a8edf7848e3ebf60edba96bacebc735b9ef150010692b6e78f41665ce61943 SHA512 974b9b35ecdab0a75201a08ae293a4e4d5245b9064c20a53d02e614a4ce4f315e0a4f49c121934cb1871f4247794448a3aeec1fce1bf1c15ff486a335a16402b WHIRLPOOL fbcde90582039d08e3001dcf51f48f2fa860d2a1da8f8fe4daa5b6d299bce04f5a0ccb343693aebf3c5261b9aa3dce5390ef2b4825068b52ef637ea27039c1f6
 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_p20150125.ebuild 3390 SHA256 ed4a6e86264ddbfef32
 EBUILD netbeans-apisupport-9999_p20150126.ebuild 3390 SHA256 52c45580aa77ce702e62ee37d3210b54c9fc23658dc567c1ccc0babec806e4ce SHA512 e192bb1a75c7561dbf248a23f68d86d0711dba15352bfc792e1c1bcbdae3c395159a09874f5089f2673fee1dc8e72c09c1013f10f333ad73b1a48966a5fdc1a4 WHIRLPOOL dae6c130c8a43ccb3e9d5830437fed10943b8701f8b40cb7849eb8d07fb4967c64a1947b48f8d318bce5e95b004c6ea594641086588b188308478efd87bf9075
 EBUILD netbeans-apisupport-9999_p20150127.ebuild 3390 SHA256 6cb14922209dfdcfe97ce538344a7dfd1c3683ce3e48089d0a80b49841999492 SHA512 4e59110f6808987d62d8fdae5abe5ad283a140fbcc3779b681fa90edc94a22819e3965e68ee5d4800623d240c73f4d09482847ff743282bd7f42719a25cb1fa6 WHIRLPOOL e2d009437a358a02d03147ba5fa9332ba80785858793e4730e6201a3d9ecc6da4159ed4966032a9c6b8f661acbe0544034670830683b6c6d37149f390334b6ed
 EBUILD netbeans-apisupport-9999_p20150128.ebuild 3390 SHA256 89dbf9a986c8f4b11c25789d549b585acbb74ba8024bc5bfe08a621d691f06e2 SHA512 b83e43919df0b332f6d25698d3a34b075c2877216cb010f106ccb3318cfa923df1d330810cd5185bb466d492f3e0e79924a1314f1c0c8a10d6a835af94912e1a WHIRLPOOL da95ec4868d23ff60ceccab6670dbbf59380db7b864b5e7abba36b93ce436f539a13c7e7fad3a79ad54c06055c787997a870ec67391b83edf9ab02dd79c1bf17
-MISC ChangeLog 156184 SHA256 037c9fe66c39a338cf7bf856dc91d04d32cdfbfc82e4f608a2dc7cb9c619042a SHA512 84a83224f5c65362775103fbc0d4aa16b0741cb4c06a6274cfb72780da6a669b062012562ccf687e0930705e2d5ad16d4d3a52b8f92f5588b963d6fb8f0ef56b WHIRLPOOL c3900192b362278fc548d45ecdca1c6a17161e4ae1db0f192620bb55a380f818224a16abb608d9d9677a184849f7082e205d3b1e01ec963a6d61f1c627127a21
+EBUILD netbeans-apisupport-9999_p20150129.ebuild 3390 SHA256 0d3c94d50b56e575b68348213676aca7593204b0613a8a41264c6ed67a812a11 SHA512 5c40c92208763a4e4fc0d74961fa3d40078a5244fa4aaf05d74eed54ce44613185a6b7109ac2ea1ff744c33a872faceff870139b03f273dad3aac153f9536f4f WHIRLPOOL 3f53ea1c32ba47a089c02ea1255b4c7fdfb071763b7875927e5a09b0dd5cdbfb623285458c62fbb63c327226a156387194b9babcf4c9fd5f234050a7c67be445
+MISC ChangeLog 156365 SHA256 7178e0df387729431d35560dcd061d76c07d721b41407f642cbf4494157ee641 SHA512 44cb8dfa4e924c9ca2c75bbdf1ede19f60cbb257dc437e89a2f8ed0f112c6c2dd5eb18fee2522ef6483de5fec58d84d5d45fa972980468cd511ba7b92e7228b4 WHIRLPOOL 04df68a70453fabd2be6a495d306d8f21658eb274bc174815dce47de7427fa7c64ebaadbe9b78f217fa2bc8175afc8c897c0d0c8a86a4efb7df339a49ae159b8
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150129.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150129.ebuild
new file mode 100644
index 0000000..3218dbf
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150129.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-29_00-02-36/zip/netbeans-trunk-nightly-201501290002-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 e78ce65..0c047a1 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_p20150129 (29 Jan 2015)
+
+  29 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-cnd-9999_p20150129.ebuild:
+  bumped to the latest sources
+
   29 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
   -netbeans-cnd-9999_p20141223.ebuild, -netbeans-cnd-9999_p20141225.ebuild:
   removed obsolete ebuilds

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index 8d710f9..207cdbb 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -58,6 +58,7 @@ DIST netbeans-trunk-nightly-201501250002-src.zip 201455903 SHA256 a758db1b55fe99
 DIST netbeans-trunk-nightly-201501260002-src.zip 201455903 SHA256 9ee86145eb73ec82f7192d38f986f316e1fe604e77c27d2ef8d7734869aef4b3 SHA512 4ed99062c874cdaf336fd6a5fd5e7aaa52eafb25c710c14a0800639433dbb2d4998061f3d92dfa3896c8e909577a281523635e93d54edb080667713e432f9f54 WHIRLPOOL c1d53d25cd0bbe1179ef2acdd78f57a420f3f0ff239d7c988a39bc225b6d4d92ee09bcc8b583bf0e7be1e233f9cb4917688b6304161090ed69ed214e092bbcc7
 DIST netbeans-trunk-nightly-201501270002-src.zip 201460403 SHA256 60dfa824eb558b0f538f4ae578c8835cb47950830f1738a22641917b566df358 SHA512 137e8d4d2333ef39b9a6bc34fd56ee239b9573e098d6aa3b08c1f6130e7ea816816563b8750fb734c1b24835c9e8c5c661542045f08792173eda1309e2ec9145 WHIRLPOOL 288a5e89d0cb5849b881acecaf858f90dd6fbf6750eb64753328a7972a367481c64eb248ca7e7399d93ee12e1715c047cc0e04d34367bceca0af2b64153187dc
 DIST netbeans-trunk-nightly-201501280002-src.zip 201449292 SHA256 b09bc8e7245306558fe57aed376d11418d096349f010bc3c59c6dc5a0a1f5e52 SHA512 1d0d33fa15aebdc6aa362158c2cefef946728ead5827e96afa845d9fb57fc8894ccf34855817dc74493d6122acd704d913ae16b93a5b8f902f05b0527e6b51bd WHIRLPOOL 5e703502eb1100f3c8366669b385c48f440f422777ccd6c52166d3455c3910e6025d74f27a9e6714649fb135bb80c3139a7bd05da201b7c34d11d6a37abdbd8e
+DIST netbeans-trunk-nightly-201501290002-src.zip 201615638 SHA256 11a8edf7848e3ebf60edba96bacebc735b9ef150010692b6e78f41665ce61943 SHA512 974b9b35ecdab0a75201a08ae293a4e4d5245b9064c20a53d02e614a4ce4f315e0a4f49c121934cb1871f4247794448a3aeec1fce1bf1c15ff486a335a16402b WHIRLPOOL fbcde90582039d08e3001dcf51f48f2fa860d2a1da8f8fe4daa5b6d299bce04f5a0ccb343693aebf3c5261b9aa3dce5390ef2b4825068b52ef637ea27039c1f6
 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_p20150125.ebuild 4586 SHA256 254fc8d83ffa33ee1ff574e02a
 EBUILD netbeans-cnd-9999_p20150126.ebuild 4586 SHA256 d561f447fda3e804ef43c98b6eb8274c602245f767f2569fbcdb8bb08701341d SHA512 824b2487423139e50acb60ae1bd4f790eee9ecd058be64aa3ecd547fd7a5db59c86daa221b942ead5b98348b1c3ac48559eb2f88077b66994d9452d8f619c19e WHIRLPOOL 39a5a05caaaa4683c0b1754fb3c0529b5e6c7f9874ffada8c8afb84e92d5d229f47b09f1f3eb4f5ee02f7c4fed77c0d7d3aaa7f9f5591cc5a54491e4172a163b
 EBUILD netbeans-cnd-9999_p20150127.ebuild 4586 SHA256 db1a2c4a00a08f715bd99c361e6a3c110ff06e949230811d87151e3af4b939da SHA512 41c04f26424c6061fde9b6519f9a03bb0748794de392824bce6fced4de9088252327e0514cbcc876f7c214ed3ba78c4639a3961a6ba3c7157f63e005d3d28ec8 WHIRLPOOL 88661e3f54e73b2cb5c41a6f1abaa998ab590743f5c4d6ef0cc795ebba6350ddee73c4d6a8b839a0fb1bd8bc821ea3af2401f5a4f236841ea813868d08d362ca
 EBUILD netbeans-cnd-9999_p20150128.ebuild 4586 SHA256 30ca81eeff1a89e85831688a77ff81ec2bf1e058bf3a2309af208527b4688ebd SHA512 c5ae4e0f4cef3c7497b6ac9a682e89ba194def4c840ab057577e68d1266cbcb36fd3bfa9808306158474e599c0b6e02e7be96dde0b2e9312d587823d50239679 WHIRLPOOL 44ebed6f7bf6950356b025080eb4f33b8be90778bd36cf4b9a75cf7d84231c6224e845da5edcc51dfb34baa1404f3ded4cb55dd85d0856024eb96301c50dcb5b
-MISC ChangeLog 142678 SHA256 dbfddc6674e42fa0fd26cf1f5ae0d2b633753df9d827b7efee433b5ae516814c SHA512 451b6b5c911f3f43351fb1d697b527d7070d76502232264ddf225114df879daa0708a95c769f7b3aa12ecbfd38ba1b44f479f9d7b9d25fce6617aefc23b5bf88 WHIRLPOOL 3b7471f22e682b86265c7f81ac92de0854d82de1e483e2a1099b807613ba07db7303f61c98d9c6b5eac02f0fb6c70c5678839c78dd8bc2ab485a4d0c87d92e19
+EBUILD netbeans-cnd-9999_p20150129.ebuild 4586 SHA256 740b6b79e87f20c8cebfffdd4fd31b913495166a455e043a1f66b579d4f93f63 SHA512 47a75d6366864cdb95144b2ad7fd5a995ac6159c439275a7ac084297a9da1514ec6d677a65b10534f3b8ab462e48f1a7b9f05cf741f9d1acf33aeb5ef0a9a8ec WHIRLPOOL 9ca7d8893aee6b1b47032fff4ebc2bbcd818626d77d1bb6f553b2e19e53a333c55b0b991ef100a936fdd462c45ebea5309798ce00482dd7d0c1f482d07154507
+MISC ChangeLog 142845 SHA256 e0557465365d11041321fa26130fc2097b0ba80715256931c255c35fe9ebbba9 SHA512 33efb8738dc7ca5ffc69ef27cf600c25d8c08e9a20aae70fb88b678f30370b98678ed28ca89c9deeaad1a2a2bab46099c77cd620e100a475232d083c99d59ff7 WHIRLPOOL 4c31533951c5997fbc26584894a2885ff162464e29d305e767a7c4336daaf18ea3a5e013f4efb15191fc4efe550b76093206e46bb92c220dacaacb8a3c27d06b
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150129.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150129.ebuild
new file mode 100644
index 0000000..f15caf1
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150129.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-29_00-02-36/zip/netbeans-trunk-nightly-201501290002-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 f594fbe..538a9b7 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_p20150129 (29 Jan 2015)
+
+  29 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-dlight-9999_p20150129.ebuild:
+  bumped to the latest sources
+
   29 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
   -netbeans-dlight-9999_p20141223.ebuild,
   -netbeans-dlight-9999_p20141225.ebuild:

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index f4c029e..3c9dfd8 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -6,6 +6,7 @@ DIST 9695A2FCDFCDDB42935490029E077C053E3F6FE1-fs_server-1.0.zip 299695 SHA256 43
 DIST DFC4928B8E531CC3E53B191500BFB066468B70AD-fs_server-1.0.zip 299540 SHA256 25b0fc774525e7ccd123135f3b6f6c1285f34efb4d98b5a23e0c1b01f5bd28b5 SHA512 6afc7d77763dc7cf87686606cb625a47943f074acde5cf89e9b06accb922c34777685b834b5e7dbfa6b5ef812b31ffa33524a31e5ac31237cb08c47daa895b53 WHIRLPOOL 67ddf8696f4512be77d75da60ef0f661c4065cc5958f742419e60212502bf454d388bce87538adc69f489131928ee62a38ec4eeb0c4c0b5da1af9a4f5502d4c4
 DIST F1AF5929CD612475CCF186F69E268F0CAAA2A90E-dtracectrl-0.1.zip 8834 SHA256 af00adae935a995cce5d668fd220cefcbe5e35ef943412109d25106982f2fd56 SHA512 72e8afec5ede6779c42221dfe5374121f0b5870f9b616c73418555bde50e777d090e9418d32e5953415e433f27300f7ab9f6aae69badbb4b8529b46364af8e93 WHIRLPOOL e529dcdc4f09d07984d671765f2990eb906c098d3feb9e512fd53441b22743d7f0900e3434fd4f1843537931470a45a91cda3f2eabe45bdd498c0a64c6d8c077
 DIST F787C9B484CD7526F866C21D8925C4DACE467F8A-derby-10.2.2.0.jar 2276020 SHA256 fc563bf30d51408ee092a59cc6abe381172040954ab1654061efb8eaf67fd2ba SHA512 ad3cc09057cf339c59189abf8fabba1e43f876c2cc2aacbcc95d8ff0ebaaa5641ac600730fbde83a13dff89705a7ced6d000f409257ac3e5f1ce027287e2c4d3 WHIRLPOOL 5e361676c3b2c3cdb35ac070dbdf2e6fd998476fb643426c106a22edadd1db904d8e0f1b25bf504d932f46247470fedc4efca92e116235669008d934e4821f97
+DIST F883DEF65C701D30F89FA8F1558238AD886F2444-fs_server-1.0.zip 312751 SHA256 070d9887e35d40e01ddb101ffc67cea32e5f9443796970f0c049a6d3e9e47ec7 SHA512 a5e2a9b578c7d815c61065df905fdef1417b5bfe65280c73832f3be210b96cd8ebc99a9a0764c790d6c387e92a57383b042b40cbaf5bd5b2bf17e6a10cccc492 WHIRLPOOL ce6a3bd95c89b7d36c641917cdc40475cc965c7192efc93addb8cde427f5a05e7cad261c4266107f50113247774255feb042a731d0274ff35ab3806403fe0d75
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f SHA512 ec81bbef311f891dd4371644afd549bef460e8e70eed49f7dbb5aec68f386097f340a411932345ba7bc786a1aef1f0b70a719d8e784b048d5ebf8b1e9ef3bb44 WHIRLPOOL 5c4440c6e2b75209b00030d1e78c28600dc387cc836be8b74bd2d55a6426c5a10d57e21a9572b83f499aa9ed6c33e2ecce44a82c440bba818e4d22c1cf856a55
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa SHA512 c2b4122d7bf8332455ac71d72e76d29bc31e13d892997e153ee1bb99a019f58bfc12179a24ab2bdaaf1c61ad823b7c24857523d0363ea6856b81a0aaef9d2eca WHIRLPOOL 296b51405e16e580101f15a459f4e07ec31ab353fec1e4c4d5ae79ff7d378e994291c7c378f380fbf83d1718366f38bbb3801834079db466a1c3bade099d7fd0
 DIST netbeans-7.1.2-201204101705-src.zip 172346251 SHA256 95df26a2eafdc88887a835b3abcf930fd0e72c1639c3e0bfceb9489e44c5865c SHA512 9470f00021fd401e33c9bb4871e40780f1775e0e41c6d0c28ee0ac157c3eede324703d0ed8b1cf14e22441a14ba82fdf72315d7135f55b2a8ffa75f935496f23 WHIRLPOOL ba64a70001e8a18080cc58279e3ba70f61b3ab2c51d2f0be81bec178610f9ff37d41a77d2d5f39e16a8c07e9a7931d1487f35054d2d5fa7e379bb8edab09fc1b
@@ -53,6 +54,7 @@ DIST netbeans-trunk-nightly-201501250002-src.zip 201455903 SHA256 a758db1b55fe99
 DIST netbeans-trunk-nightly-201501260002-src.zip 201455903 SHA256 9ee86145eb73ec82f7192d38f986f316e1fe604e77c27d2ef8d7734869aef4b3 SHA512 4ed99062c874cdaf336fd6a5fd5e7aaa52eafb25c710c14a0800639433dbb2d4998061f3d92dfa3896c8e909577a281523635e93d54edb080667713e432f9f54 WHIRLPOOL c1d53d25cd0bbe1179ef2acdd78f57a420f3f0ff239d7c988a39bc225b6d4d92ee09bcc8b583bf0e7be1e233f9cb4917688b6304161090ed69ed214e092bbcc7
 DIST netbeans-trunk-nightly-201501270002-src.zip 201460403 SHA256 60dfa824eb558b0f538f4ae578c8835cb47950830f1738a22641917b566df358 SHA512 137e8d4d2333ef39b9a6bc34fd56ee239b9573e098d6aa3b08c1f6130e7ea816816563b8750fb734c1b24835c9e8c5c661542045f08792173eda1309e2ec9145 WHIRLPOOL 288a5e89d0cb5849b881acecaf858f90dd6fbf6750eb64753328a7972a367481c64eb248ca7e7399d93ee12e1715c047cc0e04d34367bceca0af2b64153187dc
 DIST netbeans-trunk-nightly-201501280002-src.zip 201449292 SHA256 b09bc8e7245306558fe57aed376d11418d096349f010bc3c59c6dc5a0a1f5e52 SHA512 1d0d33fa15aebdc6aa362158c2cefef946728ead5827e96afa845d9fb57fc8894ccf34855817dc74493d6122acd704d913ae16b93a5b8f902f05b0527e6b51bd WHIRLPOOL 5e703502eb1100f3c8366669b385c48f440f422777ccd6c52166d3455c3910e6025d74f27a9e6714649fb135bb80c3139a7bd05da201b7c34d11d6a37abdbd8e
+DIST netbeans-trunk-nightly-201501290002-src.zip 201615638 SHA256 11a8edf7848e3ebf60edba96bacebc735b9ef150010692b6e78f41665ce61943 SHA512 974b9b35ecdab0a75201a08ae293a4e4d5245b9064c20a53d02e614a4ce4f315e0a4f49c121934cb1871f4247794448a3aeec1fce1bf1c15ff486a335a16402b WHIRLPOOL fbcde90582039d08e3001dcf51f48f2fa860d2a1da8f8fe4daa5b6d299bce04f5a0ccb343693aebf3c5261b9aa3dce5390ef2b4825068b52ef637ea27039c1f6
 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 +94,6 @@ EBUILD netbeans-dlight-9999_p20150125.ebuild 2995 SHA256 56770c3d0f6b4b7e9e01034
 EBUILD netbeans-dlight-9999_p20150126.ebuild 2995 SHA256 8b2bbeb6d44527f91ae677fe273567abf7fe3cf15435a9756ed76e315fe5754a SHA512 516f6c6cff13d314509e2764ff793a36247ed22e42f1157c276e1a122b2f103d5e5baff7ecdfe2d802b5ee64fe54dee9782ae586fcadaa9c40fbe70559e465b4 WHIRLPOOL 671b8a9d2326e79087fec9f36f4f59eb24794b25c0ba80001d8400ba7afa7ea490eafe940407dc465b163eef34e8e422dfcec4bf0621ade95f3c4124c6e396cb
 EBUILD netbeans-dlight-9999_p20150127.ebuild 2995 SHA256 6eecdeaeb925031b81a6458c6f966bf9d58c09d8e704e71daab57a4edd160b32 SHA512 4c221df5cfd2c8c692222dc5c023863751815ff723d503d5d8dba2736cd230233e44753932df45f15e5d4cd6a6b759db013b3ab3fb0dab4e558e8147ae6ae10a WHIRLPOOL dcadfc9f0d624b5014c1b021c36bb29202065ef94fb89e36eec50c06a1214c8d6f3e671ce07285cdee48ed7cd993e3927d7e65048e6fc8c355f71d96ec6aafea
 EBUILD netbeans-dlight-9999_p20150128.ebuild 2995 SHA256 66a0cdeb6ad3daed3f32083c068d875d41970cedd5e5b4506f3f25bac850cddb SHA512 d9f01568d337c824d1f8fce0cc55b7e56492fe6c66f2c81b359fbdb945c204d4edb907e0fad0390cf2e73a19c95f0abf7274dca26863a57626bf4d2d0ab5f111 WHIRLPOOL 984179a40e1763748cc46996da3bc8e854919a98814310c0fa7ed761fd0b5539fcd9e836abab8a1e962a2905f01e2379e1d4a020737c47fbf06e20c6ceaafc82
-MISC ChangeLog 148751 SHA256 7a142f5b6af2ac673a9a4fe0db2e2aef90b7722def7df9173b375bba33858cce SHA512 998d57f2d7f2c35b7923c558ca1a1ce05fea0dcb8a9c89be76823926d522e1612f2337a51c8c4379d2f3674a0a3acca38967ca264d7ed0ed62f2e76a87f5bfe9 WHIRLPOOL 08738730469f024c0887f0716732c8988edaafedbcada29827453395b567b9d56abf522da55db5e41ca34b6871855ef360824b29b6494043afbae3752d20cfc8
+EBUILD netbeans-dlight-9999_p20150129.ebuild 2995 SHA256 5f6044aee584873932a54719cfb4cc53d55cdcd5e0959b7f41e78c9df2c3aea3 SHA512 be818fedccad5504cf5f6aa11a69f67ee1d37ea019455c9689965f083372043c2dd12b3c587c1ca9108c82b0cfa6c57bf8b7f39b38cceec2235f1551e67369b2 WHIRLPOOL f39eabb8b6e6efa51d3329491679be01ed5369f8a9057e52c446ada28c5b117a1cfd915a27cb02986ca54778e4415f43d16e70ea793371faf65efda26523125e
+MISC ChangeLog 148924 SHA256 242a46920a0176dce8f095f7c26192041c59e5a3ed9d2ae1e2a99887872c5579 SHA512 a60c912783cc79ecbe06f623655ba1416e69d2c01c86f02eccd1882067a86adf1e325e1fca51960c0de9f41824232983ee9ce57e028470dffd07deb11edaf47e WHIRLPOOL f825824c3fff2b2d17763e155ac0f4386dfb22d9c5f43bda24f8ac08121125a7c23709d419aa9287fd82f78960b56659a210c75da653e8401ac22f5941c2e2a1
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150129.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150129.ebuild
new file mode 100644
index 0000000..4a68d98
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150129.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-29_00-02-36/zip/netbeans-trunk-nightly-201501290002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/F883DEF65C701D30F89FA8F1558238AD886F2444-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}"/F883DEF65C701D30F89FA8F1558238AD886F2444-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 919bad2..b789239 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_p20150129 (29 Jan 2015)
+
+  29 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-enterprise-9999_p20150129.ebuild:
+  bumped to the latest sources
+
   29 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
   -netbeans-enterprise-9999_p20141223.ebuild,
   -netbeans-enterprise-9999_p20141225.ebuild:

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 303ed47..78b8478 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -134,6 +134,7 @@ DIST netbeans-trunk-nightly-201501250002-src.zip 201455903 SHA256 a758db1b55fe99
 DIST netbeans-trunk-nightly-201501260002-src.zip 201455903 SHA256 9ee86145eb73ec82f7192d38f986f316e1fe604e77c27d2ef8d7734869aef4b3 SHA512 4ed99062c874cdaf336fd6a5fd5e7aaa52eafb25c710c14a0800639433dbb2d4998061f3d92dfa3896c8e909577a281523635e93d54edb080667713e432f9f54 WHIRLPOOL c1d53d25cd0bbe1179ef2acdd78f57a420f3f0ff239d7c988a39bc225b6d4d92ee09bcc8b583bf0e7be1e233f9cb4917688b6304161090ed69ed214e092bbcc7
 DIST netbeans-trunk-nightly-201501270002-src.zip 201460403 SHA256 60dfa824eb558b0f538f4ae578c8835cb47950830f1738a22641917b566df358 SHA512 137e8d4d2333ef39b9a6bc34fd56ee239b9573e098d6aa3b08c1f6130e7ea816816563b8750fb734c1b24835c9e8c5c661542045f08792173eda1309e2ec9145 WHIRLPOOL 288a5e89d0cb5849b881acecaf858f90dd6fbf6750eb64753328a7972a367481c64eb248ca7e7399d93ee12e1715c047cc0e04d34367bceca0af2b64153187dc
 DIST netbeans-trunk-nightly-201501280002-src.zip 201449292 SHA256 b09bc8e7245306558fe57aed376d11418d096349f010bc3c59c6dc5a0a1f5e52 SHA512 1d0d33fa15aebdc6aa362158c2cefef946728ead5827e96afa845d9fb57fc8894ccf34855817dc74493d6122acd704d913ae16b93a5b8f902f05b0527e6b51bd WHIRLPOOL 5e703502eb1100f3c8366669b385c48f440f422777ccd6c52166d3455c3910e6025d74f27a9e6714649fb135bb80c3139a7bd05da201b7c34d11d6a37abdbd8e
+DIST netbeans-trunk-nightly-201501290002-src.zip 201615638 SHA256 11a8edf7848e3ebf60edba96bacebc735b9ef150010692b6e78f41665ce61943 SHA512 974b9b35ecdab0a75201a08ae293a4e4d5245b9064c20a53d02e614a4ce4f315e0a4f49c121934cb1871f4247794448a3aeec1fce1bf1c15ff486a335a16402b WHIRLPOOL fbcde90582039d08e3001dcf51f48f2fa860d2a1da8f8fe4daa5b6d299bce04f5a0ccb343693aebf3c5261b9aa3dce5390ef2b4825068b52ef637ea27039c1f6
 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_p20150125.ebuild 15147 SHA256 bf12a42da1ad8710cc
 EBUILD netbeans-enterprise-9999_p20150126.ebuild 15147 SHA256 5b13a4e3286a75f57b4a53400534ce1070b65bff472ab7fec4f7108a265a84c8 SHA512 7de573c9362126cbe9fe80138de31e3d2fb87f4f0bdeda05715f105408bde749a98c97042f00845c432d5bc6a6c55cfaf91b9be1676f7e42cb8456d7bceb8989 WHIRLPOOL 4e3f696fd6e0053f84b2c961c86b1d3b3eeb1dd8088cae6997c761104b0b352b91f8c1b0e6e1fb300dd33c07c32b3c55cd662fcf71e64ba38db6617afad64bee
 EBUILD netbeans-enterprise-9999_p20150127.ebuild 15147 SHA256 728306698063fb422bb174a3a587156c61fdd1dfceb3a868ea6870bf8af9b62a SHA512 06f4de420ac4a6f132c26f9045a47ad9822996a958d7086c1a2f5ac952e9569846e87a1b9410802383e725dd5baaae0c48c367b4539d5ba23795150d8f39b2fe WHIRLPOOL 788ebc93230086cb3bb0b4d39c977d6b36705eb6c37097a1c8b6a0c023cea534cc3b7b5f8dce739cba5dd6e13d5a347595c435dcf8525c0721b25c48e0bd3f49
 EBUILD netbeans-enterprise-9999_p20150128.ebuild 15147 SHA256 f6319c613b8bc7506b204640e53922a3216960158b64d464553f7e5abaf3e4f1 SHA512 a9bd15acb203132f9928674f5c206280a4e72ed1d8c477c6d7992b4376c46bd1e215147565016b058449ff1ab63407f4164828152a6d00b4c9c50a70788ba42b WHIRLPOOL 2aa1da9ee2f2fa51ceca3e0a0c7d38740316abbb1b1ead4b61166e895da89bf0f2246d846e6a97e9db5588d6dc620c37ed0a87fd026ddcfeb4ce893a50b19c69
-MISC ChangeLog 156709 SHA256 ef02211830d50a1bb473a1640f492be5fd1327bf808765fd4aa95e0239f3bfee SHA512 cce03e4101b5f7186614180bac28adf4e5bee52513460255056a832c65f3591f59c3cf12e8ad4b553cf91adc947ff70830dd1bfe71f249ce998eacff29bf9af6 WHIRLPOOL 663eda4a9a05b285352412d276bf9b43c964911c31f22bde4fd34d308e90e449f791d79410c2d84243139753d482da2b7c6be4b3d302c0de5bf248a15176067e
+EBUILD netbeans-enterprise-9999_p20150129.ebuild 15147 SHA256 68bcdd1d3b5410ff3f5ac6c28eda14f4966884ba673ff1ca76398f9277a9bae4 SHA512 7a7a351f05a44bec054b08291001b32feabf0df08e9dad88a729dbdb254cdf86eb88d17dda929c5bf6e6eadb59de0f6babf29e734136d1d5edf5c49b0d0da520 WHIRLPOOL 2d982dfcd7709820024ad06bfe53c150d1bfd468eeafc648dd779d495588a27439731eed9ab3fcd4382f826726e888482b83a1edca1a090957458ab9cd55fac5
+MISC ChangeLog 156890 SHA256 407d47f857a9f9f2e587ca5a3707c4e590034de7acf9294e88b5dc9d18948805 SHA512 2683f76d783ff566aaafae5cc02cc33531e395229631f8e690b0dcc24d7dee8e84ec85221a4344cf0d91cc7ea29d4feb5a7921295dc3746e6f754a34195ba3e8 WHIRLPOOL d35f2dcdcb3c8c1469f2c73e004c961783e51d171a50e94fffa7d7bb5fd038dea316cae7ee9d6cedc21330d5f67e6843008358f90645c2daaec583735b2dd400
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150129.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150129.ebuild
new file mode 100644
index 0000000..9a9746b
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150129.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-29_00-02-36/zip/netbeans-trunk-nightly-201501290002-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 8935618..7bed293 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_p20150129 (29 Jan 2015)
+
+  29 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ergonomics-9999_p20150129.ebuild:
+  bumped to the latest sources
+
   29 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
   -netbeans-ergonomics-9999_p20141223.ebuild,
   -netbeans-ergonomics-9999_p20141225.ebuild:

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 5e2d592..78002a6 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -45,6 +45,7 @@ DIST netbeans-trunk-nightly-201501250002-src.zip 201455903 SHA256 a758db1b55fe99
 DIST netbeans-trunk-nightly-201501260002-src.zip 201455903 SHA256 9ee86145eb73ec82f7192d38f986f316e1fe604e77c27d2ef8d7734869aef4b3 SHA512 4ed99062c874cdaf336fd6a5fd5e7aaa52eafb25c710c14a0800639433dbb2d4998061f3d92dfa3896c8e909577a281523635e93d54edb080667713e432f9f54 WHIRLPOOL c1d53d25cd0bbe1179ef2acdd78f57a420f3f0ff239d7c988a39bc225b6d4d92ee09bcc8b583bf0e7be1e233f9cb4917688b6304161090ed69ed214e092bbcc7
 DIST netbeans-trunk-nightly-201501270002-src.zip 201460403 SHA256 60dfa824eb558b0f538f4ae578c8835cb47950830f1738a22641917b566df358 SHA512 137e8d4d2333ef39b9a6bc34fd56ee239b9573e098d6aa3b08c1f6130e7ea816816563b8750fb734c1b24835c9e8c5c661542045f08792173eda1309e2ec9145 WHIRLPOOL 288a5e89d0cb5849b881acecaf858f90dd6fbf6750eb64753328a7972a367481c64eb248ca7e7399d93ee12e1715c047cc0e04d34367bceca0af2b64153187dc
 DIST netbeans-trunk-nightly-201501280002-src.zip 201449292 SHA256 b09bc8e7245306558fe57aed376d11418d096349f010bc3c59c6dc5a0a1f5e52 SHA512 1d0d33fa15aebdc6aa362158c2cefef946728ead5827e96afa845d9fb57fc8894ccf34855817dc74493d6122acd704d913ae16b93a5b8f902f05b0527e6b51bd WHIRLPOOL 5e703502eb1100f3c8366669b385c48f440f422777ccd6c52166d3455c3910e6025d74f27a9e6714649fb135bb80c3139a7bd05da201b7c34d11d6a37abdbd8e
+DIST netbeans-trunk-nightly-201501290002-src.zip 201615638 SHA256 11a8edf7848e3ebf60edba96bacebc735b9ef150010692b6e78f41665ce61943 SHA512 974b9b35ecdab0a75201a08ae293a4e4d5245b9064c20a53d02e614a4ce4f315e0a4f49c121934cb1871f4247794448a3aeec1fce1bf1c15ff486a335a16402b WHIRLPOOL fbcde90582039d08e3001dcf51f48f2fa860d2a1da8f8fe4daa5b6d299bce04f5a0ccb343693aebf3c5261b9aa3dce5390ef2b4825068b52ef637ea27039c1f6
 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_p20150125.ebuild 2919 SHA256 d214468fffc4505624d
 EBUILD netbeans-ergonomics-9999_p20150126.ebuild 2919 SHA256 c0b2d65f1d0f4937b5bfc34e1c71418721837cafbdb7be714600be97efc8384b SHA512 2764211e6bb20c404002dcec96947f3ed389469f5c0946d3404f4305648d189b67860286bc036936554dfd76204143a348065d13eceabcd977c26a30971a8b60 WHIRLPOOL 1215ee388f26e3ce9c62bff26a42ebd0226b3fcef844384acb47fe7d74566e1eb2dae5e5132958d7874d8c81930de0977d6fca4d663ddee0a5f63eaf61924703
 EBUILD netbeans-ergonomics-9999_p20150127.ebuild 2919 SHA256 26f01728ed561420d32c8c10609e93d547f1397b5d6939a6c43e1859f23e5b24 SHA512 5b9c06bd3de0313e7a88a202a6d9e3a2b4d88b965b1239269a0d54f8ccfebc926086e29fe817997f689a9be9ed920b16c147e8e03c042a05dfda33941f3474f5 WHIRLPOOL d4d8d6ee52e3475c3dabc0360fc88cb737f330b7dcd567969913af82664a654d92b077e1060bc122828f7df92f35097c6b53419a7f4b82f518d3573951ee74e8
 EBUILD netbeans-ergonomics-9999_p20150128.ebuild 2919 SHA256 8f192529fe8cf6bc16960b383f18ccc4f7524adf451778987feb3ad823c78bc9 SHA512 3cb97d7faecc34a7c923da3fb77c60b947a06f4fd0c5aedab7027d7a9e4667afbc126de3f6bfed0f322609f8403fed38cdec3b760687baee1002746326eb2c1f WHIRLPOOL 75bfd0b02f17418f3c5481160390fefbe8aa7e71f582b6c62a3c58667105e76648b910b0d5254066497047ac6287f36eb1e148891a284b6fe8cbd45544c10f2e
-MISC ChangeLog 156184 SHA256 e65fb9748a3d1bf98707756e78853dfdea2717fb7ca51c264210502d05f0c1dd SHA512 c31eb0055c6abda8b5ab7ecd4905607493ff1e79710c6d01ea2467c6226103f3fd1352dd1e01363d05a8b07532c5e89db310de1aaa3fbc7ddb54109cedcea7be WHIRLPOOL 9f5518a3c56e568f3a4b84dc8d642734f486f64c8a07d64e0d0684f3a7cdb5902629f92aa15b604a290710dc3198ccaf5f897c5f84cd52babae779261e2339fb
+EBUILD netbeans-ergonomics-9999_p20150129.ebuild 2919 SHA256 4e7a767860d859497b1b9b938f8f3faca3a1f93fa5d9a93199049da27c64f70a SHA512 f8493acc43704105141a00443730f2fdbc2ee8e54e4932ce36b47282219578cdef125a1c2333c72fbd2ab617f9c1e12ed320cb2f099d25da4f5e3f519d42e946 WHIRLPOOL b67b1b07e204d5e4fed9fda7582f9784226d153cfdd96bc9447602b139721777b45d25b2fdc26658ca7d5cb3d631d33d9e244d775bc57181800b4335427dd202
+MISC ChangeLog 156365 SHA256 65767a66de421b4944bc851ce16d83a6d2fe65bd781991374ee10fe3a86333c0 SHA512 68bfb58b537a22b8d06d664bf99c1b6279392c01df1b7c84bdb2122e6e14652f7dba1124385f7244c1650fd048e98d94f845b929520e681c7db598f8c583897b WHIRLPOOL 463933cc25192902e06df457038744510740947fe5328201bb9a507a76af6f7638c178047b3084977090cb511dcabf6a628e970839bfc5d69781f546669cad59
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150129.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150129.ebuild
new file mode 100644
index 0000000..7f0be6f
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150129.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-29_00-02-36/zip/netbeans-trunk-nightly-201501290002-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 5c8cf3a..8175aa7 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_p20150129 (29 Jan 2015)
+
+  29 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-extide-9999_p20150129.ebuild:
+  bumped to the latest sources
+
   29 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
   -netbeans-extide-9999_p20141223.ebuild,
   -netbeans-extide-9999_p20141225.ebuild:

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index e437d13..c5bc5a1 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -43,6 +43,7 @@ DIST netbeans-trunk-nightly-201501250002-src.zip 201455903 SHA256 a758db1b55fe99
 DIST netbeans-trunk-nightly-201501260002-src.zip 201455903 SHA256 9ee86145eb73ec82f7192d38f986f316e1fe604e77c27d2ef8d7734869aef4b3 SHA512 4ed99062c874cdaf336fd6a5fd5e7aaa52eafb25c710c14a0800639433dbb2d4998061f3d92dfa3896c8e909577a281523635e93d54edb080667713e432f9f54 WHIRLPOOL c1d53d25cd0bbe1179ef2acdd78f57a420f3f0ff239d7c988a39bc225b6d4d92ee09bcc8b583bf0e7be1e233f9cb4917688b6304161090ed69ed214e092bbcc7
 DIST netbeans-trunk-nightly-201501270002-src.zip 201460403 SHA256 60dfa824eb558b0f538f4ae578c8835cb47950830f1738a22641917b566df358 SHA512 137e8d4d2333ef39b9a6bc34fd56ee239b9573e098d6aa3b08c1f6130e7ea816816563b8750fb734c1b24835c9e8c5c661542045f08792173eda1309e2ec9145 WHIRLPOOL 288a5e89d0cb5849b881acecaf858f90dd6fbf6750eb64753328a7972a367481c64eb248ca7e7399d93ee12e1715c047cc0e04d34367bceca0af2b64153187dc
 DIST netbeans-trunk-nightly-201501280002-src.zip 201449292 SHA256 b09bc8e7245306558fe57aed376d11418d096349f010bc3c59c6dc5a0a1f5e52 SHA512 1d0d33fa15aebdc6aa362158c2cefef946728ead5827e96afa845d9fb57fc8894ccf34855817dc74493d6122acd704d913ae16b93a5b8f902f05b0527e6b51bd WHIRLPOOL 5e703502eb1100f3c8366669b385c48f440f422777ccd6c52166d3455c3910e6025d74f27a9e6714649fb135bb80c3139a7bd05da201b7c34d11d6a37abdbd8e
+DIST netbeans-trunk-nightly-201501290002-src.zip 201615638 SHA256 11a8edf7848e3ebf60edba96bacebc735b9ef150010692b6e78f41665ce61943 SHA512 974b9b35ecdab0a75201a08ae293a4e4d5245b9064c20a53d02e614a4ce4f315e0a4f49c121934cb1871f4247794448a3aeec1fce1bf1c15ff486a335a16402b WHIRLPOOL fbcde90582039d08e3001dcf51f48f2fa860d2a1da8f8fe4daa5b6d299bce04f5a0ccb343693aebf3c5261b9aa3dce5390ef2b4825068b52ef637ea27039c1f6
 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_p20150125.ebuild 3383 SHA256 326a980f3a676a581cc82ee
 EBUILD netbeans-extide-9999_p20150126.ebuild 3383 SHA256 57e9d21de4800fab8d2fb6a0c0386cc8606f6ff2512831613669fa6958292f9e SHA512 2207398bd15cac0563d2618d03a72465a58a310a86263b55bbaf8a6eb8424f99c6cce6a42437267fcc5aaf9dc7f3de529bdd1af60dac49e9ec370c695c0a8e4d WHIRLPOOL e1216529029e7cb30f3df0853e698e6462d7c28c13e01bdb7852c1b205f4ee16353bde905a2303e99a20fb45b84c41a5a660d986510a809da9e49827c824605f
 EBUILD netbeans-extide-9999_p20150127.ebuild 3383 SHA256 d798af63b95ebf7d750b872731eb0fa4eea7f6bc6cfbe9896ee3f3216f00b906 SHA512 cc57417021d64f930d71455153986a1391f998f8e05036c9ef5760a138bfeaf645f41909f76ce7dea700e7d50d9d7478d961b0ab656257f834fe76e90eb6cd00 WHIRLPOOL 8c0448d399b65c02ab050277254e9fbb9128ddda26bbe6423324d7fef1982c6060661cec54bbb0c35130d8a20ee654bc5485d05d5b7cf76731c6ce268304c7b7
 EBUILD netbeans-extide-9999_p20150128.ebuild 3383 SHA256 bbcdb4cf9df93ad8b2c777c59313550f239103ca08ced5117b7a7b63c74e65a5 SHA512 8fc500efaa09a11c966bcb57f46aad4a8c29acd80fc52a8598b2b3b39187dd509abd8f4cf90664aac4ebb23aba1ab45b9569a8a9fc6acafc35f5dba640c9f50e WHIRLPOOL d0c9eb20fde5af5fba80f59eec15f479dbeceb401b348682670b93778e0476a6b85721c7247902922afedcd394d840e7fb12d99edae9b646ba09e91cccb97053
-MISC ChangeLog 80763 SHA256 af055889bb4100130a950f1727ca412f2f3891ddbc1e42da568261d10e0804fe SHA512 44446f87db1ee26b3758d6fb7b3b5c63b7e8f4d17b9954c664c7d4c7262542f56a0411205f1950c1e6a6b785f32b800f64fbb399a2f4b5c47ccbf2fc7e34ca0e WHIRLPOOL 928b16b3d574cc34e6c475b0c55cc482ed1a77aa541bf8e902254e01be82b8cfe7ec2dc18f4a73850f618255e81bd2d42b46802597e13afe4cdc99964c35c2f1
+EBUILD netbeans-extide-9999_p20150129.ebuild 3383 SHA256 4adea249ad6287708ddc7563e976ac6f9ba2d4fe662979cceb12a9abf0ee9fcd SHA512 f1470b9df44d6dee6173cc5d20fff6b45ab8551268af546fc267d5627a7217c544aa0583bd5985648d13ea5607de5766e2590357cab7f99f11525be8b3fe61aa WHIRLPOOL 132f18ff8cfb4807a8df4f15fef0cac0119fe43f58109b4bbe221ceb38fe1690fa146371faa9e51d570a9e51beec97a763c570d7bc1978ed62b9d0df724ef214
+MISC ChangeLog 80936 SHA256 6d4427da36ed5d2f59b4de10618ef0c1cf846d9fe28697aa6e4d924bdcd4d7ae SHA512 4762eb642968f73a74610f84fa3749bd160b4f401b7e9941e2ba04770ea1b11cd2e09e420621fe5f4de165c03ba27cfb8c4cb691845ddda1bcd56a1016740b55 WHIRLPOOL 47cf2debb37bb2313ae397cce05538a0dd32af2c273d41728972985a2905495506539cf91b3344d52f3a2feb10082c545d8266ef987aec9bbb015855875a675e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20150129.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20150129.ebuild
new file mode 100644
index 0000000..372b714
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20150129.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-29_00-02-36/zip/netbeans-trunk-nightly-201501290002-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 6aa6a95..3f6a44e 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_p20150129 (29 Jan 2015)
+
+  29 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-groovy-9999_p20150129.ebuild:
+  bumped to the latest sources
+
   29 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
   -netbeans-groovy-9999_p20141223.ebuild,
   -netbeans-groovy-9999_p20141225.ebuild:

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 88b71f2..ef1671b 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -49,6 +49,7 @@ DIST netbeans-trunk-nightly-201501250002-src.zip 201455903 SHA256 a758db1b55fe99
 DIST netbeans-trunk-nightly-201501260002-src.zip 201455903 SHA256 9ee86145eb73ec82f7192d38f986f316e1fe604e77c27d2ef8d7734869aef4b3 SHA512 4ed99062c874cdaf336fd6a5fd5e7aaa52eafb25c710c14a0800639433dbb2d4998061f3d92dfa3896c8e909577a281523635e93d54edb080667713e432f9f54 WHIRLPOOL c1d53d25cd0bbe1179ef2acdd78f57a420f3f0ff239d7c988a39bc225b6d4d92ee09bcc8b583bf0e7be1e233f9cb4917688b6304161090ed69ed214e092bbcc7
 DIST netbeans-trunk-nightly-201501270002-src.zip 201460403 SHA256 60dfa824eb558b0f538f4ae578c8835cb47950830f1738a22641917b566df358 SHA512 137e8d4d2333ef39b9a6bc34fd56ee239b9573e098d6aa3b08c1f6130e7ea816816563b8750fb734c1b24835c9e8c5c661542045f08792173eda1309e2ec9145 WHIRLPOOL 288a5e89d0cb5849b881acecaf858f90dd6fbf6750eb64753328a7972a367481c64eb248ca7e7399d93ee12e1715c047cc0e04d34367bceca0af2b64153187dc
 DIST netbeans-trunk-nightly-201501280002-src.zip 201449292 SHA256 b09bc8e7245306558fe57aed376d11418d096349f010bc3c59c6dc5a0a1f5e52 SHA512 1d0d33fa15aebdc6aa362158c2cefef946728ead5827e96afa845d9fb57fc8894ccf34855817dc74493d6122acd704d913ae16b93a5b8f902f05b0527e6b51bd WHIRLPOOL 5e703502eb1100f3c8366669b385c48f440f422777ccd6c52166d3455c3910e6025d74f27a9e6714649fb135bb80c3139a7bd05da201b7c34d11d6a37abdbd8e
+DIST netbeans-trunk-nightly-201501290002-src.zip 201615638 SHA256 11a8edf7848e3ebf60edba96bacebc735b9ef150010692b6e78f41665ce61943 SHA512 974b9b35ecdab0a75201a08ae293a4e4d5245b9064c20a53d02e614a4ce4f315e0a4f49c121934cb1871f4247794448a3aeec1fce1bf1c15ff486a335a16402b WHIRLPOOL fbcde90582039d08e3001dcf51f48f2fa860d2a1da8f8fe4daa5b6d299bce04f5a0ccb343693aebf3c5261b9aa3dce5390ef2b4825068b52ef637ea27039c1f6
 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_p20150125.ebuild 3422 SHA256 76fa84b9b95691b71fba109
 EBUILD netbeans-groovy-9999_p20150126.ebuild 3422 SHA256 bd1259df6d50662b0731bd54e71b92319b3025ebddcf2cd4c8cb668ba9dbc94c SHA512 7c3b2f8a540a5cb3eef4841e92d5488def87ed7829d192da2a156e2f405ebb44c8908051416e86bbabcb1145ef3ea8251b3d461ceb853ceec485d2bb20add2e5 WHIRLPOOL 84824532fae555273718fdf7160ebd397e0903fe45c985eeddffe5ea440b63a053606d3c406ab72d13421fd11ce38ad07b8e28042bd3ca6093d6f08045a7be70
 EBUILD netbeans-groovy-9999_p20150127.ebuild 3422 SHA256 66368c3154fae61d2210411f67a08c438501744eb4d7297398cb26728e2e4a91 SHA512 7f652659e38111c40b105b4a4d15e88e0a6956081a15c05e775ce21f0915839abbc541d87292dd9fb41b71dfd6680358a67abe1c14f949c1c9c35cb0c4e980bf WHIRLPOOL 071ed95d0d410dccfd6fe053d9e52869d6146f8d9025719b331e3d6900debb20f32ac47f8c2e121202aa3544ee3dc40fc449fee933608e6b2ec648341cbfd615
 EBUILD netbeans-groovy-9999_p20150128.ebuild 3422 SHA256 5e30b69362f5ce949ef1f4c9aeb3cdfeafe57f21c36dd7b591ae733cc1cb494c SHA512 fc8bd4dec9c982edb9f1bfe2b75fd023103d72574a1c26652b4cb6a9945516162c97b3508f8c3d69a64c5174ab27f1909830f54b487914ef0e8faa1984da297c WHIRLPOOL 559d0ac844626f826116aae71949b541e23dcbb56d826606cf7b8e00bdbd222551a6bb006c2503b4bf2d6ceb189298fb632ea64637c6837e2a5c07a18d59678e
-MISC ChangeLog 148743 SHA256 d683bc9577a76aa2a29082dbfa1c6559097295e4a36a71b8e5eb40087430d354 SHA512 4c348d3fd8ba45e5f8186b4063c25a874c4983d75d73d5ec1aa460063d8f43e112ce628de31fb6174b989b75fd0a999a86ed4fa08a7d17c3b19ecffffb57b526 WHIRLPOOL f05b17076e67bc431641208f5c941e2c762ce0756bebaef5f0a64ac72878af6e9f81a246c4572604774c138030e273892a79c101eebb9b332b72c6494f1b8686
+EBUILD netbeans-groovy-9999_p20150129.ebuild 3422 SHA256 696f3d3922149c4894711816d1e4b2f305447626b0f57a474b6f673500f76640 SHA512 a0d0cb153409dc345b82528bedbe4f3d6bf65e0fa74520b8099610ba2fa549548e4e7a154034f6b240054d3b5c40a364c9133e88f61418116ae58b172cee205f WHIRLPOOL c7832ec36eba2f6180e57d35e9cc6f75b39cbb3b8c14f075d673fed270e65fb2906e088a6a627498f054327bb3c849df799f1be4196ca5efcb0fc35eefd16e96
+MISC ChangeLog 148916 SHA256 9be446993525824b4b8f253defb7e9474b1e4508455b070cad0380878e83e4b1 SHA512 a7b0b8f36086cfebd0ae6a9a6a5234188de5dce314d7838be9b11932e844c31eb9492e58fbc1b2324b36422fb9e920b9bcda3f68f2979e4806328ad9c8b80035 WHIRLPOOL dde3463fb664a9ebd6c38bddaf64b0faf455bd9f69d926838cf4247823a5758b08154e866191b395a9841e4e136548ac83cee6c22619b16417c782ed6f4a13f0
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150129.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150129.ebuild
new file mode 100644
index 0000000..bb07b7a
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150129.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-29_00-02-36/zip/netbeans-trunk-nightly-201501290002-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 37cc37d..229cefe 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_p20150129 (29 Jan 2015)
+
+  29 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-harness-9999_p20150129.ebuild:
+  bumped to the latest sources
+
   29 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
   -netbeans-harness-9999_p20141223.ebuild,
   -netbeans-harness-9999_p20141225.ebuild:

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 840fda3..f84c270 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -51,6 +51,7 @@ DIST netbeans-trunk-nightly-201501250002-src.zip 201455903 SHA256 a758db1b55fe99
 DIST netbeans-trunk-nightly-201501260002-src.zip 201455903 SHA256 9ee86145eb73ec82f7192d38f986f316e1fe604e77c27d2ef8d7734869aef4b3 SHA512 4ed99062c874cdaf336fd6a5fd5e7aaa52eafb25c710c14a0800639433dbb2d4998061f3d92dfa3896c8e909577a281523635e93d54edb080667713e432f9f54 WHIRLPOOL c1d53d25cd0bbe1179ef2acdd78f57a420f3f0ff239d7c988a39bc225b6d4d92ee09bcc8b583bf0e7be1e233f9cb4917688b6304161090ed69ed214e092bbcc7
 DIST netbeans-trunk-nightly-201501270002-src.zip 201460403 SHA256 60dfa824eb558b0f538f4ae578c8835cb47950830f1738a22641917b566df358 SHA512 137e8d4d2333ef39b9a6bc34fd56ee239b9573e098d6aa3b08c1f6130e7ea816816563b8750fb734c1b24835c9e8c5c661542045f08792173eda1309e2ec9145 WHIRLPOOL 288a5e89d0cb5849b881acecaf858f90dd6fbf6750eb64753328a7972a367481c64eb248ca7e7399d93ee12e1715c047cc0e04d34367bceca0af2b64153187dc
 DIST netbeans-trunk-nightly-201501280002-src.zip 201449292 SHA256 b09bc8e7245306558fe57aed376d11418d096349f010bc3c59c6dc5a0a1f5e52 SHA512 1d0d33fa15aebdc6aa362158c2cefef946728ead5827e96afa845d9fb57fc8894ccf34855817dc74493d6122acd704d913ae16b93a5b8f902f05b0527e6b51bd WHIRLPOOL 5e703502eb1100f3c8366669b385c48f440f422777ccd6c52166d3455c3910e6025d74f27a9e6714649fb135bb80c3139a7bd05da201b7c34d11d6a37abdbd8e
+DIST netbeans-trunk-nightly-201501290002-src.zip 201615638 SHA256 11a8edf7848e3ebf60edba96bacebc735b9ef150010692b6e78f41665ce61943 SHA512 974b9b35ecdab0a75201a08ae293a4e4d5245b9064c20a53d02e614a4ce4f315e0a4f49c121934cb1871f4247794448a3aeec1fce1bf1c15ff486a335a16402b WHIRLPOOL fbcde90582039d08e3001dcf51f48f2fa860d2a1da8f8fe4daa5b6d299bce04f5a0ccb343693aebf3c5261b9aa3dce5390ef2b4825068b52ef637ea27039c1f6
 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_p20150125.ebuild 4131 SHA256 e3f7ae1c3750c485a82ebe
 EBUILD netbeans-harness-9999_p20150126.ebuild 4131 SHA256 2b681f77cfb9370e820a135cb97a0837e9b437fc337037a4c69b32d5eb3aa12d SHA512 1f61c8398c0aca59e34c1c173c08309fa24bc3c0c96e0afd76a19339dff94d636d10a2219f5cefad837ee1c45b0404fa5e777457f0661459857947b9919d780e WHIRLPOOL 472ba54e7339826cd2d93d9816c624fb7a65530546da9c17493cbbe90ebe5ed6c9de50adf08b34caeb58ba4563f9391922de901e5b85aeb2b0b481feb62669ee
 EBUILD netbeans-harness-9999_p20150127.ebuild 4131 SHA256 435cad558f6a1ed08be09c3a0e8043061e0987583ca99f4f7588688c3d24c303 SHA512 afcad1266345f931357825881d1330a576b4b283f4e69fef0651ad76f93e9e12444bd05171666a655d511cbaeecab4a9d1520296a31576ad73ad8325638562c7 WHIRLPOOL 6dc64e9fef5b97411e1dd263ec7eb051bdc4b5b2b6478c779b416f58b1c24759c96501dc35d883debaf0079c3804844e27f4d74cc80b916152310b5f44c0464e
 EBUILD netbeans-harness-9999_p20150128.ebuild 4131 SHA256 1655ecfe0ee0d35d87e71bbf8f03ec9dcf24b71adff9c86d032145ffaa943635 SHA512 954dd6fee2bb6eced8799c46bfd6c8f3aed400357a769e721a053b0ed4de0906c123925cb64955dd93f326b3795bff6b31e9a2255f079710c0fa452b4b994bc8 WHIRLPOOL 8c89a1439ef1e8123e46f6af0dcd8facf6e56b705d5a24fccde4abb6d91cd4c6405b51925873b8d40cbcc9710bcf9c18d923f549a95d76d8992ab2a511877b65
-MISC ChangeLog 150632 SHA256 38f227febfd74235a4462ca99534fb78bff213a42a41e98f7f26aeadcaee07b2 SHA512 be3f985f460562b958f2ae4a0d7eba1bf48d72e28d887b937ebac37ccc0426e9d0b13269f1d0752204d5a39eaab8fc7bf319413ac4cbdbd759ebcc3d8e33b20a WHIRLPOOL 1fdd1028bdbd1eb6aa3ff3e0b7d1aabfe9f645c0c40f177b79d5aeab86157830720bb24e61018d7a020f100edc8b2f4018030ea08a8417d5e438d87465b42a9f
+EBUILD netbeans-harness-9999_p20150129.ebuild 4131 SHA256 617aa67f052f9c5be49bb09b3d03535fad022bd21a6af8549e94e5313f723992 SHA512 37c0ad1b49b71771ba0ace14dec87b333e4af8207d8172853280010f24383b83597aaa65dd1a189c169c1e9e4435a2ab590da0e2fa19c5700764d8f2575e5624 WHIRLPOOL 7e80de4f0b20e468150c120aafd6e3fdc9451a6dc43e26f8d70352f17b432a57643101e73b443a7a7dd8970adcd7cb5cf7a144d7844ada611ed19d9f0b3f8ae0
+MISC ChangeLog 150807 SHA256 10c6aa09d5d238ff37b6cf872f4b9999f2982646d7ac847ad77bed03d76d9738 SHA512 11824d8420737e202788f0a6c05fed4d3eabc2d9ee97c644cdc14ac454c3585e3c6ee1589e08be4057ea7b22f32e2a8fea97d7b06a783fb5a9c9ed1b7cd3440b WHIRLPOOL 7a5bf259d60a15d246af49cb2591ffb92c604754cf54cb8ab9f82fe3287dd92d687510a714a74ff3f4b0c3352018b28ea589e98427d076e80ae87ff03a9e1fcc
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20150129.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20150129.ebuild
new file mode 100644
index 0000000..ea46dd7
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20150129.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-29_00-02-36/zip/netbeans-trunk-nightly-201501290002-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 345ff86..c6f8bb7 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_p20150129 (29 Jan 2015)
+
+  29 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ide-9999_p20150129.ebuild:
+  bumped to the latest sources
+
   29 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
   -netbeans-ide-9999_p20141223.ebuild, -netbeans-ide-9999_p20141225.ebuild:
   removed obsolete ebuilds

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 477618c..d882232 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -232,6 +232,7 @@ DIST netbeans-trunk-nightly-201501250002-src.zip 201455903 SHA256 a758db1b55fe99
 DIST netbeans-trunk-nightly-201501260002-src.zip 201455903 SHA256 9ee86145eb73ec82f7192d38f986f316e1fe604e77c27d2ef8d7734869aef4b3 SHA512 4ed99062c874cdaf336fd6a5fd5e7aaa52eafb25c710c14a0800639433dbb2d4998061f3d92dfa3896c8e909577a281523635e93d54edb080667713e432f9f54 WHIRLPOOL c1d53d25cd0bbe1179ef2acdd78f57a420f3f0ff239d7c988a39bc225b6d4d92ee09bcc8b583bf0e7be1e233f9cb4917688b6304161090ed69ed214e092bbcc7
 DIST netbeans-trunk-nightly-201501270002-src.zip 201460403 SHA256 60dfa824eb558b0f538f4ae578c8835cb47950830f1738a22641917b566df358 SHA512 137e8d4d2333ef39b9a6bc34fd56ee239b9573e098d6aa3b08c1f6130e7ea816816563b8750fb734c1b24835c9e8c5c661542045f08792173eda1309e2ec9145 WHIRLPOOL 288a5e89d0cb5849b881acecaf858f90dd6fbf6750eb64753328a7972a367481c64eb248ca7e7399d93ee12e1715c047cc0e04d34367bceca0af2b64153187dc
 DIST netbeans-trunk-nightly-201501280002-src.zip 201449292 SHA256 b09bc8e7245306558fe57aed376d11418d096349f010bc3c59c6dc5a0a1f5e52 SHA512 1d0d33fa15aebdc6aa362158c2cefef946728ead5827e96afa845d9fb57fc8894ccf34855817dc74493d6122acd704d913ae16b93a5b8f902f05b0527e6b51bd WHIRLPOOL 5e703502eb1100f3c8366669b385c48f440f422777ccd6c52166d3455c3910e6025d74f27a9e6714649fb135bb80c3139a7bd05da201b7c34d11d6a37abdbd8e
+DIST netbeans-trunk-nightly-201501290002-src.zip 201615638 SHA256 11a8edf7848e3ebf60edba96bacebc735b9ef150010692b6e78f41665ce61943 SHA512 974b9b35ecdab0a75201a08ae293a4e4d5245b9064c20a53d02e614a4ce4f315e0a4f49c121934cb1871f4247794448a3aeec1fce1bf1c15ff486a335a16402b WHIRLPOOL fbcde90582039d08e3001dcf51f48f2fa860d2a1da8f8fe4daa5b6d299bce04f5a0ccb343693aebf3c5261b9aa3dce5390ef2b4825068b52ef637ea27039c1f6
 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
@@ -273,5 +274,6 @@ EBUILD netbeans-ide-9999_p20150125.ebuild 29641 SHA256 4cc18b35859d645941781f374
 EBUILD netbeans-ide-9999_p20150126.ebuild 29641 SHA256 99a766473513e30f4e6c24f4aaff74f24f27ec0f2bf28215b69c8e9fb34a1b54 SHA512 0c38b516481ed6f9e1ba7d95297d9984cc1e69fcd9431eb91c5cba215187707da20c3ffb9be362642e6c8add3c2236a3aaae28e381c64c8a60d59087282ff6e6 WHIRLPOOL e3d86eccc1a82fab35be87c379198a7eb94d1ec932ef9ce2cb71444d96f179704b279c094a4fc78049cb9fd321efda41faf5ba28802a4569697a31c8b631c744
 EBUILD netbeans-ide-9999_p20150127.ebuild 29641 SHA256 749048205ec03928cccb7dc698aff61c8f6460e54f477ec8d3d584c656643d24 SHA512 9e8b41dc7e5e0876d96519e0982904958858132b9eff41d31935a53861ea1bd331c9824fa6da53c52bdb50a28271a73be97f0ac80a09c842ea2bbe8f30df12b3 WHIRLPOOL 9838d625ac3f12eac7222c12aee2fdce863db505d13aacdfee06d031ccab83affd9dc15729c28a65bf664010e3ab0e3e47ba156cc2435be80a486413273c124b
 EBUILD netbeans-ide-9999_p20150128.ebuild 29641 SHA256 0029a88a1790d98b6bb581e145a6149bb52b423a8b88d44aeae07145d82af8b6 SHA512 162dd109797db6098365112fc070ae984f807bc18849d04abea0cc4f09f390188507be2a19686cd851e372c9a21f3760d62a44dc9b0ad55675b1f99c848d2289 WHIRLPOOL 7dbb7fec5676e87bdf52fda75587b719ac1f76dcdc64b153b0baacd28b4a78093a7b66295106dc99f50051181f1855021be3d00a1ee9ab2471bf044e962681f2
-MISC ChangeLog 143592 SHA256 7df854ef3a8fb182011b24732e0f1601845a765104ada80be8bbb2ff1bd5c783 SHA512 743e3e418126436a17e448c6e62b990bbb694887a0084a5d986e55c1fef08e8db034b1194a3442ad3c2a82c8d223730434241c6fcef94a8e5892bee15c8714be WHIRLPOOL 335a8cf2785593cafc1cd55879b191ab258c46cd559698a36809d994008b61581534cd4f9de508c1fe2df5ff3183c299fa94cbe6e68026aeba786ccbbfba4be8
+EBUILD netbeans-ide-9999_p20150129.ebuild 29641 SHA256 66587027b4e2875ed5bf1828bb6dd6f851f26232ce02bba7c7704ba945251bc0 SHA512 894b2aac451ce42b1b945c8e824ad1e3f93300a1d7ce0216aa548c0b203e8e7e2a8cbb8dc38bef113f55882e7738f8bae38bf777bd74057a55aad97094919022 WHIRLPOOL 79e41ebe844d959cdd53577eb548be03ef11b3f72c00c3cf38e487dc9287a2b3f4200753d19bcec62ebfd0a1e237a1503951553d7898ae0db62a070514109d91
+MISC ChangeLog 143759 SHA256 d8b23195d2c1dd543273577397eb78b019d22520951c559a89c6ec9331a4576c SHA512 da5cc6cfd9f50ebcc4a1d5e62e625af6733a316495285fa0b69e2cd32f83c31851985bcd7c0678c93e4b33d55a149e71aea944707998dd56cfb2e7c203d80af3 WHIRLPOOL df595f5de92a038a7fb63f61daff5e88018115515763b5b3a52d23c246fb6282f80bec4585702e2297df7f736e18ebfafe059596f24b926c95e0e10e9b01feb6
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20150129.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20150129.ebuild
new file mode 100644
index 0000000..e99d2ca
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20150129.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-29_00-02-36/zip/netbeans-trunk-nightly-201501290002-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/934DCAB9534B8FE12FD9C90759B26B6B0D442837-org.tmatesoft.svnkit_1.8.7.r10376_v20141223_2131.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}"/934DCAB9534B8FE12FD9C90759B26B6B0D442837-org.tmatesoft.svnkit_1.8.7.r10376_v20141223_2131.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.7.r10376_v20141223_2131.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 39bf0e2..90f5145 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_p20150129 (29 Jan 2015)
+
+  29 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-java-9999_p20150129.ebuild:
+  bumped to the latest sources
+
   29 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
   -netbeans-java-9999_p20141223.ebuild, -netbeans-java-9999_p20141225.ebuild:
   removed obsolete ebuilds

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 53bfb1b..37cdbcf 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -54,6 +54,7 @@ DIST AA6FD013C506BAC98BCE1174EACAD00383650342-javac-impl-nb-7.0-b07.jar 1673570
 DIST ADD5DE96BF7F30DAA4EC41D70610CF72A16F58FD-javac-api-nb-7.0-b07.jar 130227 SHA256 c221b2ffa32c021c4219883ff43e20bbcb90644996cdbd18f8625a1913009f81 SHA512 0507546ff9e3c47dbeede6930d672842c4240a15d530875f8cb33ebd20a01204ad6cd1996dc9f18cecf5abd5c4656f5faa6d0e870d5b3db9ab07426292c7f9af WHIRLPOOL 3f8b6711b8586d44fbd6b6afddd8577a5e8cc63f36d2476768a2677195194d4abab4c94715ce3221c745fc7b29b8afd04e81f4d10ee39836cad4913e208dafaa
 DIST AF599F03E590A5992EE56F363DBD8F0F32B8787E-indexer-artifact-4.1.0.jar 24703 SHA256 d542a451c09313576942e8c201bdbd4a8545da57f9bfe9c9af9712945add6766 SHA512 2806b1eef19c270bad1b5ce2009925e086c6d356f1a530033af3d7842d324a3dc0fe4d83a23ccd75637c57ec23985430ad54ee2134657d51830dc6950bb59d22 WHIRLPOOL 73387e7fd849eb6b0f4c5aa732b51de4ca189c67338ac76d6dcafd22bab5c982813ad2004582d4854e0dd1f1bb2358a748b92c11ae8b61b88fe1f3a79ef5443f
 DIST B1D9BFCBC513472E819CB6C7E1018D26439D400A-org.eclipse.persistence.jpa.jpql_2.5.0.v20130507-3faac2b.jar 1396640 SHA256 a1ab1845519fea0fe518a22b0af26af50b5f69d9e19c4f0da8a6bdb750cb9fce SHA512 32d61be04151799ddfbb9210b88c7adf5dc4a2c4d134cb9cfeb75751327d431804dfbce478cf88af1815ed6e958788f7de9c74f0c7b251dfb5cd11680dbdc94b WHIRLPOOL ed15339405b093b50f1502258f96d568b30bdef42e4eefe80f0f7ab5e51f396d8e2c2e9d714ffdf5d24de6c2bcefa730e8bfbcab393b236517c197343a5f5d18
+DIST B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar 173819 SHA256 4f2dbc36ec77519df339846cf5333e874d6f147f5d46ccdfabb18af34ee3bd5b SHA512 ccd48f9fe445b669763428dace1a02d5820a33d872c952d3a74608f868ca225c017999ae15857ed544799d467068b759d216121ba79d3288f323aa2cffb95fa8 WHIRLPOOL 02e8556df81839b0b90c912b9e22c22c9f10c54ee0aabda4768eaf6956f7e3e29c9b24a46e20bb264f2ea186c1642ec7baeb375b2a8951737543ac16e73f9260
 DIST B456600D274B835E1E7DDB16FD843DDAB2ED3EF1-appframework-1.0.3-doc.zip 301845 SHA256 0667f86903d97f78ec1022ef1f31a173990bf69b3f882f95e11ea2bf968ec7d0 SHA512 7029859684e39e3ce6ef05e5e40b791ca8296a33ef4ae2521da002cfe03d9eecb0bd274e806b59487fb9b3c330bf76296f5922187ea9d448bfa0d21e4363d739 WHIRLPOOL 19668b1896abda74c7bf26cf9f8bae6e75413c7c5ef40b7a1d5b8c933a2063dafa0b446f285001056b90b2734b90c9adece66eecc70242d7058b3f02e9c4b7d2
 DIST BC0919190ADD3A7FB764C8412D10A2B026CD9563-eclipselink-2.3.0.jar 6503498 SHA256 ddd722c70d74201e7f06463e6b59fd2563d2b043a36825cb47ede8f9bf03c213 SHA512 75574753b37decfbc62d59bb9b007233d581d34bd88696f2a7b1ec01e8bbf6f90956d0b5431ba03f66963877e293892405f7ded25b400cd035af4eb748c6c35a WHIRLPOOL c8ad505fb06901be9c9628facc05af1de4ff82e0e803b256219713374dd1b497752f9d0f4ae99d485048e7e77b156377c4237e330e04a90f281534e2ec22c1a6
 DIST BE675D922E5BFAF6557EB5E05A06B0B5047C08B1-org.eclipse.persistence.jpa.modelgen_2.5.0.v20130507-3faac2b.jar 44520 SHA256 a5b673799f2d407d845d484c3df1d2f7eebdb3b0240fc5e2fff2848c800644cb SHA512 8daf4f7c9725fb46d99e462a6af724210eb9dea557f2e7a30172fb70f6f3e7d1e22ad7e28a47864ad495624513d618fc20134f499adccac932f96f0c40a1d7dc WHIRLPOOL c63b7bb65b200c232a7e273a3c4ff2975bb7fed60b65df6ec0533d181fa742af33d8ff2bec3f018996115a2d6545bf279d9c19c6d536d04f08fca4f2190fed11
@@ -66,6 +67,7 @@ DIST CB686A65B6C4516A32173CB60385D02027440620-spring-2.5.6.SEC03.jar 2949268 SHA
 DIST CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar 8632395 SHA256 67d175c1858005308ae9a02ff85c0bc7efc9a2a3c058a6838d51769f417f5247 SHA512 56559a40532fa42775a92d82296a86033a587116870d8201dd42f07e29990a28de5b1547e3fb59ddedadfe6b4fc3dd109b108cc65cf7b253ac1b0fbb9cc03fcc WHIRLPOOL fc40cf8d49919d3ef38f6c3473736f56ee5ac1d4db848681536c3bd3532cb112e9490e76c1ef7b15d88b2ab87ed54e58dbf1227c173a3256194b5887d37f8a84
 DIST D388DFD4853B4C82C4BE4EDB38AB56904208723E-nb-javac-impl.jar 1780249 SHA256 788c63ffba904422041d310eb218c48b36170fcddffa6dd98b4a066bb1b45bd7 SHA512 d06e63a5c3b5ed27e05ca5b735fdc79b713c7d2c948799a642354b30b56e59f33c12f33b0c1db8069ee75e0410ae183c518522263b814aed922995d262f5b3d3 WHIRLPOOL 9c53bc9cc140e187e79a22e8336db6a09a82dde30ad011abd881f9ce6f9e30ec7144320b6013260fd3701d6d26133eedd96182e4de8563d7df024d50e3f062be
 DIST D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip 84706 SHA256 214c8f6da105d8bcc4583f3f160d94fa4a8ec266c4fea4b5e12929a6386fec3a SHA512 5dd4270d3514f448f2d1533b099dbe64aab97c21e89066c467a3332d354f0675e27f6ed5ca1b23c01a2222c8e1ad261c374ae6549b9323951763b7a542a386f5 WHIRLPOOL 88a6357f335bd50d3cf3608cee0228b0c99b4b20a962e2dcd68b83c3fdd49b113618342f87cb8b758ad18612efdff0128876ae9018eeba5b682cd8267f97f8fb
+DIST D6F2ED3776B43371F4DDC6BBA062F4C742165FA7-nb-javac-impl.jar 2767204 SHA256 08472ee635f26e7d64b05a743040a2d7785b12a0d4601010609157dd02c483f8 SHA512 430f0d62bad1e99f6cefa38735763f5fca24cc1ecb4f44c445cb99ace08e6e95b97b20b835a8255ee2d5952a46fd8fcedcf85dbfdd880ef1a3dc47302356bc5d WHIRLPOOL 69624a8e9f331862221e614cf273b25d0efc93fe2feb5e6f142e33c270aca6dd4766058dab3254b2c4c0d5805031e3ae96a73866296842e8f931c6ab637e74c8
 DIST D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar 120575 SHA256 51945be4ed200cfc439d2db986bdcc184ecdfec5d0880a8c2854f88dcf20df0b SHA512 788bb5e115a77e12e9329db70e0b6edca185ebd5e30a8178f451da3a8492acba8c89848873acff224868772f464f17bd9eccc9130638d49c95593edd697d3dd2 WHIRLPOOL 9026c59ae69df71d205278a2cd7aeae24c72d74f1356bbf7d3dbe2fcceddb02948a94a87d4f7e6d710a5cc4e642d0de38d16690fff830d10b8372bcbecdd86b5
 DIST D88A41174C5F85D1B791D6A8E0F8B8A1C459D6C0-spring-framework-3.0.2.RELEASE.zip 4054621 SHA256 5901b2a23c80f2669016697aadf27fefd8350fdd5cc876f8e979d5aac92a857e SHA512 30cc8ce002795153d9890255c76892f41e6eb81377f28330a8f600821cb4d537da17863706be175c835f82841ca84f92a477af629e3e807b68e9fb3507d4ac1d WHIRLPOOL a3e13022627cd30327e72b26358c613a47f5cf88bbc60448a34283d096f49af37518c04c5e9f3454e4494bac8b915342bbaabf62447e3e3d1c33ddd5cf3b3447
 DIST E5579EF3B0C1EF2F43562DD0C3B32F8E1F603B49-nb-javac-api.jar 173813 SHA256 39fa3597e77942f589e299942e4d5f25ae04f699edfe6bd9135d5f425845649b SHA512 ca940f40881ff5a908fafc80f6aa90866d58c54189bfc073a2559ee76496f3127df920abda5d9c7aacf9a54cda693884127c1e3f696d4fc8367351313c900cc5 WHIRLPOOL fae1db760f988f4e2886d8a2f9b2384a194bf8b579825971466a21ec4fa4971a6e4e56b477ba0b61e2e034777af6c49c66d4425734cd6f9db4aca15041b384f6
@@ -123,6 +125,7 @@ DIST netbeans-trunk-nightly-201501250002-src.zip 201455903 SHA256 a758db1b55fe99
 DIST netbeans-trunk-nightly-201501260002-src.zip 201455903 SHA256 9ee86145eb73ec82f7192d38f986f316e1fe604e77c27d2ef8d7734869aef4b3 SHA512 4ed99062c874cdaf336fd6a5fd5e7aaa52eafb25c710c14a0800639433dbb2d4998061f3d92dfa3896c8e909577a281523635e93d54edb080667713e432f9f54 WHIRLPOOL c1d53d25cd0bbe1179ef2acdd78f57a420f3f0ff239d7c988a39bc225b6d4d92ee09bcc8b583bf0e7be1e233f9cb4917688b6304161090ed69ed214e092bbcc7
 DIST netbeans-trunk-nightly-201501270002-src.zip 201460403 SHA256 60dfa824eb558b0f538f4ae578c8835cb47950830f1738a22641917b566df358 SHA512 137e8d4d2333ef39b9a6bc34fd56ee239b9573e098d6aa3b08c1f6130e7ea816816563b8750fb734c1b24835c9e8c5c661542045f08792173eda1309e2ec9145 WHIRLPOOL 288a5e89d0cb5849b881acecaf858f90dd6fbf6750eb64753328a7972a367481c64eb248ca7e7399d93ee12e1715c047cc0e04d34367bceca0af2b64153187dc
 DIST netbeans-trunk-nightly-201501280002-src.zip 201449292 SHA256 b09bc8e7245306558fe57aed376d11418d096349f010bc3c59c6dc5a0a1f5e52 SHA512 1d0d33fa15aebdc6aa362158c2cefef946728ead5827e96afa845d9fb57fc8894ccf34855817dc74493d6122acd704d913ae16b93a5b8f902f05b0527e6b51bd WHIRLPOOL 5e703502eb1100f3c8366669b385c48f440f422777ccd6c52166d3455c3910e6025d74f27a9e6714649fb135bb80c3139a7bd05da201b7c34d11d6a37abdbd8e
+DIST netbeans-trunk-nightly-201501290002-src.zip 201615638 SHA256 11a8edf7848e3ebf60edba96bacebc735b9ef150010692b6e78f41665ce61943 SHA512 974b9b35ecdab0a75201a08ae293a4e4d5245b9064c20a53d02e614a4ce4f315e0a4f49c121934cb1871f4247794448a3aeec1fce1bf1c15ff486a335a16402b WHIRLPOOL fbcde90582039d08e3001dcf51f48f2fa860d2a1da8f8fe4daa5b6d299bce04f5a0ccb343693aebf3c5261b9aa3dce5390ef2b4825068b52ef637ea27039c1f6
 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 +165,6 @@ EBUILD netbeans-java-9999_p20150125.ebuild 13429 SHA256 91c864a9e0dfd6a8b3654c91
 EBUILD netbeans-java-9999_p20150126.ebuild 13429 SHA256 00ca7d4c77022e03669da4d92d80d331374366cccd73c17a4f40f684f9823c95 SHA512 e2236da88656b83d76d75eaa82e622a7f10eca576d1a9849dd97a297979826ad4e93b435b4fbca175a00467f35200b87fabafff638fa7d90c9133e481b18e696 WHIRLPOOL 9a187c7ec35017e38590dbdbf8c32c055dbcbe862cfa3dc5f748a6ab3e1561f9e279ed2a383411a114ed50885070fd8da3145b70e38b510b66d72c1f939204c9
 EBUILD netbeans-java-9999_p20150127.ebuild 13429 SHA256 89c10da4e88411f011d0d344c8367d8fd17942cdc37967e937fcd023e1fcaef1 SHA512 8da8c08ea507ea6f0af9be557326eb7e42a4d115a32ed698986e33871638c38fafebb5b380044eff1fc087595659b4d8d71f244bd17bfbecce0f85d4f1bc5b3f WHIRLPOOL 347ae745bece37a7a263821f9cbd2938ed6ca5d8b12db0401cb3bb87fbf99c5faac4ba6e7074fe3849ff9a94f7679222961cdb4b33f38b176a42f813d97d272d
 EBUILD netbeans-java-9999_p20150128.ebuild 13429 SHA256 3f56f5392da0892ddefd58f7c1d813da939dcf2b9b98c9f2e6e8270f21b2cdd8 SHA512 7263af9efbe3588b7d45688180eefc1f1c862878f7a0cc22d18463846088fbf9be5462817f5feecd0533907c6e8b33b909fb6d87748db1f09398e2d120aa8d08 WHIRLPOOL 89b71b7bd4c165db1343b51138470fc9d6db8c3fcbf1ec778616103a015a4b57310d7747ebdab23baea2345a0d45e673461060ebc5733eed749dd264e31c840c
-MISC ChangeLog 146255 SHA256 b9d1f98f6b5a495f3298490d3b50bf54acc5528d61fcfd6f4a1a4a5132d57027 SHA512 2e2d585740295aaa9b7825f4d2183482ebdf7fe4bc24c5893f5c9603ef72364ccd6488ccf11d28e445046d76b68863347eef91e1e895255164607b829da1309d WHIRLPOOL e497f2f167c06ebd5506c7d0e92b97a5146ca6bc96012b3f5a81bce1f2a60889b21c8f2e5b095a686697961e51107a690bd4d87e417ee1e6bd76cc5630bc63a3
+EBUILD netbeans-java-9999_p20150129.ebuild 13429 SHA256 9c10958495e19e3a4f415d204fd2a2ebfbbd4deb2080a5dd1136d34151475920 SHA512 1edf5f6dbbd0cacfb6e007fe6831c2571efa0c4832b552c58024c8e3d3252aad8c537c10f3e966e63c348bc4a3faf4b94a56fa58a3017bb24eec6a28f740350f WHIRLPOOL ce9aba103ccc113ea75ca5aa09fbcc3db0c080698c9d9011252692a1caaf98da739ea5b47861ec16db274a3d030a90ac31d0f80e4ef582487afcc1039950b742
+MISC ChangeLog 146424 SHA256 847cd181ebc54c5081269ebdd92e3ede12901918e605731ec3c27146ea1d7df1 SHA512 5444c3d632b9d2a73caf5eed908cc849b498510e455296a3aa3d2f17d867d826bb3a2794a6e5b7a3c27f7b94117d0b41c28f020671af7a1338da1cd5cd065292 WHIRLPOOL 7ad79248c3a95fe031cbe7dbbbd53db8117faa91c9ee2d2f7fdbda05c823757afd4837bb32bf0a2df91573c04cc457727304be5312ebfe314cd6837989ddd852
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20150129.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20150129.ebuild
new file mode 100644
index 0000000..7bf33a9
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20150129.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-29_00-02-36/zip/netbeans-trunk-nightly-201501290002-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/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar
+	http://hg.netbeans.org/binaries/D6F2ED3776B43371F4DDC6BBA062F4C742165FA7-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}"/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
+	ln -s "${DISTDIR}"/D6F2ED3776B43371F4DDC6BBA062F4C742165FA7-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 fe7c7d9..5bf9e95 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_p20150129 (29 Jan 2015)
+
+  29 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javacard-9999_p20150129.ebuild:
+  bumped to the latest sources
+
   29 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
   -netbeans-javacard-9999_p20141223.ebuild,
   -netbeans-javacard-9999_p20141225.ebuild:

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index f06141b..01507fa 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -48,6 +48,7 @@ DIST netbeans-trunk-nightly-201501250002-src.zip 201455903 SHA256 a758db1b55fe99
 DIST netbeans-trunk-nightly-201501260002-src.zip 201455903 SHA256 9ee86145eb73ec82f7192d38f986f316e1fe604e77c27d2ef8d7734869aef4b3 SHA512 4ed99062c874cdaf336fd6a5fd5e7aaa52eafb25c710c14a0800639433dbb2d4998061f3d92dfa3896c8e909577a281523635e93d54edb080667713e432f9f54 WHIRLPOOL c1d53d25cd0bbe1179ef2acdd78f57a420f3f0ff239d7c988a39bc225b6d4d92ee09bcc8b583bf0e7be1e233f9cb4917688b6304161090ed69ed214e092bbcc7
 DIST netbeans-trunk-nightly-201501270002-src.zip 201460403 SHA256 60dfa824eb558b0f538f4ae578c8835cb47950830f1738a22641917b566df358 SHA512 137e8d4d2333ef39b9a6bc34fd56ee239b9573e098d6aa3b08c1f6130e7ea816816563b8750fb734c1b24835c9e8c5c661542045f08792173eda1309e2ec9145 WHIRLPOOL 288a5e89d0cb5849b881acecaf858f90dd6fbf6750eb64753328a7972a367481c64eb248ca7e7399d93ee12e1715c047cc0e04d34367bceca0af2b64153187dc
 DIST netbeans-trunk-nightly-201501280002-src.zip 201449292 SHA256 b09bc8e7245306558fe57aed376d11418d096349f010bc3c59c6dc5a0a1f5e52 SHA512 1d0d33fa15aebdc6aa362158c2cefef946728ead5827e96afa845d9fb57fc8894ccf34855817dc74493d6122acd704d913ae16b93a5b8f902f05b0527e6b51bd WHIRLPOOL 5e703502eb1100f3c8366669b385c48f440f422777ccd6c52166d3455c3910e6025d74f27a9e6714649fb135bb80c3139a7bd05da201b7c34d11d6a37abdbd8e
+DIST netbeans-trunk-nightly-201501290002-src.zip 201615638 SHA256 11a8edf7848e3ebf60edba96bacebc735b9ef150010692b6e78f41665ce61943 SHA512 974b9b35ecdab0a75201a08ae293a4e4d5245b9064c20a53d02e614a4ce4f315e0a4f49c121934cb1871f4247794448a3aeec1fce1bf1c15ff486a335a16402b WHIRLPOOL fbcde90582039d08e3001dcf51f48f2fa860d2a1da8f8fe4daa5b6d299bce04f5a0ccb343693aebf3c5261b9aa3dce5390ef2b4825068b52ef637ea27039c1f6
 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_p20150125.ebuild 4982 SHA256 4bb78e200582fb0f8ad25
 EBUILD netbeans-javacard-9999_p20150126.ebuild 4982 SHA256 c386d7d88b4b48631480e652510cf3b9def44984973d880d97c965247f3534ee SHA512 b9445bb75459afc5be5fcfeb1cc8d4e90ec1bb9642f596be42426774db214173f0ad9b31da70ca64b1f4973cf99538f71742758c38c50c6d4d95de34bbbf02c3 WHIRLPOOL 01527b4697405df57cac9e7ed8821dd638b2204172e685011a400967c5d22a2c13a59d44e6e164eae070429ca9bea8fb8f939a711da5d8bca76ef19488c140fb
 EBUILD netbeans-javacard-9999_p20150127.ebuild 4982 SHA256 77294a7c0a48c00dd97b2d2ef5678e22994db513614f9f3f5f4d7d6556084941 SHA512 612ee4509d7eb4659281a2d0539b6b9b24428274808e636d43a1e87528b7e3ccd472e2e840ab2b3e4d74d9e6add088dda8597b68755aa306122c5addf55dbf8c WHIRLPOOL 6a454127737577707babe338ec37a4bdc95ff6ee2c63097d57b7eb729213ddb9ace8b738b92ba344ca0846461a6dd084b993b9c8e92fb9d420c9f3936cbf94e3
 EBUILD netbeans-javacard-9999_p20150128.ebuild 4982 SHA256 6b87badc01c680a4839d67f5421e7c1e83710a09c720a71551225d8ed1120324 SHA512 d1da9ffb7e09e246b2be450641bb7421c4486777c52cbe3b4491698bad4d9f9a0bfe94cac83f8b12659f5fe755ba70c26be8927a7bbe4931ea9a578963ccb26a WHIRLPOOL 5c1db029a4bd2c3b5f8920c070e6485a7cc5cbc250972c6c8839101c0c7fc056d3e103a37f05eacc1d2169ddf3064378eff9f476070c486f650adeab5e26f38f
-MISC ChangeLog 152521 SHA256 26a319b29ff49734e47e37f4e3a086795ec6abe3cd048e31a32fb30cc1f9362e SHA512 2ed54520c58a070f5cc92ec5cbb52f60e7f868aca6a5aa6ba79c3d54bd8353ae4a688e7a763188e518e967cb3353b122c082029916e124b83288d670a696eb11 WHIRLPOOL 289bf00964b54085f59b8e25cd7bd9426584281149de8e30fc0c6a14bdc4ee3218693bfd30a57b2073822b9afbafaa23b2c7aaa0b48ef309fd4962d9208f0a4f
+EBUILD netbeans-javacard-9999_p20150129.ebuild 4982 SHA256 16d77ab8cf35d696d61e71d0e3771633f2c8193bff3c026a0c9cb9cd6038419c SHA512 5239e01de855a16d71a9d97d913f6bdfe7348e04ac6d317ba780880b4230c877c7a7bf82545efc64f9af7cce037e232a9985b9cec1ac0b5ab395857d116b63d0 WHIRLPOOL b627b02fb9dddb67414ebcb30114e5c13b0202261f0b914d0afe3f60ea495fa3f1a4000285f836c8c83e000fafa10f9cec3abc7d5e1074bfc83ecec355d3acbf
+MISC ChangeLog 152698 SHA256 c37bc3599a48f65121ee25c1bb6b5d0b17fd91cfe01de6cc575a446250a6b818 SHA512 3a99a213a3675249f6e942f515d9919cf23590f2261a65ddf2ed689a55d87425e2b026a78ce2e8413a5bf1e9d4d74b7a81c7db830408b1fc93e183d804c07698 WHIRLPOOL 70b1d6b2f9e609062ba33e0cfb2ccb9c64a51b5c28ea84be1a1ac1a2c853a1a3ea15299765262d3aa4ce3f3aea1d96a05d1f61f35435473191b41be1ca71e8c0
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150129.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150129.ebuild
new file mode 100644
index 0000000..953ee79
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150129.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-29_00-02-36/zip/netbeans-trunk-nightly-201501290002-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 d507f4c..5dfc1ca 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_p20150129 (29 Jan 2015)
+
+  29 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javadoc-9999_p20150129.ebuild:
+  bumped to the latest sources
+
   29 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
   -netbeans-javadoc-9999_p20141223.ebuild,
   -netbeans-javadoc-9999_p20141225.ebuild:

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index 83ed20e..ccad813 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -51,6 +51,7 @@ DIST netbeans-trunk-nightly-201501250002-src.zip 201455903 SHA256 a758db1b55fe99
 DIST netbeans-trunk-nightly-201501260002-src.zip 201455903 SHA256 9ee86145eb73ec82f7192d38f986f316e1fe604e77c27d2ef8d7734869aef4b3 SHA512 4ed99062c874cdaf336fd6a5fd5e7aaa52eafb25c710c14a0800639433dbb2d4998061f3d92dfa3896c8e909577a281523635e93d54edb080667713e432f9f54 WHIRLPOOL c1d53d25cd0bbe1179ef2acdd78f57a420f3f0ff239d7c988a39bc225b6d4d92ee09bcc8b583bf0e7be1e233f9cb4917688b6304161090ed69ed214e092bbcc7
 DIST netbeans-trunk-nightly-201501270002-src.zip 201460403 SHA256 60dfa824eb558b0f538f4ae578c8835cb47950830f1738a22641917b566df358 SHA512 137e8d4d2333ef39b9a6bc34fd56ee239b9573e098d6aa3b08c1f6130e7ea816816563b8750fb734c1b24835c9e8c5c661542045f08792173eda1309e2ec9145 WHIRLPOOL 288a5e89d0cb5849b881acecaf858f90dd6fbf6750eb64753328a7972a367481c64eb248ca7e7399d93ee12e1715c047cc0e04d34367bceca0af2b64153187dc
 DIST netbeans-trunk-nightly-201501280002-src.zip 201449292 SHA256 b09bc8e7245306558fe57aed376d11418d096349f010bc3c59c6dc5a0a1f5e52 SHA512 1d0d33fa15aebdc6aa362158c2cefef946728ead5827e96afa845d9fb57fc8894ccf34855817dc74493d6122acd704d913ae16b93a5b8f902f05b0527e6b51bd WHIRLPOOL 5e703502eb1100f3c8366669b385c48f440f422777ccd6c52166d3455c3910e6025d74f27a9e6714649fb135bb80c3139a7bd05da201b7c34d11d6a37abdbd8e
+DIST netbeans-trunk-nightly-201501290002-src.zip 201615638 SHA256 11a8edf7848e3ebf60edba96bacebc735b9ef150010692b6e78f41665ce61943 SHA512 974b9b35ecdab0a75201a08ae293a4e4d5245b9064c20a53d02e614a4ce4f315e0a4f49c121934cb1871f4247794448a3aeec1fce1bf1c15ff486a335a16402b WHIRLPOOL fbcde90582039d08e3001dcf51f48f2fa860d2a1da8f8fe4daa5b6d299bce04f5a0ccb343693aebf3c5261b9aa3dce5390ef2b4825068b52ef637ea27039c1f6
 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_p20150125.ebuild 6234 SHA256 de31518c3137fc3dc90fbf
 EBUILD netbeans-javadoc-9999_p20150126.ebuild 6234 SHA256 69814020b349f3b60cd5e43ba40b1272998baca2590d3d92c8161f9ffd81218c SHA512 0f11716b76863aee4a14f41349d5c60b38d0c188e4da5d2f5fb133f7d52a2f0c112b7104a02ef1b9ca69b0af255e330355f0f09eab60c64d1e8a1b81997ffe69 WHIRLPOOL 827ad1b3578ea6f2dbc5c740b3b4aa94e41eab1b31171742551e97f4bca4b98cbc4ea9f9659954b7cd35c4dc8c7794905e244e99cef80e2d397f1c7195b55da5
 EBUILD netbeans-javadoc-9999_p20150127.ebuild 6234 SHA256 48802dc466fa481d79e2831c30a4d769f1d0ac70cd779d32cfaf00e6d3ecc2e2 SHA512 6ecca7cdb1eed35ea513a634d06edef31acde538aada83c426c0a3c576a9467d32acb4eb1f5985759b518a81854815550cae34d988decc95ed8a494a71338639 WHIRLPOOL fb4d7c89e1191c02783f2d0796189ac20c3be1f59030e985d952659e61f569320ebb15ad65231f47a44fdf7946e40f58938689ee9628d83f6dfaa791043dce12
 EBUILD netbeans-javadoc-9999_p20150128.ebuild 6234 SHA256 797795a9b217091a691bdc5c08319004e1de25e13daf2b290515fa945f65b516 SHA512 801390c8464d23ac5d157d1a10beab36eb17d4ab3c0611f85b295e289ec4b153106185a8f6d778a154fe48119ef4f052bbeed7632499496abb5ce955ab0307a0 WHIRLPOOL 8972802d56b2529093fa6876b09b34a6db8fd34f128133a46b2a8abce03986e18a071bc5469dd874d5f8193b6df81990d43e25e0fb027d53c4737bcb449b0a86
-MISC ChangeLog 150458 SHA256 3ba7b1290161427b9ef13575af278be30f1a20e3df055e9473335d8f30b29776 SHA512 34c4de86119cb77e250aae31a43923eba2dd18bb987384bb5fe1d13e9e3bbc7fdad11810a4745a07389f98425bcb13b1ddee62e6768796e1e2580b1b87298c81 WHIRLPOOL b6044090fad87f9a4c8db9e0967a2c32ebb56d0b385c5ba0815af089e76f5b9c2131cb8eae00d0510e6afb7da8b6ee2e5624079d8bd89b8ff2c44cf3a419f50a
+EBUILD netbeans-javadoc-9999_p20150129.ebuild 6234 SHA256 a5f961dfcc4edc58df0d251d40e5f991f1f3f32481edfc13196eb4b421d7e5f6 SHA512 dfcf841dc469f6a9188dc6d61ce306aa42fa17327731ed344ad430b4850a82a393369e2889b8d8b3ec7ef30ebff36e11efbf56103b0d5d6fd4ef4d89f1077e17 WHIRLPOOL 12f091f23c520eb4bc392a87968d40559ba93a9ca3807d2c50dad094a40ce8d6ce9d2fe050ef6adc1fec50207faac04c3fc6ced674eea21414d025bbeef5c56c
+MISC ChangeLog 150633 SHA256 1bb5c4c28b860275dbe266b58264cb4342d142f9f64d7b695fc21b447b1255a5 SHA512 c5a5d638a3c32414ad6c76f82155df30427a831f76746631858dc2907a865610f056ed4d0064c0743ebce7538f550edbe096bc890d0ca697ba8c47b0d80ce02a WHIRLPOOL 7b85a20ff919406e5e651a80b77f3019cef29aad415f22b5fd42f540ef90044e5e8a5bf4790a1f2bcffbdf861fb0ecf9810c7fb652c5ca650c5a5daf8b12519e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150129.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150129.ebuild
new file mode 100644
index 0000000..60e347e
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150129.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-29_00-02-36/zip/netbeans-trunk-nightly-201501290002-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 0e6c03b..c11bc0d 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_p20150129 (29 Jan 2015)
+
+  29 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javafx-9999_p20150129.ebuild:
+  bumped to the latest sources
+
   29 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
   -netbeans-javafx-9999_p20141223.ebuild,
   -netbeans-javafx-9999_p20141225.ebuild:

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index ee27b60..f369e1a 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -3,6 +3,7 @@ DIST 20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar 61713 SHA256 38bf
 DIST 418FC62C8A6EF5311987B01FE389B1F88EFDDCA2-jemmy-2.3.0.0.jar 1695373 SHA256 7676709cfadc97da5056cb90f35b57850259444ef97f03905b83bd08e39fa0db SHA512 526dd83a3dc8efbfdaf1135a1ccd017a94e4fe93bcbdb9fea85caf86da2a7c395ce95eee25c408ac9c3565b191c6c17e67aaf1363c67e200c503d76ba2250484 WHIRLPOOL 7316a9384024669ed487fa4cf13a9b6f78c644ac418762480c98221b208e45592d41682c9a740e8412b3d677a5ccfd3e1183ec52b8f00b2f0e52f6cc1e20cf56
 DIST 49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip 579550 SHA256 e173ba926f93e89bbb9c76bd2190b01e0af2d2b3223d2c78b4ed5bdaebbd78a0 SHA512 3de7720a392813cbbbc73a6ce2a745e10054c0888df61b1e623bf327f8a4584a9eaa07303fc41d01d2088fd6c868e7273c6355d23839dfaa9009d1f672520d58 WHIRLPOOL b6e2a6ca1bcea47dcff7d8a9ea043a5b76834bde9d9f715d5d3eb52211e5c0d8a9d0575c326fa2f1d4d2a5dd93bccdcaf20af45788e7e3032829ac85a83b64da
 DIST A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar 109823 SHA256 18050686d2da634f3612a8100c405eb092dc06d86b8917c6b945d096daf49f94 SHA512 5a0089c36c35ffa2c243cbaee376a246dbfd3dd3f170fa233946b6134f9c80dda610f2900e8bbd1553c3e8bdd3b5548145c881745acc720ec1e059d8252b8399 WHIRLPOOL b01f2a78d653aea3f7a2369a66bef0ccda6026a38efe8f52616eed75df8ef80852ba509a4319ba183ab08d9141a138cde48addd910199f47b2ada7bfc5b24efb
+DIST B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar 173819 SHA256 4f2dbc36ec77519df339846cf5333e874d6f147f5d46ccdfabb18af34ee3bd5b SHA512 ccd48f9fe445b669763428dace1a02d5820a33d872c952d3a74608f868ca225c017999ae15857ed544799d467068b759d216121ba79d3288f323aa2cffb95fa8 WHIRLPOOL 02e8556df81839b0b90c912b9e22c22c9f10c54ee0aabda4768eaf6956f7e3e29c9b24a46e20bb264f2ea186c1642ec7baeb375b2a8951737543ac16e73f9260
 DIST D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip 1647417 SHA256 8c6fa603283582893aed25c247a4748eab38f3e6ce9c59f31b2bb8f3f217a317 SHA512 ffad7d45643015d178cdb1b5bb075f0232470f5f7b82acd87d3dbf88e2034aed04fa9fadadbf7831d3c57fe0c4bc9684d841aebaa8a99ba1d6c1f6cb13f80359 WHIRLPOOL c4df551c83984a2b5cfbe60363ff4d9de2b88f87ed4dcf9b8b91615c62cfe04274736ca29186b8541bc11b1cda8c79ddfd07f3ebcfd146664d9f1c46954696ea
 DIST D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar 1713398 SHA256 5ed65a118b90400886ff4debb29a6e2f82a440bd18e7045c8653d5cb3178616b SHA512 66d1435d2214c7259a4a683bbc3596a11bc99568081c214281a635fc0d5af10bbbddf5efbd040169e0e077abc25a4cb3f790530ce2e514270cdf51e9c916d065 WHIRLPOOL 50d3a6534a31b6d8c6c62d580f4fc56f4df52e79f3acf7297ab7deff87f0b7d4a436cd97706ff9fba24aea797a3efb60d501f4f734f7c607b0cbff4c7e9899bc
 DIST netbeans-7.1.2-201204101705-src.zip 172346251 SHA256 95df26a2eafdc88887a835b3abcf930fd0e72c1639c3e0bfceb9489e44c5865c SHA512 9470f00021fd401e33c9bb4871e40780f1775e0e41c6d0c28ee0ac157c3eede324703d0ed8b1cf14e22441a14ba82fdf72315d7135f55b2a8ffa75f935496f23 WHIRLPOOL ba64a70001e8a18080cc58279e3ba70f61b3ab2c51d2f0be81bec178610f9ff37d41a77d2d5f39e16a8c07e9a7931d1487f35054d2d5fa7e379bb8edab09fc1b
@@ -50,6 +51,7 @@ DIST netbeans-trunk-nightly-201501250002-src.zip 201455903 SHA256 a758db1b55fe99
 DIST netbeans-trunk-nightly-201501260002-src.zip 201455903 SHA256 9ee86145eb73ec82f7192d38f986f316e1fe604e77c27d2ef8d7734869aef4b3 SHA512 4ed99062c874cdaf336fd6a5fd5e7aaa52eafb25c710c14a0800639433dbb2d4998061f3d92dfa3896c8e909577a281523635e93d54edb080667713e432f9f54 WHIRLPOOL c1d53d25cd0bbe1179ef2acdd78f57a420f3f0ff239d7c988a39bc225b6d4d92ee09bcc8b583bf0e7be1e233f9cb4917688b6304161090ed69ed214e092bbcc7
 DIST netbeans-trunk-nightly-201501270002-src.zip 201460403 SHA256 60dfa824eb558b0f538f4ae578c8835cb47950830f1738a22641917b566df358 SHA512 137e8d4d2333ef39b9a6bc34fd56ee239b9573e098d6aa3b08c1f6130e7ea816816563b8750fb734c1b24835c9e8c5c661542045f08792173eda1309e2ec9145 WHIRLPOOL 288a5e89d0cb5849b881acecaf858f90dd6fbf6750eb64753328a7972a367481c64eb248ca7e7399d93ee12e1715c047cc0e04d34367bceca0af2b64153187dc
 DIST netbeans-trunk-nightly-201501280002-src.zip 201449292 SHA256 b09bc8e7245306558fe57aed376d11418d096349f010bc3c59c6dc5a0a1f5e52 SHA512 1d0d33fa15aebdc6aa362158c2cefef946728ead5827e96afa845d9fb57fc8894ccf34855817dc74493d6122acd704d913ae16b93a5b8f902f05b0527e6b51bd WHIRLPOOL 5e703502eb1100f3c8366669b385c48f440f422777ccd6c52166d3455c3910e6025d74f27a9e6714649fb135bb80c3139a7bd05da201b7c34d11d6a37abdbd8e
+DIST netbeans-trunk-nightly-201501290002-src.zip 201615638 SHA256 11a8edf7848e3ebf60edba96bacebc735b9ef150010692b6e78f41665ce61943 SHA512 974b9b35ecdab0a75201a08ae293a4e4d5245b9064c20a53d02e614a4ce4f315e0a4f49c121934cb1871f4247794448a3aeec1fce1bf1c15ff486a335a16402b WHIRLPOOL fbcde90582039d08e3001dcf51f48f2fa860d2a1da8f8fe4daa5b6d299bce04f5a0ccb343693aebf3c5261b9aa3dce5390ef2b4825068b52ef637ea27039c1f6
 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 +90,6 @@ EBUILD netbeans-javafx-9999_p20150125.ebuild 4723 SHA256 fd41c1e599a6ca2c822d67a
 EBUILD netbeans-javafx-9999_p20150126.ebuild 4723 SHA256 65cf7b4261a32721b5b2c4c1c109dbd69447ec87a8b9952ac2b5d3e05ccdbd26 SHA512 6040b65725b5d28095e3c8a5ee49262c1284e8bf23dc6bd56778d3e84746eb8d1a732fb03b9f6b5f2a719cd8619e221ec81afec3b4c26bdbad8d49f120c99226 WHIRLPOOL 4e1a17f5a0bed40e0d61aba25425b3d0b5746a2843a4fb26670a40c77c1c4e8d44735055ae9a184432ec183f352b242df75ef48c027d222d2f33ed56c96985d3
 EBUILD netbeans-javafx-9999_p20150127.ebuild 4723 SHA256 57ef3e9c39d542699184c00242ebc0fa8e47c37ed88739e8ab57b9bcb36ff4d0 SHA512 221b6dd33a1e5ae3b6e00822e74f334b3716fb3202a955084652ae421459bb6dc8e07a1904ecc53bbb6713f0cb17007d85c7d2ea8ccccb350bbeb5ba68444394 WHIRLPOOL 76f73842c380fbdd92ccfba73baff88a265b1b7db99dbdf52f4c8dc59ea5f0337ca3c3436ff3c285d8b9703d1dc7165ca8e2ecb80c1a0bcd5b65a0dfc8aceced
 EBUILD netbeans-javafx-9999_p20150128.ebuild 4723 SHA256 f7e5432cd8c439167e95692e39d568ed8ace505fb8d709ce917f5c31a9b8aa9c SHA512 db81187374509de0eb08f079d3cd0bd9d1bf9eb8d7eb45439e6fc67b7b8405105fb4b1b4f0df6ea461116ad9769f3ed1dcbd91abc8fa576fc72272b2345d60e4 WHIRLPOOL 20896edc19bdcb4cf59afc173280f367cf1e8d31acaeb57f8d495b8c5f8ac70ac08c8a6c797c8b191d431fa1d0327af264d18b04d0f7e30764f704cdae925d32
-MISC ChangeLog 135262 SHA256 0e77816d441f95edb5b5d00bccd3be49f23a877019bc0fbf65b4001e0038a763 SHA512 f484a73457eaeb49aba5f91fd1efb0b942af8c30bbc7d5a01883e9ca308a13e975e320d588535f372aebba4989ff9872e40b8d0ea7985164b0816e31178595f0 WHIRLPOOL cd5c91ecd67d6c8d7a194ac32c855e6a718c66e0a22fbc6e9541ae32fcfdc03f91d46b835b80cdf3674ebf10282c8cbdc1d77c83ae68281f1a9736ad85406a3c
+EBUILD netbeans-javafx-9999_p20150129.ebuild 4723 SHA256 3abc8db5a923fe9ecb7e180ac92ad43609abe2f6136228104972a243ac05ee16 SHA512 fd09a52f5dca714508a609821fd61408f52147f3fa853797953ea573a8af37334f21c659e6b0ee8c56084323bcaba814e7311f1d5884f3dc487b8522fd9ee5f5 WHIRLPOOL 986fd2bafd270d169798faa69e1880a829f7a2506482a756c60f46e96dee7a7665f5af0b1e6144be70a7668823965e4d797e442bbc55b96644d98b37c861cc1f
+MISC ChangeLog 135435 SHA256 cbd5fcfb2b2f742d4304f0739bfb6c106e5796a70c8fd4d1e61e466631b3e838 SHA512 d5898e1b8ed341cf133a7099a1d3e8aab2014c91ac6acf161ef56b5bee43eeaafe949e3ef1c808f32642abb804b4c742a09d0a7271cb2ff5557024d8e432987f WHIRLPOOL 1337938b63269aa876e53b3459cc8fc0290843597c229eb4763a93f3ab44293206dcf992bd751e1dc843dd5d0bd64e5367ed4a26c234451f7cc3b994d2a289c5
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150129.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150129.ebuild
new file mode 100644
index 0000000..3852ff2
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150129.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-29_00-02-36/zip/netbeans-trunk-nightly-201501290002-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.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 5afd038..44259a6 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_p20150129 (29 Jan 2015)
+
+  29 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-mobility-9999_p20150129.ebuild:
+  bumped to the latest sources
+
   29 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
   -netbeans-mobility-9999_p20141223.ebuild,
   -netbeans-mobility-9999_p20141225.ebuild:

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index d976e53..2a239d0 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -54,6 +54,7 @@ DIST netbeans-trunk-nightly-201501250002-src.zip 201455903 SHA256 a758db1b55fe99
 DIST netbeans-trunk-nightly-201501260002-src.zip 201455903 SHA256 9ee86145eb73ec82f7192d38f986f316e1fe604e77c27d2ef8d7734869aef4b3 SHA512 4ed99062c874cdaf336fd6a5fd5e7aaa52eafb25c710c14a0800639433dbb2d4998061f3d92dfa3896c8e909577a281523635e93d54edb080667713e432f9f54 WHIRLPOOL c1d53d25cd0bbe1179ef2acdd78f57a420f3f0ff239d7c988a39bc225b6d4d92ee09bcc8b583bf0e7be1e233f9cb4917688b6304161090ed69ed214e092bbcc7
 DIST netbeans-trunk-nightly-201501270002-src.zip 201460403 SHA256 60dfa824eb558b0f538f4ae578c8835cb47950830f1738a22641917b566df358 SHA512 137e8d4d2333ef39b9a6bc34fd56ee239b9573e098d6aa3b08c1f6130e7ea816816563b8750fb734c1b24835c9e8c5c661542045f08792173eda1309e2ec9145 WHIRLPOOL 288a5e89d0cb5849b881acecaf858f90dd6fbf6750eb64753328a7972a367481c64eb248ca7e7399d93ee12e1715c047cc0e04d34367bceca0af2b64153187dc
 DIST netbeans-trunk-nightly-201501280002-src.zip 201449292 SHA256 b09bc8e7245306558fe57aed376d11418d096349f010bc3c59c6dc5a0a1f5e52 SHA512 1d0d33fa15aebdc6aa362158c2cefef946728ead5827e96afa845d9fb57fc8894ccf34855817dc74493d6122acd704d913ae16b93a5b8f902f05b0527e6b51bd WHIRLPOOL 5e703502eb1100f3c8366669b385c48f440f422777ccd6c52166d3455c3910e6025d74f27a9e6714649fb135bb80c3139a7bd05da201b7c34d11d6a37abdbd8e
+DIST netbeans-trunk-nightly-201501290002-src.zip 201615638 SHA256 11a8edf7848e3ebf60edba96bacebc735b9ef150010692b6e78f41665ce61943 SHA512 974b9b35ecdab0a75201a08ae293a4e4d5245b9064c20a53d02e614a4ce4f315e0a4f49c121934cb1871f4247794448a3aeec1fce1bf1c15ff486a335a16402b WHIRLPOOL fbcde90582039d08e3001dcf51f48f2fa860d2a1da8f8fe4daa5b6d299bce04f5a0ccb343693aebf3c5261b9aa3dce5390ef2b4825068b52ef637ea27039c1f6
 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_p20150125.ebuild 4418 SHA256 60774df139d6d0dc36084
 EBUILD netbeans-mobility-9999_p20150126.ebuild 4418 SHA256 a917b8b48efde1c2e202d2dfb07e64c325a242a89d78b3ca1183bdecd6c281b2 SHA512 e64cb06c56abcd452a84b31716b5a94ff267b29e0c87004ebc62cf8797046eb07d7efbe1ecbe65e280dde415790c9912bc2d0916b00dc3fe0fad89884f035124 WHIRLPOOL 4632f3f52720933cad086fee9c7ab3a2e45fad6fa45489bcfd08b0717663e78f06a3e32b9f9e6f6b95be6f74c1017eeb8e55180ae34ae0ec37576814a8becd58
 EBUILD netbeans-mobility-9999_p20150127.ebuild 4418 SHA256 fde41f1c51394512b8e6d4cf2488e15db4e3e240bbbf2327fe29c3389791ccb8 SHA512 96f778ab5f00540e75149a13e336b088df39bdbeb8026317450440ca8dede4e0c59e39bd7da76e8f3332af1e652078c51659b24742f6c3be999c9200f9f0b5f6 WHIRLPOOL ae591253dcc789a2c6ad728e2a01ba74254bce844a16e94f56e0962945944b4683605746e2c95cf64b499da4ec8e7c0b74821debc609cafad2504370b62da07c
 EBUILD netbeans-mobility-9999_p20150128.ebuild 4418 SHA256 69d62dd6ddd18831c0f97f03af32859dfd6f99b58fda381ffa48ef2630b373f0 SHA512 8524e87ff1e3410b130ad92d21f7e20f0b543a432563b1b3aae813a3f7cb3b448d65a3dc192139f9525ac8e935b051b73c44dac864a589db9ecf300824bd3e3c WHIRLPOOL dca82a437b80facbf9af58e4c4c1f4858700e4144f2fa460325f483ca1b68c96b9f5f65efa49666d05e6f989c7c011150654925fb3681d767a2dc0051189bb79
-MISC ChangeLog 152662 SHA256 3e138685ce0eb83b349330d44c25649de998545cc80d505b9dadba17428c38ee SHA512 c89a79d78727461d47c2c62cd3ff15e8d3d4cc1b4c819edc44d88670b821536ed156c2b59540eddb097c45e50546160d41db258c1b3915ead0f825cf5263922f WHIRLPOOL fd675bb367dab5cd8cd3c7315740f9f87f22e1f23819917fafc1b726226c0528097d72212c63a828d0ca7fed0ca4c385a0208d6d9794968fe11cf24c463a4b11
+EBUILD netbeans-mobility-9999_p20150129.ebuild 4418 SHA256 4c920a0b92ceff41ddc460d5884eb70890227983848a83b8e794313a47cb41e1 SHA512 624de922bd566867c8676ffcfa8e2adcebdf869babe5f04ef7c58d9d4386ddda840fe9e1e5df583a5e616da60d67fe4d5a93f9e0ae008f3a5e7e84298c57da02 WHIRLPOOL 53eb640804c2ecb2f7cb57d5d83df0f0ab138623809cc5022bd24a4f6e5dcfe4516f58069dbc0f37b236583b0c090f389cdddbb40a1bc3d2e4192be66672414f
+MISC ChangeLog 152839 SHA256 d01e655526871baa68422ad0e5947494aa0f9946a4f1534cb5b9973d34904d64 SHA512 8728a2cbc8c7e4a78855a6f2b8572947d35e638a9ba0b3f8db965ee4e7604b8d1f8543a1c8c64520fefcf1924e9abd856a0ef557899eb383bbf6d270ef67b38d WHIRLPOOL d892e4491d916cbd3fde7326977083c7c488b539a4b79a7a533b9efaeea5366dfed3c17e556d2f6438f88b28a658d4b112d520b8f31e19faf054498464d515fa
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150129.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150129.ebuild
new file mode 100644
index 0000000..6e165fd
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150129.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-29_00-02-36/zip/netbeans-trunk-nightly-201501290002-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 4d47edc..1382164 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_p20150129 (29 Jan 2015)
+
+  29 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-nb-9999_p20150129.ebuild:
+  bumped to the latest sources
+
   29 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
   -netbeans-nb-9999_p20141223.ebuild, -netbeans-nb-9999_p20141225.ebuild:
   removed obsolete ebuilds

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 4ead36e..75c1df4 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -53,6 +53,7 @@ DIST netbeans-trunk-nightly-201501250002-src.zip 201455903 SHA256 a758db1b55fe99
 DIST netbeans-trunk-nightly-201501260002-src.zip 201455903 SHA256 9ee86145eb73ec82f7192d38f986f316e1fe604e77c27d2ef8d7734869aef4b3 SHA512 4ed99062c874cdaf336fd6a5fd5e7aaa52eafb25c710c14a0800639433dbb2d4998061f3d92dfa3896c8e909577a281523635e93d54edb080667713e432f9f54 WHIRLPOOL c1d53d25cd0bbe1179ef2acdd78f57a420f3f0ff239d7c988a39bc225b6d4d92ee09bcc8b583bf0e7be1e233f9cb4917688b6304161090ed69ed214e092bbcc7
 DIST netbeans-trunk-nightly-201501270002-src.zip 201460403 SHA256 60dfa824eb558b0f538f4ae578c8835cb47950830f1738a22641917b566df358 SHA512 137e8d4d2333ef39b9a6bc34fd56ee239b9573e098d6aa3b08c1f6130e7ea816816563b8750fb734c1b24835c9e8c5c661542045f08792173eda1309e2ec9145 WHIRLPOOL 288a5e89d0cb5849b881acecaf858f90dd6fbf6750eb64753328a7972a367481c64eb248ca7e7399d93ee12e1715c047cc0e04d34367bceca0af2b64153187dc
 DIST netbeans-trunk-nightly-201501280002-src.zip 201449292 SHA256 b09bc8e7245306558fe57aed376d11418d096349f010bc3c59c6dc5a0a1f5e52 SHA512 1d0d33fa15aebdc6aa362158c2cefef946728ead5827e96afa845d9fb57fc8894ccf34855817dc74493d6122acd704d913ae16b93a5b8f902f05b0527e6b51bd WHIRLPOOL 5e703502eb1100f3c8366669b385c48f440f422777ccd6c52166d3455c3910e6025d74f27a9e6714649fb135bb80c3139a7bd05da201b7c34d11d6a37abdbd8e
+DIST netbeans-trunk-nightly-201501290002-src.zip 201615638 SHA256 11a8edf7848e3ebf60edba96bacebc735b9ef150010692b6e78f41665ce61943 SHA512 974b9b35ecdab0a75201a08ae293a4e4d5245b9064c20a53d02e614a4ce4f315e0a4f49c121934cb1871f4247794448a3aeec1fce1bf1c15ff486a335a16402b WHIRLPOOL fbcde90582039d08e3001dcf51f48f2fa860d2a1da8f8fe4daa5b6d299bce04f5a0ccb343693aebf3c5261b9aa3dce5390ef2b4825068b52ef637ea27039c1f6
 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_p20150125.ebuild 5013 SHA256 d9d5199a7b4b639ee68da0843e0
 EBUILD netbeans-nb-9999_p20150126.ebuild 5013 SHA256 9a096c30bc2f00c73731dc693ea45c4e8a3ae53d3a7aa969fe5446cd57d0c072 SHA512 416857b2dcfeeeeb76b93290b4bddcf5b6fc04e57cf8268609358c64dcb7a73191d99a5b36bab07681d792388abbb6dedfe085a91a6281238fce0e5b5e248cc3 WHIRLPOOL d6ab6fa3c461b8ee5ce2783117a10cc60ab7905796f75a2a7ba561bbf0a62a3ba1349e56f00355a8589de44322d075e01e179f93f4398c83b93b85d113ae43ec
 EBUILD netbeans-nb-9999_p20150127.ebuild 5013 SHA256 1ce07bd4f5b346121d8b3c5d0f8a1c50cabc3b429935194d911b6bc6583c4dc2 SHA512 501af0e2f81ae0c668b119d217c9af2a364bd949320b6d7af2f897deef0c5e90df9271262fa0ee089ed225bc62023935490bc6d075e600be037060b907dc340f WHIRLPOOL 98176374497a546d8dbe922f00e3620bd1ca02103fda03f8074a6019ac654eff2a3f0594cd11734111267f6c44b1dbfde62904f00e315d6c3bda52eed460b861
 EBUILD netbeans-nb-9999_p20150128.ebuild 5013 SHA256 365c8da595cd875527f6901f89eb524af216d0503813ffc0a0c0ef0330e20d1d SHA512 93aec8583a215a0d66d97aaaf68be865d20ac2ecc6d97a25cb271fa26cfcc5bec818d0ae810526898e6a5ed0a11ffb2075f91c386f3c99e6dfe92a96bc4307f9 WHIRLPOOL 6903d449134971240862a862a3898b91c06c0ea6cddbdebdb0e0670e4293c83d94567b81b93607e4dd3ec1be5fc8453bc696484bfc74818d40422a9f17a7245e
-MISC ChangeLog 141567 SHA256 0949c304604aeabcd2af2a11c17c208658b99bc67274a20f3a5d36d31fc1a4ca SHA512 3408b31ec18976d6860114baa18df7a9fbb9ec72183b93457d73f5787753a9e6bb439b8ee27031a2bae6bec1c14ebf3ed697acb7b1680e03d7d94af56f449fc5 WHIRLPOOL c0f41f753abffea9a22a75c14eded594eac73887f28696a1bf9a71e53fb25e36cc543f4cf166a6c1cc6037477a60ce0b6918984cbe4736320e405c2d45daf904
+EBUILD netbeans-nb-9999_p20150129.ebuild 5013 SHA256 5f246c6c5c907df0219588edc66641dc5fcb9b6bf787de39a7f276630d67ca68 SHA512 e53c32660d868887fa91ab547df6c6f7e1f8029b2068b267e7dfbca3ad27693b820d4a0861ac523c9c3ba5b961e8bb74bfa85d442813f5bc56b269b6abde73b8 WHIRLPOOL cae279a0aefc526d3f2b2e76da6037a41a7d0c9ee36905baba4f8f0888c0302d5226d895f070cbedd9cdd76c4f2593fece658989f643742b84567a303566cb5f
+MISC ChangeLog 141732 SHA256 382473c2625235697a32da29caa1cffdb7287a690fc061ad1a85cb44b8e732cd SHA512 5191807f8c063c8b7b7c943a5f68e4bd4fcaeffb25cc0bb2b9019e2a0ba4eb6472a3e00ab3121fe9739f850528e9b0b3cce84e011ab45b95b32714dffa00e9eb WHIRLPOOL 251fd34aa95e6b35ddbf4a4682f4dba9ed75697201ddf873f5358f4f79a6d8466545cf7b6c94bb407b45033a40e6426e8e1d32c86b9f9688fdbd785b10175dd6
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20150129.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20150129.ebuild
new file mode 100644
index 0000000..1c9efe1
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20150129.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-29_00-02-36/zip/netbeans-trunk-nightly-201501290002-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 ac33309..e5eb3df 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_p20150129 (29 Jan 2015)
+
+  29 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-php-9999_p20150129.ebuild:
+  bumped to the latest sources
+
   29 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
   -netbeans-php-9999_p20141223.ebuild, -netbeans-php-9999_p20141225.ebuild:
   removed obsolete ebuilds

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index 74db322..017ad0f 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -56,6 +56,7 @@ DIST netbeans-trunk-nightly-201501250002-src.zip 201455903 SHA256 a758db1b55fe99
 DIST netbeans-trunk-nightly-201501260002-src.zip 201455903 SHA256 9ee86145eb73ec82f7192d38f986f316e1fe604e77c27d2ef8d7734869aef4b3 SHA512 4ed99062c874cdaf336fd6a5fd5e7aaa52eafb25c710c14a0800639433dbb2d4998061f3d92dfa3896c8e909577a281523635e93d54edb080667713e432f9f54 WHIRLPOOL c1d53d25cd0bbe1179ef2acdd78f57a420f3f0ff239d7c988a39bc225b6d4d92ee09bcc8b583bf0e7be1e233f9cb4917688b6304161090ed69ed214e092bbcc7
 DIST netbeans-trunk-nightly-201501270002-src.zip 201460403 SHA256 60dfa824eb558b0f538f4ae578c8835cb47950830f1738a22641917b566df358 SHA512 137e8d4d2333ef39b9a6bc34fd56ee239b9573e098d6aa3b08c1f6130e7ea816816563b8750fb734c1b24835c9e8c5c661542045f08792173eda1309e2ec9145 WHIRLPOOL 288a5e89d0cb5849b881acecaf858f90dd6fbf6750eb64753328a7972a367481c64eb248ca7e7399d93ee12e1715c047cc0e04d34367bceca0af2b64153187dc
 DIST netbeans-trunk-nightly-201501280002-src.zip 201449292 SHA256 b09bc8e7245306558fe57aed376d11418d096349f010bc3c59c6dc5a0a1f5e52 SHA512 1d0d33fa15aebdc6aa362158c2cefef946728ead5827e96afa845d9fb57fc8894ccf34855817dc74493d6122acd704d913ae16b93a5b8f902f05b0527e6b51bd WHIRLPOOL 5e703502eb1100f3c8366669b385c48f440f422777ccd6c52166d3455c3910e6025d74f27a9e6714649fb135bb80c3139a7bd05da201b7c34d11d6a37abdbd8e
+DIST netbeans-trunk-nightly-201501290002-src.zip 201615638 SHA256 11a8edf7848e3ebf60edba96bacebc735b9ef150010692b6e78f41665ce61943 SHA512 974b9b35ecdab0a75201a08ae293a4e4d5245b9064c20a53d02e614a4ce4f315e0a4f49c121934cb1871f4247794448a3aeec1fce1bf1c15ff486a335a16402b WHIRLPOOL fbcde90582039d08e3001dcf51f48f2fa860d2a1da8f8fe4daa5b6d299bce04f5a0ccb343693aebf3c5261b9aa3dce5390ef2b4825068b52ef637ea27039c1f6
 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_p20150125.ebuild 4423 SHA256 fcb5c2dcb76b304171f445fa60
 EBUILD netbeans-php-9999_p20150126.ebuild 4423 SHA256 e749a2948fb405118e6845e217bbb45a039e221ec14bc793a577a89513efa807 SHA512 8d540c2932b57e4926c931ac6e5449a67f2ad7188353bbdb3c1a4be44435550a39a1158ac9f47f976ab4b7fe1da12d2bc39d5460998516ded3ceffb32d569b23 WHIRLPOOL b9c9e6666420378d0c0da846cd53742ce0db226d220113af3a48c3a68d5a652196a4eecb22a18073f90d0f52024b802356e13c02a1da8c215d13820d36d99a79
 EBUILD netbeans-php-9999_p20150127.ebuild 4423 SHA256 9b1056c8587f06c3db74cc4b8a016e1387e7d2ec29b5ef7b96c6f9bef74a5d0c SHA512 3725fdba48d84f034e3ff8ce416555eceacc3542aaaf21cf85faac3a3e7bdb6043df6a46d5723d88a00c2d16ed41d233ccc282b0a1d09c95a8eb205e5f152dc3 WHIRLPOOL 60a0e177a767dd9ab57b962f867a150c3d583b1a3d819e192af92a49c71379db906130b4585f1db7835977e422f85cf6086be73802de30224742e4586ce357b1
 EBUILD netbeans-php-9999_p20150128.ebuild 4423 SHA256 687b599b2c1a09ca69108fee829334a3ff3760203ef75ac739274e813259ce1f SHA512 98794d47cdef52bcc43e6abe1876cba4de5bb545f72f35b9263965f54a36dbd2d324b5ef2afc5f2d05ffb55ae1791b900ffa051c07f706102af9636033aee1d8 WHIRLPOOL a253d263b9624281e461ca10364e4a8feb532624c0431e10ad9f8f426fe5ccf29a14218388c51dd9e9294752ff4571cb954fe2e6751ea18de8a47f6feb7d09c7
-MISC ChangeLog 142421 SHA256 5ff8883c6dfd736a55358e81c50f97a67a153b72655ae046e3a2480f1bdf0dc0 SHA512 c66845fd83fcbfc4265f41ef3c8bd5fe1416cab9a90e4523de9eb09d5cbe14af9ee66c3c401cff4b65398f68a67edd063598fe4806da16e19de6e2bc4fd452c4 WHIRLPOOL ca7a52fc06166aeaab529ba30ae1a0bc3a594a31f8aec08e318d7c19f242cbf32eb0e920ccf49a33343b3fb6e12c352986738023138750b59d774535c87141b8
+EBUILD netbeans-php-9999_p20150129.ebuild 4423 SHA256 a642a1aebc1cebb8d989c486ee00e6443201b5761de492b76aa27b9797a017ca SHA512 239d0635bb2ec973db253c886c0373032715fb2aa5e98f7147fdcacdb12d35ab7e691f0c0ae0962af134b563d13f091397dcc98ced1dc3f924b520a6bdd05246 WHIRLPOOL 3858306e286e6b0487e32673c5d6ef54024fb23ef0f8092614c26db52c1b316f888aa9debfe05d5e9bd7c07c02f75a5fedab3963f6e406e9f82a434957927c74
+MISC ChangeLog 142588 SHA256 f3f4ce9487011eda4322bbf412ca9acd0d03c7998df0d481d9c5fa07346354be SHA512 ab8487d865c4e884f626b87c02eb79015a3bf062c464b77bea8c82a027eb1f8c81d039b8a4b82b916fad9f7b2668b95d9663c8763a314046b85a1c330c3cc7a9 WHIRLPOOL 721492a4fe60f9cb13c02ffad950af6b5c93a96026852138307976dfdb114616ae756d8bfb892217a4d6a3b4697a17a700c75fb146c51f28422e1255ed9cfe22
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20150129.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20150129.ebuild
new file mode 100644
index 0000000..5f37cec
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20150129.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-29_00-02-36/zip/netbeans-trunk-nightly-201501290002-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 29b28f1..9fa6c1b 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_p20150129 (29 Jan 2015)
+
+  29 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-platform-9999_p20150129.ebuild:
+  bumped to the latest sources
+
   29 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
   -netbeans-platform-9999_p20141223.ebuild,
   -netbeans-platform-9999_p20141225.ebuild:

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 4f14acb..e318886 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -79,6 +79,7 @@ DIST netbeans-trunk-nightly-201501250002-src.zip 201455903 SHA256 a758db1b55fe99
 DIST netbeans-trunk-nightly-201501260002-src.zip 201455903 SHA256 9ee86145eb73ec82f7192d38f986f316e1fe604e77c27d2ef8d7734869aef4b3 SHA512 4ed99062c874cdaf336fd6a5fd5e7aaa52eafb25c710c14a0800639433dbb2d4998061f3d92dfa3896c8e909577a281523635e93d54edb080667713e432f9f54 WHIRLPOOL c1d53d25cd0bbe1179ef2acdd78f57a420f3f0ff239d7c988a39bc225b6d4d92ee09bcc8b583bf0e7be1e233f9cb4917688b6304161090ed69ed214e092bbcc7
 DIST netbeans-trunk-nightly-201501270002-src.zip 201460403 SHA256 60dfa824eb558b0f538f4ae578c8835cb47950830f1738a22641917b566df358 SHA512 137e8d4d2333ef39b9a6bc34fd56ee239b9573e098d6aa3b08c1f6130e7ea816816563b8750fb734c1b24835c9e8c5c661542045f08792173eda1309e2ec9145 WHIRLPOOL 288a5e89d0cb5849b881acecaf858f90dd6fbf6750eb64753328a7972a367481c64eb248ca7e7399d93ee12e1715c047cc0e04d34367bceca0af2b64153187dc
 DIST netbeans-trunk-nightly-201501280002-src.zip 201449292 SHA256 b09bc8e7245306558fe57aed376d11418d096349f010bc3c59c6dc5a0a1f5e52 SHA512 1d0d33fa15aebdc6aa362158c2cefef946728ead5827e96afa845d9fb57fc8894ccf34855817dc74493d6122acd704d913ae16b93a5b8f902f05b0527e6b51bd WHIRLPOOL 5e703502eb1100f3c8366669b385c48f440f422777ccd6c52166d3455c3910e6025d74f27a9e6714649fb135bb80c3139a7bd05da201b7c34d11d6a37abdbd8e
+DIST netbeans-trunk-nightly-201501290002-src.zip 201615638 SHA256 11a8edf7848e3ebf60edba96bacebc735b9ef150010692b6e78f41665ce61943 SHA512 974b9b35ecdab0a75201a08ae293a4e4d5245b9064c20a53d02e614a4ce4f315e0a4f49c121934cb1871f4247794448a3aeec1fce1bf1c15ff486a335a16402b WHIRLPOOL fbcde90582039d08e3001dcf51f48f2fa860d2a1da8f8fe4daa5b6d299bce04f5a0ccb343693aebf3c5261b9aa3dce5390ef2b4825068b52ef637ea27039c1f6
 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_p20150125.ebuild 8293 SHA256 d693f9357e6f8e8115e05
 EBUILD netbeans-platform-9999_p20150126.ebuild 8293 SHA256 9616e24f3df2b6c9cc8a0303d574cbbe00d99c1bc0313524be22d174a34620a1 SHA512 f3ead151320ec6daf589e0b587c59c6afd1afca6adc6df1d7c04223c402a47a1a92b6350e7c04b41a15b66d355011ebd6b73980e7e63928129283dd06df2feb5 WHIRLPOOL 773f235c0737dac5fb147a2335513bd70ff339e9cfbcb716f6618cb4a86bf9c4533c5292678b195d0f29082249a1de379828638b9e4b5782f8e55a1b7195acc0
 EBUILD netbeans-platform-9999_p20150127.ebuild 8293 SHA256 392f88c4a07930b9d8d7c7a3f633f755e315c66840f0aaef30d19050838dcf41 SHA512 010315fa61da3fcf07493c06f840cbd7d523d04ec281b8c10d8614695261b9a014d96d140a8158fae3acfed4c6cf24a30771ef8c3d9a638c6bb817489ca5d474 WHIRLPOOL e4c3e63ab85b385e000332df003b6ddb3f929eb47e2d8b0e6db4f1d231c7cfaeeb8179fc9e8898ef34b5a750d538a5d210a593d9f9409e86502e9292edddb7a8
 EBUILD netbeans-platform-9999_p20150128.ebuild 8293 SHA256 ed760a7e57a6529c8bbc29c0a62d36dc164c6770727fa69ecdb5e89a21133598 SHA512 6c266988715cb6d582bfd5656da295a8aa373da87c06fcdfac22bbf13b4ceb7231f91dbcf37436977d8f690ccd159abfe64c9fc4b6553863aa4bba10c77917be WHIRLPOOL 8903439584b81ac076e2edecb2982fe2ec9d64f3fbe29bc067a7cddb85156cb3c0df13a8185d16567505da16425fd6aeaabf96e979c3548caf644743ed85ccf7
-MISC ChangeLog 153258 SHA256 9a32002bcba5a6400e1d9783cfe9f95596dbe17c8b8975859e369e217d4dcee3 SHA512 5f20f153faa45ec739692b1fd7fa7126467d292d6b82ad362e892dedd7211eaea2dd9933cfec5c1931fa1db6f9dacb00ddb70af12bcd558f6ee60981e5e0c5e1 WHIRLPOOL 50017e372865471c632002f223a548096c0ed7d3e8dc540100e89d3d60a88614474656a46410a4179cbe4f44a0de291b5c6771a6036b3ca2a6d94b91063279b5
+EBUILD netbeans-platform-9999_p20150129.ebuild 8293 SHA256 11b4114fffa8b5e85c1fde9df899559541e91b30efc70004a082f8761721199a SHA512 b3abf3b352839fbc3e98d35405f5dad0abf897284c6a8444a0e2095021144e0b95d38e9cfdfc04705354cffcba80f5588a9e8b394212c76d31cdf2b467ca15d8 WHIRLPOOL b86b39600613a3071fb24b465cb9c1a399102384ed25cb12b4d3e94d34d2620cc32c9ea2c3dc3fb0fdc9aa1b6895a1b83b24dd3ea6be43a87f06ff1dbf5fbcc2
+MISC ChangeLog 153435 SHA256 63c16c62ec9f70a10fc0d581fbe62b53cd4ebed4e167843d50c7222c36ea2d00 SHA512 43259cdca14e5579a8c123cf1c36716b63d33bd833f8574fd98b25d9b164b309ea88b553bc12ea537e3f1bfe7620f4f6d5f4c92feb93ae975e4d272895f54088 WHIRLPOOL c5e2ec1f63ea4b70ecaa1c1a6932cc2d86a62a656bf03317d14877dcf87d9137586c3542904c6afbc077be7472d56cddf478d13a9635e80d7c875d833fd8284d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20150129.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20150129.ebuild
new file mode 100644
index 0000000..36421a3
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20150129.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-29_00-02-36/zip/netbeans-trunk-nightly-201501290002-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 1dcc7d6..186e7a4 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_p20150129 (29 Jan 2015)
+
+  29 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-profiler-9999_p20150129.ebuild:
+  bumped to the latest sources
+
   29 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
   -netbeans-profiler-9999_p20141223.ebuild,
   -netbeans-profiler-9999_p20141225.ebuild:

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index d035f0e..736edda 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -45,6 +45,7 @@ DIST netbeans-trunk-nightly-201501250002-src.zip 201455903 SHA256 a758db1b55fe99
 DIST netbeans-trunk-nightly-201501260002-src.zip 201455903 SHA256 9ee86145eb73ec82f7192d38f986f316e1fe604e77c27d2ef8d7734869aef4b3 SHA512 4ed99062c874cdaf336fd6a5fd5e7aaa52eafb25c710c14a0800639433dbb2d4998061f3d92dfa3896c8e909577a281523635e93d54edb080667713e432f9f54 WHIRLPOOL c1d53d25cd0bbe1179ef2acdd78f57a420f3f0ff239d7c988a39bc225b6d4d92ee09bcc8b583bf0e7be1e233f9cb4917688b6304161090ed69ed214e092bbcc7
 DIST netbeans-trunk-nightly-201501270002-src.zip 201460403 SHA256 60dfa824eb558b0f538f4ae578c8835cb47950830f1738a22641917b566df358 SHA512 137e8d4d2333ef39b9a6bc34fd56ee239b9573e098d6aa3b08c1f6130e7ea816816563b8750fb734c1b24835c9e8c5c661542045f08792173eda1309e2ec9145 WHIRLPOOL 288a5e89d0cb5849b881acecaf858f90dd6fbf6750eb64753328a7972a367481c64eb248ca7e7399d93ee12e1715c047cc0e04d34367bceca0af2b64153187dc
 DIST netbeans-trunk-nightly-201501280002-src.zip 201449292 SHA256 b09bc8e7245306558fe57aed376d11418d096349f010bc3c59c6dc5a0a1f5e52 SHA512 1d0d33fa15aebdc6aa362158c2cefef946728ead5827e96afa845d9fb57fc8894ccf34855817dc74493d6122acd704d913ae16b93a5b8f902f05b0527e6b51bd WHIRLPOOL 5e703502eb1100f3c8366669b385c48f440f422777ccd6c52166d3455c3910e6025d74f27a9e6714649fb135bb80c3139a7bd05da201b7c34d11d6a37abdbd8e
+DIST netbeans-trunk-nightly-201501290002-src.zip 201615638 SHA256 11a8edf7848e3ebf60edba96bacebc735b9ef150010692b6e78f41665ce61943 SHA512 974b9b35ecdab0a75201a08ae293a4e4d5245b9064c20a53d02e614a4ce4f315e0a4f49c121934cb1871f4247794448a3aeec1fce1bf1c15ff486a335a16402b WHIRLPOOL fbcde90582039d08e3001dcf51f48f2fa860d2a1da8f8fe4daa5b6d299bce04f5a0ccb343693aebf3c5261b9aa3dce5390ef2b4825068b52ef637ea27039c1f6
 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_p20150125.ebuild 3478 SHA256 e2424240f37e1d0459741
 EBUILD netbeans-profiler-9999_p20150126.ebuild 3478 SHA256 afc2466c25501365ac1b8b066d2f174c5d44330406fb155cd76d81750cb34262 SHA512 e0bde47cde7856397a935939bcbdc92fbf1091df64276bef8a2abfaacd1bfe94f473b42a327ffa540d4e8abc6e901babdb1506c1ae17c1c28c2990eced997461 WHIRLPOOL 0bcdb0ddf3f78a513f8a04ac431e2bcecc11d05774b4bc4f7f7183b5f6c4dd418a2b8cb1dc251929b0b9bb9460bef22a09b412176969e6955c61909832e82e2a
 EBUILD netbeans-profiler-9999_p20150127.ebuild 3478 SHA256 12da9ad6ef4fa8b332a674f41b9298380dd5d936b5a83e6ab5a0be5bd416c8f4 SHA512 1d3aa939ca1231087164921b03dece7fcb4a78496097cb42b067c57a8ed61204665ea4ec2af02c52263c8a4ad87f2b8a4d1d7d43c615f2db1e52907f80ff0155 WHIRLPOOL 51d4c80709e868c47b89f82403b3cea4389496ebad3250e2d2a86d4e3df430ef52fb53650f9f7c0fef1f8d48e9fd19c0afb0f12e6ac55a810277715cc2455391
 EBUILD netbeans-profiler-9999_p20150128.ebuild 3478 SHA256 768b8985ad9baede59b8eb6ca86de862dcbc87334325a0c353976ee38bef8744 SHA512 298d573f9904b97ecea4d1f3d8308cd8b3f6c19ae57de3eeb89a57da7c2f1236cd1f975884b0b19e70199debd7cf814ea023431c97fab48876832904b420d0e7 WHIRLPOOL 388ef31d6fbfd3e3269855add33cc9abc875d68e8abe818a6f6f1a33f3850e65284cf955300c747e46dcd6c9f76ea04db536f92681e466e86a02b45a6765e3cb
-MISC ChangeLog 152719 SHA256 a174f4b243957b6d4a65bc8b98ab329ffd4fe7c5f48f0323a9834970b84e76fb SHA512 125f3717a47d553d471b032debaaef7060487e239cfd687307abf1eb340e333353b3dccc16bfa9806b4de86bd3f3fe9ee8bc1e96437d57a217b5ae8ccc68857a WHIRLPOOL e275469cc1e39cc0780d6d4807ad68047098a146f771dfe0435c7968363063621d2c19e5d636b6f505623c73157e002e1f81a097a600380702a772f8c1ebee7b
+EBUILD netbeans-profiler-9999_p20150129.ebuild 3478 SHA256 81f1a9078666790700d8d543ebcf47c1dfe1f297946b8e2bd97f2ac4e47a49bd SHA512 f7b290bd9df6fe590afaccc162bb08bb2e91573060021518ef8cf248ad8b274c71c8eea7a9f15ad131b1ffd57bcead6506ad9c4f23950e8892d02e8dbffaf1f1 WHIRLPOOL 63f33ac80215043b86fe4d2f06a42a2b52b97e78c21dd72be40e460c399ac2db63421f124894e9debb83cf9efc7ff9c3bf11f2231b2bc05d5d9c00305bde2f97
+MISC ChangeLog 152896 SHA256 6afa64732139eb8d1895bcc9f77f0782ff5c23d1824231d0e4b221fd8d8ff48e SHA512 0f588571088878da89cdd5558eadf91970eb81db40377c9f9b61bc423ac85fa973721ccfecdd86b01d451437a05b4bbd370a402db622e5a9cb94929683f16e8a WHIRLPOOL f8a97a3dff78006929c3c0f74d345a8dcd02977fe3a9696ab886f9f136abd4909c1a44781c158cc917d5fa7b28930cd98404e43aeb31691e1b85bf948112563c
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150129.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150129.ebuild
new file mode 100644
index 0000000..5429fea
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150129.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-29_00-02-36/zip/netbeans-trunk-nightly-201501290002-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 49af000..eb4814e 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_p20150129 (29 Jan 2015)
+
+  29 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-webcommon-9999_p20150129.ebuild:
+  bumped to the latest sources
+
   29 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
   -netbeans-webcommon-9999_p20141223.ebuild,
   -netbeans-webcommon-9999_p20141225.ebuild:

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index ad5ac82..02d2810 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -51,6 +51,7 @@ DIST netbeans-trunk-nightly-201501250002-src.zip 201455903 SHA256 a758db1b55fe99
 DIST netbeans-trunk-nightly-201501260002-src.zip 201455903 SHA256 9ee86145eb73ec82f7192d38f986f316e1fe604e77c27d2ef8d7734869aef4b3 SHA512 4ed99062c874cdaf336fd6a5fd5e7aaa52eafb25c710c14a0800639433dbb2d4998061f3d92dfa3896c8e909577a281523635e93d54edb080667713e432f9f54 WHIRLPOOL c1d53d25cd0bbe1179ef2acdd78f57a420f3f0ff239d7c988a39bc225b6d4d92ee09bcc8b583bf0e7be1e233f9cb4917688b6304161090ed69ed214e092bbcc7
 DIST netbeans-trunk-nightly-201501270002-src.zip 201460403 SHA256 60dfa824eb558b0f538f4ae578c8835cb47950830f1738a22641917b566df358 SHA512 137e8d4d2333ef39b9a6bc34fd56ee239b9573e098d6aa3b08c1f6130e7ea816816563b8750fb734c1b24835c9e8c5c661542045f08792173eda1309e2ec9145 WHIRLPOOL 288a5e89d0cb5849b881acecaf858f90dd6fbf6750eb64753328a7972a367481c64eb248ca7e7399d93ee12e1715c047cc0e04d34367bceca0af2b64153187dc
 DIST netbeans-trunk-nightly-201501280002-src.zip 201449292 SHA256 b09bc8e7245306558fe57aed376d11418d096349f010bc3c59c6dc5a0a1f5e52 SHA512 1d0d33fa15aebdc6aa362158c2cefef946728ead5827e96afa845d9fb57fc8894ccf34855817dc74493d6122acd704d913ae16b93a5b8f902f05b0527e6b51bd WHIRLPOOL 5e703502eb1100f3c8366669b385c48f440f422777ccd6c52166d3455c3910e6025d74f27a9e6714649fb135bb80c3139a7bd05da201b7c34d11d6a37abdbd8e
+DIST netbeans-trunk-nightly-201501290002-src.zip 201615638 SHA256 11a8edf7848e3ebf60edba96bacebc735b9ef150010692b6e78f41665ce61943 SHA512 974b9b35ecdab0a75201a08ae293a4e4d5245b9064c20a53d02e614a4ce4f315e0a4f49c121934cb1871f4247794448a3aeec1fce1bf1c15ff486a335a16402b WHIRLPOOL fbcde90582039d08e3001dcf51f48f2fa860d2a1da8f8fe4daa5b6d299bce04f5a0ccb343693aebf3c5261b9aa3dce5390ef2b4825068b52ef637ea27039c1f6
 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_p20150125.ebuild 4997 SHA256 0e70c8e098e0af0150c2
 EBUILD netbeans-webcommon-9999_p20150126.ebuild 4997 SHA256 b864af25c92e84bb410bb96b3a2a4fa750fc4019fa92454ca1a3cdad0b36787c SHA512 c04d492738365d8a434c6bccd8bdbf178ab70d2f2be3a0f3fe03bba65ab2a1b56454c80987893a5d505f07583cde0a134322caa842db2fa5b10e0b7408236538 WHIRLPOOL 37e23e906466cceeced0796eeedc723cc4e1b5e851a179443b80dde2b67d7692d609491593e2580dab947b2d2e9cb96dc2e2c37cf685d044a6e0257bdace3ffa
 EBUILD netbeans-webcommon-9999_p20150127.ebuild 4997 SHA256 e162bca5cc882e40acf3c900d04ba98220530d75459a4ace199e02976d1378c0 SHA512 bb4a492f8263d6291e2771be57d624dd4a628f8ae218d09a6989c920d2e09ea0aa176547f4aab74e58ea90a0e91a320d0d3798f90e73e4a44f39c1a7abef3ef1 WHIRLPOOL 190e4989adfa87fc9cefa7455105ff4f838211f19e67b223c0562227aea450695af660625af33f81cc18fc1b9f1579f416ee527527cc4dbc55301f7c21c97909
 EBUILD netbeans-webcommon-9999_p20150128.ebuild 4997 SHA256 08ba8cd99263342fc0700ab5349af8d14772d5ac1e9ebb8f64cfcc8f74c26024 SHA512 e732fc30085319fe1b02df0d9ff3b497a8e28ba3666da4ec69a625d6efd8ed51489f486b120d9673cf651c16afec5b60d036923bc6dfb0bf5a9c344cde0e727a WHIRLPOOL 013010eb299338431ba3e5c0437300f5f83e25d4749782c12679a41de70ea2aa24d76d20d63d79d5e8d20cecfe8bd3390ab77d7dd1772cc021be8fa1f784f2f0
-MISC ChangeLog 125595 SHA256 61890c672bf4e8e5efb7b17761f6be6a9370ddfe8082c74a825d5956dddcc6da SHA512 2e10c5735f538265f7ce8fea4f24dab9d47ef670c302c21635fc4b1cb6e41fc28ffce3b73502ffa3a988f298dca074f081294cc0bcd08c7ab5219963ed682199 WHIRLPOOL dc8678e5028f9d5ade547fe14dd3e55e0fe3137fd4536f5cf624d523ccc59800707a8c17d0e843a749ea7a5c33973c34401b5cd4a0ce6e527dbb445473195f50
+EBUILD netbeans-webcommon-9999_p20150129.ebuild 4997 SHA256 c6ce82206d78c408da7f099fffe7bb29a1a2b9d53b4ccee29aeb3bb2c58745b6 SHA512 ad51897fcc8d78700eb20344026270dba1c5fa3c261f53447a9455808c8ccf0a61278823a0ec0df58df3d88b530302d02d27baa281c2864c8c10f55ced3f51af WHIRLPOOL a3837569f797f2159a3f15e0b15f5c66b39e8138b97723a08e346256c8719f2e1728b8b20742af86599fb31f7039c326d07aef5ea49c4b9eb60b2c7a0d129b76
+MISC ChangeLog 125774 SHA256 b3bff85b3eb165de7f2f50db7a7a550c84aa69e74b76b0b64321dcdb1b185cfd SHA512 5abda606f134c4cb52a0c4104963f8b2b99485c1d8468b9beae26fe48a286866c8d2cd5ba06f67b17a3cd00ce54a77ac490569e1edb568ef6f35d23eb03da7c4 WHIRLPOOL 9cc739864b3494affdc262696a2c2a6d534a0d902124cfb06518d0d3523d67d7c39d9183ac71a5c7e675aa41f1f7c973cbefd8cb1754f6afa558c960fc60fde6
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150129.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150129.ebuild
new file mode 100644
index 0000000..bba693e
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150129.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-29_00-02-36/zip/netbeans-trunk-nightly-201501290002-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 2639899..e1da599 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_p20150129 (29 Jan 2015)
+
+  29 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-websvccommon-9999_p20150129.ebuild:
+  bumped to the latest sources
+
   29 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
   -netbeans-websvccommon-9999_p20141223.ebuild,
   -netbeans-websvccommon-9999_p20141225.ebuild:

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 2a15bbc..2064336 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -45,6 +45,7 @@ DIST netbeans-trunk-nightly-201501250002-src.zip 201455903 SHA256 a758db1b55fe99
 DIST netbeans-trunk-nightly-201501260002-src.zip 201455903 SHA256 9ee86145eb73ec82f7192d38f986f316e1fe604e77c27d2ef8d7734869aef4b3 SHA512 4ed99062c874cdaf336fd6a5fd5e7aaa52eafb25c710c14a0800639433dbb2d4998061f3d92dfa3896c8e909577a281523635e93d54edb080667713e432f9f54 WHIRLPOOL c1d53d25cd0bbe1179ef2acdd78f57a420f3f0ff239d7c988a39bc225b6d4d92ee09bcc8b583bf0e7be1e233f9cb4917688b6304161090ed69ed214e092bbcc7
 DIST netbeans-trunk-nightly-201501270002-src.zip 201460403 SHA256 60dfa824eb558b0f538f4ae578c8835cb47950830f1738a22641917b566df358 SHA512 137e8d4d2333ef39b9a6bc34fd56ee239b9573e098d6aa3b08c1f6130e7ea816816563b8750fb734c1b24835c9e8c5c661542045f08792173eda1309e2ec9145 WHIRLPOOL 288a5e89d0cb5849b881acecaf858f90dd6fbf6750eb64753328a7972a367481c64eb248ca7e7399d93ee12e1715c047cc0e04d34367bceca0af2b64153187dc
 DIST netbeans-trunk-nightly-201501280002-src.zip 201449292 SHA256 b09bc8e7245306558fe57aed376d11418d096349f010bc3c59c6dc5a0a1f5e52 SHA512 1d0d33fa15aebdc6aa362158c2cefef946728ead5827e96afa845d9fb57fc8894ccf34855817dc74493d6122acd704d913ae16b93a5b8f902f05b0527e6b51bd WHIRLPOOL 5e703502eb1100f3c8366669b385c48f440f422777ccd6c52166d3455c3910e6025d74f27a9e6714649fb135bb80c3139a7bd05da201b7c34d11d6a37abdbd8e
+DIST netbeans-trunk-nightly-201501290002-src.zip 201615638 SHA256 11a8edf7848e3ebf60edba96bacebc735b9ef150010692b6e78f41665ce61943 SHA512 974b9b35ecdab0a75201a08ae293a4e4d5245b9064c20a53d02e614a4ce4f315e0a4f49c121934cb1871f4247794448a3aeec1fce1bf1c15ff486a335a16402b WHIRLPOOL fbcde90582039d08e3001dcf51f48f2fa860d2a1da8f8fe4daa5b6d299bce04f5a0ccb343693aebf3c5261b9aa3dce5390ef2b4825068b52ef637ea27039c1f6
 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_p20150125.ebuild 2727 SHA256 04d05dd1bf487bbe5
 EBUILD netbeans-websvccommon-9999_p20150126.ebuild 2727 SHA256 e0353eaa48837f740db6aab45963d4c0331ae196eb7fbe8f2dc62cccef334f59 SHA512 57a56b7712a4a22ce5e025f9221b6d250d6f9d990372ab0d5663e9317fd43cba294de41af213f397e288edf17a439274c3d321dc60c7fe6e74470cec693d4324 WHIRLPOOL a4513346feae699969e5979475a1bebe832c4984f86f3e696aba41b603e9a4170f16d5590e9f03c94788fdac8ab477467e5c7495b6acd1ecb3e7902805512f62
 EBUILD netbeans-websvccommon-9999_p20150127.ebuild 2727 SHA256 cfea92e05cd6fb6a58c58e299697450d455e5876c5d026118481d2561d2ffcbd SHA512 980d1955bbd6fe242e8f49e86ec5c5aa2b881f0168c46da1363c093d0750d3fd41c6d235f3cb6dca4d0a67830c52c65f680e4c11c43f8753cc6db0d04929d16b WHIRLPOOL 988290b674e9b298b93e2bbff4fab92ef638cd0e383bdd1ca14e6f053240111ddbf36a89ab8e201a486563787c58fac3459cd48da79cd4f709ea23a951654f15
 EBUILD netbeans-websvccommon-9999_p20150128.ebuild 2727 SHA256 8ad3e91c823cecbb461413eabdf6fe3269d69bf220f31a32a9c534377cf844e4 SHA512 8cee74f216cc02e1c30f4ac5320d02cfadfa11402863a7ef5361f8bae52665e45750c00456a1ff1498137799d023c0854131aa2a75136908b953a5805151fd08 WHIRLPOOL 09101336df2c609dea0ee1f9365b5bf9fb90dadc2fc7c2ddb31d24fe78ac36df48ce28bbb90e11f5bfe3d6ec80b2e5a6a44df825b45438a067d874733f1435b5
-MISC ChangeLog 159964 SHA256 cb503fc7fbfab3337cd0b9d0dd54de4dbe8f310f03954d036eb5289d6b1544e1 SHA512 fec0eb11dda4093a81d4cae9312649d26afbc363fc346cfa49f214da93021026d9f350bffb2e59e165db4a6b40cb21b0916d688a02e650d6758774015094fb07 WHIRLPOOL 2777a2928a1788b9000db8e0f049a8e50ff5a4b498d9d2c3d887fa6a4e79f860584f15b15220dad415409938a2c8e45cd3f98015de66d0314f02b72cff126c0e
+EBUILD netbeans-websvccommon-9999_p20150129.ebuild 2727 SHA256 78168084354840fe9301c1c52e86da5cbaeb3f774fc9c5e3cfaa473f0f181d81 SHA512 168b0100ee90b9aa55dc2bb51140e729db050d1094ca5217f7b711572c99a14beaa119fb747b92cd908364e2f094af1fd6972bd81e55f7cc60f07f622450f71a WHIRLPOOL cea19b9b044d0bb06ed22c9bf7942075f71f8720b5406d0dabb6fefefcbead91670f015478a9df50c6b8e51d31f0260f69cf63fcfdd1a65ac2f5ea833f2c1bae
+MISC ChangeLog 160149 SHA256 92d6f0c6ec168ca0be69ca0d15d6fb07c3359a203b63601a39c77047237be545 SHA512 832b6763e3b5acb58a127c2953eaa1821455854e7890f36f234aae0b09347fc87caf6c3c77aea06abccddacf41cddf38dda5e36b889e9d16375664e40e25b700 WHIRLPOOL 851de585dda56d6ba3189cf5be0a2610ed7ecb5383776d9b84fb60740967205f1eec4fdad97d94a03f3ef67c75f43722aacb188a1ad278c1d5201b2a2448796b
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150129.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150129.ebuild
new file mode 100644
index 0000000..70fe2ce
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150129.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-29_00-02-36/zip/netbeans-trunk-nightly-201501290002-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 dbc4674..42c8adc 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_p20150129 (29 Jan 2015)
+
+  29 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-9999_p20150129.ebuild:
+  bumped to the latest sources
+
   29 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
   -netbeans-9999_p20141223.ebuild, -netbeans-9999_p20141225.ebuild:
   removed obsolete ebuilds

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 53ca6e7..79e7f2a 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -53,6 +53,7 @@ DIST netbeans-trunk-nightly-201501250002-src.zip 201455903 SHA256 a758db1b55fe99
 DIST netbeans-trunk-nightly-201501260002-src.zip 201455903 SHA256 9ee86145eb73ec82f7192d38f986f316e1fe604e77c27d2ef8d7734869aef4b3 SHA512 4ed99062c874cdaf336fd6a5fd5e7aaa52eafb25c710c14a0800639433dbb2d4998061f3d92dfa3896c8e909577a281523635e93d54edb080667713e432f9f54 WHIRLPOOL c1d53d25cd0bbe1179ef2acdd78f57a420f3f0ff239d7c988a39bc225b6d4d92ee09bcc8b583bf0e7be1e233f9cb4917688b6304161090ed69ed214e092bbcc7
 DIST netbeans-trunk-nightly-201501270002-src.zip 201460403 SHA256 60dfa824eb558b0f538f4ae578c8835cb47950830f1738a22641917b566df358 SHA512 137e8d4d2333ef39b9a6bc34fd56ee239b9573e098d6aa3b08c1f6130e7ea816816563b8750fb734c1b24835c9e8c5c661542045f08792173eda1309e2ec9145 WHIRLPOOL 288a5e89d0cb5849b881acecaf858f90dd6fbf6750eb64753328a7972a367481c64eb248ca7e7399d93ee12e1715c047cc0e04d34367bceca0af2b64153187dc
 DIST netbeans-trunk-nightly-201501280002-src.zip 201449292 SHA256 b09bc8e7245306558fe57aed376d11418d096349f010bc3c59c6dc5a0a1f5e52 SHA512 1d0d33fa15aebdc6aa362158c2cefef946728ead5827e96afa845d9fb57fc8894ccf34855817dc74493d6122acd704d913ae16b93a5b8f902f05b0527e6b51bd WHIRLPOOL 5e703502eb1100f3c8366669b385c48f440f422777ccd6c52166d3455c3910e6025d74f27a9e6714649fb135bb80c3139a7bd05da201b7c34d11d6a37abdbd8e
+DIST netbeans-trunk-nightly-201501290002-src.zip 201615638 SHA256 11a8edf7848e3ebf60edba96bacebc735b9ef150010692b6e78f41665ce61943 SHA512 974b9b35ecdab0a75201a08ae293a4e4d5245b9064c20a53d02e614a4ce4f315e0a4f49c121934cb1871f4247794448a3aeec1fce1bf1c15ff486a335a16402b WHIRLPOOL fbcde90582039d08e3001dcf51f48f2fa860d2a1da8f8fe4daa5b6d299bce04f5a0ccb343693aebf3c5261b9aa3dce5390ef2b4825068b52ef637ea27039c1f6
 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_p20150125.ebuild 7216 SHA256 0d89993e8cc37481475e8c55d929e6
 EBUILD netbeans-9999_p20150126.ebuild 7216 SHA256 9626c35a2093c580779076741f212628d9d05e99d458fde979bebb346339fbe6 SHA512 8ca0abea479db575ffe3f5cadf918a20fa893881a06a65fe2eb80c42f21499868c483fe955b6b66de1cf24a3ac9face01ac85b62b61012ca97be37573e89ad78 WHIRLPOOL d579b217f6d83dc8084c58e4e465270a73c9d5a8ac42d8cb6a7598db2e6fd0de2a8be44f7594bbd73cfe3a9a2ad90e05df986970c88f2eee745a886111a0e168
 EBUILD netbeans-9999_p20150127.ebuild 7216 SHA256 21174dcf4e4b0408e126daec19f45f45d07927599cab25ac308a466be89721b5 SHA512 f651bfd082753fa85b927143a3a3c6cb7d45f68abc4c797ccc7a4b53e9c45a8915101ed47000fe0d2cf1ad3152a255ce9690e51eebe15e1b5b039c93e2a3164c WHIRLPOOL 13b8f1b28b1e17536bf70d88243355c400af8479286cbf47e8c87417fcfbbfc1fe1d21947e2f3ebe5d4b01a81dc977147a6d9c8a167dced0746cb1e314820e88
 EBUILD netbeans-9999_p20150128.ebuild 7216 SHA256 8d214ee2575b7784d95333c5ac4ac5b8056a477f15a1308ebd0cd68dc298ebda SHA512 3ede6dc3e5cf6f31e5efce648a5abc5ee98a769469e35b6ef47f228d31527d99a81f79f641f18f34be20823343f4cea14a1ebe119b6ab295a6f0c06124ff1d8e WHIRLPOOL c22b702985163f41f02990996e68f78bbe2d432da1a9122c7093ff72586ee31f5e8135937654c090b6e704d356d59bf502e5cf3a56c1ab8c6f2f85bef8fb3c12
-MISC ChangeLog 136250 SHA256 de5a189214a7ea8d7cb7ac5060c7b32621c110c0a971728a83a3d448bf3e3d1a SHA512 6d311e64e2f7e4a515cefb85e3031e90119d3cdc5cee9e6de2a4081ced32934c54e4ecf313d441c4c6b57a7e961071a1a91604426e17d32d61dea6785901dd79 WHIRLPOOL 9ad51e5ac4483f7fba021fb90596e4522cd612366e4762d4124fb7160523ce248d69b0b6bb40decb0c7002f00b6420fe02ad36c4940d09f1af1ff743f0f9cf1d
+EBUILD netbeans-9999_p20150129.ebuild 7216 SHA256 0fbdfab70211fb1a24251c4f79345763de5d9e7c5b083f3f98206b63da21b855 SHA512 b952af20f044ebfb30693e987edb2990c45db21c25bd3d2fa087cdc467238f8a7c20985bf655a808ccb511060b7ac255fea3f648e0177c6c0165307d49c0a1ae WHIRLPOOL 710159d8722875efd716f22b9e2a0e3c8f7ac3d1040ab67a06357cbca5a369bc8d2756c110c4fe4025097431a64f57564469736290a5bdb4fec2117afd981f41
+MISC ChangeLog 136409 SHA256 957803e761cffb4cdecc203f9e597a847b0d4ebb0357a5951b02ee0a052970d2 SHA512 b9436b1351d621f44551c085838d05ed5a25a925c1d38b428f3a7c8af9c2e7c80309b15b791f2fc644b88ef9b16d9831fcf1bf440dea1d48c588ae56a816736d WHIRLPOOL 3a41ab0d332fa95e467fc6b5344b544a6de3e4f5aa50baa9a945fc35f3278a82191434c2376ea10f058c7a73305f6e77394049603dfdb3a163b32fc54ca26b02
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

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


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

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-webcommon/, dev-java/netbeans-javadoc/, ...
@ 2016-03-18 11:26 Miroslav Šulc
  0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2016-03-18 11:26 UTC (permalink / raw
  To: gentoo-commits

commit:     bfc27f1d9f004bf13488b847b3bfcbe9ec373641
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 18 11:26:38 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Mar 18 11:26:38 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=bfc27f1d

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.2.28

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 43ddec5..6302228 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -22,6 +22,7 @@ DIST netbeans-trunk-nightly-201603100002-src.zip 209888833 SHA256 f13cb9c43038fc
 DIST netbeans-trunk-nightly-201603150001-src.zip 210021503 SHA256 b0ea2aa58d93a667cc83dbec9a9534b4693ac7a8d570682ebcda7fb4bc33a1ea SHA512 a06b780cf27f7e83964261d6a2dbb147e99bb353bae9d5bec0fd6bb8ca3fdc564f2da54eaa66b343089f854cc27e808846699fe691e047a4a04a1b1444143532 WHIRLPOOL f135bfcef0de549b44eeeac35f2cc1e49d4e8b21c3d254398cfd35bb04808c3e55e9fe9953a5b96c8acfc23a331d26f9fb9f9f20ec14ee93665aadd072c29e1f
 DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c89599c9d9ca42493a477d2c2d11cae3e5e1e7b6c3876bc953a SHA512 be94af9676f2559c959c213683ff23720798fe3fb8c5849e7d3422a89ab7de011bcd7eb90d7d480789461a8270ed6c2cbac6536f4ba5b5196472a73c1ac3ce73 WHIRLPOOL 53d7422959ba36b979d9b37333863479f811697f880f2e1c1861a1ff83a735364b265c32314e5ecc4a08e94f1478da3e74ed14112bc5a09b5c7b6b9e97385d4d
 DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
+DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 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_p20160223.ebuild 3384 SHA256 5daddd74a5e1320640ad7a6cea09ffce0c25a669d6fc44f8352dca5ec286a155 SHA512 dd285243d5a43cf86b74914c9b5ff70ec0bd07977e9288244202f17d19092d47bf4724298c3e9e3c75d8b9c3ec6d99fbd1999226c91aeb2f09266eaea4fc8d1d WHIRLPOOL a9ce0642d90e2a2870d0992e7198f18a0cb8d1523efca5d553320be5ed4f9ae6c408f34200bf354ce577c14065f35de81ada7c22a1ae57872b496f2d9e8001da
@@ -42,4 +43,5 @@ EBUILD netbeans-apisupport-9999_p20160310.ebuild 3384 SHA256 47745fc20189deb3566
 EBUILD netbeans-apisupport-9999_p20160315.ebuild 3384 SHA256 eddc33cae34a58ddb64298e66212de4d29db8627adaf54d66d722b21cb5527b5 SHA512 47c01ef73997196be3294ca032bad5796609b570e908e6ab597ae858a8b4330e7a2b991ae0edb3b0e6df2d952ed508f1b475d3f2aa026b944469575d69c9cecf WHIRLPOOL ca0b2a6abe668df0f92f80d49b7299f3c042fffe68b4f2b68d897bda172ff931b124249cc7bbf5ae39545289e2f29c55dc6a9be4b3c09cd2fcfa01aaec72be06
 EBUILD netbeans-apisupport-9999_p20160316.ebuild 3384 SHA256 2b0dc286cd42bd6d61b58c51f737ea5b4e5a4d827948d0ef7b2b33768f2784a2 SHA512 098f86b858fdf6fe8434bc47f43be7a44191ca81cc8b0e435db1f2e8c22d12023d062b18805cff7bb7aa5ddfc86f7026a22b9569c0366a2a8ec99eaece6cbf1b WHIRLPOOL a2dda23b09b40a15495b2386be00aa1e747bc6692af8cf54421a0e58a17c557c354cd8a4bca2bfb92b2c8f5a48db0513ca5c527b5fd25162be9323d27a1d2f21
 EBUILD netbeans-apisupport-9999_p20160317.ebuild 3384 SHA256 1a071cabfe5f4815a401c0024b9c755e721528c6aa08e27f657003f61d43515b SHA512 ff5c867796d03be732d0e4877c2098c4c7287b7c140416b1f8e257492b5cab8c39eb355ccd28fbbe3cfcf1f0ccbf4b55d774608a76da8042d716f8a29ef5004e WHIRLPOOL 4b5ddeede7455c8163d340d95f40ebdc815bc64c26406b693991c731f56b512da3623b715727f7a517dce15d3a9292057cd3ff0f02d61fee60ad4b80365dfbf9
+EBUILD netbeans-apisupport-9999_p20160318.ebuild 3384 SHA256 a4bf2510eb7029190e63338a58d9527f53b1dbb65bcc9502b782df59d6faa157 SHA512 cb0795fdee3eded2db10d7da62009d0569315a15e2079520fee27077de26d576649c57345d93318837d4640dc3f095d0c8728a56c18bd0633b1540de64065495 WHIRLPOOL 0b04a21f24b2761b1c348053b0beefc87bb5d4151c91eeb9a348ef972e3a8e8671ec12e229437c8a62e708074844194759949964e74a4a57e05de8f72783d16c
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160318.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160318.ebuild
new file mode 100644
index 0000000..ba5e18d
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160318.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans API Support Cluster"
+HOMEPAGE="http://netbeans.org/projects/apisupport"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-18_00-01-48/zip/netbeans-trunk-nightly-201603180001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r15-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 86cf51c..7f9cdec 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201603100002-src.zip 209888833 SHA256 f13cb9c43038fc
 DIST netbeans-trunk-nightly-201603150001-src.zip 210021503 SHA256 b0ea2aa58d93a667cc83dbec9a9534b4693ac7a8d570682ebcda7fb4bc33a1ea SHA512 a06b780cf27f7e83964261d6a2dbb147e99bb353bae9d5bec0fd6bb8ca3fdc564f2da54eaa66b343089f854cc27e808846699fe691e047a4a04a1b1444143532 WHIRLPOOL f135bfcef0de549b44eeeac35f2cc1e49d4e8b21c3d254398cfd35bb04808c3e55e9fe9953a5b96c8acfc23a331d26f9fb9f9f20ec14ee93665aadd072c29e1f
 DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c89599c9d9ca42493a477d2c2d11cae3e5e1e7b6c3876bc953a SHA512 be94af9676f2559c959c213683ff23720798fe3fb8c5849e7d3422a89ab7de011bcd7eb90d7d480789461a8270ed6c2cbac6536f4ba5b5196472a73c1ac3ce73 WHIRLPOOL 53d7422959ba36b979d9b37333863479f811697f880f2e1c1861a1ff83a735364b265c32314e5ecc4a08e94f1478da3e74ed14112bc5a09b5c7b6b9e97385d4d
 DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
+DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 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_p20160223.ebuild 4790 SHA256 bbeabbad72c5a0a2ca07c4c9c1d7573788751cc376176375df8de4e7aba4eeef SHA512 34848e0c3bfc54ab1a616d3a77b2d786eadd776a791cfce50c647535ad36e230635f6e8ebcb05d6c5e0a9d84256d76cbe39bb82a409827e27df64ca44a6e39d9 WHIRLPOOL a60479dfdea44d40d74e351b58f33322e921046a9e1a8a47e70b0df2739672a072e6d55f3a3ae7fe0de4a45edc528cd7381fc80142a1762e52687e23ef024aaf
@@ -55,4 +56,5 @@ EBUILD netbeans-cnd-9999_p20160310.ebuild 4790 SHA256 a1ed7e56f6c54d71dd8ba7ca05
 EBUILD netbeans-cnd-9999_p20160315.ebuild 4790 SHA256 8c7be18ef04ffda9d3ba73a864bd6751a3ac46b411e9a2c79abb0ca273114a4b SHA512 b71669c247b9065aa64e101cbd1fcbef65fa56110687e0db6876e5d93103eeb0b4ec52a178538542e335b950df7154844aa72572652ddecce936d319becfbc0c WHIRLPOOL bdf5fc8b4b5532cd58df1c56d665978ab96d8971670eb4b1fd897cd0a59a6dd9a76b4b50a6ab6273b13afba3b17034276484b0f5453bb74da65f05ceeb5f03f5
 EBUILD netbeans-cnd-9999_p20160316.ebuild 4790 SHA256 58fd8b3ccf7caf0f0e98d40c46498cbafbb4e3c3dc3c0069c59799689efef8b5 SHA512 a2a109f10d084aac30a7e6aa3d1c665fac9a3e14abf26f3b2bf8e00ec1bc405f54feca62c53e0e991516f380edd961e3832282364eb56f861c1d6b941df59cf4 WHIRLPOOL 60ba0bb3fa15ce41c46ea9df3e8bf766794269f3c48f658519abdcf5eaa2fa026e77f9a4b91151e79bf5991a39714b334b4c4cd45c939969a0c01f4aa20771ed
 EBUILD netbeans-cnd-9999_p20160317.ebuild 4790 SHA256 9033abd5562dc6e6da55eba4d73dce9eabf25b49f3da473e6eaefaaf203f261d SHA512 76aa042f77ef990617dbc9f4f719a2048dcfe32e5ea38ff4d17a0b7ea2c4dc8ff00ed0b5471f53882f0bbe4fc04980e8557dec6b1869b01cc7469ac0a9a9b39e WHIRLPOOL 1832ca113daa66150afdcd73c2af6b7dacb60b70ed298151ee13517dd4d2640a6b2607102573fbcbf50b7df30086ebaebef80aece1ffcdc014d5efe6a856cf32
+EBUILD netbeans-cnd-9999_p20160318.ebuild 4790 SHA256 df1601c74401f28b42e367cf55f93faf5c57eb1b342d5aaa47061dfac73b70cb SHA512 70848039871673c546e6956b30592628b91aa6510774f557a654cc06b0d09af69626573f3df68be91cbaa9de91c087a07fbff7370bace1dcec5731c5ec563a13 WHIRLPOOL 46de36701caf7f46ca010ca4890289d2dc74bbb6411194accf584ef68827f18bf92ef005fbf5f18abd51b36bbd0556635a933ab84d4fc2a47dfa21a9eac75c03
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160318.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160318.ebuild
new file mode 100644
index 0000000..074cd42
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160318.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans CND Cluster"
+HOMEPAGE="http://netbeans.org/projects/cnd"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-18_00-01-48/zip/netbeans-trunk-nightly-201603180001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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/83DB4623F3B6A93E0B36BC341C3C1B926749ED67-clank_0.3.6.zip
+	http://hg.netbeans.org/binaries/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip
+	http://hg.netbeans.org/binaries/E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip
+	http://hg.netbeans.org/binaries/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+# These files are for remote development and debugging
+QA_PREBUILT="usr/share/netbeans-cnd-${SLOT}/bin/*"
+
+CDEPEND="~dev-java/netbeans-dlight-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	>=dev-java/jna-3.4.0
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.cnd -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r15-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}"/83DB4623F3B6A93E0B36BC341C3C1B926749ED67-clank_0.3.6.zip libs.clank/external/clank_0.3.6.zip || die
+	ln -s "${DISTDIR}"/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip cnd.discovery/external/cnd-build-trace-1.0.zip || die
+	ln -s "${DISTDIR}"/E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip cnd.remote/external/cnd-rfs-1.0.zip || die
+	ln -s "${DISTDIR}"/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip cnd.modelimpl/external/open-fortran-parser-0.7.1.2.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r15-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.jna/external jna jna.jar jna-4.2.1.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 e2fc9e9..65f5a8d 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201603100002-src.zip 209888833 SHA256 f13cb9c43038fc
 DIST netbeans-trunk-nightly-201603150001-src.zip 210021503 SHA256 b0ea2aa58d93a667cc83dbec9a9534b4693ac7a8d570682ebcda7fb4bc33a1ea SHA512 a06b780cf27f7e83964261d6a2dbb147e99bb353bae9d5bec0fd6bb8ca3fdc564f2da54eaa66b343089f854cc27e808846699fe691e047a4a04a1b1444143532 WHIRLPOOL f135bfcef0de549b44eeeac35f2cc1e49d4e8b21c3d254398cfd35bb04808c3e55e9fe9953a5b96c8acfc23a331d26f9fb9f9f20ec14ee93665aadd072c29e1f
 DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c89599c9d9ca42493a477d2c2d11cae3e5e1e7b6c3876bc953a SHA512 be94af9676f2559c959c213683ff23720798fe3fb8c5849e7d3422a89ab7de011bcd7eb90d7d480789461a8270ed6c2cbac6536f4ba5b5196472a73c1ac3ce73 WHIRLPOOL 53d7422959ba36b979d9b37333863479f811697f880f2e1c1861a1ff83a735364b265c32314e5ecc4a08e94f1478da3e74ed14112bc5a09b5c7b6b9e97385d4d
 DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
+DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 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_p20160223.ebuild 2968 SHA256 5c71a5d3b3984fdbcb1d2226f70acfb024f514090341bdb21320f294aa5f710c SHA512 53f8dd01002daef65a7aafaa1dcd8d16f5fa6e6679930eeea987fcfd0c1dd44eb1997eb4f765cb8a017eaf0549c27ceba876e9c3b25610ded868da8df1a2fb78 WHIRLPOOL ab9074b255f9e0041148f5a9d715a6ecff2ea3ce62b931f7eb588b3e71335c66ccd080bf01f8d14d3ad1608f790a3d47b61bef0bc1077ba4f3f667e538696bd0
@@ -45,4 +46,5 @@ EBUILD netbeans-dlight-9999_p20160310.ebuild 2968 SHA256 6fb3b94a094e7925d7a107f
 EBUILD netbeans-dlight-9999_p20160315.ebuild 2968 SHA256 8a98e95657fb45aecde854427cc59ffd63787daf402ed49c93b2d99c8ce289f6 SHA512 d69431ce29702503da18b3b39c5fc7556f59d8e0658b72b7459992ae38a3f464091a6aadef1fa6cf6bc4aee771108a1d83c92fe2d92d023278db732c997274b8 WHIRLPOOL a885d9810d46bad6f431ce5810dc0644c26e2d87377a6efeff96d236322f441257bbab2d57f3ac27dd5abe5ae830a92f587f665c9a247c000e422e2847ebe42a
 EBUILD netbeans-dlight-9999_p20160316.ebuild 2968 SHA256 6d1c43401d93014a97b07f85faa1713559797e52aa39c1d449039f93297d1cbe SHA512 31133f6dfe5ec0e2de41b93368499816cfdd6f105ea59cd860ce9dbd9564c4d086ff4589ee94234905ccb83e9831ee88bcc0a1c17a7bb1df7070549295ac8811 WHIRLPOOL f597bcd667d5b7aefb32bb74d6d667e877bfb34d239229fe6692f93f9da6fc3cc47ea7bbbf2991e870e5ad39e60409d2ec55b7a43cbf70086352160948b9970c
 EBUILD netbeans-dlight-9999_p20160317.ebuild 2968 SHA256 8915c4c2d0aa3cafe72d4b55c44cb6db5579e97f47717794c615b6df5343650f SHA512 ecda9c9ded00fbddd9da5b4e381783f10ef2b58e8b86e2128d6964c219539508bb80123291e91647cb65d33ebc4112117e1469390513db4429587067a9d79a42 WHIRLPOOL 8bfa9cd428c26c9e1c47a9b5363634f479671d2aebe3d3f42963ada537d467b57d1ba729a999c632a80170947bfe6fb811566db73c369c2326648b398622a79c
+EBUILD netbeans-dlight-9999_p20160318.ebuild 2968 SHA256 9fd185fed7b6965963c5b533347e7d63528235af613dadc2f348ab81cbfbe874 SHA512 bb1d6a4e63daaed2909179ba75375e7da5edc5ca73736166d2938af7094863d528eebdb197b8575abaf9578c10abc46be3d05d1b64973348db920568a7f30553 WHIRLPOOL 1f5ce94abe9a9202c8cfd11ffa6254e7b00ec3d4fd427436ed4aa3fb843fac6f70e98275f154fa4d78023805b73cbe67cee4135660e5f67f4ea9e925a4ce3770
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160318.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160318.ebuild
new file mode 100644
index 0000000..8c24584
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160318.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans D-Light Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-18_00-01-48/zip/netbeans-trunk-nightly-201603180001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/0F89C62CA701D20BA9A9A526D4D017888C3B5A65-fs_server-1.0.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.dlight -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r15-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/0F89C62CA701D20BA9A9A526D4D017888C3B5A65-fs_server-1.0.zip dlight.remote.impl/external/fs_server-1.0.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r15-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 dea5b4e..25ab488 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -54,6 +54,7 @@ DIST netbeans-trunk-nightly-201603100002-src.zip 209888833 SHA256 f13cb9c43038fc
 DIST netbeans-trunk-nightly-201603150001-src.zip 210021503 SHA256 b0ea2aa58d93a667cc83dbec9a9534b4693ac7a8d570682ebcda7fb4bc33a1ea SHA512 a06b780cf27f7e83964261d6a2dbb147e99bb353bae9d5bec0fd6bb8ca3fdc564f2da54eaa66b343089f854cc27e808846699fe691e047a4a04a1b1444143532 WHIRLPOOL f135bfcef0de549b44eeeac35f2cc1e49d4e8b21c3d254398cfd35bb04808c3e55e9fe9953a5b96c8acfc23a331d26f9fb9f9f20ec14ee93665aadd072c29e1f
 DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c89599c9d9ca42493a477d2c2d11cae3e5e1e7b6c3876bc953a SHA512 be94af9676f2559c959c213683ff23720798fe3fb8c5849e7d3422a89ab7de011bcd7eb90d7d480789461a8270ed6c2cbac6536f4ba5b5196472a73c1ac3ce73 WHIRLPOOL 53d7422959ba36b979d9b37333863479f811697f880f2e1c1861a1ff83a735364b265c32314e5ecc4a08e94f1478da3e74ed14112bc5a09b5c7b6b9e97385d4d
 DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
+DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 EBUILD netbeans-enterprise-8.0.2-r1.ebuild 15075 SHA256 41d376117ad1d8d59c8194debfd29dc42f5fd4de70aee12a2134ec143a604dda SHA512 4cd9de88e9a401cc0be88e3e2605abc411c47307818376b2bcc00f9ae570b21324f2bf00fd83e819bfa076da0fb07811fa1f0f9362a6cd0ee05b63221a199000 WHIRLPOOL 73f4518c14430fe7aa3614ebf1b11a06ba0e9bce7479af2770db3a114f149d575a16a655218f757ed416b5149228ac56dac700f5a8d5e034cc838bfa4092e636
 EBUILD netbeans-enterprise-8.1-r1.ebuild 15888 SHA256 d4c04ccfee01a46819020cb7cf8fd8297618f3c0431ae2d9dd7eec8131f988ab SHA512 6c7c39c378cb79d3f382cb80d07710a8c5233aaf0df8fb58889ee6aa6bde73624efa6aa49b43f84105685094a7aff89e4b6367ffd1fd113da27b42d50d07e983 WHIRLPOOL e678e2a6957e428c1b6e51469c0e7cc6a08da2c797f1575b6bb660a7f3281c00f071179de459e27c983304915b005baaf94ad4fae0a4c08162f218bf53b7d821
 EBUILD netbeans-enterprise-9999_p20160223.ebuild 15825 SHA256 31e2790d5ab2f3cf60e63f961bd691819376197b39ad8280589d7002d2f2faea SHA512 93513a9390f16e5748fd9b51a219f9c7200206fcf3c4f2f40707549350b85a1af11151fdcd7d51cd97dfe27f4d2f9d92da6226bb3dedc23cfb9dd01bb1a45b33 WHIRLPOOL 9aebe0834717768a3f2f140c3b6af9d1c1d59036775f1ee27803b6db5ed3a863b6b1752b5c3a59cde27117ce5c0e09e6d74c4c4deeaae4ec243ecce328a8aced
@@ -74,4 +75,5 @@ EBUILD netbeans-enterprise-9999_p20160310.ebuild 15825 SHA256 b3caa6ca50dfbb850e
 EBUILD netbeans-enterprise-9999_p20160315.ebuild 15825 SHA256 c9504a69cabdb1d947544cfcbe1c7ae2c997df698c2158004268aacd70a25d9f SHA512 f92fc4abd2932697dc5e36ab0ba7d9667e5addd8b1fe5cf73c044a522aabe81db628442214bbb25e8790bf3a3af8915d2b5a1256fddcf8738a42179a49921f31 WHIRLPOOL 8bfd8dbb10efa442ee2be6f1742b03e1cc0eade1c9f78d2f63c7b0caa9813e91041c87794dea30e47d3339511ae95ef0e8b556fb53729a017bc14b57aad7c1f4
 EBUILD netbeans-enterprise-9999_p20160316.ebuild 15825 SHA256 ff3f2c1a3e30aacaa3dd133f1c183b74df10890d54405aa05ebd3cd34d225c18 SHA512 34ff07b9414e699db1871da94a0cdbb8b951e5bac8eb40ba4ffbd9fdef6715a93f20df4a8953b961a8e48cf579b58f93c62314b1c9a33511f62fdec9dab1033a WHIRLPOOL d44ee053465e092d53349137252e1d06cf82a6964cbb9b018ea819702cd17fc788fb7f602f94a844abc87e99abd24445a4bd23d5051526431ce47bafcc7aad2e
 EBUILD netbeans-enterprise-9999_p20160317.ebuild 15825 SHA256 4f2fa626c07ffeb3e1cb40e3c5c4087e30a16d842b8d7394568074bad37f1327 SHA512 2d75b7ae04cde94528f22e67661621f6a2128d9ac4cab2666f7d8b7dbb67c543202d391fec60587cf41b7c4ba77df7d223b0e63581606fda4fd9a74d2b284860 WHIRLPOOL 4957421c384f39bf9068af973a6b633d8293836ae3fafe4dc048cf0967f77d5445682591e9bc2e627230e8af559aa32ed250e3d86d065b17dc44c0683befc259
+EBUILD netbeans-enterprise-9999_p20160318.ebuild 15825 SHA256 e1153728673703675acd0655006d6d4414c130d47d1ef48ba3aa282e12ad2db4 SHA512 1f78c2496cbd01ea5ce4a06d626d978228ef75895508d4e88b7a3410a5ad1c2771ed53e81598a94e7adecb8744649d3314d8c5b0dbc05d274e7fb2eeac7ebf6c WHIRLPOOL 4acc2564cb3d2b6f2639000a673e83ca8830482dbfecf4b88db28a617d636b1b05faf45aa1760e82aa3fe4eb56cc07015ed22e7924fb8065391e7de3341f4a05
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 629c62a..abcf252 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -22,6 +22,7 @@ DIST netbeans-trunk-nightly-201603100002-src.zip 209888833 SHA256 f13cb9c43038fc
 DIST netbeans-trunk-nightly-201603150001-src.zip 210021503 SHA256 b0ea2aa58d93a667cc83dbec9a9534b4693ac7a8d570682ebcda7fb4bc33a1ea SHA512 a06b780cf27f7e83964261d6a2dbb147e99bb353bae9d5bec0fd6bb8ca3fdc564f2da54eaa66b343089f854cc27e808846699fe691e047a4a04a1b1444143532 WHIRLPOOL f135bfcef0de549b44eeeac35f2cc1e49d4e8b21c3d254398cfd35bb04808c3e55e9fe9953a5b96c8acfc23a331d26f9fb9f9f20ec14ee93665aadd072c29e1f
 DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c89599c9d9ca42493a477d2c2d11cae3e5e1e7b6c3876bc953a SHA512 be94af9676f2559c959c213683ff23720798fe3fb8c5849e7d3422a89ab7de011bcd7eb90d7d480789461a8270ed6c2cbac6536f4ba5b5196472a73c1ac3ce73 WHIRLPOOL 53d7422959ba36b979d9b37333863479f811697f880f2e1c1861a1ff83a735364b265c32314e5ecc4a08e94f1478da3e74ed14112bc5a09b5c7b6b9e97385d4d
 DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
+DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 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_p20160223.ebuild 2913 SHA256 6ff5f86044c351beff5dcefb88b1789dd0e92ce6202a958ee0e3e8bdc63604b8 SHA512 4a9c5cb7f7b45be903cc9005bd179dd7ac402f444669d0297cce4c4d5cacdab0e34db98a75795e29ec80a3b451607f0ef093e3bb58af8293a86caf6b876ca1a1 WHIRLPOOL be19765e738e8cee8298eb87efbe40dc3e037f6d1814a605e339dcdc4b4109cc20156c55b117c8b0cdc3532e2347b78d428729c87427bf1aba2559dc2bf10adf
@@ -42,4 +43,5 @@ EBUILD netbeans-ergonomics-9999_p20160310.ebuild 2913 SHA256 c23b37c04c4fa1f3222
 EBUILD netbeans-ergonomics-9999_p20160315.ebuild 2913 SHA256 7c08e624e7790cb90d4ca4f06bbbcb1acd1e33ecb00688e16415328718a1600b SHA512 08e39ce9eed3c69049c27a6fa3b66cd68a59c08f46ac474c9bed0b86fc6d496920e1cf1b1ebbdb25a8c1f34c3ef3bcb0b8654520ca407a90fc52186560caad5e WHIRLPOOL 5d275f1cd5d2673edee724d0c9e3964adb693d34ded92dd4d3d48bc6e159ab4364490e549e48466cc7225acc8c3e1398dafb4e1fb76571ea267e40c076415e59
 EBUILD netbeans-ergonomics-9999_p20160316.ebuild 2913 SHA256 fdd9d8564ee09ebcd6aadeb102f6db8f94206447b889a60236738f393712e3dd SHA512 0831595349999afa3568bbb2f7b523feebc4506836e6c9d050fed54af42eb4df04754d8389905c5d6bdfd11acdf305a3750c6e0f4aed8c3ed1820101a20630e7 WHIRLPOOL 3ea7aeca83746382a8445d95828486a0f439f8fd9c0094b96f1894ade992dff28f530a2be0b9a55b797dc8615d57e19e73530c192c7d10e70112b49a076bb292
 EBUILD netbeans-ergonomics-9999_p20160317.ebuild 2913 SHA256 52f165b1a959e0d0d1d49ed05825bb48851c8c61a2003b0373dacadd8a7a7dfc SHA512 f18c58e496bc0d2cc1865f3771e1ea33253758624bea93016092a4f8eae3c88df25530ce39624ef3b803ece62afe5ded9ff302c70c5dc6ac8945528b5c5e787c WHIRLPOOL c04d952c243d0e0be48d70d4fa92ad8cbb36e8191d44cf49ae0ec3f8228c71d3f691761bb2dd0539ca6ef3da79807247c439a645fd0102a9b07fb5cf034edd4d
+EBUILD netbeans-ergonomics-9999_p20160318.ebuild 2913 SHA256 2edf1ef963b14ced4503f9a90d5f984ea8c5b09124f46072ace319e2e6ca9f99 SHA512 8fff57c0c944ea948b82f2a64d01095259079e754baa5ce65fb4d3284981d2c57f2778537b4af4c7978137259bda90f332bde95106397f28827533d74967386f WHIRLPOOL 0f4a9588486f1661b795fca54479ecc9cadcb371712af38ad56473b5d7f1739c90fb532e7758a8b5085d1777ab4f422b255077dbe435f563f9564c0ae6b426e8
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160318.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160318.ebuild
new file mode 100644
index 0000000..40d9c7c
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160318.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Ergonomics Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-18_00-01-48/zip/netbeans-trunk-nightly-201603180001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r15-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 7628046..ac86f30 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201603100002-src.zip 209888833 SHA256 f13cb9c43038fc
 DIST netbeans-trunk-nightly-201603150001-src.zip 210021503 SHA256 b0ea2aa58d93a667cc83dbec9a9534b4693ac7a8d570682ebcda7fb4bc33a1ea SHA512 a06b780cf27f7e83964261d6a2dbb147e99bb353bae9d5bec0fd6bb8ca3fdc564f2da54eaa66b343089f854cc27e808846699fe691e047a4a04a1b1444143532 WHIRLPOOL f135bfcef0de549b44eeeac35f2cc1e49d4e8b21c3d254398cfd35bb04808c3e55e9fe9953a5b96c8acfc23a331d26f9fb9f9f20ec14ee93665aadd072c29e1f
 DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c89599c9d9ca42493a477d2c2d11cae3e5e1e7b6c3876bc953a SHA512 be94af9676f2559c959c213683ff23720798fe3fb8c5849e7d3422a89ab7de011bcd7eb90d7d480789461a8270ed6c2cbac6536f4ba5b5196472a73c1ac3ce73 WHIRLPOOL 53d7422959ba36b979d9b37333863479f811697f880f2e1c1861a1ff83a735364b265c32314e5ecc4a08e94f1478da3e74ed14112bc5a09b5c7b6b9e97385d4d
 DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
+DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 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_p20160223.ebuild 3377 SHA256 d0c25e373788ffe46d79bae6d6d94588c767d48b9c37935cdfe8f5bed5ca93aa SHA512 4341073759bda3e69ca842de17b00235cd105a358a5a9c13386ef5aef3592dd632c5ccd0414bacead5537b065782ce1d4ac68ceef9f90ce63d46489aab7e3a76 WHIRLPOOL 383677b45d93edf0de469d73b148a9a24e9f02d2aec19a838065de72ea3199acbfa9af986f7e8d5600c422c7c2cff0b56edd065693c9e2d456a6e86b7e3e827f
@@ -44,4 +45,5 @@ EBUILD netbeans-extide-9999_p20160310.ebuild 3377 SHA256 adf9588306d0ec3643f5ffb
 EBUILD netbeans-extide-9999_p20160315.ebuild 3377 SHA256 858ca1db2453181db8451fc5d2fc2493447a1f68b2568bcbc2d3b50873208629 SHA512 028f06e4674be683bfeae51b4a99ce531720e9ec67afc631020e2646eede542270a8a84aec885cacfa9bf92d583c181e53e2fddab1d4629ab368dd825c424420 WHIRLPOOL 89a300b698150e71a1f3ed0d7faefbb1248226dc4952ee680a84dab330d5a6544a5c39a1a529ce1ea3d3e83f02dc888be1f219ec5bf6cb9ca8b1970e6aeebc03
 EBUILD netbeans-extide-9999_p20160316.ebuild 3377 SHA256 109463728e454d659cadbc7e828810a2951775ad95e0c80543a1498a28f561ed SHA512 9aea6ebe66ec5d55402b53019829fca6e22b6d6c0ebcd91d967d487c7c8966cb37214b601ac3955f1760de121fc6d20aeb253d97aa477c7f800b7df04a6544fb WHIRLPOOL f492f5a70706a9187931fc3c989de8cae35035e63475ac924c7747238f0466d54865fa721da064d210cf5acaa4f3422db3f0f7a1980a03f6317e4ffe65ba0691
 EBUILD netbeans-extide-9999_p20160317.ebuild 3377 SHA256 f68c3456143ad28df02562514720a6baedeb7fa67223e43a979e937c1510bb8b SHA512 4ef90f0dac9ed68e2c071a3c75fec783434c6e506ae8a92e4e332725b11e063585e1ba983435ce2f526baaa42f37f777059eb79979700bfbed00352b860d3ea9 WHIRLPOOL e1db60ffa1dfb73e9c2b24c202bbe23ba0c10285c0d8cd76d9b717d0f3668cc229e4c8cce99bc8107473640d00c1fd550d5e73af140148ca6650e6d0c7e045d6
+EBUILD netbeans-extide-9999_p20160318.ebuild 3377 SHA256 b9a02da0791616ec505c1c2a2db90dbb61f96e916b13e1dca95935492bec7a9f SHA512 e49d40d1d4c10171f864b175ced60552d0840c8b226579d682d9b404b53532715a3541a1bcdf91f57b8e5cf9ee97201b2ee7e5a07dcfaf5f8601fc746402e4e2 WHIRLPOOL 9892c5c4d6c2729f6454912e48b1e42c0bcb4ca3aaa5693ecdb5ef2a31ee71e89de42093998a7e2523106e5eb5052715d559226c72c4decfe08da22bcf28c14b
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160318.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160318.ebuild
new file mode 100644
index 0000000..1d4c994
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20160318.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans ExtIDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-18_00-01-48/zip/netbeans-trunk-nightly-201603180001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-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-r15-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 c7e475b..0525036 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201603100002-src.zip 209888833 SHA256 f13cb9c43038fc
 DIST netbeans-trunk-nightly-201603150001-src.zip 210021503 SHA256 b0ea2aa58d93a667cc83dbec9a9534b4693ac7a8d570682ebcda7fb4bc33a1ea SHA512 a06b780cf27f7e83964261d6a2dbb147e99bb353bae9d5bec0fd6bb8ca3fdc564f2da54eaa66b343089f854cc27e808846699fe691e047a4a04a1b1444143532 WHIRLPOOL f135bfcef0de549b44eeeac35f2cc1e49d4e8b21c3d254398cfd35bb04808c3e55e9fe9953a5b96c8acfc23a331d26f9fb9f9f20ec14ee93665aadd072c29e1f
 DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c89599c9d9ca42493a477d2c2d11cae3e5e1e7b6c3876bc953a SHA512 be94af9676f2559c959c213683ff23720798fe3fb8c5849e7d3422a89ab7de011bcd7eb90d7d480789461a8270ed6c2cbac6536f4ba5b5196472a73c1ac3ce73 WHIRLPOOL 53d7422959ba36b979d9b37333863479f811697f880f2e1c1861a1ff83a735364b265c32314e5ecc4a08e94f1478da3e74ed14112bc5a09b5c7b6b9e97385d4d
 DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
+DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 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_p20160223.ebuild 3416 SHA256 cc089bee4a8b4574f642ca131ed8c7bfb55588938f452ccdbb6d06fc46833085 SHA512 4ae13ae2b1b43c5f53c3119114bc184974cd402bf9d81d76a369a399d3402a6052ef650f016765310111b3be17a756713cab63a03f6e58056a87c72f1e1bd981 WHIRLPOOL e97e7198d220497f158caaf02f66aa606b05032484e9284d202637ff6d08da8a655a9e2aa5f911748fa3f3ac5b170674b8d4993bcc62d4e0ae2a73b545f59554
@@ -44,4 +45,5 @@ EBUILD netbeans-groovy-9999_p20160310.ebuild 3416 SHA256 208f949aea7ef85428eb240
 EBUILD netbeans-groovy-9999_p20160315.ebuild 3416 SHA256 707fb6ce8a2effa220886a24aeaf87a203dcd3e30e50d3d39fcc23ccfda38a29 SHA512 f2a65c41e493379a57754c6c0740ba517a428c1a420cd26e8622bfb8e370c1e59225398ba5a48826724d1e1ff02d8a59b28e38039b74391ff878fb5759ae3c4c WHIRLPOOL 05ba822637cb1e1dae8276f436ba82dec7f6c05b3b4afd64a663f2a80dcee584b5b51d85bbb6698d1b0dae9d12aa32f6af1ec0a5ae235dc144d2d65f8dd0679c
 EBUILD netbeans-groovy-9999_p20160316.ebuild 3416 SHA256 98385adf344a4b4ebadb33af9ab0fdb2fcaf0170f33a985b651e0ac72f2c6bfe SHA512 c1ae8a64da34f06296dfb46bbcb94e08183454d600e510d4737533674033196a6f94d125f7d30cd26605a6ea6ba6696f731886c61f406f955ffd6064850f81c4 WHIRLPOOL 85ac1736cd80ce349b53219e7cc82b5f559ea741f4416bd0c0579a0361f4d38ae642ccc3f014cbc1e81445800a4c7f297cf1b1388c909d0c066e2dcde3841eef
 EBUILD netbeans-groovy-9999_p20160317.ebuild 3416 SHA256 c9c15ab6709d20709a6375fff328411d9cca28ab714eb05790fad5432a9a5514 SHA512 97202604f1e4db1a816a1b08fa41565c92c168a7ddbbaf09206f6f00ffdf484ecf5156f9b1985db1e8fda56a98f562192285e86300ff6703032f1ab3704aad1d WHIRLPOOL 8e1732891548a904861eb3be803a4e75a4f1cae2dfa547a07266336d3f1c3d324cf217c4536edbc14bd7e14f23425875c5a17f5b5cdf8eeda075e3b018cd7f36
+EBUILD netbeans-groovy-9999_p20160318.ebuild 3416 SHA256 4a926c35e0df3789d6403a6fdf761eb6f5d70c7634c3957b0d3ea8473bd987af SHA512 fb676c7154871b994cba18b40d70e12e9504f53465d3be27e095ee2a2702982f520fbafd3296e6f5cdb88c3cd57327caf6e59421c847fefdfdc79dd1fa38848c WHIRLPOOL 4589efafa72d8ffb90243e758597ae172d4c4d6e33e060b2210b3d266505235f09b63d3ffa7bc02571f8522ec3480c258a250e74184b6a3c76552b6aaee4041e
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160318.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160318.ebuild
new file mode 100644
index 0000000..4cdd86c
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160318.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Groovy Cluster"
+HOMEPAGE="http://netbeans.org/projects/groovy"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-18_00-01-48/zip/netbeans-trunk-nightly-201603180001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/01730F61E9C9E59FD1B814371265334D7BE0B8D2-groovy-all-2.4.5.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.groovy -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r15-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/01730F61E9C9E59FD1B814371265334D7BE0B8D2-groovy-all-2.4.5.jar libs.groovy/external/groovy-all-2.4.5.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r15-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 7a0ea1e..054434b 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201603100002-src.zip 209888833 SHA256 f13cb9c43038fc
 DIST netbeans-trunk-nightly-201603150001-src.zip 210021503 SHA256 b0ea2aa58d93a667cc83dbec9a9534b4693ac7a8d570682ebcda7fb4bc33a1ea SHA512 a06b780cf27f7e83964261d6a2dbb147e99bb353bae9d5bec0fd6bb8ca3fdc564f2da54eaa66b343089f854cc27e808846699fe691e047a4a04a1b1444143532 WHIRLPOOL f135bfcef0de549b44eeeac35f2cc1e49d4e8b21c3d254398cfd35bb04808c3e55e9fe9953a5b96c8acfc23a331d26f9fb9f9f20ec14ee93665aadd072c29e1f
 DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c89599c9d9ca42493a477d2c2d11cae3e5e1e7b6c3876bc953a SHA512 be94af9676f2559c959c213683ff23720798fe3fb8c5849e7d3422a89ab7de011bcd7eb90d7d480789461a8270ed6c2cbac6536f4ba5b5196472a73c1ac3ce73 WHIRLPOOL 53d7422959ba36b979d9b37333863479f811697f880f2e1c1861a1ff83a735364b265c32314e5ecc4a08e94f1478da3e74ed14112bc5a09b5c7b6b9e97385d4d
 DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
+DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 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_p20160223.ebuild 4126 SHA256 57311330141b3f7b60f7e643652f8805bffbc170b1d4de9bb1caa55bd1c2d6c2 SHA512 60b4b0c90306a9249798047d43a152a64b03a13ad46ebd7a417262d69837adafc94b220539d06ec10ff54b1bab55593a90bcff5884c88c4c6b3e677f97f1a93f WHIRLPOOL 132160c30789f7f5a66c84f34555fbae7a76fdb1321e37f6a3559abeac25aba8463fd323a740eee3586c2fcb8b19fb2928a8ff57f562d55d1f1390e9d0cf0ac7
@@ -47,4 +48,5 @@ EBUILD netbeans-harness-9999_p20160310.ebuild 4126 SHA256 ccca705905e0e0187c4b60
 EBUILD netbeans-harness-9999_p20160315.ebuild 4126 SHA256 ddc05082c1cd678882a4126bc08e5715a02e8bc0ee4613e9f5a02a364a3ccc1f SHA512 ab25d6b272454bd23d253c9878b2739e91c4b2800bfa8a82615ffaeb62840b7ce9197cd915bb6d7b912e1129461e1296b889a38fdfcec723ce4bad9626929c6b WHIRLPOOL a8466bf9716b1797f10cada2906188c5304b34aca7adc82dca56c89d59b749358b55c77da33f8a21553f9199830327ac32945612ce57e2462496a9fca20dd7e5
 EBUILD netbeans-harness-9999_p20160316.ebuild 4126 SHA256 6deec86c975f542f29865f0378d933d5cd5b53ef8f687bb44362035d4fb9c7c1 SHA512 2c8ecd5103e783f0b4c489742b34a56bc85f671c0c63a94cb81aec650556844c33cac97534d312caeb37b955f122e50af3d4e21512b76f526b50184480ff2784 WHIRLPOOL 1d65c245b5c444a2468d5310ade6a3b809c04dc978724055252f34f1c938e2c26ad41deb53b0ddd72f6a6e130997ab381ad1a6628c5d4a55d23d9fbd64252192
 EBUILD netbeans-harness-9999_p20160317.ebuild 4126 SHA256 ce03fcd0de453da4e2a92e0f25cf46681fd64c403a5fddd5f4b745ae2eb067ef SHA512 73feb0a1fddc05fcfc8dbdda8ad541359bbd196862c575723c0d217b048d08d8c16d570e18e713299dc7bd0e19e053fccbffaa85d0fb6564f40fd50f0f9cf664 WHIRLPOOL f9cb2cf168be7f07c70c46103ff7d6cb9b649ff98b593ee021920407ff46f3e979b23e5403ed0badc7a13fead4024c557dca000476aec8fb6d99c1666184311d
+EBUILD netbeans-harness-9999_p20160318.ebuild 4126 SHA256 6ae8166ae7e7384b5e91bd09aa8e30bc0f830150a618c2c27db5319ee6c18851 SHA512 d06edabe7275a2a35f4b627bf33efc6147b859197a75f601a069684845d6ac9eac2ceb7710d43b4b0702041ae18fa1f7e4ae0449d41ee1cc0b1e5dbce5fb3105 WHIRLPOOL ed980870f12b1caf4ea2cef8878c06900d4fc3191f553b2441aec137251c4962590b524d3e8dec30864b48edcb435c4285b7d6a3d8a0b7fd43dd04c0c3490e24
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160318.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160318.ebuild
new file mode 100644
index 0000000..4679697
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20160318.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Harness"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-18_00-01-48/zip/netbeans-trunk-nightly-201603180001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-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-r15-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into apisupport.harness/external javahelp jsearch.jar jsearch-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/harness >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/harness$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	fperms 755 launchers/app.sh
+	find "${D}" -name "*.exe" -type f -delete
+
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/antlib
+	pushd "${instdir}" >/dev/null || die
+	rm jsearch-2.0_05.jar && java-pkg_jar-from --into "${instdir}" javahelp jsearch.jar jsearch-2.0_05.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/harness
+}

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 89060f8..93151eb 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -154,6 +154,7 @@ DIST netbeans-trunk-nightly-201603100002-src.zip 209888833 SHA256 f13cb9c43038fc
 DIST netbeans-trunk-nightly-201603150001-src.zip 210021503 SHA256 b0ea2aa58d93a667cc83dbec9a9534b4693ac7a8d570682ebcda7fb4bc33a1ea SHA512 a06b780cf27f7e83964261d6a2dbb147e99bb353bae9d5bec0fd6bb8ca3fdc564f2da54eaa66b343089f854cc27e808846699fe691e047a4a04a1b1444143532 WHIRLPOOL f135bfcef0de549b44eeeac35f2cc1e49d4e8b21c3d254398cfd35bb04808c3e55e9fe9953a5b96c8acfc23a331d26f9fb9f9f20ec14ee93665aadd072c29e1f
 DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c89599c9d9ca42493a477d2c2d11cae3e5e1e7b6c3876bc953a SHA512 be94af9676f2559c959c213683ff23720798fe3fb8c5849e7d3422a89ab7de011bcd7eb90d7d480789461a8270ed6c2cbac6536f4ba5b5196472a73c1ac3ce73 WHIRLPOOL 53d7422959ba36b979d9b37333863479f811697f880f2e1c1861a1ff83a735364b265c32314e5ecc4a08e94f1478da3e74ed14112bc5a09b5c7b6b9e97385d4d
 DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
+DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 EBUILD netbeans-ide-8.0.2-r2.ebuild 29330 SHA256 4822cbe26fc19685164c35d69e75bc20578ca8a5ce3394fe97bde6acc721fd2d SHA512 552f35cb1aa5429beb70c72a0cd2a3aa3a006f5870ec4084e88632a39e2ccdc05d0b2b15a87f26c72cdffb3c9a6fa0a124a8d501edeef9aa9580396922071e8d WHIRLPOOL 4c9bce3ca21d5ae61ef9392b9282c2dff9de7f82f2e83d2944a2906ca2180ef0ffab59489bdbb6afc7ba88d5143d77b47a0cf6b219a5a4d385b68afcacd3fe6d
 EBUILD netbeans-ide-8.1-r2.ebuild 30301 SHA256 892f20531352d85b5b72b1c85352eefa444917b515b0b564f04c4f91d1e654f9 SHA512 50af4873fd3ea7755b0d33b086be7e07766b6c009a46ec3954a67a1da9930378bcf9da6d18b7e60078b31af4b36ccf060f22378a8ef26b3829ccf30a529dd023 WHIRLPOOL 1024af16e7cae7f4728dd37f88031be33253b7c62548a095d3e827abeccb6c183d34ce312bd1a0f808f0d107aff217e4b81b7a17eecc6842e1d914d7061df2c9
 EBUILD netbeans-ide-9999_p20160223.ebuild 30235 SHA256 42a75953a9bdeee192bf1f6ba62b4a7d9b2916656e49633c270025726e951844 SHA512 ef07e842663d9de4d43bf95a178f21a54e9ba50c42f77e2b6baf539cb8bed2d92fc277e5be568e6ad5c65cb84ec9f2f9c9d81e43783c222b00bac850fa7770b2 WHIRLPOOL d732d829d40f779573a6a4cb8f669844abf79985aa9afde6e32c0c643def9e0f007daeece0fd275268b44b161d65b7b92f78038c15d4b1655f53e493f566b2cc
@@ -174,4 +175,5 @@ EBUILD netbeans-ide-9999_p20160310.ebuild 30250 SHA256 54670f6da4f9a061341a35438
 EBUILD netbeans-ide-9999_p20160315.ebuild 30250 SHA256 61f00b3029fd34d5d6b8a30b230bafbdca4ad6bfd9957817fef843e995fb54f8 SHA512 d54fdd4444771cdd4bae86f16fa76b6d078347df3970fcd4e59c334b1224e640db979a11b2e697824f85426ff0a39391ddee62b9abd350e2197a309e57226201 WHIRLPOOL 8719528ddf55ad8ed815a4f5862e91cabeb274204140399ea17e9e6c2a5bfcaaf643d51df22ecca21933f0a5eded29ac3375bc8cd06310180ce028da69f6a9b6
 EBUILD netbeans-ide-9999_p20160316.ebuild 30250 SHA256 1c00e9ce20992f520a4ed254db5cb7244f0917bc2c2a6fdb30b04197f5f42a19 SHA512 156358d9d6bd9256b5e40d64ecc010acdf8ec077e0913df4a2deb1397678fa0950f17f75929b327f0485da36661fd7e1cf3d2fd7db8c8799f146bd24be7310e4 WHIRLPOOL 6b4c3180ada9053ef9c16b3e432d560e6256c9cbb94a11ade8cd1826f9f94c224742636431180daa9817e014a97855cfed48f13d6a0409debdec39d34cda6fde
 EBUILD netbeans-ide-9999_p20160317.ebuild 30250 SHA256 280833d0184aa941e05a2bf9ba7292ace7929536eb69b70f66e55e62640101d1 SHA512 84f301cd9a9e442c92f80b0217a553b9c6332355210a8699136d7975d4cb4f0b232285e6b5063825152f8c9814f14148a496d5f412136b69bbb62e5eb19da36a WHIRLPOOL 398ad8adde07f0d1f2c716adfc28078141d015fcf9a7587fe580b4f90558f88914ce9357e2029a20660108c5cacfcc82ace837401296a7b19d1ddc47f7b98b8c
+EBUILD netbeans-ide-9999_p20160318.ebuild 30250 SHA256 d9180327b8af7764ec36c8bb8bcd39f77776922482810290acf54d12af4c24b8 SHA512 5ceabfa4c585ba734aa8961d5ef65ed27f871e17c3f0f328add00ef6caa77d2dde7ec4f048a600a0f2e5211235fdc4cc00572c181b544e267a1e78fbd63e6247 WHIRLPOOL 2ae77f9a6a195fef9614ea7456907c0d9504bdaf43e5673d646300daab9888f56114a4e3dba07edd8c0f66c4df2daeafc6b6dd8b7f7f610c46466096ac35e9c5
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index ab8e4a6..4809aa2 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -51,6 +51,7 @@ DIST netbeans-trunk-nightly-201603100002-src.zip 209888833 SHA256 f13cb9c43038fc
 DIST netbeans-trunk-nightly-201603150001-src.zip 210021503 SHA256 b0ea2aa58d93a667cc83dbec9a9534b4693ac7a8d570682ebcda7fb4bc33a1ea SHA512 a06b780cf27f7e83964261d6a2dbb147e99bb353bae9d5bec0fd6bb8ca3fdc564f2da54eaa66b343089f854cc27e808846699fe691e047a4a04a1b1444143532 WHIRLPOOL f135bfcef0de549b44eeeac35f2cc1e49d4e8b21c3d254398cfd35bb04808c3e55e9fe9953a5b96c8acfc23a331d26f9fb9f9f20ec14ee93665aadd072c29e1f
 DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c89599c9d9ca42493a477d2c2d11cae3e5e1e7b6c3876bc953a SHA512 be94af9676f2559c959c213683ff23720798fe3fb8c5849e7d3422a89ab7de011bcd7eb90d7d480789461a8270ed6c2cbac6536f4ba5b5196472a73c1ac3ce73 WHIRLPOOL 53d7422959ba36b979d9b37333863479f811697f880f2e1c1861a1ff83a735364b265c32314e5ecc4a08e94f1478da3e74ed14112bc5a09b5c7b6b9e97385d4d
 DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
+DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 EBUILD netbeans-java-8.0.2-r4.ebuild 13298 SHA256 d4172dfdec5afecb1cd099e18a21aa872c7822bff40b192b5f4ec4d35e6e0ef8 SHA512 48ae6f7141117fbf58123ded750d76f2e7311211a6be3b62bd491349817460da11f781ec5694da91584315547c32008f568fac3bfb406dbdb5ed7fd825ff694e WHIRLPOOL 73fb68aec003707c14b2b390c2de80f24e1e5413cf7e16cf7e661af47c908e2d559214580379e45e21d316767987ac906b5a119a61ae39f03c3d01dafad49b7c
 EBUILD netbeans-java-8.1-r2.ebuild 14814 SHA256 1f49212c90fcaa9a6483f19bb60c963520f20aa08c2a509aa19cc7fda12e4564 SHA512 2d6b225f5d32f0ce1801124808b0cc2101f16a703540877c4818be06694742cfa262c3a2e7018761254f9244a7992eb7fe9bc15cdb20f6f4cb83958789c0ef42 WHIRLPOOL 8557163a46ea91a47efec3c272b8a8a0f2acbf9eaa8f6c280d0ddaac6dd8b2185f06716ab12ebf76fb87fe6c05ab1a14bfd281875ebef586f1304d2162e5f2dc
 EBUILD netbeans-java-9999_p20160223.ebuild 14930 SHA256 b277782f4837d65401fb02c278256ec2644d66f890907769aa8f0723cf2e3680 SHA512 7586e79abd8e88ace311a543b52a76653d8d6d6a2f21c2d19f0ab0e0cd869538fa561552e591188f36d7a0aa5634d71cfbd7f2602deb3143a8deccfa66f49420 WHIRLPOOL e9d97aa78c4786b646e84dc50951b4818440517a328c74c32f59e665f8b775d425f4b9a83d56bf3230cadda12fe9708b676bea680a1f659fa66b068eeff49fc3
@@ -71,4 +72,5 @@ EBUILD netbeans-java-9999_p20160310.ebuild 14930 SHA256 d823e6b6a3639b39bc2c7f2b
 EBUILD netbeans-java-9999_p20160315.ebuild 14930 SHA256 3223d62bb9696ef736434c6a75b226ae3d8ffc992d08d1af7b4aad8f2bdcf30c SHA512 a12008c247b1e392d8ad2a8d11cbdba78c67932ae4b22b17a01101c7981a865504c979e3fb4a783ed48ef6ca756eaa68d7e7b19ab8826ab525c9f994375083a6 WHIRLPOOL b6211ddb81da54cc9e741ee10577f43f21695cc8a5c80b6ee5d579a8379ecc84d7c49be5c835bd1bcdf516245eb8e0b16568b80ef7aacde9b103f6c412624847
 EBUILD netbeans-java-9999_p20160316.ebuild 14930 SHA256 825e6e76d356b0cac519ea8f82dbf3ba8cf35a7bee2b90d106ef520bd95e56cb SHA512 9042f1f891fa9a8400058179031a6f521ebefa2fe20af5e25eab70c10204db34e2b6b354404ab5bf4367e1fbcffbf7eb2a23258a3255220f9d303d674fb0f93e WHIRLPOOL 1b1cdac4a6698713f0673ad957c77bf4d2047db611ec999bb17f9d89b24df6ff692c5a53525c3cea0cbb905297b4ce46b6c1a75dab6c4558d7b089653ad4bac9
 EBUILD netbeans-java-9999_p20160317.ebuild 14930 SHA256 795be76cd0800c4bc46f7492e7f69efe55866f87f23e6e6add82ad1f2f22bf79 SHA512 c3da9f0a49e973db43b353c339247b73619787e8806a54178c4683cc15d5dd085ba5d3167bc639985a924fd30d2f71ad84bf3f73e303945a610650779049be70 WHIRLPOOL acf15d379a561863838b99a2816da85aee0a6248a1e5fc69992162be599cb6c4a1e95042907fcf013979cb7e8723b4356041775f449b91e8f831ede3ef73742b
+EBUILD netbeans-java-9999_p20160318.ebuild 14930 SHA256 ed99658a8aa6b5fff711e5117d68e428f79a789dba4bcfd5a1fe61805fdfcd59 SHA512 c1ca5e2c5d5862009fbc532f140b9b77ed6130edff37dbe069635d3ed7f3ea05f32c7e7336763807bf391cc75f67fa62ca5c2480ed4a8fa389aca86e153030eb WHIRLPOOL c9953168b1cb056079284e65196e0b10565a5bdaeb570639155cc2051a01e7a892f7110ee743db13ecb2b18e05f02a5a6ada48f42bd9be8b30b82b4c6a3045a1
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 2ce1e7d..03b5feb 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201603100002-src.zip 209888833 SHA256 f13cb9c43038fc
 DIST netbeans-trunk-nightly-201603150001-src.zip 210021503 SHA256 b0ea2aa58d93a667cc83dbec9a9534b4693ac7a8d570682ebcda7fb4bc33a1ea SHA512 a06b780cf27f7e83964261d6a2dbb147e99bb353bae9d5bec0fd6bb8ca3fdc564f2da54eaa66b343089f854cc27e808846699fe691e047a4a04a1b1444143532 WHIRLPOOL f135bfcef0de549b44eeeac35f2cc1e49d4e8b21c3d254398cfd35bb04808c3e55e9fe9953a5b96c8acfc23a331d26f9fb9f9f20ec14ee93665aadd072c29e1f
 DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c89599c9d9ca42493a477d2c2d11cae3e5e1e7b6c3876bc953a SHA512 be94af9676f2559c959c213683ff23720798fe3fb8c5849e7d3422a89ab7de011bcd7eb90d7d480789461a8270ed6c2cbac6536f4ba5b5196472a73c1ac3ce73 WHIRLPOOL 53d7422959ba36b979d9b37333863479f811697f880f2e1c1861a1ff83a735364b265c32314e5ecc4a08e94f1478da3e74ed14112bc5a09b5c7b6b9e97385d4d
 DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
+DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 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_p20160223.ebuild 4971 SHA256 81eaadb7b246ee0314f77557067d32da709ce6be3bb6f9fcaafddba33fd6129a SHA512 3c68f002019a464bcf5892befff75778eb4af2dcf63c922cda3f400c78e59eab65bc9034d71e1677d6c1ff54c4fc0bee464c5cb54bff2170f746b3a2306d92c7 WHIRLPOOL 0955a607abd596b29acfcb94a6bfaba00760e8da438b9cbf4ec7561696729078f9747615f68654d902c1be8e448a12256205e75cfadf5455b791b577e2c1bda2
@@ -45,4 +46,5 @@ EBUILD netbeans-javacard-9999_p20160310.ebuild 4971 SHA256 7e399bd066616aa564230
 EBUILD netbeans-javacard-9999_p20160315.ebuild 4971 SHA256 4dc593056ecac0ea7ff7159003be241c6407d3dcaeed9f79bf258d5996523a4f SHA512 d285508358b5be857003a4afde142e9d6c74db7d71eb4e9b7652f6fcc1a05bd517148576111a2e14a404a7caba821962e2d710689dd108243ff52193417082da WHIRLPOOL 17760a9dff33d8d4df9458d783e4d1f6f6d9f69def7f60aea18909c61462e58854274dee8e1deeec99903b5fcb437e64491a2a6a84b5d4a0c5a2a44048a0c81a
 EBUILD netbeans-javacard-9999_p20160316.ebuild 4971 SHA256 f49fc339a8fc9eb802540f8602cc83da965793e7e8e9263b732d92944eef31e9 SHA512 01c897c31a975ac8d8f1bea21c5648653fe4e36fb0e7e563c487c092f38d76ae8d4cd354848fdb448a364fd301eed409d4bc8f496499a04402794a65bf748ee3 WHIRLPOOL 7e67fd153f8b0542d37f84b64f8a45cdd100ccca8ccfc407f4bd66a5f5d9febab3a65b8d4ee614355ae1a43cc3c9ad64175bf73af1c5aec27c9f1b59838b1de5
 EBUILD netbeans-javacard-9999_p20160317.ebuild 4971 SHA256 491df3c98164a05ae23d9b5e73223b3b41dc9351feff5cacdb34b97f048c244d SHA512 cfd8484e25fa1695b0f63d230e13819abe002762cb45151e4484f736888dbc5f161adc07898c06e5af5062eb50018f03b05de8d92629153ccf288208c9504cc1 WHIRLPOOL ea3182004a92930e60b3c3ea3edf98a2e9e6610c91b45bb75721d07d1e15b10ed7cb2b23e99b3cd217f239f94c23ebb7b2f838629cffc22a30a9d3b519df38e9
+EBUILD netbeans-javacard-9999_p20160318.ebuild 4971 SHA256 056699e04063ee897948036907be6bf83365b0f8305e3dc516c75cfd22f935b8 SHA512 c00f7a769bb86713a7f6e08b10459972da5a8b0d64290316b11d0764302c851c08dcdf24d3c9a351d7921287395a17b75dafc2620c3df498b541b22c3e7e4627 WHIRLPOOL 06362f02d0a87760e59ed257a06c2d9df21c25fe38cae339e3fc424f813abb46a7ccab6197cc76131258ed6a78987e5764ea49842c0745a0562933f8ab4813fb
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160318.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160318.ebuild
new file mode 100644
index 0000000..d08a972
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160318.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaCard Cluster"
+HOMEPAGE="http://netbeans.org/projects/javacard"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-18_00-01-48/zip/netbeans-trunk-nightly-201603180001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-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-r15-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/javacard >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/javacard$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	rm -fr "${D}"/${INSTALL_DIR}/bin || die
+
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/JCDK3.0.2_ConnectedEdition/lib
+	pushd "${instdir}" >/dev/null || die
+	rm ant-contrib-1.0b3.jar && java-pkg_jar-from --into "${instdir}" ant-contrib ant-contrib.jar ant-contrib-1.0b3.jar
+	rm asm-all-3.1.jar && java-pkg_jar-from --into "${instdir}" asm-3 asm.jar asm-all-3.1.jar
+	rm bcel-5.2.jar && java-pkg_jar-from --into "${instdir}" bcel bcel.jar bcel-5.2.jar
+	rm commons-cli-1.0.jar && java-pkg_jar-from --into "${instdir}" commons-cli-1 commons-cli.jar commons-cli-1.0.jar
+	rm commons-codec-1.3.jar && java-pkg_jar-from --into "${instdir}" commons-codec commons-codec.jar commons-codec-1.3.jar
+	rm commons-httpclient-3.0.jar && java-pkg_jar-from --into "${instdir}" commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.0.jar
+	rm commons-logging-1.1.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar commons-logging-1.1.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/javacard
+}

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index 6e1e9e6..189511e 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201603100002-src.zip 209888833 SHA256 f13cb9c43038fc
 DIST netbeans-trunk-nightly-201603150001-src.zip 210021503 SHA256 b0ea2aa58d93a667cc83dbec9a9534b4693ac7a8d570682ebcda7fb4bc33a1ea SHA512 a06b780cf27f7e83964261d6a2dbb147e99bb353bae9d5bec0fd6bb8ca3fdc564f2da54eaa66b343089f854cc27e808846699fe691e047a4a04a1b1444143532 WHIRLPOOL f135bfcef0de549b44eeeac35f2cc1e49d4e8b21c3d254398cfd35bb04808c3e55e9fe9953a5b96c8acfc23a331d26f9fb9f9f20ec14ee93665aadd072c29e1f
 DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c89599c9d9ca42493a477d2c2d11cae3e5e1e7b6c3876bc953a SHA512 be94af9676f2559c959c213683ff23720798fe3fb8c5849e7d3422a89ab7de011bcd7eb90d7d480789461a8270ed6c2cbac6536f4ba5b5196472a73c1ac3ce73 WHIRLPOOL 53d7422959ba36b979d9b37333863479f811697f880f2e1c1861a1ff83a735364b265c32314e5ecc4a08e94f1478da3e74ed14112bc5a09b5c7b6b9e97385d4d
 DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
+DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 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_p20160223.ebuild 6293 SHA256 ab491f58251c66c9b1c0fc2daa7839dd5720ff13a841a34dc19a7b136fb3b747 SHA512 69dccbf92f435fee525321b3fe00e4d615ae89e4c92018492623e8c8c987220dd27bbc772707551c02e07e28e6a104c28d8f88f3fc93da319804190f0607cfbe WHIRLPOOL 52d861f5748d1a6542286c1422dd7a3f2973c531aceac0b23dfdf6da9fd19c3eea37c20555ddc14e7ebd928fe6fc156088b4e84351f116320dd0cffe24c8a5c7
@@ -43,4 +44,5 @@ EBUILD netbeans-javadoc-9999_p20160310.ebuild 6293 SHA256 48e8a983d902a78e203b3b
 EBUILD netbeans-javadoc-9999_p20160315.ebuild 6293 SHA256 857667472fc304f18c2c51385c6cfff55ec10cf4f16bbe4c1d96cd4c7914f60c SHA512 dfb04f44a781f78a6d7302722a04584807b6b30387df31edb79fbfcf25c9830146a66983b5661230c077cd14112648714c06b6d772e292bb57ad099abfba7f89 WHIRLPOOL 64092e496fb95b6051fa286d0fb7ce7495b043d5c233d0b9b7848c27ab24eff6a4371e5ccfb00aeee4f40b8f42421a88a491707d4b1f481d32330839f703a57a
 EBUILD netbeans-javadoc-9999_p20160316.ebuild 6293 SHA256 522dc944441e51c7cef0fb129c2779588d4282ac2aa315bae1c267821f6a3ef3 SHA512 0cae801105968a8123aaaadb95629cca04fe23dfccc1b0e2872bcacdbb802462d0213315e4846112ec63cee60bca270db63a344a5ce9196c1196a8ae9cd68c8d WHIRLPOOL 99131e7238a64ebbfba835e3ff4716e95fdb76cd192de6fe5e48cfb06328ef05138e56729a2f6e468c0bb7d546ee35332547b3cae3c80f359ca52b795283dfab
 EBUILD netbeans-javadoc-9999_p20160317.ebuild 6293 SHA256 ccba0cc3f2c9c218e249dbcb4212ede5a0cc3aab0ca730c098bb676af31e319f SHA512 0145f315f13f6a0b2ccde9945c1e28abfb060dd4bbb7150de508500bbdede9aa633e38027452c1b6e1a8854e5533f37adb0f4c5c26c49f03c4fe299f32291acd WHIRLPOOL 2c0dcdecb1682c057612b39d91b3eddaec685dda5277a8a1f438890659bd84f55932d6e80114062a9964e78135795ada6e47de7969942a7ee7f16a7b38a7ab97
+EBUILD netbeans-javadoc-9999_p20160318.ebuild 6293 SHA256 94c55bf82cc3a3c779f08957a2d8c0532bff6f9f9fd9f8bd691199c34ba17960 SHA512 a253b65835d939c2e88ff7f1d6d0f30992ccdff1d89f6a20517a74c1b76941b2cd4d5e279be7b28dd422b47d60f55911770ec5e5fa1f18b59f1ec5df1367b8ac WHIRLPOOL 2b7047fe8b601b61a3f4639f058bfd531e409a61a95bda0582d4c44d68e9e3c3c2be85a8faf4a750a95303f3ac8908703106576eeef571bb89b7da7e9e8f868c
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160318.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160318.ebuild
new file mode 100644
index 0000000..071397a
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160318.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaDocs"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-18_00-01-48/zip/netbeans-trunk-nightly-201603180001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-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-r15-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 2881725..ea09c67 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201603100002-src.zip 209888833 SHA256 f13cb9c43038fc
 DIST netbeans-trunk-nightly-201603150001-src.zip 210021503 SHA256 b0ea2aa58d93a667cc83dbec9a9534b4693ac7a8d570682ebcda7fb4bc33a1ea SHA512 a06b780cf27f7e83964261d6a2dbb147e99bb353bae9d5bec0fd6bb8ca3fdc564f2da54eaa66b343089f854cc27e808846699fe691e047a4a04a1b1444143532 WHIRLPOOL f135bfcef0de549b44eeeac35f2cc1e49d4e8b21c3d254398cfd35bb04808c3e55e9fe9953a5b96c8acfc23a331d26f9fb9f9f20ec14ee93665aadd072c29e1f
 DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c89599c9d9ca42493a477d2c2d11cae3e5e1e7b6c3876bc953a SHA512 be94af9676f2559c959c213683ff23720798fe3fb8c5849e7d3422a89ab7de011bcd7eb90d7d480789461a8270ed6c2cbac6536f4ba5b5196472a73c1ac3ce73 WHIRLPOOL 53d7422959ba36b979d9b37333863479f811697f880f2e1c1861a1ff83a735364b265c32314e5ecc4a08e94f1478da3e74ed14112bc5a09b5c7b6b9e97385d4d
 DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
+DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 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_p20160223.ebuild 4717 SHA256 25d4a8912785b067f6dd613c6514cdfe999b0bebe59f22da20f626ccf2cbfaac SHA512 00f8e10a57e386752083fc639244212f709603d3013abc966b5db24996bbf347074d1ab7a6a37b7bb6faa94d38fe7cf39d93194afb8055ee65be5568c5f01ba2 WHIRLPOOL f7aa8804118828ffd06a2d5226d935d2dac3185ae7a369b6e407df90e89be86ddd3ba13ef7672414826f8e570f8a0507f89b2a7988c243c25157bc28f37063b2
@@ -50,4 +51,5 @@ EBUILD netbeans-javafx-9999_p20160310.ebuild 4717 SHA256 31c398271c5e4386412d48c
 EBUILD netbeans-javafx-9999_p20160315.ebuild 4717 SHA256 7a3117eda7d8012a76c3e05c26220661d1a1b05fa9bdc7cd920557ca2d481a5b SHA512 6eb6f09c3827a0674b0957721d3501c08087ae33b76da139284ce6bfb4daa2c66973f49531817f912175796ff93e42a6c660b03f07301911fbc10f5643b23c68 WHIRLPOOL 78cb1ae0a6ec88f2b1ba8535bd8345ed2c648d3f536761dbbc8dc9766e8bd7adaecf761f2adba445248a322048f1e75cbf5c4fec3f2d77733361f1478286e24a
 EBUILD netbeans-javafx-9999_p20160316.ebuild 4717 SHA256 764340a3f0915bd67ef742dd8403815a517d3d127333fdb0214d8386d42c913f SHA512 975b7c9206e8cdadc9da21fa8c1a783339b1d8178d0012417c22667588a8ce297cbbf1daa59fc966c25dcbde07f05bc8d67fd42cb60f66e4234f208871746b69 WHIRLPOOL cf2273d03cbd3f4c76572e0bd111c836f953b35dd72db8874d1e578a903051fd1deb243b94050f4f08502a7486dd267cd2e9d3dd37ac55821c331e8ebf87deb3
 EBUILD netbeans-javafx-9999_p20160317.ebuild 4717 SHA256 fb1f635f5c5704857ea78a0a16da84600acc9fe2f60abef9e154c639ea8f4f16 SHA512 90b84a7e610f5c7d49eb119bec67cfbfea7bccba2a6d71e3db34e2176f249eda189066950788f4d67202b15ce47bfdd0c2a4c9cf6e56a13feb3cd04d7e32f92b WHIRLPOOL 741d79a2c97aa0e864a9fa8faf7da363b8b5d723060f6f712ca84cfb6f5dd4aeb57ab38c06b5813e349b05168f2228e65e43613945aa666fcca22cadedddd441
+EBUILD netbeans-javafx-9999_p20160318.ebuild 4717 SHA256 a98b52d8510e05b83888095205f09ca6e6aef0a8974e3f7e02f89db3d9b9ad4a SHA512 de84cda652907da0af796186bf487db82ec633899ed93d4e6d9df538bf0893aa97f364083707d573e115a2eaf3c4d85dabfca3586be6712c8098e883159eb8a5 WHIRLPOOL 3193c22d944a64b2f7b471098ae0ed136052a91b6f7ec2efc7bf4cde4b53cc8966a0c1a2e80b4ae78d16bbc3310ffab876f7577f13676442e0f3a8ec781a2c7e
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160318.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160318.ebuild
new file mode 100644
index 0000000..9713ff2
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160318.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaFX Cluster"
+HOMEPAGE="http://netbeans.org/projects/javafx"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-18_00-01-48/zip/netbeans-trunk-nightly-201603180001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-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-r15-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 44c6a88..022ccfe 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -22,6 +22,7 @@ DIST netbeans-trunk-nightly-201603100002-src.zip 209888833 SHA256 f13cb9c43038fc
 DIST netbeans-trunk-nightly-201603150001-src.zip 210021503 SHA256 b0ea2aa58d93a667cc83dbec9a9534b4693ac7a8d570682ebcda7fb4bc33a1ea SHA512 a06b780cf27f7e83964261d6a2dbb147e99bb353bae9d5bec0fd6bb8ca3fdc564f2da54eaa66b343089f854cc27e808846699fe691e047a4a04a1b1444143532 WHIRLPOOL f135bfcef0de549b44eeeac35f2cc1e49d4e8b21c3d254398cfd35bb04808c3e55e9fe9953a5b96c8acfc23a331d26f9fb9f9f20ec14ee93665aadd072c29e1f
 DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c89599c9d9ca42493a477d2c2d11cae3e5e1e7b6c3876bc953a SHA512 be94af9676f2559c959c213683ff23720798fe3fb8c5849e7d3422a89ab7de011bcd7eb90d7d480789461a8270ed6c2cbac6536f4ba5b5196472a73c1ac3ce73 WHIRLPOOL 53d7422959ba36b979d9b37333863479f811697f880f2e1c1861a1ff83a735364b265c32314e5ecc4a08e94f1478da3e74ed14112bc5a09b5c7b6b9e97385d4d
 DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
+DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 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_p20160223.ebuild 4412 SHA256 67e415144e9fce632d238454d32f3035f596c3bae87065d5a3b4a8702acbc3b2 SHA512 08b8f044ef846999e65c1fb928ca2f89088755694c87648b5e4de49321e03df67338a3e7cc5a6ef93207236de127074984e56e2c76b2b3ba3a68a7d82dba8a8e WHIRLPOOL 44f24e92b3d3aecf16ba3f5ceaf1caf0616c9ecf26b436690c8d33e6a29bb89717fc1f26d0b645d65edae12ddf4bb58606434f9878db53aa16886b7128a6c3f9
@@ -42,4 +43,5 @@ EBUILD netbeans-mobility-9999_p20160310.ebuild 4412 SHA256 b8e5c217297c7ee3c2f05
 EBUILD netbeans-mobility-9999_p20160315.ebuild 4412 SHA256 0c7901b03cc9788d79ff503d620455503a9ba34aef1296e7969e5b708f769042 SHA512 ea357ef71b753cdfc766520b0d2de9ac04933826b245481f284aaa17d6e54d0017c0b04bbbdd5caaa92fa2d03f246e9ca68c9d5555ff21e75fa0bc83a50697e3 WHIRLPOOL 7e66a54607c7e5fcdbd061eab839201b80f34505435851823a94b8ca0d2b493dadb8b9dbce6af44598ca54202ff71f4744e1ffb5ff44c776905b5297bcf45a26
 EBUILD netbeans-mobility-9999_p20160316.ebuild 4412 SHA256 ea5cfd184f876ba7820e0445313ba89d52967b54fd52a2af7be746f0819a1a62 SHA512 170b2967bae914b35b7e6451eef48ef7c9288f7b99694dff9d4fd29831e82526484c979b9118846a5a3c2fd39310745d211fdec281daa8c70eb96eb8b8039b63 WHIRLPOOL 65e40a9b307446b0d03b6fc59175722d12920c53c80a628cc03b8437bc66df9960d50fe5c9f90356559cb01f9e7311588d6a719413dd0293976f0767ba148044
 EBUILD netbeans-mobility-9999_p20160317.ebuild 4412 SHA256 c874d20f71d2227100460844e28bb4bc00bd19aa4d7483eea1b129f5c814e820 SHA512 75e6e3afc5a62312103a33b503208e0493307174fb50dddfa04723b7ce9eeb9fd6ac58a0cf7d688f93cb01671155ba5879fed235d8708dd5e9ebaf8c5b01c80b WHIRLPOOL d5fc34223f3b84d8af14f871b6589e47e0b5417a4446e74d50d088d67392e2944d5e3b690af0168be84310d963a4af03a62402419d21ab7873a7b4aa652ded7d
+EBUILD netbeans-mobility-9999_p20160318.ebuild 4412 SHA256 357ef62e12cdb2bf03ed092bdc0a11d1a438827263d12f34dbc4ed63ead26751 SHA512 1110898e3b5d77ab0c7237daa1091b2c34e2de0cb9b9f9bfce195be22e32e0b74e2c669aa94575cd45535fbcaa084694cae85c9378b79dd556d038ab5696f8dc WHIRLPOOL 72e4781b2ee1d5e067f461ae0559a6a9397284a93ed1a3d422c151f662a2756050efd2ca1762aec78401fe7ad9555f0d3bfe0db65b9cc484db34ee86bfb952ef
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160318.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160318.ebuild
new file mode 100644
index 0000000..ab4d94a
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160318.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Mobility Cluster"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-18_00-01-48/zip/netbeans-trunk-nightly-201603180001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r15-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 8a4b72b..4e1f306 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201603100002-src.zip 209888833 SHA256 f13cb9c43038fc
 DIST netbeans-trunk-nightly-201603150001-src.zip 210021503 SHA256 b0ea2aa58d93a667cc83dbec9a9534b4693ac7a8d570682ebcda7fb4bc33a1ea SHA512 a06b780cf27f7e83964261d6a2dbb147e99bb353bae9d5bec0fd6bb8ca3fdc564f2da54eaa66b343089f854cc27e808846699fe691e047a4a04a1b1444143532 WHIRLPOOL f135bfcef0de549b44eeeac35f2cc1e49d4e8b21c3d254398cfd35bb04808c3e55e9fe9953a5b96c8acfc23a331d26f9fb9f9f20ec14ee93665aadd072c29e1f
 DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c89599c9d9ca42493a477d2c2d11cae3e5e1e7b6c3876bc953a SHA512 be94af9676f2559c959c213683ff23720798fe3fb8c5849e7d3422a89ab7de011bcd7eb90d7d480789461a8270ed6c2cbac6536f4ba5b5196472a73c1ac3ce73 WHIRLPOOL 53d7422959ba36b979d9b37333863479f811697f880f2e1c1861a1ff83a735364b265c32314e5ecc4a08e94f1478da3e74ed14112bc5a09b5c7b6b9e97385d4d
 DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
+DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 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_p20160223.ebuild 4111 SHA256 d66c45ed0763ad788286b0c2fd3715a213fd405c04414cd2f92d45fcfdbfbdd1 SHA512 0c0e145c7b4b337d590d9cde5798e1797f90116ce61e79dd9aedffa5997c924e4e42d67e01e9d8b7624e76dce151f2e4ad19482ff3d58ec8a47ffb6f368e1310 WHIRLPOOL 2e8816fb5b5f533425570cce925ec834bb5ee5697ab05257949c27984f27cfe7f3e03cf8c582b0d6559d42e82ac9d41ca529cd04f1e65dd71eff0c4e675a8a31
@@ -45,4 +46,5 @@ EBUILD netbeans-nb-9999_p20160310.ebuild 4111 SHA256 fb45eb3b793ec6f5d106cbdc498
 EBUILD netbeans-nb-9999_p20160315.ebuild 4111 SHA256 b1c57e0ea1fdc5689d75f528274b9c667e4b3a79d741db328dfafc66686472de SHA512 6c866fa57445d6897d0660dbad1a49902b8d34ca3784575ad99bbfef9d078c8b815c7771773e2010b1f6daab38435c2a1007670ce39d057dc93fb939c90887ca WHIRLPOOL 1c2843c182ca57b1eb25050ac01aae8b39912ac71b8c9710b93d222e4ff42f9f72bf86cf3bad7979ceea1e5c6bd8b59338c4232bfa44e9365f8d39c7029be8dd
 EBUILD netbeans-nb-9999_p20160316.ebuild 4111 SHA256 a650d837db80676ff4197417482006dbbffdda62c2acffd226b2d20e2c87d210 SHA512 faa621fc38cd66adaf9203dfaaf1c1ac8fee25112982f37fce6c120ca1856be1d99b592d23259d74316a0896d132782b0660efa5c1b2ab66297675d988c9e0e2 WHIRLPOOL f53d71a336e933f09301bd38de831775355b00685c79f13732800df5dcca47d97b3dfb01537cc7a918b3894355784eb2e09b5f91cf7de0603a00fc3ca59bf0ac
 EBUILD netbeans-nb-9999_p20160317.ebuild 4111 SHA256 04f02792389acbeb49fe367ec5f4f238d337bfc5aff7a7c2fcce0c2c5eecb571 SHA512 8e41affc8d65fa3558d3644fdefca2eaf5c9497bc41169091ef7d963208865c8dec97935218e96bf9f94df01ce40563556df5852550f9fec55f86b4dfc6599a9 WHIRLPOOL d8c5103314289db1f845d4654b6c96f1bacb62cf992c2fe8829f16922bb56879d3bc13cca132aea66d75b5a54da28bea5a9d727b685ed7c457e5fac73ed2dc45
+EBUILD netbeans-nb-9999_p20160318.ebuild 4111 SHA256 0916bbee7a2fa8b2a97f17239c82fcf46272caad5ad403ab50902a31b1d7f756 SHA512 db4ffebc264b1d0d3ec384facf77d16d8e6ee702909cf3207c801813f766a223a38c75c443d579b09ec4fab809cc67e6b5354d388ef81ada89819f9a64c81c59 WHIRLPOOL 2eb654a9bcaac8eea74a496817a064da47edff2b61df8a1cc4e6468d841552eeac9f2b2af1f98a08df258ca336eaf73df0ae25ec3e2fd418d7a7ebf80db875df
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160318.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160318.ebuild
new file mode 100644
index 0000000..1404b71
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20160318.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Branding"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-18_00-01-48/zip/netbeans-trunk-nightly-201603180001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r15-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 ad92d5e..74d39d5 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201603100002-src.zip 209888833 SHA256 f13cb9c43038fc
 DIST netbeans-trunk-nightly-201603150001-src.zip 210021503 SHA256 b0ea2aa58d93a667cc83dbec9a9534b4693ac7a8d570682ebcda7fb4bc33a1ea SHA512 a06b780cf27f7e83964261d6a2dbb147e99bb353bae9d5bec0fd6bb8ca3fdc564f2da54eaa66b343089f854cc27e808846699fe691e047a4a04a1b1444143532 WHIRLPOOL f135bfcef0de549b44eeeac35f2cc1e49d4e8b21c3d254398cfd35bb04808c3e55e9fe9953a5b96c8acfc23a331d26f9fb9f9f20ec14ee93665aadd072c29e1f
 DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c89599c9d9ca42493a477d2c2d11cae3e5e1e7b6c3876bc953a SHA512 be94af9676f2559c959c213683ff23720798fe3fb8c5849e7d3422a89ab7de011bcd7eb90d7d480789461a8270ed6c2cbac6536f4ba5b5196472a73c1ac3ce73 WHIRLPOOL 53d7422959ba36b979d9b37333863479f811697f880f2e1c1861a1ff83a735364b265c32314e5ecc4a08e94f1478da3e74ed14112bc5a09b5c7b6b9e97385d4d
 DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
+DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 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_p20160223.ebuild 4418 SHA256 52c28929af3a5a4f14c5b096e97f761274a3dbc4c7fa79d781f434ab7ec12251 SHA512 878af2b75881d71d5245309ab37fc30b2d674e7fc25caed52c8d3711df9225b845a6418747ad5f7323138d9ecf111906c798ad07cbecc303d9a9cf61a9bf2788 WHIRLPOOL 5400b24dd76b1276e97459e85b2290d69c96e86b6c5a1eea29b185d96435983e781e99ecf9293a87540738feb1fe578708b58b3dd90ef431ef1b85424941926e
@@ -46,4 +47,5 @@ EBUILD netbeans-php-9999_p20160310.ebuild 4418 SHA256 44b8dddbc569d71115513a41cd
 EBUILD netbeans-php-9999_p20160315.ebuild 4418 SHA256 ed5a272b24badc47048c2b3e083d139799411283fa50ab6a0e9370f415a4bdb5 SHA512 076a787aaa485856544effaa9fb111a07e00cc7d9b6c04cb7c390cf4f936fcb4a1eef0a008b2bdd05f0ead59776b70ea6148ae67e1c99f0b3a8ef7db850b100b WHIRLPOOL f0bfb80a00f7227729a214714a06e98b3d7c2bef976e48c73f64a99ed5a520b9ed560e58b636e31eca30b4fed8f0d8e8bc07495d5c94b2b64284f6f825f8cb1b
 EBUILD netbeans-php-9999_p20160316.ebuild 4418 SHA256 ce4a6d03d8de02b48d96c4937068e016d7270bfa9159e785c6163ad9824f1d01 SHA512 dc823be4904e2a33091c5d0123508383db4bf2c3eb3b2cdaf41cbabc0affeed59f86e2ee8dee080fc89acc91e4522f168e3aab020a36591831e54a1b293c040c WHIRLPOOL d06bcfee3f1bcbbb1398e05a0395811a58839261aef0b09f9c98d235fee94b1fc20a13d196dd2c255f9da466c8de1be3b21a403888ac208f1a997c6a29e63d9f
 EBUILD netbeans-php-9999_p20160317.ebuild 4418 SHA256 cb50ef14aba92bd3390ecc90bcfb647a113193a3a6412dce24e6fc32d44a24ea SHA512 bafe62fffdf35eaef18d4bff566a0c4b03eff5401ae022827e24c7e4c7fe95cf30e702b275854ec56c58e7df77ee0cc75021db1fb0d20bb99fe7c536643b780f WHIRLPOOL 53921305b8544475cbffa331832ad9fbf82a521628dcacb051fd92ec0bda789ca2c1b205deb5715aa6179e1578dd08a369f52f907496f501eca20b02dcbf4c5d
+EBUILD netbeans-php-9999_p20160318.ebuild 4418 SHA256 675766ee5595a165e07df6435ccbc4c3b9fc06a04718f518f707a070f121cce5 SHA512 01c35192bb7d4bf5ed7fdc11249e02d3058fb69f0390c9dba1838cf61053a394a255999a40e69134c13c400061e49fded6928123e9b35f23522b44494170c7b0 WHIRLPOOL 2d9ea92b5e51dee994bd0353becede29f2b8053bb7f934368d322f3a815ca44a53ca7ff61e6e6fbfbcdc055a4df712623bbaf0289aa11504da3ba3a354566ad7
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160318.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160318.ebuild
new file mode 100644
index 0000000..bf540b0
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20160318.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans PHP Cluster"
+HOMEPAGE="http://netbeans.org/projects/php"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-18_00-01-48/zip/netbeans-trunk-nightly-201603180001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-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-r15-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.javacup/external javacup javacup.jar java-cup-11a.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-webcommon-${SLOT} webcommon || die
+	cat /usr/share/netbeans-webcommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.webcommon.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/php >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/php$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext
+	pushd "${instdir}" >/dev/null || die
+	rm java-cup-11a.jar && java-pkg_jar-from --into "${instdir}" javacup javacup.jar java-cup-11a.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/php
+}

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 25763a5..3c6739f 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -1,19 +1,28 @@
 DIST 0388CADD903570B9FE30140C0EC39DC573389B33-jna-platform-4.2.1-patched.jar 1855698 SHA256 fc5c94bf163a21aef7870b2a7356187cf47eadca801136fd76cb7e97f1cce10a SHA512 904928b00afb9f90f1c1fbf344944728948df1b144c478199b4b490a1b351e1fb6b5c767425f2b090b734734d855c7dfb4a4429a288d37012d9744e10267d903 WHIRLPOOL 59db13e2b613c807e6554079c2666592462c27f8cbed84552828dc0a3d63464f7af75ebb362db0f5cb14a2c2e2596ec73e017b05cc3c6fa305fffd63ae0ed700
 DIST 068B9902E65F2292C9EA30E5423E41FB6B30D8AA-net.java.html.boot.fx-1.2.3.jar 66508 SHA256 f91fd63a87fe119f2c3adfe021de416a6748c53af3399d6c4a6ef132a7ddd219 SHA512 9abc9d3ad65344007d5869767e519b9cfd3f55498d6e821333a39912e988d17e24a3e4b4858f917d66d81b2ad3cd97b87e49efa7985f0568e4edccfc055b129d WHIRLPOOL 76f5e62918a7c057bf1ec74289ef13354d1f1e823335089f27326fd251346408d3c7d4c6e33109b105b92caa8bccf6f7ecf7d6fb5c2e2b382b183e2ddf373025
+DIST 10E4214A89082C70FCF9F721953001C0932037BA-net.java.html.geo-1.3.jar 26101 SHA256 af95400dcdd6c730d68b6219ed83e620a405a9f9eedbb3acfd8b7ae0ca718cb8 SHA512 be6587de5ba44b05a4912658cff0dff15c20ee984462b441d6f8088a2d6a991f1c070ee78fe75ed35ad406d11c615a08a1b40b3b729cf7b3508c60ded1ad3caf WHIRLPOOL 24665234fd09a7c79a59c75cbcac6f8e4de227056334639d22fb41f30eb1229eaeaa0b2e11c6f856ac09d1939f8ce9235e3d9f5ddd86f5c670a38a790e4d648e
 DIST 1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar 529233 SHA256 a61000572baa9e216f035b56dc4f2b4119328e8858af5d523af84b356d7857e0 SHA512 55f88f204cafd6968a952d6d08286220a569f678915446aca2b49bfe3bb7e2de6935d5ce834ef55363209d8f23be7d2275cc517a2ce837b75e5e5a6551e9ba9e WHIRLPOOL 4cba5cb7078c4b24ceec00a54aef36898ca288643c6b85c360b271b2a914e516f298bc489f9e78477411c9ecdaa17f3262381d02b360d4309dc5b9308523b7e7
 DIST 1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip 77859 SHA256 1503657e36d02befc5433a57f1134209f98f3d193ea30c9ac0553814a8590a21 SHA512 15834d5448da80be539259e902ffa678a3b94293ffec221ad1e6238f0abd2dd2b588b8c06165f7e89796e96a6660c3166aad13112d34eebbed29163b52074b56 WHIRLPOOL 274c0cf5fa7d44701d7ea82b34758d6fceada1fe88bbea34058a468d350e1661c76f07e7ee0edc6b0c34113f7afc4540f2345e2d1bf6bf577969a305362d4227
 DIST 24824B1E8C2A2D3A5C471F5875BF61F27E8916DB-net.java.html.geo-1.2.3.jar 26106 SHA256 c174ff56ad6c9c9a43da65ef6af3089d06589e3bdce9fd0a46a0a62dce090b3d SHA512 144ce397daeb28dcab232d80ee652851b545b6a98849594352340d7a5044b28c96142b72ea5c3dfab6e0f63fbbd36c6e0404c5cfa43408048ccd550d415456eb WHIRLPOOL ec025825f612aa44e7f8f9c1e3a8b30c21f3c3b13980043e9187b58aefae1a0024b0db5e25e1d4eaa307585d22f1bd32fcc688d5daa5438ad079464c47593c5f
 DIST 2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar 241636 SHA256 94ecde163b4ca3a42425cd830c79197f22d0d1336d471ced6a8a83b07acbf7c8 SHA512 346746e19ca24e7489ba7bb283cefa47d2df33e6795e9e275bdc269dc312537264c24537b2128246cca8a4c2053a73e4172c6d0b9f16450e227d9aa895e9c730 WHIRLPOOL beb6125f81acbe80b6249d2b857a0759a876bba677466af6d1b71b54dffe33272d3d8e98953a49e2acf502fc27d60c31eef442e19f5f63a17a3d5190c27e6b69
+DIST 5C992BAEC0111EE293BD44173140A9D8EC860765-net.java.html.boot.fx-1.3.jar 67500 SHA256 5007956e1d36eea9f093996ddc6d9bcf7fc06dad12dd61c48031294162f4a63b SHA512 d87ca1d527b87a47266593bdc0e58f4aa4adb6a04869a342657940e8a442b58a60c08831e27202b9628b996c16bc4635a0985c8d3126962e5d7f2dde049515df WHIRLPOOL 441fe868d8eb3bd6d8020961e1343313fa3b739205d01832c77fd04e40194603f62001295b8c75f606292d26a6e15cd80ddf2bf9796fd944b22f441fad7e8231
+DIST 6BDCE8349F83CD02F2942D4FBFA86A81A129F42A-net.java.html.sound-1.3.jar 9109 SHA256 9dd9b6cfcd4fef1018ac5f0581727157fcc22eb4e208e410488c99e0120bff27 SHA512 883d2428460ab3728e60259fa74b5dd6cb0ef168eb54becb10ad0a289a29e518273917daaed64a7d8f8c61033a8dd56a160ea922be4e8df396823d00910b9c52 WHIRLPOOL 27bb3a958cc742c91ee451d3fa2e85fba5c045647f91a35917ba4cfbc08d2cd178af88966e215ec9f41ddae7b6b99623d82cc4fb165abc748459a6a1e56e2d42
+DIST 771CDCA0A3F2F3CE818E20CC2D707A3592422485-ko4j-1.3.jar 45895 SHA256 d1a6747ecb6c0dcef784a52bb7acc774d3ca55f1c28e5c98f0c18006fbab11ea SHA512 5ea1efe94544f52aa9ac1492929c0342140df12cde399610faff719ad71f3740621834868876bc622f983c237a880df792ec6817bd0c7fd3ad6edc02320584ad WHIRLPOOL 0b68ac44c64d98614aa896158211f7c39d8c7164126d74f6d3071072675d47fd09c7114e567814ea7093aa95bc3d35c5b8c36bde21e840b5c4d1c3923f9adda4
 DIST 78DD1C0B4EDC348FF4DCD0616597BB809AAE248D-net.java.html-1.2.3.jar 14733 SHA256 125d1cc1df883470c74f396c23630276ace89ab42fb363166a4248c2ddc1487c SHA512 ac034c2b06ab448ce797c9eeea302895fe70bb9661e9a60d5aac7f0e5f1e5a120763b23f369e7fa061231a176177dc9893789ecb60dd987e5c13eedf6af66ad8 WHIRLPOOL a0d65040a60cf1d4c0cfbbd9c261961d8daf10d3fc10fbf131c642110fa0d0c00e1abe2f72263b61346fac8d21b467bacd65599bed466c900fc655ab3433bfb2
 DIST 7BA1E1C450BCD0AD9D0D2F6797A2EB50A4822E0E-net.java.html.boot-1.2.3.jar 58919 SHA256 f30fa9a4f16215bc5d467abef55e1a3814fba7499a42cf46607fad26daf427e3 SHA512 b0169453140a1a8149393581ed3910c6e6423fc80ec8542b7de9de9610c44553ba2bc8ff3a296d172657e2e418d85c9bddc5f1e55cc4c3eae85276d0b5d06233 WHIRLPOOL 55e0f0f943f93bf9eeb5121e65076cfd2e5cd592b752f41db7ecf4a76b494c7d250baa2cc48e4880261821a253065600ee127f1aa648fa31bbd56606fdb45f55
+DIST 7FC91530F4395FA0D58F9539F3B40858E766BFA3-net.java.html.boot-1.3.jar 59464 SHA256 de08b475f31fbfc8b278646f1e682525e0859bbd3a6beebbca5073352dbe48e2 SHA512 dddc4e304ea53bead46d2a5d4485ce51447380003d16aab999fee799e98b9aab281e2d9426b2a41274a4c2fea98bd3a2470594c753c10748db3e3c20f5abecbf WHIRLPOOL 96016e7eb2ae730d018d388a1f41afe5243b6c2b4b5c1fbf2a407b722b317f6660afde6bf56d5f513be467bd9cd375eaeedc3fb26fd570c4d26130af464280e9
 DIST 8621531E83EC4850DA61AA2266FE41105C304F40-net.java.html.boot.script-1.2.3.jar 10706 SHA256 e48b4a3429196bae0de1966304c6821ea62015bd32f634933b63510875310f97 SHA512 eaee1e783b83cde0d9fc86b895388a2efd07bbc032a7e0781ff698a75c7a7e8c308ed8fdcc0a5730a65d2dcf57698d8c9add6753d09884671888cc69839fbd03 WHIRLPOOL ece6aca595880a49342a4d11f5f5bbd21d9bbcceec5e473da7cbf7583328f9333aefa735133d78858b7cffcfb2f6701953a6a6af5ff4df6c05f2ef6e2b6640df
 DIST 941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar 937942 SHA256 84354aa70f995a7ff3c96b144c49b7fe90a0c6e21f818fd23b17f75b17fd1ca9 SHA512 bea8b53fc64cc3fbab1646a9235e7a9d98ffc7311277ea6a53485364462fce1b4bc9645d9f0bb6f072ee32ca730f963f7cad5c43cad052b1df7fad6245c90177 WHIRLPOOL 457ab0e25ca4ace03b91dc7feeb970a8d83f23495f06c0bb15b6c3eceae74f4ab7862aad57e2e8b0109b8cced52bd826a6ede6b31a5437cb341e9809085ee8bd
 DIST 972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar 234898 SHA256 d80c97da091ccc495479980aca82bb9ade3c3239fbc60b5f3840440ed3fe785d SHA512 889ebf198602afd574774ea3f41898f497d7f9af8e9a6397f6555d6fa7ac690e6e7e2e869e181636528f7a5b32204866e53250f6ce790d05763fcea4c8649d16 WHIRLPOOL 47cd43dd5732fe6a773ed50047af2786dd3d4ba712ae5f70c1f80571e835fbbdef68ee90ef3dde9d8e10a0e983f213656acbe287d7d6262c8a0bd0925799d35b
 DIST 989A81454D4FA962EB1C158FE794D2EB060AB9F6-net.java.html.sound-1.2.3.jar 9110 SHA256 116d1e95f47b9e6416070a10f00183924223f006ecc41f05ff7609605223edca SHA512 0b9cc9e8b77def8d9cc76b41c4225079edaac1e3e83d8b4b67b7d8f12b9132d42547ab89bd907ca46a6187f119afb6e1f2a7b2ab22e5928669e61f2f9b0e6515 WHIRLPOOL 386b6cb43831781be94e9ab2cc2c781302c36e55392012bb28fe17682bd356f96ffe56b9229b28a98e308070dbd6857efa036e3168aaaf4c17150306e366e5fd
+DIST A3085BAA78C8EE7F55081E70C79ABE04CA38CE93-net.java.html-1.3.jar 14974 SHA256 e699d8cbcbc2679a42cd80667b16ae4917fd885dcbc0fdd4baa75716e8f8b6de SHA512 7b52a1ad7d32ed98b9bdcc8fe4e179a781cd36b10aa87c3ea60e9fc30f27dd914a1fb94cf09d96b66c2dfb4e4f0811b01febcd746c3316155905f29eeed6abee WHIRLPOOL ba89b226bd591de2a1399bfa2df8271f3c3a6e578c84fd6aa63ea2d287ca7abb33af201eb1255f44b51e040ad98a33d007d7840c89658d3d25169350e2ba86bd
 DIST A3432F57D9B3B4AD62CB0B294EEC43D12FCF3F62-ko4j-1.2.3.jar 86050 SHA256 fbbda04975d9d1a58245da34348b3acda92906f941e3bbeec300d455bbfac77f SHA512 871f8c565afc02a301cd696709df5c132a430691a322db3bb64486b3064396c525b4c73f1214639b79ada947671909ff644ba7f8de1b790e32508c8a7b9aa710 WHIRLPOOL ce9118204472f70eec544bc48b257c856492561da9dd7b5c436149e57cb803b5b107308cb494729592dd55b2619fdf0c758d51ca0459e213a322952c87fe53c6
 DIST AC97B566699146713B3CF0ABC226B5C08EF7CF33-testng-6.8.1-dist.jar 903720 SHA256 f3c0ef4a908848eec98c923cd3251a5c99b5946bee3697f9d22c889192812480 SHA512 84cde632392c370c32d14e7d3f81c655956b2d1ca12b8e5638f6580e34922a9d521b3bc40faec31f96021b03f217988ec685f46757e2e9c28769654306ecc212 WHIRLPOOL 9176b6c49685432617bc35068a2f924059514f710429b2985aede2e9b3c02b8c6cf7f34d8ed04f86a6d4651fe6fca108a3eb8aa3e850dc7f78247d6027083dc7
 DIST AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip 388369 SHA256 8dc5a546c2dea5169aa31234a940035f628d561252ff82c835ec8fe28d5f14c4 SHA512 2a7938d152d101416ce2d06bce39e07d670189450a723cb298d23a1c6613c49569c6774fb160081b08f22e644e71b27787a4eb9173856cfb3d56b05bca9b95e4 WHIRLPOOL c12861342b306704f55709b2452e9fb664065f355d4e8407d8e7564c8c89725a60aa2b9d254f00cefd40af62742193b516547e7b1989651a12daf21c77ca3339
 DIST B27F1304F18FEDE876F940AEFA6C9EB5632619D7-org.eclipse.osgi_3.9.1.v20140110-1610.jar 1392395 SHA256 bdddeb459d260a1ef05b38a5bcf55495411c047c90a7790171a6ef54380fba45 SHA512 183874456aefd6c76f490fe28a0df092719787d2772593753d019a04fd83b566db964303fedd4f1d62f203f6cac9d2470c1e52733694d1e464a6abd727d2df61 WHIRLPOOL 5794acfd955018a9d00bbcd405493df78588b7860c599769862dbb8458fd17214efbaa5f6bec784392f6c62408132889874c3b8cb78b7eea49946c456bafd2cf
+DIST BF6C9BB0FFB78A6B846ECAEB880C460D883B4F72-net.java.html.boot.script-1.3.jar 10702 SHA256 773e5aa7a42e46f0ec7e3fb71f7a457c7d6123ec0a1354ae82a5949b59f38428 SHA512 8e054e4b207a30495718ffd0cc01a0654de1eed4a7ec37d0a23a68aa6a8af1fd215d0660d6d6957e39298866a3e0bdbcea6fd329269ec97bc4141548c814bfc3 WHIRLPOOL 6a9fa93c5c9c5c71d12654505b4cff4e12264c443ce8ef180ccca5e3253adbdf88bffdb91fc19877ad5bb2405ae51687c42bcd2eeb071ddc384d0315c342f87e
+DIST CEC2829EC391CB404AD32EB2D08F879C418B745B-xhr4j-1.3.jar 10718 SHA256 276233b4e339122dae57450b6189f520d44168c01aef607f1095beb16cbad913 SHA512 e679b73200a4cd33bb8ef575aa2d79cab29a0e97d042abf7db9576e247ac720effde1c314636719dbf5133fe9d00457865d1209ae15a3022d931a448f0c0758b WHIRLPOOL 96d2b22fbe1f6fa88ca8555306ac344c773dd7f26e91d05e7229e704163a630af250c26b0c6eedf1c912cf9bad8c36b2299806d9649b28d0fc2bf542f2e1162c
+DIST D97314CE1869DD3B8B8942256A70673E2991C9DD-net.java.html.json-1.3.jar 106018 SHA256 50caf7f7b40c5f444e1a97b982d9a54c7098706f180a92be8ca22d67391e9407 SHA512 d7465d9ee58ba91facdbd911f38993788ca54865da64e5322fd29d399fc8e4b2680bb7c2575ebe421e7a247bb32a5fa5075527c0b3cc0b783a4dc2599b193a86 WHIRLPOOL 65bd9eaa2c18a83ac5242936cb182ee62b6ed2f1381346892bdbfbaabb12d9838203baeb2a9e7ccc41534a3b9e9b08273fb63652d02a78f633a0f5510f2041f9
 DIST E5DDC5E827D3D62E7BE9F7E32927CA01F2839971-org.eclipse.osgi_3.9.1.v20140110-1610.jar 1333309 SHA256 7da1f152b349a9167c7ac8d7e6adbb0ea2f5fe319be2e82c80d18b33265a0fc4 SHA512 db6581b3e208470ced2ea5c367160dcb9470a1858926da46eaad6011d5a9feb273038467f75e57a375376ad947b3c1ecb4e5ea6a2fd88096eda84e1232b2eaef WHIRLPOOL 90f19b85218cfe869028be95b90e2394541a5d761186599ed6ec4a62b207b4e32b9ef292a992b894359b318bff10b764cc481b2e1652df7548dd6fa451c8cd65
 DIST F41518385DA4B5682C864F19B82C3BA4AF65AE83-net.java.html.json-1.2.3.jar 99610 SHA256 2ca5e00b2a44c9c9a2c1f7f9354ce7680d3908894bccc8468956866c1f8e8ba3 SHA512 ea0a2aa2a93c96321c67cdb871ccde933e03258ad99abaa2d00ce3128a9a88f111766222b0d76fa1a2a585c9bd155371aa1385d9c3b48f429d98c7723ff3bf15 WHIRLPOOL 1a9cfa2f5bdac6717e721f9f16494901c24ac5695924e91fb1895fdd3bd601056c855c49c9362c5cd45f697d55fa246766377ca5e968587936a13052aeb203fe
 DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
@@ -40,6 +49,7 @@ DIST netbeans-trunk-nightly-201603100002-src.zip 209888833 SHA256 f13cb9c43038fc
 DIST netbeans-trunk-nightly-201603150001-src.zip 210021503 SHA256 b0ea2aa58d93a667cc83dbec9a9534b4693ac7a8d570682ebcda7fb4bc33a1ea SHA512 a06b780cf27f7e83964261d6a2dbb147e99bb353bae9d5bec0fd6bb8ca3fdc564f2da54eaa66b343089f854cc27e808846699fe691e047a4a04a1b1444143532 WHIRLPOOL f135bfcef0de549b44eeeac35f2cc1e49d4e8b21c3d254398cfd35bb04808c3e55e9fe9953a5b96c8acfc23a331d26f9fb9f9f20ec14ee93665aadd072c29e1f
 DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c89599c9d9ca42493a477d2c2d11cae3e5e1e7b6c3876bc953a SHA512 be94af9676f2559c959c213683ff23720798fe3fb8c5849e7d3422a89ab7de011bcd7eb90d7d480789461a8270ed6c2cbac6536f4ba5b5196472a73c1ac3ce73 WHIRLPOOL 53d7422959ba36b979d9b37333863479f811697f880f2e1c1861a1ff83a735364b265c32314e5ecc4a08e94f1478da3e74ed14112bc5a09b5c7b6b9e97385d4d
 DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
+DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 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_p20160223.ebuild 9360 SHA256 78c6427d97d0b1141709c88e2e30b02c68a6cf9474a6cab8830298b77ab8f025 SHA512 ba699c7ed9c2fb54e6cc8232f2214e7f96621cbf3858fca5d797627ce1d898534b21c9ee23ba6dcd91db931f5161d89c15463bb86387c74db66905b96f37603f WHIRLPOOL 750fa3cbccfa07bd00c64057c2f0d68469ea8db774fc975b19f4afe6d574f97adc2ad90cf73b780aff65b06f0a583f8db19dc9b0aab819b8f251e4c393a76b3a
@@ -60,4 +70,5 @@ EBUILD netbeans-platform-9999_p20160310.ebuild 9360 SHA256 25a7f3dafc302ec8b036b
 EBUILD netbeans-platform-9999_p20160315.ebuild 9360 SHA256 3ecbd4699bcd3e38fda1a063a4dbd20f8681340b2fafe3be51fe7ba3f2181de0 SHA512 acb950ccbde849c08ef0bc3fde208acd752409006d1d19d17ddd9d7afad285c303c02cc467403b6f58f6f8ba6fea715a20a435d9afcade2c7dbedf02158c003d WHIRLPOOL 712193a7a72989d7789497505a8335409c8cd3708125b580a42f9bd343bf3383fac25afcae9676b160eca81f0b1860a93333fa78f3d9b6cfb047a88eb91cabd4
 EBUILD netbeans-platform-9999_p20160316.ebuild 9360 SHA256 9c44bd0fb5330b62798fbb8d0e47676ecdbdbe1402f23150202673bd08c82c9a SHA512 eee06869ee6b0d64edbc1b4540120bf36b36ce08ad613c57432d991af84ba4198e418890e0a8d401f518c9334aebc5bb18f8448c0b330bc7d77180d82764ed72 WHIRLPOOL 584edc403377de5d5c103382124396620000eca813183ac99f342dd2004f34a505d2012deafc4b24d61309e7fa6c76fca6962cef6d477f68a64bed71f4805df9
 EBUILD netbeans-platform-9999_p20160317.ebuild 9421 SHA256 5d9828f5deccf0c5dc717bb6bbcd428a7d9c5ab91b867257a75ca1c933f9d6ba SHA512 ef8bd7e34f946c10a43821ff158a954a5cb118a56b1c3fdeefe63109a902c20ea624194013a9e749fd6998646d33e3808619f7bac8ed56f8c8b7007c7d434551 WHIRLPOOL fef24fc93996fbd6859bcb45a2a3030b16bded499149e0a717351d9e571ce5c50a35fc83bb24f9d5d8031ff340910b96a46ec102ddc267f849b71c9e511dd2ed
+EBUILD netbeans-platform-9999_p20160318.ebuild 9581 SHA256 db1a1733e25b6f13dd9f6e6a7e47ae32f309b7d0cd8cbdb0873c153b1886349a SHA512 ed8b7439fd46ee3c448f95f354e3943478a0de160c234df13b009880fa4b1782cd2f95c51f8319c48e523d13d2bdcb0fbf71906ae9cbdf2441ce746c7da549a0 WHIRLPOOL 259f65c4c0e9a26e6b4e30b63373d24cbceaec8c588192edb9ddc03fd60491b861548a53958261d2caad01cce2cf882d57c5b5752dbba103f56cdfa3bcd3768b
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160318.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160318.ebuild
new file mode 100644
index 0000000..ede2d0d
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20160318.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Platform"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-18_00-01-48/zip/netbeans-trunk-nightly-201603180001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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/0388CADD903570B9FE30140C0EC39DC573389B33-jna-platform-4.2.1-patched.jar
+	http://hg.netbeans.org/binaries/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar
+	http://hg.netbeans.org/binaries/771CDCA0A3F2F3CE818E20CC2D707A3592422485-ko4j-1.3.jar
+	http://hg.netbeans.org/binaries/A3085BAA78C8EE7F55081E70C79ABE04CA38CE93-net.java.html-1.3.jar
+	http://hg.netbeans.org/binaries/7FC91530F4395FA0D58F9539F3B40858E766BFA3-net.java.html.boot-1.3.jar
+	http://hg.netbeans.org/binaries/5C992BAEC0111EE293BD44173140A9D8EC860765-net.java.html.boot.fx-1.3.jar
+	http://hg.netbeans.org/binaries/BF6C9BB0FFB78A6B846ECAEB880C460D883B4F72-net.java.html.boot.script-1.3.jar
+	http://hg.netbeans.org/binaries/10E4214A89082C70FCF9F721953001C0932037BA-net.java.html.geo-1.3.jar
+	http://hg.netbeans.org/binaries/D97314CE1869DD3B8B8942256A70673E2991C9DD-net.java.html.json-1.3.jar
+	http://hg.netbeans.org/binaries/6BDCE8349F83CD02F2942D4FBFA86A81A129F42A-net.java.html.sound-1.3.jar
+	http://hg.netbeans.org/binaries/E5DDC5E827D3D62E7BE9F7E32927CA01F2839971-org.eclipse.osgi_3.9.1.v20140110-1610.jar
+	http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip
+	http://hg.netbeans.org/binaries/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip
+	http://hg.netbeans.org/binaries/CEC2829EC391CB404AD32EB2D08F879C418B745B-xhr4j-1.3.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+# oracle-jdk-bin is needed for now because of javafx which is not packaged separately yet
+# [parseprojectxml] Distilling /var/tmp/portage/dev-java/netbeans-platform-9999_p20151108/work/nbbuild/build/public-package-jars/org-netbeans-libs-javafx.jar from [/var/tmp/portage/dev-java/netbeans-platform-9999_p20151108/work/nbbuild/netbeans/platform/modules/org-netbeans-libs-javafx.jar, /usr/lib64/icedtea8/jre/lib/ext/jfxrt.jar]
+# [parseprojectxml] Classpath entry /usr/lib64/icedtea8/jre/lib/ext/jfxrt.jar does not exist; skipping
+#  [nbmerge] Failed to build target: all-api.htmlui
+
+CDEPEND="dev-java/hamcrest-core:1.3
+	dev-java/javahelp:0
+	>=dev-java/jna-3.4:0
+	dev-java/junit:4[source]
+	>=dev-java/osgi-core-api-5:0
+	dev-java/osgi-compendium:0
+	dev-java/swing-layout:1[source]
+	dev-java/testng:0"
+DEPEND="dev-java/oracle-jdk-bin:1.8[javafx]
+	app-arch/unzip
+	${CDEPEND}"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.platform -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.8"
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r15-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}"/0388CADD903570B9FE30140C0EC39DC573389B33-jna-platform-4.2.1-patched.jar libs.jna.platform/external/jna-platform-4.2.1-patched.jar || die
+	ln -s "${DISTDIR}"/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar junitlib/external/junit-4.12-javadoc.jar || die
+	ln -s "${DISTDIR}"/771CDCA0A3F2F3CE818E20CC2D707A3592422485-ko4j-1.3.jar o.n.html.ko4j/external/ko4j-1.3.jar || die
+	ln -s "${DISTDIR}"/A3085BAA78C8EE7F55081E70C79ABE04CA38CE93-net.java.html-1.3.jar net.java.html/external/net.java.html-1.3.jar || die
+	ln -s "${DISTDIR}"/7FC91530F4395FA0D58F9539F3B40858E766BFA3-net.java.html.boot-1.3.jar net.java.html.boot/external/net.java.html.boot-1.3.jar || die
+	ln -s "${DISTDIR}"/5C992BAEC0111EE293BD44173140A9D8EC860765-net.java.html.boot.fx-1.3.jar net.java.html.boot.fx/external/net.java.html.boot.fx-1.3.jar || die
+	ln -s "${DISTDIR}"/BF6C9BB0FFB78A6B846ECAEB880C460D883B4F72-net.java.html.boot.script-1.3.jar net.java.html.boot.script/external/net.java.html.boot.script-1.3.jar || die
+	ln -s "${DISTDIR}"/10E4214A89082C70FCF9F721953001C0932037BA-net.java.html.geo-1.3.jar net.java.html.geo/external/net.java.html.geo-1.3.jar || die
+	ln -s "${DISTDIR}"/D97314CE1869DD3B8B8942256A70673E2991C9DD-net.java.html.json-1.3.jar net.java.html.json/external/net.java.html.json-1.3.jar || die
+	ln -s "${DISTDIR}"/6BDCE8349F83CD02F2942D4FBFA86A81A129F42A-net.java.html.sound-1.3.jar net.java.html.sound/external/net.java.html.sound-1.3.jar || die
+	ln -s "${DISTDIR}"/E5DDC5E827D3D62E7BE9F7E32927CA01F2839971-org.eclipse.osgi_3.9.1.v20140110-1610.jar netbinox/external/org.eclipse.osgi_3.9.1.v20140110-1610.jar || die
+	ln -s "${DISTDIR}"/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip o.jdesktop.layout/external/swing-layout-1.0.4-doc.zip || die
+	ln -s "${DISTDIR}"/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip libs.testng/external/testng-6.8.1-javadoc.zip || die
+	ln -s "${DISTDIR}"/CEC2829EC391CB404AD32EB2D08F879C418B745B-xhr4j-1.3.jar o.n.html.xhr4j/external/xhr4j-1.3.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	# upstream jna jar contains bundled binary libraries so we disable that feature
+	epatch netbeans-9999-r15-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --into libs.junit4/external hamcrest-core-1.3 hamcrest-core.jar hamcrest-core-1.3.jar
+	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.jna/external jna jna.jar jna-4.2.1.jar
+	java-pkg_jar-from --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+	ln -s /usr/share/junit-4/sources/junit-src.zip junitlib/external/junit-4.12-sources.jar || die
+	java-pkg_jar-from --into libs.osgi/external osgi-core-api osgi-core-api.jar osgi.core-5.0.0.jar
+	java-pkg_jar-from --into libs.osgi/external osgi-compendium osgi-compendium.jar osgi.cmpn-4.2.jar
+	java-pkg_jar-from --into o.jdesktop.layout/external swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
+	ln -s /usr/share/swing-layout-1/sources/swing-layout-src.zip o.jdesktop.layout/external/swing-layout-1.0.4-src.zip || die
+	java-pkg_jar-from --into libs.testng/external testng testng.jar testng-6.8.1-dist.jar
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	unset DISPLAY
+	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+	pushd nbbuild/netbeans/platform >/dev/null || die
+
+	java-pkg_dojar lib/*.jar
+	grep -E "/platform$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	insinto ${INSTALL_DIR}
+	doins -r *
+	rm "${D}"/${INSTALL_DIR}/docs/junit-4.12-sources.jar || die
+	dosym /usr/share/junit-4/sources/junit-src.zip ${INSTALL_DIR}/docs/junit-4.12-sources.jar
+	rm "${D}"/${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip || die
+	dosym /usr/share/swing-layout-1/sources/swing-layout-src.zip ${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip
+	find "${D}"/${INSTALL_DIR} -name "*.exe" -delete
+	find "${D}"/${INSTALL_DIR} -name "*.dll" -delete
+	rm -fr "${D}"/modules/lib || die
+
+	popd >/dev/null || die
+
+	fperms 775 ${INSTALL_DIR}/lib/nbexec
+	dosym ${INSTALL_DIR}/lib/nbexec /usr/bin/nbexec-${SLOT}
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext
+	pushd "${instdir}" >/dev/null || die
+	rm hamcrest-core-1.3.jar && java-pkg_jar-from --into "${instdir}" hamcrest-core-1.3 hamcrest-core.jar hamcrest-core-1.3.jar
+	rm jhall-2.0_05.jar && java-pkg_jar-from --into "${instdir}" javahelp jhall.jar jhall-2.0_05.jar
+	rm jna-4.1.0.jar && java-pkg_jar-from --into "${instdir}" jna jna.jar jna-4.1.0.jar
+	rm junit-4.12.jar && java-pkg_jar-from --into "${instdir}" junit-4 junit.jar junit-4.12.jar
+	rm osgi.cmpn-4.2.jar && java-pkg_jar-from --into "${instdir}" osgi-compendium osgi-compendium.jar osgi.cmpn-4.2.jar
+	rm osgi.core-5.0.0.jar && java-pkg_jar-from --into "${instdir}" osgi-core-api osgi-core-api.jar osgi.core-5.0.0.jar
+	rm swing-layout-1.0.4.jar && java-pkg_jar-from --into "${instdir}" swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
+	rm testng-6.8.1-dist.jar && java-pkg_jar-from --into "${instdir}" testng testng.jar testng-6.8.1-dist.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/platform
+}

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 2721c78..152dd7c 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -22,6 +22,7 @@ DIST netbeans-trunk-nightly-201603100002-src.zip 209888833 SHA256 f13cb9c43038fc
 DIST netbeans-trunk-nightly-201603150001-src.zip 210021503 SHA256 b0ea2aa58d93a667cc83dbec9a9534b4693ac7a8d570682ebcda7fb4bc33a1ea SHA512 a06b780cf27f7e83964261d6a2dbb147e99bb353bae9d5bec0fd6bb8ca3fdc564f2da54eaa66b343089f854cc27e808846699fe691e047a4a04a1b1444143532 WHIRLPOOL f135bfcef0de549b44eeeac35f2cc1e49d4e8b21c3d254398cfd35bb04808c3e55e9fe9953a5b96c8acfc23a331d26f9fb9f9f20ec14ee93665aadd072c29e1f
 DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c89599c9d9ca42493a477d2c2d11cae3e5e1e7b6c3876bc953a SHA512 be94af9676f2559c959c213683ff23720798fe3fb8c5849e7d3422a89ab7de011bcd7eb90d7d480789461a8270ed6c2cbac6536f4ba5b5196472a73c1ac3ce73 WHIRLPOOL 53d7422959ba36b979d9b37333863479f811697f880f2e1c1861a1ff83a735364b265c32314e5ecc4a08e94f1478da3e74ed14112bc5a09b5c7b6b9e97385d4d
 DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
+DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 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_p20160223.ebuild 3472 SHA256 c38a3b4ea35fb1d709b1fe432edd11de71481cfb45a28e0cf2e7e0468a7c1d8c SHA512 be3e9f9cda15a1ce7aa7503e12c20d43d7cb7761364de396d8b1e25782eba6201542d7687dd70f610ad6142c4f42ca00cebf41999b9026eab2fedeae65ce6219 WHIRLPOOL 6f8bf25def2259566b3c28377407cf49c9ead12e50cd3529bbdb5b10e9d3290c3c4510b982f6d299f144f2385210dc7dcc681ca45a3ad12629635f5507f3bf60
@@ -42,4 +43,5 @@ EBUILD netbeans-profiler-9999_p20160310.ebuild 3472 SHA256 ed2b0397c14a310eac207
 EBUILD netbeans-profiler-9999_p20160315.ebuild 3472 SHA256 89264ec877e4adafbb9c50387c556e22f13e36a2a1b104ce22dc996ec53bf2eb SHA512 dca291db2653e70230639350f80a3d5cb1a7a711c46e46e90b841da07fa84bffd00f11de34b33e1b08c9980a22786d8021c7f8a8aba2664e49e5695d77914e27 WHIRLPOOL 55664c898fc201ed3b2967c11a6140e8d6f274b2c022dc887d7a11aceb52e2a45104599b5bc34d08ee29d9df5f3579281ea25351a7a228505cc3fd2fdc62dcef
 EBUILD netbeans-profiler-9999_p20160316.ebuild 3472 SHA256 9bcd46949afed478f5fac0b310cef1e1f4854234bca722a7135737b432f40eb8 SHA512 70c0c0bb426c7f011e7a568b8ae2b16aaad58f796c49c85b7dde20b0e9bcd0774b4da46726cef5f30222d3ab8ed988e7c1ca677796316cba73f2b3a9de9cfcc3 WHIRLPOOL eb002e9a325d9b9f5747d531737d779eacc4df96b4a29f790a83311f144a871301f43908a88ef0dd0a185f63947484a925b6e9bd09fe99e3289604845f56a1aa
 EBUILD netbeans-profiler-9999_p20160317.ebuild 3472 SHA256 a6f563645b63a5d2986310ad8ad0d0dd476c18a2d04dabbd66f91b97e3a55539 SHA512 a99e7bb7c86cccf41009044cd7cd03ee4afa0d1e5dd475fdae83461c1eb9b504c616eb09a05e4d0d2811bf22392dc51852ae5a01bb3b51714c6788545d4c78d9 WHIRLPOOL 0407b5a0283469dcfc0c22edd3f4e01fff5e81858ef328d4b00a75b4957e60c2d7653cedbba09a4fa9a5712c8e77c13b5affad23bf304998c748d1bdbe1e9e4f
+EBUILD netbeans-profiler-9999_p20160318.ebuild 3472 SHA256 1584a63dff37711ad3c3879c17552f7e5ab3ecfe6a084cda5c9c593b831c8fac SHA512 cfb693f3956903efad33c131d8fd80b063c52f37d27a3f4d09346b6999d042dafc7c904635a8f873d72b0a767d1f2604ac4d0582022fa9cae91246dd3401596e WHIRLPOOL e7bc6e161d78bd7753919dee47a2423ced0ca2fedc3ae75891f7803001c7c3c9ebb9bd30d9c3a625b6a350165eadaea29e28068226733bb9e739de9c56bac33c
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160318.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160318.ebuild
new file mode 100644
index 0000000..43ac9bf
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160318.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Profiler Cluster"
+HOMEPAGE="http://netbeans.org/projects/profiler"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-18_00-01-48/zip/netbeans-trunk-nightly-201603180001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r15-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 23e25a2..4109d13 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201603100002-src.zip 209888833 SHA256 f13cb9c43038fc
 DIST netbeans-trunk-nightly-201603150001-src.zip 210021503 SHA256 b0ea2aa58d93a667cc83dbec9a9534b4693ac7a8d570682ebcda7fb4bc33a1ea SHA512 a06b780cf27f7e83964261d6a2dbb147e99bb353bae9d5bec0fd6bb8ca3fdc564f2da54eaa66b343089f854cc27e808846699fe691e047a4a04a1b1444143532 WHIRLPOOL f135bfcef0de549b44eeeac35f2cc1e49d4e8b21c3d254398cfd35bb04808c3e55e9fe9953a5b96c8acfc23a331d26f9fb9f9f20ec14ee93665aadd072c29e1f
 DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c89599c9d9ca42493a477d2c2d11cae3e5e1e7b6c3876bc953a SHA512 be94af9676f2559c959c213683ff23720798fe3fb8c5849e7d3422a89ab7de011bcd7eb90d7d480789461a8270ed6c2cbac6536f4ba5b5196472a73c1ac3ce73 WHIRLPOOL 53d7422959ba36b979d9b37333863479f811697f880f2e1c1861a1ff83a735364b265c32314e5ecc4a08e94f1478da3e74ed14112bc5a09b5c7b6b9e97385d4d
 DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
+DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 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_p20160223.ebuild 5280 SHA256 46af50cc127d8757d9c497309373139aba8ef44c6b837d92a96da3b572e5972e SHA512 d2b5310e85cbafa3308117915050d326c28f613121d2e9a1ab0de5816b53a0720d3156dd6d6a679f6e28a107572f6e21dcf8736029d1f0043745793ae0c903ba WHIRLPOOL a47e42f5adf77bbe9ade116423dea10bb5e874ade3dcbe530d6d68f0b0aa8d9363548e907fac1faec32dc6c97f3bb5b704086e840e88ccec8f8d8592106f92da
@@ -58,4 +59,5 @@ EBUILD netbeans-webcommon-9999_p20160310.ebuild 5244 SHA256 5d82efd217257d990335
 EBUILD netbeans-webcommon-9999_p20160315.ebuild 5244 SHA256 835727030311efb639f4653c221b0be18003f52d3ddc79ff79573caff7aa937e SHA512 1a3c084660b7bb19d5d790e41be3c43a2f212c0d84e42a05506257393bcfe2a231535b9691360557934d2845db01b2666fc82caa9a85f7aa5bfbc9e0e066acd5 WHIRLPOOL 31383c3b7c25dbb2fa47c6eb5feafd72534657ec5a06658a29b18fc002b036be28c85713c6515b7bbf4d59f2d653d1d66f68f04e6cb6e701a6d1821a6d561fec
 EBUILD netbeans-webcommon-9999_p20160316.ebuild 5244 SHA256 10198edde545dd3cd708ed683d97d9a223b9339e86aa544e1218a5eb703fe657 SHA512 d72ed54cc339c4337acc43c9a814c5245725f6ffcd1e0e82b378faafb83cbf249faaaf7c06407a915f26ace737887f441e06740055db44cf5ef903e7ca641815 WHIRLPOOL a23f9eb4b7303ac2552e6dd6b53ba15fc2989b42dab709bad06413486a33136f865daddf5915f15809e17b7be222e9c57614b8165b0732a7e8d606b096456930
 EBUILD netbeans-webcommon-9999_p20160317.ebuild 5244 SHA256 2700f7310a1ec5e460f25b50f9b6fdcfe104d815d74fda77c9646e039f24c71b SHA512 69ba1d2dc1f3ef5f84fb1da41715f3bf1457a41ef0ee217d35c12ef20efdb83dc7d452b1bc307f5052cc20880cce31d4e9afe63bb3a92d40e97b132ba58a6b2c WHIRLPOOL d2378a652d577bf271f76a80d927cd29100f2fc3a75699f0d40b33a47033ea7ab5557b50374a836965d91ec5e3e96016c23b63cef0965bbd8af242db369c3585
+EBUILD netbeans-webcommon-9999_p20160318.ebuild 5244 SHA256 c28b7fad684b23cc00ec1b404aacbf3656a80ef2adc7b92910b885f56b29984d SHA512 57e0cbeea116459c1fae1484cb874af830fe321ef3639e43129a01a3a7192b4b409e82818fb7c9c46c42d62c278dc6e32b43ece33287fca16763db002501855e WHIRLPOOL 628aae7addcdb8ce8fdc571c673bc1581839fcfc093c6804c4b48b9cd159615cf553d51c6b87c390e45722c306d759a62866bf39c3abb62af5fb34febe81a7d4
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160318.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160318.ebuild
new file mode 100644
index 0000000..89e9abb
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160318.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-18_00-01-48/zip/netbeans-trunk-nightly-201603180001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar
+	http://hg.netbeans.org/binaries/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim
+	http://hg.netbeans.org/binaries/0929AC5F40B5A8667021408748D64F30F77B3165-libiDeviceNativeBinding.dylib
+	http://hg.netbeans.org/binaries/2A38DA3DB5D36DBBDC0B03990B46810F72430D5E-libimobiledevice.4.dylib
+	http://hg.netbeans.org/binaries/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib
+	http://hg.netbeans.org/binaries/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar
+	http://hg.netbeans.org/binaries/C1BB9FF4232248B0054E5A26A33474A251EA19CB-libusbmuxd.2.dylib
+	http://hg.netbeans.org/binaries/D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip
+	http://hg.netbeans.org/binaries/1EFED55F8C442E4DB1C2338A5C35D494364F9ECD-ojetdocs-1_1_2.zip
+	http://hg.netbeans.org/binaries/CA8F6968FED0BE20E786C70CF9B603F4D7B66C68-ojetdocs-2_0_0.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+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-r15-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar libs.plist/external/dd-plist.jar || die
+	ln -s "${DISTDIR}"/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim cordova.platforms.ios/external/ios-sim || die
+	ln -s "${DISTDIR}"/0929AC5F40B5A8667021408748D64F30F77B3165-libiDeviceNativeBinding.dylib cordova.platforms.ios/external/libiDeviceNativeBinding.dylib || die
+	ln -s "${DISTDIR}"/2A38DA3DB5D36DBBDC0B03990B46810F72430D5E-libimobiledevice.4.dylib cordova.platforms.ios/external/libimobiledevice.4.dylib || die
+	ln -s "${DISTDIR}"/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib cordova.platforms.ios/external/libplist.1.dylib || die
+	ln -s "${DISTDIR}"/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar libs.jstestdriver/external/libs.jstestdriver-ext.jar || die
+	ln -s "${DISTDIR}"/C1BB9FF4232248B0054E5A26A33474A251EA19CB-libusbmuxd.2.dylib cordova.platforms.ios/external/libusbmuxd.2.dylib || die
+	ln -s "${DISTDIR}"/D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip html.ojet/external/ojetdocs-1_0_0.zip || die
+	ln -s "${DISTDIR}"/1EFED55F8C442E4DB1C2338A5C35D494364F9ECD-ojetdocs-1_1_2.zip html.ojet/external/ojetdocs-1_1_2.zip || die
+	ln -s "${DISTDIR}"/CA8F6968FED0BE20E786C70CF9B603F4D7B66C68-ojetdocs-2_0_0.zip html.ojet/external/ojetdocs-2_0_0.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r15-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 c6597e4..3be8bb1 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -22,6 +22,7 @@ DIST netbeans-trunk-nightly-201603100002-src.zip 209888833 SHA256 f13cb9c43038fc
 DIST netbeans-trunk-nightly-201603150001-src.zip 210021503 SHA256 b0ea2aa58d93a667cc83dbec9a9534b4693ac7a8d570682ebcda7fb4bc33a1ea SHA512 a06b780cf27f7e83964261d6a2dbb147e99bb353bae9d5bec0fd6bb8ca3fdc564f2da54eaa66b343089f854cc27e808846699fe691e047a4a04a1b1444143532 WHIRLPOOL f135bfcef0de549b44eeeac35f2cc1e49d4e8b21c3d254398cfd35bb04808c3e55e9fe9953a5b96c8acfc23a331d26f9fb9f9f20ec14ee93665aadd072c29e1f
 DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c89599c9d9ca42493a477d2c2d11cae3e5e1e7b6c3876bc953a SHA512 be94af9676f2559c959c213683ff23720798fe3fb8c5849e7d3422a89ab7de011bcd7eb90d7d480789461a8270ed6c2cbac6536f4ba5b5196472a73c1ac3ce73 WHIRLPOOL 53d7422959ba36b979d9b37333863479f811697f880f2e1c1861a1ff83a735364b265c32314e5ecc4a08e94f1478da3e74ed14112bc5a09b5c7b6b9e97385d4d
 DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
+DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 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_p20160223.ebuild 2721 SHA256 91ae22880cf71f21a6686abe6303d38d1fbc352eab28aa6aceec838df867a617 SHA512 40a3dff775b85c8d392fb55534450e0605aa0cbe33edc7f0355357d8200c5c30656e665281f48897db132ccba682756b58d7a65c98c1bed120685520612f7b0b WHIRLPOOL 267a3ad3e95a7a2c26cc8460fec3a8e45156fad105e9da639cc2d2f33a355929421a0e1e7e7207aea8a0251095174e146f919ac5625453c481294021e25e4d1f
@@ -42,4 +43,5 @@ EBUILD netbeans-websvccommon-9999_p20160310.ebuild 2721 SHA256 653bc5184ae2689b2
 EBUILD netbeans-websvccommon-9999_p20160315.ebuild 2721 SHA256 c6635aa2d34b04bdf67c139340d492836e2a1ac99fb6d6034f03e5d939147a03 SHA512 313af0fcd157eeb5efa3ef26b7fc4a659ed64596810c5457496bf644848f31d02bfd3ef0e2b65272147d71578471565d38b09a5d7e71064e02b15110d940775d WHIRLPOOL e3d9254d700b7d720fdf49c2a98e0954358304e650e6c04e05cc63c580288bb5baf5c9f7fe031cc4a25ad6865e648c7209e901f4f5741a1c259d78ee4c12d2c7
 EBUILD netbeans-websvccommon-9999_p20160316.ebuild 2721 SHA256 8a07ef88583977f67457beb80754368bce495718c5cb6987bef37993e978e168 SHA512 d5dc1dc2efa9509ab00f0da9d098281ec3af685d9a6dd0a53859dad3f612fb78757d6719596ac542ee68dd7de6f359ed2a7cfc396f4e57559c327e7983aaea9f WHIRLPOOL 7c5503a521ecfdb948ae1d383cfb997b925e9fce20de999e2d5272553544fd1157f9fac358aae688dda0a69ab7377b9dcd5198591b98e7ef49f12a0d46e0f629
 EBUILD netbeans-websvccommon-9999_p20160317.ebuild 2721 SHA256 904ac318e98083851a60b0c19cbcf2d41304f7ef0f80976ca19af23c76405861 SHA512 2e69a65036eb87136767e3bd909434054afeaac3f3861f4524137ce0c32a81b41849462ef8814f35324f8aceca247d463974a8e065dd3f8fd8a3379b8c4a86c3 WHIRLPOOL d7a39c34337a08696fcf72a01920b99a036baa3d43c7a1c654ad56f087beda27a4d818ca1303333b2a6a769d92ca7855160a6b7fc5d7a1ad9c95e6bf9b2c22d0
+EBUILD netbeans-websvccommon-9999_p20160318.ebuild 2721 SHA256 f261ea6ee8ad3f4bf7f777a1517edf187dddf7dc4d307df50f5b2f229c8fb7b8 SHA512 999cc373f762a7c91780c5b62e2e6af3dd82c14c4f0167cc575c45a09122a94feb528563fc9b376ba1fdbe8f4e1d216d024f8155b0c53bc4995adf12626efd7d WHIRLPOOL 5cd9d416043483556147ca910919219268100496da2dda93c760190f5d4a7090376e2aaac514336e34168e10f61c28c47876fcc5960b06be030f78306403a0c0
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160318.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160318.ebuild
new file mode 100644
index 0000000..66e6b9c
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160318.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Common Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-18_00-01-48/zip/netbeans-trunk-nightly-201603180001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r15-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 4222894..c44301e 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201603100002-src.zip 209888833 SHA256 f13cb9c43038fc
 DIST netbeans-trunk-nightly-201603150001-src.zip 210021503 SHA256 b0ea2aa58d93a667cc83dbec9a9534b4693ac7a8d570682ebcda7fb4bc33a1ea SHA512 a06b780cf27f7e83964261d6a2dbb147e99bb353bae9d5bec0fd6bb8ca3fdc564f2da54eaa66b343089f854cc27e808846699fe691e047a4a04a1b1444143532 WHIRLPOOL f135bfcef0de549b44eeeac35f2cc1e49d4e8b21c3d254398cfd35bb04808c3e55e9fe9953a5b96c8acfc23a331d26f9fb9f9f20ec14ee93665aadd072c29e1f
 DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c89599c9d9ca42493a477d2c2d11cae3e5e1e7b6c3876bc953a SHA512 be94af9676f2559c959c213683ff23720798fe3fb8c5849e7d3422a89ab7de011bcd7eb90d7d480789461a8270ed6c2cbac6536f4ba5b5196472a73c1ac3ce73 WHIRLPOOL 53d7422959ba36b979d9b37333863479f811697f880f2e1c1861a1ff83a735364b265c32314e5ecc4a08e94f1478da3e74ed14112bc5a09b5c7b6b9e97385d4d
 DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
+DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 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_p20160223.ebuild 6939 SHA256 4983a26789624ec9422887100f322c64fe62af55cd7cc9a6dd539d37c475827d SHA512 352e85e53c08e87c671cac68ac2ad62247ed7df5f7c631e0d16cea5936e930e80d22f2e9d118f488faa5db5082d74defc38169dfee231f8771538aff6671b470 WHIRLPOOL de818ecc93fbacc632c4075a3cbfee90795d889eda7f71cfa8e192515025fa552b556482556d68d0e4eaad88ddef3348910ef092574ad2638f7bf1f0916642f5
@@ -45,4 +46,5 @@ EBUILD netbeans-9999_p20160310.ebuild 6939 SHA256 dcb6b43b4837806bef912177449998
 EBUILD netbeans-9999_p20160315.ebuild 6939 SHA256 50b7d31d9498e199a70e743b3b7c708a405ca683f9545f1206081ed84f53a368 SHA512 22ab2dfed73f2f95986219b9a8405e675848b3a3686976f8e02c332a846c3a1d78a95b4c43c6573adb699345d3f8d46e307cd3c25114f7e1459b2b6c1d741960 WHIRLPOOL b1435ab027649fe973407e4726b8a9a11391a8c1775baf85c2802c451527bbc0a55418f524855e0c57dff76cd2bae6d85a5ce600b1210c86168d94bb9747e041
 EBUILD netbeans-9999_p20160316.ebuild 6939 SHA256 ec060ffffa8905bde4b4cabf768690a1c8cc3c1d3a60e18fdfca1b4b32c43398 SHA512 c83a272a3db907fbe9166062c5b1d563974ed27c34cd40e3867ca47d4a468a7c7db1259c9a5d86ae0f8e1c0d68eac6fe1bd69012d546c69c08d02adc63bfa41d WHIRLPOOL ba5274d9813a707e063d6037ef8f274518dadc5e1cc68a585f8f0163a0a45dfb95744897604d361ae8e09dea7ca7c2f1e5817720e830f63f49bd189e1f2b0bdf
 EBUILD netbeans-9999_p20160317.ebuild 6939 SHA256 a897b7ae94ad8027afe154a2d8dca577d398e647a83220466917e31fed6e8348 SHA512 5d86321a4e2880d1559e7eacf8ffbd1cb3fda93e2864bed0a9070788595eb574eb7edcb403ba1addfa37ca1128bf90e42196c5f2f2d0b2a7dc68bbed864debc7 WHIRLPOOL b7019e854c34dd0fc04d77a7d1be75911828e6bb37dabeb937ed83805feab7f4ba03de0d704db7dd27760c3f9f027fce6cf7983e2aca4058fa01e442481a57ac
+EBUILD netbeans-9999_p20160318.ebuild 6939 SHA256 fbc2d450376c4bdeb779ae76020fbeea61a4591763505cddf4bdb9993cda3eca SHA512 d3d0e73641486fc9c608a8cb40e297d49bc23ec77b47eecde7251b88dde5108edb50d82cdf64fd738bd34b721b3a348db7712f5771663ed27e8287b6806538d4 WHIRLPOOL d668f8ad9a80289c7b05260d3c44af546b971cb67bb0371388ea3a782b60ab269078342bb050869276a932983ed051f01525c363766ae625ffc0e274fa7ffd4b
 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834

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


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

end of thread, other threads:[~2016-03-18 11:26 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-29  8:06 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-webcommon/, dev-java/netbeans-javadoc/, Miroslav Šulc
  -- strict thread matches above, loose matches on Subject: below --
2016-03-18 11:26 Miroslav Šulc

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