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

commit:     cba1020f7ba8ba75294d785eeb5624eeb95e44ce
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 23 09:26:44 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Apr 23 09:26:44 2015 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=cba1020f

netbeans: bumped to the latest sources

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

diff --git a/dev-java/netbeans-apisupport/ChangeLog b/dev-java/netbeans-apisupport/ChangeLog
index f5c5332..e208096 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_p20150423 (23 Apr 2015)
+
+  23 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-apisupport-9999_p20150423.ebuild:
+  bumped to the latest sources
+
 *netbeans-apisupport-9999_p20150421 (21 Apr 2015)
 
   21 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 7d78863..e70a8e3 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201504140001-src.zip 207131027 SHA256 78124063613a80
 DIST netbeans-trunk-nightly-201504160452-src.zip 207150212 SHA256 16f83a8d853a24a06c78f758426af3fded5d6284a27a1e867656ccfb51dad248 SHA512 9155dec6773c8560091652e93c561874be5fbbb18eb7658c53d872eb081e31683358986921c90d371f5e8a3c66779532fba131e5bf9d90c97d2518b5349fa881 WHIRLPOOL bce9d3120af6e9cd41850622e460c94f17aa641bf03da0657ecc75df24361e35f347d91a571f598bfa858cb8b9e608a02189f60b0d40e75f7d8c8ac938ca6042
 DIST netbeans-trunk-nightly-201504170001-src.zip 207165961 SHA256 a30747f33bf216973e62f474edffb31d9db669c6250ea4f12eb83b42f3515843 SHA512 6df1a966b8bca727728b9a007f8448b57c41270b9fabf9039ef958648c7c96c1a0fa20e86e75d90a5bf86700827c1b2520d2ac12ee6e9ee550ea931b2d2419ed WHIRLPOOL 945ef6e67fd91c0c8dfeceff4ed0a4226f0090a134137357e6ad5c6ffcc82815ef6d4cba7cf1f9d6a0682f34454012b28d8124b44a294bb586f671f5dc5c032d
 DIST netbeans-trunk-nightly-201504210001-src.zip 207178961 SHA256 b277aeba16c941024cc88c8d36a4183ff078adf054721dadc8593be14c963c0d SHA512 d421faa83f70a9ec7cb58d88290aa1104839d2b3e5f3e4582f1c2294fa2647913911eb298d625ad8a97bbf7aa2c35314a4480e20d36c0f4abb7f909c5f2c3481 WHIRLPOOL 5b2becf39729c209e27bd3cbcf0f7fe88b1829c3e898c24fc6d5c1efb4345cd17637243390886151cdba80d05cff65da6eedf7fcb9bb3fca42afb08d26ed2fa8
+DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9ebdb4fae53f4999d1bb357dad09966f36c050e52d9cf53507f6 SHA512 2a2a5dab10d0dcf6797f1a51f58af7a2f39c9c10a29f5e3f231e895e20333b434273cb69192209e400c75bde82a6d7175c0018fba94998911f4e71abf30f4119 WHIRLPOOL 7ae4e39d0a8f0e7ee249e3f8fa7aa0a77f837734e9e7dfa3b2b648c015fba99f5f0d1088474c8678cf9de0728c1ce1eb9bd6de0319369c862011531c84c1e0f5
 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
@@ -56,5 +57,6 @@ EBUILD netbeans-apisupport-9999_p20150414.ebuild 3390 SHA256 96cd4c467f2e398af47
 EBUILD netbeans-apisupport-9999_p20150416.ebuild 3390 SHA256 95c0f17352fd43146e07b5931afb116180d594f55700bf3de49b6b1b8cdccdcb SHA512 98f285542039fc29207fa8ffc9b09dc879b013e857d30c91b821c84c8e8bad8a691bd85b84386eef8e8108440bb04fa6d316708321b0d7ff708f367a67964018 WHIRLPOOL eb11342c828b0b5073cb0bbb2bf7c26ddbd6fd01f341049bee1e0109b3439c7dc757351ecf2cc3ab6c8af273338b7d0e34677e009d9121d52c9722a7680be58e
 EBUILD netbeans-apisupport-9999_p20150417.ebuild 3390 SHA256 0d85a2d19ab9ccc210269fc551c155925d7300a8da12258d4f8321d26de5ffb8 SHA512 eb60653c1b9d8766c1628329e748aa475571ed8a4c3f785ded47bbecd8582865461c99e61d78d644fa34a9f8ad6e9b1d167ee05b95dad1cf6fe097054acab06b WHIRLPOOL 2d39597968c609298d44476373034e4fc247771055c0b3eb9ff398fe746f54c24f3a07440e53aa7bdcc966d9a8623d32a7a48d0f3d3b6d829c2732ae3ff0369d
 EBUILD netbeans-apisupport-9999_p20150421.ebuild 3390 SHA256 0304c8008fda731adc0cd938fc3925ed618d4766e27407e354ac823b2332bb77 SHA512 dc7c1fb007da9bda4426a6732545eeb4688acf56b9e2285549078083c900882d0f8604513fe12e6b587de3aaef6825acfb9fd02b30e5d4844b73606b3d040c90 WHIRLPOOL 6b4f330d87938032860dca5c7b5fdb41ee0ee8d789cf44ccfdea8bd51326a27b0069b9d34985b689d601e42cf322a0c9d1c6f36f8b2adddf43938b4a5f5992b7
-MISC ChangeLog 168326 SHA256 2bc398d92eb7a0ec2cc6d42db7eb30dbf371b1c1d3a76f0da8a85e2ceb03366e SHA512 e8eec93b893dc8b7da163ac4df25a2b7977f65dc68be61844faec4f7b301fe467319c0579f6d9f135a60ef6b7a2f2620ad81bd4f800b962690c1d64efdf27d94 WHIRLPOOL ae4b2e3bcfcaaa0bdf6132271922c4548426d180c352283128337b2de8e8c8c13cc54b25bc9d46e944a6a661d777f1525fb8b2293bfeb373efdc407b0f5bd9c8
+EBUILD netbeans-apisupport-9999_p20150423.ebuild 3390 SHA256 07a92b64899e853f4475b621623394c72f58603297b75fcf8ca901315b2b3e2c SHA512 2f211f6623f179b33670e5988caeb1a8497aeec812b96c9eedf795d2b67d07740efbd9b8558dd77abc8f65a481d2a61c2bf01a5590d0794b7e828932407455ec WHIRLPOOL 37fd850be51d1c788f793e0ec4c1813c290f7c016f49516e10c6fabec25a445340fb01ba6ec8bafaeecd6825100c1e29fd10fc2676b6b30706fa5f1833e60a26
+MISC ChangeLog 168507 SHA256 ef454ed654d31ea477e4af5c8c1581545ea3e499154496e95784e4963ed677cf SHA512 8600197ec0079645b98ae6341af0df9d137689ae8818b04c25badf506b81e84f40d7f9db1daf1dbb53e4941dc95c04f47bb2551526d88c6e6ab022f26a89b05e WHIRLPOOL 6994b61b02423fe8fc3f5a927ba548a8fdcb62ebd1ff1287162a7a5387af9d3ff45409ebe9ddbe22cc38965e97b7241c7d1426be9a6a9c24ea6abcea2799b4b7
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150423.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150423.ebuild
new file mode 100644
index 0000000..fa394d9
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150423.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-04-23_00-01-56/zip/netbeans-trunk-nightly-201504230001-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 8d2b1be..3066751 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_p20150423 (23 Apr 2015)
+
+  23 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-cnd-9999_p20150423.ebuild:
+  bumped to the latest sources
+
 *netbeans-cnd-9999_p20150421 (21 Apr 2015)
 
   21 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index d293bb1..da89cbd 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -46,6 +46,7 @@ DIST netbeans-trunk-nightly-201504140001-src.zip 207131027 SHA256 78124063613a80
 DIST netbeans-trunk-nightly-201504160452-src.zip 207150212 SHA256 16f83a8d853a24a06c78f758426af3fded5d6284a27a1e867656ccfb51dad248 SHA512 9155dec6773c8560091652e93c561874be5fbbb18eb7658c53d872eb081e31683358986921c90d371f5e8a3c66779532fba131e5bf9d90c97d2518b5349fa881 WHIRLPOOL bce9d3120af6e9cd41850622e460c94f17aa641bf03da0657ecc75df24361e35f347d91a571f598bfa858cb8b9e608a02189f60b0d40e75f7d8c8ac938ca6042
 DIST netbeans-trunk-nightly-201504170001-src.zip 207165961 SHA256 a30747f33bf216973e62f474edffb31d9db669c6250ea4f12eb83b42f3515843 SHA512 6df1a966b8bca727728b9a007f8448b57c41270b9fabf9039ef958648c7c96c1a0fa20e86e75d90a5bf86700827c1b2520d2ac12ee6e9ee550ea931b2d2419ed WHIRLPOOL 945ef6e67fd91c0c8dfeceff4ed0a4226f0090a134137357e6ad5c6ffcc82815ef6d4cba7cf1f9d6a0682f34454012b28d8124b44a294bb586f671f5dc5c032d
 DIST netbeans-trunk-nightly-201504210001-src.zip 207178961 SHA256 b277aeba16c941024cc88c8d36a4183ff078adf054721dadc8593be14c963c0d SHA512 d421faa83f70a9ec7cb58d88290aa1104839d2b3e5f3e4582f1c2294fa2647913911eb298d625ad8a97bbf7aa2c35314a4480e20d36c0f4abb7f909c5f2c3481 WHIRLPOOL 5b2becf39729c209e27bd3cbcf0f7fe88b1829c3e898c24fc6d5c1efb4345cd17637243390886151cdba80d05cff65da6eedf7fcb9bb3fca42afb08d26ed2fa8
+DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9ebdb4fae53f4999d1bb357dad09966f36c050e52d9cf53507f6 SHA512 2a2a5dab10d0dcf6797f1a51f58af7a2f39c9c10a29f5e3f231e895e20333b434273cb69192209e400c75bde82a6d7175c0018fba94998911f4e71abf30f4119 WHIRLPOOL 7ae4e39d0a8f0e7ee249e3f8fa7aa0a77f837734e9e7dfa3b2b648c015fba99f5f0d1088474c8678cf9de0728c1ce1eb9bd6de0319369c862011531c84c1e0f5
 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
@@ -71,5 +72,6 @@ EBUILD netbeans-cnd-9999_p20150414.ebuild 4586 SHA256 6a37a83fdbe6676a90447630a1
 EBUILD netbeans-cnd-9999_p20150416.ebuild 4586 SHA256 583b40ea86c831a185ce9164ddbd1c6e0466fec5daa33bbe0c6a01dd33ebdac1 SHA512 2cc714972ca44ae6ed63ac890c6b7e1e74e98ede5ff5c9b6bc4f38dd6a9c97606ba667cb8454153064d155fb803e16caa3ff5a68e984cbd241b128c66ea7b2f1 WHIRLPOOL 3ee99fa711d98e3f311543ee339bc88c1f4ff3af4a004eddc0b2ee24a8148f520a67c895fec44ef323a163e252e135ebc32af2e63fe9cf2c702d4f577b9f37ab
 EBUILD netbeans-cnd-9999_p20150417.ebuild 4586 SHA256 43318076d210601bbb4027e62fb96308ad4ebf6e488f7a014307e95f829aef8a SHA512 48c293e6285208fcf3ed40317801f2f3382e498fba0261b6f34072a72ea385caa5c0081b96fcf8788a717605a1605f9a92b2f64c64a2d73baf535352a4a2d870 WHIRLPOOL bee74016fd9649289af7dd3f2b7447a29db292b8fba55c06b8fcfe0c761510759a41ebd5a95180efff164d0f93b0551525e62bef8c926e981d03f0481bd59227
 EBUILD netbeans-cnd-9999_p20150421.ebuild 4586 SHA256 9e5244ff0758a679429ad0c044f7d3749192455d490585a84034372d610a179f SHA512 fbb8026f59c406120d3c4140b35a7f18aad966545fec714bccaee15bdbaddf2726c36470c9632512b275f462c4944e7a4809f5bf3bd7736ca2fa2aea902f3bc0 WHIRLPOOL 1a0b339a07e4e51efe337597269e6b5cbee593e98044bfd84fe9eb3ef4f2ac2ba604fb885d687a4ae55e24ac8d08da0b88a7fa490560daf3c66fc8f0889b0f88
-MISC ChangeLog 153645 SHA256 dc9db1f8ead79c8d97735396fdbc2151b621fefe11976a52bf36cf0587977bb0 SHA512 5ab248b3bc4f15cdc59ed8d03b7b698079bceaa1ddd89f8a4defda54368f5c407cebbf82688c3c6de037392b38bb090f0cc0a3343855dbc06bf8f0d86a88444d WHIRLPOOL df383a91eb557b2c467f591fa59ae267318de1d9d5d03a14747dfb280bd418f0bfbd4a391d35d66a83d70253eb169c78f89dccde0f2bbb43ad8771405981ee10
+EBUILD netbeans-cnd-9999_p20150423.ebuild 4586 SHA256 057bfa9973b0107d35f55f04c0f85e631896ce0de008732d2a7f2da318191bc8 SHA512 b1cda5c65e7ff9048a7afa770cd7adde0fc641f7fda52e35351b46591a60219a2284b96662ee98f0491a799323fefd92cf008fa138aba002fa1a9449f24ea380 WHIRLPOOL 90acbd507dc4bd7db5257c61f089e06eb4bbbb622a13afefd31746ed57f09773d44ed9d06a704a1026e982d88b12e337c84378e9def037d412ad780eb71aac77
+MISC ChangeLog 153812 SHA256 ff214d4f61aa8dcc13f97a220d6fbf4835902dae907fe87548788ef107f5c441 SHA512 9f3fed1f5b09de15a3ec11a4542d2de237ccb3ee72164485c075725a292d0db8b38a83f4ae478b8f8ba91335e8122c47f11e6544615ce649648a1308c856395f WHIRLPOOL 075d30b71b9e983747f6df183acf45c48af9512643423d3d97a611535cbb37ff137c32af83f2efb9b420037156862dad3abc5df21bdef6077d07d4508e8df8da
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150423.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150423.ebuild
new file mode 100644
index 0000000..e967aee
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150423.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-04-23_00-01-56/zip/netbeans-trunk-nightly-201504230001-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/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip
+	http://hg.netbeans.org/binaries/547CFC4D4F7C877925CFB0732F303DC1797A58C1-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}"/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip cnd.discovery/external/cnd-build-trace-1.0.zip || die
+	ln -s "${DISTDIR}"/547CFC4D4F7C877925CFB0732F303DC1797A58C1-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 9421486..87a3346 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_p20150423 (23 Apr 2015)
+
+  23 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-dlight-9999_p20150423.ebuild:
+  bumped to the latest sources
+
 *netbeans-dlight-9999_p20150421 (21 Apr 2015)
 
   21 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index ad201be..d4f1b31 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -40,6 +40,7 @@ DIST netbeans-trunk-nightly-201504140001-src.zip 207131027 SHA256 78124063613a80
 DIST netbeans-trunk-nightly-201504160452-src.zip 207150212 SHA256 16f83a8d853a24a06c78f758426af3fded5d6284a27a1e867656ccfb51dad248 SHA512 9155dec6773c8560091652e93c561874be5fbbb18eb7658c53d872eb081e31683358986921c90d371f5e8a3c66779532fba131e5bf9d90c97d2518b5349fa881 WHIRLPOOL bce9d3120af6e9cd41850622e460c94f17aa641bf03da0657ecc75df24361e35f347d91a571f598bfa858cb8b9e608a02189f60b0d40e75f7d8c8ac938ca6042
 DIST netbeans-trunk-nightly-201504170001-src.zip 207165961 SHA256 a30747f33bf216973e62f474edffb31d9db669c6250ea4f12eb83b42f3515843 SHA512 6df1a966b8bca727728b9a007f8448b57c41270b9fabf9039ef958648c7c96c1a0fa20e86e75d90a5bf86700827c1b2520d2ac12ee6e9ee550ea931b2d2419ed WHIRLPOOL 945ef6e67fd91c0c8dfeceff4ed0a4226f0090a134137357e6ad5c6ffcc82815ef6d4cba7cf1f9d6a0682f34454012b28d8124b44a294bb586f671f5dc5c032d
 DIST netbeans-trunk-nightly-201504210001-src.zip 207178961 SHA256 b277aeba16c941024cc88c8d36a4183ff078adf054721dadc8593be14c963c0d SHA512 d421faa83f70a9ec7cb58d88290aa1104839d2b3e5f3e4582f1c2294fa2647913911eb298d625ad8a97bbf7aa2c35314a4480e20d36c0f4abb7f909c5f2c3481 WHIRLPOOL 5b2becf39729c209e27bd3cbcf0f7fe88b1829c3e898c24fc6d5c1efb4345cd17637243390886151cdba80d05cff65da6eedf7fcb9bb3fca42afb08d26ed2fa8
+DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9ebdb4fae53f4999d1bb357dad09966f36c050e52d9cf53507f6 SHA512 2a2a5dab10d0dcf6797f1a51f58af7a2f39c9c10a29f5e3f231e895e20333b434273cb69192209e400c75bde82a6d7175c0018fba94998911f4e71abf30f4119 WHIRLPOOL 7ae4e39d0a8f0e7ee249e3f8fa7aa0a77f837734e9e7dfa3b2b648c015fba99f5f0d1088474c8678cf9de0728c1ce1eb9bd6de0319369c862011531c84c1e0f5
 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
@@ -65,5 +66,6 @@ EBUILD netbeans-dlight-9999_p20150414.ebuild 2995 SHA256 1330bb86e1fdb45175952af
 EBUILD netbeans-dlight-9999_p20150416.ebuild 2995 SHA256 a43ff0fd1951ed8dd17d36e380f20fc0abe3c0f468a4a9e57f9962214f75adb3 SHA512 6543cbbcb8adb385e58df877d002126fa9ee2de51d2031f701849ee1d97db866d5c02ce0447b9534a9dfd753daa84bd4c49dfd9570d67c63f4cb69d6bdf5c86f WHIRLPOOL 5b1d63ecab2552909ebd17b002ff6473db410e7b186c0bad5f81740044eb2f4d3ad60e2e73f77ce0bb98c13214cdb64ae7ab3f5acf768890da372d117acac9cb
 EBUILD netbeans-dlight-9999_p20150417.ebuild 2995 SHA256 940ff2ce90d19b0574f8efa2fd427af47b841da469cf4de3ab23910aa1f3c2e3 SHA512 d7d26790885653703e771721243d8dc82566d003e3b9f42352177704dd40c8fed975c47df5270fa62016731ae5c8a576762520536755de0023d493b843c62b42 WHIRLPOOL afc40a5a4865bd89270e4e49f94b24a47d5b1faf91db47fd70411fce3d873c5ed74a15cde9fa8e641b7be7fb1d61d4c29889606dc10b50928f53665938bbbb85
 EBUILD netbeans-dlight-9999_p20150421.ebuild 2995 SHA256 ba1a8bba2548d7ed29b960961d15b253d8ea6f03449ae90fae539f49ec77d766 SHA512 df9b191108aad68624653b934b17c04628999381c4254fcef25f8239a0f9247802683706288f9be70d695c994f1108b0951cae55a8a8708ebe331c4bc2ca5f01 WHIRLPOOL 85a11aeea2fc4447978a9b9005323408200dd0fc9e90fd42ac1e9af9b7c9cd66480a020fa8b582036d82a803a142f53b8e5e85307fbc2caa7939afd43e010091
-MISC ChangeLog 160359 SHA256 e7d8d24d86a2ee110f67622524f765e071795fafd43e351a07fea446a1a2dede SHA512 44cc94e994f2dde8d02dd0d45e4c765cfe1ff9a2bb8e049de2f0573991b7af80a56c422ed1aed5ec28b82db0154b38984d41f5426bf4b357e635340b6b55986e WHIRLPOOL a12378c3ab56332fdbb6ec7002f19ab3d62633623752e3bea025cce9965022a77840f56b9b2828da5297a0d6e0a6c46ae2c04c2a43ec28394260e2ab971ef0ed
+EBUILD netbeans-dlight-9999_p20150423.ebuild 2995 SHA256 b810e07b435dd806dc61cf07bd22f29aa3b875622e0c016717c6202b77275e8b SHA512 99cc93c1ffd99857072111905218d30a289db30783fb89c231fe4ab5a06942b935f4bce3ba0f72901893c5b3708a5b607ba4d46fab7e952a3478796058b0996b WHIRLPOOL dbc79e69924e7d63a94faee5ff7914980d487491ce1caaee92a93104902ac05e0eb11f7473ba0bd3822c820701c1fffaba98d3ae28fe29eebe1e972327fd4f4b
+MISC ChangeLog 160532 SHA256 dec42ae2f14b41a2f307434d3d31d1646eb2a45d56864f4067c1a518a5f49859 SHA512 dbb68b6d74638d8cc25eaa49a3dc40a7e52f1b2352ff2a0e8874a257e099a6cbf05ae67e0cc33ee59cfcce972366eb53da2335f5fc6fb8026e7ecbc46623881d WHIRLPOOL 4aa777fd25b3041538cb4faa9cefdbc90f9f72ae7455c8ee37bca14635f21f59fe086929e9ab5bc98566f943037e44bdace8b25e0d4fca31ee655a4616fb011c
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150423.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150423.ebuild
new file mode 100644
index 0000000..ba3bea3
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150423.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-04-23_00-01-56/zip/netbeans-trunk-nightly-201504230001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/E2B00E95C773FCD0B68CEF4980D19D04C02722EB-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}"/E2B00E95C773FCD0B68CEF4980D19D04C02722EB-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 02fc9ab..5678de0 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_p20150423 (23 Apr 2015)
+
+  23 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-enterprise-9999_p20150423.ebuild:
+  bumped to the latest sources
+
 *netbeans-enterprise-9999_p20150421 (21 Apr 2015)
 
   21 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 588b80b..3c861fc 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -120,6 +120,7 @@ DIST netbeans-trunk-nightly-201504140001-src.zip 207131027 SHA256 78124063613a80
 DIST netbeans-trunk-nightly-201504160452-src.zip 207150212 SHA256 16f83a8d853a24a06c78f758426af3fded5d6284a27a1e867656ccfb51dad248 SHA512 9155dec6773c8560091652e93c561874be5fbbb18eb7658c53d872eb081e31683358986921c90d371f5e8a3c66779532fba131e5bf9d90c97d2518b5349fa881 WHIRLPOOL bce9d3120af6e9cd41850622e460c94f17aa641bf03da0657ecc75df24361e35f347d91a571f598bfa858cb8b9e608a02189f60b0d40e75f7d8c8ac938ca6042
 DIST netbeans-trunk-nightly-201504170001-src.zip 207165961 SHA256 a30747f33bf216973e62f474edffb31d9db669c6250ea4f12eb83b42f3515843 SHA512 6df1a966b8bca727728b9a007f8448b57c41270b9fabf9039ef958648c7c96c1a0fa20e86e75d90a5bf86700827c1b2520d2ac12ee6e9ee550ea931b2d2419ed WHIRLPOOL 945ef6e67fd91c0c8dfeceff4ed0a4226f0090a134137357e6ad5c6ffcc82815ef6d4cba7cf1f9d6a0682f34454012b28d8124b44a294bb586f671f5dc5c032d
 DIST netbeans-trunk-nightly-201504210001-src.zip 207178961 SHA256 b277aeba16c941024cc88c8d36a4183ff078adf054721dadc8593be14c963c0d SHA512 d421faa83f70a9ec7cb58d88290aa1104839d2b3e5f3e4582f1c2294fa2647913911eb298d625ad8a97bbf7aa2c35314a4480e20d36c0f4abb7f909c5f2c3481 WHIRLPOOL 5b2becf39729c209e27bd3cbcf0f7fe88b1829c3e898c24fc6d5c1efb4345cd17637243390886151cdba80d05cff65da6eedf7fcb9bb3fca42afb08d26ed2fa8
+DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9ebdb4fae53f4999d1bb357dad09966f36c050e52d9cf53507f6 SHA512 2a2a5dab10d0dcf6797f1a51f58af7a2f39c9c10a29f5e3f231e895e20333b434273cb69192209e400c75bde82a6d7175c0018fba94998911f4e71abf30f4119 WHIRLPOOL 7ae4e39d0a8f0e7ee249e3f8fa7aa0a77f837734e9e7dfa3b2b648c015fba99f5f0d1088474c8678cf9de0728c1ce1eb9bd6de0319369c862011531c84c1e0f5
 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
@@ -145,5 +146,6 @@ EBUILD netbeans-enterprise-9999_p20150414.ebuild 14851 SHA256 8478fd9a92b51d04e7
 EBUILD netbeans-enterprise-9999_p20150416.ebuild 14851 SHA256 5a0da7194792a8d231dd237e345f8b77627415eecd95fca0e1110f1c64064a18 SHA512 a6e58b44bd4221e914d596f51e7f907b8bb3862593303dde38d35b03308a9dca55f8396a85f131ab559b2660833418209d6925b6a311afc542792e0d55867efe WHIRLPOOL ddc591579e9457ff95382f70a07667eb32e5dcb1d707e754756dbd62b1dfc7a3095a224aea7a24d38a7d9b2917041a86e884af9f42c2f6e2c2accc4e3de93833
 EBUILD netbeans-enterprise-9999_p20150417.ebuild 14851 SHA256 2212eea015a05f31f70b21ed47436f9c551564a8b6f4e179b0ca2e6fb2c6f43e SHA512 dec2bff37c48ce8aab969a17afa4e1bbe54ed7927c5704733dea3367a1bacdc88bd091c3f50197638ac718f6a12e4be4b59cd4ff9d87d4635f6f03b7a5710b56 WHIRLPOOL 7f6e05898de1d39a9018d7c8a6c69e651ee602321fdb1adb2a31c31d57c561e238f40c5a063b47025463fd47e5eaf4c8124f5d9d8fd47331bbceea56aa96c35d
 EBUILD netbeans-enterprise-9999_p20150421.ebuild 14851 SHA256 b5a66e12c6f06069d745da67b49826befaa05a82eea5b2c04f614bdcdf040106 SHA512 9f5df1090ba60ec1e28d84bcffbcc8c5c9db282c60d51803d4417392640df55ac8b8f0ae74ddc0011f970e2390f2070048ff6e2d7780546b4ffc8dc37628762b WHIRLPOOL 186e3dcfb48a32ccbaad5aeb4142b5a69d18b310d85f76c1995905c77fefcf75f3229fd8950277f19ca5b222b1af56d2cf1c03224bfc0e33ad7e940413eac431
-MISC ChangeLog 168851 SHA256 6e467ab48bd701ff532c9a8e2c38b40dadb9e81deb64c333ee66a748bcfcb685 SHA512 5ff5da78a99350e1347078bd4b331c0869b4f3b440ee92c1494f63c8cbad2f1aaa9e802f6c9a6c14617e0d8ba8b9c6cc761f82a177c696276326aa88d8f7b190 WHIRLPOOL 75fcaba08e539e1860809ff80de1305a8cb826567200a2924111a61d683998048fc2ca01b65fbc9fd08a8b67ff4b0674acc0b810cfd8a80b693451c7bdfdac7e
+EBUILD netbeans-enterprise-9999_p20150423.ebuild 15937 SHA256 0e9ed7f410cb4331dc93ab942d00e5d93a81299324e4be3a36f1f91eac1c9cdf SHA512 774b7771477ef745181a5bb00d2e7bb8add058aaa80a3cd998c24a4d62f84ecc445a07f6f0f6e7944c404c037c2ea98477b3a1e910cf5d53b08ad72f99d2f611 WHIRLPOOL d34b4e08d533bdbe511bcb26abc12666c4bce6419e396a96d5c0664bb4435436aa4bacbcd4a1e1be47414ed48cb9f9c93502e991970bb118e5b355006ec79bac
+MISC ChangeLog 169032 SHA256 363927d1e45bc2a0a96c0daaf0780237bee79f0e4a26079f238ad2b42a0fc52c SHA512 12f6866b62b8936441f444ae688121e030fa4e87899b4b4d58e07a3b28376141b0311549f9d4a4ebb0293a0bf10b43c2ecd1bf460791eec33e0b81dfc815490d WHIRLPOOL ad343b5ec7c021335706446be22df3bc4ebc8018784bf912bc9cf73d00195466d1b23826494e7b50d3aaaa1584a102793ff81b1215b533705ce5b0dd63e8658b
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-ergonomics/ChangeLog b/dev-java/netbeans-ergonomics/ChangeLog
index f409491..076f1c3 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_p20150423 (23 Apr 2015)
+
+  23 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ergonomics-9999_p20150423.ebuild:
+  bumped to the latest sources
+
 *netbeans-ergonomics-9999_p20150421 (21 Apr 2015)
 
   21 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 258a9a9..15aa4ce 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201504140001-src.zip 207131027 SHA256 78124063613a80
 DIST netbeans-trunk-nightly-201504160452-src.zip 207150212 SHA256 16f83a8d853a24a06c78f758426af3fded5d6284a27a1e867656ccfb51dad248 SHA512 9155dec6773c8560091652e93c561874be5fbbb18eb7658c53d872eb081e31683358986921c90d371f5e8a3c66779532fba131e5bf9d90c97d2518b5349fa881 WHIRLPOOL bce9d3120af6e9cd41850622e460c94f17aa641bf03da0657ecc75df24361e35f347d91a571f598bfa858cb8b9e608a02189f60b0d40e75f7d8c8ac938ca6042
 DIST netbeans-trunk-nightly-201504170001-src.zip 207165961 SHA256 a30747f33bf216973e62f474edffb31d9db669c6250ea4f12eb83b42f3515843 SHA512 6df1a966b8bca727728b9a007f8448b57c41270b9fabf9039ef958648c7c96c1a0fa20e86e75d90a5bf86700827c1b2520d2ac12ee6e9ee550ea931b2d2419ed WHIRLPOOL 945ef6e67fd91c0c8dfeceff4ed0a4226f0090a134137357e6ad5c6ffcc82815ef6d4cba7cf1f9d6a0682f34454012b28d8124b44a294bb586f671f5dc5c032d
 DIST netbeans-trunk-nightly-201504210001-src.zip 207178961 SHA256 b277aeba16c941024cc88c8d36a4183ff078adf054721dadc8593be14c963c0d SHA512 d421faa83f70a9ec7cb58d88290aa1104839d2b3e5f3e4582f1c2294fa2647913911eb298d625ad8a97bbf7aa2c35314a4480e20d36c0f4abb7f909c5f2c3481 WHIRLPOOL 5b2becf39729c209e27bd3cbcf0f7fe88b1829c3e898c24fc6d5c1efb4345cd17637243390886151cdba80d05cff65da6eedf7fcb9bb3fca42afb08d26ed2fa8
+DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9ebdb4fae53f4999d1bb357dad09966f36c050e52d9cf53507f6 SHA512 2a2a5dab10d0dcf6797f1a51f58af7a2f39c9c10a29f5e3f231e895e20333b434273cb69192209e400c75bde82a6d7175c0018fba94998911f4e71abf30f4119 WHIRLPOOL 7ae4e39d0a8f0e7ee249e3f8fa7aa0a77f837734e9e7dfa3b2b648c015fba99f5f0d1088474c8678cf9de0728c1ce1eb9bd6de0319369c862011531c84c1e0f5
 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
@@ -56,5 +57,6 @@ EBUILD netbeans-ergonomics-9999_p20150414.ebuild 2919 SHA256 c4b6380136ca3771223
 EBUILD netbeans-ergonomics-9999_p20150416.ebuild 2919 SHA256 e904d42aa7e377211aeda2e4695ee6eca3ed9911f196d74cd5d3b8b5142bb93d SHA512 52ad2abdc43c40c6a92a1d1e68bc2b9b52cb1b2cc48bd3072bc05ad6f7a0efd27c0d24e7226708d7f01382e835d2f83ac106aea6d1b3bd77e9b3bea58f46183f WHIRLPOOL e63392f2fe4a9001ec04a9c518fe01165455d74b52037c2e09b2b8bd6324a295084584a52f981aaf9b243d0ffde202f9d2a71db86bd886577144410cf38271e6
 EBUILD netbeans-ergonomics-9999_p20150417.ebuild 2919 SHA256 d9431f95460bd69f95a5b0ed1b1efe3694d1f552545131629244b9e33d9cee70 SHA512 47e3b77164406027751a8ea315f01b192b73ad0c934353de60c35e7e95007c02bfd778a3de660d6f9adc1c0eb841cb4790e28b5219c575dc8d76ca1112a97090 WHIRLPOOL 2bc1961276b7a446340a5f04555174dbf8932202464caf2ed5f217fe642a72b3dfdd6a277f816e9160565c2c4f53ef98730af491414ce618c98b68e69a62c020
 EBUILD netbeans-ergonomics-9999_p20150421.ebuild 2919 SHA256 975d1649145cc6c160a3a724192d7b5d1cf6e5309e05fac4e05f4630461fbb1f SHA512 eebf700fa23b0a1bbefe785d35222ea78e07b1233050276db84e74c4d254056a328ea3bc00115f3aa7ccd2f47f55361d2bef6a49feecc2a232085fb719393c11 WHIRLPOOL 4be6b36a9b9e09c3dad813b7658dcef5f031d45fa42ca7af41a788dd3bc1657b9280e9c9381cdbb9eec2712a95501fd6c961ad443705de813592ef02c7ac09e6
-MISC ChangeLog 168326 SHA256 2b88f58ab65d6efd58964273e96d5c6efa2fa23948c9e8c27c6129056a6bb788 SHA512 009773fb7efb1d54ca0a6b50b4dba18af588e7f34e4d997a7e8474a2374d38f33b7bf8ac2c910bba349ca9e2573e2fd6cbf10c8d931072c1fc1f80a13da89c66 WHIRLPOOL a4e503ef56602f49b7d692db0e2d4dec185c9777ab0e026097730507d5b3162f7389ee17b4644f4423e23e26d8909579fcc133e18b0988f61c638dbe875d3523
+EBUILD netbeans-ergonomics-9999_p20150423.ebuild 2919 SHA256 b407b9c8c0273b431ffa67b1f77c6ff531ae9b8f30e2594d1665c3cefa0bd649 SHA512 bd5520652574a37fe377d03a8cb6d965941aa11a49cd24f0a9a9b802b16a74c09609129f0b7e12fcad44dcdbd65b9ba14112ef4c8a78e18092e6419162c5a3df WHIRLPOOL 2958c546a060b9743000572d794cebe729f5089439dc7adbd36961b2d429308685b2f5a167e95bca15b463fb7b91fee842508fb03d8f9933f7cb25e1e59b2d98
+MISC ChangeLog 168507 SHA256 5c64dc05a7587127f1fd0377d984fc04dede6803d23f2ec04bf1dbb7b6d29a6e SHA512 23d062d2eb6659540f62e91a8b32fc0aae3f72c0af1422f8d71024e8c222ef17de056f5dbfbfddd415541a870a8c0ab2af5b143e1eae7b01fd9ff96f70db32d6 WHIRLPOOL 3b69bcea3bdefed35ca6eb3773fb9b36f5fa8846447203023b801c97cda90fb0604345514d88df4873baf2f469f14dd1f6535ceaed574f541a2f215fd040f622
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150423.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150423.ebuild
new file mode 100644
index 0000000..9c2b287
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150423.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-04-23_00-01-56/zip/netbeans-trunk-nightly-201504230001-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 67bc682..43860e2 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_p20150423 (23 Apr 2015)
+
+  23 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-extide-9999_p20150423.ebuild:
+  bumped to the latest sources
+
 *netbeans-extide-9999_p20150421 (21 Apr 2015)
 
   21 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index ce820fb..60c4d79 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201504140001-src.zip 207131027 SHA256 78124063613a80
 DIST netbeans-trunk-nightly-201504160452-src.zip 207150212 SHA256 16f83a8d853a24a06c78f758426af3fded5d6284a27a1e867656ccfb51dad248 SHA512 9155dec6773c8560091652e93c561874be5fbbb18eb7658c53d872eb081e31683358986921c90d371f5e8a3c66779532fba131e5bf9d90c97d2518b5349fa881 WHIRLPOOL bce9d3120af6e9cd41850622e460c94f17aa641bf03da0657ecc75df24361e35f347d91a571f598bfa858cb8b9e608a02189f60b0d40e75f7d8c8ac938ca6042
 DIST netbeans-trunk-nightly-201504170001-src.zip 207165961 SHA256 a30747f33bf216973e62f474edffb31d9db669c6250ea4f12eb83b42f3515843 SHA512 6df1a966b8bca727728b9a007f8448b57c41270b9fabf9039ef958648c7c96c1a0fa20e86e75d90a5bf86700827c1b2520d2ac12ee6e9ee550ea931b2d2419ed WHIRLPOOL 945ef6e67fd91c0c8dfeceff4ed0a4226f0090a134137357e6ad5c6ffcc82815ef6d4cba7cf1f9d6a0682f34454012b28d8124b44a294bb586f671f5dc5c032d
 DIST netbeans-trunk-nightly-201504210001-src.zip 207178961 SHA256 b277aeba16c941024cc88c8d36a4183ff078adf054721dadc8593be14c963c0d SHA512 d421faa83f70a9ec7cb58d88290aa1104839d2b3e5f3e4582f1c2294fa2647913911eb298d625ad8a97bbf7aa2c35314a4480e20d36c0f4abb7f909c5f2c3481 WHIRLPOOL 5b2becf39729c209e27bd3cbcf0f7fe88b1829c3e898c24fc6d5c1efb4345cd17637243390886151cdba80d05cff65da6eedf7fcb9bb3fca42afb08d26ed2fa8
+DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9ebdb4fae53f4999d1bb357dad09966f36c050e52d9cf53507f6 SHA512 2a2a5dab10d0dcf6797f1a51f58af7a2f39c9c10a29f5e3f231e895e20333b434273cb69192209e400c75bde82a6d7175c0018fba94998911f4e71abf30f4119 WHIRLPOOL 7ae4e39d0a8f0e7ee249e3f8fa7aa0a77f837734e9e7dfa3b2b648c015fba99f5f0d1088474c8678cf9de0728c1ce1eb9bd6de0319369c862011531c84c1e0f5
 EBUILD netbeans-extide-7.4.ebuild 3311 SHA256 8585e0b9eac3b9bb35d5b5e0152936f84708a824d76831930a3dfd3d196556b0 SHA512 19eceec7a634923b4712eb277a1ff9900a2eb4d9ac0a2c699175333c263f0c02baaf24eb30bd7919444f5c9df751186689b2d4359ca1c88dca02884d7c18c3cd WHIRLPOOL e64509f198c4d09851f98d5bd2ddd5b469b0a7c0f3122f391c17833e5d6d77b7a6c2fd9e942e34f2df42047504ad40593f97af9b2898450e769c7b012355c316
 EBUILD netbeans-extide-8.0.2.ebuild 3313 SHA256 d147df43b8e55de81e0429604a2497a82861864ae50fbb85368a3070e1c266c9 SHA512 8f2722ce12c1582ca6e9ed348fcb37b9969585037b5432e592e5dd6ef4b3e49c58783da5fe20f088bee07514e3b42de7aa36607900b285c32c4b91fa218df90c WHIRLPOOL 0fb074484787a5e0e688dc734efe027ff6dfd082dd63bc9bccc612f915fbbe33a4f93db6c43d345abc9c191e22ec196aada1e889d1240968916d54c69497a2d6
 EBUILD netbeans-extide-8.0.ebuild 3305 SHA256 b2d57e2e2d92760ead3d383fe4dd5b4fb9fc2807a9b58c6f40b44fc24072b8bb SHA512 6e7f12758188a564ef6b5cf8b0ffdf79e30d1021172d10f215d04e727bc4001e4385fd0961a26a6bb42638089e0919b1d4628a13ba11a3deac94d4693c7210d5 WHIRLPOOL adac8461de43669b7bb98ea8920c0a2944837211a37503b957221149d4b91c4bd92b6db160191990b838c474495c65f62c8a4bb9fdbcaa371b4648a335b1afa9
@@ -50,5 +51,6 @@ EBUILD netbeans-extide-9999_p20150414.ebuild 3383 SHA256 eb50642e35490b89a2adeb6
 EBUILD netbeans-extide-9999_p20150416.ebuild 3383 SHA256 736a7b232a9c9a97f838c035d7fb31418dfb1812574729252a145abd42337ebb SHA512 52ebd9c313615e1726219e826ac53a1dfee446058bfee29817ec681b046b5d61403af4425afabdcfa682a44d73e8d9e9160194308ee396324182e2fdaff912a1 WHIRLPOOL 17b5b82ec3f718e32d6be483da922679019626ff582b6d899bae28ab29148f294f0ba1e8353ca0ae300b0f97744abc3e0d85231c82927077bf4382264fff595c
 EBUILD netbeans-extide-9999_p20150417.ebuild 3383 SHA256 db844cf3cbd16f8c38f1e05d66b05bd70bc9ba8ef7a8dc383e3fe45f9c1de88b SHA512 04cdf20fa96a2655e2ec40f821b5552f69ee50f1d2db172d95f6d216ebf5ee48429a910536258825bffe18b569fa2958298f2e9a27a407b52c2208ed3f89a47e WHIRLPOOL 13645c56f75c1eed5fc0111fcfb220e9dd483cfbff05bf1cb11ac7781a0b7e35b7b8cf555a6a9b4dba4bd52d79306d230dc13a6b7dd83a03e252614f68bdd35b
 EBUILD netbeans-extide-9999_p20150421.ebuild 3383 SHA256 7518f83d097ee412ba5c6131c6a007c73c9f650f202fdb42a66e98ca427bf981 SHA512 3ca03569170302875417e61d11bd3516f74a1d3feff3c46fec9e3718eed9ccb2c766357e691634b85a9b02981801cc9d79ac7aae6740127034531afa8b90297b WHIRLPOOL 71087faa2d76b8d1f5a15d59509b559734d951ba178ebe140d0c5d3f6e6c6e6ba33a0bb5714ac110823459bead755c96ae07e9e178266816c5a71952d67f627a
-MISC ChangeLog 92269 SHA256 aca0e62bcf652f025eb9cc96b6b9f76c28acf9ce8b568a43797dec3487ca14bb SHA512 ce1b9a849751b5e44704abf221dcab344bb24f51df85968787c9d4b73d02d760f99b4e93a0e3c4dc3b8409cff17a86aacdd34d6066035e779e8478cc61b746f0 WHIRLPOOL 41d28bcc05e04bdb23ef81148f7c6ccaa73c7c46bd44ae7f3eef86da8153e54204501461a7268cbd3f2c0245a481a4ecef1b9acd27f21b98fc1dfffe0e0d89b3
+EBUILD netbeans-extide-9999_p20150423.ebuild 3383 SHA256 0274d22f28d2378c853a723ee32cda98ddb319287b62ba03006b6b2c21c7f19e SHA512 895dc683ca7a15667ef645e8458da00f15aba38988fc02ae0eecc4d90ff831071940286e735b0ce845410c536796ae6695ec6573ff08d562418c346117f4ca8a WHIRLPOOL 6f4bea1a211417315e63e150f6bdeceafbf0f6126e8176e268b05cf95abe738006538a8e9a872c13e4f06a7f04c2b02706cfb4bf4c6af9c95beca37061366998
+MISC ChangeLog 92442 SHA256 458318d0028ceea9f3d9b63a43b2e0fdbb51ab7f6a552f9b26817addf897f892 SHA512 43e38edf930dd004b9f51134ec0f1455244128a7ffa04cbadbf6a5585ca858aa6a1bc4ec804253335dd951e23438ed4b8ebf3dd110d8c5a2b8475bb9391f9b40 WHIRLPOOL 5b793142f565b6f2588b0a1b7c559f447ea8c27e13041cb24abc2626a0aea17573e5904fbb4393c5952715c49e9ba87465adce02151004eb9def043e6222953b
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20150423.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20150423.ebuild
new file mode 100644
index 0000000..bb162b8
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20150423.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-04-23_00-01-56/zip/netbeans-trunk-nightly-201504230001-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 4c34792..0b75625 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_p20150423 (23 Apr 2015)
+
+  23 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-groovy-9999_p20150423.ebuild:
+  bumped to the latest sources
+
 *netbeans-groovy-9999_p20150421 (21 Apr 2015)
 
   21 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index fd9b815..906efaf 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201504140001-src.zip 207131027 SHA256 78124063613a80
 DIST netbeans-trunk-nightly-201504160452-src.zip 207150212 SHA256 16f83a8d853a24a06c78f758426af3fded5d6284a27a1e867656ccfb51dad248 SHA512 9155dec6773c8560091652e93c561874be5fbbb18eb7658c53d872eb081e31683358986921c90d371f5e8a3c66779532fba131e5bf9d90c97d2518b5349fa881 WHIRLPOOL bce9d3120af6e9cd41850622e460c94f17aa641bf03da0657ecc75df24361e35f347d91a571f598bfa858cb8b9e608a02189f60b0d40e75f7d8c8ac938ca6042
 DIST netbeans-trunk-nightly-201504170001-src.zip 207165961 SHA256 a30747f33bf216973e62f474edffb31d9db669c6250ea4f12eb83b42f3515843 SHA512 6df1a966b8bca727728b9a007f8448b57c41270b9fabf9039ef958648c7c96c1a0fa20e86e75d90a5bf86700827c1b2520d2ac12ee6e9ee550ea931b2d2419ed WHIRLPOOL 945ef6e67fd91c0c8dfeceff4ed0a4226f0090a134137357e6ad5c6ffcc82815ef6d4cba7cf1f9d6a0682f34454012b28d8124b44a294bb586f671f5dc5c032d
 DIST netbeans-trunk-nightly-201504210001-src.zip 207178961 SHA256 b277aeba16c941024cc88c8d36a4183ff078adf054721dadc8593be14c963c0d SHA512 d421faa83f70a9ec7cb58d88290aa1104839d2b3e5f3e4582f1c2294fa2647913911eb298d625ad8a97bbf7aa2c35314a4480e20d36c0f4abb7f909c5f2c3481 WHIRLPOOL 5b2becf39729c209e27bd3cbcf0f7fe88b1829c3e898c24fc6d5c1efb4345cd17637243390886151cdba80d05cff65da6eedf7fcb9bb3fca42afb08d26ed2fa8
+DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9ebdb4fae53f4999d1bb357dad09966f36c050e52d9cf53507f6 SHA512 2a2a5dab10d0dcf6797f1a51f58af7a2f39c9c10a29f5e3f231e895e20333b434273cb69192209e400c75bde82a6d7175c0018fba94998911f4e71abf30f4119 WHIRLPOOL 7ae4e39d0a8f0e7ee249e3f8fa7aa0a77f837734e9e7dfa3b2b648c015fba99f5f0d1088474c8678cf9de0728c1ce1eb9bd6de0319369c862011531c84c1e0f5
 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
@@ -60,5 +61,6 @@ EBUILD netbeans-groovy-9999_p20150414.ebuild 3422 SHA256 5051b2b9788edd5094a3aef
 EBUILD netbeans-groovy-9999_p20150416.ebuild 3422 SHA256 505dfb935a9c2d4cdc933e61c650574a7e19bfc396906d4b68b7e8f688f53476 SHA512 5b38a0902a97dfef56b9dc9fce7a49f0651d5af54973d6d5015c8a8ad4a551cf3a1de976482426cbfab597edeebfb0c005e5896d934a7f19bf9039c5f1019583 WHIRLPOOL 85b7e4c554ebd2acb35d0a93e97ff9d79a8fd2bf3bfb44582ba45057701ac488a16550277ee5e0dc3bde204330d7f0a80ab0feb291126edf1f4fdb90e3d53264
 EBUILD netbeans-groovy-9999_p20150417.ebuild 3422 SHA256 058bdada7aeeab9680620bb77a1b95444df3c5b32a2f046da4e3eafebd867cb1 SHA512 bf8274b41831147e3293e2eb9d9dd624a51b974dace1fd1b1a32ad53db46a3249f83504ce1e8b2bdecb84feeba74d701ee4f957ca2e94fb188b51660daa84b8e WHIRLPOOL 9d59deea3c4fa80168ac832829a39292e3ea547a85ad8c9b93629f5a7f2b8d5864b693bd67ccf5eba673a09ad974f12912becc2c264d1be18c058ab37ef1d665
 EBUILD netbeans-groovy-9999_p20150421.ebuild 3422 SHA256 8840d448cf98e8f98876276a8c7c698b76d7d181286d15a4a695f01d23c17f25 SHA512 709da54247b84827c176b92a5907dcdf9473da0f1773333b475232025aede4ccbc9276cfabd2ae6ddaea546e71b59e931f80774fc2a96adcd0d9c4139d621ceb WHIRLPOOL 9cc6a4ab042b47222908826a12acc214d59b1ff86e061a612498d905a7c7507334d576f34eaf54f0bf887346408f0309232ea9aa6cfa232826d4b388a40e71c2
-MISC ChangeLog 160249 SHA256 87de78cdeb51a3f4a7697b81a7690772cb74587dc7401e34d75ece5b7d649e86 SHA512 cbce392e518c0f29dcfc1a95085ba94c805a7caa13525564e23b57ba4015c2904d8c0679296eb7808253277fc036f80bc839adbf70d2d740bfbce76ab7170035 WHIRLPOOL cc4c35c2650c675b08d5338f66bfa9e595401fca58a1158ed48e777f4fe65d2c1a065bdc6c0deb3fc86cad686ce74fab6e5bfd45a783979c05c7f2f2522bd4d7
+EBUILD netbeans-groovy-9999_p20150423.ebuild 3422 SHA256 50f7029938d8bebfe4261e7f7a856e0e8d1a747d51a1dadf04adaa56c87fae1e SHA512 c0d9863e1c012f1c2a9bfb92c98005d488647ece4135eaa9a3dadc7422645a14e60bbe29674eb0b555e1caa324975c013f510f0ef7f90295a60ca6542559b37b WHIRLPOOL c2ecda2f6d147e17cd0f53647fc1de9a1621d4ef8b5b3ed927b52c6a35c400d149160895582dbd354ddd04755d7c2dcb2a652aeb759e2b91f83371b276fd3332
+MISC ChangeLog 160422 SHA256 ea325a4c6d5c25e50b400bc31ab6260b740b4657feebafd9db0eb1a8df7dae94 SHA512 f57f341372bf804ca4e72b918b01404af01a73e6fb24431d65aa9ff0c46764c919f9cc6728bdd87097678d43ecfcd9630008def2fb0f8a287c1eb9414f816498 WHIRLPOOL b7345e2332f20cfbe2e0a3e38313e2a6f15dfaa262d425ab1788c85fe8426c40e862d97699c202142964ee212cd0800d9cbbe717b3362baad31916af8c1a9c27
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150423.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150423.ebuild
new file mode 100644
index 0000000..89ff7a7
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150423.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-04-23_00-01-56/zip/netbeans-trunk-nightly-201504230001-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 948777c..0aa8fb1 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_p20150423 (23 Apr 2015)
+
+  23 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-harness-9999_p20150423.ebuild:
+  bumped to the latest sources
+
 *netbeans-harness-9999_p20150421 (21 Apr 2015)
 
   21 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 20fd335..c3a2182 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -37,6 +37,7 @@ DIST netbeans-trunk-nightly-201504140001-src.zip 207131027 SHA256 78124063613a80
 DIST netbeans-trunk-nightly-201504160452-src.zip 207150212 SHA256 16f83a8d853a24a06c78f758426af3fded5d6284a27a1e867656ccfb51dad248 SHA512 9155dec6773c8560091652e93c561874be5fbbb18eb7658c53d872eb081e31683358986921c90d371f5e8a3c66779532fba131e5bf9d90c97d2518b5349fa881 WHIRLPOOL bce9d3120af6e9cd41850622e460c94f17aa641bf03da0657ecc75df24361e35f347d91a571f598bfa858cb8b9e608a02189f60b0d40e75f7d8c8ac938ca6042
 DIST netbeans-trunk-nightly-201504170001-src.zip 207165961 SHA256 a30747f33bf216973e62f474edffb31d9db669c6250ea4f12eb83b42f3515843 SHA512 6df1a966b8bca727728b9a007f8448b57c41270b9fabf9039ef958648c7c96c1a0fa20e86e75d90a5bf86700827c1b2520d2ac12ee6e9ee550ea931b2d2419ed WHIRLPOOL 945ef6e67fd91c0c8dfeceff4ed0a4226f0090a134137357e6ad5c6ffcc82815ef6d4cba7cf1f9d6a0682f34454012b28d8124b44a294bb586f671f5dc5c032d
 DIST netbeans-trunk-nightly-201504210001-src.zip 207178961 SHA256 b277aeba16c941024cc88c8d36a4183ff078adf054721dadc8593be14c963c0d SHA512 d421faa83f70a9ec7cb58d88290aa1104839d2b3e5f3e4582f1c2294fa2647913911eb298d625ad8a97bbf7aa2c35314a4480e20d36c0f4abb7f909c5f2c3481 WHIRLPOOL 5b2becf39729c209e27bd3cbcf0f7fe88b1829c3e898c24fc6d5c1efb4345cd17637243390886151cdba80d05cff65da6eedf7fcb9bb3fca42afb08d26ed2fa8
+DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9ebdb4fae53f4999d1bb357dad09966f36c050e52d9cf53507f6 SHA512 2a2a5dab10d0dcf6797f1a51f58af7a2f39c9c10a29f5e3f231e895e20333b434273cb69192209e400c75bde82a6d7175c0018fba94998911f4e71abf30f4119 WHIRLPOOL 7ae4e39d0a8f0e7ee249e3f8fa7aa0a77f837734e9e7dfa3b2b648c015fba99f5f0d1088474c8678cf9de0728c1ce1eb9bd6de0319369c862011531c84c1e0f5
 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
@@ -62,5 +63,6 @@ EBUILD netbeans-harness-9999_p20150414.ebuild 4131 SHA256 6ccc012a70799b66d9b4ef
 EBUILD netbeans-harness-9999_p20150416.ebuild 4131 SHA256 d5b1af542eeef10342ccbe42460c7f4b906b9735dc478b453c23257077b6fcca SHA512 767015c1544fb0209dbc946d2d085cee6350a69f54f92ac800c1d04efe4c1e71c91205e8e5065c41aa6575a96f974dee15d496bc81da81972cfdf87a69eea5f9 WHIRLPOOL d67222850fa2bbcd6725e945e167787c9e4a43366a1620d85dccc07ba10d0e1b20112f6020633ce4cea9e0a72b9e59a2388e12c9184ae50cbdba472896802a37
 EBUILD netbeans-harness-9999_p20150417.ebuild 4131 SHA256 53b8c795c6398f313550984f7b5f0676fbc5c0bc4fca13dbc1a2cabe29e02b69 SHA512 f7bb02ffcefe08969385c720c88bbd39c25c8ef574de5fd651d20aa581b60a12310362c28d06219ea1fe96fde691ac6efaab14d6c64490929313d74f872e2875 WHIRLPOOL 3cc7df4e017b857fc820949dccb057b7bc2767423b3bd8693eb0cc1a8aed12b0552e0a977d7fac4abfb0ba1d24f1a1a6e2928f77588d19f90245d5e062222490
 EBUILD netbeans-harness-9999_p20150421.ebuild 4131 SHA256 26a35a0b824e7a7beb25befaba9b250d121cd53cd60a11fc988e1848ba129d4f SHA512 49d53a70313c1a8fa030a7d6bf461794702ad11978eec2f604abbd4bbf896c3506b76ae9c8244118e4f8fda9c21c698a38dfa5ff03e1a39ef1fa2db0b4a19a62 WHIRLPOOL f54503653b529cc7e96e6e18c4fedf356bf0c484b7bc37a824983a19365ac5d5a177f23e7c35e028118d5fc0993092981b7a26dab9ec9b1513482ceae9d11807
-MISC ChangeLog 162297 SHA256 b71994acc9d52127cd66eee29656b2edcd4e2ed80b6fd2e44c655a0fd2497f20 SHA512 cc46f36d762242d8d04e4d3ab747f204b8d7b7328b74c3075a5eb0eefb1097f904ab38c3ecf8fa8d8d5362628f32364275453df88ef85889307f388826e1de14 WHIRLPOOL cd4bf684c5a17e4e189eeca70ab8bfb9724b5ef7cfec352d75f81c86572d4416ef80ccf9743fef5d880c44a3117c8afbff51345a2d14162ff325be22717f49bd
+EBUILD netbeans-harness-9999_p20150423.ebuild 4131 SHA256 46418b1805335786c9436e2b5b2d8d4ac8a2f14c946955023c19efe99cf9c7cb SHA512 b8d0b8e718e0718b8b991c82e4d752302c46ebdb44e2bb9732f3be4d16bed4e3f6b9dbcd2f104808fde2ac201e36662148f6726901ef6162c31539fefcff05c5 WHIRLPOOL 441d2eb0ef8c270a5e6d7193f1fa80e2a9dd1190c033e7b8d58a8e32464df7dda8c5f756d9f72903117597a07645ad6fde193d46c9adf6152080764cf6925e64
+MISC ChangeLog 162472 SHA256 32aa352c0b2fe9702de938ff0ee606c828a90590fe7ee5e984ac1219be03d794 SHA512 755f9a7de4689d98d250d9b441ba26fd30d5615cdc87de9a494b566bffd73060b704577e69a09f2879d12a98056def871772090eb59b5f582611143f8d4e897a WHIRLPOOL d601ee125adab1e04f6807f7ac623db84e68171396a2a010447d776b7fd008a28002326b001535b0934b4ba4009d323dffd76240de11d4405195449c1cd678e3
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-ide/ChangeLog b/dev-java/netbeans-ide/ChangeLog
index 72b347a..93d246b 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_p20150423 (23 Apr 2015)
+
+  23 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ide-9999_p20150423.ebuild:
+  bumped to the latest sources
+
 *netbeans-ide-9999_p20150421 (21 Apr 2015)
 
   21 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 667304b..30f8737 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -241,6 +241,7 @@ DIST netbeans-trunk-nightly-201504140001-src.zip 207131027 SHA256 78124063613a80
 DIST netbeans-trunk-nightly-201504160452-src.zip 207150212 SHA256 16f83a8d853a24a06c78f758426af3fded5d6284a27a1e867656ccfb51dad248 SHA512 9155dec6773c8560091652e93c561874be5fbbb18eb7658c53d872eb081e31683358986921c90d371f5e8a3c66779532fba131e5bf9d90c97d2518b5349fa881 WHIRLPOOL bce9d3120af6e9cd41850622e460c94f17aa641bf03da0657ecc75df24361e35f347d91a571f598bfa858cb8b9e608a02189f60b0d40e75f7d8c8ac938ca6042
 DIST netbeans-trunk-nightly-201504170001-src.zip 207165961 SHA256 a30747f33bf216973e62f474edffb31d9db669c6250ea4f12eb83b42f3515843 SHA512 6df1a966b8bca727728b9a007f8448b57c41270b9fabf9039ef958648c7c96c1a0fa20e86e75d90a5bf86700827c1b2520d2ac12ee6e9ee550ea931b2d2419ed WHIRLPOOL 945ef6e67fd91c0c8dfeceff4ed0a4226f0090a134137357e6ad5c6ffcc82815ef6d4cba7cf1f9d6a0682f34454012b28d8124b44a294bb586f671f5dc5c032d
 DIST netbeans-trunk-nightly-201504210001-src.zip 207178961 SHA256 b277aeba16c941024cc88c8d36a4183ff078adf054721dadc8593be14c963c0d SHA512 d421faa83f70a9ec7cb58d88290aa1104839d2b3e5f3e4582f1c2294fa2647913911eb298d625ad8a97bbf7aa2c35314a4480e20d36c0f4abb7f909c5f2c3481 WHIRLPOOL 5b2becf39729c209e27bd3cbcf0f7fe88b1829c3e898c24fc6d5c1efb4345cd17637243390886151cdba80d05cff65da6eedf7fcb9bb3fca42afb08d26ed2fa8
+DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9ebdb4fae53f4999d1bb357dad09966f36c050e52d9cf53507f6 SHA512 2a2a5dab10d0dcf6797f1a51f58af7a2f39c9c10a29f5e3f231e895e20333b434273cb69192209e400c75bde82a6d7175c0018fba94998911f4e71abf30f4119 WHIRLPOOL 7ae4e39d0a8f0e7ee249e3f8fa7aa0a77f837734e9e7dfa3b2b648c015fba99f5f0d1088474c8678cf9de0728c1ce1eb9bd6de0319369c862011531c84c1e0f5
 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
@@ -268,5 +269,6 @@ EBUILD netbeans-ide-9999_p20150414.ebuild 30068 SHA256 b98120fa998e889402b23663c
 EBUILD netbeans-ide-9999_p20150416.ebuild 30068 SHA256 0f835a695688e90c62bb2b20fb14693ae804321b38492d620803f0bf1e15c98e SHA512 df31089073f1c8eee72bc33f86d89c20f372ba1b104294fc60084e21056690d80ee999dc84eaf031d5f93f664b5fa56c1c96853a3d1c105dacb1be0961f379b8 WHIRLPOOL 4c3c3d145f55a9dc35d438b5f820ed233bd54f6774f43de7c210a0f803d6c6081e173df6565e54260ba347904b230a325a51c66dce00092dcb593467dd8ab30a
 EBUILD netbeans-ide-9999_p20150417.ebuild 30068 SHA256 7b7987c3406df7650b2a177241e7c138718859f4ae776ea3d1ddf711ac7c558e SHA512 df784ff772e3780f70fa5d342ead5ad116b36417a902cf24cc2693c54023037e4a7e3d13e2bec765795a10ade55e47deef71c9c1f1c487305931756e1717b3ac WHIRLPOOL 5e478bbe74d843eafec71bea006d5d0e88e947b1e734241baeb1fee32478f7a1414d3ca6956510f5a1f10cee8e5b7c4e0ff7f898d36a7a59c7be6176d76416cd
 EBUILD netbeans-ide-9999_p20150421.ebuild 30068 SHA256 4d795d834ffe7cd7c27d0dc17da0d5eb91bd0620ac7fbdd13d2162b3f06e8c22 SHA512 315b4675a5e83d625f4452f74316833bd2a72beb996de8abd6b89f3fada49a71785cd1665b0f1d06f26224269f11da2228705b1464000965b2638982f130732e WHIRLPOOL 99d06711689269fd1efcbdcf8c09d5ecb74c15d4b4c5f7fbe745e9e304e90141e1126aa2b8fc0bd9e209b2650d59e5c98338a037c3e065ecd302e413349de655
-MISC ChangeLog 154559 SHA256 eaa6e8cfd22b11092d5917ef94724d810142e459cd7c32bd0a481b1f67a49f6a SHA512 e01d5ff212604627192a42e4a757bf038af5c9f65d6ff009f2139ab7384b7f48f11c53f389ae421b9f19a86112d85aceef76fa32138f213325859a3772d5b474 WHIRLPOOL 5097eaee7f7cb9cb8adbca26696bb0399008b4198681ab28b1bd58e3a7dcd5bbfa0995803a197d1c67f4655c4ee140a2d57d6780696383269e9d6e57427d2dbe
+EBUILD netbeans-ide-9999_p20150423.ebuild 30352 SHA256 0d010b14d34de4dd841a003b026271645829aef1ef22d945147522682435cfe5 SHA512 934b1f684192046766e54a379b53665d4ff3da45828ec6250155874208bfde12fb74ee4ffe7b2092d9c8233b78fc8d4ff0811e628b0e6097c6f5337820aac704 WHIRLPOOL 74b015195633cf064ca65f5409930b74eb526ada36146403309116ff3681ca04e2e540992485c53566f945755f9b5343c1afc922c4daf41fd611232b176a62ed
+MISC ChangeLog 154726 SHA256 7e9e4710a49363d117dffe5d6bc3da5e33cf61055cdb410bcbe2a989c9dd63d3 SHA512 85335813558085545eae27c0fb489781056eaa9c3605d8aa3d339d4fc36397b3a1651bf7b4e8c6a2c0e3f10ac7b44406ed9c3a1fc3286ec06606da55b1eb27e0 WHIRLPOOL 15115e82484f545c1b884989410bc9eaecf8535b94b2f3e7170d857c5ac67c4686361ccbc66a5826ccbb90f03e2c009cda9c9f483a8bb023e89e0a1f7d399a35
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-java/ChangeLog b/dev-java/netbeans-java/ChangeLog
index b6324c2..9780cb7 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_p20150423 (23 Apr 2015)
+
+  23 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-java-9999_p20150423.ebuild:
+  bumped to the latest sources
+
 *netbeans-java-9999_p20150421 (21 Apr 2015)
 
   21 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 458b049..9960bc0 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -67,6 +67,7 @@ DIST C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip 5029407 SH
 DIST CAF99EFBB25E9183609D6FBA4F63D85E7606903F-indexer-core-4.1.0.jar 220841 SHA256 f6140d9e9f52a50c381ac500c119b268bae84e84c9ba37d361baf22d4e4ec68f SHA512 3fbf7b2e6d4674f6ee4dd210e80d3d61452399a2722959105bd276b5e959edce39ac932c0ef9e8453eb6c7598aff244c5072ad8f9a927ea720c3226a548cbcd6 WHIRLPOOL b0bf637ce741808e87f7d5f1d97a1d4fa90e1548836dda90cb498e333f995bff6973fe1cdfb251391a36bae5c1a473f097b9ebd1f2f08e3aa46f050d9cc607b4
 DIST CB686A65B6C4516A32173CB60385D02027440620-spring-2.5.6.SEC03.jar 2949268 SHA256 7865677c19d1373c7126751c30bf9719bbe7431f9b8a160e78cd53d74534f4f1 SHA512 c8902a4f552f558f83ced82d7983ddcc05b49acfd85f7062d544648ac433fef98f5c77eb089a7401ea454220ff249f61445d833ec7a2697bccdbf78d13dc224a WHIRLPOOL 6f6d80865869242354c3d900217c48f6a28e5412234cc9cd637748941762822cebbd7a6398bbe6ede9aae30bad0987c8b4bf674b483fa78c4854a3dd7b7d95aa
 DIST CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar 8632395 SHA256 67d175c1858005308ae9a02ff85c0bc7efc9a2a3c058a6838d51769f417f5247 SHA512 56559a40532fa42775a92d82296a86033a587116870d8201dd42f07e29990a28de5b1547e3fb59ddedadfe6b4fc3dd109b108cc65cf7b253ac1b0fbb9cc03fcc WHIRLPOOL fc40cf8d49919d3ef38f6c3473736f56ee5ac1d4db848681536c3bd3532cb112e9490e76c1ef7b15d88b2ab87ed54e58dbf1227c173a3256194b5887d37f8a84
+DIST CDF434816732716A56529F7F2E9B019F925AA064-nb-javac-impl.jar 2761168 SHA256 26f0e577516327610268fb62b68f068e0dd182bb4b3678646ecc437f97cd68a5 SHA512 0c771f65565be9b30fb48a5328f45287bb6ced1a156a1f5f5f1d0d9274a614599c74d10d58f57caabc46d1621e29f762bac6f1dc4719efc5540eb19ee86810b8 WHIRLPOOL a8638872da64586a52f85693ce2f36be8e5f15bf00fe0f9e0531db6a36409aed9b69be84c1c80794941e83850f74f64a1454b758cbd642cf2e44a61779d3ab6a
 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 D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar 120575 SHA256 51945be4ed200cfc439d2db986bdcc184ecdfec5d0880a8c2854f88dcf20df0b SHA512 788bb5e115a77e12e9329db70e0b6edca185ebd5e30a8178f451da3a8492acba8c89848873acff224868772f464f17bd9eccc9130638d49c95593edd697d3dd2 WHIRLPOOL 9026c59ae69df71d205278a2cd7aeae24c72d74f1356bbf7d3dbe2fcceddb02948a94a87d4f7e6d710a5cc4e642d0de38d16690fff830d10b8372bcbecdd86b5
@@ -112,6 +113,7 @@ DIST netbeans-trunk-nightly-201504140001-src.zip 207131027 SHA256 78124063613a80
 DIST netbeans-trunk-nightly-201504160452-src.zip 207150212 SHA256 16f83a8d853a24a06c78f758426af3fded5d6284a27a1e867656ccfb51dad248 SHA512 9155dec6773c8560091652e93c561874be5fbbb18eb7658c53d872eb081e31683358986921c90d371f5e8a3c66779532fba131e5bf9d90c97d2518b5349fa881 WHIRLPOOL bce9d3120af6e9cd41850622e460c94f17aa641bf03da0657ecc75df24361e35f347d91a571f598bfa858cb8b9e608a02189f60b0d40e75f7d8c8ac938ca6042
 DIST netbeans-trunk-nightly-201504170001-src.zip 207165961 SHA256 a30747f33bf216973e62f474edffb31d9db669c6250ea4f12eb83b42f3515843 SHA512 6df1a966b8bca727728b9a007f8448b57c41270b9fabf9039ef958648c7c96c1a0fa20e86e75d90a5bf86700827c1b2520d2ac12ee6e9ee550ea931b2d2419ed WHIRLPOOL 945ef6e67fd91c0c8dfeceff4ed0a4226f0090a134137357e6ad5c6ffcc82815ef6d4cba7cf1f9d6a0682f34454012b28d8124b44a294bb586f671f5dc5c032d
 DIST netbeans-trunk-nightly-201504210001-src.zip 207178961 SHA256 b277aeba16c941024cc88c8d36a4183ff078adf054721dadc8593be14c963c0d SHA512 d421faa83f70a9ec7cb58d88290aa1104839d2b3e5f3e4582f1c2294fa2647913911eb298d625ad8a97bbf7aa2c35314a4480e20d36c0f4abb7f909c5f2c3481 WHIRLPOOL 5b2becf39729c209e27bd3cbcf0f7fe88b1829c3e898c24fc6d5c1efb4345cd17637243390886151cdba80d05cff65da6eedf7fcb9bb3fca42afb08d26ed2fa8
+DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9ebdb4fae53f4999d1bb357dad09966f36c050e52d9cf53507f6 SHA512 2a2a5dab10d0dcf6797f1a51f58af7a2f39c9c10a29f5e3f231e895e20333b434273cb69192209e400c75bde82a6d7175c0018fba94998911f4e71abf30f4119 WHIRLPOOL 7ae4e39d0a8f0e7ee249e3f8fa7aa0a77f837734e9e7dfa3b2b648c015fba99f5f0d1088474c8678cf9de0728c1ce1eb9bd6de0319369c862011531c84c1e0f5
 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
@@ -139,5 +141,6 @@ EBUILD netbeans-java-9999_p20150414.ebuild 13432 SHA256 4cc1ea0b3e212da96fae22ba
 EBUILD netbeans-java-9999_p20150416.ebuild 13404 SHA256 7866d55e780d403033e129e539e305154e49d662bea6fe78f552630dd73227de SHA512 8e4c20b6d3d0b8e1bfe80d32291f8bbe934ceff4b6e81b95971f9667709bdc21fea97b9247ada8ca2a36ba3b555803d667cdce0df66491a9660da3077cf54fc2 WHIRLPOOL babcf787c4d8b113c84245dfcefaf8a29f19f63b1b9b593074294462277ededa9d90609a9d9a8289e2c51d4f1a8fa02ff4da72f6d0cae1422d5e87adad8d3e6b
 EBUILD netbeans-java-9999_p20150417.ebuild 13404 SHA256 87f8ddd3b3312c9aa9a6ca12e6859d7d4fab94d01ea5c02a557b3b532c6d6d1d SHA512 ad46ced17eb529d84c01c1c3d4c6d5b6adfc0b018fa1b73b956192296f09c8aa1da86c254dbfd17e3825019a749237def866b7adcdf48d487d6a2963d73ab416 WHIRLPOOL 788840d8a0c20636dfebda202d167e556fdedf41fd4c01538e2d09a0f7aa52249a2295aa48264c257bca8e5a780a3ba3139a8ad5907fc1962364414751323262
 EBUILD netbeans-java-9999_p20150421.ebuild 13404 SHA256 0cef5013ed56bd13bf0b12099a50e6f0f49701a025cced57ef4253a4fba27ed8 SHA512 e39130e1c3a7f8036728cd5db58ae4f0e28af596ff1f854bf792cb864c0da273f281e0c37cba2c3c8bea312cc99709518eeed8390b3375317b0a6680d7574559 WHIRLPOOL dbc44fe02f09454cc414a4dedc45af755b0f52c502bab13195b3bba4f6c4c41174f00207bd9c5f972c4d3f6730685273b2af0a22b2f5cba2ae5798b6990fe462
-MISC ChangeLog 157709 SHA256 006ad4cd97a97d42a4d00bfea8bb77908265129d4bd585bfbb4fba5b05129164 SHA512 55fd76e1b18d657f92249d328c1cab2b7f25dad7010b38f3e328d6adfca6fce55c397a370c504ffbc094e794163fa80ed08771bf70cce139c4cf597193834575 WHIRLPOOL e7a3de57d9778ca4b247b6e91aa2d9958627c4a7190ed656c6dfd631c04a4ed1b0c1088494d5359b0c1b7b44ed79a48c41f93745b8f8e11c5729887c5baf4fb8
+EBUILD netbeans-java-9999_p20150423.ebuild 14341 SHA256 1b63cb478076e34742f75f8e3c06ea91c1d0c1dfd2af623968121c4e8deed96c SHA512 8c2523fc1f2b32fc31bcd351924d143222e77088dc8f3432fbfba57eaf6989663e6d726b56d6a0d0804e995ad1decba41b039009a2479611822c4756af632db1 WHIRLPOOL a0ba2f519585b07489c1e42e0b612ad1f06f4cf7094be87a42599293231ea5996e3876d72dfb67e7e0ede436102c30422f5d40284751e609fef7c94d74c9fed1
+MISC ChangeLog 157878 SHA256 1b79c74d5c92d1bcac008dd39edcf10362a43a92eb75157a1302b44e705b3a7a SHA512 91263bd83c60ef56159d0286b1076d668e7049f51c8f7f167fb6096d4d1b5a1e0a9d265e2b225dac1052039cff233129819d50e839e35c39a6dad59d7ff3c6fa WHIRLPOOL 43b9249222063be8ce742b3c6d6fa20ae40f1e37b50bd8fff37b411a57c1bbfc3c794bd69e553289286893129ac750672f4a327f87f3d5061e80029d5451db03
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20150423.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20150423.ebuild
new file mode 100644
index 0000000..4f9e9a2
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20150423.ebuild
@@ -0,0 +1,268 @@
+# 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-04-23_00-01-56/zip/netbeans-trunk-nightly-201504230001-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/CDF434816732716A56529F7F2E9B019F925AA064-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:3
+	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/commons-cli:1
+	dev-java/commons-collections:0
+	dev-java/dom4j:1
+	dev-java/fastinfoset:0
+	dev-java/glassfish-transaction-api:0
+	dev-java/javassist:3
+	dev-java/jboss-logging:0
+	dev-java/jsr67:0
+	dev-java/jsr181:0
+	dev-java/jtidy:0
+	dev-java/log4j:0
+	dev-java/mimepull:0
+	dev-java/oracle-javamail:0
+	dev-java/saaj:0
+	dev-java/slf4j-api:0
+	dev-java/slf4j-log4j12:0
+	dev-java/slf4j-simple:0
+	dev-java/stax-ex:0
+	dev-java/stax2-api:0
+	dev-java/xmlstreambuffer:0"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.java -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+pkg_pretend() {
+	local die_now=""
+
+	if [ -d /usr/share/netbeans-java-${SLOT}/ant ]; then
+		if [ -n "$(find /usr/share/netbeans-java-${SLOT}/ant -type l)" ]; then
+			eerror "Please remove following symlinks and run emerge again:"
+			find /usr/share/netbeans-java-${SLOT}/ant -type l
+			die_now="1"
+		fi
+	fi
+
+	if [ -L /usr/share/netbeans-java-${SLOT}/maven ]; then
+		if [ -z "${die_now}" ]; then
+			eerror "Please remove following symlinks and run emerge again:"
+		fi
+
+		echo "/usr/share/netbeans-java-${SLOT}/maven"
+		die_now="1"
+	fi
+
+	if [ -n "${die_now}" ]; then
+		die "Symlinks exist"
+	fi
+}
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip maven.embedder/external/apache-maven-3.0.5-bin.zip || die
+	ln -s "${DISTDIR}"/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip o.jdesktop.beansbinding/external/beansbinding-1.2.1-doc.zip || die
+	ln -s "${DISTDIR}"/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar j2ee.eclipselink/external/eclipselink.jar || die
+	ln -s "${DISTDIR}"/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip hibernate4lib/external/hibernate-release-4.3.1-lib.zip || die
+	ln -s "${DISTDIR}"/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar maven.indexer/external/indexer-artifact-5.1.1.jar || die
+	ln -s "${DISTDIR}"/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar maven.indexer/external/indexer-core-5.1.1-patched.jar || die
+	ln -s "${DISTDIR}"/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar maven/external/jarjar-1.4.jar || die
+	ln -s "${DISTDIR}"/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar j2ee.eclipselink/external/javax.persistence_2.1.0.v201304241213.jar || die
+	ln -s "${DISTDIR}"/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip websvc.jaxws21/external/jaxws-2.2.6.zip || die
+	ln -s "${DISTDIR}"/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip websvc.jaxws21api/external/jaxws-2.2.6-api.zip || die
+	ln -s "${DISTDIR}"/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip websvc.jaxws21/external/jaxws-api-doc.zip || die
+	ln -s "${DISTDIR}"/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip j2ee.eclipselink/external/JPAjavadocs04032013.zip || die
+	ln -s "${DISTDIR}"/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar maven.indexer/external/lucene-core-3.6.2.jar || die
+	ln -s "${DISTDIR}"/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar maven.indexer/external/lucene-highlighter-3.6.2.jar || die
+	ln -s "${DISTDIR}"/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar maven.embedder/external/maven-dependency-tree-2.0.jar || die
+	ln -s "${DISTDIR}"/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
+	ln -s "${DISTDIR}"/CDF434816732716A56529F7F2E9B019F925AA064-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-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-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}/maven/lib
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-cli-1.2.jar && dosym /usr/share/commons-cli-1/lib/commons-cli.jar ${instdir}/commons-cli-1.2.jar || die
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm AbsoluteLayout.jar  && dosym /usr/share/absolutelayout/lib/absolutelayout.jar ${instdir}/AbsoluteLayout.jar || die
+	rm beansbinding-1.2.1.jar && dosym /usr/share/beansbinding/lib/beansbinding.jar ${instdir}/beansbinding-1.2.1.jar || die
+	rm cglib-2.2.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/hibernate4
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm antlr-2.7.7.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.7.jar || die
+	rm c3p0-0.9.2.1.jar && dosym /usr/share/c3p0/lib/c3p0.jar ${instdir}/c3p0-0.9.2.1.jar || die
+	rm cglib-2.2.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
+	rm commons-collections-3.2.1.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections-3.2.1.jar || die
+	rm dom4j-1.6.1.jar && dosym /usr/share/dom4j-1/lib/dom4j.jar ${instdir}/dom4j-1.6.1.jar || die
+	rm javassist-3.18.1-GA.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist-3.18.1-GA.jar || die
+	rm jboss-logging-3.1.3.GA.jar && dosym /usr/share/jboss-logging/lib/jboss-logging.jar ${instdir}/jboss-logging-3.1.3.GA.jar || die
+	rm jboss-transaction-api_1.2_spec-1.0.0.Final.jar && dosym /usr/share/glassfish-transaction-api/lib/jta.jar ${instdir}/jboss-transaction-api_1.2_spec-1.0.0.Final.jar || die
+	rm jtidy-r8-20060801.jar && dosym /usr/share/jtidy/lib/Tidy.jar ${instdir}/jtidy-r8-20060801.jar || die
+	rm log4j-1.2.12.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.12.jar || die
+	rm slf4j-api-1.6.1.jar && dosym /usr/share/slf4j-api/lib/slf4j-api.jar ${instdir}/slf4j-api-1.6.1.jar || die
+	rm slf4j-log4j12-1.6.1.jar && dosym /usr/share/slf4j-log4j12/lib/slf4j-log4j12.jar ${instdir}/slf4j-log4j12-1.6.1.jar || die
+	rm slf4j-simple-1.6.1.jar && dosym /usr/share/slf4j-simple/lib/slf4j-simple.jar ${instdir}/slf4j-simple-1.6.1.jar || die
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext/jaxws22
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm FastInfoset.jar && dosym /usr/share/fastinfoset/lib/fastinfoset.jar ${instdir}/FastInfoset.jar || die
+	rm javax.mail_1.4.jar && dosym /usr/share/oracle-javamail/lib/mail.jar ${instdir}/javax.mail_1.4.jar || die
+	rm mimepull.jar && dosym /usr/share/mimepull/lib/mimepull.jar ${instdir}/mimepull.jar || die
+	rm saaj-impl.jar && dosym /usr/share/saaj/lib/saaj.jar ${instdir}/saaj-impl.jar || die
+	rm stax-ex.jar && dosym /usr/share/stax-ex/lib/stax-ex.jar ${instdir}/stax-ex.jar || die
+	rm stax2-api.jar && dosym /usr/share/stax2-api/lib/stax2-api.jar ${instdir}/stax2-api.jar || die
+	rm streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/xmlstreambuffer.jar ${instdir}/streambuffer.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxws22/api
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
+	rm saaj-api.jar && dosym /usr/share/jsr67/lib/jsr67.jar ${instdir}/saaj-api.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/maven
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jdom-1.0.jar && dosym /usr/share/jdom-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 bd288bf..8f40aae 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_p20150423 (23 Apr 2015)
+
+  23 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javacard-9999_p20150423.ebuild:
+  bumped to the latest sources
+
 *netbeans-javacard-9999_p20150421 (21 Apr 2015)
 
   21 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index e134745..3317fd6 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201504140001-src.zip 207131027 SHA256 78124063613a80
 DIST netbeans-trunk-nightly-201504160452-src.zip 207150212 SHA256 16f83a8d853a24a06c78f758426af3fded5d6284a27a1e867656ccfb51dad248 SHA512 9155dec6773c8560091652e93c561874be5fbbb18eb7658c53d872eb081e31683358986921c90d371f5e8a3c66779532fba131e5bf9d90c97d2518b5349fa881 WHIRLPOOL bce9d3120af6e9cd41850622e460c94f17aa641bf03da0657ecc75df24361e35f347d91a571f598bfa858cb8b9e608a02189f60b0d40e75f7d8c8ac938ca6042
 DIST netbeans-trunk-nightly-201504170001-src.zip 207165961 SHA256 a30747f33bf216973e62f474edffb31d9db669c6250ea4f12eb83b42f3515843 SHA512 6df1a966b8bca727728b9a007f8448b57c41270b9fabf9039ef958648c7c96c1a0fa20e86e75d90a5bf86700827c1b2520d2ac12ee6e9ee550ea931b2d2419ed WHIRLPOOL 945ef6e67fd91c0c8dfeceff4ed0a4226f0090a134137357e6ad5c6ffcc82815ef6d4cba7cf1f9d6a0682f34454012b28d8124b44a294bb586f671f5dc5c032d
 DIST netbeans-trunk-nightly-201504210001-src.zip 207178961 SHA256 b277aeba16c941024cc88c8d36a4183ff078adf054721dadc8593be14c963c0d SHA512 d421faa83f70a9ec7cb58d88290aa1104839d2b3e5f3e4582f1c2294fa2647913911eb298d625ad8a97bbf7aa2c35314a4480e20d36c0f4abb7f909c5f2c3481 WHIRLPOOL 5b2becf39729c209e27bd3cbcf0f7fe88b1829c3e898c24fc6d5c1efb4345cd17637243390886151cdba80d05cff65da6eedf7fcb9bb3fca42afb08d26ed2fa8
+DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9ebdb4fae53f4999d1bb357dad09966f36c050e52d9cf53507f6 SHA512 2a2a5dab10d0dcf6797f1a51f58af7a2f39c9c10a29f5e3f231e895e20333b434273cb69192209e400c75bde82a6d7175c0018fba94998911f4e71abf30f4119 WHIRLPOOL 7ae4e39d0a8f0e7ee249e3f8fa7aa0a77f837734e9e7dfa3b2b648c015fba99f5f0d1088474c8678cf9de0728c1ce1eb9bd6de0319369c862011531c84c1e0f5
 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
@@ -59,5 +60,6 @@ EBUILD netbeans-javacard-9999_p20150414.ebuild 4982 SHA256 0e1ef0e0493a7e7c70317
 EBUILD netbeans-javacard-9999_p20150416.ebuild 4982 SHA256 44f9628141153666158d34b81d00ce46800dfebc19c49329dd7610866480db5c SHA512 ea3ec9e0e109d0298c8a769da4ed05743eb197a4d47c26c2026617c7b00cc55208e2e09ac818344e58e13ee5f4dd5eede3a7e9e1dee6be06bd64c216dd870ff9 WHIRLPOOL be45b466868da6160c148fef19a6fdfe2bd9dc27eeb18000958b18e7e00e46c3ded61898edfa6e54d7cbb2c693d81048538f032cad6f6c56e6ff2a655a62388c
 EBUILD netbeans-javacard-9999_p20150417.ebuild 4982 SHA256 b9ac669d3ae305f65fe8903233375f1eec632ad92e440cce138b8f75f3e6d8e7 SHA512 75da6ec0da27b65649efc0ae5e8202a2403cd0bcb2641ebfaaf8c221435342a3db7503341aca1a837810a110fc6a321db63111f03c0fe97ed9dabfcc09cf155e WHIRLPOOL 1bf5de15e16b701f5dd9084bc588b6efd4c904eec23aef3cb6624827187ec655af0cdc53e9775f708dbc096f575960baac09690b03f975da9cef720c0cf4de9c
 EBUILD netbeans-javacard-9999_p20150421.ebuild 4982 SHA256 aa18f52776de46de10979c45bd08f1e22b59ce6ee87c1e52c344a43e2de62909 SHA512 fc67dde704afddd6398e254535e1ca9b15fed1d01398a63c487f4528a68803779373609d3dbcac3aa02fee7c8f9342032c37b6b3ae357da5da26dfe2c8a043b5 WHIRLPOOL 5cd01326fce53b2ec01f73c18fdbd25c1948c2c6c1331c93b876dd4e8e276caead4014defc2749f5a21c554c407728a07dfe0921a10e4e758f4e3eec88a04c39
-MISC ChangeLog 164345 SHA256 7be6e76984edb3be5b244f42c6394b2812b1e8fa4255de55bdc71821c4eb4f2f SHA512 bfa06f9e99fbbf41ce274a98a5cae47d4ef99db9abcda94ff036c0a0d42d5f0b3960aa94a13350983af5b69d3cb68e01d1d1635445d7ea46f195a2a127178de2 WHIRLPOOL 7aeb9fb80463b5ed8ad0200c0cc46a5e4fad93fc2b50253e9a61e961f268f72b7a42d2a43e650f09fcc645db06c683408f8348dabef76673472ac4905ec247c8
+EBUILD netbeans-javacard-9999_p20150423.ebuild 4982 SHA256 1175aa72d1b45318417a9fb1500853724b1cbef29b3106b22ed83e51b8d03e54 SHA512 570955e042c5ebfc7c40f0a1902af2bdd213053341d81170a5bed2d609d9eba279dee5393b00f77b6b4a5e76e6102a0c235d7f10f7a8868f5618f2d5aa9c9875 WHIRLPOOL 332262b34f2c436bf28faaf03508543faa82e8e70de762e0daa5d384e6268fc982da9a864dc01911f43529d38da4ab502dbc9e2426fa893f141621f25e52031b
+MISC ChangeLog 164522 SHA256 6d5e81d47584a681f9a9c2cd839fe7287c1e50424570941702857d114a5b23a0 SHA512 25019c5299917d88391e91527d2d25745eb54054600b98098a61efb9ce5eb0ffa279082e5d20323e9775eeb34759a7dd8929f7ae2653cbfac2a4e318354a46d2 WHIRLPOOL fc12fca89998ed4908ed2ce8b8292442541b3c8dc058f6d51749a64afc63de1c437a51276ac47af00c3e4f7ee69ff44fd23cbf864c850de802cebf9eba01b3a6
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150423.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150423.ebuild
new file mode 100644
index 0000000..f86798d
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150423.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-04-23_00-01-56/zip/netbeans-trunk-nightly-201504230001-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 69aa34a..c0f15b3 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_p20150423 (23 Apr 2015)
+
+  23 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javadoc-9999_p20150423.ebuild:
+  bumped to the latest sources
+
 *netbeans-javadoc-9999_p20150421 (21 Apr 2015)
 
   21 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index aac2fa8..bcba530 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -37,6 +37,7 @@ DIST netbeans-trunk-nightly-201504140001-src.zip 207131027 SHA256 78124063613a80
 DIST netbeans-trunk-nightly-201504160452-src.zip 207150212 SHA256 16f83a8d853a24a06c78f758426af3fded5d6284a27a1e867656ccfb51dad248 SHA512 9155dec6773c8560091652e93c561874be5fbbb18eb7658c53d872eb081e31683358986921c90d371f5e8a3c66779532fba131e5bf9d90c97d2518b5349fa881 WHIRLPOOL bce9d3120af6e9cd41850622e460c94f17aa641bf03da0657ecc75df24361e35f347d91a571f598bfa858cb8b9e608a02189f60b0d40e75f7d8c8ac938ca6042
 DIST netbeans-trunk-nightly-201504170001-src.zip 207165961 SHA256 a30747f33bf216973e62f474edffb31d9db669c6250ea4f12eb83b42f3515843 SHA512 6df1a966b8bca727728b9a007f8448b57c41270b9fabf9039ef958648c7c96c1a0fa20e86e75d90a5bf86700827c1b2520d2ac12ee6e9ee550ea931b2d2419ed WHIRLPOOL 945ef6e67fd91c0c8dfeceff4ed0a4226f0090a134137357e6ad5c6ffcc82815ef6d4cba7cf1f9d6a0682f34454012b28d8124b44a294bb586f671f5dc5c032d
 DIST netbeans-trunk-nightly-201504210001-src.zip 207178961 SHA256 b277aeba16c941024cc88c8d36a4183ff078adf054721dadc8593be14c963c0d SHA512 d421faa83f70a9ec7cb58d88290aa1104839d2b3e5f3e4582f1c2294fa2647913911eb298d625ad8a97bbf7aa2c35314a4480e20d36c0f4abb7f909c5f2c3481 WHIRLPOOL 5b2becf39729c209e27bd3cbcf0f7fe88b1829c3e898c24fc6d5c1efb4345cd17637243390886151cdba80d05cff65da6eedf7fcb9bb3fca42afb08d26ed2fa8
+DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9ebdb4fae53f4999d1bb357dad09966f36c050e52d9cf53507f6 SHA512 2a2a5dab10d0dcf6797f1a51f58af7a2f39c9c10a29f5e3f231e895e20333b434273cb69192209e400c75bde82a6d7175c0018fba94998911f4e71abf30f4119 WHIRLPOOL 7ae4e39d0a8f0e7ee249e3f8fa7aa0a77f837734e9e7dfa3b2b648c015fba99f5f0d1088474c8678cf9de0728c1ce1eb9bd6de0319369c862011531c84c1e0f5
 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
@@ -62,5 +63,6 @@ EBUILD netbeans-javadoc-9999_p20150414.ebuild 6234 SHA256 b99c80bc2581fde7fedf71
 EBUILD netbeans-javadoc-9999_p20150416.ebuild 6234 SHA256 c7b9bcc2e2dfb615f20f19896f08bc6481df03c343b4c47cf011e81c9884b462 SHA512 0cf5399569d383c5a819ce2a193f356d3086cb3d7b5f46cf8d145eade010265182ec424b4532873af90cd1a2a2c96b3dd67a88d96afce06ec77d128dbcf7c0ba WHIRLPOOL fff726fbb60e9f88107c297d2622f3c0d242e6c3cd1a13d98edeef97394684c6c17e706e1475976046b10d195d538f0458d93bb5017a7a8849185b1eebf454a8
 EBUILD netbeans-javadoc-9999_p20150417.ebuild 6234 SHA256 6ce43f1cc14979b660c02aa67fab0253a1d06bc41876871b3f2f4a7a1a249238 SHA512 1f219e29b1f5c8e5e5c72e1092ae570eb409093352b3f1bf2222e57d940a636c2b74646cae207b05677b34c4650537ea72fbc0c39f3a1a2e5b25e001d881ea91 WHIRLPOOL 8131def65bd989e48b1fb6d8936b15bfea29a35909b46c012929d2eff76fe5dc35655d8efba112d55444cfbafab40d71a4e78af27452b83f382ecafc49383c0b
 EBUILD netbeans-javadoc-9999_p20150421.ebuild 6234 SHA256 079767078c911cc2098a67ec1844e73598d1e54c063f03ac67f7335dcdc80e0d SHA512 8d9e3a6105753a5a6a4cb53ed59abbca3ab68cb561004c828cf5857deb16a10c7b4a62836f6dc40ca9999c78291bdd95721aaa49721a910fed75611ad9a92f67 WHIRLPOOL 7ceb9363c7c6d8d60c493254c39ba07f2154c0c9f8daca3f748d5ceab584630950060f965685573a79aa14ef6d7fe80da15009f35eb32e3c2d321cbca7768172
-MISC ChangeLog 162123 SHA256 ab1d8803f4da972cb4d072baf7744729efef567541c6f2db72582900d1cbf32a SHA512 df16b3bf3c97b01c027d49163773b0250705cc1d40384202030a721f66f9291d96d04054065dfab663b186d40d01566629944cca6ad313eb191b7f28c15c4adc WHIRLPOOL 44cece6752586b03e531e06fa8c62fdbc71142ff0ee252526204ddcc1d3869da5d2c8aec96d6c51e6764964910e209f03fd2feca8e32115a93ad817461c0db7a
+EBUILD netbeans-javadoc-9999_p20150423.ebuild 6234 SHA256 f166b7057cfcd2262ab0bf9a72db99244dc6fa030f8eece5aafa78066eb91816 SHA512 fa39cb36ecb08315d85a5b59165f2ef7b9ee2ed7a819a9db478626a297bbac5427da5fdb00905a9ee8f2de813663be23dcf5c6cf1391295210d7d94af62c2ac8 WHIRLPOOL 35cd90bf7747a00c2154d1b2ff9a0d5bec6ba74734983c22ca2d9f6d2069bc4ae2e18bc2ebdcfb7e908a629c8ab751ea61dd5373c5aafe3352d8346a1102e5ba
+MISC ChangeLog 162298 SHA256 562afbc4b5a0c73e4faf3b170d0430e7494e74111ef985a21b6d8240105effc6 SHA512 aa825ca31af4958a0d23b6e32b8ba918137241a2ae6402e5195552f65ac398b1d80545dcf7d2948d7fe05fc75d06f9b53e5dca67bf11534cfb80a7569557598e WHIRLPOOL d2a70378b57bdd5bb2ab35d3fa5cfd4aa296371415c025e88acbaf9840cb3178448c42378d1a30467be0bc0fc7ae2e2fc64c1a7398670e02bfd9305bcffacea8
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-javafx/ChangeLog b/dev-java/netbeans-javafx/ChangeLog
index e45fd8f..9cebdb1 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_p20150423 (23 Apr 2015)
+
+  23 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javafx-9999_p20150423.ebuild:
+  bumped to the latest sources
+
 *netbeans-javafx-9999_p20150421 (21 Apr 2015)
 
   21 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index c228200..09e1cf2 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -37,6 +37,7 @@ DIST netbeans-trunk-nightly-201504140001-src.zip 207131027 SHA256 78124063613a80
 DIST netbeans-trunk-nightly-201504160452-src.zip 207150212 SHA256 16f83a8d853a24a06c78f758426af3fded5d6284a27a1e867656ccfb51dad248 SHA512 9155dec6773c8560091652e93c561874be5fbbb18eb7658c53d872eb081e31683358986921c90d371f5e8a3c66779532fba131e5bf9d90c97d2518b5349fa881 WHIRLPOOL bce9d3120af6e9cd41850622e460c94f17aa641bf03da0657ecc75df24361e35f347d91a571f598bfa858cb8b9e608a02189f60b0d40e75f7d8c8ac938ca6042
 DIST netbeans-trunk-nightly-201504170001-src.zip 207165961 SHA256 a30747f33bf216973e62f474edffb31d9db669c6250ea4f12eb83b42f3515843 SHA512 6df1a966b8bca727728b9a007f8448b57c41270b9fabf9039ef958648c7c96c1a0fa20e86e75d90a5bf86700827c1b2520d2ac12ee6e9ee550ea931b2d2419ed WHIRLPOOL 945ef6e67fd91c0c8dfeceff4ed0a4226f0090a134137357e6ad5c6ffcc82815ef6d4cba7cf1f9d6a0682f34454012b28d8124b44a294bb586f671f5dc5c032d
 DIST netbeans-trunk-nightly-201504210001-src.zip 207178961 SHA256 b277aeba16c941024cc88c8d36a4183ff078adf054721dadc8593be14c963c0d SHA512 d421faa83f70a9ec7cb58d88290aa1104839d2b3e5f3e4582f1c2294fa2647913911eb298d625ad8a97bbf7aa2c35314a4480e20d36c0f4abb7f909c5f2c3481 WHIRLPOOL 5b2becf39729c209e27bd3cbcf0f7fe88b1829c3e898c24fc6d5c1efb4345cd17637243390886151cdba80d05cff65da6eedf7fcb9bb3fca42afb08d26ed2fa8
+DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9ebdb4fae53f4999d1bb357dad09966f36c050e52d9cf53507f6 SHA512 2a2a5dab10d0dcf6797f1a51f58af7a2f39c9c10a29f5e3f231e895e20333b434273cb69192209e400c75bde82a6d7175c0018fba94998911f4e71abf30f4119 WHIRLPOOL 7ae4e39d0a8f0e7ee249e3f8fa7aa0a77f837734e9e7dfa3b2b648c015fba99f5f0d1088474c8678cf9de0728c1ce1eb9bd6de0319369c862011531c84c1e0f5
 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
@@ -61,5 +62,6 @@ EBUILD netbeans-javafx-9999_p20150414.ebuild 4723 SHA256 bc05fab90f0f7f63307e7a7
 EBUILD netbeans-javafx-9999_p20150416.ebuild 4723 SHA256 27d61a0177fe2bd2ace335219523490b9f50e2f1a35a064735f288eaec538e9b SHA512 7036ab86ae0148b051fb839a18d866b6d32823cc32fc8f0f4f4bffdfe2daaaae9f0d0184eeabaafaddf5d8f6ba254d43f6fd6448064608663cc9810675c70092 WHIRLPOOL f432358b995ac48561de02b6d0a93c7721b9f99b8c9a375032a37397a8f72c0a6484071abab977acead1a391a6ff86eba0f34abe0f30c884dccf2cd6b1fa67bc
 EBUILD netbeans-javafx-9999_p20150417.ebuild 4723 SHA256 3a368542bce30f542a388330c9a04bba183753743ec5b3ec679714b86cdd6c84 SHA512 30b8eca508a7320e58f96eff61fe9cb4d18c8fa3ecd08bf69ee0ff3ba33c5b9dff67689d32574e0752e51eebf94169d08047f0c93bf8338b3129564c29d43013 WHIRLPOOL 34dae24e830192d5200b6c67943c49ec4474d82b785c5a5f4cb53e401dc919552fd02c712a1ebcd9e367f500366967a9e752b16debeda87fb52b78b9bf62faeb
 EBUILD netbeans-javafx-9999_p20150421.ebuild 4723 SHA256 0d37ad047a7e40f954001bfe274c10ea812fc7376265a270d5770f2b12d153aa SHA512 abffa36d38e534ab214e1e3b6fd5dfcc58584dc8c1a28c98cbb0501bbfa6234405cf2c9b815fb1746e66d1ebde78be3a3f29efdc4e75b1fcce1aac7762230ca6 WHIRLPOOL 8320bf8436d4bc47a5802a9f6456d605c858170dc8492a86a08edd806ee48eab3d740d945d73891f3689874aa74d5115a7593251384a11f12fc054241938bdda
-MISC ChangeLog 146768 SHA256 720e1679e15b67c667f1988155926c4590cef9f39a6a67052e901017fb485f21 SHA512 42f3043829d4c17efebb37ad49b6e8e684efb64416a227207bfd71a19e3287b22872ac342dc31fa7dcb8a17658d02e56672935c4793cac70b9798b3ed9db46ad WHIRLPOOL 055783bb43395886f76b79c551b4684fcf8aedcbe020e6220acf6f5dcb22cb1a4f6ac214aed76104a1822dc8d658a6a758a7f02a0ec3d127ee062567aaffac75
+EBUILD netbeans-javafx-9999_p20150423.ebuild 4723 SHA256 0454454b4ed0bd6b0d990cbc8aec15535fc17d9e2ef103015c7608027590b784 SHA512 134045bedbe4081472e1ec9bc26641877fcd544cce2f4d287796fa693abb765befb97db03460b14c9ca7017699e362da71a3dd8605777763e58ffd6c33b5d4bb WHIRLPOOL a718f9de62662f780de1cc4e4d751f4c41173c416a232d243eb0c9d8bd62175623b353d67b4fecfff60e097a6ff2115107d0e209002e9c5a1dbf9cbba157c1b3
+MISC ChangeLog 146941 SHA256 8a1ddde35513b1e366e3af1cb13e85cf496cbed85ff935b3f2d12cda0e6228e2 SHA512 2b7275ae34874e77f71b20f250daf443d2799f72f7aa6eccd67f2ca95957aff6191da9c0cd404f1eaeabea2360771492430015f25b22350e716a759d170aebc4 WHIRLPOOL 3b16e9f97267690255488cddd3fe8321f9424f2f292aeee24624fe684e1bd0d4ac38dff4ea5b332779a3e7161c476fbcbb4ffc751fcc0ccd66346c3d70790a2d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-mobility/ChangeLog b/dev-java/netbeans-mobility/ChangeLog
index 7c7f46f..86caa93 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_p20150423 (23 Apr 2015)
+
+  23 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-mobility-9999_p20150423.ebuild:
+  bumped to the latest sources
+
 *netbeans-mobility-9999_p20150421 (21 Apr 2015)
 
   21 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 466e407..634e588 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -40,6 +40,7 @@ DIST netbeans-trunk-nightly-201504140001-src.zip 207131027 SHA256 78124063613a80
 DIST netbeans-trunk-nightly-201504160452-src.zip 207150212 SHA256 16f83a8d853a24a06c78f758426af3fded5d6284a27a1e867656ccfb51dad248 SHA512 9155dec6773c8560091652e93c561874be5fbbb18eb7658c53d872eb081e31683358986921c90d371f5e8a3c66779532fba131e5bf9d90c97d2518b5349fa881 WHIRLPOOL bce9d3120af6e9cd41850622e460c94f17aa641bf03da0657ecc75df24361e35f347d91a571f598bfa858cb8b9e608a02189f60b0d40e75f7d8c8ac938ca6042
 DIST netbeans-trunk-nightly-201504170001-src.zip 207165961 SHA256 a30747f33bf216973e62f474edffb31d9db669c6250ea4f12eb83b42f3515843 SHA512 6df1a966b8bca727728b9a007f8448b57c41270b9fabf9039ef958648c7c96c1a0fa20e86e75d90a5bf86700827c1b2520d2ac12ee6e9ee550ea931b2d2419ed WHIRLPOOL 945ef6e67fd91c0c8dfeceff4ed0a4226f0090a134137357e6ad5c6ffcc82815ef6d4cba7cf1f9d6a0682f34454012b28d8124b44a294bb586f671f5dc5c032d
 DIST netbeans-trunk-nightly-201504210001-src.zip 207178961 SHA256 b277aeba16c941024cc88c8d36a4183ff078adf054721dadc8593be14c963c0d SHA512 d421faa83f70a9ec7cb58d88290aa1104839d2b3e5f3e4582f1c2294fa2647913911eb298d625ad8a97bbf7aa2c35314a4480e20d36c0f4abb7f909c5f2c3481 WHIRLPOOL 5b2becf39729c209e27bd3cbcf0f7fe88b1829c3e898c24fc6d5c1efb4345cd17637243390886151cdba80d05cff65da6eedf7fcb9bb3fca42afb08d26ed2fa8
+DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9ebdb4fae53f4999d1bb357dad09966f36c050e52d9cf53507f6 SHA512 2a2a5dab10d0dcf6797f1a51f58af7a2f39c9c10a29f5e3f231e895e20333b434273cb69192209e400c75bde82a6d7175c0018fba94998911f4e71abf30f4119 WHIRLPOOL 7ae4e39d0a8f0e7ee249e3f8fa7aa0a77f837734e9e7dfa3b2b648c015fba99f5f0d1088474c8678cf9de0728c1ce1eb9bd6de0319369c862011531c84c1e0f5
 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
@@ -65,5 +66,6 @@ EBUILD netbeans-mobility-9999_p20150414.ebuild 4418 SHA256 6c3fd35761a9a7617dac4
 EBUILD netbeans-mobility-9999_p20150416.ebuild 4418 SHA256 3f9d8881252b0eb44d28b4a99d6d2b7a076764515f005ded6a5f2f9e77dc705b SHA512 7b003c53c49183194f437c8c3e26bdf1d31624340263757235c6fe02682c35565079d85f953ed954e123e1192edfe7075df1af3d13b4c2a8ef5d08c5367569f4 WHIRLPOOL c07d7539f57c837cb99298e137c4e5595c94554518989be7572dd64255b6d53ad633a41991e1827c762ee7f80d46688e39256457f496e2a7d8092561922cf336
 EBUILD netbeans-mobility-9999_p20150417.ebuild 4418 SHA256 a9c8a5b4b3bbb2992e93b17f7680362b1c12fdddd939e2513c5f7e56b3ec1eca SHA512 6f082143813929fa9c2520ebf8194ede1f764dbc5ecbf4ce040ef7b3021d4883f996151559ed0f6a501fa6b004c94e28b9037fa1cae66a1b19ccaafd14930777 WHIRLPOOL d04bbf19ec0b04fdab2793278dee2fafdd926344942867d16da7e3db6da6409fde19845a0c6694f105be524b2b1df3030798f6731e66a1fbf3cf2576a66bee11
 EBUILD netbeans-mobility-9999_p20150421.ebuild 4418 SHA256 13aa9acf107dbd5eea12f6a656f80b383f79ab0b4de73e237739aa5d746b008a SHA512 04bc05fd045d3c4bb2d00968cd78979fb2bec4fcb42e310412b8fe75b08c62b8116809fd476cf2e90e0d88cf77831dcee6552b3253bf0ef8b02050e1fefefd84 WHIRLPOOL 2291d2d97a880c65fb6903a9d6ca9cee8a8362f6146b2bed7098974660d331fb0eb9a0c79c58e8cd25aad2b4708e0d3f6aafb6e75ad36865ccf7a69b46bcfc67
-MISC ChangeLog 164486 SHA256 ced09cba40968ef7e753d6e1bab6817b608b5aa850bf3fe832dd6bffd37f4cc2 SHA512 09b4acae50a23afccb8fd887f4bda7662824dffca9ceef2b996c7b3c85e9cbc874200b1ac5bcdb1554e50d30ee8421f813ecc9c970cff3d6952cd6656dd4622a WHIRLPOOL c61ce1c0de97785209ad8bce452f0a77e8b771512418b6e76f31382f47bda552c59a18bce196753df0df238fed06ebf9aa25d0531b0efcd43814c0bdc1b363d5
+EBUILD netbeans-mobility-9999_p20150423.ebuild 4418 SHA256 4e12acf22c14b142cb3ddc9d14f6046f2f0d00d3840789e6d637634961974bc9 SHA512 dfb3c104f00a9fdbb8290994164831272416eb185eb2a2c2df3ece7137e0ae1aace5c53f168f077f9e655d086bd2f58b47c1fef5c59a9062b735a74a040bfbcf WHIRLPOOL 94ca1ea65a53067aa6b2eb6bb6998badaa0f4f85f43828deaabcb70c712266ccd8f3f181ea3588a199173fb73c342ae25af5848ecc7615308a967d53181ccccf
+MISC ChangeLog 164663 SHA256 6a3c0f8868d3f9eb4156a6596b100d7c469063a7682ed05c62e8260c3fa0f4eb SHA512 0bb6202b25ec0fd019c47d460e0982c0d228161ccf18fccbee127c362e228401452ad79cb4d78a5ad6d603bd5ea66bb868abb5152236e84d325e23a56383d21e WHIRLPOOL ddee6e60ee49923e24a07868db2329e8c3fb343b0fbb47a391a55ae04af5fcef77a6248760aa611736f09c08f538329e03cedf877f24100e505a1a504cdfe9d7
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150423.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150423.ebuild
new file mode 100644
index 0000000..e3a09f9
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150423.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-04-23_00-01-56/zip/netbeans-trunk-nightly-201504230001-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 a6a2829..47da734 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_p20150423 (23 Apr 2015)
+
+  23 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-nb-9999_p20150423.ebuild:
+  bumped to the latest sources
+
 *netbeans-nb-9999_p20150421 (21 Apr 2015)
 
   21 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index fb7844c..71bedae 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201504140001-src.zip 207131027 SHA256 78124063613a80
 DIST netbeans-trunk-nightly-201504160452-src.zip 207150212 SHA256 16f83a8d853a24a06c78f758426af3fded5d6284a27a1e867656ccfb51dad248 SHA512 9155dec6773c8560091652e93c561874be5fbbb18eb7658c53d872eb081e31683358986921c90d371f5e8a3c66779532fba131e5bf9d90c97d2518b5349fa881 WHIRLPOOL bce9d3120af6e9cd41850622e460c94f17aa641bf03da0657ecc75df24361e35f347d91a571f598bfa858cb8b9e608a02189f60b0d40e75f7d8c8ac938ca6042
 DIST netbeans-trunk-nightly-201504170001-src.zip 207165961 SHA256 a30747f33bf216973e62f474edffb31d9db669c6250ea4f12eb83b42f3515843 SHA512 6df1a966b8bca727728b9a007f8448b57c41270b9fabf9039ef958648c7c96c1a0fa20e86e75d90a5bf86700827c1b2520d2ac12ee6e9ee550ea931b2d2419ed WHIRLPOOL 945ef6e67fd91c0c8dfeceff4ed0a4226f0090a134137357e6ad5c6ffcc82815ef6d4cba7cf1f9d6a0682f34454012b28d8124b44a294bb586f671f5dc5c032d
 DIST netbeans-trunk-nightly-201504210001-src.zip 207178961 SHA256 b277aeba16c941024cc88c8d36a4183ff078adf054721dadc8593be14c963c0d SHA512 d421faa83f70a9ec7cb58d88290aa1104839d2b3e5f3e4582f1c2294fa2647913911eb298d625ad8a97bbf7aa2c35314a4480e20d36c0f4abb7f909c5f2c3481 WHIRLPOOL 5b2becf39729c209e27bd3cbcf0f7fe88b1829c3e898c24fc6d5c1efb4345cd17637243390886151cdba80d05cff65da6eedf7fcb9bb3fca42afb08d26ed2fa8
+DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9ebdb4fae53f4999d1bb357dad09966f36c050e52d9cf53507f6 SHA512 2a2a5dab10d0dcf6797f1a51f58af7a2f39c9c10a29f5e3f231e895e20333b434273cb69192209e400c75bde82a6d7175c0018fba94998911f4e71abf30f4119 WHIRLPOOL 7ae4e39d0a8f0e7ee249e3f8fa7aa0a77f837734e9e7dfa3b2b648c015fba99f5f0d1088474c8678cf9de0728c1ce1eb9bd6de0319369c862011531c84c1e0f5
 EBUILD netbeans-nb-7.0.1.ebuild 5106 SHA256 3c68751bf5face5f80e2d7dcedb7466e69343f2d06c0a4dd30a722a987fbb207 SHA512 d79343e0ca8655b074a8f96b9898e4bc0123d60e346602ba8d7a239597993cadb33a036b43862ef1a39630e4f0ba7e79892d8b2eed8b30535f12a5d0b9f4b581 WHIRLPOOL 9f2cd645e34fbcfa8f0059fbda4f355f411aaff7966121360dfe5b3c769966c5a4586bbc04142b279e3a3fa323bc4b51a6349cf3eafe89063db44fcae58ef119
 EBUILD netbeans-nb-7.1.2.ebuild 4977 SHA256 265f9e4a9490937a65632ddaef48e3a731154b07b9ee5f9536a991181fc2fcbd SHA512 65d1065993dba3b1fece428beb1b75f17d89eddb08aacd2cbf5ecd3ee5ca844e75e9100c324ecdeeed5b138b1da4ab8cd5a4598e584a17545ffc2c52ea763779 WHIRLPOOL 9b63f2b5671bd38d24ff6b280de37fc19c74170bf80c22818da5e8af415a85211c6cfcf690e68d7697c41a1b749a3c7b48ec9b362782df140856f892d381e360
 EBUILD netbeans-nb-7.2.ebuild 4960 SHA256 bef2020a6e0d722ca77c0931b9a06014cedc822f14a21d8d916200e358dcdfb8 SHA512 988d902bbef52e123b5800e56049210d69c4dd6dbeca80396aeac58c70d90b76da65b338e664368ea3f9a3973b7b94ffd0a47a77b01be53452c2cc04c4067442 WHIRLPOOL a27fa8a1a066499a3fc2cb82e955b6b18b1725889b088ea1e94528cde3ec58f3b46c1e757fa597af6ad4ba96218dacfacff9561799f46add316e233d46127d28
@@ -64,5 +65,6 @@ EBUILD netbeans-nb-9999_p20150414.ebuild 5003 SHA256 20c402d6c38af77fbd6b6b22282
 EBUILD netbeans-nb-9999_p20150416.ebuild 5003 SHA256 89d241cff445b9dbe5537b701f20414c9337cf9db181438e52c1e2e9d1644708 SHA512 873e13da24ca3763d9921d9391e59677450ea2a695e91cd6f7688cf68d06f428b0717cfb83b692edd7c9ec50fa48e4cdeb4d5d22a775e4595f098eeeebe0bc79 WHIRLPOOL d41210ac135afdafe4892a585c14d8f08acf5875867ad2699a27b7c75f6993b048275c059cb6cebac80f227874b600064c47c34ea935ca6e39cb34985d81ee04
 EBUILD netbeans-nb-9999_p20150417.ebuild 5003 SHA256 928e26af64f731d12b686606533c8a5ad387ddfbe106f3842a197cb177957d8d SHA512 f8638847ca2247e843fae9c8934078975fb4ecc2e8b44c14153f42a3540778f67d63c2830cbd55bef81be114293442c9bea1fba60a71d3e25ffbdb9e7734538b WHIRLPOOL 5518ea537ebd450c251c7be5077a043917210611cef33c237f31b9f078a936248d44f818d4efb880169a570543925253ddf09a4e38a67f85e1170739ffd71bcc
 EBUILD netbeans-nb-9999_p20150421.ebuild 5003 SHA256 bf40f1a0d120b6e613800bd9d4a201275ca7a7b14a106933abf6718123e4e70d SHA512 44ec2ed13eeb90bb4cadd3bbd5f8dc550800c03b34ac976ba7295a3da92dd0f4a965a90aae77f108b0d4b9f86b3b3e88cf2899b11ca52e05341a57c456a64c03 WHIRLPOOL 89d97210ccac3633d25a1110b30a3678c40f0d5a1fbbf6c9242ac18290db96c1765e92f9d474322ae901e8b5712f2af329463e3828762d79d2837e2b639f1fec
-MISC ChangeLog 153708 SHA256 819d0b19ac3769e83cd7fe0de381918728cf4ad639953dfc9c24efb25ccdc82a SHA512 d9b61a91b1ca0bf178df837b1af607a73fd85a07cad269b639d20c7717d8b9cdedfb281a3d69ae1f51bdb8998a2d11dc49a7c1077bcc507613d951121d619c5b WHIRLPOOL 843c5c1a90a4295bf6bfe92da2fa204d7972efbe562b99a6e5fad5b62e9b52b6d840f1b028ead3f4c9b52830e0017364e2b1943fd77935c7ab728ab62e51381a
+EBUILD netbeans-nb-9999_p20150423.ebuild 5003 SHA256 f19f2c6d6e80b7967f9fe1c00900d2da84b9a9677a7da89b42a3f223c53fe7c7 SHA512 4cbdda0402cbc8fb152b27cf7bd618b0b4cceb129ed1e58723b3c4a06a63fc82c20a4056cca7dabe4af544f52984c84b15f83bc48ce0b2ec82af0420705b52fe WHIRLPOOL 999fd12a494dd6612864bb4abba78182f3fd6b06c6b587b187ca8b1dfe1c6fdfcce8c327328ea9d94cfffb31b01a44012127e3320e894ba72a3a5b3478d5e2dd
+MISC ChangeLog 153873 SHA256 41c251c01771b6a6a71ba50b3515b419be7fb3ccc9c866b0cf6ffe5fe8f72253 SHA512 079e71faa3e973dcc667a9365e66e763e4ecfefb845414aceae4ff4ae7488d93064a5e0c78bf3cf16f92fb42637643e0bc13eeeba638350816fd8638ec2a144c WHIRLPOOL b0ed92693a39b4ace8aef0aacff4b750abcb850dbbd1f6035b723d6219e5bad33bb582376a54db6a2f6ec2662bac82537dabe8b991b54f9ca53747349f0aa570
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

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

diff --git a/dev-java/netbeans-php/ChangeLog b/dev-java/netbeans-php/ChangeLog
index 8c65e72..4c6eecf 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_p20150423 (23 Apr 2015)
+
+  23 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-php-9999_p20150423.ebuild:
+  bumped to the latest sources
+
 *netbeans-php-9999_p20150421 (21 Apr 2015)
 
   21 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index 5abd3d5..fa1bfe3 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -42,6 +42,7 @@ DIST netbeans-trunk-nightly-201504140001-src.zip 207131027 SHA256 78124063613a80
 DIST netbeans-trunk-nightly-201504160452-src.zip 207150212 SHA256 16f83a8d853a24a06c78f758426af3fded5d6284a27a1e867656ccfb51dad248 SHA512 9155dec6773c8560091652e93c561874be5fbbb18eb7658c53d872eb081e31683358986921c90d371f5e8a3c66779532fba131e5bf9d90c97d2518b5349fa881 WHIRLPOOL bce9d3120af6e9cd41850622e460c94f17aa641bf03da0657ecc75df24361e35f347d91a571f598bfa858cb8b9e608a02189f60b0d40e75f7d8c8ac938ca6042
 DIST netbeans-trunk-nightly-201504170001-src.zip 207165961 SHA256 a30747f33bf216973e62f474edffb31d9db669c6250ea4f12eb83b42f3515843 SHA512 6df1a966b8bca727728b9a007f8448b57c41270b9fabf9039ef958648c7c96c1a0fa20e86e75d90a5bf86700827c1b2520d2ac12ee6e9ee550ea931b2d2419ed WHIRLPOOL 945ef6e67fd91c0c8dfeceff4ed0a4226f0090a134137357e6ad5c6ffcc82815ef6d4cba7cf1f9d6a0682f34454012b28d8124b44a294bb586f671f5dc5c032d
 DIST netbeans-trunk-nightly-201504210001-src.zip 207178961 SHA256 b277aeba16c941024cc88c8d36a4183ff078adf054721dadc8593be14c963c0d SHA512 d421faa83f70a9ec7cb58d88290aa1104839d2b3e5f3e4582f1c2294fa2647913911eb298d625ad8a97bbf7aa2c35314a4480e20d36c0f4abb7f909c5f2c3481 WHIRLPOOL 5b2becf39729c209e27bd3cbcf0f7fe88b1829c3e898c24fc6d5c1efb4345cd17637243390886151cdba80d05cff65da6eedf7fcb9bb3fca42afb08d26ed2fa8
+DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9ebdb4fae53f4999d1bb357dad09966f36c050e52d9cf53507f6 SHA512 2a2a5dab10d0dcf6797f1a51f58af7a2f39c9c10a29f5e3f231e895e20333b434273cb69192209e400c75bde82a6d7175c0018fba94998911f4e71abf30f4119 WHIRLPOOL 7ae4e39d0a8f0e7ee249e3f8fa7aa0a77f837734e9e7dfa3b2b648c015fba99f5f0d1088474c8678cf9de0728c1ce1eb9bd6de0319369c862011531c84c1e0f5
 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
@@ -67,5 +68,6 @@ EBUILD netbeans-php-9999_p20150414.ebuild 4423 SHA256 dba90c7da072a072d4fcedee4c
 EBUILD netbeans-php-9999_p20150416.ebuild 4423 SHA256 b5ba2fb6e77b6b2b857635ccabb0efe50a38f2b8e3ee428021e21054171c9f09 SHA512 b4f8deac6c7abdcab4d0ef4067c6adb0f42ddd7ce849c07f0e7f305b98faf0faecd5bdfd09cb2b8b4301b6b3f7ab43f8d431c6feff72a38ddb8cc2e1f26bb85e WHIRLPOOL abbe27a5baaa3ab5bd534f6a60b1e2e92ec77f988020e683be70a5c6689bbc48ac5fb0bd283c17896bd6caa9f37f392c138c1a594f6bf38aca445b77b7ef9b04
 EBUILD netbeans-php-9999_p20150417.ebuild 4423 SHA256 b40d0a2ece1f8424b3794b3a07edacb713b6bdebb3f819241f461ba6f3611101 SHA512 7ee099298f37016266b758200467294e5dd360055ca89c9b7e8030dd046583bd4fcfa61c4b10ffe138cfb1c0605821d682178f2aea80f0ee039a2810c1fe93a9 WHIRLPOOL b4e765ccbdc8c612db89bdf7219fef35d3c506f9f8a059ec93dbefc396b516788d797a80c40ac31b640ad2934ecda30e1d3fdd1ed857fb98677160e5b40ac7c5
 EBUILD netbeans-php-9999_p20150421.ebuild 4423 SHA256 bfa7b69c5d065c2efdd80d319a3a35aa7c2c154c4feb33667dbc8e4fbb4b498a SHA512 f701317c5380a3994ab5a5ba91b70d21cf5975dc6d33e52e7178e97fd455730ba4ea11037ef9418c1db09a14615b59431052f41b13ddb0ade38c994c0ac0f665 WHIRLPOOL 195de15aa35c4e014dd683508ae3803e542626ef78f8940aaaaa6afd005ebe2711d16f4cc415fbaa463fcb685b99a8eb27a1e09c5ecb189d8fd88c741fc39db2
-MISC ChangeLog 153388 SHA256 de9ec625b53cf554067485c132e4baee94ab98b471f1753e833c5a43e5b80867 SHA512 1e04076795af471ae5345866b2a684cac9f6878d079d0ade93da4d9428bc7b35d9946447f561821e0afa8da3fb617c7c0fd416df283cca689e7a3549a4c750d5 WHIRLPOOL d701885fa7b6a437623df1534feb5ccdbb9253a11c09d0393e75ec6ea725410f1b32eb3b723f67aee3ac5bcc1d82150d4d6ffece8a51f4618316a53d4eb5ecce
+EBUILD netbeans-php-9999_p20150423.ebuild 4423 SHA256 854bcc4abeb870e9f7541903cc540214244e03821e7acacea2b6766bd6970821 SHA512 ee4675752e73b0b9971155275b28244f49af7175c540d1679738180bbc33c068273b83ff6708ed2536b54a4652cfa3072cfaa159c6f88c1fcede4e15c783d7c5 WHIRLPOOL c2e3a56e6fa66b27fbfa473a1f48772426ab7b21caa0b965cc1ef60a627a0cb39a31f8f404eeb1c52ab1d3ab006407f02f80c389e95a3569336a336b228c81a6
+MISC ChangeLog 153555 SHA256 531f1d08dde52a0a824eb8fa4bbad7b985f1d41d5b46c8b3ea6299e758101c60 SHA512 449fbc818679f8350579d4505bf61d8a836fadfb12e2d099f49a3a6970ef287f28ee35fac719cd46d49133e33b0dfd872ac1112bfee19ef28a88a2f567167b2a WHIRLPOOL a1b19055f817f97466519e9c8d30306078dde5dde9b6d712f7c1569187ee7aa4159625c2c6e82eb1c8f45f72e1ab445a726addf592fd537c40dbd63ecaf53291
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20150423.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20150423.ebuild
new file mode 100644
index 0000000..496e64e
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20150423.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-04-23_00-01-56/zip/netbeans-trunk-nightly-201504230001-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 ac8e295..300cce2 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_p20150423 (23 Apr 2015)
+
+  23 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-platform-9999_p20150423.ebuild:
+  bumped to the latest sources
+
 *netbeans-platform-9999_p20150421 (21 Apr 2015)
 
   21 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 955682f..e69cbea 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -1,3 +1,4 @@
+DIST 0027BC49CBF5E88B68CCD58BD1EEB2EA7188D069-junit-3.8.2-api.zip 72555 SHA256 030c83b85348e572d3ccd946560db8b217b6ac751d0494ebbfa27aea19d01dfe SHA512 2b6a664635a589562142a61b7a23df49516c2df785d22654a1d3517234d38755f5325aafbb0d04989f66eeea1059833164d6c7df24983b8b7dbd569ef18820f5 WHIRLPOOL 7d9259290e1f35f4682d59087292821a74c50ec679c36e22fd7f5dc1130416b6875edc91ffe523c17ecb12342d019661f6783a257bf2af00a14c7d5e6c290b5f
 DIST 03FE10857B0689B1F98B8D96DE87E80DF5D87A69-net-java-html-boot-fx.jar 63071 SHA256 3da9815a7a11675944cbe85efdce0ca9756c5b6be1a16bf9b0e98b5984f4415f SHA512 7693394686124c5eae90bd1ee3b49a1356635f044f3aa8ddcbe838cbe1334a9efd15034d0513db1078afabcd13d667882f2f3b042eee0529a97b2f18c4c45032 WHIRLPOOL d731b30cd7c2b0284a0bc90c36950486bf9da4e94170733419257908df9b3f6c0166b8154b336df321b0986393e32ad0a501401c8ec43d952582933429914310
 DIST 08676C719D33D26DF4F3988E210A04D7F11183B7-felix-2.0.3.jar 284924 SHA256 654e4e24680cffaca17ccf43b0028978741fdc25abc7c1cf82a23ae11b160077 SHA512 8478d4d1e2cf602b06d235a7b38ef84b441a683710db8084849b75529f2716e5c4254efbe417cf5151bcfb6034eff9aa0485a86c1ac662af440b3e846329f5b5 WHIRLPOOL 3d1eed325dd2b1d3c742b0bfa6cf855fc24bb80a8441b6a9f172fa189328745970fe7de0b4541ba1e7a45c89fc55888715ace84563de0f2879ff4544c55c0f58
 DIST 14F630EDF137F54188636B5139432986D5FB19B7-felix-4.0.2.jar 493190 SHA256 f05d8543385a31f22eba0a6d2e10c69fb3883a32e0101832e58d9dda66bc33c6 SHA512 9e49eeb7f1bc61e6db16047ce846081ffcd3e7777b0538d48b6f5a3ecd7778637518f7ded7d2ef4cf812befa03dc43e7b7996b715e00f7600d87cf3cf741a065 WHIRLPOOL 55e21a695489e1c70757ca0061a30f8561fa69262662455601b1457fb911378cd5a9168afaa6c88a077e56709efcd15bc6a0ad178ed7b17cf832d8e9edc632cf
@@ -9,6 +10,7 @@ DIST 2D80F93B8803250F232902C46EBA850BF1F3E67F-org.eclipse.osgi_3.7.1.R37x_v20110
 DIST 2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar 241636 SHA256 94ecde163b4ca3a42425cd830c79197f22d0d1336d471ced6a8a83b07acbf7c8 SHA512 346746e19ca24e7489ba7bb283cefa47d2df33e6795e9e275bdc269dc312537264c24537b2128246cca8a4c2053a73e4172c6d0b9f16450e227d9aa895e9c730 WHIRLPOOL beb6125f81acbe80b6249d2b857a0759a876bba677466af6d1b71b54dffe33272d3d8e98953a49e2acf502fc27d60c31eef442e19f5f63a17a3d5190c27e6b69
 DIST 31C9329E78A222E38CB86716ACFCEF81EF0BA1FD-net-java-html-boot-script.jar 10699 SHA256 555f1fda384ab2466f4ea8a6ceee918c3207fc0765f833835bf0a3ae4d87546f SHA512 80fa6c2efb84c0046eef85613ac4c0b66e22ff611621c74d38f9f480b4fc31c30af607d8a6b99cf557dbea18b61844cdfb3236026f3597a984debbe4ad4a5bd7 WHIRLPOOL c44e695c890ca53328d441a8728a86045d3892aad9f1c934ab8ef76a74f8e11c6adde7531e37fc21bba1028e3f42e54fda44823f23978e9de5aa692ce23d1aa7
 DIST 432EDFB05C0F44E6ADAC4B1F3E08C67D1F52FB4B-net-java-html-json.jar 97196 SHA256 4497b1cbf9bc8e8eb8323ec6ea1b226e94cb30c374da4971c47d3129061e1975 SHA512 726cdf540cb0031b0433c09eea93f99b316ceebde771a7dfcc1f52c7858404a47c8c284c479b4e7dbfaa46453a0c84abf2fcf86e0eb9f666a2fbc48a207259d4 WHIRLPOOL ec6989a5f261cc08d9a5181d4b0b7c3a2e23719483b23559f465bb56283565347b63292946e29caa8ba1c93df16faf93b5d2226c3d4c850b0754d505945e7328
+DIST 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 986195A7E31034EE73F7A896A36B24169692F142-osgi.core-4.2.jar 101276 SHA256 f352484ea4d982793637f9c6978ebb283b2b026ec4c5add78b776084f420b8d8 SHA512 84d689b8704d3f172ba73df7b1d51e9c8a48f8bb983fc136da9b195d600201aa03a62df68fe13cdd04cf00302def3bdd89756c0553feecd0095b85a0067e6a4c WHIRLPOOL 4d8ca7718e056d970ddff2a0a8fe625f26efda7d5cfd8380d622025178c93c92bb783dd4093443bcfb34e78baaf9bf0648ca18ce35fc57d84ceb7f1e28573f8f
 DIST A7B6C3470DB8821A3587CE04844FF504A7C62354-net-java-html-sound.jar 9106 SHA256 7a3491a5173e53a6171713ecf7b68789fded694a622aa5aaf7ef5f558db2283a SHA512 c121b27e50a9fddb606d67c1651c8f812a0e74579e435fb56493bab2d112da408cb8521b483324b364ea9e0c8a562c9dac2fced426ac301f68e6d36a26926a33 WHIRLPOOL ab144785a5587070d19596195db1e2e937e625e74766005d1c55681226439e2cc9489a3930a873570bc96f5f05c25c39c88eec99dcf4d5298e3fe4183585eff5
@@ -56,6 +58,7 @@ DIST netbeans-trunk-nightly-201504140001-src.zip 207131027 SHA256 78124063613a80
 DIST netbeans-trunk-nightly-201504160452-src.zip 207150212 SHA256 16f83a8d853a24a06c78f758426af3fded5d6284a27a1e867656ccfb51dad248 SHA512 9155dec6773c8560091652e93c561874be5fbbb18eb7658c53d872eb081e31683358986921c90d371f5e8a3c66779532fba131e5bf9d90c97d2518b5349fa881 WHIRLPOOL bce9d3120af6e9cd41850622e460c94f17aa641bf03da0657ecc75df24361e35f347d91a571f598bfa858cb8b9e608a02189f60b0d40e75f7d8c8ac938ca6042
 DIST netbeans-trunk-nightly-201504170001-src.zip 207165961 SHA256 a30747f33bf216973e62f474edffb31d9db669c6250ea4f12eb83b42f3515843 SHA512 6df1a966b8bca727728b9a007f8448b57c41270b9fabf9039ef958648c7c96c1a0fa20e86e75d90a5bf86700827c1b2520d2ac12ee6e9ee550ea931b2d2419ed WHIRLPOOL 945ef6e67fd91c0c8dfeceff4ed0a4226f0090a134137357e6ad5c6ffcc82815ef6d4cba7cf1f9d6a0682f34454012b28d8124b44a294bb586f671f5dc5c032d
 DIST netbeans-trunk-nightly-201504210001-src.zip 207178961 SHA256 b277aeba16c941024cc88c8d36a4183ff078adf054721dadc8593be14c963c0d SHA512 d421faa83f70a9ec7cb58d88290aa1104839d2b3e5f3e4582f1c2294fa2647913911eb298d625ad8a97bbf7aa2c35314a4480e20d36c0f4abb7f909c5f2c3481 WHIRLPOOL 5b2becf39729c209e27bd3cbcf0f7fe88b1829c3e898c24fc6d5c1efb4345cd17637243390886151cdba80d05cff65da6eedf7fcb9bb3fca42afb08d26ed2fa8
+DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9ebdb4fae53f4999d1bb357dad09966f36c050e52d9cf53507f6 SHA512 2a2a5dab10d0dcf6797f1a51f58af7a2f39c9c10a29f5e3f231e895e20333b434273cb69192209e400c75bde82a6d7175c0018fba94998911f4e71abf30f4119 WHIRLPOOL 7ae4e39d0a8f0e7ee249e3f8fa7aa0a77f837734e9e7dfa3b2b648c015fba99f5f0d1088474c8678cf9de0728c1ce1eb9bd6de0319369c862011531c84c1e0f5
 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
@@ -81,5 +84,6 @@ EBUILD netbeans-platform-9999_p20150414.ebuild 8293 SHA256 8f983066a5fe8c1eac7c9
 EBUILD netbeans-platform-9999_p20150416.ebuild 8293 SHA256 c84dce91490474e655bad5f469f8d4348a196818a2cc788e8669ae1f35129901 SHA512 3664f400802fb34694e658809ad17ab878661782439b3d8c50ccda84fb3894afca9cd5c930a5fc6ffc820e7137922e50a7cfd9aff4f65fb298faef58dcc0bfa1 WHIRLPOOL da46b3a2fbd7541bcca3fae22c8e9a2aa7014f0d9437ce490af16c5f2e9633e504913bb1f29fb4b59cd2250a2e1966114612d934360310ed4828c26fe84ab95a
 EBUILD netbeans-platform-9999_p20150417.ebuild 8293 SHA256 a80d37afb86dfd29c47ffb7337114bb4fcf6c7b5692dbc17db39e584c98ac0c4 SHA512 26a3790f6149b6bb904b6e4fb2b3170ed23924a504a51040a329212626bb0917044bbdfd0b7b6102ac900998852027ad5acd03b287874fc2e41656facac38939 WHIRLPOOL 69f3a9716cc4b8bdd11c1a57c29021bfb39776654a1639e24e12885c449e1f013abf76cf47017f3564a3781f673550a4a00507d471bdf76c2953bbeef79636b7
 EBUILD netbeans-platform-9999_p20150421.ebuild 8293 SHA256 c105494e3e301bdd8c1c8308c85b10ce70877196cddc072bd64f77da07e132f7 SHA512 324ba652b8c61270ff98ba5d36202b4988107097afb9c072cf5d881587229927b19facc24b5a1a9ae2c59d7b5e3eee67c32525d8b7074b3b22bf0da81b4db099 WHIRLPOOL d829e13dad887dc8ddfba5dfe09c612f3593514d4f0c04b1153abba453dbd19710d46292fa992ea6370d6423c057f93d4b1a3f4f5ad8649a0e0173d5eed83f72
-MISC ChangeLog 165082 SHA256 c86a8d750ae3dd7f607f81fbea404525143e2f5d892abbf416afdd06574563ef SHA512 66e2119eda54cf0df12dd8732bf9df3274a36d826755de5284df6cf9ec5ff891dc949ea140687fcff349a7e3d04306d954462fd44ae6d55b0d499d7d07fb37b9 WHIRLPOOL 6225dd13e08e2ad479a5e7557d367e62b5fe150dd319c87056d067506bdb530a6cb08239b454f57e3c303bf61907ddeeb1bff8cf8186e041c6a3f4f7257d8ada
+EBUILD netbeans-platform-9999_p20150423.ebuild 9652 SHA256 ca973ab7c88079bd9a3e3c81229569f5e7e16fa503805b9e6ee72b99af31c0af SHA512 659bae8fe33ef47daff830517b808135ed2f984efeb186d603f13f62ceee9f4b63f0d032ab5dae007d198f9c281ebaafeeb6e04adcd351e99182ce12554d3598 WHIRLPOOL 06a0ac403e2a2d91660661a32d185728c9c059306b1ad7b5d729835282d39463b2b85a23dad29dd4af0794a10fb5d404eedcc76b21b011ce56af9e1a654ccb12
+MISC ChangeLog 165259 SHA256 e148c494f3c4a59f1229786171e1612ccde351c88e1a6a0ec5f835fc23c99d10 SHA512 e3c2b8a8f47af8eb622c366f77dfb49e9bac060047b4213834f5aafd360d4cded64e7f58b022832853dd95cfa631a8ff3b53c3d3f04f9a93b0ae4b41bd30fffa WHIRLPOOL 27453d12fa8a322ce74d426ad9c98f989a3b271bf34ef5f3067f1228c75433ecbc144b59f9ee8f6d3c9c5bdc7abf9d69c238c4f0fd5fb0961fcdcede2d2e724c
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-profiler/ChangeLog b/dev-java/netbeans-profiler/ChangeLog
index ab281c4..7ae805d 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_p20150423 (23 Apr 2015)
+
+  23 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-profiler-9999_p20150423.ebuild:
+  bumped to the latest sources
+
 *netbeans-profiler-9999_p20150421 (21 Apr 2015)
 
   21 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 5c7b5f0..c4978a6 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201504140001-src.zip 207131027 SHA256 78124063613a80
 DIST netbeans-trunk-nightly-201504160452-src.zip 207150212 SHA256 16f83a8d853a24a06c78f758426af3fded5d6284a27a1e867656ccfb51dad248 SHA512 9155dec6773c8560091652e93c561874be5fbbb18eb7658c53d872eb081e31683358986921c90d371f5e8a3c66779532fba131e5bf9d90c97d2518b5349fa881 WHIRLPOOL bce9d3120af6e9cd41850622e460c94f17aa641bf03da0657ecc75df24361e35f347d91a571f598bfa858cb8b9e608a02189f60b0d40e75f7d8c8ac938ca6042
 DIST netbeans-trunk-nightly-201504170001-src.zip 207165961 SHA256 a30747f33bf216973e62f474edffb31d9db669c6250ea4f12eb83b42f3515843 SHA512 6df1a966b8bca727728b9a007f8448b57c41270b9fabf9039ef958648c7c96c1a0fa20e86e75d90a5bf86700827c1b2520d2ac12ee6e9ee550ea931b2d2419ed WHIRLPOOL 945ef6e67fd91c0c8dfeceff4ed0a4226f0090a134137357e6ad5c6ffcc82815ef6d4cba7cf1f9d6a0682f34454012b28d8124b44a294bb586f671f5dc5c032d
 DIST netbeans-trunk-nightly-201504210001-src.zip 207178961 SHA256 b277aeba16c941024cc88c8d36a4183ff078adf054721dadc8593be14c963c0d SHA512 d421faa83f70a9ec7cb58d88290aa1104839d2b3e5f3e4582f1c2294fa2647913911eb298d625ad8a97bbf7aa2c35314a4480e20d36c0f4abb7f909c5f2c3481 WHIRLPOOL 5b2becf39729c209e27bd3cbcf0f7fe88b1829c3e898c24fc6d5c1efb4345cd17637243390886151cdba80d05cff65da6eedf7fcb9bb3fca42afb08d26ed2fa8
+DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9ebdb4fae53f4999d1bb357dad09966f36c050e52d9cf53507f6 SHA512 2a2a5dab10d0dcf6797f1a51f58af7a2f39c9c10a29f5e3f231e895e20333b434273cb69192209e400c75bde82a6d7175c0018fba94998911f4e71abf30f4119 WHIRLPOOL 7ae4e39d0a8f0e7ee249e3f8fa7aa0a77f837734e9e7dfa3b2b648c015fba99f5f0d1088474c8678cf9de0728c1ce1eb9bd6de0319369c862011531c84c1e0f5
 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
@@ -56,5 +57,6 @@ EBUILD netbeans-profiler-9999_p20150414.ebuild 3478 SHA256 9101d2b9f97e110898828
 EBUILD netbeans-profiler-9999_p20150416.ebuild 3478 SHA256 494427ced0ce42c82332aba94ce0ce66623a8af467e65ea031236aa3382754e5 SHA512 d75c7ad39d24e12ccb21338a447a77cf9cb31c04cb79eb48f3f2c63506e9b4fb53f7c711c8725a34924d37905db645cf81795cd257ebe551bef04e92f40eb7cb WHIRLPOOL 0fd5b84814a1acf015aec521c4deeff6936f796c8b4b9eb8b008dbe1aad31c4ebf935c3dd15a5c754704bfad62dbd39c5112ee27527966c36ee3dfb5a025ce81
 EBUILD netbeans-profiler-9999_p20150417.ebuild 3478 SHA256 42f6975b88eb8b89437a35f3f3e4dbb46564783e164bb5b71ac5cdc1291df228 SHA512 225fb823564cb357deacd7099e12eae3b2c8872daaeeca3b6f380627f43699340eaf713b6ebf75fca881f1d56ce470506b7809f4b38a5b5bff5c5c2b08e84d88 WHIRLPOOL 1966856693deabf50f5fe628a9858bf0bfc20c8d15dfb5b111f535ecf5bfe5608175cfd6933aa8116a8b22b95aa124145c5d4010856cb0600e50b324f8d14d2f
 EBUILD netbeans-profiler-9999_p20150421.ebuild 3478 SHA256 42fe361da62f2c704dcafc54fe338c80af6c670115ea9b8e9110c161bc1a2794 SHA512 445cbcbee658afa7d5e362a535f89ed2b86ee3ed8778ff74bae9eb945cca638f5985ae75a3d6564a7d46e7c8c3fc5197af804f6c29c2f7b0dfadad58a29cd7e4 WHIRLPOOL 9848b6d16506c9173153e43f411de318812e4695db1da1e60b014c917d5a567b066360a46bc54f0253ad692e7ba40630f0e236cf677e2c4999e6ec7be0d32a09
-MISC ChangeLog 164543 SHA256 c46db88852979fa1bfc79f9f3afdf8b11f7fc2056a6f91b120cb1fc773b7a791 SHA512 1b75da1dfe93180b0d8e333a4e530060f3ceb13aeaf62b8c392e4b4b75941b8e1a465e1f2899be09ef5756541014a66910f601814f4f1540ecd7ac5a135a49a0 WHIRLPOOL f37c90e42dedb5870b61f5f5fa6f399787128870067b478e8cece7ca6337679d6deb9e307983c01b3e3f4e6082d912af4279ae9eb043a56e155ad57aa2cc905a
+EBUILD netbeans-profiler-9999_p20150423.ebuild 3478 SHA256 9162330ec844e959136d17a95b00a3e619be96572e6f5ca43fb5ee5b0b6d84fe SHA512 cb7a3e3f829904279a4ff61539c75d432d6767a44d683ecccbd11e02592d185a137dd03c28ba659bc2996d250a55462b82b376ea1ff0f8bac3ef0e55d4e4ddf6 WHIRLPOOL 1cba3f741c0b05782c8a9cb207eb1341df03490de02208da0859d1efe01d86a6d3c34967ecabfcf05029beb3742aff05cfe36b1584f31d071916fd53ec0e502a
+MISC ChangeLog 164720 SHA256 ff4fd4cbe10d2a93ea21e954049e7915d0bbbd1b38ef7aeabaf6b649a7cf2bd9 SHA512 cdc8d522c14da907dd1dc90841cd7692b56e32091173710a2927d0e169053a2bf40e9063804af7de6cfc95568776f191ea8967742664ce3fd014f258ebb1d60a WHIRLPOOL d01a2da608c8dbd068f547c491bb9c805a35a84d60a00b4dd5747caf51bc8ffd00e365fd8c5359298feca03d56d3cb5800ced08caed7e79ec87623328a372548
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150423.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150423.ebuild
new file mode 100644
index 0000000..83baf40
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150423.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-04-23_00-01-56/zip/netbeans-trunk-nightly-201504230001-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 90108f1..ffeb411 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_p20150423 (23 Apr 2015)
+
+  23 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-webcommon-9999_p20150423.ebuild:
+  bumped to the latest sources
+
 *netbeans-webcommon-9999_p20150421 (21 Apr 2015)
 
   21 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index c226313..b93238e 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -37,6 +37,7 @@ DIST netbeans-trunk-nightly-201504140001-src.zip 207131027 SHA256 78124063613a80
 DIST netbeans-trunk-nightly-201504160452-src.zip 207150212 SHA256 16f83a8d853a24a06c78f758426af3fded5d6284a27a1e867656ccfb51dad248 SHA512 9155dec6773c8560091652e93c561874be5fbbb18eb7658c53d872eb081e31683358986921c90d371f5e8a3c66779532fba131e5bf9d90c97d2518b5349fa881 WHIRLPOOL bce9d3120af6e9cd41850622e460c94f17aa641bf03da0657ecc75df24361e35f347d91a571f598bfa858cb8b9e608a02189f60b0d40e75f7d8c8ac938ca6042
 DIST netbeans-trunk-nightly-201504170001-src.zip 207165961 SHA256 a30747f33bf216973e62f474edffb31d9db669c6250ea4f12eb83b42f3515843 SHA512 6df1a966b8bca727728b9a007f8448b57c41270b9fabf9039ef958648c7c96c1a0fa20e86e75d90a5bf86700827c1b2520d2ac12ee6e9ee550ea931b2d2419ed WHIRLPOOL 945ef6e67fd91c0c8dfeceff4ed0a4226f0090a134137357e6ad5c6ffcc82815ef6d4cba7cf1f9d6a0682f34454012b28d8124b44a294bb586f671f5dc5c032d
 DIST netbeans-trunk-nightly-201504210001-src.zip 207178961 SHA256 b277aeba16c941024cc88c8d36a4183ff078adf054721dadc8593be14c963c0d SHA512 d421faa83f70a9ec7cb58d88290aa1104839d2b3e5f3e4582f1c2294fa2647913911eb298d625ad8a97bbf7aa2c35314a4480e20d36c0f4abb7f909c5f2c3481 WHIRLPOOL 5b2becf39729c209e27bd3cbcf0f7fe88b1829c3e898c24fc6d5c1efb4345cd17637243390886151cdba80d05cff65da6eedf7fcb9bb3fca42afb08d26ed2fa8
+DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9ebdb4fae53f4999d1bb357dad09966f36c050e52d9cf53507f6 SHA512 2a2a5dab10d0dcf6797f1a51f58af7a2f39c9c10a29f5e3f231e895e20333b434273cb69192209e400c75bde82a6d7175c0018fba94998911f4e71abf30f4119 WHIRLPOOL 7ae4e39d0a8f0e7ee249e3f8fa7aa0a77f837734e9e7dfa3b2b648c015fba99f5f0d1088474c8678cf9de0728c1ce1eb9bd6de0319369c862011531c84c1e0f5
 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
@@ -60,5 +61,6 @@ EBUILD netbeans-webcommon-9999_p20150414.ebuild 4997 SHA256 75076bd16e0fff898469
 EBUILD netbeans-webcommon-9999_p20150416.ebuild 4997 SHA256 36fca13c201fbbda3113221b7d1cfe820d1235402a570fdcdc1ec0a7c6d7c451 SHA512 b1660917c4b22faab86c58015d8463f822dbbd22103985058c528ef88b12fcc50daffc2b6ac0ee4bd35dcb6750b449e02ce88a185276ecf462bcd1f8a8c4cd67 WHIRLPOOL 8fbdd724918b34d9f1d401d0a725f028f16da2835e43d33706253a3c238ecb8935716038aecb7ab88281edd93ad1c4be6f4a474dfa69be17d77e2a59b3f1495c
 EBUILD netbeans-webcommon-9999_p20150417.ebuild 4997 SHA256 a8524d36207f7b09eefeff931388d5624d1353ff5d638b38c987d34e7661f142 SHA512 799a56806730d07bb24ba0829d2e622dd5893e8fb3d016f868e88b60de530e8c1320fa8c3913ea1353d57dc5f275aefb83d87e79e409708d454c8e25aff50ed7 WHIRLPOOL 45447ddc773ec61577bd81d5ed5699249cecbb0216b5f96082d0529243bfdb99acd69603afe2c21cc12781a46f84128b52ff94681942eb8590069eecb11f14a3
 EBUILD netbeans-webcommon-9999_p20150421.ebuild 4997 SHA256 3b435a5a6c5c06a297180a526f702932fa37cf9e24fe08e20cf489136f07c920 SHA512 2daeba1bb1e64ad00186c3be0c28077d94db6cb70b54fc38b2a66758672a253817380a876678fee89db42743b251b6aabfd41414bc1806cece0ac84fdc43b10b WHIRLPOOL c1a6ee48403e031b0e7a61f73b256b8976cdc9b648516397e2307a4b84223198ec2cbbd007dc89907e0332a35b97a746f41b4dfd582143b3a0550f3dcea8e908
-MISC ChangeLog 137578 SHA256 9220a886c0a8e1720ee127089b9745f7da228608bd63798a0c1c9e1cb64e288a SHA512 8133c0abd5496e3f2dca839824a60ffcf618706b5962baad83216999b2a38df8ffd5c4ebcabb5ed86bd63723157f6df474d51aa15bdcdafbd52c07957e7a14be WHIRLPOOL 273ed3154f79530a8468c4811b79590feaa0f414f3982ea488ee918ef50e864c3ebd44b518a3da0aa92540e733ce338a6f50b0ea981a9692eeccf237de877bb9
+EBUILD netbeans-webcommon-9999_p20150423.ebuild 4997 SHA256 02f1c52b633ae50b4b48c917c38700b8eb724d136a584438b83d423d39d8a7f9 SHA512 c3769d3dc4e35f9289eacc60a53ca2dc5d734bfb23b0a6b2b01afe6fcae23f3cc8befd03d782a5f4d5f1f9262d471c769024a9bc02ba37a00a406795d7a82e70 WHIRLPOOL 1e7c0843f31758579fc3b9510a164bd361e55d971e97f8be2aa66d5a5f4a7b833a0beec36bda168f8ae48a1f83af34f744239bc292b28bba4acb75c51d9d6085
+MISC ChangeLog 137757 SHA256 cae61f648852c3c11f02b9795be8f772e738ef75bfd8831fdae21f857f0f5eb9 SHA512 c9188832466e9ec6023eec3e1ee52df305a03206a6428f497ee0ce21dcf767d8ce4d1e14f434dbc6cfa0e92ea5bef5608eee9f041df9835ba2f14947ddb01468 WHIRLPOOL ea3a1ca182989a413796e2f339240d7c58ebfaf02b384c175bd7ad4c216aaa5c93287e17ea0ae117a74d4d8d56c342ef59cd0fafd279e4974c530bdb523379ce
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150423.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150423.ebuild
new file mode 100644
index 0000000..746f8c1
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150423.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-04-23_00-01-56/zip/netbeans-trunk-nightly-201504230001-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 8a6b049..23ac80d 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_p20150423 (23 Apr 2015)
+
+  23 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-websvccommon-9999_p20150423.ebuild:
+  bumped to the latest sources
+
 *netbeans-websvccommon-9999_p20150421 (21 Apr 2015)
 
   21 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 24c7b02..c6add5d 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201504140001-src.zip 207131027 SHA256 78124063613a80
 DIST netbeans-trunk-nightly-201504160452-src.zip 207150212 SHA256 16f83a8d853a24a06c78f758426af3fded5d6284a27a1e867656ccfb51dad248 SHA512 9155dec6773c8560091652e93c561874be5fbbb18eb7658c53d872eb081e31683358986921c90d371f5e8a3c66779532fba131e5bf9d90c97d2518b5349fa881 WHIRLPOOL bce9d3120af6e9cd41850622e460c94f17aa641bf03da0657ecc75df24361e35f347d91a571f598bfa858cb8b9e608a02189f60b0d40e75f7d8c8ac938ca6042
 DIST netbeans-trunk-nightly-201504170001-src.zip 207165961 SHA256 a30747f33bf216973e62f474edffb31d9db669c6250ea4f12eb83b42f3515843 SHA512 6df1a966b8bca727728b9a007f8448b57c41270b9fabf9039ef958648c7c96c1a0fa20e86e75d90a5bf86700827c1b2520d2ac12ee6e9ee550ea931b2d2419ed WHIRLPOOL 945ef6e67fd91c0c8dfeceff4ed0a4226f0090a134137357e6ad5c6ffcc82815ef6d4cba7cf1f9d6a0682f34454012b28d8124b44a294bb586f671f5dc5c032d
 DIST netbeans-trunk-nightly-201504210001-src.zip 207178961 SHA256 b277aeba16c941024cc88c8d36a4183ff078adf054721dadc8593be14c963c0d SHA512 d421faa83f70a9ec7cb58d88290aa1104839d2b3e5f3e4582f1c2294fa2647913911eb298d625ad8a97bbf7aa2c35314a4480e20d36c0f4abb7f909c5f2c3481 WHIRLPOOL 5b2becf39729c209e27bd3cbcf0f7fe88b1829c3e898c24fc6d5c1efb4345cd17637243390886151cdba80d05cff65da6eedf7fcb9bb3fca42afb08d26ed2fa8
+DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9ebdb4fae53f4999d1bb357dad09966f36c050e52d9cf53507f6 SHA512 2a2a5dab10d0dcf6797f1a51f58af7a2f39c9c10a29f5e3f231e895e20333b434273cb69192209e400c75bde82a6d7175c0018fba94998911f4e71abf30f4119 WHIRLPOOL 7ae4e39d0a8f0e7ee249e3f8fa7aa0a77f837734e9e7dfa3b2b648c015fba99f5f0d1088474c8678cf9de0728c1ce1eb9bd6de0319369c862011531c84c1e0f5
 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
@@ -56,5 +57,6 @@ EBUILD netbeans-websvccommon-9999_p20150414.ebuild 2727 SHA256 aeba52c5446b7336b
 EBUILD netbeans-websvccommon-9999_p20150416.ebuild 2727 SHA256 a888f2089077c3e524800b93c738cec943befc790a59579eb45bda4ae4b819aa SHA512 557f902fada023937ab71d2ad018ac26c2e9ab5fbc51bb7a8475faf20926273be3cd2fd694839d6d3dd6ad598429158e5842d5278fa595540fb9495685f42325 WHIRLPOOL 86728c9bf6bb1c589901fc8a55f1bfc7cafaae17bb859aaa84ca681bd3ba2ac91f45ae9b8e113d1e6059a46ba0df9dfc7cbee9fac22439f7d31b54733d81ecdd
 EBUILD netbeans-websvccommon-9999_p20150417.ebuild 2727 SHA256 f405fbac18106121e7e6bba8c941509fc1d873fc55aaa3edb9f8aabfc0d5bee1 SHA512 6dad1c828bff21d2a97ae86bc5b55dd54dd7f31821fde5feb1194b28301db2a92b699af2ea268638eac152f8b331ca2ab3616f4bb3bf8d16d02661018399c3d9 WHIRLPOOL 8abd5f2a27ce71daf932d63493c8bd81f60d32d902ceb9b2c36d696c6142da2780790f0a7872dd63ab751bcf04cad4c4b49cedf17f61399333040f0776166972
 EBUILD netbeans-websvccommon-9999_p20150421.ebuild 2727 SHA256 31e0f629e921a3f9441d4d92658d45e0ad2521f4bbc07b6f66cea69b28dc84a3 SHA512 924b7777a51fe421c7ef9100c029347ccedd21c7c002abc2a4591c0ff66646d87c707a35a6c46aca3a48bac825b90f777e7bb3c5eebada6934a6a5363dafd21a WHIRLPOOL 76bb7c7d83a4fe16e9f703ce51aa7089634baad04c9780fa2b6238b577ed406d808ebfe051571d63e8edf166c0e594a948e684ae3a49686167478325d87cdbc8
-MISC ChangeLog 172424 SHA256 718647f932899e1f76519454e90a5287d3759ad02b08b286009c8385cb9aea67 SHA512 987460f3cec20c1ebb7564041ed715ac30293107930b89d04e880d2800f69a9d77b1a75a92a0353b5c6a1cc04336f926bb7446cb3ee6610eeb4378d728c4655a WHIRLPOOL 54e0a6a2719a8e86498317ebd1ed2ad27a6d0db96c2bd7f7eeaf6eb60d9e8499e9101a0411c6b6a89afee8d6f1adf9f04f10c6791996344b249167453661b943
+EBUILD netbeans-websvccommon-9999_p20150423.ebuild 2727 SHA256 6e542e53ab1e0980371b27a60c7888dbfb3fa793ac5ae39137a83454e9dadd4e SHA512 54636685103899b9b8415a7f451b968d804d158849356bc89dc45f6a398a85489aae8e305d3a427f4f240db168a23b0a9f0cb115934afca0ac73c3298380da83 WHIRLPOOL fc2e039d630ffc1b06deb522df76bdce6d1954949c0f018852fa494bf59f5ab177c2faaae4bad71c68efa3d5b78b184a05f3829522041a5848a6672dc83d5273
+MISC ChangeLog 172609 SHA256 cba93cc509c15b455955036fe6599aa7393a55ff490df02abd4f9eb1be71ee40 SHA512 904e93601e30990fdb4a2e060e2add434447b9e47ae40e79be1d0c6ab55f7579da5c7fe08d9d57cbed71e47057db3fd7bd080d763c67c2dd384c5e3ea086fa92 WHIRLPOOL fab4e93494f415456cf49d41468ca4fea4735797f84535947a63d7fc36f0d8a8b7fb3f654e26f562a9c4b13164bede4162e2b95e3918548b5380655d9d48fb95
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150423.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150423.ebuild
new file mode 100644
index 0000000..5e22e3b
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150423.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-04-23_00-01-56/zip/netbeans-trunk-nightly-201504230001-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 56e7180..82d26ef 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_p20150423 (23 Apr 2015)
+
+  23 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-9999_p20150423.ebuild:
+  bumped to the latest sources
+
 *netbeans-9999_p20150421 (21 Apr 2015)
 
   21 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index b228f90..221124c 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201504140001-src.zip 207131027 SHA256 78124063613a80
 DIST netbeans-trunk-nightly-201504160452-src.zip 207150212 SHA256 16f83a8d853a24a06c78f758426af3fded5d6284a27a1e867656ccfb51dad248 SHA512 9155dec6773c8560091652e93c561874be5fbbb18eb7658c53d872eb081e31683358986921c90d371f5e8a3c66779532fba131e5bf9d90c97d2518b5349fa881 WHIRLPOOL bce9d3120af6e9cd41850622e460c94f17aa641bf03da0657ecc75df24361e35f347d91a571f598bfa858cb8b9e608a02189f60b0d40e75f7d8c8ac938ca6042
 DIST netbeans-trunk-nightly-201504170001-src.zip 207165961 SHA256 a30747f33bf216973e62f474edffb31d9db669c6250ea4f12eb83b42f3515843 SHA512 6df1a966b8bca727728b9a007f8448b57c41270b9fabf9039ef958648c7c96c1a0fa20e86e75d90a5bf86700827c1b2520d2ac12ee6e9ee550ea931b2d2419ed WHIRLPOOL 945ef6e67fd91c0c8dfeceff4ed0a4226f0090a134137357e6ad5c6ffcc82815ef6d4cba7cf1f9d6a0682f34454012b28d8124b44a294bb586f671f5dc5c032d
 DIST netbeans-trunk-nightly-201504210001-src.zip 207178961 SHA256 b277aeba16c941024cc88c8d36a4183ff078adf054721dadc8593be14c963c0d SHA512 d421faa83f70a9ec7cb58d88290aa1104839d2b3e5f3e4582f1c2294fa2647913911eb298d625ad8a97bbf7aa2c35314a4480e20d36c0f4abb7f909c5f2c3481 WHIRLPOOL 5b2becf39729c209e27bd3cbcf0f7fe88b1829c3e898c24fc6d5c1efb4345cd17637243390886151cdba80d05cff65da6eedf7fcb9bb3fca42afb08d26ed2fa8
+DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9ebdb4fae53f4999d1bb357dad09966f36c050e52d9cf53507f6 SHA512 2a2a5dab10d0dcf6797f1a51f58af7a2f39c9c10a29f5e3f231e895e20333b434273cb69192209e400c75bde82a6d7175c0018fba94998911f4e71abf30f4119 WHIRLPOOL 7ae4e39d0a8f0e7ee249e3f8fa7aa0a77f837734e9e7dfa3b2b648c015fba99f5f0d1088474c8678cf9de0728c1ce1eb9bd6de0319369c862011531c84c1e0f5
 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
@@ -64,5 +65,6 @@ EBUILD netbeans-9999_p20150414.ebuild 7216 SHA256 12dd75fe3792937732b5a60c887eb1
 EBUILD netbeans-9999_p20150416.ebuild 7216 SHA256 b7fa88bf3f631250541228241a213432d6e338df9c467342fc4ae25103877779 SHA512 fca01c7c3b7b00248bcdb2d51e8590e4a3aa8667f28c9b2fa38f3c2d9c701de94356ff82ba662c48c8378cd5bad5eaaef623c51b868ee3af220bb3d53cd171c8 WHIRLPOOL 98808eea35b4c951af3f3a44dd36270d52c6d23b7e9d233ba37f8f1422ee0b4fe12695c2df733ceff27424265fac0c41bf13bdeb258a293c369580b912f879b9
 EBUILD netbeans-9999_p20150417.ebuild 7216 SHA256 e4e7c9041975dea0715480a7de2cbbc781d82487f88e21d76b242a8fbe97e66d SHA512 808275b4f393117adde2f4959c80af31b5a09e9ae85d6c9d88054eb77324e074519e1735bccf3172bc348d6d8ff631c9648eefb5939bdd56d6874d1495f41453 WHIRLPOOL 02e0f06e3617a41d0d6410cda02996abb6919e8c742f40547187f3d44666f2667220d8f035df9e8f1564c04dfc1cc8d2f3e225059651df74fd20e2675b135566
 EBUILD netbeans-9999_p20150421.ebuild 7216 SHA256 424c295f177f3ec8b9aaeaf5ffb8b35a4b6fcfdb0caa4509295889b47a6481fe SHA512 ead9deac4500e89d7ead39a82dd44247cc9f1971591c505734593123ce87a16ba9fed52bfafecbcef07f634eb17ae87ed3da12c6f0d7d14e106b9a0d13d8a02e WHIRLPOOL b98a1e590fe6bb021abeaa7a7abdc40c4819b217984263d19a61598bfcf298ceed585fbcb5daac63730bb2128d794b61e9482d8f915623fd00008ebd7d37472f
-MISC ChangeLog 146581 SHA256 8a00dcc276dab0cae2a26d8e3cb9e558727f01baff08490000cc2e8477b41fbe SHA512 06e870b394b8c65a507a0fe5d1e2b028c465e4c8b6dc273cab18123ff0886fbfccc4d856fc0c55451e08d94525d6e9e6e7fde5111e8418d4d71d15b1ed1ce640 WHIRLPOOL 54dd3a9d28a97dc4a5b19918e487e14cacfc96e084db12829d319f14f087279cb00f0168af9b79da9d814914266228191133842081de048123493b42065e187a
+EBUILD netbeans-9999_p20150423.ebuild 7216 SHA256 828f90dd1fa9106f4576de2f9ce71244c0aaebae5cd59f34f64983762e4b6270 SHA512 d51d5a3473fa6a69bf7c72df4dd864709f31bafc720076c9444ef4f192395a55ece4ad16473a7faf1ca08232dcad95ed055784987fcc38e0b793e8353bf3e6b0 WHIRLPOOL 3c9ce0c3ceb8816b311d58e80c4f0288cc0bf8bdf02f656469871f996ddf1f493979d06e57aba35fac825ddb5eb0cc07a2ebe4aa60a7c110b32c050cb62ce43e
+MISC ChangeLog 146740 SHA256 257ec224266589db60943b5356df59d110584d0fcc6de339707241a8b4d4b345 SHA512 0515d0b8825be2d1cbad86775d0d80b5f702be10dac3dd738bb5b257cd435e97632425e8430588f838bbf0c37ba3e8f332d68ec34d6e9e363cb7f3713f7b84c3 WHIRLPOOL 71695ce7b585ab37a4e046110ac6643539736bf29b56abd5d64acd5b6d6ec12a8593cda11b649f84f1eb031628f21a785148f6ce05e06171783b9df47d73d279
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

diff --git a/dev-util/netbeans/netbeans-9999_p20150423.ebuild b/dev-util/netbeans/netbeans-9999_p20150423.ebuild
new file mode 100644
index 0000000..eda8a6f
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20150423.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-04-23_00-01-56/zip/netbeans-trunk-nightly-201504230001-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-php/, dev-java/netbeans-harness/, ...
@ 2016-04-21  8:13 Miroslav Šulc
  0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2016-04-21  8:13 UTC (permalink / raw
  To: gentoo-commits

commit:     bb62b47913010f344ffea31685389900936a8cca
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 21 08:12:55 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Apr 21 08:12:55 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=bb62b479

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.2.28

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 01655df..6d9e296 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201604170001-src.zip 213245562 SHA256 8d1da18eea0786
 DIST netbeans-trunk-nightly-201604180001-src.zip 213245562 SHA256 33e9976d15aa52ed61f53bebb87d8290a64d6e7658dc96b044136f47d46c28de SHA512 71252b57630390c901bed5fec7021d5f9255adf02c2e84c1e0981a2d729c1d0c1ed14b927b1dd36c9a72b30ced64ae6b74429e4990ddfac4bc36aff4c46e7e17 WHIRLPOOL af4f5d0f0c8f7caac85bc7ecab0fe91c68141abc9df5a0a28cc069262aa08f869d5934f5d4a546fdd997e29dc5d63ab0aefcce530560e8ed5b9bfab86b962105
 DIST netbeans-trunk-nightly-201604190001-src.zip 213247710 SHA256 2f4140e8d8ae7ea2e527d35f7ba1a75379b48659c67fca903a9ae2f5ab45652a SHA512 7d9e19583553738a793829ea2da5d57026ff17418b0a36da19cd344548a7d3a2bd0bc8dde0938ede14712806fca58ba17c5b86270eb674e1cbf6b1009f81b438 WHIRLPOOL 61910b59a2c03276bcab996b94635d0823bca717a0560e7b348df4e3dc30b926e7280fc828aa38c6d80b786ff559ece017456790cfde77c6f3e8598c30357bdc
 DIST netbeans-trunk-nightly-201604200001-src.zip 213312613 SHA256 e5dc1c1019f49460244a5d2a0c0117a0aee8bc37047fd93dc5780d6a4e374284 SHA512 5a796bee9472f30ffeebae8cfe7b3f7de02cdcda5754d5196be5fd0d577a668270c9a0cc212cc1528b2f4beb2b1f0162d951dbf0582774a7a09f87329aa26251 WHIRLPOOL 38f51d2261a92a965b160c608358e2e3d62dd623ab4ff909ddda420ef57d626c93f57dbd713ab7136b6e7781e54dc997e41b73d90a35cc25c6706de9a727cc02
+DIST netbeans-trunk-nightly-201604210001-src.zip 213315777 SHA256 e4a64f84f3ab854860e94f2d438779d38398f13860ac1e0eea0242b5ac308c72 SHA512 7cd20de630392d1d0fd1920a8e77ea06e20f92a6b40f5226c9f1de465797bc88c90e1cbafcdadc4e3c32e960c38fe6214430caa43e9d5211e807e61cb515a389 WHIRLPOOL bb99ddbee70d506e5c765e97efd9de3c497467720207ee0d8f7ff59785fdf8ab5a2f77d88d80ed1b8c3b6e16fd601a4e61644867de5c844c28f1163b565da87a
 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_p20160323.ebuild 3384 SHA256 88eaedaad525293991e3452d337d3f9ccc7f53265450fd6ced94b3c7e4fc10f6 SHA512 6805198573b4ee320ff940bb6b1c0ee141053694593037a05ce6a497f1be71181a098b1bc99c7049297ca6b64bf126ecb427a856fa70e98370e15d2fde788df4 WHIRLPOOL d4811090e31e79712918c7ef184eecb13104eee5d1bd3b6927fdeff67fc28465eb9b8a77f39b3f6d7a911c21009a26ec8969c1fe890c1bae5bdd80a00f749bf7
@@ -44,4 +45,5 @@ EBUILD netbeans-apisupport-9999_p20160417.ebuild 3384 SHA256 0fb247fc376d9cfe8f1
 EBUILD netbeans-apisupport-9999_p20160418.ebuild 3384 SHA256 ce302141901379f4f31cdf17604551dd0c6f7dc45185bd56ea21137b3586dffb SHA512 a7ac352502a6ca40c51f3f78ac180e17f261ff803ec1428b28ecfb861ddb75c17183453233ac3dbe415e64796342a4f60ce34c14940c4acbcb1f5d965279152f WHIRLPOOL aa66a6fe21cf9ccd72e53d12bde3db2d863d9b55dc260e7c75b840ed60b3ce885cf22d8da6686162d21a986b411c3d7131bc96039a28ea9099f27215ae354d0b
 EBUILD netbeans-apisupport-9999_p20160419.ebuild 3384 SHA256 f6bc49ea7d1ec7b0ab060751a96ebec6a180e4682c50be943072c0f618a200c5 SHA512 098f5e266f43f7a611e1393a20c65bb735bef530dfb544678d070edff19696ea2e44c34f1bc71f800dc473fe5605d4ff9464e0c8ec3225aa13677605ee81a93e WHIRLPOOL 066b811f5fcc42128253bb3c61473c7fd04669f1d5cfe028fa9a59c9d3772137d05672ba86927ca97f2bb376ecd294ef748ed66c477a1a02fd9cd22ea56df399
 EBUILD netbeans-apisupport-9999_p20160420.ebuild 3384 SHA256 d7452100bc9908831149a0af434bc83efe3a84e946c050af25e59d8c414da8bd SHA512 36c3adff92fa711617ab1583ef45de84dad59e8b169b5b8ee3893297d9b01d626f6d64c7fce950fd4fccd00e878e711d495cafd2600d1edf87674fe5cf3e13f5 WHIRLPOOL 5033cfd0d5a4223aafcf5b3156efcd213936a8fee05246a5b79b898c395a4c1bf8f8464c18919b93f33190f94dce9c8515f55aec16cfb4cdb6261a73ddca9e6c
+EBUILD netbeans-apisupport-9999_p20160421.ebuild 3384 SHA256 ca40d7f3f6895d9cf0d1d95d6b48c8dbb86897d10efd8f98aac86609fbc2ef78 SHA512 4478f8d874700edcfc4018018141a893200dd9e72874bdc5f0d49f13d571318c91edd815f619802d21f5b2a856f939999b7359f10fa7dd324e2ea5db8350081e WHIRLPOOL 912e5015baf0f5ac0513e0613bdf63f1e5632f8ec85825d8e0f6d6bbb76fa498b891e448d4ead990ca6a4f97c0b89563c4233a58ec183c8e5b7a0c73c4f570dd
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index f49a2f5..60625c2 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201604170001-src.zip 213245562 SHA256 8d1da18eea0786
 DIST netbeans-trunk-nightly-201604180001-src.zip 213245562 SHA256 33e9976d15aa52ed61f53bebb87d8290a64d6e7658dc96b044136f47d46c28de SHA512 71252b57630390c901bed5fec7021d5f9255adf02c2e84c1e0981a2d729c1d0c1ed14b927b1dd36c9a72b30ced64ae6b74429e4990ddfac4bc36aff4c46e7e17 WHIRLPOOL af4f5d0f0c8f7caac85bc7ecab0fe91c68141abc9df5a0a28cc069262aa08f869d5934f5d4a546fdd997e29dc5d63ab0aefcce530560e8ed5b9bfab86b962105
 DIST netbeans-trunk-nightly-201604190001-src.zip 213247710 SHA256 2f4140e8d8ae7ea2e527d35f7ba1a75379b48659c67fca903a9ae2f5ab45652a SHA512 7d9e19583553738a793829ea2da5d57026ff17418b0a36da19cd344548a7d3a2bd0bc8dde0938ede14712806fca58ba17c5b86270eb674e1cbf6b1009f81b438 WHIRLPOOL 61910b59a2c03276bcab996b94635d0823bca717a0560e7b348df4e3dc30b926e7280fc828aa38c6d80b786ff559ece017456790cfde77c6f3e8598c30357bdc
 DIST netbeans-trunk-nightly-201604200001-src.zip 213312613 SHA256 e5dc1c1019f49460244a5d2a0c0117a0aee8bc37047fd93dc5780d6a4e374284 SHA512 5a796bee9472f30ffeebae8cfe7b3f7de02cdcda5754d5196be5fd0d577a668270c9a0cc212cc1528b2f4beb2b1f0162d951dbf0582774a7a09f87329aa26251 WHIRLPOOL 38f51d2261a92a965b160c608358e2e3d62dd623ab4ff909ddda420ef57d626c93f57dbd713ab7136b6e7781e54dc997e41b73d90a35cc25c6706de9a727cc02
+DIST netbeans-trunk-nightly-201604210001-src.zip 213315777 SHA256 e4a64f84f3ab854860e94f2d438779d38398f13860ac1e0eea0242b5ac308c72 SHA512 7cd20de630392d1d0fd1920a8e77ea06e20f92a6b40f5226c9f1de465797bc88c90e1cbafcdadc4e3c32e960c38fe6214430caa43e9d5211e807e61cb515a389 WHIRLPOOL bb99ddbee70d506e5c765e97efd9de3c497467720207ee0d8f7ff59785fdf8ab5a2f77d88d80ed1b8c3b6e16fd601a4e61644867de5c844c28f1163b565da87a
 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_p20160323.ebuild 4790 SHA256 b45a5478c2329595bc11fe97e89a02d0732f5c8fd75a299292e29d7d5970a3f1 SHA512 cadb56df12a4544c795f56efe929e944c504d4a851144c0b959d7a8005a861186fbbc6fbb6fd05a7b6950af6a30224e3194bd1933a48baa2e36d785c4db6dd6c WHIRLPOOL 1b0368afa7fe0c42c52cd09eb2bfe698399cc0e749eddec1ad8924dfc1a7113de5e1f5329bb617b12064d232bbb55df232f0ffabe8793cb1f8bac7a83b827c1e
@@ -55,4 +56,5 @@ EBUILD netbeans-cnd-9999_p20160417.ebuild 4790 SHA256 0fd32adf3f2f838ff2e50af202
 EBUILD netbeans-cnd-9999_p20160418.ebuild 4790 SHA256 cccdb3a54b00fe2e4a6d0daa702b5c087f53dd319815c5053d26b588b5b72691 SHA512 d3b813fda44e681754fedcd8dd9a1f297898f1b95fdd997676f82792624ac887732c8e752924f92d614215bf4df22f350a7637c775a723de5420b4811fc4bf8b WHIRLPOOL eaab91fea4dc9c792e504e72307bfc55f211e603705d90fc6243ccd5012623b33b0c99d80e87f7d5faf90bec77fd36246fdf4cda99dc4261f72ac94b6dbd3d2c
 EBUILD netbeans-cnd-9999_p20160419.ebuild 4790 SHA256 7cb1589af46fd665834f9025ced55dbb72083b8b579d2f1a9a4eb5f1b8018317 SHA512 078ba42f3e3789b8367f140321fe577c97e64c00b6b0ace71407deda84157d2439a3bbe84a3f285a7ce8a566c01628a28c5493cda9b381ae359376ba2840b0b9 WHIRLPOOL ac55c83ab81bf6544739cb205c82cafc22d6f8aa93cd79d049c712b95bfc480a092266a811f99e683049d57eaafb9c643d3a1ce534809a81880dbd251737eefd
 EBUILD netbeans-cnd-9999_p20160420.ebuild 4790 SHA256 8252309584016176a7d5873764a0be8f6045d52a67443eadeb8b0d2c6d65b939 SHA512 9adaefbf1903d8df3d8ca555fd5241a07bda90198b6295d80711efa150db1748bd772775d61ab3e2535793b7ddd9abf09a4047c7cacbfeb523ade19c16788deb WHIRLPOOL 211c4f57686cc45223fc6a66ea2cf55c956ae493b7750b17f7fc4ce844db354fe4ea64728dc883295dea20c758a6cf71d6fb17f2f4ec4c93ae902715116f31eb
+EBUILD netbeans-cnd-9999_p20160421.ebuild 4790 SHA256 b8b8003ac5fffcfea6fbc8162cdac781c81e7c3d11866f2f6aead76967227e91 SHA512 b2178549b595f572a2b3c4b93f20825bd2bbd2c8a08fe985aec8153012581c7533fa2327bcd41256e60a51dafae60ebffa34135e333e35443e1a15dc4ef2c70b WHIRLPOOL 89d5b1c9478b04e9d036f65e974910a9066f1c7f2017a70f88fde5bae974798aadb83d03886d68091c01af578caa890ce1664507a38ebd5396be0d872dbaecf1
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160421.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160421.ebuild
new file mode 100644
index 0000000..419b3a1
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160421.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-04-21_00-01-48/zip/netbeans-trunk-nightly-201604210001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar
+	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
+	http://hg.netbeans.org/binaries/85FD13415B0553D6421F4BBA5FE0F587B9748B20-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-r16-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar libs.antlr3.devel/external/antlr-3.4.jar || die
+	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
+	ln -s "${DISTDIR}"/85FD13415B0553D6421F4BBA5FE0F587B9748B20-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-r16-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.jna/external jna jna.jar jna-4.2.2.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-dlight-${SLOT} dlight || die
+	cat /usr/share/netbeans-dlight-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.dlight.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/cnd >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/cnd$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	fperms 755 bin/dorun.sh
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/cnd
+}

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 8ce17ba..e41c6ec 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201604170001-src.zip 213245562 SHA256 8d1da18eea0786
 DIST netbeans-trunk-nightly-201604180001-src.zip 213245562 SHA256 33e9976d15aa52ed61f53bebb87d8290a64d6e7658dc96b044136f47d46c28de SHA512 71252b57630390c901bed5fec7021d5f9255adf02c2e84c1e0981a2d729c1d0c1ed14b927b1dd36c9a72b30ced64ae6b74429e4990ddfac4bc36aff4c46e7e17 WHIRLPOOL af4f5d0f0c8f7caac85bc7ecab0fe91c68141abc9df5a0a28cc069262aa08f869d5934f5d4a546fdd997e29dc5d63ab0aefcce530560e8ed5b9bfab86b962105
 DIST netbeans-trunk-nightly-201604190001-src.zip 213247710 SHA256 2f4140e8d8ae7ea2e527d35f7ba1a75379b48659c67fca903a9ae2f5ab45652a SHA512 7d9e19583553738a793829ea2da5d57026ff17418b0a36da19cd344548a7d3a2bd0bc8dde0938ede14712806fca58ba17c5b86270eb674e1cbf6b1009f81b438 WHIRLPOOL 61910b59a2c03276bcab996b94635d0823bca717a0560e7b348df4e3dc30b926e7280fc828aa38c6d80b786ff559ece017456790cfde77c6f3e8598c30357bdc
 DIST netbeans-trunk-nightly-201604200001-src.zip 213312613 SHA256 e5dc1c1019f49460244a5d2a0c0117a0aee8bc37047fd93dc5780d6a4e374284 SHA512 5a796bee9472f30ffeebae8cfe7b3f7de02cdcda5754d5196be5fd0d577a668270c9a0cc212cc1528b2f4beb2b1f0162d951dbf0582774a7a09f87329aa26251 WHIRLPOOL 38f51d2261a92a965b160c608358e2e3d62dd623ab4ff909ddda420ef57d626c93f57dbd713ab7136b6e7781e54dc997e41b73d90a35cc25c6706de9a727cc02
+DIST netbeans-trunk-nightly-201604210001-src.zip 213315777 SHA256 e4a64f84f3ab854860e94f2d438779d38398f13860ac1e0eea0242b5ac308c72 SHA512 7cd20de630392d1d0fd1920a8e77ea06e20f92a6b40f5226c9f1de465797bc88c90e1cbafcdadc4e3c32e960c38fe6214430caa43e9d5211e807e61cb515a389 WHIRLPOOL bb99ddbee70d506e5c765e97efd9de3c497467720207ee0d8f7ff59785fdf8ab5a2f77d88d80ed1b8c3b6e16fd601a4e61644867de5c844c28f1163b565da87a
 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_p20160323.ebuild 2968 SHA256 91643a3d24626b8209a58899f272f0776f882d7e1330ed76fe83a2a72b985eaa SHA512 aefd98a2a7b88b6a4edca6876be5c83dab37c86312e16a7d7feccaf7ce956a08ff3e8381aa753a6fdef4c35937b69540076d07bf8e0cdc492b738caa7995920e WHIRLPOOL f135a3b61b8d03d2e466089c6d7abe5acde926a1dd60490d69257dc3142da7715bcb4143b59b14dec27fa7bb99ad10a2bae59db2a84f8950283d6a2460ddc111
@@ -47,4 +48,5 @@ EBUILD netbeans-dlight-9999_p20160417.ebuild 2968 SHA256 2aad4091f37950956c63cc1
 EBUILD netbeans-dlight-9999_p20160418.ebuild 2968 SHA256 fec90bb8acda9dd8fd5b96e24914f54e5df417f30e25f6f398178e92e2088fdf SHA512 85e4b571e731493250834d42b605d27685581ed35185a9cdebbba7183f1c4d9966523985d1ff5c9a1e24f49b5a2842f12b7280b1a1396852da9dbced09a656bb WHIRLPOOL 93f89788f24b1c52367655a1183239b312da64cc2510a3e00a90e627f48620f9fd2825309f38cf68041d2861998d85f9692e54b633a79bd07e9e30152dbc1d88
 EBUILD netbeans-dlight-9999_p20160419.ebuild 2968 SHA256 7683d7f19aa7fcaf92489235490acee21102b98d0b6a0a1c4593393c451b160d SHA512 da6a182707e1c027c164a8309aed6d81b08432377ec392ec04169f917191beceecbe0331f5898f997bf3d0f2092b7fa51f8b5fc5ffdcf940d46ad0097d4a4703 WHIRLPOOL bb42ddd2a4dba86722f7d7f592f021db1b01444176c40c09233d0b25f6d33de568e8ee7ff3dc793f74c329ba642de43e1373b78aaaea9affd923e73f2206e091
 EBUILD netbeans-dlight-9999_p20160420.ebuild 2968 SHA256 fe7ea31b0ad02719f39383146f83c4a433ab3c3702aa168d64d3ec4064a9fdf2 SHA512 45bc1539ad4a1949bf6a944cc00864879077634c8a33398876c256b049d5db3a5cfcab351b772c8f80033defc3d729dd8019f70c1254d9aec29e4b3eea704a85 WHIRLPOOL 3c44722eef41a5b67048ed1082d06182165d60d82d26e99639ff58b424d536574ef98fbe6fa7437715bc59d7490b7f3a927e354ec40ade1b006e556a201e7b18
+EBUILD netbeans-dlight-9999_p20160421.ebuild 2968 SHA256 69af7d7926bd6df15a08a11c811071ceb452b2bb3c74d89fa485498b042d5b89 SHA512 aa96eafedc2c7de807f9600c6a65c7e200563df04f1322f59f7aff51816c9b96696de0deb4c42b28902dd46ff1b2b6f70e9a97c15727fa5cc8aad6fe2db36cf1 WHIRLPOOL a2c8e63c5819c169c4abf8882be3283bc20cbc769dfc2a4cbb7e4db7b2119dcaf96b27661b8ccde3cff9714023b62bccd0077c3dc8d54c300b176fe684b63b2f
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 34024ec..7926a97 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -55,6 +55,7 @@ DIST netbeans-trunk-nightly-201604170001-src.zip 213245562 SHA256 8d1da18eea0786
 DIST netbeans-trunk-nightly-201604180001-src.zip 213245562 SHA256 33e9976d15aa52ed61f53bebb87d8290a64d6e7658dc96b044136f47d46c28de SHA512 71252b57630390c901bed5fec7021d5f9255adf02c2e84c1e0981a2d729c1d0c1ed14b927b1dd36c9a72b30ced64ae6b74429e4990ddfac4bc36aff4c46e7e17 WHIRLPOOL af4f5d0f0c8f7caac85bc7ecab0fe91c68141abc9df5a0a28cc069262aa08f869d5934f5d4a546fdd997e29dc5d63ab0aefcce530560e8ed5b9bfab86b962105
 DIST netbeans-trunk-nightly-201604190001-src.zip 213247710 SHA256 2f4140e8d8ae7ea2e527d35f7ba1a75379b48659c67fca903a9ae2f5ab45652a SHA512 7d9e19583553738a793829ea2da5d57026ff17418b0a36da19cd344548a7d3a2bd0bc8dde0938ede14712806fca58ba17c5b86270eb674e1cbf6b1009f81b438 WHIRLPOOL 61910b59a2c03276bcab996b94635d0823bca717a0560e7b348df4e3dc30b926e7280fc828aa38c6d80b786ff559ece017456790cfde77c6f3e8598c30357bdc
 DIST netbeans-trunk-nightly-201604200001-src.zip 213312613 SHA256 e5dc1c1019f49460244a5d2a0c0117a0aee8bc37047fd93dc5780d6a4e374284 SHA512 5a796bee9472f30ffeebae8cfe7b3f7de02cdcda5754d5196be5fd0d577a668270c9a0cc212cc1528b2f4beb2b1f0162d951dbf0582774a7a09f87329aa26251 WHIRLPOOL 38f51d2261a92a965b160c608358e2e3d62dd623ab4ff909ddda420ef57d626c93f57dbd713ab7136b6e7781e54dc997e41b73d90a35cc25c6706de9a727cc02
+DIST netbeans-trunk-nightly-201604210001-src.zip 213315777 SHA256 e4a64f84f3ab854860e94f2d438779d38398f13860ac1e0eea0242b5ac308c72 SHA512 7cd20de630392d1d0fd1920a8e77ea06e20f92a6b40f5226c9f1de465797bc88c90e1cbafcdadc4e3c32e960c38fe6214430caa43e9d5211e807e61cb515a389 WHIRLPOOL bb99ddbee70d506e5c765e97efd9de3c497467720207ee0d8f7ff59785fdf8ab5a2f77d88d80ed1b8c3b6e16fd601a4e61644867de5c844c28f1163b565da87a
 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_p20160323.ebuild 15825 SHA256 ff658282faaf219891dbf9a1c2d95320f26a084fe1b38d123a7154c54eca36e7 SHA512 cf018a3be15ed0a97f6d5c8b1be2155085c57cefb65853013c25e7b94fde6ffc4dbcf016a50a40712b8b41f5f57786a9017f4d1f53ea1ab400775e986c8270bf WHIRLPOOL 0a1e3d705a21e2ab915cdfef89f8f362cd220540130a1019116f7c31d0861c2de2dc0089679243fa5289151fa57208aeb9733e8a906c25cce621695fee0b31a8
@@ -76,4 +77,5 @@ EBUILD netbeans-enterprise-9999_p20160417.ebuild 15825 SHA256 86b3aadd49c6cd877c
 EBUILD netbeans-enterprise-9999_p20160418.ebuild 15825 SHA256 c2af91026534862779f5a3845882d375ce0df4b67e4f3d2b3ab8c88dc2f6361f SHA512 41163907e34ab6d6d61869521198d671cc4dec04ccfdfe891692296afe8fca6641268d20644553a5af434cb8021c15101a9d1fee49767e2dce6eabe6d1ba4c11 WHIRLPOOL 232eeaab21d111daed2ffa86bb63bba9f9d1283ae5e8c829bae27fa8dfbcf75e41a12431662ae80fc99ee1bc71034cc6dade3abd024422de8fd51fe86e41d7a4
 EBUILD netbeans-enterprise-9999_p20160419.ebuild 15825 SHA256 27f7a24cba42fa12769853ed5cb8a220ca5124580c2cc04634666aabe6e1845f SHA512 b0e5eedd8ff2d7d06f636b7eb5cf7568769a0dacf7d18baea9a910f63bd30d2031442804e912c8dbe68014f451a5c1cedbfa24d3d20fedc9882cfcf4e2c5b7fc WHIRLPOOL c31ce34d72e768f0ac5b7d6e1640f7b99ff8dad79f8b15d4660aaed967fd7b97c05eb1654e8f03070546d97603e6eb05be2b6b438981983a0e116689d2dc7562
 EBUILD netbeans-enterprise-9999_p20160420.ebuild 15825 SHA256 16e9b93d3d16df8115f5b51b2efca1920f492f23b1ca926fa41ccf796bce043c SHA512 8f0c088fb213249c90b63d7d55053e6bb8a84886031ecfe42780618bfd174bef55473414037c83caca80809c665451070a0fa0c478e591d8d9edf24536cc0604 WHIRLPOOL 1251ff19f420fcbe23abc05be14ade9700e9ec509539623fd1b00aca9a53b5e28a94b68a8d11180d08da7c1893508ac52f4e0cce209ff7e5b8db18a76b95a154
+EBUILD netbeans-enterprise-9999_p20160421.ebuild 15825 SHA256 6de150a90f780413f14fa4f7997cfba1e69f066f16bcf9e073f6fa3d87272d51 SHA512 3205955b56389899e9bdddc9f73598b2f0a17f7604448c834974fd0e54f975c20703355bd9cc5d6fa5695174c2eb33f0f9ecd4cf49f2a641b7952243b3c75c05 WHIRLPOOL 3ab3a0e82aa4980cc263fbcc1bbc36ec17eefe311a7f482ebffc7c9e159969d43e40fc26cd98079e2b8eb1a9fcb53235daaf04808f93f6f8e8c476f1d921ba4e
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 2fe6609..63c65da 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201604170001-src.zip 213245562 SHA256 8d1da18eea0786
 DIST netbeans-trunk-nightly-201604180001-src.zip 213245562 SHA256 33e9976d15aa52ed61f53bebb87d8290a64d6e7658dc96b044136f47d46c28de SHA512 71252b57630390c901bed5fec7021d5f9255adf02c2e84c1e0981a2d729c1d0c1ed14b927b1dd36c9a72b30ced64ae6b74429e4990ddfac4bc36aff4c46e7e17 WHIRLPOOL af4f5d0f0c8f7caac85bc7ecab0fe91c68141abc9df5a0a28cc069262aa08f869d5934f5d4a546fdd997e29dc5d63ab0aefcce530560e8ed5b9bfab86b962105
 DIST netbeans-trunk-nightly-201604190001-src.zip 213247710 SHA256 2f4140e8d8ae7ea2e527d35f7ba1a75379b48659c67fca903a9ae2f5ab45652a SHA512 7d9e19583553738a793829ea2da5d57026ff17418b0a36da19cd344548a7d3a2bd0bc8dde0938ede14712806fca58ba17c5b86270eb674e1cbf6b1009f81b438 WHIRLPOOL 61910b59a2c03276bcab996b94635d0823bca717a0560e7b348df4e3dc30b926e7280fc828aa38c6d80b786ff559ece017456790cfde77c6f3e8598c30357bdc
 DIST netbeans-trunk-nightly-201604200001-src.zip 213312613 SHA256 e5dc1c1019f49460244a5d2a0c0117a0aee8bc37047fd93dc5780d6a4e374284 SHA512 5a796bee9472f30ffeebae8cfe7b3f7de02cdcda5754d5196be5fd0d577a668270c9a0cc212cc1528b2f4beb2b1f0162d951dbf0582774a7a09f87329aa26251 WHIRLPOOL 38f51d2261a92a965b160c608358e2e3d62dd623ab4ff909ddda420ef57d626c93f57dbd713ab7136b6e7781e54dc997e41b73d90a35cc25c6706de9a727cc02
+DIST netbeans-trunk-nightly-201604210001-src.zip 213315777 SHA256 e4a64f84f3ab854860e94f2d438779d38398f13860ac1e0eea0242b5ac308c72 SHA512 7cd20de630392d1d0fd1920a8e77ea06e20f92a6b40f5226c9f1de465797bc88c90e1cbafcdadc4e3c32e960c38fe6214430caa43e9d5211e807e61cb515a389 WHIRLPOOL bb99ddbee70d506e5c765e97efd9de3c497467720207ee0d8f7ff59785fdf8ab5a2f77d88d80ed1b8c3b6e16fd601a4e61644867de5c844c28f1163b565da87a
 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_p20160323.ebuild 2913 SHA256 bed218767277e7c09f35753e37f5d6bc3eb7b6472d0ab86ff0b6a6dcb1bc3b3d SHA512 69840a6b0971ad77db60bfb34b59b3b33d355a1e98c8eac6d887429ae3cff4fa75521055f458cc47c9c35210e28ffafa6712634300ac626d4620939c97dcfa96 WHIRLPOOL d3cc043d84e34937ecb38ff653caeb817d26226b9c972d17d4e7e0723fd48a6e7e288e7dbfd07b42a53e8df4b86aeeb59d302e3d205013842f07b3a9922aabe9
@@ -44,4 +45,5 @@ EBUILD netbeans-ergonomics-9999_p20160417.ebuild 2913 SHA256 3e985a1f7545ffc91ad
 EBUILD netbeans-ergonomics-9999_p20160418.ebuild 2913 SHA256 f30646af86d27330358ab60305d9f7c05b1eaf29a2ce3f6c94bc289b854ce298 SHA512 5e7e7798ae4f6bc8859e071ea0835887b99dc5c4f6c38ad0e626f0e949126e4b53d902f63e3203f7c5c33e0d39d62da018a72b5502b62437845706d3a897449d WHIRLPOOL 78e48094d6ba8c6aff7b3243511cba8f35f8854deb6955cf73b14b7b0ecaa89c88be335fdc0f430af265874a31d9282b242657cff7a695f5cdb2988c5e4db5d9
 EBUILD netbeans-ergonomics-9999_p20160419.ebuild 2913 SHA256 0d7540ef0ab9f4d4ed8a819eab470006b0284fe048a6a993af541f46b205b87c SHA512 c67250772e69bfa7c78d3c4e1234ea0068e791ad3309051dd27ce271c6127f6bab93685858afabdbb1c9b87a1f60505bde137a806842eaca2391b9d08c91444c WHIRLPOOL f8f48716b7286d2e8829563d113b519eb8eeb7d411d0a1f5cb7c30a53c243333f5576b7494944474264038ba6d295504d2cb3b0d00eaa74291da1f225523fbc5
 EBUILD netbeans-ergonomics-9999_p20160420.ebuild 2913 SHA256 0722528952c07c4613e510ed4a8a5eae4c8d1cb85d37ffb6ec55c86b982f32ef SHA512 3f4a1779aff00d1dde88d866385a4312bd63ad1b6022147a805967ff61c5b255ba55b4a0e8994aa04c807890fb8fd5e0e4ab8dfb534f0b7155c3f46faebdeaab WHIRLPOOL bc27548547dc06e8705fd6941c6bafc285a8f4d86f1b0f2c313e796bcedfc276cd86cd0e79a9cece94ee81607b396a3c069bc5f5945385326cadfc5bad08b243
+EBUILD netbeans-ergonomics-9999_p20160421.ebuild 2913 SHA256 562a0020227fef4a991ede7febb034bb7e157146794494c0b686510346273968 SHA512 3ba83127c6f36152b47d5e26106f01736c2f6620d2c1e785aa1fcee8c8826a315594db40eca33f27d745d0d3fdb9e3eb7d367ecf504cd249980353e80b1dd335 WHIRLPOOL e13acffd737762779400e676e783a9ece16142a0ed40914d9412b7dd8ffa6efe90b57ec7541bf4f06229d26d1c24cec59027b2ebde50c11e9ad574b9b55ccae8
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index a2b73d5..40e6134 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201604170001-src.zip 213245562 SHA256 8d1da18eea0786
 DIST netbeans-trunk-nightly-201604180001-src.zip 213245562 SHA256 33e9976d15aa52ed61f53bebb87d8290a64d6e7658dc96b044136f47d46c28de SHA512 71252b57630390c901bed5fec7021d5f9255adf02c2e84c1e0981a2d729c1d0c1ed14b927b1dd36c9a72b30ced64ae6b74429e4990ddfac4bc36aff4c46e7e17 WHIRLPOOL af4f5d0f0c8f7caac85bc7ecab0fe91c68141abc9df5a0a28cc069262aa08f869d5934f5d4a546fdd997e29dc5d63ab0aefcce530560e8ed5b9bfab86b962105
 DIST netbeans-trunk-nightly-201604190001-src.zip 213247710 SHA256 2f4140e8d8ae7ea2e527d35f7ba1a75379b48659c67fca903a9ae2f5ab45652a SHA512 7d9e19583553738a793829ea2da5d57026ff17418b0a36da19cd344548a7d3a2bd0bc8dde0938ede14712806fca58ba17c5b86270eb674e1cbf6b1009f81b438 WHIRLPOOL 61910b59a2c03276bcab996b94635d0823bca717a0560e7b348df4e3dc30b926e7280fc828aa38c6d80b786ff559ece017456790cfde77c6f3e8598c30357bdc
 DIST netbeans-trunk-nightly-201604200001-src.zip 213312613 SHA256 e5dc1c1019f49460244a5d2a0c0117a0aee8bc37047fd93dc5780d6a4e374284 SHA512 5a796bee9472f30ffeebae8cfe7b3f7de02cdcda5754d5196be5fd0d577a668270c9a0cc212cc1528b2f4beb2b1f0162d951dbf0582774a7a09f87329aa26251 WHIRLPOOL 38f51d2261a92a965b160c608358e2e3d62dd623ab4ff909ddda420ef57d626c93f57dbd713ab7136b6e7781e54dc997e41b73d90a35cc25c6706de9a727cc02
+DIST netbeans-trunk-nightly-201604210001-src.zip 213315777 SHA256 e4a64f84f3ab854860e94f2d438779d38398f13860ac1e0eea0242b5ac308c72 SHA512 7cd20de630392d1d0fd1920a8e77ea06e20f92a6b40f5226c9f1de465797bc88c90e1cbafcdadc4e3c32e960c38fe6214430caa43e9d5211e807e61cb515a389 WHIRLPOOL bb99ddbee70d506e5c765e97efd9de3c497467720207ee0d8f7ff59785fdf8ab5a2f77d88d80ed1b8c3b6e16fd601a4e61644867de5c844c28f1163b565da87a
 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_p20160323.ebuild 3377 SHA256 c583f98fb3dddfe84291425cc2475a5799f010089c83c7da06391d114fd87f58 SHA512 7ba61d1c8cf405daaf3da17d5a1f28c922c904852482e54c320281b78dc10f4c6531f0335d548fb563353aac976ca165b1603ceec24a54b773bb8d5408e3f513 WHIRLPOOL 95cfb50e92e1f654f70445a46b139385e716b2d170f6ddd1eb4e8f6aa724f1c9740dcac9d0f581165d41b8fe37e7f21366afb33b69386daeca4848721b41826c
@@ -46,4 +47,5 @@ EBUILD netbeans-extide-9999_p20160417.ebuild 3377 SHA256 8207c1951821a6d0e746f36
 EBUILD netbeans-extide-9999_p20160418.ebuild 3377 SHA256 a2d2397ed22bfe02eafa0acc7179c13dd3a4dd08956703cc190a6d95d3eea748 SHA512 b32db013e94888b06ead77215020eafb2ee546860d3e3f7f690028dff40b79fb740a07225e209c53fc669da8c46c9763368d9de1aa75708d6078a0dd70baf9b1 WHIRLPOOL 1c5ce7ac90aea790524f712d9511d96cd415d6ff97b81490a0d4904baed501de78931c3722d6f22ad0368ee75f6cf6e17b403a26e59da097ec6924c1402d4a04
 EBUILD netbeans-extide-9999_p20160419.ebuild 3377 SHA256 a4a4d628e30578cb4c6cedd01b69ad2bb0fc00497bdb3f63fecaa879d1296a43 SHA512 8d75799dc3b5ecb71d8c1b0d3ce19e251c227f52d39ecd5af4bbe7c153934f073bb3a21292c67ea494916c14ecfb01a5c6298701b1a2359b0cee87a4e693dccc WHIRLPOOL 6231c21c2e528e99e5164c53c85331cd501f0bf76e2a71af5713877ed3e71fa43b9ec07fc71f361535bb0cd5f4c965c640aa27089742fd7a971e1b5594d0e0ca
 EBUILD netbeans-extide-9999_p20160420.ebuild 3377 SHA256 6cbef85a91cd96ed8e07d9302892d7994054e1d11efb8bc3641d1b5929be99e0 SHA512 537170c38750af2882c6775e6ff6d791f32247c09be0a4a7157730b9b8f14841808f6f8736bf7542d6b189218140f20963408f391967f4d83dc50df649d3d5db WHIRLPOOL 96868447d0630a5650a11a4d504898c5e437a6f50b7de41d5463679b59068d77dbc84c0c84017de940c972a26c6c427b593b2f95fbd63cf7e5acbe3dea0b3318
+EBUILD netbeans-extide-9999_p20160421.ebuild 3377 SHA256 9f13288b89eb41360349a647acd6b6f5ec02ab44c0bdd1923ae98a9e834db85e SHA512 5449dc706f41d1dfbe642d7a39ec25e1be22eaed592e24462a318d7304da5e3236a07759950111378d2d496c658de02f40a6943bbe2af71338373ac41266f0a1 WHIRLPOOL f1397473f60d1933e63ed9f1d7f83113b517b629f2dbbe4a88bd4eeccdde73258f261b897f995b8bb29dd7c2ae9127aa4dd39127af0c01ab668187bae89facbe
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160421.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160421.ebuild
new file mode 100644
index 0000000..e15721a
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20160421.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-04-21_00-01-48/zip/netbeans-trunk-nightly-201604210001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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-r16-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-r16-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	unset DISPLAY
+	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+	pushd nbbuild/netbeans/extide >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/extide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/extide
+}

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 383ee63..06a5ce0 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201604170001-src.zip 213245562 SHA256 8d1da18eea0786
 DIST netbeans-trunk-nightly-201604180001-src.zip 213245562 SHA256 33e9976d15aa52ed61f53bebb87d8290a64d6e7658dc96b044136f47d46c28de SHA512 71252b57630390c901bed5fec7021d5f9255adf02c2e84c1e0981a2d729c1d0c1ed14b927b1dd36c9a72b30ced64ae6b74429e4990ddfac4bc36aff4c46e7e17 WHIRLPOOL af4f5d0f0c8f7caac85bc7ecab0fe91c68141abc9df5a0a28cc069262aa08f869d5934f5d4a546fdd997e29dc5d63ab0aefcce530560e8ed5b9bfab86b962105
 DIST netbeans-trunk-nightly-201604190001-src.zip 213247710 SHA256 2f4140e8d8ae7ea2e527d35f7ba1a75379b48659c67fca903a9ae2f5ab45652a SHA512 7d9e19583553738a793829ea2da5d57026ff17418b0a36da19cd344548a7d3a2bd0bc8dde0938ede14712806fca58ba17c5b86270eb674e1cbf6b1009f81b438 WHIRLPOOL 61910b59a2c03276bcab996b94635d0823bca717a0560e7b348df4e3dc30b926e7280fc828aa38c6d80b786ff559ece017456790cfde77c6f3e8598c30357bdc
 DIST netbeans-trunk-nightly-201604200001-src.zip 213312613 SHA256 e5dc1c1019f49460244a5d2a0c0117a0aee8bc37047fd93dc5780d6a4e374284 SHA512 5a796bee9472f30ffeebae8cfe7b3f7de02cdcda5754d5196be5fd0d577a668270c9a0cc212cc1528b2f4beb2b1f0162d951dbf0582774a7a09f87329aa26251 WHIRLPOOL 38f51d2261a92a965b160c608358e2e3d62dd623ab4ff909ddda420ef57d626c93f57dbd713ab7136b6e7781e54dc997e41b73d90a35cc25c6706de9a727cc02
+DIST netbeans-trunk-nightly-201604210001-src.zip 213315777 SHA256 e4a64f84f3ab854860e94f2d438779d38398f13860ac1e0eea0242b5ac308c72 SHA512 7cd20de630392d1d0fd1920a8e77ea06e20f92a6b40f5226c9f1de465797bc88c90e1cbafcdadc4e3c32e960c38fe6214430caa43e9d5211e807e61cb515a389 WHIRLPOOL bb99ddbee70d506e5c765e97efd9de3c497467720207ee0d8f7ff59785fdf8ab5a2f77d88d80ed1b8c3b6e16fd601a4e61644867de5c844c28f1163b565da87a
 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_p20160323.ebuild 3416 SHA256 cae40b6dee59adc072b92f47ca65705df610e33f52c4a5419b3f4a588d7092e6 SHA512 061b3da802905ec04e2162e3802957df73d2b753be7f0c8abd5db73a16e9b5a150589792e30d7b017c23b522774f424cb2b5d6f12ec7ffebceea8bebd5d6bbee WHIRLPOOL d2a7c2648c7bfa42e4d79caaf38bcc6afac696b7d35af4407925d61b13c72941ccd2f832a65802590655eb86ccad014584227695419cdcb529b3c868e218d161
@@ -46,4 +47,5 @@ EBUILD netbeans-groovy-9999_p20160417.ebuild 3416 SHA256 4d34c6c3d9cc2ae5cfe8d42
 EBUILD netbeans-groovy-9999_p20160418.ebuild 3416 SHA256 417d9145b45a0f232c767dabed7df89dbb79049bffa0223b5af25cba769d9dd8 SHA512 e28cd8c6567fb091b7faa5937e0443ef1c6523d261fee666bc47c8c9f3f3fc1886c1cb9bb62db4ac8c75eaaebb83bfc840e9bc8cd4f79cb9f33e727fd1918b64 WHIRLPOOL b717be05f9a03d2551ec9211e657a0080a77d067031cdb07faaa25d3ad1e9dcd2adaaecc6a67b10f23c412609566034abb15c5af61507ce9ac8b58ccf76daf74
 EBUILD netbeans-groovy-9999_p20160419.ebuild 3416 SHA256 c3b5c2e9f49d30a85c67c040863b77e0f79b71222f00db5ccb50af0acfe1dbf7 SHA512 24297a705d4631e7e96b2948430baeaa37b6545d6d5c03bf1a822bf8bc150a627df683927062ff89d9004d3435c1bb73ef431ac71f701beea8a708470ea83ea0 WHIRLPOOL bf01c133c6ae86e3983627feebde3a0045aa872e6337af0bec48c103a8ecd069d842da5433e7245920ea41c5cea1928ca93603e9140b03207e739f8a7db5ba5c
 EBUILD netbeans-groovy-9999_p20160420.ebuild 3416 SHA256 15d3be032a9574f5fc912e202d9046542acbe0544c43d855dc01e0d3b7dd15c5 SHA512 71310285e946532b4995e0a752f588d5c94f0b3ead76937ffd4940557300fdc611926df0ba97ff70109f5161989b2875e6484c92f812b0977bce48420ec88dc2 WHIRLPOOL 76f1d2682a741b47caf508311f7877a45dbe2b607622408cfb4a00e6613889b65a2f3c9944f69b2ad1859c1133a08e2cb955b93acf9066281d9a4d2165666794
+EBUILD netbeans-groovy-9999_p20160421.ebuild 3416 SHA256 72ecc1094cd4b210cdb0acc769551c352fd97b5963840317cd9b9745e60bd437 SHA512 217a3c38e37732b5db063e94cb9b62a28108b54ce569ad1ca9125dc5a8e4895e0e7d27ebc872697b31790203894aa2982ea3803a3c00285b115bb269e9a428e4 WHIRLPOOL b03334f6277a6a48112ddd3852b97ce3485c953cd0f9d69f4e181aaefbcfd148f3c20f0fdda3105e80711fc7fffd3d405b09f784411e583766ec546a697ee099
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 95262bc..190693c 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201604170001-src.zip 213245562 SHA256 8d1da18eea0786
 DIST netbeans-trunk-nightly-201604180001-src.zip 213245562 SHA256 33e9976d15aa52ed61f53bebb87d8290a64d6e7658dc96b044136f47d46c28de SHA512 71252b57630390c901bed5fec7021d5f9255adf02c2e84c1e0981a2d729c1d0c1ed14b927b1dd36c9a72b30ced64ae6b74429e4990ddfac4bc36aff4c46e7e17 WHIRLPOOL af4f5d0f0c8f7caac85bc7ecab0fe91c68141abc9df5a0a28cc069262aa08f869d5934f5d4a546fdd997e29dc5d63ab0aefcce530560e8ed5b9bfab86b962105
 DIST netbeans-trunk-nightly-201604190001-src.zip 213247710 SHA256 2f4140e8d8ae7ea2e527d35f7ba1a75379b48659c67fca903a9ae2f5ab45652a SHA512 7d9e19583553738a793829ea2da5d57026ff17418b0a36da19cd344548a7d3a2bd0bc8dde0938ede14712806fca58ba17c5b86270eb674e1cbf6b1009f81b438 WHIRLPOOL 61910b59a2c03276bcab996b94635d0823bca717a0560e7b348df4e3dc30b926e7280fc828aa38c6d80b786ff559ece017456790cfde77c6f3e8598c30357bdc
 DIST netbeans-trunk-nightly-201604200001-src.zip 213312613 SHA256 e5dc1c1019f49460244a5d2a0c0117a0aee8bc37047fd93dc5780d6a4e374284 SHA512 5a796bee9472f30ffeebae8cfe7b3f7de02cdcda5754d5196be5fd0d577a668270c9a0cc212cc1528b2f4beb2b1f0162d951dbf0582774a7a09f87329aa26251 WHIRLPOOL 38f51d2261a92a965b160c608358e2e3d62dd623ab4ff909ddda420ef57d626c93f57dbd713ab7136b6e7781e54dc997e41b73d90a35cc25c6706de9a727cc02
+DIST netbeans-trunk-nightly-201604210001-src.zip 213315777 SHA256 e4a64f84f3ab854860e94f2d438779d38398f13860ac1e0eea0242b5ac308c72 SHA512 7cd20de630392d1d0fd1920a8e77ea06e20f92a6b40f5226c9f1de465797bc88c90e1cbafcdadc4e3c32e960c38fe6214430caa43e9d5211e807e61cb515a389 WHIRLPOOL bb99ddbee70d506e5c765e97efd9de3c497467720207ee0d8f7ff59785fdf8ab5a2f77d88d80ed1b8c3b6e16fd601a4e61644867de5c844c28f1163b565da87a
 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_p20160323.ebuild 4126 SHA256 64a3e3eee2f5b7a30ced6a751742f0018eb14556d27af01342869f4acc59d179 SHA512 217c9adf60a041d2e8924b4a76a54e6454e7d1e0577d7a3329b16bda8741026fbed47af84627b606178d8b6c9ae287e8ab05b79640a875568febf1ad5afae8b3 WHIRLPOOL 2b05a70fe465352ed4a785aa8c4e654fdead5c8a8ffca2822aa068f6cc096f5404769abd87920e14e59f8999384c611cb64702f9a6a8b6c2a7aeb1ed8c8c52bc
@@ -49,4 +50,5 @@ EBUILD netbeans-harness-9999_p20160417.ebuild 4126 SHA256 b1ca4a6a126491f642a5c8
 EBUILD netbeans-harness-9999_p20160418.ebuild 4126 SHA256 1d3986f63355996367a28abcc860c38db8badc241d3a8286f2d9c329dffd9179 SHA512 93f7823bf2c9185dfda5bd623c21158325fb6735e2472c93b65fd18be66cde9b4390bde2d9e1887abe93360442c7115f8b9b8f8229442be0f2e99774a0ae31d4 WHIRLPOOL d1c8553bf93227f98dd0df80a298214a2be36486838fc937e7924d5a075749a6b1deca0dfd7c719b27dd7f5392edca14734e9d52106980a53b7e726f0cd6af55
 EBUILD netbeans-harness-9999_p20160419.ebuild 4126 SHA256 acd20e594a88d732827cead80ed1f660a26e625fb32ad0d0e921c343b6b36f1d SHA512 abec43ff885747d2d058486a3038581e04b96bd440c895f5809070bbe47f66c7a2cffb489d5e4ea3a82b9107a032c5a5869e393bb2a150f756e6928090ffd788 WHIRLPOOL b71a9483ed8dfa291953b22479a8e79ffa4669182b8f86b543d9c963132a47437c2bb398b6c0ce7352b572da5f73f0c78d22be350e51ef2e3e101c7ab0e757db
 EBUILD netbeans-harness-9999_p20160420.ebuild 4126 SHA256 f7c48befe630b4b97c07468d1e25ade12cf9e2c769f753c4f18dc740e82d0881 SHA512 02c00c8c5d5692975a12f47f3a5876c1afbb307d60cc61a833cb043b2ac6ab45f370ca01afe6b0f506e6ccae1dd031b7251d77d1ba15f136acba6ea14c96fd65 WHIRLPOOL 08fd25a65fb7cbb32c47e9993d6ede57a83a11e85f35abfe4fbeb888fc86b4a164cca58e4203680780771d91750dd5cdbe0abfcea09aa1ab55b066e13641f7d2
+EBUILD netbeans-harness-9999_p20160421.ebuild 4126 SHA256 de28d9760e22c1bfa841d6204fe744809044ee285b8fa4c6358e5bd856700188 SHA512 f86808e6a256540ec62be49f79d890cd7f2b73e2e519d6377881dc68834d3de9ff7bf148517f1c157101ac2cd2f4efedb524ac0d1d1cc6836c73591bf459e23f WHIRLPOOL 02f9366f4c524a8c1e51f4d7dd61f2f3461c35acf7945ed44867dc790d11cb360f74b82b68f99d35bec9e22a124ca45f9003067a86849e1b17d988998e6723e7
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 197bb77..19b917c 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -162,6 +162,7 @@ DIST netbeans-trunk-nightly-201604170001-src.zip 213245562 SHA256 8d1da18eea0786
 DIST netbeans-trunk-nightly-201604180001-src.zip 213245562 SHA256 33e9976d15aa52ed61f53bebb87d8290a64d6e7658dc96b044136f47d46c28de SHA512 71252b57630390c901bed5fec7021d5f9255adf02c2e84c1e0981a2d729c1d0c1ed14b927b1dd36c9a72b30ced64ae6b74429e4990ddfac4bc36aff4c46e7e17 WHIRLPOOL af4f5d0f0c8f7caac85bc7ecab0fe91c68141abc9df5a0a28cc069262aa08f869d5934f5d4a546fdd997e29dc5d63ab0aefcce530560e8ed5b9bfab86b962105
 DIST netbeans-trunk-nightly-201604190001-src.zip 213247710 SHA256 2f4140e8d8ae7ea2e527d35f7ba1a75379b48659c67fca903a9ae2f5ab45652a SHA512 7d9e19583553738a793829ea2da5d57026ff17418b0a36da19cd344548a7d3a2bd0bc8dde0938ede14712806fca58ba17c5b86270eb674e1cbf6b1009f81b438 WHIRLPOOL 61910b59a2c03276bcab996b94635d0823bca717a0560e7b348df4e3dc30b926e7280fc828aa38c6d80b786ff559ece017456790cfde77c6f3e8598c30357bdc
 DIST netbeans-trunk-nightly-201604200001-src.zip 213312613 SHA256 e5dc1c1019f49460244a5d2a0c0117a0aee8bc37047fd93dc5780d6a4e374284 SHA512 5a796bee9472f30ffeebae8cfe7b3f7de02cdcda5754d5196be5fd0d577a668270c9a0cc212cc1528b2f4beb2b1f0162d951dbf0582774a7a09f87329aa26251 WHIRLPOOL 38f51d2261a92a965b160c608358e2e3d62dd623ab4ff909ddda420ef57d626c93f57dbd713ab7136b6e7781e54dc997e41b73d90a35cc25c6706de9a727cc02
+DIST netbeans-trunk-nightly-201604210001-src.zip 213315777 SHA256 e4a64f84f3ab854860e94f2d438779d38398f13860ac1e0eea0242b5ac308c72 SHA512 7cd20de630392d1d0fd1920a8e77ea06e20f92a6b40f5226c9f1de465797bc88c90e1cbafcdadc4e3c32e960c38fe6214430caa43e9d5211e807e61cb515a389 WHIRLPOOL bb99ddbee70d506e5c765e97efd9de3c497467720207ee0d8f7ff59785fdf8ab5a2f77d88d80ed1b8c3b6e16fd601a4e61644867de5c844c28f1163b565da87a
 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_p20160323.ebuild 30250 SHA256 2bda5de8b196a6ffed491baea0330ab492b40d95510c336705ee8738255365bd SHA512 dbc858271d0823a30357b958abd0ed1b8374a2b31f946d6902e5d520006d5d3f37903f6d058082af71c226fb4034cfe41f40d7f336d7cb5df2097aaca9a672f0 WHIRLPOOL 10b0beb0952f480a5e22e7e1ad09d266e7952f399458132e2e41693ef606df64f5743caadb7a1bb6053a4bf47f336479b6ea732f7104c1bb465215ca18d5f86b
@@ -183,4 +184,5 @@ EBUILD netbeans-ide-9999_p20160417.ebuild 30761 SHA256 b91fd3ae94e850a5ee8f3747c
 EBUILD netbeans-ide-9999_p20160418.ebuild 30761 SHA256 ea9bd06da776f3f911af65a19e9b987ab8c3747d3ac8db9bd80e6092d00a5e57 SHA512 c909bd02673b5dcdbbb3309720006e49fd1ef01e8635dbbc9667556d29f1d975d2b658a58d33a24883b82b9b22ff042cc89c38da31272f6a6904faf17f673308 WHIRLPOOL 378d660d7fc5a4b24830f239fd3230c8c77411f6effff410b16a1322ff9afab96fc157ad977937622c422938f8c2f7b12a900beb79bdfb23ab8e431164840538
 EBUILD netbeans-ide-9999_p20160419.ebuild 30761 SHA256 f4686e58428ed2cbd7892298726c84bf0d67606a1b7f980648f6144af269228e SHA512 40245d06013687877954adb094360fde4705ac9efff56deec39fcecc3dbf6c1bb1574607b9d06fd971904b2829392cd3559976284fdbc6d0680e50209f9873dc WHIRLPOOL 9f96d898313c9b44eee619ccf8157726c3e98bed2d623bf320097072de7b5ce23aebfc76878bf656152e88b6eb4c59f65629fab4d72790f26eca1fe5165ee588
 EBUILD netbeans-ide-9999_p20160420.ebuild 30761 SHA256 45f7ae937d72e98f5b4353e6156db7cf5c334415c4437e94797364f501484c46 SHA512 98ca1ef4ec62ce90a230a85666ede8efaa565c80b761394f4cd54962248095e865024577529358c767f155c563ecfada0956f0743ecc14da568ac7f600eaafa3 WHIRLPOOL b0ce3f6580b95293ed7dc1a28cbb4625175fc09dcc9a7ba87cafe647b7df1c0472175dd0ced6d362b6b44f1d7d5027eda8d359b40ee00e7a9cf3916dab877baf
+EBUILD netbeans-ide-9999_p20160421.ebuild 30761 SHA256 434e23f761ca72ec043607ee7d45a618b24a471ffcb5f16b37599d3f35a9af61 SHA512 9bd07ca464d6261fecdb56410e398f6b9200f4a52534f3557f95aaafeea8e0e29a4314ee270ad282747201997ade863c95dfbcf89fefd2ef9557ee5b4f7749be WHIRLPOOL 236330624cafb4c99fc56f06c41192e992c03a5b8dac431182c33dcf6cc65465f9e066db0a1f87b75c712810528fdeee745fbcb74291b657a7692dfff7b848e4
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160421.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160421.ebuild
new file mode 100644
index 0000000..ee0719e
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20160421.ebuild
@@ -0,0 +1,382 @@
+# 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-04-21_00-01-48/zip/netbeans-trunk-nightly-201604210001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
+	http://hg.netbeans.org/binaries/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar
+	http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
+	http://hg.netbeans.org/binaries/DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar
+	http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar
+	http://hg.netbeans.org/binaries/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar
+	http://hg.netbeans.org/binaries/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar
+	http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip
+	http://hg.netbeans.org/binaries/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip
+	http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
+	http://hg.netbeans.org/binaries/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip
+	http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar
+	http://hg.netbeans.org/binaries/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar
+	http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
+	http://hg.netbeans.org/binaries/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip
+	http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar
+	http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar
+	http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar
+	http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip
+	http://hg.netbeans.org/binaries/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar
+	http://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar
+	http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
+	http://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar
+	http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar
+	http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar
+	http://hg.netbeans.org/binaries/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar
+	http://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar
+	http://hg.netbeans.org/binaries/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/825DC870D1D423E347F4F8229A211A2C297BB15D-org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar
+	http://hg.netbeans.org/binaries/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar
+	http://hg.netbeans.org/binaries/17C0C8D6DEBF5EBE734881C131888D8088BD9E7D-org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar
+	http://hg.netbeans.org/binaries/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar
+	http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar
+	http://hg.netbeans.org/binaries/DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8-svnClientAdapter-javahl-1.10.12.jar
+	http://hg.netbeans.org/binaries/C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8-svnClientAdapter-main-1.10.12.jar
+	http://hg.netbeans.org/binaries/AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8-svnClientAdapter-svnkit-1.10.12.jar
+	http://hg.netbeans.org/binaries/5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.jar
+	http://hg.netbeans.org/binaries/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar
+	http://hg.netbeans.org/binaries/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar
+	http://hg.netbeans.org/binaries/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar
+	http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar
+	http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar
+	http://hg.netbeans.org/binaries/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
+	dev-java/jna:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ide -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r16-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
+	ln -s "${DISTDIR}"/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}"/DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar || die
+	ln -s "${DISTDIR}"/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar o.apache.commons.io/external/commons-io-1.4.jar || die
+	ln -s "${DISTDIR}"/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar o.apache.commons.lang/external/commons-lang-2.6.jar || die
+	ln -s "${DISTDIR}"/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar libs.commons_net/external/commons-net-3.3.jar || die
+	ln -s "${DISTDIR}"/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip css.editor/external/css21-spec.zip || die
+	ln -s "${DISTDIR}"/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip css.editor/external/css3-spec.zip || die
+	ln -s "${DISTDIR}"/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip derby/external/derbysampledb.zip || die
+	ln -s "${DISTDIR}"/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip dlight.nativeexecution/external/exechlp-1.0.zip || die
+	ln -s "${DISTDIR}"/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar libs.freemarker/external/freemarker-2.3.19.jar || die
+	ln -s "${DISTDIR}"/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar c.google.guava/external/guava-15.0.jar || die
+	ln -s "${DISTDIR}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
+	ln -s "${DISTDIR}"/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip html.parser/external/html5doc.zip || die
+	ln -s "${DISTDIR}"/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar html.parser/external/htmlparser-1.2.1.jar || die
+	ln -s "${DISTDIR}"/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar libs.ini4j/external/ini4j-0.5.1.jar || die
+	ln -s "${DISTDIR}"/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar html.validation/external/iri.jar || die
+	ln -s "${DISTDIR}"/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip spellchecker.dictionary_en/external/ispell-enwl-3.1.20.zip || die
+	ln -s "${DISTDIR}"/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar c.googlecode.javaewah.JavaEWAH/external/JavaEWAH-0.7.9.jar || die
+	ln -s "${DISTDIR}"/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar xml.jaxb.api/external/jaxb-api.jar || die
+	ln -s "${DISTDIR}"/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip libs.jaxb/external/jaxb-api-doc.zip || die
+	ln -s "${DISTDIR}"/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar libs.jaxb/external/jaxb-impl.jar || die
+	ln -s "${DISTDIR}"/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar libs.jaxb/external/jaxb-xjc.jar || die
+	ln -s "${DISTDIR}"/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar libs.jaxb/external/jaxb1-impl.jar || die
+	ln -s "${DISTDIR}"/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar libs.javafx/external/jfxrt.jar || die
+	ln -s "${DISTDIR}"/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar html.validation/external/jing.jar || die
+	ln -s "${DISTDIR}"/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}"/825DC870D1D423E347F4F8229A211A2C297BB15D-org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.markdown.core/external/org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar || die
+	ln -s "${DISTDIR}"/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar || die
+	ln -s "${DISTDIR}"/17C0C8D6DEBF5EBE734881C131888D8088BD9E7D-org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar || die
+	ln -s "${DISTDIR}"/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar extexecution.process/external/processtreekiller-1.0.7.jar || die
+	ln -s "${DISTDIR}"/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar libs.svnClientAdapter.svnkit/external/svnkit_1.7.8.r9538_v20130107_2001.jar || die
+	ln -s "${DISTDIR}"/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar o.apache.xml.resolver/external/resolver-1.2.jar || die
+	ln -s "${DISTDIR}"/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar libs.svnClientAdapter.svnkit/external/sqljet-1.1.10.jar || die
+	ln -s "${DISTDIR}"/DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8-svnClientAdapter-javahl-1.10.12.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.10.12.jar || die
+	ln -s "${DISTDIR}"/C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8-svnClientAdapter-main-1.10.12.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.10.12.jar || die
+	ln -s "${DISTDIR}"/AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8-svnClientAdapter-svnkit-1.10.12.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.10.12.jar || die
+	ln -s "${DISTDIR}"/5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.jar libs.svnClientAdapter.javahl/external/svnjavahl-1.9.3.jar || die
+	ln -s "${DISTDIR}"/3B91269E9055504778F57744D24F505856698602-svnkit-1.7.0-beta4-20120316.233307-1.jar libs.svnClientAdapter.svnkit/external/svnkit-1.7.0-beta4-20120316.233307-1.jar || die
+	ln -s "${DISTDIR}"/015525209A02BD74254930FF844C7C13498B7FB9-svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar libs.svnClientAdapter.svnkit/external/svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar || die
+	ln -s "${DISTDIR}"/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar libs.swingx/external/swingx-all-1.6.4.jar || die
+	ln -s "${DISTDIR}"/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar httpserver/external/tomcat-webserver-3.2.jar || die
+	ln -s "${DISTDIR}"/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar swing.validation/external/ValidationAPI.jar || die
+	ln -s "${DISTDIR}"/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-r16-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.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 --build-only --into libs.jna/external jna jna.jar jna-4.2.2.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 0d91460..e35410d 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -59,6 +59,7 @@ DIST netbeans-trunk-nightly-201604170001-src.zip 213245562 SHA256 8d1da18eea0786
 DIST netbeans-trunk-nightly-201604180001-src.zip 213245562 SHA256 33e9976d15aa52ed61f53bebb87d8290a64d6e7658dc96b044136f47d46c28de SHA512 71252b57630390c901bed5fec7021d5f9255adf02c2e84c1e0981a2d729c1d0c1ed14b927b1dd36c9a72b30ced64ae6b74429e4990ddfac4bc36aff4c46e7e17 WHIRLPOOL af4f5d0f0c8f7caac85bc7ecab0fe91c68141abc9df5a0a28cc069262aa08f869d5934f5d4a546fdd997e29dc5d63ab0aefcce530560e8ed5b9bfab86b962105
 DIST netbeans-trunk-nightly-201604190001-src.zip 213247710 SHA256 2f4140e8d8ae7ea2e527d35f7ba1a75379b48659c67fca903a9ae2f5ab45652a SHA512 7d9e19583553738a793829ea2da5d57026ff17418b0a36da19cd344548a7d3a2bd0bc8dde0938ede14712806fca58ba17c5b86270eb674e1cbf6b1009f81b438 WHIRLPOOL 61910b59a2c03276bcab996b94635d0823bca717a0560e7b348df4e3dc30b926e7280fc828aa38c6d80b786ff559ece017456790cfde77c6f3e8598c30357bdc
 DIST netbeans-trunk-nightly-201604200001-src.zip 213312613 SHA256 e5dc1c1019f49460244a5d2a0c0117a0aee8bc37047fd93dc5780d6a4e374284 SHA512 5a796bee9472f30ffeebae8cfe7b3f7de02cdcda5754d5196be5fd0d577a668270c9a0cc212cc1528b2f4beb2b1f0162d951dbf0582774a7a09f87329aa26251 WHIRLPOOL 38f51d2261a92a965b160c608358e2e3d62dd623ab4ff909ddda420ef57d626c93f57dbd713ab7136b6e7781e54dc997e41b73d90a35cc25c6706de9a727cc02
+DIST netbeans-trunk-nightly-201604210001-src.zip 213315777 SHA256 e4a64f84f3ab854860e94f2d438779d38398f13860ac1e0eea0242b5ac308c72 SHA512 7cd20de630392d1d0fd1920a8e77ea06e20f92a6b40f5226c9f1de465797bc88c90e1cbafcdadc4e3c32e960c38fe6214430caa43e9d5211e807e61cb515a389 WHIRLPOOL bb99ddbee70d506e5c765e97efd9de3c497467720207ee0d8f7ff59785fdf8ab5a2f77d88d80ed1b8c3b6e16fd601a4e61644867de5c844c28f1163b565da87a
 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_p20160323.ebuild 14930 SHA256 c6ce42878879b67b80dde5580208c87c15391646f3df1866e8e1c73a2213b1c7 SHA512 3fcba554c4d3f22c093082393974885a329bb2d7ac3c3b9559e3307946a9a67f6c44b45b321448fe68a0b1e47d0db2262b6c8c3dac7f2c1df6e63b2e7a8b2201 WHIRLPOOL 32802eb70b582d546ca3a955146f007e9c6ed0919bf965693ca0da2b4de98cf6dce16fc4964ed6c893e0356994744a35ecf19507026850490895c2af58764562
@@ -80,4 +81,5 @@ EBUILD netbeans-java-9999_p20160417.ebuild 15656 SHA256 004348a9ed0c0f8ded8ee03d
 EBUILD netbeans-java-9999_p20160418.ebuild 15656 SHA256 c32afc695b05ff58946236b9d5f4999d8658aa58214a820605cc9c20b3d93d62 SHA512 1683311f3cdab287e652706eea039050b0e91447a31b2ab35e4ed2a4bba29887a82d3cbe11d4b6281a9bf37c2190a55fbde3e425810dd406278ec8f8481fa6d0 WHIRLPOOL fb09c7938d3ae68737262cad6dc3b8aa0df7e38ff5bd02ee67a4b393a32f23c7aced8293f137e952c5087a228616d83bfb3f0a6a986146b3f2d3dbd2de383977
 EBUILD netbeans-java-9999_p20160419.ebuild 15656 SHA256 cdd3a2c13aea7f362a11c3b03307802f59b11c1a36f9925b2ffcb60b3a763fa4 SHA512 7a5cf0fb5fb4f47d72e0b6349e3117c32bcbbbfc34e8759e40b219f713a018ff52468bdac6230bfe2f618ef960e4aa7ba3f43b37c287e93f09843901fd539b10 WHIRLPOOL e291921be7cd9bde4de489eb6411a53178fa1fad0afb034afd2a972242a3b7b2a184d45a920133a02d22f401a8fbc3606c1006b85f92023c4a87d1ba92b4ddb9
 EBUILD netbeans-java-9999_p20160420.ebuild 15656 SHA256 06f0b99e94725bb834ed5a85791853977bd29ade4c935f538d54ee85ee4ca5c2 SHA512 87b6171c14700cd997cb3ad1eb6520e2bfa94402ea1d3e1a2ce1797c9c43c4cafd815b2d1248b72b57f81e2999056349d53b7dba5ed2525a5026cd936579a428 WHIRLPOOL 4c26418de7a6473367048534085eb67de391de5a35d222b64a26fb570b13eb9078ebdc4507177777248fdd90f25ac195b98847fe7cb40d4aac30b6342ba878a7
+EBUILD netbeans-java-9999_p20160421.ebuild 15656 SHA256 cdf3854ea1867b8b848206fa34edf5cfb16efeeb6618a9b0eda47529733258ae SHA512 27ed82ef9a4e1a23a271b3d253606ec5092321a0941273542bcd09cd887b83b9726318430aec7dfd8d2ddb1335231c0815e751240191e1a0b2234ba35599c37d WHIRLPOOL 8000035a4253a04f0e5617a4ce4b9370f4076ec03b79db856a3ba7b69022732c619be97ad9564b3d7e64c233628f5ccaafc56e66c7f4032002fa5bea4b42c6bd
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 8a45f92..932e6a5 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201604170001-src.zip 213245562 SHA256 8d1da18eea0786
 DIST netbeans-trunk-nightly-201604180001-src.zip 213245562 SHA256 33e9976d15aa52ed61f53bebb87d8290a64d6e7658dc96b044136f47d46c28de SHA512 71252b57630390c901bed5fec7021d5f9255adf02c2e84c1e0981a2d729c1d0c1ed14b927b1dd36c9a72b30ced64ae6b74429e4990ddfac4bc36aff4c46e7e17 WHIRLPOOL af4f5d0f0c8f7caac85bc7ecab0fe91c68141abc9df5a0a28cc069262aa08f869d5934f5d4a546fdd997e29dc5d63ab0aefcce530560e8ed5b9bfab86b962105
 DIST netbeans-trunk-nightly-201604190001-src.zip 213247710 SHA256 2f4140e8d8ae7ea2e527d35f7ba1a75379b48659c67fca903a9ae2f5ab45652a SHA512 7d9e19583553738a793829ea2da5d57026ff17418b0a36da19cd344548a7d3a2bd0bc8dde0938ede14712806fca58ba17c5b86270eb674e1cbf6b1009f81b438 WHIRLPOOL 61910b59a2c03276bcab996b94635d0823bca717a0560e7b348df4e3dc30b926e7280fc828aa38c6d80b786ff559ece017456790cfde77c6f3e8598c30357bdc
 DIST netbeans-trunk-nightly-201604200001-src.zip 213312613 SHA256 e5dc1c1019f49460244a5d2a0c0117a0aee8bc37047fd93dc5780d6a4e374284 SHA512 5a796bee9472f30ffeebae8cfe7b3f7de02cdcda5754d5196be5fd0d577a668270c9a0cc212cc1528b2f4beb2b1f0162d951dbf0582774a7a09f87329aa26251 WHIRLPOOL 38f51d2261a92a965b160c608358e2e3d62dd623ab4ff909ddda420ef57d626c93f57dbd713ab7136b6e7781e54dc997e41b73d90a35cc25c6706de9a727cc02
+DIST netbeans-trunk-nightly-201604210001-src.zip 213315777 SHA256 e4a64f84f3ab854860e94f2d438779d38398f13860ac1e0eea0242b5ac308c72 SHA512 7cd20de630392d1d0fd1920a8e77ea06e20f92a6b40f5226c9f1de465797bc88c90e1cbafcdadc4e3c32e960c38fe6214430caa43e9d5211e807e61cb515a389 WHIRLPOOL bb99ddbee70d506e5c765e97efd9de3c497467720207ee0d8f7ff59785fdf8ab5a2f77d88d80ed1b8c3b6e16fd601a4e61644867de5c844c28f1163b565da87a
 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_p20160323.ebuild 4971 SHA256 304241fa6209ff3e1cf3bfc82965b593e706860bdc9fdbf898428725b602b014 SHA512 cb95ddafcda3a2f94f4535e9d106f2ccf3a23e027cea3f510aafb508c13e899132bec1f89512805515fbec872a917b197425c9e5db80cb4f5637a16b7ba731ea WHIRLPOOL 001a3357ef99f759d08eba878eeb9d1f829338ab21e5a0806d02477419081663708c98a9f7c2d56d5b97b67d1a9cf457f5917f0e247764910114d4b2e34cdeb8
@@ -47,4 +48,5 @@ EBUILD netbeans-javacard-9999_p20160417.ebuild 4971 SHA256 63649670731a69a41afb0
 EBUILD netbeans-javacard-9999_p20160418.ebuild 4971 SHA256 03076b874ec32867fe6a2c1df674924b3542b3c76ad3c37d63d4f80a56f92c1e SHA512 00f3243347b966ae8cd21d2e620a1f598d1a158c98f1e436f5ca974454033cedeb4e9fd6b3df0c834a5581610559a21b7a5696adb36a3db427b6655aef9846f6 WHIRLPOOL ff67fa7357d40f6963d282c6cda5dd9812efa6b666dbadc6c64b5f84432f31f7e05fbc72162a439703e75fdc1086258ae31212823663f3d9f2bf80dc8988b81b
 EBUILD netbeans-javacard-9999_p20160419.ebuild 4971 SHA256 0059a432ff7f3a43a6468c99fde3f59fa9de3bd0056de5c225352cdb943dabb7 SHA512 61c448eac2abd456aa04e7180509f54b585b264230634292f7c1dbdd22e88b089bc2bfa859211a1f3b3ba86a87ae8d6e2b9fd4f070d4065bd8b1be23beee72f6 WHIRLPOOL 6ff34275a2be9b214632f56aac4f14d3947c5b31cb4449beafb678d3cce8693e41346911e22e842c3d67fe3b7a5f678a4b099af093b3d589c5aac6d67385d0bf
 EBUILD netbeans-javacard-9999_p20160420.ebuild 4971 SHA256 0e1c3236ad294c5cbb474c7cdd08edfef8e5351e961688a7b6b77b3287f692fb SHA512 b03a66a607777ced5b6d4361762367c02a2b58ad882595fd5eea06ed4fa7474946877bd3859c82377a928b8a9cdef135de5d8ef162f7b2f923b644ee6a43371b WHIRLPOOL ab00309df15acffd1d918d7a2009d46c31a7ad99ba5b01405a3ade62a45b7474333d97a2ff7868cec2c7d1a6910f4d17488e5ddab8ed368bdcc3692eeeb9f012
+EBUILD netbeans-javacard-9999_p20160421.ebuild 4971 SHA256 847ecea7030748fa8cce6171b2e621e182d5cd8735fab82753beba502dc39a4a SHA512 3f74b644db1d83d321cb68c938d27a692a4ae8ca06a8b7fdd8384bdaaa3ee0acc38a58a9ac650ec61385b0af25a3ec3b009e314c9aae6686999c0da332b5643e WHIRLPOOL eeac390ca57be123e2053022afc36a9ea25be6c327a22d88e7ed81f90a223640f45c52d5875e31f0c2ca476a13e62ce5bcf08fbc0b75fdbce91672739346dd73
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160421.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160421.ebuild
new file mode 100644
index 0000000..568612a
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160421.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-04-21_00-01-48/zip/netbeans-trunk-nightly-201604210001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar
+	http://hg.netbeans.org/binaries/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar
+	http://hg.netbeans.org/binaries/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}
+	dev-java/ant-contrib:0
+	dev-java/asm:3
+	dev-java/bcel:0
+	dev-java/commons-cli:1
+	dev-java/commons-codec:0
+	dev-java/commons-httpclient:3
+	dev-java/commons-logging:0"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.javacard -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r16-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar javacard.ri.platform/external/anttasks.jar || die
+	ln -s "${DISTDIR}"/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar javacard.apdu.io/external/apduio.jar || die
+	ln -s "${DISTDIR}"/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip javacard.ri.bundle/external/javacard_ri.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/javacard >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/javacard$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	rm -fr "${D}"/${INSTALL_DIR}/bin || die
+
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/JCDK3.0.2_ConnectedEdition/lib
+	pushd "${instdir}" >/dev/null || die
+	rm ant-contrib-1.0b3.jar && java-pkg_jar-from --into "${instdir}" ant-contrib ant-contrib.jar ant-contrib-1.0b3.jar
+	rm asm-all-3.1.jar && java-pkg_jar-from --into "${instdir}" asm-3 asm.jar asm-all-3.1.jar
+	rm bcel-5.2.jar && java-pkg_jar-from --into "${instdir}" bcel bcel.jar bcel-5.2.jar
+	rm commons-cli-1.0.jar && java-pkg_jar-from --into "${instdir}" commons-cli-1 commons-cli.jar commons-cli-1.0.jar
+	rm commons-codec-1.3.jar && java-pkg_jar-from --into "${instdir}" commons-codec commons-codec.jar commons-codec-1.3.jar
+	rm commons-httpclient-3.0.jar && java-pkg_jar-from --into "${instdir}" commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.0.jar
+	rm commons-logging-1.1.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar commons-logging-1.1.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/javacard
+}

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index b227e80..f1de082 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201604170001-src.zip 213245562 SHA256 8d1da18eea0786
 DIST netbeans-trunk-nightly-201604180001-src.zip 213245562 SHA256 33e9976d15aa52ed61f53bebb87d8290a64d6e7658dc96b044136f47d46c28de SHA512 71252b57630390c901bed5fec7021d5f9255adf02c2e84c1e0981a2d729c1d0c1ed14b927b1dd36c9a72b30ced64ae6b74429e4990ddfac4bc36aff4c46e7e17 WHIRLPOOL af4f5d0f0c8f7caac85bc7ecab0fe91c68141abc9df5a0a28cc069262aa08f869d5934f5d4a546fdd997e29dc5d63ab0aefcce530560e8ed5b9bfab86b962105
 DIST netbeans-trunk-nightly-201604190001-src.zip 213247710 SHA256 2f4140e8d8ae7ea2e527d35f7ba1a75379b48659c67fca903a9ae2f5ab45652a SHA512 7d9e19583553738a793829ea2da5d57026ff17418b0a36da19cd344548a7d3a2bd0bc8dde0938ede14712806fca58ba17c5b86270eb674e1cbf6b1009f81b438 WHIRLPOOL 61910b59a2c03276bcab996b94635d0823bca717a0560e7b348df4e3dc30b926e7280fc828aa38c6d80b786ff559ece017456790cfde77c6f3e8598c30357bdc
 DIST netbeans-trunk-nightly-201604200001-src.zip 213312613 SHA256 e5dc1c1019f49460244a5d2a0c0117a0aee8bc37047fd93dc5780d6a4e374284 SHA512 5a796bee9472f30ffeebae8cfe7b3f7de02cdcda5754d5196be5fd0d577a668270c9a0cc212cc1528b2f4beb2b1f0162d951dbf0582774a7a09f87329aa26251 WHIRLPOOL 38f51d2261a92a965b160c608358e2e3d62dd623ab4ff909ddda420ef57d626c93f57dbd713ab7136b6e7781e54dc997e41b73d90a35cc25c6706de9a727cc02
+DIST netbeans-trunk-nightly-201604210001-src.zip 213315777 SHA256 e4a64f84f3ab854860e94f2d438779d38398f13860ac1e0eea0242b5ac308c72 SHA512 7cd20de630392d1d0fd1920a8e77ea06e20f92a6b40f5226c9f1de465797bc88c90e1cbafcdadc4e3c32e960c38fe6214430caa43e9d5211e807e61cb515a389 WHIRLPOOL bb99ddbee70d506e5c765e97efd9de3c497467720207ee0d8f7ff59785fdf8ab5a2f77d88d80ed1b8c3b6e16fd601a4e61644867de5c844c28f1163b565da87a
 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_p20160323.ebuild 6293 SHA256 a0d7dfbb1f4ad34d6cfe54c149cdad842345449c3c640917bdbf96fa9b2e16e9 SHA512 09a676ab446a5b13157ca1290f034c8d85fc185f2fed5e62bbf2d47a005d5edad7fbe1df2c11e85e1267132d511ffef5237fa6dadc980f3688d108e199358406 WHIRLPOOL 4428da9319652f8000a3a83fefaf5eef6bb77364817c287c5565008962592074fb06e69f40b9d147ecfa7887f945d397a417e9e365fcc6c2bbefe08b6683652a
@@ -45,4 +46,5 @@ EBUILD netbeans-javadoc-9999_p20160417.ebuild 6293 SHA256 40d0a558fb66ddbe526e7f
 EBUILD netbeans-javadoc-9999_p20160418.ebuild 6293 SHA256 385e21683da0bba90cd606aa9d25285f247e859e131de661b6c300987b0de424 SHA512 e8da4e3ebd7d7c6bfb5a76af727723a6f80a1166288d2a7522a6a3912dd066bce4e4e00b7dc65b8a76e63cfb9453b552534a6a411bd1f2bdcf376779daf46fb5 WHIRLPOOL f2d94a0494acc93bd61648505f3a9c108320ef3250d1737f580e98ad57a38923625ea1e2e495c790cd343ca240eb526b8874a2e99853a69ceb44f6151fc80426
 EBUILD netbeans-javadoc-9999_p20160419.ebuild 6293 SHA256 931648d28881dafe5f06952a312ee14ffc432e6bf509258e85b5dbc518c475ac SHA512 1118b910f851ea270c3414b778a5002168a3cbd2d436f990a247f543636ccaa105adc420d43ad10f6f35c92c91faa9071a608486fd9145b7d0c7adc87f9abbb9 WHIRLPOOL 801056e9c5a80f564e4ee10b8500e076251cfe29dca9b9f453e10f1b7144d4594c85902ee166c82f981c6ef2eb3da3c7b8db10400b6bd1d6330883fbab133835
 EBUILD netbeans-javadoc-9999_p20160420.ebuild 6293 SHA256 66a74bdf890ea85ac0e7c857d0d4c0cc82f80a242cae78f88b6e2d243bee5c25 SHA512 90e9048a50f7a178e3294e6caae6308ec871fc473f6da3c553ae946904a1f4ec4615f37e674db05cf3a8db38a8354f1d9d6b02efcaf22ff9d29e245513628b56 WHIRLPOOL c20717ecf22c149860b9616c873544d564434f3a37b2c00a52874e4550d6e2d5dee7e0fc6834a59570f07b2ffe2179a00537aefbc8a7ee9688f7e6f5e411c4cc
+EBUILD netbeans-javadoc-9999_p20160421.ebuild 6293 SHA256 fd1af49bf46a9d25b056d99df7f16cce383283f7c82ca526c763aa319b575d08 SHA512 3414f073d3d17a93c73101396fd9dd21154a420bde99f5740d0ab47e5380841275653d8091b2db384f78924881117ad7deb809fa157fdb7d9eace8b33fd2fcb3 WHIRLPOOL 64a53184c43ab5519670e2a8defd00a6802f5f4bea1e719d4ec16b0a95630fa0c9cc389da488477e0f2ed60a445d222c1358cbdf4803623f81ee07f15def10ac
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160421.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160421.ebuild
new file mode 100644
index 0000000..9168465
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160421.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-04-21_00-01-48/zip/netbeans-trunk-nightly-201604210001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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-r16-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-r16-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-apisupport-${SLOT} apisupport || die
+	cat /usr/share/netbeans-apisupport-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.apisupport.built
+
+	ln -s /usr/share/netbeans-cnd-${SLOT} cnd || die
+	cat /usr/share/netbeans-cnd-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.cnd.built
+
+	ln -s /usr/share/netbeans-dlight-${SLOT} dlight || die
+	cat /usr/share/netbeans-dlight-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.dlight.built
+
+	ln -s /usr/share/netbeans-enterprise-${SLOT} enterprise || die
+	cat /usr/share/netbeans-enterprise-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.enterprise.built
+
+	ln -s /usr/share/netbeans-ergonomics-${SLOT} ergonomics || die
+	cat /usr/share/netbeans-ergonomics-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ergonomics.built
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-groovy-${SLOT} groovy || die
+	cat /usr/share/netbeans-groovy-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.groovy.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-javacard-${SLOT} javacard || die
+	cat /usr/share/netbeans-javacard-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.javacard.built
+
+	ln -s /usr/share/netbeans-mobility-${SLOT} mobility || die
+	cat /usr/share/netbeans-mobility-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.mobility.built
+
+	ln -s /usr/share/netbeans-nb-${SLOT}/nb nb || die
+	cat /usr/share/netbeans-nb-${SLOT}/nb/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.nb.built
+
+	ln -s /usr/share/netbeans-php-${SLOT} php || die
+	cat /usr/share/netbeans-php-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.php.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-profiler-${SLOT} profiler || die
+	cat /usr/share/netbeans-profiler-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.profiler.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	eant -Dpermit.jdk8.builds=true -f nbbuild/build.xml bootstrap || die
+	ANT_OPTS="-Xmx1536m" eant -Dpermit.jdk8.builds=true -f nbbuild/javadoctools/build.xml build-javadoc
+}
+
+src_install() {
+	rm nbbuild/build/javadoc/*.zip
+	java-pkg_dojavadoc nbbuild/build/javadoc
+}

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 72e7118..ed73691 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201604170001-src.zip 213245562 SHA256 8d1da18eea0786
 DIST netbeans-trunk-nightly-201604180001-src.zip 213245562 SHA256 33e9976d15aa52ed61f53bebb87d8290a64d6e7658dc96b044136f47d46c28de SHA512 71252b57630390c901bed5fec7021d5f9255adf02c2e84c1e0981a2d729c1d0c1ed14b927b1dd36c9a72b30ced64ae6b74429e4990ddfac4bc36aff4c46e7e17 WHIRLPOOL af4f5d0f0c8f7caac85bc7ecab0fe91c68141abc9df5a0a28cc069262aa08f869d5934f5d4a546fdd997e29dc5d63ab0aefcce530560e8ed5b9bfab86b962105
 DIST netbeans-trunk-nightly-201604190001-src.zip 213247710 SHA256 2f4140e8d8ae7ea2e527d35f7ba1a75379b48659c67fca903a9ae2f5ab45652a SHA512 7d9e19583553738a793829ea2da5d57026ff17418b0a36da19cd344548a7d3a2bd0bc8dde0938ede14712806fca58ba17c5b86270eb674e1cbf6b1009f81b438 WHIRLPOOL 61910b59a2c03276bcab996b94635d0823bca717a0560e7b348df4e3dc30b926e7280fc828aa38c6d80b786ff559ece017456790cfde77c6f3e8598c30357bdc
 DIST netbeans-trunk-nightly-201604200001-src.zip 213312613 SHA256 e5dc1c1019f49460244a5d2a0c0117a0aee8bc37047fd93dc5780d6a4e374284 SHA512 5a796bee9472f30ffeebae8cfe7b3f7de02cdcda5754d5196be5fd0d577a668270c9a0cc212cc1528b2f4beb2b1f0162d951dbf0582774a7a09f87329aa26251 WHIRLPOOL 38f51d2261a92a965b160c608358e2e3d62dd623ab4ff909ddda420ef57d626c93f57dbd713ab7136b6e7781e54dc997e41b73d90a35cc25c6706de9a727cc02
+DIST netbeans-trunk-nightly-201604210001-src.zip 213315777 SHA256 e4a64f84f3ab854860e94f2d438779d38398f13860ac1e0eea0242b5ac308c72 SHA512 7cd20de630392d1d0fd1920a8e77ea06e20f92a6b40f5226c9f1de465797bc88c90e1cbafcdadc4e3c32e960c38fe6214430caa43e9d5211e807e61cb515a389 WHIRLPOOL bb99ddbee70d506e5c765e97efd9de3c497467720207ee0d8f7ff59785fdf8ab5a2f77d88d80ed1b8c3b6e16fd601a4e61644867de5c844c28f1163b565da87a
 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_p20160323.ebuild 4717 SHA256 acee79578d7f2ddc855790643f5c3cab5c04789a55609ee1748f112a28539bca SHA512 6ebf45a1e5db61d201d9131a1ce5b38105a2863b71b2ce8b8c6220d75505e874809f4a2f87ae7c0065458c896210b279d326cae108288797c0c23c84bda11c72 WHIRLPOOL f9a674934de5f0dc52a785884b0e7b746d9176f3d387ea3097e74ba8f8e093960ce5d5f7d2751caa05899e4d48773712283f68f5753b7a8bd300d984b04e135d
@@ -52,4 +53,5 @@ EBUILD netbeans-javafx-9999_p20160417.ebuild 4717 SHA256 8e608fd2303950497649ab6
 EBUILD netbeans-javafx-9999_p20160418.ebuild 4717 SHA256 ca49ca0191ce5ce4464008fb7f9581f5d6149442448b540f30968abbbfa15d6b SHA512 1acc9f0382e82fb139705c06f5862bbdfd0db37599b173bda125f1c1e80955e16fa6121cd9d774aa6712a1b2f5c65f4070de0c2a38cdaa95d48ee40ceef773bb WHIRLPOOL 0bab04ae22f3904293d35b70923366a7b64637eb412fdbb6d982e342d684422f0be80d80df6aa95c9a90dc0609b6384daf1d1b0f4fd3d309939825e38555d252
 EBUILD netbeans-javafx-9999_p20160419.ebuild 4717 SHA256 ef08603302c5525d16a21a15b582207838c030562beadf678611e931490455a0 SHA512 51478c129189611900e59f25660ab2f28549f6a1675d3f1e15cd3623a40afffef11c5b5fa74851f5a47c92621fa6de20ac274414f1748c998140f82d2567794c WHIRLPOOL a2bf4bef604977c31b8e25a22811ea0da8e682e56a26924861ba1d25bbd6aa14c4d3a47f30e3ffbf13a695cb651692ad8bff0795434fd28cad0725743d3462ef
 EBUILD netbeans-javafx-9999_p20160420.ebuild 4717 SHA256 2b1a5defd56a3c90d137a5c479ba5141ff2e1f4b38dca1dd666c2ff3c3234f2f SHA512 5c20f2d2ce396c898abe236ceccf6cf4cbaaf6836bad5bbab524335a581943f24e07c70e8e4d5d221c79787cbd3b582d610345a6e6796f96b5f9c3ebd88fed74 WHIRLPOOL b4330ba141bf71427f6f0682e6612c8d12d4e614ccbe04c04847ebf6a078f4eda582fbdf6dd389bbfde9f09b65cb8ba6dba2b03bb606040f4dd7a07c189b739d
+EBUILD netbeans-javafx-9999_p20160421.ebuild 4717 SHA256 0ef4e8b346e508e83f976055e5f41157323cb7aef8ab33bb40ce575cf4b2c36e SHA512 40a0c896a09379048a2245fb0b81fa7587ad8b180ace778e413aac94a422082dc7682f83500f0f6259cfffa560597e8c3e78ca1737b438fff119607343694ceb WHIRLPOOL 470b0e0fb0578813fbe7e47c3d64d2a457746c1b4b437e4366bfb5559135b7d00718881cd6e009632bd62f93964e6d054cb00fe4b2a99ab044c0a8be798f0998
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 44f04fd..0844765 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201604170001-src.zip 213245562 SHA256 8d1da18eea0786
 DIST netbeans-trunk-nightly-201604180001-src.zip 213245562 SHA256 33e9976d15aa52ed61f53bebb87d8290a64d6e7658dc96b044136f47d46c28de SHA512 71252b57630390c901bed5fec7021d5f9255adf02c2e84c1e0981a2d729c1d0c1ed14b927b1dd36c9a72b30ced64ae6b74429e4990ddfac4bc36aff4c46e7e17 WHIRLPOOL af4f5d0f0c8f7caac85bc7ecab0fe91c68141abc9df5a0a28cc069262aa08f869d5934f5d4a546fdd997e29dc5d63ab0aefcce530560e8ed5b9bfab86b962105
 DIST netbeans-trunk-nightly-201604190001-src.zip 213247710 SHA256 2f4140e8d8ae7ea2e527d35f7ba1a75379b48659c67fca903a9ae2f5ab45652a SHA512 7d9e19583553738a793829ea2da5d57026ff17418b0a36da19cd344548a7d3a2bd0bc8dde0938ede14712806fca58ba17c5b86270eb674e1cbf6b1009f81b438 WHIRLPOOL 61910b59a2c03276bcab996b94635d0823bca717a0560e7b348df4e3dc30b926e7280fc828aa38c6d80b786ff559ece017456790cfde77c6f3e8598c30357bdc
 DIST netbeans-trunk-nightly-201604200001-src.zip 213312613 SHA256 e5dc1c1019f49460244a5d2a0c0117a0aee8bc37047fd93dc5780d6a4e374284 SHA512 5a796bee9472f30ffeebae8cfe7b3f7de02cdcda5754d5196be5fd0d577a668270c9a0cc212cc1528b2f4beb2b1f0162d951dbf0582774a7a09f87329aa26251 WHIRLPOOL 38f51d2261a92a965b160c608358e2e3d62dd623ab4ff909ddda420ef57d626c93f57dbd713ab7136b6e7781e54dc997e41b73d90a35cc25c6706de9a727cc02
+DIST netbeans-trunk-nightly-201604210001-src.zip 213315777 SHA256 e4a64f84f3ab854860e94f2d438779d38398f13860ac1e0eea0242b5ac308c72 SHA512 7cd20de630392d1d0fd1920a8e77ea06e20f92a6b40f5226c9f1de465797bc88c90e1cbafcdadc4e3c32e960c38fe6214430caa43e9d5211e807e61cb515a389 WHIRLPOOL bb99ddbee70d506e5c765e97efd9de3c497467720207ee0d8f7ff59785fdf8ab5a2f77d88d80ed1b8c3b6e16fd601a4e61644867de5c844c28f1163b565da87a
 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_p20160323.ebuild 4412 SHA256 2c08c29b61f44d19335f0bf220f7ec820b0192d0ca47d769c711a2d72ead05d0 SHA512 4b398ca24c711f2f1bcf1afc481ed4a280afd96cb80a12f110b0e0413fe9b16d2d256675a10d40b7e53b70715487af45717513300268b97cc15d76228300e212 WHIRLPOOL 8c18bd51f1b207fc4e50bc627cb4486eb214cac313445bebabb1219a77df8c9f373a4be08b8653fa42a17c7f271ba29d0adf305adba642f9ec7726e351bcc5d8
@@ -44,4 +45,5 @@ EBUILD netbeans-mobility-9999_p20160417.ebuild 4412 SHA256 df71322874c90a942a153
 EBUILD netbeans-mobility-9999_p20160418.ebuild 4412 SHA256 4c34a329c4cb0c72c28dec092214b95af0c00036a3977e9b270dcb98d0ce0bd5 SHA512 b8025fb42bcecb499b926d71f926118f476650f6f7331d1db7965311f664c5ab70ef361472de55883a60dbee2becf6b90a95ce297f4945c3f792970b25b8ef4f WHIRLPOOL 3fc633a1f5bae919a9f321b944c0fbce364d0558a75f2eb09c411abba8ba219990904cbda9306b592c68f50970f0dc349aa1b2ce9b97feb11a34d949b175d600
 EBUILD netbeans-mobility-9999_p20160419.ebuild 4412 SHA256 25ed9e94c342960c5009bc833093c1c1f5af00d586d3e577402cc17865f25e2f SHA512 ebc783c6c6866d6663b6405a0afab548937a9763c79db27c25477bbe6740c8b8227973b4917c409253a90c059f2f50171a11dae9f0572647734d2541b188b67a WHIRLPOOL 7a20243a1b981bff7a5db53056f02ff0093d1e0addf34eed5c002b46e9643d8aaeb72e4a35797fe3c9c075e1552f26440baac75472549a44ae52472ab3162b72
 EBUILD netbeans-mobility-9999_p20160420.ebuild 4412 SHA256 4b178040d918a47f97ee75133143e58bcbf6e456278c84280765c6e7999d33db SHA512 a32603db9448d57d06640c36eec69bf07792c2e375104ecf23d97c5fde74768df3c8e73c8d607627890f2b709fbb0ca82011f6ae4c7139063a6bfe8a47ca698e WHIRLPOOL ba9c298c2db60a09079a96007496c6f90d569730555c3e2fd4f0f2694a8171b0b8c331146506de5d6c0f32da1a3bb0bed8b9ca83a60d9329b6cd8ec43367bb4f
+EBUILD netbeans-mobility-9999_p20160421.ebuild 4412 SHA256 2f0b87610c3a22ff5a6c1760a2733a455e4cd1895a2acfd6a283e85ac0319ce8 SHA512 dd3e5e04fb1eb13d15b872095624d62b04bc069ececdc25685ad1e72714b6c0a50bc8a4c834a4566b9c6e857b8961f8871c0b02728358d0b0541302a460d124f WHIRLPOOL 5fdcff18d2808452581cc599a2074591fdf8513ba751892ad67576d38f790be4541170c4d36e6af05511b5e151cc1bf62c9f94596a2569cd397548b3be361e74
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160421.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160421.ebuild
new file mode 100644
index 0000000..d7cfb36
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160421.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-04-21_00-01-48/zip/netbeans-trunk-nightly-201604210001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-apisupport-${PV}
+	~dev-java/netbeans-enterprise-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-websvccommon-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.mobility -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f | grep -vE "mobility.databindingme/lib/netbeans_databindingme.*\.jar" \
+		| grep -v "vmd.components.midp/netbeans_midp_components_basic/dist/netbeans_midp_components_basic.jar" \
+		| grep -v "vmd.components.midp.pda/netbeans_midp_components_pda/dist/netbeans_midp_components_pda.jar" \
+		| grep -v "vmd.components.midp.wma/netbeans_midp_components_wma/dist/netbeans_midp_components_wma.jar" \
+		| grep -v "vmd.components.svg/nb_svg_midp_components/dist/nb_svg_midp_components.jar" | xargs rm
+
+	unpack netbeans-9999-r16-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-apisupport-${SLOT} apisupport || die
+	cat /usr/share/netbeans-apisupport-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.apisupport.built
+
+	ln -s /usr/share/netbeans-enterprise-${SLOT} enterprise || die
+	cat /usr/share/netbeans-enterprise-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.enterprise.built
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/mobility >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/mobility$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	rm -rf "${D}"/${INSTALL_DIR}/modules/lib || die
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/mobility
+}

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 6ef8513..bf890ab 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201604170001-src.zip 213245562 SHA256 8d1da18eea0786
 DIST netbeans-trunk-nightly-201604180001-src.zip 213245562 SHA256 33e9976d15aa52ed61f53bebb87d8290a64d6e7658dc96b044136f47d46c28de SHA512 71252b57630390c901bed5fec7021d5f9255adf02c2e84c1e0981a2d729c1d0c1ed14b927b1dd36c9a72b30ced64ae6b74429e4990ddfac4bc36aff4c46e7e17 WHIRLPOOL af4f5d0f0c8f7caac85bc7ecab0fe91c68141abc9df5a0a28cc069262aa08f869d5934f5d4a546fdd997e29dc5d63ab0aefcce530560e8ed5b9bfab86b962105
 DIST netbeans-trunk-nightly-201604190001-src.zip 213247710 SHA256 2f4140e8d8ae7ea2e527d35f7ba1a75379b48659c67fca903a9ae2f5ab45652a SHA512 7d9e19583553738a793829ea2da5d57026ff17418b0a36da19cd344548a7d3a2bd0bc8dde0938ede14712806fca58ba17c5b86270eb674e1cbf6b1009f81b438 WHIRLPOOL 61910b59a2c03276bcab996b94635d0823bca717a0560e7b348df4e3dc30b926e7280fc828aa38c6d80b786ff559ece017456790cfde77c6f3e8598c30357bdc
 DIST netbeans-trunk-nightly-201604200001-src.zip 213312613 SHA256 e5dc1c1019f49460244a5d2a0c0117a0aee8bc37047fd93dc5780d6a4e374284 SHA512 5a796bee9472f30ffeebae8cfe7b3f7de02cdcda5754d5196be5fd0d577a668270c9a0cc212cc1528b2f4beb2b1f0162d951dbf0582774a7a09f87329aa26251 WHIRLPOOL 38f51d2261a92a965b160c608358e2e3d62dd623ab4ff909ddda420ef57d626c93f57dbd713ab7136b6e7781e54dc997e41b73d90a35cc25c6706de9a727cc02
+DIST netbeans-trunk-nightly-201604210001-src.zip 213315777 SHA256 e4a64f84f3ab854860e94f2d438779d38398f13860ac1e0eea0242b5ac308c72 SHA512 7cd20de630392d1d0fd1920a8e77ea06e20f92a6b40f5226c9f1de465797bc88c90e1cbafcdadc4e3c32e960c38fe6214430caa43e9d5211e807e61cb515a389 WHIRLPOOL bb99ddbee70d506e5c765e97efd9de3c497467720207ee0d8f7ff59785fdf8ab5a2f77d88d80ed1b8c3b6e16fd601a4e61644867de5c844c28f1163b565da87a
 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_p20160323.ebuild 4111 SHA256 0623097b6d76f3290926cb3660f7d32c333894a546bd0cf0d6c48a9ec7f8cc3c SHA512 f00bea390fbc4ef045609a3bbe6475aa5ceea8ec257d63b349cb37f8075eaa3ff991f49e5814a11e18f2f7c92bdebda6faa62cc2f05f98abf7264bb0a41532b8 WHIRLPOOL 62132505d1da38d702ea426d82940b85b0229529995e5352b6a67868a9a29d1aae88846aff1257f524e63fc2a8e7fc32b47ba1e601c5d09148d82a22fe80bf4c
@@ -47,4 +48,5 @@ EBUILD netbeans-nb-9999_p20160417.ebuild 4111 SHA256 d6ba131f04f756d8850a44276b2
 EBUILD netbeans-nb-9999_p20160418.ebuild 4111 SHA256 913ba4229842c07420111bddc6ad0bf65feee71704d377a605e8c4e3fdf4dbab SHA512 c9cb517cdda4ef52448572df999859cb37ccd37c1bdc3e9ad01a6482a75d5db7430ff5b07e8f984751a8c6fe28f7fdcfced15c4ffe8f814b2da2b9b90632c7a3 WHIRLPOOL feb8f8a5f2809370ca419897d8b902b29e476783f6655833c6c333cf42addd13e4dc9b636717908956eab18be476efba41a54f4bdc43e1d0fa17ee995579da8f
 EBUILD netbeans-nb-9999_p20160419.ebuild 4111 SHA256 81b494a994045ebc75e93c0d22d505fafd32c4cd9bd97c9e2a4a002f659cad8c SHA512 36db4fe35a329606b3424be96ded43a5763738761659144e7a43acad930850e4ac788b94abebe2801998de04ed728554291e5c2191471c129830461ca9a63fdd WHIRLPOOL 05b2ca9aeae913a298cad0f7ef46fc18315fbe8fce83be248a58fc467fce483d035361b43a4702ce1c4a9b334b7a07b282a5de28ef030076f0c4426ffa9e5ceb
 EBUILD netbeans-nb-9999_p20160420.ebuild 4111 SHA256 ae8fe0d2065f02219b19e0f5b9fd0fa16e9b1c97337ceb3375fc1d759ccc0e3f SHA512 c05b3594809bbe3ed2900647f4ecd40ee9e392cf9fcf811dcb8db4a040f97575b4922843a1b8a6d4475fa6836f044c5e623138fc7d7a78f36829c2332a07f8cb WHIRLPOOL 5052065e317e5dbbf639644f9774c11a10ecdd433115bc014d0066bba7a3ef0cd83885fdbca83046790619d97d2be0ad98ed654971220404e93aa34e2fe860db
+EBUILD netbeans-nb-9999_p20160421.ebuild 4111 SHA256 4c2351a7ccfa6b3b37862272e95f15af4eade6307c0661a50191d4f9d370a7aa SHA512 d89129eef1a1f108202ac1ac205ddf19b6ecbb8d5f57dc4171011afe074e5c45b9b3757f7984f77cf52319f615a05b0a32a3138e0bd1c7f663934bd647cfe2a9 WHIRLPOOL ccd0458af9d26dfe4267a7f5ee4f7a380b373557bcf94f8d07fd78c0101a3cb3912dc0850501edee2d4824aa4c5e6238422f9c8a7d9925c0118fdd4654f2e414
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9

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

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index 42cecd4..4dbaade 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201604170001-src.zip 213245562 SHA256 8d1da18eea0786
 DIST netbeans-trunk-nightly-201604180001-src.zip 213245562 SHA256 33e9976d15aa52ed61f53bebb87d8290a64d6e7658dc96b044136f47d46c28de SHA512 71252b57630390c901bed5fec7021d5f9255adf02c2e84c1e0981a2d729c1d0c1ed14b927b1dd36c9a72b30ced64ae6b74429e4990ddfac4bc36aff4c46e7e17 WHIRLPOOL af4f5d0f0c8f7caac85bc7ecab0fe91c68141abc9df5a0a28cc069262aa08f869d5934f5d4a546fdd997e29dc5d63ab0aefcce530560e8ed5b9bfab86b962105
 DIST netbeans-trunk-nightly-201604190001-src.zip 213247710 SHA256 2f4140e8d8ae7ea2e527d35f7ba1a75379b48659c67fca903a9ae2f5ab45652a SHA512 7d9e19583553738a793829ea2da5d57026ff17418b0a36da19cd344548a7d3a2bd0bc8dde0938ede14712806fca58ba17c5b86270eb674e1cbf6b1009f81b438 WHIRLPOOL 61910b59a2c03276bcab996b94635d0823bca717a0560e7b348df4e3dc30b926e7280fc828aa38c6d80b786ff559ece017456790cfde77c6f3e8598c30357bdc
 DIST netbeans-trunk-nightly-201604200001-src.zip 213312613 SHA256 e5dc1c1019f49460244a5d2a0c0117a0aee8bc37047fd93dc5780d6a4e374284 SHA512 5a796bee9472f30ffeebae8cfe7b3f7de02cdcda5754d5196be5fd0d577a668270c9a0cc212cc1528b2f4beb2b1f0162d951dbf0582774a7a09f87329aa26251 WHIRLPOOL 38f51d2261a92a965b160c608358e2e3d62dd623ab4ff909ddda420ef57d626c93f57dbd713ab7136b6e7781e54dc997e41b73d90a35cc25c6706de9a727cc02
+DIST netbeans-trunk-nightly-201604210001-src.zip 213315777 SHA256 e4a64f84f3ab854860e94f2d438779d38398f13860ac1e0eea0242b5ac308c72 SHA512 7cd20de630392d1d0fd1920a8e77ea06e20f92a6b40f5226c9f1de465797bc88c90e1cbafcdadc4e3c32e960c38fe6214430caa43e9d5211e807e61cb515a389 WHIRLPOOL bb99ddbee70d506e5c765e97efd9de3c497467720207ee0d8f7ff59785fdf8ab5a2f77d88d80ed1b8c3b6e16fd601a4e61644867de5c844c28f1163b565da87a
 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_p20160323.ebuild 4418 SHA256 78af17d8ab7754bb43a899f0893624177e1e1c011d2c64868deeb3402f9ba9ee SHA512 8e88d0fb5b89a9b5546e3eeb22d78fa57a84ea9bac357b75e8add3e0a5367613e6af623df66e7eaf675018f21473264677adcdc0f73612d2f9754a7f35c5f8f5 WHIRLPOOL 635ba9612c20bf71236eb8481e1a69c835dfd24fc2d7f4331420f54c23a07a32361635512b25cd283b32cc54c7978555f59e25a42408827f8603623e3acc65d9
@@ -48,4 +49,5 @@ EBUILD netbeans-php-9999_p20160417.ebuild 4418 SHA256 16396e5d8a89c0de7cf159e5f0
 EBUILD netbeans-php-9999_p20160418.ebuild 4418 SHA256 03969fd1475873de4da38e3461e67adc2ac67568c7ce6291b15776e1bb982098 SHA512 c80f7cb03d407c354c1af56f4d432c730128f4e446b6eba0bc3545ccf7602b5557a690b4863ff305d497e440c4ef424640e69097db918fd1f669266bd359ddd8 WHIRLPOOL f0a76a4a515d94e0d13295f78f29651075c768bac34c489b52924b5fb16e7bcc4550ce07acde565c107cea2b0be9353752613d90884b8463616fdb47e0b9af12
 EBUILD netbeans-php-9999_p20160419.ebuild 4418 SHA256 f5543f4c280c8d47c95429288438c374913a48a561412abc9135c815c3986ac4 SHA512 9a5ada58a2d255e1ae2ead1274a89e227ea8f5e0cc1d8597c9d40fbdfe135fe67f1431f87eac3ee31bc641e508bbf5585665184a632e46a1695ef9e1f23fa830 WHIRLPOOL e8874318132de2e445306a03aee46c8188fd94e2dd0a63d71d9927df913e12f0ceb064ab5b7f220a98e36eb08d668646c1281472f809113eee5eba1d85c306ac
 EBUILD netbeans-php-9999_p20160420.ebuild 4418 SHA256 c549efdcc23481e3895a226847afbf292ef4eb14f221c1041c399d74b31ee113 SHA512 9a80e799a24183385b5391855c38ad3add83c43465b6b5e4b8147fd8b5a1e14a0216a212eeda48c22161bd74ebb0fc0e1bfaa281cac38d9a87cabfc92a1d3f17 WHIRLPOOL 7d345ce6020a154bac2fced15bcab46beaaad61e06b08a548f1e6fec3f42b295bbb25b1b1bae16f519de5abc275372d9919bfb31ed1ba6ca88432ee7e68e523a
+EBUILD netbeans-php-9999_p20160421.ebuild 4418 SHA256 999d03254a8c1671cf4799c40de01e9e0b16d280ff52201cc0271d9e31963739 SHA512 7a568bdad819745e4f02acc3cb681b66f9a09b679a43fa59bb68de1135846c355431ed44f5310f7e182864cdda9c29b3889735e740f20ff2a68169afa322d592 WHIRLPOOL 5df4774cb3dccc2f17d55568a23f86cd5003ee5b3cd455570a9b06c85df261f21eda55fc7d7ca7b887abdd9b9222959ac75221ec3e0d622ddc52bc9ed1d14f4c
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160421.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160421.ebuild
new file mode 100644
index 0000000..e45109d
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20160421.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-04-21_00-01-48/zip/netbeans-trunk-nightly-201604210001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip
+	http://hg.netbeans.org/binaries/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-r16-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip php.phpdoc.documentation/external/phpdocdesc.zip || die
+	ln -s "${DISTDIR}"/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-r16-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.javacup/external javacup javacup.jar java-cup-11a.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-webcommon-${SLOT} webcommon || die
+	cat /usr/share/netbeans-webcommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.webcommon.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/php >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/php$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext
+	pushd "${instdir}" >/dev/null || die
+	rm java-cup-11a.jar && java-pkg_jar-from --into "${instdir}" javacup javacup.jar java-cup-11a.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/php
+}

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index ac8cfbb..e604e2f 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -50,6 +50,7 @@ DIST netbeans-trunk-nightly-201604170001-src.zip 213245562 SHA256 8d1da18eea0786
 DIST netbeans-trunk-nightly-201604180001-src.zip 213245562 SHA256 33e9976d15aa52ed61f53bebb87d8290a64d6e7658dc96b044136f47d46c28de SHA512 71252b57630390c901bed5fec7021d5f9255adf02c2e84c1e0981a2d729c1d0c1ed14b927b1dd36c9a72b30ced64ae6b74429e4990ddfac4bc36aff4c46e7e17 WHIRLPOOL af4f5d0f0c8f7caac85bc7ecab0fe91c68141abc9df5a0a28cc069262aa08f869d5934f5d4a546fdd997e29dc5d63ab0aefcce530560e8ed5b9bfab86b962105
 DIST netbeans-trunk-nightly-201604190001-src.zip 213247710 SHA256 2f4140e8d8ae7ea2e527d35f7ba1a75379b48659c67fca903a9ae2f5ab45652a SHA512 7d9e19583553738a793829ea2da5d57026ff17418b0a36da19cd344548a7d3a2bd0bc8dde0938ede14712806fca58ba17c5b86270eb674e1cbf6b1009f81b438 WHIRLPOOL 61910b59a2c03276bcab996b94635d0823bca717a0560e7b348df4e3dc30b926e7280fc828aa38c6d80b786ff559ece017456790cfde77c6f3e8598c30357bdc
 DIST netbeans-trunk-nightly-201604200001-src.zip 213312613 SHA256 e5dc1c1019f49460244a5d2a0c0117a0aee8bc37047fd93dc5780d6a4e374284 SHA512 5a796bee9472f30ffeebae8cfe7b3f7de02cdcda5754d5196be5fd0d577a668270c9a0cc212cc1528b2f4beb2b1f0162d951dbf0582774a7a09f87329aa26251 WHIRLPOOL 38f51d2261a92a965b160c608358e2e3d62dd623ab4ff909ddda420ef57d626c93f57dbd713ab7136b6e7781e54dc997e41b73d90a35cc25c6706de9a727cc02
+DIST netbeans-trunk-nightly-201604210001-src.zip 213315777 SHA256 e4a64f84f3ab854860e94f2d438779d38398f13860ac1e0eea0242b5ac308c72 SHA512 7cd20de630392d1d0fd1920a8e77ea06e20f92a6b40f5226c9f1de465797bc88c90e1cbafcdadc4e3c32e960c38fe6214430caa43e9d5211e807e61cb515a389 WHIRLPOOL bb99ddbee70d506e5c765e97efd9de3c497467720207ee0d8f7ff59785fdf8ab5a2f77d88d80ed1b8c3b6e16fd601a4e61644867de5c844c28f1163b565da87a
 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_p20160323.ebuild 9581 SHA256 730095d721f39328d68495a7f502926a74e84fa380fb77601a3262e6d92ea941 SHA512 8513599e2a2a702d1587f5e3d1029db274a097b5ee494864b99ecf77be56a178e7831a0d36220cd44f7403c705da59bc318d84687f5f137829bc9769d406655b WHIRLPOOL 7c4799c8bac08a30f1760e900a5fa11858481e240af05063f3af8c51ce7b23dbfaf5bfac74ee3a1ef6f5bbe9ef75e39f5553c66a7570ef877abc1739b70767ec
@@ -71,4 +72,5 @@ EBUILD netbeans-platform-9999_p20160417.ebuild 9520 SHA256 ffebba1aead76e8aae5fb
 EBUILD netbeans-platform-9999_p20160418.ebuild 9520 SHA256 f0db295d6e2b0aa0cf792bfe5fb25ed2762dca4faf32862a21714464fc47bdcc SHA512 d33a5b0a97fb9fb06b253c050e41699b2e32192a9fd39bdaaacaeb95d7564484e27992595f1621802326348f92ac3f5c7d38f5e9bb408482a634987f9d411770 WHIRLPOOL 8c12dff9fefdc9e2c4aa1e2ff309a1ae8d23c60d129dd867c23fdbd76a2b7a62b15a136bc79bd31f4327ef378ed7b4deaced77e1ba831e9c50d92a6dc14cb424
 EBUILD netbeans-platform-9999_p20160419.ebuild 9520 SHA256 ec745db31cfb3d65a7e374e800642a6f02dd9b23d3693b4790e7ce91aa72faf4 SHA512 c2d26726006c50530ee643790a2725ee5b3e05b007a34969143685c62373d0dc2857287fa9494e5a783bc9d466dce96949c90911530a5f05c62ab229de103922 WHIRLPOOL 32a9b57da17291185ada0238635340550954adddaa1f77d4213db91ba9679b09dce8dab5483f2faf02bf7001e5af6bc285a1589549ce0d8a14f93def4766270e
 EBUILD netbeans-platform-9999_p20160420.ebuild 9520 SHA256 0226bf8a7d1ae265025a1eabd67db36eb9ce68895a44725b7297f8a1b9f67b9c SHA512 a1d03dd2de9417d69f79502e6dc868fcb648a4a6c3149bd0317aaad784f0c22766a6d09e2602b1ff1bcab9c7176310effed8d01bd28974097ca23bc134d0cb4c WHIRLPOOL da7e6ca030cde3550735f8d68ea4b2ebb1201128d6e9e32cdbc00d6adee47fcd445d5b5bdff68206a370b0edf4592175d2830b412b51ed184f4a68b43f256efd
+EBUILD netbeans-platform-9999_p20160421.ebuild 9520 SHA256 750d8938f9ad6bb12b9a47f6395d37541977e5debd04b3fbfe788478d9b398ea SHA512 7b3f0e052d21b8cdd6cfc233dae7f95deffc4a26f4bcb3a26ee2acd77598ae31260452d4f9ea542e88432c50a6aef3a8f04bcb52185a1af3d3c8f45d1cad42a6 WHIRLPOOL 11c9c8517f9122fb9a2f83e2fe34c512c46134e5007d8ae571c03065abb18fa5b594bf903a0c0c82bca98840540faeed893523cc7d8c6f98b9e989e3bca74106
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 8eb6182..ee1f532 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201604170001-src.zip 213245562 SHA256 8d1da18eea0786
 DIST netbeans-trunk-nightly-201604180001-src.zip 213245562 SHA256 33e9976d15aa52ed61f53bebb87d8290a64d6e7658dc96b044136f47d46c28de SHA512 71252b57630390c901bed5fec7021d5f9255adf02c2e84c1e0981a2d729c1d0c1ed14b927b1dd36c9a72b30ced64ae6b74429e4990ddfac4bc36aff4c46e7e17 WHIRLPOOL af4f5d0f0c8f7caac85bc7ecab0fe91c68141abc9df5a0a28cc069262aa08f869d5934f5d4a546fdd997e29dc5d63ab0aefcce530560e8ed5b9bfab86b962105
 DIST netbeans-trunk-nightly-201604190001-src.zip 213247710 SHA256 2f4140e8d8ae7ea2e527d35f7ba1a75379b48659c67fca903a9ae2f5ab45652a SHA512 7d9e19583553738a793829ea2da5d57026ff17418b0a36da19cd344548a7d3a2bd0bc8dde0938ede14712806fca58ba17c5b86270eb674e1cbf6b1009f81b438 WHIRLPOOL 61910b59a2c03276bcab996b94635d0823bca717a0560e7b348df4e3dc30b926e7280fc828aa38c6d80b786ff559ece017456790cfde77c6f3e8598c30357bdc
 DIST netbeans-trunk-nightly-201604200001-src.zip 213312613 SHA256 e5dc1c1019f49460244a5d2a0c0117a0aee8bc37047fd93dc5780d6a4e374284 SHA512 5a796bee9472f30ffeebae8cfe7b3f7de02cdcda5754d5196be5fd0d577a668270c9a0cc212cc1528b2f4beb2b1f0162d951dbf0582774a7a09f87329aa26251 WHIRLPOOL 38f51d2261a92a965b160c608358e2e3d62dd623ab4ff909ddda420ef57d626c93f57dbd713ab7136b6e7781e54dc997e41b73d90a35cc25c6706de9a727cc02
+DIST netbeans-trunk-nightly-201604210001-src.zip 213315777 SHA256 e4a64f84f3ab854860e94f2d438779d38398f13860ac1e0eea0242b5ac308c72 SHA512 7cd20de630392d1d0fd1920a8e77ea06e20f92a6b40f5226c9f1de465797bc88c90e1cbafcdadc4e3c32e960c38fe6214430caa43e9d5211e807e61cb515a389 WHIRLPOOL bb99ddbee70d506e5c765e97efd9de3c497467720207ee0d8f7ff59785fdf8ab5a2f77d88d80ed1b8c3b6e16fd601a4e61644867de5c844c28f1163b565da87a
 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_p20160323.ebuild 3472 SHA256 c2de8a0f149e8d1a7c99e4b8e637ead8f11b71c54687e5ae8e9f572507e6c627 SHA512 f998d4f56921170e937ad9b888e891e87c182db5a726644ea382aa219e069b515f10c429d79e7cd358cfb69a937c416bee10c635372074b5e7cfe01e6da1faaa WHIRLPOOL e6c48f5a04bef7b83c99060c104c799397de85461539f8d158a78cbffee114950d498d7d412d47d1ccf493945b3d6691a0721e64c742312d45c1ae6a75202245
@@ -44,4 +45,5 @@ EBUILD netbeans-profiler-9999_p20160417.ebuild 3472 SHA256 54398576b7b55e124cc5f
 EBUILD netbeans-profiler-9999_p20160418.ebuild 3472 SHA256 fc88063db6929a34b0442170298f423b58e9c8320be90696091fe7929f3802d8 SHA512 3325b88e8a90ce451bc77301477bffc7fd929b2f688e74fca07eec4e97e08dce27c7199be54dbe1fb955351bf8e80296887e431721cf573d6298a5f0ecfd2fe3 WHIRLPOOL afd355430eba86570851b0601a5b09fa15332894bd99138606eb94b188c7b814dd8c7234b078ebc0a05632b751484826ba5ab5f6260af34a71d68d6fb442077e
 EBUILD netbeans-profiler-9999_p20160419.ebuild 3472 SHA256 93245f7f5d0c4a1e24dc8d6026c799f36922f50df55c5124279b692464cd9dc6 SHA512 4cbebf3df456617de2f28de15d22eafd4fa7257999c47b628174805569f4a17b6efcd3584644e8eadf0aa76a6ece5eaa6ed83fd6d107edc5a4a734ef73620c44 WHIRLPOOL 730b0155c761b362e9a5a8d00b0d018588f0a18fe11f16e08ad4243ed672c021d34ec202f2229d71d09a79a54f75575f222dada3fa2570dd8f755498befa3f51
 EBUILD netbeans-profiler-9999_p20160420.ebuild 3472 SHA256 86f6f53b1d05224963e22fd5a75f99f294ddc33b411c4160daab8e13a3035f40 SHA512 da1d6cb6f6af85daefcd73ab08ee290e69a34d65521d16aca4d2e070751d4dbc1c90e1d9e3bab1ffa8efdbed12bbf13e8401bb8b598d0c443fe34493124be15c WHIRLPOOL 9a79f3ece5f093d69387b4301a3fd92c24e226a40dc7a76658c26cafc19c0e27d671047c9e462036ee1a3db0e1e59849c3e46fc4724782acd8e705cc3e690fa6
+EBUILD netbeans-profiler-9999_p20160421.ebuild 3472 SHA256 652b3495839c5bd8b67d5c7a29e3ef9e89a87dc37da6ce36be2a8d1d2a9a6c57 SHA512 6936fa9de9565d41ab8cf6f8d99c34d5fb4e06da187b823791416605b2771212e9ce6642cca85e06a0c76aaea0ce4298d64a2ab3fb5e9efa68b9fd95b5932abb WHIRLPOOL 4846add31e512f92b839ae0fcda1c2e9b30745024add2217826dfab1dbca8c6e04c5d56e2af4a17ee92ba36e9958d546450a8d8fe1a974858deaa3debd1422e8
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index cfc78d0..c55ca38 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201604170001-src.zip 213245562 SHA256 8d1da18eea0786
 DIST netbeans-trunk-nightly-201604180001-src.zip 213245562 SHA256 33e9976d15aa52ed61f53bebb87d8290a64d6e7658dc96b044136f47d46c28de SHA512 71252b57630390c901bed5fec7021d5f9255adf02c2e84c1e0981a2d729c1d0c1ed14b927b1dd36c9a72b30ced64ae6b74429e4990ddfac4bc36aff4c46e7e17 WHIRLPOOL af4f5d0f0c8f7caac85bc7ecab0fe91c68141abc9df5a0a28cc069262aa08f869d5934f5d4a546fdd997e29dc5d63ab0aefcce530560e8ed5b9bfab86b962105
 DIST netbeans-trunk-nightly-201604190001-src.zip 213247710 SHA256 2f4140e8d8ae7ea2e527d35f7ba1a75379b48659c67fca903a9ae2f5ab45652a SHA512 7d9e19583553738a793829ea2da5d57026ff17418b0a36da19cd344548a7d3a2bd0bc8dde0938ede14712806fca58ba17c5b86270eb674e1cbf6b1009f81b438 WHIRLPOOL 61910b59a2c03276bcab996b94635d0823bca717a0560e7b348df4e3dc30b926e7280fc828aa38c6d80b786ff559ece017456790cfde77c6f3e8598c30357bdc
 DIST netbeans-trunk-nightly-201604200001-src.zip 213312613 SHA256 e5dc1c1019f49460244a5d2a0c0117a0aee8bc37047fd93dc5780d6a4e374284 SHA512 5a796bee9472f30ffeebae8cfe7b3f7de02cdcda5754d5196be5fd0d577a668270c9a0cc212cc1528b2f4beb2b1f0162d951dbf0582774a7a09f87329aa26251 WHIRLPOOL 38f51d2261a92a965b160c608358e2e3d62dd623ab4ff909ddda420ef57d626c93f57dbd713ab7136b6e7781e54dc997e41b73d90a35cc25c6706de9a727cc02
+DIST netbeans-trunk-nightly-201604210001-src.zip 213315777 SHA256 e4a64f84f3ab854860e94f2d438779d38398f13860ac1e0eea0242b5ac308c72 SHA512 7cd20de630392d1d0fd1920a8e77ea06e20f92a6b40f5226c9f1de465797bc88c90e1cbafcdadc4e3c32e960c38fe6214430caa43e9d5211e807e61cb515a389 WHIRLPOOL bb99ddbee70d506e5c765e97efd9de3c497467720207ee0d8f7ff59785fdf8ab5a2f77d88d80ed1b8c3b6e16fd601a4e61644867de5c844c28f1163b565da87a
 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_p20160323.ebuild 5244 SHA256 f5303885a1987ffaae129cc10e43eaefd6c7e70ff139282a9eb9e86e24b28985 SHA512 aa5b7b80a499943507d6c415b505c9b02881dbabe45947d84f5400c6d9330d9fa43e15bd135055339349e5a84d93f105335ce8e7a380f7b0bd794bd7f09ddda5 WHIRLPOOL 75a4ffd50ae4cf02d298b04f05d1a1726639e9591f1a3ba16e1ebef187373dd792795b1ab69fbe5c62679f0e3f2fda1a92c79f0a9bfb8988c496a61afa6de026
@@ -59,4 +60,5 @@ EBUILD netbeans-webcommon-9999_p20160417.ebuild 5343 SHA256 9ee3864c697cb0cd16ed
 EBUILD netbeans-webcommon-9999_p20160418.ebuild 5343 SHA256 d7a215ea9abe29e024a1b0a67674a52f4e3f035698f3e966c5d6040ee2fc3f94 SHA512 88a197870e27a1dc275d3b434b546ef1e71d47b3aad2b2555b440932f467d5b70668f76a25850db2bb5ee0398b942b9525597023d38b827bcb7a0a039155f7d5 WHIRLPOOL 141c0e4484d23d11c828b96a3690f27884868fe05439751ac1fc6e7cb00455f6f870594ab337e8f133baf541b9dec0dd403bef677c4ef949a6d72cb067d1112b
 EBUILD netbeans-webcommon-9999_p20160419.ebuild 5343 SHA256 21a2789ef4ee952ebde10c3a8894446ec50cafbefd925320f1dcc19074a2e830 SHA512 d24dde25713acd2b154f36295207d3b3c65eb619d29eff3d6bd4a81d06100338e37ca09ae80b4288127b5c95bceeb3651c24b9e02cbac17705275a50e19a1a32 WHIRLPOOL 1677411e57b1e46c179e03fbfd44fb34b9dfdfdaef16f3ab4354e3c55085b1b526bb759d65c689696c29733f8011748839616cd34e8519fcb0f67044df1d3f14
 EBUILD netbeans-webcommon-9999_p20160420.ebuild 5343 SHA256 89041853c71ff725da96f0f6a1e0077a4200653fddb999d2357e7616d33113cb SHA512 3bb6854dd40b2c6e5830fe95b2b97ea9bcfbb1c810310ac079cb1e2fa10c7a43bef295fbb23eb1498cf892f2380ad827447a6acfbd06995f7b7b388d24d75c06 WHIRLPOOL 25c42b2346a5ec03d18e068d60c2de819fa7864d57034fd94777c0f52d8ac71e1ee6dfff3d6eb59ee17c92528e93d8da80388af6a0c53b447e0fc7920de75eb6
+EBUILD netbeans-webcommon-9999_p20160421.ebuild 5343 SHA256 d9b11a4d0686414bff4273466ae8d407f76131c38cefcae87acd624e8b950e91 SHA512 e1b6a277bba39821db479225a69562850b2e82d06d8e1cb08da4881c344cf9a5c22bcc8b859283e2286c34a42244b40ee1d97e1612760d6b16d139c280eec2b5 WHIRLPOOL bfa63d8bc13499259ac0c0bfc52a5d814ae4440e5d1be9225ffd396a223cbf758303f07e8aec44fbe48d9014a597421223a445440e80e3c349c913f34705e669
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160421.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160421.ebuild
new file mode 100644
index 0000000..afbd4ad
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160421.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 Web Services Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-04-21_00-01-48/zip/netbeans-trunk-nightly-201604210001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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
+	dev-java/jna:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.webcommon -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r16-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/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-r16-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.jna/external jna jna.jar jna-4.2.2.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/webcommon >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+	grep -E "/webcommon$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/webcommon
+}

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index df88f77..cab8a35 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201604170001-src.zip 213245562 SHA256 8d1da18eea0786
 DIST netbeans-trunk-nightly-201604180001-src.zip 213245562 SHA256 33e9976d15aa52ed61f53bebb87d8290a64d6e7658dc96b044136f47d46c28de SHA512 71252b57630390c901bed5fec7021d5f9255adf02c2e84c1e0981a2d729c1d0c1ed14b927b1dd36c9a72b30ced64ae6b74429e4990ddfac4bc36aff4c46e7e17 WHIRLPOOL af4f5d0f0c8f7caac85bc7ecab0fe91c68141abc9df5a0a28cc069262aa08f869d5934f5d4a546fdd997e29dc5d63ab0aefcce530560e8ed5b9bfab86b962105
 DIST netbeans-trunk-nightly-201604190001-src.zip 213247710 SHA256 2f4140e8d8ae7ea2e527d35f7ba1a75379b48659c67fca903a9ae2f5ab45652a SHA512 7d9e19583553738a793829ea2da5d57026ff17418b0a36da19cd344548a7d3a2bd0bc8dde0938ede14712806fca58ba17c5b86270eb674e1cbf6b1009f81b438 WHIRLPOOL 61910b59a2c03276bcab996b94635d0823bca717a0560e7b348df4e3dc30b926e7280fc828aa38c6d80b786ff559ece017456790cfde77c6f3e8598c30357bdc
 DIST netbeans-trunk-nightly-201604200001-src.zip 213312613 SHA256 e5dc1c1019f49460244a5d2a0c0117a0aee8bc37047fd93dc5780d6a4e374284 SHA512 5a796bee9472f30ffeebae8cfe7b3f7de02cdcda5754d5196be5fd0d577a668270c9a0cc212cc1528b2f4beb2b1f0162d951dbf0582774a7a09f87329aa26251 WHIRLPOOL 38f51d2261a92a965b160c608358e2e3d62dd623ab4ff909ddda420ef57d626c93f57dbd713ab7136b6e7781e54dc997e41b73d90a35cc25c6706de9a727cc02
+DIST netbeans-trunk-nightly-201604210001-src.zip 213315777 SHA256 e4a64f84f3ab854860e94f2d438779d38398f13860ac1e0eea0242b5ac308c72 SHA512 7cd20de630392d1d0fd1920a8e77ea06e20f92a6b40f5226c9f1de465797bc88c90e1cbafcdadc4e3c32e960c38fe6214430caa43e9d5211e807e61cb515a389 WHIRLPOOL bb99ddbee70d506e5c765e97efd9de3c497467720207ee0d8f7ff59785fdf8ab5a2f77d88d80ed1b8c3b6e16fd601a4e61644867de5c844c28f1163b565da87a
 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_p20160323.ebuild 2721 SHA256 711867c40a107ccc31f760f1bb5cd3957463dacf73941f56a6b1f0ae6f51dc63 SHA512 4928f51238e92f1ef03b72e91b5af73712c6afe2e10482bfe201d5d66a10d3602b12f4ebbf573a24c6bb3fbb4cf1d07c008b54c86b53738267d7f75070d83843 WHIRLPOOL 06ebddd26c8cfb1ae6bee59553c2e5e9d122a2df58b61e9380eb4dc982cd0661a24d27dd96decf56efe5f0d0c71d072f9fb912902471129b49a40bf3025b38d0
@@ -44,4 +45,5 @@ EBUILD netbeans-websvccommon-9999_p20160417.ebuild 2721 SHA256 a2092848b2bf41fb2
 EBUILD netbeans-websvccommon-9999_p20160418.ebuild 2721 SHA256 cd5ff5bbacfaadcc0c7e5e07c7d6487132fdd2f5fa1b820713a05144c4e7bfcd SHA512 05b162645511dfda25154fa20ddd3f4e9e52a30af32e0806eaa8a030da5969c4da21de8459d5a4cceee83c4489be5dbbe3b292b36af54f8aefa1a56a6698dfab WHIRLPOOL 6cd71499fa5e0ab1c7c21191fa1127ce21f45c10d93f40a78b51fde01bf69f811ac2e4f50611d04e33e8a69933a9b206a0a17c7d99461efa3fe1b28271e7b036
 EBUILD netbeans-websvccommon-9999_p20160419.ebuild 2721 SHA256 a2075b802132caa8dfe953a1f83c49e2d221321b7f59795beb0b83ac763e294d SHA512 786cafe147026906468ad1be59d0e16255a9a59741977cf4a35fd45d1c6412db0cea595d36b30097aa951ad64acc0dacf78f2ca1c3e8360908052a9cc8d21030 WHIRLPOOL 327df93ab0e0063df1f0e6dc2036fe810977cd3a7e81247b190661df0efd99ad5b29a07b1f9becfc877bdbb33821e60db2eaf49550d764b5f8e2843379bd4e3a
 EBUILD netbeans-websvccommon-9999_p20160420.ebuild 2721 SHA256 5543fd00c8197acd1ecc53e663c7922dedc28be51f77fee4f2a501e43c367448 SHA512 44bb478bff093710aaab2f47140193dd2d7717849b0f4938a457d7cd44c46d9f0a9d50db8d0422d70724c572d4507d1100f8587c9718377f4d3e5f58cc61e77f WHIRLPOOL 0691a1795426c372241e4e8a7cdd07c37d006e3fd6edad289733c79d048bc3079a357ded8871ce71755c317d30612fd012581257c999f7e623530c12e0604ae8
+EBUILD netbeans-websvccommon-9999_p20160421.ebuild 2721 SHA256 44cf1ab2f64aa08dbcfa383e46bde2c7cc9f74df9470d056646a6413102bb606 SHA512 9a7de62d69d5b79a7efae9cd9d8e0532c878851bed3b585b379c61519ddfb6c6c82aa08a3690f1e42ceee9e3cb401eca48a2194ebc9900facaa7cd51a17cb34f WHIRLPOOL f11096236b46cc73b5558a842d0235d003f9d6a5eaaa8b0d051104388a3deaf9210b0d9d1aa35a2b18b7811f6e6e9bb619305f0569e6258fe5446f737882dbfd
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index fb81f74..f8edd09 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201604170001-src.zip 213245562 SHA256 8d1da18eea0786
 DIST netbeans-trunk-nightly-201604180001-src.zip 213245562 SHA256 33e9976d15aa52ed61f53bebb87d8290a64d6e7658dc96b044136f47d46c28de SHA512 71252b57630390c901bed5fec7021d5f9255adf02c2e84c1e0981a2d729c1d0c1ed14b927b1dd36c9a72b30ced64ae6b74429e4990ddfac4bc36aff4c46e7e17 WHIRLPOOL af4f5d0f0c8f7caac85bc7ecab0fe91c68141abc9df5a0a28cc069262aa08f869d5934f5d4a546fdd997e29dc5d63ab0aefcce530560e8ed5b9bfab86b962105
 DIST netbeans-trunk-nightly-201604190001-src.zip 213247710 SHA256 2f4140e8d8ae7ea2e527d35f7ba1a75379b48659c67fca903a9ae2f5ab45652a SHA512 7d9e19583553738a793829ea2da5d57026ff17418b0a36da19cd344548a7d3a2bd0bc8dde0938ede14712806fca58ba17c5b86270eb674e1cbf6b1009f81b438 WHIRLPOOL 61910b59a2c03276bcab996b94635d0823bca717a0560e7b348df4e3dc30b926e7280fc828aa38c6d80b786ff559ece017456790cfde77c6f3e8598c30357bdc
 DIST netbeans-trunk-nightly-201604200001-src.zip 213312613 SHA256 e5dc1c1019f49460244a5d2a0c0117a0aee8bc37047fd93dc5780d6a4e374284 SHA512 5a796bee9472f30ffeebae8cfe7b3f7de02cdcda5754d5196be5fd0d577a668270c9a0cc212cc1528b2f4beb2b1f0162d951dbf0582774a7a09f87329aa26251 WHIRLPOOL 38f51d2261a92a965b160c608358e2e3d62dd623ab4ff909ddda420ef57d626c93f57dbd713ab7136b6e7781e54dc997e41b73d90a35cc25c6706de9a727cc02
+DIST netbeans-trunk-nightly-201604210001-src.zip 213315777 SHA256 e4a64f84f3ab854860e94f2d438779d38398f13860ac1e0eea0242b5ac308c72 SHA512 7cd20de630392d1d0fd1920a8e77ea06e20f92a6b40f5226c9f1de465797bc88c90e1cbafcdadc4e3c32e960c38fe6214430caa43e9d5211e807e61cb515a389 WHIRLPOOL bb99ddbee70d506e5c765e97efd9de3c497467720207ee0d8f7ff59785fdf8ab5a2f77d88d80ed1b8c3b6e16fd601a4e61644867de5c844c28f1163b565da87a
 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_p20160323.ebuild 6939 SHA256 2058f071a7fc4ac7bcaaad80217741227698a3567c1f16221d44841e91ef6c95 SHA512 aeb4f33680687e96fceccc9d720d473f987b952a331e311bbd088bb1810bd4d3a2498f2ca1722ac0e3ec900faa7b8add4aaa68ea4fe803e61be8deb4d6692e36 WHIRLPOOL 880154f5145d6a7d6d0c8ca1b6071e14c038101b37fa9c7ed785c3afc0c9edde2cf1496181b3424035d1bb957dfe8598435d8cf1a41e6dcba4bb63d933f24a9f
@@ -47,4 +48,5 @@ EBUILD netbeans-9999_p20160417.ebuild 6939 SHA256 1ff713ec7a2f1d42f17325e029e5f5
 EBUILD netbeans-9999_p20160418.ebuild 6939 SHA256 18b5deca587d50422faf08b0d63ea0a56198831eff26a7ce5a7bd638eebc5f5c SHA512 e45680bc1316b2141a665868b0b4f59f10aa59ee2f12b05794022ad1c43e71fc8e5fd642ff5090ce1bfc405c3ed8910e3628cfb354d98b582f2776acf206b839 WHIRLPOOL aadf4aa3e6214013c9f8b9da059ba1866abe43856c4208abe0af014c1a8534d21c091795dcfb25ceacdcfea174ffc0d593d2f1ee704bb1db9ab7b57b102e0e65
 EBUILD netbeans-9999_p20160419.ebuild 6939 SHA256 a62e02df95641ed8caa73fc0e0d0adbb0554cf35e128b4c7948e5f4c359a4b0d SHA512 80a8c7e852437e602a40812f1c8620123dd09deccb9e8b0617cd47a056b35fdc6912f73fbd897a11344a8981a391b09f0ebee5f1a671e0eaf36c113cd625bba2 WHIRLPOOL 42c9e9dea98286dd4092f4df8ebe0010c561374000cebdab553104affc8ee02b521193fcf05131f7d0d3f8c6da94a1df61b827b9c8d82fbbe97ed16512378217
 EBUILD netbeans-9999_p20160420.ebuild 6939 SHA256 f71cd54d8507f8394880416446672f15407f5e5faa9ecb0d3a38336bdc5fa982 SHA512 600fdb466e6b836b5f21e30825d8cbcdd0baabc2a26f3786b9c548b85cb87f339faad934ccc0920a8fa13fc5775b44f790b512e7413af7c486a0cb9b02fd2fd2 WHIRLPOOL a4773228630832d42ba91ea101b390202f64d13e3d104328f287d3ce7fe866dae96f16732d414a1a8900da57074f7b18737072ca363c6bd6d908701c7b487c5f
+EBUILD netbeans-9999_p20160421.ebuild 6939 SHA256 3bae68e0a0bbf9ef8c3a50f0d58a02408f695a409f8adade818e25e66df2424f SHA512 2adc03956756e714a46107650fb068458605ca48c5c588a3a87d942f774ebc40f836b2aad9e99459d0c6a3d9d49fc0dfa302ec022df453e0d44f29cb36ef2820 WHIRLPOOL 6e744263c22604c88691dcb8d022c5faf45a7864ff5cfa48ab9b094340d09c1e6edbccb81c42f492012b22e8d296a3cb08c258966091ef19fcec40d9b04d8d61
 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834

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


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

end of thread, other threads:[~2016-04-21  8:13 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-29 10:38 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-php/, dev-java/netbeans-harness/, Miroslav Šulc
  -- strict thread matches above, loose matches on Subject: below --
2016-04-21  8:13 Miroslav Šulc

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