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

commit:     5fdee8698e584689ce532f309eeb1fdde1f408bd
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  3 10:43:35 2014 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Nov  3 10:43:35 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/fordfrog.git;a=commit;h=5fdee869

netbeans: bumped to the latest sources

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

diff --git a/dev-java/netbeans-apisupport/ChangeLog b/dev-java/netbeans-apisupport/ChangeLog
index 3c7ead1..ac3ad7e 100644
--- a/dev-java/netbeans-apisupport/ChangeLog
+++ b/dev-java/netbeans-apisupport/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-apisupport-9999_p20141103 (03 Nov 2014)
+
+  03 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-apisupport-9999_p20141103.ebuild:
+  bumped to the latest sources
+
 *netbeans-apisupport-9999_p20141031 (31 Oct 2014)
 
   31 Oct 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index b9ac368..609e312 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201410170001-src.zip 197610191 SHA256 ece01ea8e2f656
 DIST netbeans-trunk-nightly-201410190001-src.zip 198848484 SHA256 239ac089ce10c7f9bb528c7885a1096edf90c34a449e0954123015da764964e4 SHA512 b6d330d6d7a82662b73c410877ce049e6a9258a3310383e515a4cfeb8597ea5c72b2adcb650a131b7a2dcda5d1260b4d927120cc6f4dfd667e6ec14e71c27daa WHIRLPOOL 48c59a25b584360cafb366df0fdb1acaf46612dc0a204b91841d0d9493b3b34056485005ad23db8ae05ae44c2d68798b603f68ce87e7012b2e63211db3fe3e8d
 DIST netbeans-trunk-nightly-201410300002-src.zip 198898097 SHA256 a8617a69f201a25d4bf0f78226885e73a6fedcd5c8620f115573fda6d617b444 SHA512 8c7c70c04260cda6225b6246e756ea285dd60f88490ff29b2f13195103f5fd3589a8ea0b30436a126a33663c5b25b1d7a7e2713804bb7fb23b2033038c229c08 WHIRLPOOL 61c3ceea8c2ba7d8f55515495b6cb47473d55b7a35c84632fd34edb34fe8c94393dc0b08252196d9132290db974aa03e15b897c0d8a9397bfdc957fa64ca9219
 DIST netbeans-trunk-nightly-201410310002-src.zip 198916747 SHA256 4f200798d8c10985c1e5fa7c9e523564808e508a3f19737a3effa9aef7d8808e SHA512 e7aae2121699e1d8b19df3406c1eae8e1573a64b11ecfae2c110df895ceaf114585643e064b781896f6956747169265aecd317018eef324f3ba2d3571020c76d WHIRLPOOL 8ef1ebedc044af25a3219c24d38e677ffd89ffb91cfb0d017373d60c3c1c3d27ee0065c6ea68b003fb8ef28a3b7c6c7e64a110e1f670f989f1a038efbef406a0
+DIST netbeans-trunk-nightly-201411030002-src.zip 198928747 SHA256 4101f4b4ca15f57435d9973d7ca3e1d742744515af454add071132034944df53 SHA512 890d8331fbe66022c65ce2aa71af4c88f23a75d101a90f0c0f63b3bf63307abcf47362064d685ecb26ae27405fcbb5e051ca798151505717f5d43d7f4adb37f5 WHIRLPOOL fa908bb07de1375432cbb2cb4cc9ba669e8042bb2e4b29b4a2ba95e994fac7043a9883df7f046a3928b8f4774ae82272855e73e644b58c5782f8afd27006ef1f
 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
@@ -53,5 +54,6 @@ EBUILD netbeans-apisupport-9999_p20141017.ebuild 3390 SHA256 ab3b8cb7f02999208ac
 EBUILD netbeans-apisupport-9999_p20141019.ebuild 3390 SHA256 1b010429b1c8c29bbdec05f8364ffe5378f151f3bc7c5becf032847333c64b47 SHA512 808ecf9520c942e92202c6416528fe5417bb634eaed8683466f72f12e9c61216be41aaf10123078f170575c51e3b5c82512867861ae8f716b6975aca052b0b8b WHIRLPOOL b0a2f7ad8352c2fe766e6c0ceec76a5d6d3382e5b4b92277fbb66e9e2f0f46440a2afac367bda404078aaa69f4083b192020c9bf9cdfca171b192d6108f82011
 EBUILD netbeans-apisupport-9999_p20141030.ebuild 3390 SHA256 b0a6dd95928e6dcb0c6b736eb1bbb1ba20d62e82af6fed137ff0eadcbf6bc9ed SHA512 fcd191af5e1d112c016bff801e3ba7e2f276badc03422aa36e49ec4a4ac7ab48e4ad138acca742f19a2c37a39d9cf061a1363e73bd5a967a33f4862f708f96f0 WHIRLPOOL 5062bb833aa81ead349d9d31712c77c6e2e59482d961e7a148d6e03e5501ea5826514f6da63845e91736e21a9a5572ed24cc82a662fd1626ecd22b4f079fd1fa
 EBUILD netbeans-apisupport-9999_p20141031.ebuild 3390 SHA256 8de6345e8143d29611c866b585341cb890e3a0a772e0c5ae0b46bb959e11a21c SHA512 2a8213c271f65ccf69fddcf2e2c584b01a266fa4b1f091a15fd9e16187381f7ca404e59c6d057bbc8a046a86132e3c0d752c0e6553f04b5072c70f0360b23b01 WHIRLPOOL 37ba4a1a7db9305a0e985b757af1b8fa41b86464a9b2b2900b1b7a376f8c040f5d736b4033c92e446404b9b515d280fad2ce2350b8820fdb849d81258e0f5733
-MISC ChangeLog 139318 SHA256 8329ca70383e23a633669f6571072dcbdd0e59fd05392b0c7d864bb3662d7965 SHA512 99ac1c6390482652545f258afb1edd350f165a165eeccfeae4f791fa24119a6b4c8cacc37315d7399ccd55620c68209717326175cb839763f410bc481a9b887e WHIRLPOOL 017064fb923938f8553ba12bdefec9c6561c090a75efa45721726438c324df042f8fc95a681ee6988a80f327bc3974a3da1001188fc47ac15e7e0fdaa34eb8ea
+EBUILD netbeans-apisupport-9999_p20141103.ebuild 3390 SHA256 7f89ec8b8a156b10b3b061fee2766034dfdfcbaec11d1970056c376b4e5c3d3e SHA512 71de62aa10467b594639cff2ddd9e0fc8175097c7f95c11f57b8e7f1588c957ff871ebd94a3457d1b6c71926102ab09128197e593c77d3206e314f4106971bae WHIRLPOOL 131f1ab47390eaadde2efb6958077d7619d88368f3472485d803b6bcaa8f6b9e1b26185f6ae643c30368a1ab35b0f81181afaf56bf6398580234a922469104ae
+MISC ChangeLog 139499 SHA256 2af8712c0b47c2927fde33c6082417263ceda40c52bd1160e6f95d3bda252726 SHA512 f6ad2feef7e774cacfac3075e768ea7c4804a0ff4ef9eaa8914e6907c553c15a76e282b06ecc23450bbe827aef722f2a053e3f2ede4d38561ed50cdd515b0b34 WHIRLPOOL f0024d6218bfdc2604c709a284a8ad892aea234021e026bafd8b40f5c306f0f8aef9fb302927026398aabb75be11132bb12c58049f167cddc726b66c6abe5c1e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20141103.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20141103.ebuild
new file mode 100644
index 0000000..ce1e971
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20141103.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2014 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/2014-11-03_00-02-02/zip/netbeans-trunk-nightly-201411030002-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 505be8c..3f3b2b2 100644
--- a/dev-java/netbeans-cnd/ChangeLog
+++ b/dev-java/netbeans-cnd/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-cnd-9999_p20141103 (03 Nov 2014)
+
+  03 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-cnd-9999_p20141103.ebuild:
+  bumped to the latest sources
+
 *netbeans-cnd-9999_p20141031 (31 Oct 2014)
 
   31 Oct 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index 71a5786..fca60a7 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -42,6 +42,7 @@ DIST netbeans-trunk-nightly-201410170001-src.zip 197610191 SHA256 ece01ea8e2f656
 DIST netbeans-trunk-nightly-201410190001-src.zip 198848484 SHA256 239ac089ce10c7f9bb528c7885a1096edf90c34a449e0954123015da764964e4 SHA512 b6d330d6d7a82662b73c410877ce049e6a9258a3310383e515a4cfeb8597ea5c72b2adcb650a131b7a2dcda5d1260b4d927120cc6f4dfd667e6ec14e71c27daa WHIRLPOOL 48c59a25b584360cafb366df0fdb1acaf46612dc0a204b91841d0d9493b3b34056485005ad23db8ae05ae44c2d68798b603f68ce87e7012b2e63211db3fe3e8d
 DIST netbeans-trunk-nightly-201410300002-src.zip 198898097 SHA256 a8617a69f201a25d4bf0f78226885e73a6fedcd5c8620f115573fda6d617b444 SHA512 8c7c70c04260cda6225b6246e756ea285dd60f88490ff29b2f13195103f5fd3589a8ea0b30436a126a33663c5b25b1d7a7e2713804bb7fb23b2033038c229c08 WHIRLPOOL 61c3ceea8c2ba7d8f55515495b6cb47473d55b7a35c84632fd34edb34fe8c94393dc0b08252196d9132290db974aa03e15b897c0d8a9397bfdc957fa64ca9219
 DIST netbeans-trunk-nightly-201410310002-src.zip 198916747 SHA256 4f200798d8c10985c1e5fa7c9e523564808e508a3f19737a3effa9aef7d8808e SHA512 e7aae2121699e1d8b19df3406c1eae8e1573a64b11ecfae2c110df895ceaf114585643e064b781896f6956747169265aecd317018eef324f3ba2d3571020c76d WHIRLPOOL 8ef1ebedc044af25a3219c24d38e677ffd89ffb91cfb0d017373d60c3c1c3d27ee0065c6ea68b003fb8ef28a3b7c6c7e64a110e1f670f989f1a038efbef406a0
+DIST netbeans-trunk-nightly-201411030002-src.zip 198928747 SHA256 4101f4b4ca15f57435d9973d7ca3e1d742744515af454add071132034944df53 SHA512 890d8331fbe66022c65ce2aa71af4c88f23a75d101a90f0c0f63b3bf63307abcf47362064d685ecb26ae27405fcbb5e051ca798151505717f5d43d7f4adb37f5 WHIRLPOOL fa908bb07de1375432cbb2cb4cc9ba669e8042bb2e4b29b4a2ba95e994fac7043a9883df7f046a3928b8f4774ae82272855e73e644b58c5782f8afd27006ef1f
 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
@@ -66,5 +67,6 @@ EBUILD netbeans-cnd-9999_p20141017.ebuild 4586 SHA256 51872f2c58419ec353ce582e8f
 EBUILD netbeans-cnd-9999_p20141019.ebuild 4586 SHA256 4f6340a6db3c56b1ac60ee5880f19136c0e96c19b27574a6cf5470151ccf378d SHA512 a2228cf822bc2737de4d3833fadd7ce6c7891a58043a48fd69a9e487413d6499ae2ac65ed727e88b939074cb9cd4f36bc4aeb7970de9efcbb078ed780dc26616 WHIRLPOOL 39bca396d84ccbf1057b15e186a63eb2354433a3eb83fe031d0415836a01011e755167001e78b8b1486df14e80b34f850ca7a5cd5dbd8f242d801604709198e3
 EBUILD netbeans-cnd-9999_p20141030.ebuild 4586 SHA256 001d61d8ea0ccf67bb65479d5d475283d19d7b92f752f79227f7325ae38cd59a SHA512 5423585b09e2b8c22351cb278e2a33fb06caa23be1d8dfbb01e8cbdee342969e4a76dfa05ca4f9fe0fae292d42a0237cad04fc8fd1dec8da861b51243ed4e009 WHIRLPOOL 9bdb210e43b7c5d94de2dd58461cb735dd3d2bc3ee5c660c1fea03b28c10f95dad09440037cf8937eb0cc7d6a0f52a29c43fe40255f6f885a63d1d8d8df73cad
 EBUILD netbeans-cnd-9999_p20141031.ebuild 4586 SHA256 ca6c20874a20dace78f7cbda14b1ca5811b879cec4dd9c97a5b3ebe74aff85a5 SHA512 81847157d6a6c33231c3e55cc10bbef1878043f79d09881769e0933adae80514ec6881e1fb46b0a3abdb5ba76441e05f63b91ac1c7bc61d49453956af600d372 WHIRLPOOL d64d0e4b5b04ecd67d30e8d3bc5371257c44d4164d5bb9c61a09d454d2e136461b5bc8abc49289a4441154d475240c26f1fc353e77427cf3657ee38fb93b93dc
-MISC ChangeLog 127365 SHA256 aa09ced59242a0ebd84db39e29ee37bb2b7b2e0fb4caad29a80fa5b427be6c41 SHA512 2ab788fc71a1aaf34954632a9d1585ff6053b60c6edfe5a94b0cbe8c9e6e7d07dc6c29ac0bcb674054b9b6b5194747fca1ba5712a82eb5ab1ca06e6313452184 WHIRLPOOL d0cfc6b1113b0551cb40f6d419a679ee0944bf70a45fac721202ce740b29f7015639853a5c604d395a186810266c0d9c6d543995ac37fc665dd767a62a520d03
+EBUILD netbeans-cnd-9999_p20141103.ebuild 4586 SHA256 160c14ef6ffc7eb128de6307c7837738473988fe14ac2c39f679a196c54a00b8 SHA512 3f3054afbd9ea353c4c2ce80360795529c8d1db744bb4090f249319c8bc1ab4629509bc9332392a7ca779f48f33b42f7b33453d80d26748f10103fd8f7d96c1e WHIRLPOOL dd8aad1cc3d3c3f561a184833aa14e09d60e5195cf6df7db979a47f10fe2e30d005cb5a25a7b58541a5bd72ff2aab1c390fa4b39b9133f1588ef97b0c4801adf
+MISC ChangeLog 127532 SHA256 aa03a949f3bc28f4fb9941d10f07e164ae953449a2c041ded04ff0b7768b23a3 SHA512 e5f5f610f6c5c8e1eb3e90f8f076a28a6bb4d937448e39758a5c9dd389164a5ca809e63f870c446f37d33723d28e2766f9b217d2203d3a0f841a450839f5eaaf WHIRLPOOL c126433696c511beab25c5d0c77a48a8fd1cf718764009e21d720a42265de91992f9a5d556530dd8716984f4ab4d820a0e7937a78cd6de79c0195c51fa492073
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-dlight/ChangeLog b/dev-java/netbeans-dlight/ChangeLog
index db87afc..177ca00 100644
--- a/dev-java/netbeans-dlight/ChangeLog
+++ b/dev-java/netbeans-dlight/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-dlight-9999_p20141103 (03 Nov 2014)
+
+  03 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-dlight-9999_p20141103.ebuild:
+  bumped to the latest sources
+
 *netbeans-dlight-9999_p20141031 (31 Oct 2014)
 
   31 Oct 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 8615a54..09d6d63 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201410170001-src.zip 197610191 SHA256 ece01ea8e2f656
 DIST netbeans-trunk-nightly-201410190001-src.zip 198848484 SHA256 239ac089ce10c7f9bb528c7885a1096edf90c34a449e0954123015da764964e4 SHA512 b6d330d6d7a82662b73c410877ce049e6a9258a3310383e515a4cfeb8597ea5c72b2adcb650a131b7a2dcda5d1260b4d927120cc6f4dfd667e6ec14e71c27daa WHIRLPOOL 48c59a25b584360cafb366df0fdb1acaf46612dc0a204b91841d0d9493b3b34056485005ad23db8ae05ae44c2d68798b603f68ce87e7012b2e63211db3fe3e8d
 DIST netbeans-trunk-nightly-201410300002-src.zip 198898097 SHA256 a8617a69f201a25d4bf0f78226885e73a6fedcd5c8620f115573fda6d617b444 SHA512 8c7c70c04260cda6225b6246e756ea285dd60f88490ff29b2f13195103f5fd3589a8ea0b30436a126a33663c5b25b1d7a7e2713804bb7fb23b2033038c229c08 WHIRLPOOL 61c3ceea8c2ba7d8f55515495b6cb47473d55b7a35c84632fd34edb34fe8c94393dc0b08252196d9132290db974aa03e15b897c0d8a9397bfdc957fa64ca9219
 DIST netbeans-trunk-nightly-201410310002-src.zip 198916747 SHA256 4f200798d8c10985c1e5fa7c9e523564808e508a3f19737a3effa9aef7d8808e SHA512 e7aae2121699e1d8b19df3406c1eae8e1573a64b11ecfae2c110df895ceaf114585643e064b781896f6956747169265aecd317018eef324f3ba2d3571020c76d WHIRLPOOL 8ef1ebedc044af25a3219c24d38e677ffd89ffb91cfb0d017373d60c3c1c3d27ee0065c6ea68b003fb8ef28a3b7c6c7e64a110e1f670f989f1a038efbef406a0
+DIST netbeans-trunk-nightly-201411030002-src.zip 198928747 SHA256 4101f4b4ca15f57435d9973d7ca3e1d742744515af454add071132034944df53 SHA512 890d8331fbe66022c65ce2aa71af4c88f23a75d101a90f0c0f63b3bf63307abcf47362064d685ecb26ae27405fcbb5e051ca798151505717f5d43d7f4adb37f5 WHIRLPOOL fa908bb07de1375432cbb2cb4cc9ba669e8042bb2e4b29b4a2ba95e994fac7043a9883df7f046a3928b8f4774ae82272855e73e644b58c5782f8afd27006ef1f
 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
@@ -58,5 +59,6 @@ EBUILD netbeans-dlight-9999_p20141017.ebuild 2995 SHA256 1e76c000650e47299c55ccf
 EBUILD netbeans-dlight-9999_p20141019.ebuild 2995 SHA256 037d0a709d54e79dede7e10b3747859296c366170693aa0c29cc9bf818b64ec8 SHA512 fae69f7a42001ad0717315245963af02b68b7253c42b81db91c0323c24404e5c9364b5077dd1c55160e541d96115373abfcdca6132ab569e52ea3cef4048f28f WHIRLPOOL 53b359982792dc2c43223ac5685f8a79ccc34c5546061a759c6a498a63db828ab2e87c8f10e987f1689c84c28470b3e3c1b08e5015e7a54f2dadf0a770edef97
 EBUILD netbeans-dlight-9999_p20141030.ebuild 2995 SHA256 9221974ba1679f8970d3588c3ef991825d8e6b348751c31732dfdea193ab348f SHA512 f336c08e2436c46670f5edf22b25e9bbe4f03045766e29ad5997dea55a1ca8f7fe4b8d704790fb4a776a612a7397159dc9d100cad1a7404837c74147318a5887 WHIRLPOOL 549da3988a0748121a7842ec70651e04fb91e95214e17a774b26ea157c2d84bd10fcaaba4570ffc7f72e2fc461098aaf5bbc608761d3b488cc4faad2fb3265f4
 EBUILD netbeans-dlight-9999_p20141031.ebuild 2995 SHA256 95862d61936c5ac39e48c50f0ca289df4a0766a92aa35a2bbe148a4b98028548 SHA512 6ad2756e8d85ef6059fafc05956a77bd2cd2914d84ba7f2e291eb6ee637e80f8afd11e0a8122827c44a429f96b17f632373ea7e375e056bec7ec368e09c308c5 WHIRLPOOL dde4b17f24a65afc398edbf487dd2f9c69b6374af69019151c0b6744e2f1de77a89a7b649c37170fb7825d7cfa7787256d29e1a692fc29f2ca7775fc7eaadaca
-MISC ChangeLog 132737 SHA256 e507c46f73b7815d582c78d25e792c52a2cd274ff0fa1e6c1d095574a72eb8e5 SHA512 51dbef274df9e908d3cd5f0aeca501ad53dc54abdec40cd1014b577e6f5eaced5cbf624cb91eab652072cb093e2b9e76b4e3890d1891ed3df5aed84461625db8 WHIRLPOOL b19bf31c1e0b1987bc78d18d8d253526da0e03d6462b7214275fa953454a58fe2fd49d10dbe02b2d1c5efc2f6dcac197a2707f17e56ecfb73a6576f821744f84
+EBUILD netbeans-dlight-9999_p20141103.ebuild 2995 SHA256 b3ed4fbd1d47a5be837cde7d682ec43720eb9095faf378f6f222a4a3761bd56e SHA512 8bd3ebd410bd16524ff36cbf4c400dc698874499fd315be28a4a9a64cb8e4abe04ecb9984cca41aa34cdb6b4f1ab8c7e83d3707f7d1c84250635cf52b0864d6f WHIRLPOOL ac1a2c86dfb52014182f26ca23132f229433e5cf43265f262c060dc5b74e57e53931bececc5349922debaefbeb571fca35edd8de1eb6c2a5a8f499e3c0c84890
+MISC ChangeLog 132910 SHA256 8b96970f2224c59f9dd61e812b7ff2267dce0910436b7c6cd51bc7063835f7e4 SHA512 fd5080a15bafa10fdb157a98242f850c2699b8833a7f7f18ef7539ec4296187d1fa30362175d4736892eccef7163a8fc6f4683460e6043cd3057073530ba468c WHIRLPOOL 4111b0bd5bbe1ff02faea6c75f8357515259cd6a66280bc565bbcb1ead422f6d4d95ae338b3bca9d20de2bf2b96135d91dfedc917db7adb319e1e0f52818026d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20141103.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20141103.ebuild
new file mode 100644
index 0000000..487c8f7
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20141103.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2014 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/2014-11-03_00-02-02/zip/netbeans-trunk-nightly-201411030002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/457A4C66AE33D1D5887BB1F359EEA41A10EBB2AB-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}"/457A4C66AE33D1D5887BB1F359EEA41A10EBB2AB-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 12cd26b..46bdf52 100644
--- a/dev-java/netbeans-enterprise/ChangeLog
+++ b/dev-java/netbeans-enterprise/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-enterprise-9999_p20141103 (03 Nov 2014)
+
+  03 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-enterprise-9999_p20141103.ebuild:
+  bumped to the latest sources
+
 *netbeans-enterprise-9999_p20141031 (31 Oct 2014)
 
   31 Oct 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index da4430e..6e08562 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -118,6 +118,7 @@ DIST netbeans-trunk-nightly-201410170001-src.zip 197610191 SHA256 ece01ea8e2f656
 DIST netbeans-trunk-nightly-201410190001-src.zip 198848484 SHA256 239ac089ce10c7f9bb528c7885a1096edf90c34a449e0954123015da764964e4 SHA512 b6d330d6d7a82662b73c410877ce049e6a9258a3310383e515a4cfeb8597ea5c72b2adcb650a131b7a2dcda5d1260b4d927120cc6f4dfd667e6ec14e71c27daa WHIRLPOOL 48c59a25b584360cafb366df0fdb1acaf46612dc0a204b91841d0d9493b3b34056485005ad23db8ae05ae44c2d68798b603f68ce87e7012b2e63211db3fe3e8d
 DIST netbeans-trunk-nightly-201410300002-src.zip 198898097 SHA256 a8617a69f201a25d4bf0f78226885e73a6fedcd5c8620f115573fda6d617b444 SHA512 8c7c70c04260cda6225b6246e756ea285dd60f88490ff29b2f13195103f5fd3589a8ea0b30436a126a33663c5b25b1d7a7e2713804bb7fb23b2033038c229c08 WHIRLPOOL 61c3ceea8c2ba7d8f55515495b6cb47473d55b7a35c84632fd34edb34fe8c94393dc0b08252196d9132290db974aa03e15b897c0d8a9397bfdc957fa64ca9219
 DIST netbeans-trunk-nightly-201410310002-src.zip 198916747 SHA256 4f200798d8c10985c1e5fa7c9e523564808e508a3f19737a3effa9aef7d8808e SHA512 e7aae2121699e1d8b19df3406c1eae8e1573a64b11ecfae2c110df895ceaf114585643e064b781896f6956747169265aecd317018eef324f3ba2d3571020c76d WHIRLPOOL 8ef1ebedc044af25a3219c24d38e677ffd89ffb91cfb0d017373d60c3c1c3d27ee0065c6ea68b003fb8ef28a3b7c6c7e64a110e1f670f989f1a038efbef406a0
+DIST netbeans-trunk-nightly-201411030002-src.zip 198928747 SHA256 4101f4b4ca15f57435d9973d7ca3e1d742744515af454add071132034944df53 SHA512 890d8331fbe66022c65ce2aa71af4c88f23a75d101a90f0c0f63b3bf63307abcf47362064d685ecb26ae27405fcbb5e051ca798151505717f5d43d7f4adb37f5 WHIRLPOOL fa908bb07de1375432cbb2cb4cc9ba669e8042bb2e4b29b4a2ba95e994fac7043a9883df7f046a3928b8f4774ae82272855e73e644b58c5782f8afd27006ef1f
 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
@@ -142,5 +143,6 @@ EBUILD netbeans-enterprise-9999_p20141017.ebuild 15147 SHA256 396885a0021b62408a
 EBUILD netbeans-enterprise-9999_p20141019.ebuild 15147 SHA256 ac2074171a2a96e9bbbda44ffded6a70c56bb46edb4e3aae0060f262fa2b0252 SHA512 b253f92376c685d41041881feb45ae5cdc6530ae88e06fe4b744359bc2892855b791a8b3d08c002ba18b8333b4744756d398920764994b5ab3ade865b54baea1 WHIRLPOOL 86512585bb1f29a051c2d7c38446f69977f473355b45f519d8825e2efa30d07c146b03c2c03c1d5089f0bca5676fa937f9c60cd4f22fa2e5842b6e4c11ca72c9
 EBUILD netbeans-enterprise-9999_p20141030.ebuild 15147 SHA256 76367964a472ac71aa650374f82bc0529f90d4a69cbb14af5be913ba6c5ff6a8 SHA512 0c36270d56652c0effaba25dd1ab2bf5762ad029dd6113c42cb05c2451a21c18afc21442017d308f432a94689c30325fb5c4d5f1b33cabe5840c6d70476608b7 WHIRLPOOL 3c6a6cc9cf1294ccb2e32018673ef0a46cdd61030afb5ada7678a46ec4844cd14434391ebd0d9ea4ec22940ac90f621a65ab1d23ba22c333c0eb5975b94a333d
 EBUILD netbeans-enterprise-9999_p20141031.ebuild 15147 SHA256 f6f9490a2f5d7d26d6e42ea5028ceaae763387795fcac45af5867a6ec8b99cb6 SHA512 02b4c3a6f73b55bd627bc6e64bb783933ebedd501462a0d42c90b8431e98700b2b8fe43c2b133567dc419893aa1a2660a1ffd02f011f1b493151b23a33af7e9d WHIRLPOOL 777ddfa0e9127650f27282c2fef303f39d2683163b0efac89ddfaa62f3905100a0ee9da7c80ea41998e1578dca35c56d7823e76029aab081360a3b2b8e39ce0e
-MISC ChangeLog 139843 SHA256 39adc4d2fcbe05391b196e9fcca78df5df7185045bdb2cf8a1dc95e6d20578ca SHA512 76294759c612651b6e3e6da93f3ce55c47f268501571262e8d76f4c0cac3ba6dee1aa485b1a46910a3024111e771bb7dba9c3479ca4f0768af8e610e845df38d WHIRLPOOL 2c75080c8fce102f895dd5b02967c122063bef2a1710bad4173b0b712016b893b211bf8c1751f75189e2ae64c59bd55b2771a93124b7ccab2d8d956de3b549b5
+EBUILD netbeans-enterprise-9999_p20141103.ebuild 15147 SHA256 c2fe91d17861a6634ea6491abf5244479d30f92da426f2dada4f46ceeb59738f SHA512 269175fcea5974d7a2960da912d8af15c2b66bfd70cd46e7dd05b4e65d88da8bd648f0a9cd660da13344556bf9dea00bbcd68d0b336094ce0c1f134d1c6c9320 WHIRLPOOL 9c8fbdf59d5d44166d8bcaa6594ffa04e2b7cb26919463f55c1e2957ffd56c1f6606c29df825176af8d03ad660c9507022923fad2694b0c9089315492dcd3077
+MISC ChangeLog 140024 SHA256 fcf21755b9c3279f843eaa37776e40c86649022f3425f92c68673fad5f8aa500 SHA512 cb22cb6ab3c0fce4ee45656552d17d3c87e988f5e29a83833c66856311ba4d12f656fa1dda63da6993a3ee6a25408e2d62db1ab050543fd645451622a5938f74 WHIRLPOOL 24715998df34ec129e744e38eb489a7606273f748c902d0f4aeb436aa9e04bc6ddcd83b23f046d8a9e07240198b275cca00ad053bde85c6e6234049787625f70
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-ergonomics/ChangeLog b/dev-java/netbeans-ergonomics/ChangeLog
index 07a5019..23d6ac7 100644
--- a/dev-java/netbeans-ergonomics/ChangeLog
+++ b/dev-java/netbeans-ergonomics/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-ergonomics-9999_p20141103 (03 Nov 2014)
+
+  03 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ergonomics-9999_p20141103.ebuild:
+  bumped to the latest sources
+
 *netbeans-ergonomics-9999_p20141031 (31 Oct 2014)
 
   31 Oct 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 895a6e5..41042b3 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201410170001-src.zip 197610191 SHA256 ece01ea8e2f656
 DIST netbeans-trunk-nightly-201410190001-src.zip 198848484 SHA256 239ac089ce10c7f9bb528c7885a1096edf90c34a449e0954123015da764964e4 SHA512 b6d330d6d7a82662b73c410877ce049e6a9258a3310383e515a4cfeb8597ea5c72b2adcb650a131b7a2dcda5d1260b4d927120cc6f4dfd667e6ec14e71c27daa WHIRLPOOL 48c59a25b584360cafb366df0fdb1acaf46612dc0a204b91841d0d9493b3b34056485005ad23db8ae05ae44c2d68798b603f68ce87e7012b2e63211db3fe3e8d
 DIST netbeans-trunk-nightly-201410300002-src.zip 198898097 SHA256 a8617a69f201a25d4bf0f78226885e73a6fedcd5c8620f115573fda6d617b444 SHA512 8c7c70c04260cda6225b6246e756ea285dd60f88490ff29b2f13195103f5fd3589a8ea0b30436a126a33663c5b25b1d7a7e2713804bb7fb23b2033038c229c08 WHIRLPOOL 61c3ceea8c2ba7d8f55515495b6cb47473d55b7a35c84632fd34edb34fe8c94393dc0b08252196d9132290db974aa03e15b897c0d8a9397bfdc957fa64ca9219
 DIST netbeans-trunk-nightly-201410310002-src.zip 198916747 SHA256 4f200798d8c10985c1e5fa7c9e523564808e508a3f19737a3effa9aef7d8808e SHA512 e7aae2121699e1d8b19df3406c1eae8e1573a64b11ecfae2c110df895ceaf114585643e064b781896f6956747169265aecd317018eef324f3ba2d3571020c76d WHIRLPOOL 8ef1ebedc044af25a3219c24d38e677ffd89ffb91cfb0d017373d60c3c1c3d27ee0065c6ea68b003fb8ef28a3b7c6c7e64a110e1f670f989f1a038efbef406a0
+DIST netbeans-trunk-nightly-201411030002-src.zip 198928747 SHA256 4101f4b4ca15f57435d9973d7ca3e1d742744515af454add071132034944df53 SHA512 890d8331fbe66022c65ce2aa71af4c88f23a75d101a90f0c0f63b3bf63307abcf47362064d685ecb26ae27405fcbb5e051ca798151505717f5d43d7f4adb37f5 WHIRLPOOL fa908bb07de1375432cbb2cb4cc9ba669e8042bb2e4b29b4a2ba95e994fac7043a9883df7f046a3928b8f4774ae82272855e73e644b58c5782f8afd27006ef1f
 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
@@ -53,5 +54,6 @@ EBUILD netbeans-ergonomics-9999_p20141017.ebuild 2919 SHA256 505903fbf01acf11a76
 EBUILD netbeans-ergonomics-9999_p20141019.ebuild 2919 SHA256 4da8d8a755bd3e2878439461ab3ce89dae644efc88ff198b4e2a0aeab3d10bf5 SHA512 5e049580c04396bc24e7ee0c7ecc0ea5a792e7298ccdf11cf51c345dd6e13e0fed816a4b41b1ad804056c0f7555d908c7529acaad08c9684b5931b84186c5fe0 WHIRLPOOL 9959ff7f26225c3c608c08fc8654b19a5c77b38b5375295ec0af21fa94073e51a69c13b8184a5fb8e165e164c5051c6569d2e78b672a7f51bceacfa45822033b
 EBUILD netbeans-ergonomics-9999_p20141030.ebuild 2919 SHA256 b0d864aa9af2f17d1c1ac512cc3e74914689e4b73f81fc6d58482d0500686a74 SHA512 c1176f57f8bd9c2496b54f062768a707411b68b60f21f03c69f3f70418fd4b5ff93b895bd3e1dbb976433dda075d3f318d2000ae51fea3498b7805a432700733 WHIRLPOOL e38f7b82d2b4d6aa36224a072b295f9c443fd9a0246b9d16c357ce9c0e6b62223059382da0fe3af63d7f6c25e73527d005d42a47c2c0d292a217d63c2b61f502
 EBUILD netbeans-ergonomics-9999_p20141031.ebuild 2919 SHA256 890ba15b8f1cec97c2d0de1c804510dea197513d031bba0a5ee5e62e3d071324 SHA512 4e876e05fbb62a3a76f73668e65365b195578ed40b8e41be8d4fd34d70754d78376d2f5e08cbebf512f20e9e98f33576e7fe57cadefb5fa127ad21747700822d WHIRLPOOL 83992ebb731018f4b2f040767daa0a10d4116fa4705ea847c7aaa96962b98d6dcc66678d206bd629de64493ff43b0045948b7b078c3a7f82ee0a2179ce45087b
-MISC ChangeLog 139318 SHA256 3ccfd565df1f631f6007f015e9a07158ba7efaaac76f4a516f47070ec716a665 SHA512 c5f24bf000f036cf5625be0289216a1b62bec1306f1e9e5b8090aff0b9fb772d9e95a218d2369911d13eb4ac1128c9151aa22bce5d93d2458cf1012661437eb3 WHIRLPOOL c452a5433f3c432e93a3b08e4496c92565ad488acc24145e967384c2e55eb9efa91bd4c8e31ce6ca05c7eec0e76f77f886964c1d6d9c6d0999791fa3843f149f
+EBUILD netbeans-ergonomics-9999_p20141103.ebuild 2919 SHA256 ec9b824f14d5c52fc2ca80a22c8f487868f68fbfaf4ed95271d07cde129db4ac SHA512 d60043cc343a1f62af72fd06f8e953e3c4c4af5d6f20bca1b899537c69888ebf502af7f68cd7f26202d4d5c46476f91e704e559bf32f54a04a66f9bf68a4ec60 WHIRLPOOL 7c390480999e3aadabe299bd77abb86e28bcc2f0631d734e8ac1774159476a9a3f17c6c5dde5106b7b83720daeea7371dd88f1210128cf73fc9ab5099d723fcd
+MISC ChangeLog 139499 SHA256 a6c86e49723e598f81bad8b6edec3c1aae36668238338684c1b1b674ce2d84db SHA512 ae34a0099cb1f558e3053e29b1bf060f3b906a0686738c26161baec169ef30a8cc1b2102ddeb1ec6195af1cc4393a275a6d3343aae36a3ca411311f653cbe815 WHIRLPOOL f1ce7c347a73901b8d98aa3d0f2e7049e2fbe8f0c0566bbb9c34d7d118c21bc08d58954d9b302730bbf61e8cbfe7aa353dbf8d40a8a028f7af2bbbb133a09617
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20141103.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20141103.ebuild
new file mode 100644
index 0000000..4765a55
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20141103.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2014 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/2014-11-03_00-02-02/zip/netbeans-trunk-nightly-201411030002-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 8677f7c..c02ef92 100644
--- a/dev-java/netbeans-extide/ChangeLog
+++ b/dev-java/netbeans-extide/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-extide-9999_p20141103 (03 Nov 2014)
+
+  03 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-extide-9999_p20141103.ebuild:
+  bumped to the latest sources
+
 *netbeans-extide-9999_p20141031 (31 Oct 2014)
 
   31 Oct 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index 13e99e3..de7767f 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201410170001-src.zip 197610191 SHA256 ece01ea8e2f656
 DIST netbeans-trunk-nightly-201410190001-src.zip 198848484 SHA256 239ac089ce10c7f9bb528c7885a1096edf90c34a449e0954123015da764964e4 SHA512 b6d330d6d7a82662b73c410877ce049e6a9258a3310383e515a4cfeb8597ea5c72b2adcb650a131b7a2dcda5d1260b4d927120cc6f4dfd667e6ec14e71c27daa WHIRLPOOL 48c59a25b584360cafb366df0fdb1acaf46612dc0a204b91841d0d9493b3b34056485005ad23db8ae05ae44c2d68798b603f68ce87e7012b2e63211db3fe3e8d
 DIST netbeans-trunk-nightly-201410300002-src.zip 198898097 SHA256 a8617a69f201a25d4bf0f78226885e73a6fedcd5c8620f115573fda6d617b444 SHA512 8c7c70c04260cda6225b6246e756ea285dd60f88490ff29b2f13195103f5fd3589a8ea0b30436a126a33663c5b25b1d7a7e2713804bb7fb23b2033038c229c08 WHIRLPOOL 61c3ceea8c2ba7d8f55515495b6cb47473d55b7a35c84632fd34edb34fe8c94393dc0b08252196d9132290db974aa03e15b897c0d8a9397bfdc957fa64ca9219
 DIST netbeans-trunk-nightly-201410310002-src.zip 198916747 SHA256 4f200798d8c10985c1e5fa7c9e523564808e508a3f19737a3effa9aef7d8808e SHA512 e7aae2121699e1d8b19df3406c1eae8e1573a64b11ecfae2c110df895ceaf114585643e064b781896f6956747169265aecd317018eef324f3ba2d3571020c76d WHIRLPOOL 8ef1ebedc044af25a3219c24d38e677ffd89ffb91cfb0d017373d60c3c1c3d27ee0065c6ea68b003fb8ef28a3b7c6c7e64a110e1f670f989f1a038efbef406a0
+DIST netbeans-trunk-nightly-201411030002-src.zip 198928747 SHA256 4101f4b4ca15f57435d9973d7ca3e1d742744515af454add071132034944df53 SHA512 890d8331fbe66022c65ce2aa71af4c88f23a75d101a90f0c0f63b3bf63307abcf47362064d685ecb26ae27405fcbb5e051ca798151505717f5d43d7f4adb37f5 WHIRLPOOL fa908bb07de1375432cbb2cb4cc9ba669e8042bb2e4b29b4a2ba95e994fac7043a9883df7f046a3928b8f4774ae82272855e73e644b58c5782f8afd27006ef1f
 EBUILD netbeans-extide-7.4.ebuild 3311 SHA256 8585e0b9eac3b9bb35d5b5e0152936f84708a824d76831930a3dfd3d196556b0 SHA512 19eceec7a634923b4712eb277a1ff9900a2eb4d9ac0a2c699175333c263f0c02baaf24eb30bd7919444f5c9df751186689b2d4359ca1c88dca02884d7c18c3cd WHIRLPOOL e64509f198c4d09851f98d5bd2ddd5b469b0a7c0f3122f391c17833e5d6d77b7a6c2fd9e942e34f2df42047504ad40593f97af9b2898450e769c7b012355c316
 EBUILD netbeans-extide-8.0.ebuild 3305 SHA256 b2d57e2e2d92760ead3d383fe4dd5b4fb9fc2807a9b58c6f40b44fc24072b8bb SHA512 6e7f12758188a564ef6b5cf8b0ffdf79e30d1021172d10f215d04e727bc4001e4385fd0961a26a6bb42638089e0919b1d4628a13ba11a3deac94d4693c7210d5 WHIRLPOOL adac8461de43669b7bb98ea8920c0a2944837211a37503b957221149d4b91c4bd92b6db160191990b838c474495c65f62c8a4bb9fdbcaa371b4648a335b1afa9
 EBUILD netbeans-extide-9999_p20140922.ebuild 3357 SHA256 95bcd4b978d466a3bb83b949d04cc873fa4155a9c8db8497226d70a4491f4799 SHA512 ef34f0dc969603125788bbaebe0ca5f4b067fd3f1851cd32eb8935a9e0322785312add38bd3e85ef54182c90fc5873ca010527a561225635eaca2d4f56a24158 WHIRLPOOL 49e8d6088fcf7972f74f43eaf52fe3a6fd307810170386c81ebb6caccdf87b9ebc25fb740d6397b5d2a0e15e8eae293ed8d2dc75ed2d014bbfbf5ae7339d7f18
@@ -47,5 +48,6 @@ EBUILD netbeans-extide-9999_p20141017.ebuild 3383 SHA256 ee74703af38300290ed60da
 EBUILD netbeans-extide-9999_p20141019.ebuild 3383 SHA256 4b05cb75058cbc955f7eefc30277a86213d35cdc2915d4be83c204b79d1faa4a SHA512 aed9274a871abd9ef77966510a71b69796f1ea3ada9f21918713207cfa6a0f39b87ceea27f556bd35a155e8516b6a3f5990234f24ce494449b81e6c648fc6d90 WHIRLPOOL d3c7b166a210b282817e42d32c520920346d71cddf2167277f2fac916d034fbe6e4f8eb742b47fb5b62f6b429203d6e8728b7affda5368179f4c51eac2f9a4e9
 EBUILD netbeans-extide-9999_p20141030.ebuild 3383 SHA256 5840b80aba6068e5daa477666c0f6182934604ddafb20222d1d726d591b1b632 SHA512 a6225cc8a53c9459d327a23009172d0787c047f70677e8cf58703a14880afd7eef048d8a25b95097c0f0eadc962be3d57085b1321f77fb52f295b49dc9b77f52 WHIRLPOOL b217f55bccac1a2ef13ab36a40c408e9c9d5ca4ed1b152036424647e250723b1054e16e3d470cbdc7de8285d1bc370e8c27583cc37e413fefcd31b8b181b1f5d
 EBUILD netbeans-extide-9999_p20141031.ebuild 3383 SHA256 414ca7f3acba95add59dfda771c545af96334edb4b68e94a199860928969dc46 SHA512 393ed814deeb442b69d9bfd7b38f6ac4f131787ed162917b44a1a8c11e6c6026a7fa38dfbe11b1639088af72259a7ac18962075980580b27dfca38878ddf89b1 WHIRLPOOL 239d59a684c6f5216bb7ea894cd73b96b983941e13d51cd67356586ce993af10f799816de525c4e6cfe84d6c8f713c0cb38ae679925fc142bee5460f9d14b1f0
-MISC ChangeLog 64749 SHA256 0aab38c64ffc4c7e468cdaba1b3c68a630de4a8b3ef9beb35b8b3d59dceb2f70 SHA512 c86a0886b35d969023c0c513d91390e42ab27558d3b21ae9ed7c62998e96b17d188397da86196bbf651559b0b3ca37b07241620ce05b1e8f28cd11c8645cee00 WHIRLPOOL 0a6f3f2643eec063152cf5d38681b0b79e063e509cbe8be9bcbdf9d974e57a7ea27cb3fe9d3fc5ede7a8af3456925ac3987f2318ae088c0c8edb2b90e502056f
+EBUILD netbeans-extide-9999_p20141103.ebuild 3383 SHA256 ac79b4c23f4c631d2e39c7ded54ea70e7eb7ba4a8c59c0079898eb02fdf978f8 SHA512 cdac054ad9b7eadcd3ad3b344d1e1b7350570c71e12f5d8a24fe1570f5fc0992ca4c82102f0ec5efc1a47f08ed90d92055ca31b6f535c0ce7a1026b2407aeab6 WHIRLPOOL 5b914e88d6011269f0c2699eb18d4475a834a27be6ac67dc5ed8ed1fd38c00f39b9e88e904a8cb055f06d45c27baa30c9546d5d833a0a154b1f34ef55fb1bb2e
+MISC ChangeLog 64922 SHA256 31f118d8e785cf8c0b341d3aff510d20cbc6c2206d7ede5dec7693c105d29ee1 SHA512 135aad7f1272cfc32fb2bee76ae104effb7c4b159154d0e631dddc8c55852392fec3ac735076818c24317ef3e9b07d5ce9551c60ba9708a1fd647ec67cb67342 WHIRLPOOL c47e9c6c841709623cdf92253b45b84e34dd52f5ea79537cdbfb8fb29541c1f036e2aefce68ccc6536a06616d785fecace58d17ebf4c0919e334a652699e4391
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20141103.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20141103.ebuild
new file mode 100644
index 0000000..d78161c
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20141103.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2014 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/2014-11-03_00-02-02/zip/netbeans-trunk-nightly-201411030002-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 d9179fa..5f1eb0f 100644
--- a/dev-java/netbeans-groovy/ChangeLog
+++ b/dev-java/netbeans-groovy/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-groovy-9999_p20141103 (03 Nov 2014)
+
+  03 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-groovy-9999_p20141103.ebuild:
+  bumped to the latest sources
+
 *netbeans-groovy-9999_p20141031 (31 Oct 2014)
 
   31 Oct 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 23b2134..447b294 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201410170001-src.zip 197610191 SHA256 ece01ea8e2f656
 DIST netbeans-trunk-nightly-201410190001-src.zip 198848484 SHA256 239ac089ce10c7f9bb528c7885a1096edf90c34a449e0954123015da764964e4 SHA512 b6d330d6d7a82662b73c410877ce049e6a9258a3310383e515a4cfeb8597ea5c72b2adcb650a131b7a2dcda5d1260b4d927120cc6f4dfd667e6ec14e71c27daa WHIRLPOOL 48c59a25b584360cafb366df0fdb1acaf46612dc0a204b91841d0d9493b3b34056485005ad23db8ae05ae44c2d68798b603f68ce87e7012b2e63211db3fe3e8d
 DIST netbeans-trunk-nightly-201410300002-src.zip 198898097 SHA256 a8617a69f201a25d4bf0f78226885e73a6fedcd5c8620f115573fda6d617b444 SHA512 8c7c70c04260cda6225b6246e756ea285dd60f88490ff29b2f13195103f5fd3589a8ea0b30436a126a33663c5b25b1d7a7e2713804bb7fb23b2033038c229c08 WHIRLPOOL 61c3ceea8c2ba7d8f55515495b6cb47473d55b7a35c84632fd34edb34fe8c94393dc0b08252196d9132290db974aa03e15b897c0d8a9397bfdc957fa64ca9219
 DIST netbeans-trunk-nightly-201410310002-src.zip 198916747 SHA256 4f200798d8c10985c1e5fa7c9e523564808e508a3f19737a3effa9aef7d8808e SHA512 e7aae2121699e1d8b19df3406c1eae8e1573a64b11ecfae2c110df895ceaf114585643e064b781896f6956747169265aecd317018eef324f3ba2d3571020c76d WHIRLPOOL 8ef1ebedc044af25a3219c24d38e677ffd89ffb91cfb0d017373d60c3c1c3d27ee0065c6ea68b003fb8ef28a3b7c6c7e64a110e1f670f989f1a038efbef406a0
+DIST netbeans-trunk-nightly-201411030002-src.zip 198928747 SHA256 4101f4b4ca15f57435d9973d7ca3e1d742744515af454add071132034944df53 SHA512 890d8331fbe66022c65ce2aa71af4c88f23a75d101a90f0c0f63b3bf63307abcf47362064d685ecb26ae27405fcbb5e051ca798151505717f5d43d7f4adb37f5 WHIRLPOOL fa908bb07de1375432cbb2cb4cc9ba669e8042bb2e4b29b4a2ba95e994fac7043a9883df7f046a3928b8f4774ae82272855e73e644b58c5782f8afd27006ef1f
 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
@@ -57,5 +58,6 @@ EBUILD netbeans-groovy-9999_p20141017.ebuild 3422 SHA256 0a876e4b1fe2dbc9b6e166b
 EBUILD netbeans-groovy-9999_p20141019.ebuild 3422 SHA256 aad6543f3e24d85ce954e0aaae4ce045e5aff55077ad91f05d2d3f7c810e63a8 SHA512 73720cbd1a422c550da69ab5c32b526cd652415271d440f142f432c47b8e5068176baadc5abc0c8fd9bf53e3945ae765ca35dc3dc5bd4c21486732792b3e4078 WHIRLPOOL bba2a7218cc9a9339975165f8a89a1a190c67a826a727de68696d64631564c1d994f165ccab3fad747af222fcf3e429f3b3b816fcd546df9b792ece4eb937b0e
 EBUILD netbeans-groovy-9999_p20141030.ebuild 3422 SHA256 f54419adc0990a78f6b55f8d559685c057d9ce28ddcf2790bff4be598de63ca7 SHA512 1d9acc61576ea11df17072f2ffc17ba0473d4f667a50aaa0439cd00b9b74cfc398636db15eb3f98319f59b76c02427ddd2ff361d9b9c66a21ffa2ec473d3a6a5 WHIRLPOOL aa2d0172f545a077d3582121759eb13c20e5ee263655c024bfb7b3892614c0c996a47d6c3a4475f553cc802748dbb6dcaf50cd372e00615300ffd5383ab446e4
 EBUILD netbeans-groovy-9999_p20141031.ebuild 3422 SHA256 1a0b4a254339ac888712c7e70c97264a393450bbc8cc02b4650cda61d2a7e6d1 SHA512 56d9b7f7ae0ea05b82c0a61a559364f876e6a54c3e5e69404a76ea6beabddb65767113bc8a89bc8c625b0fef777fab929f9c44e017809191b870c17aa7c9ac36 WHIRLPOOL 18332bc67af9389176cb86d52f6491d94a8cfcc91419a634bb0480d63d6724842d3c4f7dcb25aec71e0fde43b3b6779b4de15925119313c7ebbed13873bc55fe
-MISC ChangeLog 132729 SHA256 7a5519cc37d630e7824be455e250008b29060927a0f941b2f2766a7ee079febe SHA512 4eba390e965ecf61897fa763758baf04eb7e7f321b5abb181610ed426fb24dea860b23d47979d0897dcefae2f4dfc0bc40e97bec49751d647ff452d716ab4756 WHIRLPOOL 9759aa53abc6e46f03952ed379c7c1b5b26a6587d97771ffb91cdfb57fb872a58269e363f74211f92c6a69aa799ebc0e2186c078e5d8321dfc6e0bcab0c2499c
+EBUILD netbeans-groovy-9999_p20141103.ebuild 3422 SHA256 d41e9fd24ca59ef3965385545ede4b89cd6b62adbe2eaeb0b1df2e45c7adf82c SHA512 f6008db01ef3684aeaf2f1c277316edd7ed107ab4c8ffbabb1ca30f6840f9f8e9ea4a88cf042d7c2503e9d0d2e2066be656cf8c3a5b3ea786772d00c718c7073 WHIRLPOOL 554f1d0b9a901453c136d4f2eabd5322b46749c0971fd16b8717cc93ebaefd8fd81e2d07db7ee823f1c56b08a17c5085e614809efa3f8c6144feecae354029bf
+MISC ChangeLog 132902 SHA256 90d79f9bf9b16763c050bc61a8d0b48daac1ff406ace78cb106781bddeec5514 SHA512 6635e3a4eab482bd553c19d80e3aad56eec692d480ecccc6571a6a2f99feb23a4b7abfa06a49fd88d8ab969e6d5d7d495407ead9fd82ead58487c56b4d3a2381 WHIRLPOOL 94babbfe056e39aed65c4de4a47afc96f8e94e5c187a9d36e1fce1e2c693a906a6d895336a1046dfb4ff1f046742d7be44ba241e2ae530353c9798eaa809bdbc
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20141103.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20141103.ebuild
new file mode 100644
index 0000000..c6f3c4e
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20141103.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2014 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/2014-11-03_00-02-02/zip/netbeans-trunk-nightly-201411030002-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 871b981..0f8247a 100644
--- a/dev-java/netbeans-harness/ChangeLog
+++ b/dev-java/netbeans-harness/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-harness-9999_p20141103 (03 Nov 2014)
+
+  03 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-harness-9999_p20141103.ebuild:
+  bumped to the latest sources
+
 *netbeans-harness-9999_p20141031 (31 Oct 2014)
 
   31 Oct 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 84ae44a..a7a45a5 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201410170001-src.zip 197610191 SHA256 ece01ea8e2f656
 DIST netbeans-trunk-nightly-201410190001-src.zip 198848484 SHA256 239ac089ce10c7f9bb528c7885a1096edf90c34a449e0954123015da764964e4 SHA512 b6d330d6d7a82662b73c410877ce049e6a9258a3310383e515a4cfeb8597ea5c72b2adcb650a131b7a2dcda5d1260b4d927120cc6f4dfd667e6ec14e71c27daa WHIRLPOOL 48c59a25b584360cafb366df0fdb1acaf46612dc0a204b91841d0d9493b3b34056485005ad23db8ae05ae44c2d68798b603f68ce87e7012b2e63211db3fe3e8d
 DIST netbeans-trunk-nightly-201410300002-src.zip 198898097 SHA256 a8617a69f201a25d4bf0f78226885e73a6fedcd5c8620f115573fda6d617b444 SHA512 8c7c70c04260cda6225b6246e756ea285dd60f88490ff29b2f13195103f5fd3589a8ea0b30436a126a33663c5b25b1d7a7e2713804bb7fb23b2033038c229c08 WHIRLPOOL 61c3ceea8c2ba7d8f55515495b6cb47473d55b7a35c84632fd34edb34fe8c94393dc0b08252196d9132290db974aa03e15b897c0d8a9397bfdc957fa64ca9219
 DIST netbeans-trunk-nightly-201410310002-src.zip 198916747 SHA256 4f200798d8c10985c1e5fa7c9e523564808e508a3f19737a3effa9aef7d8808e SHA512 e7aae2121699e1d8b19df3406c1eae8e1573a64b11ecfae2c110df895ceaf114585643e064b781896f6956747169265aecd317018eef324f3ba2d3571020c76d WHIRLPOOL 8ef1ebedc044af25a3219c24d38e677ffd89ffb91cfb0d017373d60c3c1c3d27ee0065c6ea68b003fb8ef28a3b7c6c7e64a110e1f670f989f1a038efbef406a0
+DIST netbeans-trunk-nightly-201411030002-src.zip 198928747 SHA256 4101f4b4ca15f57435d9973d7ca3e1d742744515af454add071132034944df53 SHA512 890d8331fbe66022c65ce2aa71af4c88f23a75d101a90f0c0f63b3bf63307abcf47362064d685ecb26ae27405fcbb5e051ca798151505717f5d43d7f4adb37f5 WHIRLPOOL fa908bb07de1375432cbb2cb4cc9ba669e8042bb2e4b29b4a2ba95e994fac7043a9883df7f046a3928b8f4774ae82272855e73e644b58c5782f8afd27006ef1f
 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
@@ -59,5 +60,6 @@ EBUILD netbeans-harness-9999_p20141017.ebuild 4131 SHA256 0d749a2aea7dcab7df2843
 EBUILD netbeans-harness-9999_p20141019.ebuild 4131 SHA256 22440b1c057213657bb0aaa1a0dd12745b3bc1914feb026f88b44ffdd4f565ea SHA512 aee6580ed4ee753b92ea93e5b6ea2a4ad0e972b7e763ef1f8b274cd068ad7d1b81985380c9194cb792283b14149af9f0aae6d0ac3e8a3908035b332bf65e6056 WHIRLPOOL 80bfb916ce15bce268bf152e63e49eaafc4a5446dd347ca8a3d2175e48d6bbe39e474093c2c449277c458c65d65c2eb27ce2395297d496e96b560f4e3e0dfaab
 EBUILD netbeans-harness-9999_p20141030.ebuild 4131 SHA256 5903eadc2b1453e31f462f892cf1de7232b3bcbbd3ae3c7b7b27cea60abe9c87 SHA512 7d3e6a6a694e54b290267d4f81df111febcafc4300822820fd942a6c8a90d27e74c8bf84efc2f16fafa98985e53683368e33f00170b37db20e73d6726fbc756f WHIRLPOOL 921e1eceed823f54a8429fef1137f83e279b0cfaa26937ddc7ddfd5f1fe65d577e4729f41b046004cff5541d11f3f45c8787baf0396d3b9c032811c3de59a7f2
 EBUILD netbeans-harness-9999_p20141031.ebuild 4131 SHA256 f1e9a85f22c027cde053f7f04570d244a044f12fa405ff40cd61cae040775718 SHA512 f96f952885c29b9c1a8311924cb1236b910e916e29520a04dcf53598eb41bdd8c4c158a9fbd062dfa43e39271de24b6ffddbe12ec8cee6488a4eb5b2c0d99990 WHIRLPOOL e62d6ab52fe40c5a364076e6d1b5b8c8632e0b7ec80c7f20eb8791bcd270b78bd3d8cae9658e0a1abd5b3983e9f505ef8968f998d4722ae272c083d16a7134ad
-MISC ChangeLog 134405 SHA256 76ee2d2dcd4eff71a0d0d7c09972e779dbc0864a41faece8218361591e643db3 SHA512 46aca1eab7ab0a8a3162a0f9ff0d9dfe2b413244a4ed3072e47e1182f736b5d48db92de5060b4bd602674468caacf30c2b816d03e4484d358be5dc3444229d91 WHIRLPOOL 7a4988d42052e6888454791cfacb929a5fa03128c720a071429f0b76815f5f61440d29ffb0227f6b8007981c2b20c680d589281beb309e94094d4f963bb8e96a
+EBUILD netbeans-harness-9999_p20141103.ebuild 4131 SHA256 933dcf56452fb2ef9b1f6476152303143ec7cb94bf4519c560f7c63737347667 SHA512 78524db506afccd76d91a2c0f06385958027a8116d9236f5417ae754eacd64bf3866a7187ad03d5b2ccca1bd9cc001d84a082df813a96c192f9bfa4229c8bc57 WHIRLPOOL 19860d61a2fa63582fbc50c715896302a8c1903c08b2951f0090afff576fd37ab8a4d42ccec537b0ee0e9f13e5c66c5860cd8740e0f639129a9c1529d98bcf91
+MISC ChangeLog 134580 SHA256 51bd696dee832ad53e9307aab2c937768aca21731512b4726c461f1575ed5190 SHA512 45b8bca194ab57518dea64d6635546b1d73c19ddaa0c06bac7853ae1c677db8c7159b0815cc9d8b33f5174d7d17a8fe6a43033d168bb248fded82eb94d0d0f50 WHIRLPOOL 53b3e01059419be713f9175dd0b9897d7e9f296ca54adeab25c1f9d9d4e6b844a519a7fb0c577543e3463e76c6b00f7c233ed5e8d8ecd748b69a7af476001ae1
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-ide/ChangeLog b/dev-java/netbeans-ide/ChangeLog
index 137dd70..e9daed9 100644
--- a/dev-java/netbeans-ide/ChangeLog
+++ b/dev-java/netbeans-ide/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-ide-9999_p20141103 (03 Nov 2014)
+
+  03 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ide-9999_p20141103.ebuild:
+  bumped to the latest sources
+
 *netbeans-ide-9999_p20141031 (31 Oct 2014)
 
   31 Oct 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 6598b23..37b2099 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -210,6 +210,7 @@ DIST netbeans-trunk-nightly-201410170001-src.zip 197610191 SHA256 ece01ea8e2f656
 DIST netbeans-trunk-nightly-201410190001-src.zip 198848484 SHA256 239ac089ce10c7f9bb528c7885a1096edf90c34a449e0954123015da764964e4 SHA512 b6d330d6d7a82662b73c410877ce049e6a9258a3310383e515a4cfeb8597ea5c72b2adcb650a131b7a2dcda5d1260b4d927120cc6f4dfd667e6ec14e71c27daa WHIRLPOOL 48c59a25b584360cafb366df0fdb1acaf46612dc0a204b91841d0d9493b3b34056485005ad23db8ae05ae44c2d68798b603f68ce87e7012b2e63211db3fe3e8d
 DIST netbeans-trunk-nightly-201410300002-src.zip 198898097 SHA256 a8617a69f201a25d4bf0f78226885e73a6fedcd5c8620f115573fda6d617b444 SHA512 8c7c70c04260cda6225b6246e756ea285dd60f88490ff29b2f13195103f5fd3589a8ea0b30436a126a33663c5b25b1d7a7e2713804bb7fb23b2033038c229c08 WHIRLPOOL 61c3ceea8c2ba7d8f55515495b6cb47473d55b7a35c84632fd34edb34fe8c94393dc0b08252196d9132290db974aa03e15b897c0d8a9397bfdc957fa64ca9219
 DIST netbeans-trunk-nightly-201410310002-src.zip 198916747 SHA256 4f200798d8c10985c1e5fa7c9e523564808e508a3f19737a3effa9aef7d8808e SHA512 e7aae2121699e1d8b19df3406c1eae8e1573a64b11ecfae2c110df895ceaf114585643e064b781896f6956747169265aecd317018eef324f3ba2d3571020c76d WHIRLPOOL 8ef1ebedc044af25a3219c24d38e677ffd89ffb91cfb0d017373d60c3c1c3d27ee0065c6ea68b003fb8ef28a3b7c6c7e64a110e1f670f989f1a038efbef406a0
+DIST netbeans-trunk-nightly-201411030002-src.zip 198928747 SHA256 4101f4b4ca15f57435d9973d7ca3e1d742744515af454add071132034944df53 SHA512 890d8331fbe66022c65ce2aa71af4c88f23a75d101a90f0c0f63b3bf63307abcf47362064d685ecb26ae27405fcbb5e051ca798151505717f5d43d7f4adb37f5 WHIRLPOOL fa908bb07de1375432cbb2cb4cc9ba669e8042bb2e4b29b4a2ba95e994fac7043a9883df7f046a3928b8f4774ae82272855e73e644b58c5782f8afd27006ef1f
 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
@@ -236,5 +237,6 @@ EBUILD netbeans-ide-9999_p20141017.ebuild 29632 SHA256 ddfd8d348e5d1829322513c05
 EBUILD netbeans-ide-9999_p20141019.ebuild 29641 SHA256 2dfc7b98a294bd7bdd0961657e3d4921808ce444f021e86378092f3f3b1e2c5f SHA512 9f80c7d56a10fd5e466b268978b122dc713f3f0850e1a9a6eb98055738927dd1cd446e95011bc374ce781e41b5122671a188b0faed4b06b6294ff1d17d52d486 WHIRLPOOL 6d5b394c4c0613ba70526e3fbece1186cde091561dee814412d8f639e4763a0a47e8c44a98399e005d95407e24b33e78ab9d357110083217ca65ff929f94e55e
 EBUILD netbeans-ide-9999_p20141030.ebuild 29641 SHA256 2b2dc87bf323f927210d163f520a73508be07d10cb7052c10473d7806c14f6a2 SHA512 3453d23208049c343aeff20b0dc82df42e8226580752cae5380895f82024eedea66fc8546600bf66ececb4807b608caf0914f672f0db2873e0a37315b84c67ec WHIRLPOOL f05d3f08b48820e6681c8724fdde072535e42be5531433f64b57186a80ff9c8a4b0210a74fe6808e2cf361fa9f8a4282f548b8afc207b2c4cd87cd1a7b7bafb3
 EBUILD netbeans-ide-9999_p20141031.ebuild 29641 SHA256 06dfd25266a4c084a4d28fab0991366305adf709c6c5e47f5a238dddd2c825ac SHA512 bed915d3a5252d53d73d58c73faa8ec46ac07ec89e293af190b1dda196e7e3ca2c7d191329117e5ea6648edd017ddd6308157fe9c16af44ff339d17f20354f46 WHIRLPOOL b479558d549af7fe62145d651705e235e064a120cc2577572582f67c16da45b231207677935d03e95dd827e3c2c6a071b7ccb8b0fcb9de3a4d9f3c1f73f9328d
-MISC ChangeLog 128279 SHA256 41b922d73575f1b51f81e68b44cca01f0e82fd8d98b973edb2b930ff9809f764 SHA512 8532c1dec0456e72d27b5776010a603a7bab6322d778fdd34623f1bbd2d45c942c1325deb11ec74a34e34e2f0ae0437b4d6bc4ab581734fe8ee3effd41bd1ae1 WHIRLPOOL db8c41af389111d107ac580f05c20bab3c31579a687f90f6469fafc95efadfe041cb7e7b63e6078ce6ed567d90e1ddecf07c55023071e32789c49915cc853aba
+EBUILD netbeans-ide-9999_p20141103.ebuild 29641 SHA256 02546c566a2d8b5c998edaafc422befd973fa7abec03d84cdf932cf080cfd440 SHA512 203e655e4c54c74f78d2971c0111bb8e55e8f84136281793ab1d331a766813b3cb6533f09aa14c902087475465bff03b2a76e9214673e2847c149448735684c2 WHIRLPOOL 74145b5f09529ea8a994b134f0273ce29c473e1900310cda0e4b5af4fe7abe41c52caf222b6edb6cc3cdf0b0f6a2ccebe1b2381078b84cae20d02ae0eecc2bf4
+MISC ChangeLog 128446 SHA256 b49a7dac55c8902c1da17d4434dd586b469c55e41bbdf45c3586546eff2fd12f SHA512 d7a6ff7f48329d5a2274ef6cab647e23bce6725869b9b9527362205537c1d4ff077ea8a58acfc4e40a98f84c4e50f7fe04a4736af1130992cf2b252257f4510f WHIRLPOOL 0e36078465930ef3b0bb23ee1b7e9704973018cec99e628b5188612fd134590d8a5035fa6d8632d1e8a26d6caadab4c94c0d61c2c05d128611f3b7fcb10555a5
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20141103.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20141103.ebuild
new file mode 100644
index 0000000..0805995
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20141103.ebuild
@@ -0,0 +1,373 @@
+# Copyright 1999-2014 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/2014-11-03_00-02-02/zip/netbeans-trunk-nightly-201411030002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
+	http://hg.netbeans.org/binaries/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar
+	http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
+	http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar
+	http://hg.netbeans.org/binaries/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar
+	http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip
+	http://hg.netbeans.org/binaries/53AFD6CAA1B476204557B0626E7D673FBD5D245C-css3-spec.zip
+	http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
+	http://hg.netbeans.org/binaries/C40DFDACDF892D1BA14B540B32C11B6F34659931-exechlp-1.0.zip
+	http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar
+	http://hg.netbeans.org/binaries/75C30C488AD2A18A82C7FE3829F4A33FC7841643-glassfish-tooling-sdk-0.3-b054-246345.jar
+	http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
+	http://hg.netbeans.org/binaries/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar
+	http://hg.netbeans.org/binaries/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-html5doc.zip
+	http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar
+	http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar
+	http://hg.netbeans.org/binaries/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar
+	http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar
+	http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip
+	http://hg.netbeans.org/binaries/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar
+	http://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar
+	http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
+	http://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar
+	http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar
+	http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar
+	http://hg.netbeans.org/binaries/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar
+	http://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar
+	http://hg.netbeans.org/binaries/DA6CE3C2EB334DB61EFA99CD66134619867368FA-js-corestubs.zip
+	http://hg.netbeans.org/binaries/997BF4A93B8A99E37AB51C9016D1D18CF5FF4B60-js-domstubs.zip
+	http://hg.netbeans.org/binaries/291540295937BAC426A5A5BDDB6D86604075F4C0-js-reststubs.zip
+	http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar
+	http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar
+	http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar
+	http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar
+	http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
+	http://hg.netbeans.org/binaries/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar
+	http://hg.netbeans.org/binaries/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar
+	http://hg.netbeans.org/binaries/7052E115041D04410A4519A61307502FB7C138E6-org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar
+	http://hg.netbeans.org/binaries/B19A4D998C76FE7A30830C96B9E3A47682F320FC-org.eclipse.core.jobs-3.5.101.jar
+	http://hg.netbeans.org/binaries/E64EF6A3FC5DB01AD95632B843706CCE56614C90-org.eclipse.core.net_1.2.100.I20110511-0800.jar
+	http://hg.netbeans.org/binaries/6658C235056134F7E86295E751129508802D71F2-org.eclipse.core.runtime-3.7.0.jar
+	http://hg.netbeans.org/binaries/0CA9B9DF8A8E4C6805C60A5761C470FCE8AE828F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110.jar
+	http://hg.netbeans.org/binaries/9C74D245214DB08E7EB9BC07A951B41CFE3E3648-org.eclipse.equinox.app-1.3.100.jar
+	http://hg.netbeans.org/binaries/78E5D0B8516B042495660DA36CE5114650F8F156-org.eclipse.equinox.common_3.6.0.v20110523.jar
+	http://hg.netbeans.org/binaries/FD94003A1BCE42008753522BFED68E5A84B92644-org.eclipse.equinox.preferences-3.4.2.jar
+	http://hg.netbeans.org/binaries/54AE046B40C9095C2637F8D21664C5CD76E34485-org.eclipse.equinox.registry_3.5.200.v20120522-1841.jar
+	http://hg.netbeans.org/binaries/0FFB9B1D7CD992CE6C8AAEEC2F6F98DFBB1D2F91-org.eclipse.equinox.security-1.1.1.jar
+	http://hg.netbeans.org/binaries/7FE73A21F4A078ABAAFACE4D2B03B5EB3D306F63-org.eclipse.jgit-3.4.1.201406201815-r.jar
+	http://hg.netbeans.org/binaries/49F1EFEBC8CECA5D514209BE18A048EB5707C0A7-org.eclipse.jgit.java7-3.4.1.201406201815-r.jar
+	http://hg.netbeans.org/binaries/A94F8F805202B28236FFBC03C1CA149129DAEA1C-org.eclipse.mylyn.bugzilla.core_3.10.0.20131024-1218.jar
+	http://hg.netbeans.org/binaries/19D64C17A692D2023E22B16AD515118DF6427790-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710.jar
+	http://hg.netbeans.org/binaries/A1BF01D1DD09274446738C3F83360314B8881CD5-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210.jar
+	http://hg.netbeans.org/binaries/136A7EB3BB9B2559C5F9184B438F108C959B3C03-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116.jar
+	http://hg.netbeans.org/binaries/531746EBE57071AB7F8CCC7ACB0E806F25893916-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116.jar
+	http://hg.netbeans.org/binaries/D3ED088A49DE9E5163457E9279181DD4185BFBE6-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023.jar
+	http://hg.netbeans.org/binaries/8D4278A9F47D17A104182E59CF06D682B3DE0B3E-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055.jar
+	http://hg.netbeans.org/binaries/1FC011B8A350B70950B3F1D722D7F2890C6E76D8-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055.jar
+	http://hg.netbeans.org/binaries/6E914CA3075C8FDF7652F04A02868CF32F2EDCE3-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055.jar
+	http://hg.netbeans.org/binaries/8A2F6232978E0330A5D36F19BA0686F96FB980B5-org.tmatesoft.svnkit_1.8.4.r10218_v20140302_1242.jar
+	http://hg.netbeans.org/binaries/820FD32B3FB7F885996B15474F220BDCCACD6D27-processtreekiller-1.0.2.jar
+	http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar
+	http://hg.netbeans.org/binaries/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar
+	http://hg.netbeans.org/binaries/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar
+	http://hg.netbeans.org/binaries/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar
+	http://hg.netbeans.org/binaries/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.jar
+	http://hg.netbeans.org/binaries/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar
+	http://hg.netbeans.org/binaries/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar
+	http://hg.netbeans.org/binaries/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar
+	http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar
+	http://hg.netbeans.org/binaries/CE9A1C96875443F2FDD5127B750DA39CF4CE818B-com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.jar
+	http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar
+	http://hg.netbeans.org/binaries/6FC6098C230D7CBA5730106D379CBBB42F6EC48A-validator.jar
+	http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar
+	http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar
+	http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar
+	http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-platform-${PV}
+	dev-java/commons-httpclient:3
+	dev-java/commons-lang:2.1
+	dev-java/commons-logging:0
+	dev-java/icu4j:4.4
+	dev-java/iso-relax:0
+	dev-java/jdbc-mysql:0
+	dev-java/jdbc-postgresql:0
+	>=dev-java/json-simple-1.1:0
+	dev-java/jsr173:0
+	dev-java/jvyamlb:0
+	dev-java/log4j:0
+	dev-java/lucene:3.5
+	dev-java/rhino:1.6
+	dev-java/saxon:9
+	dev-java/smack:2.2
+	dev-java/sun-jaf:0
+	dev-java/tomcat-servlet-api:2.2
+	dev-java/ws-commons-util:0
+	dev-java/xerces:2"
+#	dev-vcs/subversion>=1.8.4:0[java] missing from the tree
+#	app-text/jing:0 our version is probably too old
+#	dev-java/commons-io:1 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/freemarker:2.3
+#	dev-java/ini4j:0 our version is too old
+#	dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours
+#	dev-java/trilead-ssh2:0 in overlay
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	dev-java/commons-codec:0
+	>=dev-java/jsch-0.1.46:0
+	dev-java/jzlib:0
+	${CDEPEND}
+	dev-java/javacc:0
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ide -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
+	ln -s "${DISTDIR}"/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar libs.nashorn/external/asm-all-4.0.jar || die
+	ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
+	ln -s "${DISTDIR}"/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar o.apache.commons.io/external/commons-io-1.4.jar || die
+	ln -s "${DISTDIR}"/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar libs.commons_net/external/commons-net-3.3.jar || die
+	ln -s "${DISTDIR}"/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip css.editor/external/css21-spec.zip || die
+	ln -s "${DISTDIR}"/53AFD6CAA1B476204557B0626E7D673FBD5D245C-css3-spec.zip css.editor/external/css3-spec.zip || die
+	ln -s "${DISTDIR}"/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip derby/external/derbysampledb.zip || die
+	ln -s "${DISTDIR}"/C40DFDACDF892D1BA14B540B32C11B6F34659931-exechlp-1.0.zip dlight.nativeexecution/external/exechlp-1.0.zip || die
+	ln -s "${DISTDIR}"/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar libs.freemarker/external/freemarker-2.3.19.jar || die
+	ln -s "${DISTDIR}"/75C30C488AD2A18A82C7FE3829F4A33FC7841643-glassfish-tooling-sdk-0.3-b054-246345.jar libs.glassfish.sdk/external/glassfish-tooling-sdk-0.3-b054-246345.jar || die
+	ln -s "${DISTDIR}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
+	ln -s "${DISTDIR}"/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar html.validation/external/html5-datatypes.jar || die
+	ln -s "${DISTDIR}"/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-html5doc.zip html.parser/external/html5doc.zip || die
+	ln -s "${DISTDIR}"/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar html.parser/external/htmlparser-1.2.1.jar || die
+	ln -s "${DISTDIR}"/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar libs.ini4j/external/ini4j-0.5.1.jar || die
+	ln -s "${DISTDIR}"/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar html.validation/external/io-xml-util.jar || die
+	ln -s "${DISTDIR}"/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar html.validation/external/iri.jar || die
+	ln -s "${DISTDIR}"/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip spellchecker.dictionary_en/external/ispell-enwl-3.1.20.zip || die
+	ln -s "${DISTDIR}"/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar c.googlecode.javaewah.JavaEWAH/external/JavaEWAH-0.7.9.jar || die
+	ln -s "${DISTDIR}"/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar xml.jaxb.api/external/jaxb-api.jar || die
+	ln -s "${DISTDIR}"/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip libs.jaxb/external/jaxb-api-doc.zip || die
+	ln -s "${DISTDIR}"/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar libs.jaxb/external/jaxb-impl.jar || die
+	ln -s "${DISTDIR}"/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar libs.jaxb/external/jaxb-xjc.jar || die
+	ln -s "${DISTDIR}"/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar libs.jaxb/external/jaxb1-impl.jar || die
+	ln -s "${DISTDIR}"/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar libs.javafx/external/jfxrt.jar || die
+	ln -s "${DISTDIR}"/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar html.validation/external/jing.jar || die
+	ln -s "${DISTDIR}"/DA6CE3C2EB334DB61EFA99CD66134619867368FA-js-corestubs.zip javascript2.editor/external/js-corestubs.zip || die
+	ln -s "${DISTDIR}"/997BF4A93B8A99E37AB51C9016D1D18CF5FF4B60-js-domstubs.zip javascript2.editor/external/js-domstubs.zip || die
+	ln -s "${DISTDIR}"/291540295937BAC426A5A5BDDB6D86604075F4C0-js-reststubs.zip javascript2.editor/external/js-reststubs.zip || die
+	ln -s "${DISTDIR}"/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.core-0.0.7.jar || die
+	ln -s "${DISTDIR}"/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.sshagent-0.0.7.jar || die
+	ln -s "${DISTDIR}"/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.pageant-0.0.7.jar || die
+	ln -s "${DISTDIR}"/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.usocket-jna-0.0.7.jar || die
+	ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.process/external/libpam4j-1.1.jar || die
+	ln -s "${DISTDIR}"/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar libs.nashorn/external/nashorn-02f810c26ff9-patched.jar || die
+	ln -s "${DISTDIR}"/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar html.validation/external/non-schema.jar || die
+	ln -s "${DISTDIR}"/7052E115041D04410A4519A61307502FB7C138E6-org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar o.eclipse.core.contenttype/external/org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar || die
+	ln -s "${DISTDIR}"/B19A4D998C76FE7A30830C96B9E3A47682F320FC-org.eclipse.core.jobs-3.5.101.jar o.eclipse.core.jobs/external/org.eclipse.core.jobs-3.5.101.jar || die
+	ln -s "${DISTDIR}"/E64EF6A3FC5DB01AD95632B843706CCE56614C90-org.eclipse.core.net_1.2.100.I20110511-0800.jar o.eclipse.core.net/external/org.eclipse.core.net_1.2.100.I20110511-0800.jar || die
+	ln -s "${DISTDIR}"/6658C235056134F7E86295E751129508802D71F2-org.eclipse.core.runtime-3.7.0.jar o.eclipse.core.runtime/external/org.eclipse.core.runtime-3.7.0.jar || die
+	ln -s "${DISTDIR}"/0CA9B9DF8A8E4C6805C60A5761C470FCE8AE828F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110.jar o.eclipse.core.runtime.compatibility.auth/external/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110.jar || die
+	ln -s "${DISTDIR}"/9C74D245214DB08E7EB9BC07A951B41CFE3E3648-org.eclipse.equinox.app-1.3.100.jar o.eclipse.equinox.app/external/org.eclipse.equinox.app-1.3.100.jar || die
+	ln -s "${DISTDIR}"/78E5D0B8516B042495660DA36CE5114650F8F156-org.eclipse.equinox.common_3.6.0.v20110523.jar o.eclipse.equinox.common/external/org.eclipse.equinox.common_3.6.0.v20110523.jar || die
+	ln -s "${DISTDIR}"/FD94003A1BCE42008753522BFED68E5A84B92644-org.eclipse.equinox.preferences-3.4.2.jar o.eclipse.equinox.preferences/external/org.eclipse.equinox.preferences-3.4.2.jar || die
+	ln -s "${DISTDIR}"/54AE046B40C9095C2637F8D21664C5CD76E34485-org.eclipse.equinox.registry_3.5.200.v20120522-1841.jar o.eclipse.equinox.registry/external/org.eclipse.equinox.registry_3.5.200.v20120522-1841.jar || die
+	ln -s "${DISTDIR}"/0FFB9B1D7CD992CE6C8AAEEC2F6F98DFBB1D2F91-org.eclipse.equinox.security-1.1.1.jar o.eclipse.equinox.security/external/org.eclipse.equinox.security-1.1.1.jar || die
+	ln -s "${DISTDIR}"/7FE73A21F4A078ABAAFACE4D2B03B5EB3D306F63-org.eclipse.jgit-3.4.1.201406201815-r.jar o.eclipse.jgit/external/org.eclipse.jgit-3.4.1.201406201815-r.jar || die
+	ln -s "${DISTDIR}"/49F1EFEBC8CECA5D514209BE18A048EB5707C0A7-org.eclipse.jgit.java7-3.4.1.201406201815-r.jar o.eclipse.jgit.java7/external/org.eclipse.jgit.java7-3.4.1.201406201815-r.jar || die
+	ln -s "${DISTDIR}"/A94F8F805202B28236FFBC03C1CA149129DAEA1C-org.eclipse.mylyn.bugzilla.core_3.10.0.20131024-1218.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.10.0.20131024-1218.jar || die
+	ln -s "${DISTDIR}"/19D64C17A692D2023E22B16AD515118DF6427790-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.10.0.20130926-1710.jar || die
+	ln -s "${DISTDIR}"/A1BF01D1DD09274446738C3F83360314B8881CD5-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.10.0.20131018-1210.jar || die
+	ln -s "${DISTDIR}"/136A7EB3BB9B2559C5F9184B438F108C959B3C03-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116.jar || die
+	ln -s "${DISTDIR}"/531746EBE57071AB7F8CCC7ACB0E806F25893916-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116.jar || die
+	ln -s "${DISTDIR}"/D3ED088A49DE9E5163457E9279181DD4185BFBE6-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023.jar || die
+	ln -s "${DISTDIR}"/8D4278A9F47D17A104182E59CF06D682B3DE0B3E-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055.jar || die
+	ln -s "${DISTDIR}"/1FC011B8A350B70950B3F1D722D7F2890C6E76D8-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055.jar || die
+	ln -s "${DISTDIR}"/6E914CA3075C8FDF7652F04A02868CF32F2EDCE3-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055.jar  || die
+	ln -s "${DISTDIR}"/8A2F6232978E0330A5D36F19BA0686F96FB980B5-org.tmatesoft.svnkit_1.8.4.r10218_v20140302_1242.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.4.r10218_v20140302_1242.jar || die
+	ln -s "${DISTDIR}"/820FD32B3FB7F885996B15474F220BDCCACD6D27-processtreekiller-1.0.2.jar extexecution.process/external/processtreekiller-1.0.2.jar || die
+	ln -s "${DISTDIR}"/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar libs.svnClientAdapter.svnkit/external/svnkit_1.7.8.r9538_v20130107_2001.jar || die
+	ln -s "${DISTDIR}"/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar o.apache.xml.resolver/external/resolver-1.2.jar || die
+	ln -s "${DISTDIR}"/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar libs.svnClientAdapter.svnkit/external/sqljet-1.1.10.jar || die
+	ln -s "${DISTDIR}"/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.10.3.jar || die
+	ln -s "${DISTDIR}"/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.10.3.jar || die
+	ln -s "${DISTDIR}"/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.10.3.jar || die
+	ln -s "${DISTDIR}"/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.jar libs.svnClientAdapter.javahl/external/svnjavahl-1.8.4.jar || die
+	ln -s "${DISTDIR}"/3B91269E9055504778F57744D24F505856698602-svnkit-1.7.0-beta4-20120316.233307-1.jar libs.svnClientAdapter.svnkit/external/svnkit-1.7.0-beta4-20120316.233307-1.jar || die
+	ln -s "${DISTDIR}"/015525209A02BD74254930FF844C7C13498B7FB9-svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar libs.svnClientAdapter.svnkit/external/svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar || die
+	ln -s "${DISTDIR}"/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar libs.swingx/external/swingx-all-1.6.4.jar || die
+	ln -s "${DISTDIR}"/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar httpserver/external/tomcat-webserver-3.2.jar || die
+	ln -s "${DISTDIR}"/CE9A1C96875443F2FDD5127B750DA39CF4CE818B-com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.jar || die
+	ln -s "${DISTDIR}"/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar swing.validation/external/ValidationAPI.jar || die
+	ln -s "${DISTDIR}"/6FC6098C230D7CBA5730106D379CBBB42F6EC48A-validator.jar html.validation/external/validator.jar || die
+	ln -s "${DISTDIR}"/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar extexecution.process/external/winp-1.14-patched.jar || die
+	ln -s "${DISTDIR}"/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar o.apache.xmlrpc/external/xmlrpc-client-3.0.jar || die
+	ln -s "${DISTDIR}"/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar o.apache.xmlrpc/external/xmlrpc-common-3.0.jar || die
+	ln -s "${DISTDIR}"/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar o.apache.xmlrpc/external/xmlrpc-server-3.0.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	popd >/dev/null || die
+
+	java-pkg_jar-from --build-only --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.49.jar
+	java-pkg_jar-from --build-only --into c.jcraft.jzlib/external jzlib jzlib.jar jzlib-1.0.7.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
+	java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar
+	java-pkg_jar-from --into html.parser/external icu4j-4.4 icu4j.jar icu4j-4_4_2.jar
+	java-pkg_jar-from --into html.validation/external iso-relax isorelax.jar isorelax.jar
+	java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
+	java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
+	# java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.19.jar
+	java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.3.jar
+	java-pkg_jar-from --into libs.lucene/external lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smack.jar smack.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smackx.jar smackx.jar
+	# java-pkg_jar-from --into libs.svnClientAdapter.javahl/external subversion svn-javahl.jar svnjavahl-1.8.4.jar
+	java-pkg_jar-from --into libs.xerces/external xerces-2 xercesImpl.jar xerces-2.8.0.jar
+	java-pkg_jar-from --build-only --into o.apache.commons.codec/external commons-codec commons-codec.jar apache-commons-codec-1.3.jar
+	java-pkg_jar-from --into o.apache.commons.httpclient/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.1.jar
+	java-pkg_jar-from --into o.apache.commons.lang/external commons-lang-2.1 commons-lang.jar commons-lang-2.4.jar
+	java-pkg_jar-from --into o.apache.commons.logging/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
+	java-pkg_jar-from --into o.apache.ws.commons.util/external ws-commons-util ws-commons-util.jar ws-commons-util-1.0.1.jar
+	java-pkg_jar-from --into servletapi/external tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
+	java-pkg_jar-from --into xml.jaxb.api/external sun-jaf activation.jar activation.jar
+	java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_1.0_api.jar
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	unset DISPLAY
+	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+	pushd nbbuild/netbeans/ide >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/ide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	rm -fr "${D}"/${INSTALL_DIR}/bin/nativeexecution || die
+	rm -fr "${D}"/${INSTALL_DIR}/modules/lib || die
+
+	insinto ${INSTALL_DIR}/bin/nativeexecution
+	doins bin/nativeexecution/*
+
+	pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution >/dev/null || die
+	for file in *.sh ; do
+		fperms 755 ${file}
+	done
+	popd >/dev/null || die
+
+	if use x86 ; then
+		doins -r bin/nativeexecution/Linux-x86
+		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86 >/dev/null || die
+		for file in * ; do
+			fperms 755 ${file}
+		done
+		popd >/dev/null || die
+	elif use amd64 ; then
+		doins -r bin/nativeexecution/Linux-x86_64
+		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86_64 >/dev/null || die
+		for file in * ; do
+			fperms 755 ${file}
+		done
+		popd >/dev/null || die
+	fi
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	# rm freemarker-2.3.19.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.19.jar || die
+	rm icu4j-4_4_2.jar && dosym /usr/share/icu4j-4.4/lib/icu4j.jar ${instdir}/icu4j-4_4_2.jar || die
+	rm isorelax.jar && dosym /usr/share/iso-relax/lib/isorelax.jar ${instdir}/isorelax.jar || die
+	rm json-simple-1.1.1.jar && dosym /usr/share/json-simple/lib/json-simple.jar ${instdir}/json-simple-1.1.1.jar || die
+	rm jvyamlb-0.2.3.jar && dosym /usr/share/jvyamlb/lib/jvyamlb.jar ${instdir}/jvyamlb-0.2.3.jar || die
+	rm log4j-1.2.15.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.15.jar || die
+	rm lucene-core-3.5.0.jar && dosym /usr/share/lucene-3.5/lib/lucene-core.jar ${instdir}/lucene-core-3.5.0.jar || die
+	rm mysql-connector-java-5.1.23-bin.jar && dosym /usr/share/jdbc-mysql/lib/jdbc-mysql.jar ${instdir}/mysql-connector-java-5.1.23-bin.jar || die
+	rm postgresql-9.2-1002.jdbc4.jar && dosym /usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar ${instdir}/postgresql-9.2-1002.jdbc4.jar || die
+	rm saxon9B.jar && dosym /usr/share/saxon-9/lib/saxon.jar ${instdir}/saxon9B.jar || die
+	rm servlet-2.2.jar && dosym /usr/share/tomcat-servlet-api-2.2/lib/servlet.jar ${instdir}/servlet-2.2.jar || die
+	rm smack.jar && dosym /usr/share/smack-2.2/lib/smack.jar ${instdir}/smack.jar || die
+	rm smackx.jar && dosym /usr/share/smack-2.2/lib/smackx.jar ${instdir}/smackx.jar || die
+	# rm svnjavahl.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl.jar || die
+	rm xerces-2.8.0.jar && dosym /usr/share/xerces-2/lib/xercesImpl.jar ${instdir}/xerces-2.8.0.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxb
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm activation.jar && dosym /usr/share/sun-jaf/lib/activation.jar ${instdir}/activation.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxb/api
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsr173_1.0_api.jar && dosym /usr/share/jsr173/lib/jsr173.jar ${instdir}/jsr173_1.0_api.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ide
+}

diff --git a/dev-java/netbeans-java/ChangeLog b/dev-java/netbeans-java/ChangeLog
index fb1aa37..3500ccb 100644
--- a/dev-java/netbeans-java/ChangeLog
+++ b/dev-java/netbeans-java/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-java-9999_p20141103 (03 Nov 2014)
+
+  03 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-java-9999_p20141103.ebuild:
+  bumped to the latest sources
+
 *netbeans-java-9999_p20141031 (31 Oct 2014)
 
   31 Oct 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 66c763a..4aa5ebf 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -105,6 +105,7 @@ DIST netbeans-trunk-nightly-201410170001-src.zip 197610191 SHA256 ece01ea8e2f656
 DIST netbeans-trunk-nightly-201410190001-src.zip 198848484 SHA256 239ac089ce10c7f9bb528c7885a1096edf90c34a449e0954123015da764964e4 SHA512 b6d330d6d7a82662b73c410877ce049e6a9258a3310383e515a4cfeb8597ea5c72b2adcb650a131b7a2dcda5d1260b4d927120cc6f4dfd667e6ec14e71c27daa WHIRLPOOL 48c59a25b584360cafb366df0fdb1acaf46612dc0a204b91841d0d9493b3b34056485005ad23db8ae05ae44c2d68798b603f68ce87e7012b2e63211db3fe3e8d
 DIST netbeans-trunk-nightly-201410300002-src.zip 198898097 SHA256 a8617a69f201a25d4bf0f78226885e73a6fedcd5c8620f115573fda6d617b444 SHA512 8c7c70c04260cda6225b6246e756ea285dd60f88490ff29b2f13195103f5fd3589a8ea0b30436a126a33663c5b25b1d7a7e2713804bb7fb23b2033038c229c08 WHIRLPOOL 61c3ceea8c2ba7d8f55515495b6cb47473d55b7a35c84632fd34edb34fe8c94393dc0b08252196d9132290db974aa03e15b897c0d8a9397bfdc957fa64ca9219
 DIST netbeans-trunk-nightly-201410310002-src.zip 198916747 SHA256 4f200798d8c10985c1e5fa7c9e523564808e508a3f19737a3effa9aef7d8808e SHA512 e7aae2121699e1d8b19df3406c1eae8e1573a64b11ecfae2c110df895ceaf114585643e064b781896f6956747169265aecd317018eef324f3ba2d3571020c76d WHIRLPOOL 8ef1ebedc044af25a3219c24d38e677ffd89ffb91cfb0d017373d60c3c1c3d27ee0065c6ea68b003fb8ef28a3b7c6c7e64a110e1f670f989f1a038efbef406a0
+DIST netbeans-trunk-nightly-201411030002-src.zip 198928747 SHA256 4101f4b4ca15f57435d9973d7ca3e1d742744515af454add071132034944df53 SHA512 890d8331fbe66022c65ce2aa71af4c88f23a75d101a90f0c0f63b3bf63307abcf47362064d685ecb26ae27405fcbb5e051ca798151505717f5d43d7f4adb37f5 WHIRLPOOL fa908bb07de1375432cbb2cb4cc9ba669e8042bb2e4b29b4a2ba95e994fac7043a9883df7f046a3928b8f4774ae82272855e73e644b58c5782f8afd27006ef1f
 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
@@ -129,5 +130,6 @@ EBUILD netbeans-java-9999_p20141017.ebuild 13405 SHA256 ce43ebf3a6ac4c65c66a3d32
 EBUILD netbeans-java-9999_p20141019.ebuild 13405 SHA256 666c0c0675acced3d4f3ce160e71c673f9a10b31699c2cc7eaf6ed4d37294f11 SHA512 bf68d63e0ac780674299de13c6625d8d5b39b632a881ae153eb0733da482e7995a016cdfbc81fcb3fddc9f94ec23a5a101974f4a067861cdfe5c268ab36e7b5b WHIRLPOOL 3b7a4813d634ebe35acc1a43e788d05ca6e32f7aebba7e7604c3f5b2f7c0312abb3137e512469f11ae2a7d1e8c449b083e64f8b9b91e9ade259e70a9fef198ed
 EBUILD netbeans-java-9999_p20141030.ebuild 13405 SHA256 a02170d183b689afe51a72d86204e6e30de3ddcfee9299c54f42433723bdcba8 SHA512 db43a73bbc75bd623c3da89598df974fbc9484ed0e7d6cbdb9f101917daa84951a8c2ffb8131f5b827b47e1706e64d3adae0eb01ef068912ce292072052f5a2a WHIRLPOOL f7c37c3fbc813f07c49eee2f178b7be790ea0e8285f049e94a394eda746b674499389f831d6d98330932d642f771e4690c3856d4df99ca14d47d34f73eb35f7d
 EBUILD netbeans-java-9999_p20141031.ebuild 13405 SHA256 6354e891f03f0a2899c817f30b9a1c48a09d58b27bbf9e8b5c668c7afedd58a8 SHA512 7ccb5fb01bde1933bcb191436a9aef75c6201d611a90babddc1c1f0d4b6be3cc7b91098cc43d60a7f859e4d575b4017b02778c7cca20052663a3d1170b5eae03 WHIRLPOOL 753f03626ed058c626fa7d653bfb76bd2c14bfce0b29b79ff9587dcae7b26b05d47ad3566fec3395e3e4f5918968d34823d264d456edae263f429b928fd35f46
-MISC ChangeLog 130727 SHA256 1738eb41a4c9dd5ac38eacc471d264aeedf67fc62bff877ef746dca5d9038ecd SHA512 780811af140e6cb8038db3efdb996671a81d9ef59f6ff672387b16bee28692c0f93483874a11665404172a070ddc920d95a3f2485cc84d0a259458cf1ce7c896 WHIRLPOOL 57a09316b4dcd871605b8449c49558e9f4aec73bc4695f572e7fbed5fe977bf9c48e71b67a313be898730b889ec694233efbf69fbfd47e75e25bb877e07dc0aa
+EBUILD netbeans-java-9999_p20141103.ebuild 13405 SHA256 b6e0d6afe7b4f10f51efc09ea617f12a5dd7add3de3f838009045f9310e4c48d SHA512 524f1b4a46fea46d4c4f6f1ee76eda7fc8a1f3cf1cfe75a1beb53a75eed01bf85b32797ccc4a64682492a352ff998762a23b91b8144f2746220faba4d85967f5 WHIRLPOOL 2c3ec4f12256e2fc578ce1e7c19b47ae9c0d80341f2011e8a7d48b9188dc57365a8c96d12726e3cd6fae03e515ea2000124146bb6b9cb1a4d52452f1f039c9bb
+MISC ChangeLog 130896 SHA256 de8d38124d8d5d443672bcdf0f0468fc7c7f96eacde186ad54d4749f1f9c5b1c SHA512 cb822862e32434bd463139430ba4248fe055cfb669130eb714f5321212c93aa2791160ce2e38d2f2ea95cc49f540f15ec06f3d7af0697d8342151ba56ec7ceb7 WHIRLPOOL 03a037e25fa60411ffad3c757b5359a184a8eb44e334ab09463114deff9285dcc87f52ffe3244a6c55392b7c5385cd7b5cc68f5eb2a58322830d4d9210789d3a
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20141103.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20141103.ebuild
new file mode 100644
index 0000000..536ce89
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20141103.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2014 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/2014-11-03_00-02-02/zip/netbeans-trunk-nightly-201411030002-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/2B9EAB164D8748F9793F6A0D29B6463E97B284DA-indexer-core-5.1.1.jar
+	http://hg.netbeans.org/binaries/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar
+	http://hg.netbeans.org/binaries/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar
+	http://hg.netbeans.org/binaries/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip
+	http://hg.netbeans.org/binaries/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip
+	http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip
+	http://hg.netbeans.org/binaries/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip
+	http://hg.netbeans.org/binaries/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar
+	http://hg.netbeans.org/binaries/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar
+	http://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar
+	http://hg.netbeans.org/binaries/E5579EF3B0C1EF2F43562DD0C3B32F8E1F603B49-nb-javac-api.jar
+	http://hg.netbeans.org/binaries/7B5CF580E4F9760727BBD7964E5B7664B243AA75-nb-javac-impl.jar
+	http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
+	http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar
+	http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip
+	http://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/beansbinding:0
+	dev-java/cglib:2.2
+	dev-java/jdom:1.0"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/json-simple:0
+	dev-java/junit:4"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}
+	dev-java/absolutelayout:0
+	dev-java/antlr:0[java]
+	dev-java/c3p0:0
+	dev-java/cglib:2.1
+	dev-java/commons-collections:0
+	dev-java/dom4j:1
+	dev-java/fastinfoset:0
+	dev-java/glassfish-transaction-api:0
+	dev-java/javassist:3
+	dev-java/jboss-logging:0
+	dev-java/jsr67:0
+	dev-java/jsr181:0
+	dev-java/jtidy:0
+	dev-java/log4j:0
+	dev-java/mimepull:0
+	dev-java/saaj:0
+	dev-java/stax-ex:0
+	dev-java/xmlstreambuffer:0"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.java -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+pkg_pretend() {
+	local die_now=""
+
+	if [ -d /usr/share/netbeans-java-${SLOT}/ant ]; then
+		if [ -n "$(find /usr/share/netbeans-java-${SLOT}/ant -type l)" ]; then
+			eerror "Please remove following symlinks and run emerge again:"
+			find /usr/share/netbeans-java-${SLOT}/ant -type l
+			die_now="1"
+		fi
+	fi
+
+	if [ -L /usr/share/netbeans-java-${SLOT}/maven ]; then
+		if [ -z "${die_now}" ]; then
+			eerror "Please remove following symlinks and run emerge again:"
+		fi
+
+		echo "/usr/share/netbeans-java-${SLOT}/maven"
+		die_now="1"
+	fi
+
+	if [ -n "${die_now}" ]; then
+		die "Symlinks exist"
+	fi
+}
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip maven.embedder/external/apache-maven-3.0.5-bin.zip || die
+	ln -s "${DISTDIR}"/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip o.jdesktop.beansbinding/external/beansbinding-1.2.1-doc.zip || die
+	ln -s "${DISTDIR}"/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar j2ee.eclipselink/external/eclipselink.jar || die
+	ln -s "${DISTDIR}"/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip hibernate4lib/external/hibernate-release-4.3.1-lib.zip || die
+	ln -s "${DISTDIR}"/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar maven.indexer/external/indexer-artifact-5.1.1.jar || die
+	ln -s "${DISTDIR}"/2B9EAB164D8748F9793F6A0D29B6463E97B284DA-indexer-core-5.1.1.jar maven.indexer/external/indexer-core-5.1.1.jar || die
+	ln -s "${DISTDIR}"/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar maven/external/jarjar-1.4.jar || die
+	ln -s "${DISTDIR}"/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar j2ee.eclipselink/external/javax.persistence_2.1.0.v201304241213.jar || die
+	ln -s "${DISTDIR}"/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip websvc.jaxws21/external/jaxws-2.2.6.zip || die
+	ln -s "${DISTDIR}"/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip websvc.jaxws21api/external/jaxws-2.2.6-api.zip || die
+	ln -s "${DISTDIR}"/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip websvc.jaxws21/external/jaxws-api-doc.zip || die
+	ln -s "${DISTDIR}"/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip j2ee.eclipselink/external/JPAjavadocs04032013.zip || die
+	ln -s "${DISTDIR}"/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar maven.indexer/external/lucene-core-3.6.2.jar || die
+	ln -s "${DISTDIR}"/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar maven.indexer/external/lucene-highlighter-3.6.2.jar || die
+	ln -s "${DISTDIR}"/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar maven.embedder/external/maven-dependency-tree-2.0.jar || die
+	ln -s "${DISTDIR}"/E5579EF3B0C1EF2F43562DD0C3B32F8E1F603B49-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
+	ln -s "${DISTDIR}"/7B5CF580E4F9760727BBD7964E5B7664B243AA75-nb-javac-impl.jar libs.javacimpl/external/nb-javac-impl.jar || die
+	ln -s "${DISTDIR}"/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar || die
+	ln -s "${DISTDIR}"/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselinkmodelgen/external/org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar || die
+	ln -s "${DISTDIR}"/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip libs.springframework/external/spring-framework-3.2.7.RELEASE.zip || die
+	ln -s "${DISTDIR}"/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip libs.springframework/external/spring-framework-4.0.1.RELEASE.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.cglib/external cglib-2.2 cglib.jar cglib-2.2.jar
+	java-pkg_jar-from --build-only --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.10.jar
+	java-pkg_jar-from --into maven.embedder/external jdom-1.0 jdom.jar jdom-1.0.jar
+	java-pkg_jar-from --into o.jdesktop.beansbinding/external beansbinding beansbinding.jar beansbinding-1.2.1.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/java >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+	grep -E "/java$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	chmod 755 "${D}"/${INSTALL_DIR}/maven/bin/mvn* || die
+	rm -fr "${D}"/${INSTALL_DIR}/maven/bin/*.bat || die
+
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm AbsoluteLayout.jar  && dosym /usr/share/absolutelayout/lib/absolutelayout.jar ${instdir}/AbsoluteLayout.jar || die
+	rm beansbinding-1.2.1.jar && dosym /usr/share/beansbinding/lib/beansbinding.jar ${instdir}/beansbinding-1.2.1.jar || die
+	rm cglib-2.2.jar && dosym /usr/share/cglib-2.2/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/hibernate4
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm antlr-2.7.7.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.7.jar || die
+	rm c3p0-0.9.2.1.jar && dosym /usr/share/c3p0/lib/c3p0.jar ${instdir}/c3p0-0.9.2.1.jar || die
+	rm cglib-2.2.jar && dosym /usr/share/cglib-2.1/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
+	rm commons-collections-3.2.1.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections-3.2.1.jar || die
+	rm dom4j-1.6.1.jar && dosym /usr/share/dom4j-1/lib/dom4j.jar ${instdir}/dom4j-1.6.1.jar || die
+	rm javassist-3.18.1-GA.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist-3.18.1-GA.jar || die
+	rm jboss-logging-3.1.3.GA.jar && dosym /usr/share/jboss-logging/lib/jboss-logging.jar ${instdir}/jboss-logging-3.1.3.GA.jar || die
+	rm jboss-transaction-api_1.2_spec-1.0.0.Final.jar && dosym /usr/share/glassfish-transaction-api/lib/jta.jar ${instdir}/jboss-transaction-api_1.2_spec-1.0.0.Final.jar || die
+	rm jtidy-r8-20060801.jar && dosym /usr/share/jtidy/lib/Tidy.jar ${instdir}/jtidy-r8-20060801.jar || die
+	rm log4j-1.2.12.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.12.jar || die
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext/jaxws22
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm FastInfoset.jar && dosym /usr/share/fastinfoset/lib/fastinfoset.jar ${instdir}/FastInfoset.jar || die
+	rm mimepull.jar && dosym /usr/share/mimepull/lib/mimepull.jar ${instdir}/mimepull.jar || die
+	rm saaj-impl.jar && dosym /usr/share/saaj/lib/saaj.jar ${instdir}/saaj-impl.jar || die
+	rm stax-ex.jar && dosym /usr/share/stax-ex/lib/stax-ex.jar ${instdir}/stax-ex.jar || die
+	rm streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/streambuffer.jar ${instdir}/streambuffer.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxws22/api
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
+	rm saaj-api.jar && dosym /usr/share/jsr67/lib/jsr67.jar ${instdir}/saaj-api.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/maven
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jdom-1.0.jar && dosym /usr/share/jdom-1.0/lib/jdom.jar ${instdir}/jdom-1.0.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java
+}

diff --git a/dev-java/netbeans-javacard/ChangeLog b/dev-java/netbeans-javacard/ChangeLog
index 9eccd85..f1981be 100644
--- a/dev-java/netbeans-javacard/ChangeLog
+++ b/dev-java/netbeans-javacard/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javacard-9999_p20141103 (03 Nov 2014)
+
+  03 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javacard-9999_p20141103.ebuild:
+  bumped to the latest sources
+
 *netbeans-javacard-9999_p20141031 (31 Oct 2014)
 
   31 Oct 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index ada4695..3382a9b 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201410170001-src.zip 197610191 SHA256 ece01ea8e2f656
 DIST netbeans-trunk-nightly-201410190001-src.zip 198848484 SHA256 239ac089ce10c7f9bb528c7885a1096edf90c34a449e0954123015da764964e4 SHA512 b6d330d6d7a82662b73c410877ce049e6a9258a3310383e515a4cfeb8597ea5c72b2adcb650a131b7a2dcda5d1260b4d927120cc6f4dfd667e6ec14e71c27daa WHIRLPOOL 48c59a25b584360cafb366df0fdb1acaf46612dc0a204b91841d0d9493b3b34056485005ad23db8ae05ae44c2d68798b603f68ce87e7012b2e63211db3fe3e8d
 DIST netbeans-trunk-nightly-201410300002-src.zip 198898097 SHA256 a8617a69f201a25d4bf0f78226885e73a6fedcd5c8620f115573fda6d617b444 SHA512 8c7c70c04260cda6225b6246e756ea285dd60f88490ff29b2f13195103f5fd3589a8ea0b30436a126a33663c5b25b1d7a7e2713804bb7fb23b2033038c229c08 WHIRLPOOL 61c3ceea8c2ba7d8f55515495b6cb47473d55b7a35c84632fd34edb34fe8c94393dc0b08252196d9132290db974aa03e15b897c0d8a9397bfdc957fa64ca9219
 DIST netbeans-trunk-nightly-201410310002-src.zip 198916747 SHA256 4f200798d8c10985c1e5fa7c9e523564808e508a3f19737a3effa9aef7d8808e SHA512 e7aae2121699e1d8b19df3406c1eae8e1573a64b11ecfae2c110df895ceaf114585643e064b781896f6956747169265aecd317018eef324f3ba2d3571020c76d WHIRLPOOL 8ef1ebedc044af25a3219c24d38e677ffd89ffb91cfb0d017373d60c3c1c3d27ee0065c6ea68b003fb8ef28a3b7c6c7e64a110e1f670f989f1a038efbef406a0
+DIST netbeans-trunk-nightly-201411030002-src.zip 198928747 SHA256 4101f4b4ca15f57435d9973d7ca3e1d742744515af454add071132034944df53 SHA512 890d8331fbe66022c65ce2aa71af4c88f23a75d101a90f0c0f63b3bf63307abcf47362064d685ecb26ae27405fcbb5e051ca798151505717f5d43d7f4adb37f5 WHIRLPOOL fa908bb07de1375432cbb2cb4cc9ba669e8042bb2e4b29b4a2ba95e994fac7043a9883df7f046a3928b8f4774ae82272855e73e644b58c5782f8afd27006ef1f
 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
@@ -56,5 +57,6 @@ EBUILD netbeans-javacard-9999_p20141017.ebuild 4982 SHA256 91642f2e348d57e5a6668
 EBUILD netbeans-javacard-9999_p20141019.ebuild 4982 SHA256 32cb43c9bacfc9138a548eb991050e14349094b2c46f296de15954dfb03bbe18 SHA512 2a473977bbd5a9a667279d977ea6ae7b007f53e3fd4bdbf2bd84ba017be5d5abf8558df72ae666e09d1c617b419db3815fb90293ec3fe86811787395ca6798ea WHIRLPOOL 829cc304b7ddc79e31e8d465e5144546429a458d5d55bfdb123e951d96ab2753b3986f7f6c0653ac5d17f0d1c7f525c6b4fcb757238a6e4fcd081ac9b5a07b12
 EBUILD netbeans-javacard-9999_p20141030.ebuild 4982 SHA256 a0c9682d09a84e799e8fabd7b1f1986b7f967d71bd305b863887d5785c4b51e1 SHA512 c04485c5ca77cfd916caa9040f09cb8d59a69daf82bda74b5b8ceb90520355b7ff574a121f7ab342a85ae3f0bf8f0f0b36a8cbfed82b2c7052ac6fdb5a324933 WHIRLPOOL 44ab4b8ff0218e89b9d4208ec184ee41ace866d6be23a0a7b22d239ee28bd20914dbc5d4c1ae2484b2136c30b5d388be38498c0a8f2ecf14ac6580115b362f4f
 EBUILD netbeans-javacard-9999_p20141031.ebuild 4982 SHA256 338921b979a21d6ef1b42f54c082bc6792ecd047fa503f4194a57987c4148206 SHA512 f0eab4701445213111d9ab193a6ca967f56fe092cdedcc2186db433556597382d388131155445ee0df2b16b1dfcbd28d55471fc2d9919a6eacfce0ee9ab19712 WHIRLPOOL 97fd22102234091a6ebe169d063acfc0f43d87be182d8be77093cf7eac11cb0a1b46583bb9fcda14d02656a00b2bd375e633d330218ceec72923884808297a2b
-MISC ChangeLog 136081 SHA256 8a631633c391bd89e124e49c7268cabf04c682f724850702c969d0f7ac567043 SHA512 e7828a94a0c39c6bc22f1e1d89ac8051a06f9010037cd199c7046cf790fb689570ce5a22984ce822a333e0f525f30fa44596e3368b1a23d6e5be5c6f1d46e09a WHIRLPOOL bdb9d6285792bc235c13a8d66c2294b251d1cf1d09ab8df7a04e0fc8ace5ae46edf8bc3fc58c62f9e5debd02133472ba5575bf1bd3ff1b09019e2ed22c8b3813
+EBUILD netbeans-javacard-9999_p20141103.ebuild 4982 SHA256 ec3162099e828246c676e3169fee1d9699ca55dfdc46fe601b08fcb7856afe9b SHA512 a6cbb4f650af91392289f2e80707aac8ea6a28cad01ca1c6b849a0cf89c05dbbac63257a3adf2555eebedea07e5165fedce28a0b651885483523c22878d09329 WHIRLPOOL 71e30b10a88b7655e42aa035926a88b9955657353866f943263498aa4285241a6bbf0fb40e3dd9fdd943a826b18d4102292029e12e805c20c84c7e3e4d7f772a
+MISC ChangeLog 136258 SHA256 6a2c401cde75d9968dd8893fcf8e05fc4db7f00018c35896ec2b45acf9492a00 SHA512 630c9a515531b366070051a6b47c86eab8f1ed9e06446f6866952402936dbe7df1446912f0f249c593858186299f66c8a176c0dc2d8e1e7f905719eb842482bd WHIRLPOOL 95c9dda756908c00619943f348d3392afa833c0e29641d110bdf65091bb064c44a8b0bc0708526ba548f6e39d1fd3c909f2a6e2b727f0a7e563cb3b6bfb1ca21
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20141103.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20141103.ebuild
new file mode 100644
index 0000000..08e825f
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20141103.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2014 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/2014-11-03_00-02-02/zip/netbeans-trunk-nightly-201411030002-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 a712867..c0d09c9 100644
--- a/dev-java/netbeans-javadoc/ChangeLog
+++ b/dev-java/netbeans-javadoc/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javadoc-9999_p20141103 (03 Nov 2014)
+
+  03 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javadoc-9999_p20141103.ebuild:
+  bumped to the latest sources
+
 *netbeans-javadoc-9999_p20141031 (31 Oct 2014)
 
   31 Oct 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index 4f1ae0a..5751e02 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201410170001-src.zip 197610191 SHA256 ece01ea8e2f656
 DIST netbeans-trunk-nightly-201410190001-src.zip 198848484 SHA256 239ac089ce10c7f9bb528c7885a1096edf90c34a449e0954123015da764964e4 SHA512 b6d330d6d7a82662b73c410877ce049e6a9258a3310383e515a4cfeb8597ea5c72b2adcb650a131b7a2dcda5d1260b4d927120cc6f4dfd667e6ec14e71c27daa WHIRLPOOL 48c59a25b584360cafb366df0fdb1acaf46612dc0a204b91841d0d9493b3b34056485005ad23db8ae05ae44c2d68798b603f68ce87e7012b2e63211db3fe3e8d
 DIST netbeans-trunk-nightly-201410300002-src.zip 198898097 SHA256 a8617a69f201a25d4bf0f78226885e73a6fedcd5c8620f115573fda6d617b444 SHA512 8c7c70c04260cda6225b6246e756ea285dd60f88490ff29b2f13195103f5fd3589a8ea0b30436a126a33663c5b25b1d7a7e2713804bb7fb23b2033038c229c08 WHIRLPOOL 61c3ceea8c2ba7d8f55515495b6cb47473d55b7a35c84632fd34edb34fe8c94393dc0b08252196d9132290db974aa03e15b897c0d8a9397bfdc957fa64ca9219
 DIST netbeans-trunk-nightly-201410310002-src.zip 198916747 SHA256 4f200798d8c10985c1e5fa7c9e523564808e508a3f19737a3effa9aef7d8808e SHA512 e7aae2121699e1d8b19df3406c1eae8e1573a64b11ecfae2c110df895ceaf114585643e064b781896f6956747169265aecd317018eef324f3ba2d3571020c76d WHIRLPOOL 8ef1ebedc044af25a3219c24d38e677ffd89ffb91cfb0d017373d60c3c1c3d27ee0065c6ea68b003fb8ef28a3b7c6c7e64a110e1f670f989f1a038efbef406a0
+DIST netbeans-trunk-nightly-201411030002-src.zip 198928747 SHA256 4101f4b4ca15f57435d9973d7ca3e1d742744515af454add071132034944df53 SHA512 890d8331fbe66022c65ce2aa71af4c88f23a75d101a90f0c0f63b3bf63307abcf47362064d685ecb26ae27405fcbb5e051ca798151505717f5d43d7f4adb37f5 WHIRLPOOL fa908bb07de1375432cbb2cb4cc9ba669e8042bb2e4b29b4a2ba95e994fac7043a9883df7f046a3928b8f4774ae82272855e73e644b58c5782f8afd27006ef1f
 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
@@ -59,5 +60,6 @@ EBUILD netbeans-javadoc-9999_p20141017.ebuild 6234 SHA256 5fe713d48bb25457cae5dc
 EBUILD netbeans-javadoc-9999_p20141019.ebuild 6234 SHA256 1c4beafabc4e113c156bfc9ea9e9b57395a924034c0892c24db1c95d8180749d SHA512 ee2a47ac55f6815f762bdb26b6a4e25fdf20ef000153150232672be5d058d9cd8a09f8b40ad4171c10cf0738220b1228ce356041c1250280bb3a730095f20aaf WHIRLPOOL feeb08f51a1a356ed2483187a0abe56cdcdbc6e4ba37cb1645a91d4995af27cd08c3a84cf38130e13164c401a8c19c0af4dce522fad8b5ed503fbeae52a86f13
 EBUILD netbeans-javadoc-9999_p20141030.ebuild 6234 SHA256 a11d0f4b55b70970a3b58486e0f9e492bb51c85d9cd85db3eac8389b26ef47a6 SHA512 96481cc66d75717f42676743e13155c32d2467ca05aa61e148489be4984f38cfbe044031ff116af73bc5624e2352bd95124b0b97e982a441e1d7a535320a1111 WHIRLPOOL a60ea3c1515771b30fef69714118a2d6e47492a8bb535daf0c7181a2a0a6a72042b41681cd85041dad404d24ec24b5280b7cf0839cd6db8bf7e573273e7b6262
 EBUILD netbeans-javadoc-9999_p20141031.ebuild 6234 SHA256 a8de92a4f78a89ef291ccae61290b69688327073e9b1cd90a7c17eda59596db9 SHA512 8a9d4f1301ecf501ad9a8ec16dfcf00b9dd41422abc9061d9405e4af65d0a349a60c543750f9b27f10c92a20749fdbe332cab737960ab50aac2ef8c3940b1039 WHIRLPOOL 59dc62f2e209d1d409e0509bc2c1b14548e09746e9528928c127b25c5ddbc787e91e6f135ae0538229e623ffa0cd688594b52afd836d7d8e62d6442dffff6ec1
-MISC ChangeLog 134231 SHA256 652acf8d48b7fb1d254bda589949086a5548b1850f56383380f64b6f3ada5473 SHA512 3b7445e1c8d5fdd525df4eeaa4c75fe2373918dc2f2a10269bbcda09f31cf31fdd8db07566d8efae9210c0bf25ef102a584c95e306b09da333c861f9221ce79b WHIRLPOOL 811f23ca7f55f65a116ead0d9fca365d39d09298448f2c8765e4e62612e0ca0cc6660a08701f31b8c48d8f36972b85ec246c3cf4d52b8c9df22ad22a4356483d
+EBUILD netbeans-javadoc-9999_p20141103.ebuild 6234 SHA256 a6bc8c1fca878f6b43649a3c8c88f44081d7e47fdfae8e053b02f1fad09c8b14 SHA512 1d4246e801b45072722333ff37442d8810c886bcaae4b33084734f5f672bb44330666cf12619efb846fa116ec3157a18b43ad873e6ecc822b08140ef2a8e80f8 WHIRLPOOL 4af945e699be15cfe41a654ad6940e8070c87bad2957e0957de50552f617e21056953150773b03ddea4a7732673ec15295ca0b786019477390c69f07bdbb6c82
+MISC ChangeLog 134406 SHA256 a5694ddb7d43a8378ae25f74abb48a011af1f48ba4f66f7eed6b3da53a5aad41 SHA512 811e44d7d0f97524abc15191bd6e244f4df975d7c8aaa2f83a2531153fc2ee19778f9145c2e6ddb6c10e3b35afdf65f99878c97c7e1569b38b79fad46f7def9b WHIRLPOOL 13de963e1e6a35c69c4997a30efe31cf1576c44351da48fd8241db7bfe71df117978f04eaba737a54ff2bf93bb69ba9fcffb19dcab082ca6e3a0232b5a34ce72
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-javafx/ChangeLog b/dev-java/netbeans-javafx/ChangeLog
index dfebebb..24c8399 100644
--- a/dev-java/netbeans-javafx/ChangeLog
+++ b/dev-java/netbeans-javafx/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javafx-9999_p20141103 (03 Nov 2014)
+
+  03 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javafx-9999_p20141103.ebuild:
+  bumped to the latest sources
+
 *netbeans-javafx-9999_p20141031 (31 Oct 2014)
 
   31 Oct 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index f742597..6e32f52 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201410170001-src.zip 197610191 SHA256 ece01ea8e2f656
 DIST netbeans-trunk-nightly-201410190001-src.zip 198848484 SHA256 239ac089ce10c7f9bb528c7885a1096edf90c34a449e0954123015da764964e4 SHA512 b6d330d6d7a82662b73c410877ce049e6a9258a3310383e515a4cfeb8597ea5c72b2adcb650a131b7a2dcda5d1260b4d927120cc6f4dfd667e6ec14e71c27daa WHIRLPOOL 48c59a25b584360cafb366df0fdb1acaf46612dc0a204b91841d0d9493b3b34056485005ad23db8ae05ae44c2d68798b603f68ce87e7012b2e63211db3fe3e8d
 DIST netbeans-trunk-nightly-201410300002-src.zip 198898097 SHA256 a8617a69f201a25d4bf0f78226885e73a6fedcd5c8620f115573fda6d617b444 SHA512 8c7c70c04260cda6225b6246e756ea285dd60f88490ff29b2f13195103f5fd3589a8ea0b30436a126a33663c5b25b1d7a7e2713804bb7fb23b2033038c229c08 WHIRLPOOL 61c3ceea8c2ba7d8f55515495b6cb47473d55b7a35c84632fd34edb34fe8c94393dc0b08252196d9132290db974aa03e15b897c0d8a9397bfdc957fa64ca9219
 DIST netbeans-trunk-nightly-201410310002-src.zip 198916747 SHA256 4f200798d8c10985c1e5fa7c9e523564808e508a3f19737a3effa9aef7d8808e SHA512 e7aae2121699e1d8b19df3406c1eae8e1573a64b11ecfae2c110df895ceaf114585643e064b781896f6956747169265aecd317018eef324f3ba2d3571020c76d WHIRLPOOL 8ef1ebedc044af25a3219c24d38e677ffd89ffb91cfb0d017373d60c3c1c3d27ee0065c6ea68b003fb8ef28a3b7c6c7e64a110e1f670f989f1a038efbef406a0
+DIST netbeans-trunk-nightly-201411030002-src.zip 198928747 SHA256 4101f4b4ca15f57435d9973d7ca3e1d742744515af454add071132034944df53 SHA512 890d8331fbe66022c65ce2aa71af4c88f23a75d101a90f0c0f63b3bf63307abcf47362064d685ecb26ae27405fcbb5e051ca798151505717f5d43d7f4adb37f5 WHIRLPOOL fa908bb07de1375432cbb2cb4cc9ba669e8042bb2e4b29b4a2ba95e994fac7043a9883df7f046a3928b8f4774ae82272855e73e644b58c5782f8afd27006ef1f
 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
@@ -57,5 +58,6 @@ EBUILD netbeans-javafx-9999_p20141017.ebuild 4723 SHA256 7ad151c1e6e691177aa1127
 EBUILD netbeans-javafx-9999_p20141019.ebuild 4723 SHA256 0706f05dcf871cafd6fffb892a88700455d80891fee49d320b3b4a15ffe06aea SHA512 a37f7b3fd327b908198bb944b201f2e77b700998317bf423cde7788b6ec3097782e92230bc79941630053525b571056a2720a99368c4c4fe183d7a753ca61bf9 WHIRLPOOL acfe940ab9d531f9b3ee5716e00267bc6f2c834e1b371ddd7d4e2e178a72dc4ff1b2e8086bd38b6e663a57222d92fb1f9304d0663860ea9407f11d5503a64327
 EBUILD netbeans-javafx-9999_p20141030.ebuild 4723 SHA256 3a90132501f253ac5c41c5e33e0b647201c6f6b9893ac6a25e82c71754982cf2 SHA512 2bb4b98790693666cd53f94f5c5bf4e23710f446bbc7dec226b3f1badd2f1a2c4e57e9ee78e625ad69df4dc256adf3ed5421d81bd3e0a4b84d9bc2d2d8d3a5d4 WHIRLPOOL 6a1e7d16b0b0cfc922f2bc803e1a8adb9d6cf8b94038be30e8a26f610bcfaddd838c050151cea8350c1c5f9a9dbfb2b11fa963fcce00f274498fb33261f53316
 EBUILD netbeans-javafx-9999_p20141031.ebuild 4723 SHA256 8a02350a07e1546599ea526b1fb50dd9d5afaf00b650f215473ada08bead514b SHA512 bbd53ec1ede67f3e792477dc12f3462904bf840f83ad05a8fec9668b79627b0ed430af2926b015d39680f60292d79cf562cd67b6a2129b7fe7b9a26283463843 WHIRLPOOL e539e20a78dc8c6bb7f771a7a05e4f7bfdfdd36e7c6e3161cea4fcd66ba8949d2544b532187a238517e308a00ec7fa4fe4aef61216da26448d849402cadce394
-MISC ChangeLog 119248 SHA256 4a1d68e8e5b8f4dea440e94eabb14401b3b4f8efefc0bd4d49d9d6c8873ea995 SHA512 cbeb7fec5d419bae37c32e8aa93745fe1cab7a79e4636e41f22453c56502241c1d4201a7a190b63e05403889cd099c009e9477618b9df068a0ceb555fcb938d6 WHIRLPOOL 17191ccf9e7eaa6330fb5b250e9a9c9edaa39b1a4003a41c87a6d946388e8f196d96286229f1f5f1c9a51374a07582d9cc621a226f3274e21ac372f9a20c0bca
+EBUILD netbeans-javafx-9999_p20141103.ebuild 4723 SHA256 9f5c07e0def8292adb58b88def3a308e1ee72d5e50e362cad25f16576db80061 SHA512 442d329582878c0053f9d3db4f0fd6293b2e75df735e1b23b307d600a967a8b85f15170589ff7d4c0810f1f5e168b9a30a637bddf08463b2b8dbd8396bb2d765 WHIRLPOOL 19e266590fed3b0420d361cbd10bb9e654609746df5b1be9d2a785e10f65f590e062b3c0435ea13b5ee11b0b6457d1713c849bca6aa58523af315150e2bb6047
+MISC ChangeLog 119421 SHA256 65a2c7fb35ae5d0655dc097fc8d2d8b5f5227c912b79bcb467cd450433d3c5b9 SHA512 9e458cbb9c3d6181c3dc05bbcbf5de6ea704f5078f177988c9621b2893082431d54fdaf6b5727c13abd33f7232f852007e3e59b7a821e598e5216601129b9732 WHIRLPOOL 0f158c0e798f2d85ae19ff8776676f890ba49597e7c3e695380083e3edf45084829a57449a56c628751507077882146873389e6ff41a49c45213a277466e7115
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-mobility/ChangeLog b/dev-java/netbeans-mobility/ChangeLog
index b0e532d..f9438f1 100644
--- a/dev-java/netbeans-mobility/ChangeLog
+++ b/dev-java/netbeans-mobility/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-mobility-9999_p20141103 (03 Nov 2014)
+
+  03 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-mobility-9999_p20141103.ebuild:
+  bumped to the latest sources
+
 *netbeans-mobility-9999_p20141031 (31 Oct 2014)
 
   31 Oct 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 5ff078d..969bd04 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201410170001-src.zip 197610191 SHA256 ece01ea8e2f656
 DIST netbeans-trunk-nightly-201410190001-src.zip 198848484 SHA256 239ac089ce10c7f9bb528c7885a1096edf90c34a449e0954123015da764964e4 SHA512 b6d330d6d7a82662b73c410877ce049e6a9258a3310383e515a4cfeb8597ea5c72b2adcb650a131b7a2dcda5d1260b4d927120cc6f4dfd667e6ec14e71c27daa WHIRLPOOL 48c59a25b584360cafb366df0fdb1acaf46612dc0a204b91841d0d9493b3b34056485005ad23db8ae05ae44c2d68798b603f68ce87e7012b2e63211db3fe3e8d
 DIST netbeans-trunk-nightly-201410300002-src.zip 198898097 SHA256 a8617a69f201a25d4bf0f78226885e73a6fedcd5c8620f115573fda6d617b444 SHA512 8c7c70c04260cda6225b6246e756ea285dd60f88490ff29b2f13195103f5fd3589a8ea0b30436a126a33663c5b25b1d7a7e2713804bb7fb23b2033038c229c08 WHIRLPOOL 61c3ceea8c2ba7d8f55515495b6cb47473d55b7a35c84632fd34edb34fe8c94393dc0b08252196d9132290db974aa03e15b897c0d8a9397bfdc957fa64ca9219
 DIST netbeans-trunk-nightly-201410310002-src.zip 198916747 SHA256 4f200798d8c10985c1e5fa7c9e523564808e508a3f19737a3effa9aef7d8808e SHA512 e7aae2121699e1d8b19df3406c1eae8e1573a64b11ecfae2c110df895ceaf114585643e064b781896f6956747169265aecd317018eef324f3ba2d3571020c76d WHIRLPOOL 8ef1ebedc044af25a3219c24d38e677ffd89ffb91cfb0d017373d60c3c1c3d27ee0065c6ea68b003fb8ef28a3b7c6c7e64a110e1f670f989f1a038efbef406a0
+DIST netbeans-trunk-nightly-201411030002-src.zip 198928747 SHA256 4101f4b4ca15f57435d9973d7ca3e1d742744515af454add071132034944df53 SHA512 890d8331fbe66022c65ce2aa71af4c88f23a75d101a90f0c0f63b3bf63307abcf47362064d685ecb26ae27405fcbb5e051ca798151505717f5d43d7f4adb37f5 WHIRLPOOL fa908bb07de1375432cbb2cb4cc9ba669e8042bb2e4b29b4a2ba95e994fac7043a9883df7f046a3928b8f4774ae82272855e73e644b58c5782f8afd27006ef1f
 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
@@ -62,5 +63,6 @@ EBUILD netbeans-mobility-9999_p20141017.ebuild 4418 SHA256 7b5dea2772d406706adea
 EBUILD netbeans-mobility-9999_p20141019.ebuild 4418 SHA256 694248f9dc5014eefdf9d391d46644c0248be6bb063219731864fd41edd9207d SHA512 542f664a630004bc5266a2deb9b6f1a4cfc861afb65ab2f5cafd779caf0fae8041fc219552e793052892b2799d72d6f0b0320f7a97b72b36228502123fa1461f WHIRLPOOL d3331f6ca9a98f445067ca25668737c20501194afdfb1b85b8086adc84fcbaf1aec04d727c829a2ed56cc673c035be41943190d301ddb3ed950527ed3428deb7
 EBUILD netbeans-mobility-9999_p20141030.ebuild 4418 SHA256 777e3d0af2e916293b60169eb9df19bcb3f7f0d14a410059f15a08efbf53ca3f SHA512 b199bf39f33f2bb1c8c25d7c4063393340b85c36928b8e896d937e86f7bbbf4c731890b90269a324aa400f21474232fd75ea40fadcd04d84c1ec7a478b0d3b60 WHIRLPOOL 4b4c72b177e6a2948c2975ddc4f27573d237bb9bd34b2ad8c534588fe170d610b16c39565c26bb071e78b30d63c08378fcde31097952dc9de0019405810fbc09
 EBUILD netbeans-mobility-9999_p20141031.ebuild 4418 SHA256 3fbfc76e5da4355b3ad98c85941d30baf59726c53ab96535767310ec18344454 SHA512 31f1b03146af3d0211ef5475a542aa8f7d8286a29680fec881e9d5e8d20bd8ce378f55cb226bfa7ea781d2d69550b6471fcd692927cd709bb25dae6916a79954 WHIRLPOOL 082e03b61152c3032d2c34cc8ec415de86b2ee12fe29ac1df956e3f047c0723ab949d363a4663ad33e856146e2842d76a9e130a24b25de69749403275bba91d0
-MISC ChangeLog 136222 SHA256 9c8fec3ed6dfa138cb8cbcece19d41cdf6b64a2765dc8a1c634a47358ed432e7 SHA512 54240c17c3451de2fcf30e114bb24170d9fa522c3fa94d858d3426c748af70a1e215ab645c3b81eff407eceee9e6dac10c790902ece863e5bea4bc625c5f9437 WHIRLPOOL 29d31e93169bb12647a30af14ad2126655607b02b924c92bcb5b5641c76b7a1a8b6cc15b7b9406d6f1755cd3d6a28ff4ac2c9e973d0bec741f330cda28e0e570
+EBUILD netbeans-mobility-9999_p20141103.ebuild 4418 SHA256 f1a108bd95db3894b5d8f3ca87b640c0c9640975b97da3e60191726d7f01cd0a SHA512 932c008d9ee0b47e20864eab2564eb306231f034e926abfe7ba1b68ab7e3973d50f209e279874c49ebd86b0b4a39f6658ad62792b9c0e5622aacc8753eb431d8 WHIRLPOOL ac1643a416530d4f6956a4a24f83f352d2f4da8f714696854a079a0317dfe5468febb1626b61e7a4c6b5d8114f17c33d13990b31d834f0adc454890430a64ff8
+MISC ChangeLog 136399 SHA256 6e16bd330ec3830047e9deb17d75b592bdefe7997a8edf6fa8d338cd129b5b42 SHA512 ba3a371ab2ee64380ec21250eecc71f602a6e0ba5c0eae06ff82aa54ecb27fe6b8d30fca30f38bffc33326549a324d3a18bbb532e723743d102eca2163fd33d1 WHIRLPOOL d6e9c5eb971f4bb5723570d9dcbcb19af674aef8215d006105b24722fbba011987f2b5f60e5ca69264e0608b1faba872aa963640ea49add603e29ba9141365e9
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20141103.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20141103.ebuild
new file mode 100644
index 0000000..14b9b35
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20141103.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2014 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/2014-11-03_00-02-02/zip/netbeans-trunk-nightly-201411030002-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 f53a622..11931ac 100644
--- a/dev-java/netbeans-nb/ChangeLog
+++ b/dev-java/netbeans-nb/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-nb-9999_p20141103 (03 Nov 2014)
+
+  03 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-nb-9999_p20141103.ebuild:
+  bumped to the latest sources
+
 *netbeans-nb-9999_p20141031 (31 Oct 2014)
 
   31 Oct 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 7646d0e..5401fac 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -37,6 +37,7 @@ DIST netbeans-trunk-nightly-201410170001-src.zip 197610191 SHA256 ece01ea8e2f656
 DIST netbeans-trunk-nightly-201410190001-src.zip 198848484 SHA256 239ac089ce10c7f9bb528c7885a1096edf90c34a449e0954123015da764964e4 SHA512 b6d330d6d7a82662b73c410877ce049e6a9258a3310383e515a4cfeb8597ea5c72b2adcb650a131b7a2dcda5d1260b4d927120cc6f4dfd667e6ec14e71c27daa WHIRLPOOL 48c59a25b584360cafb366df0fdb1acaf46612dc0a204b91841d0d9493b3b34056485005ad23db8ae05ae44c2d68798b603f68ce87e7012b2e63211db3fe3e8d
 DIST netbeans-trunk-nightly-201410300002-src.zip 198898097 SHA256 a8617a69f201a25d4bf0f78226885e73a6fedcd5c8620f115573fda6d617b444 SHA512 8c7c70c04260cda6225b6246e756ea285dd60f88490ff29b2f13195103f5fd3589a8ea0b30436a126a33663c5b25b1d7a7e2713804bb7fb23b2033038c229c08 WHIRLPOOL 61c3ceea8c2ba7d8f55515495b6cb47473d55b7a35c84632fd34edb34fe8c94393dc0b08252196d9132290db974aa03e15b897c0d8a9397bfdc957fa64ca9219
 DIST netbeans-trunk-nightly-201410310002-src.zip 198916747 SHA256 4f200798d8c10985c1e5fa7c9e523564808e508a3f19737a3effa9aef7d8808e SHA512 e7aae2121699e1d8b19df3406c1eae8e1573a64b11ecfae2c110df895ceaf114585643e064b781896f6956747169265aecd317018eef324f3ba2d3571020c76d WHIRLPOOL 8ef1ebedc044af25a3219c24d38e677ffd89ffb91cfb0d017373d60c3c1c3d27ee0065c6ea68b003fb8ef28a3b7c6c7e64a110e1f670f989f1a038efbef406a0
+DIST netbeans-trunk-nightly-201411030002-src.zip 198928747 SHA256 4101f4b4ca15f57435d9973d7ca3e1d742744515af454add071132034944df53 SHA512 890d8331fbe66022c65ce2aa71af4c88f23a75d101a90f0c0f63b3bf63307abcf47362064d685ecb26ae27405fcbb5e051ca798151505717f5d43d7f4adb37f5 WHIRLPOOL fa908bb07de1375432cbb2cb4cc9ba669e8042bb2e4b29b4a2ba95e994fac7043a9883df7f046a3928b8f4774ae82272855e73e644b58c5782f8afd27006ef1f
 EBUILD netbeans-nb-7.0.1.ebuild 5116 SHA256 17ac4a9aa7931d052a899ad8649bed42d5c37a06d913e0dc8ded118d7ef01c47 SHA512 932964fcc4d8d614a2ad8531eecd9298b89f06ac97db68e140e77bceb5d9c08c35524ae4766c18f5467bb01391a9c9f29cd4c5e45c29664b91340a33b0804d7e WHIRLPOOL 0e935fc1c63b61a97e60941111cd30fe4f7b740743013074f7722f3556473ccdba8bcd70ac6f544c67e2a60dd2d7c96abc9bf6bfc51aa6e9ff3135d041ebf3a1
 EBUILD netbeans-nb-7.1.2.ebuild 4987 SHA256 075ef11ab57b236061e4df3e905524ecfba2966c5d735d113b878a03219a9cc1 SHA512 321182e1780acfdbff56c1c84748897cf8c4dcf9fc94d0a6db71a018968e8f96e479a2dbb2f97655d50ee836ac1a81fdd62f6f04ba1b2d54157158e577c2b986 WHIRLPOOL 3d3742c6e90f0231ecabf5200446d00900204f51b9fb2be92954668dae86584d8ef477be11cad462a9721a04a1bc97673b8d8d808ef49f0345d979022471d919
 EBUILD netbeans-nb-7.2.ebuild 4970 SHA256 79d73ca57dd63e25afccd44816dd248e79f6974dd7e9ebbf4b3b11eb659092d9 SHA512 083317f6944c5fe38507fbca18804888e25c23070420a3080bb68bf00be95e520541c381482a6c55ff60656b36f8dd3fac60f2c605e4e3ee0ae92427faa468da WHIRLPOOL 7f02ab258612c5035b26326f25aaa08bf60fc0ff3108a2bf61dbcde9fe845e647f91319938206742a5f131fe905678833f3ad2449f68efef7e6ed4203f7538f3
@@ -61,5 +62,6 @@ EBUILD netbeans-nb-9999_p20141017.ebuild 5013 SHA256 cf52500519e2ede061c737fd473
 EBUILD netbeans-nb-9999_p20141019.ebuild 5013 SHA256 604be51398876e70ac266eb1d9562db9026b1ae921bb4015f11e2766cdc7e1c6 SHA512 7383fdfa0e11ed567f8de975a169fb7bf7a78991a5a0c577f4b245d08ef435ca481ed0fe2ab2da2e131c8b6d9f06cb35de9fc619bef4602560a9ee68bdf4c356 WHIRLPOOL 28eb14c69eb3bddf916ae487d3a29daa9557454b09d3eb74ff669e69a9abc2e2d1f2bef75ab91a59ef55cb304d61596354e28f8318e97d002cdffd07379121bd
 EBUILD netbeans-nb-9999_p20141030.ebuild 5013 SHA256 3e00632ede810da46911bf4a99b6809d8ef20b055125115053a438edb2bc4341 SHA512 2690634425501caab09a9c9952fef0673ac675112468102f75aee90dbbee221a2637ba8d71513a1ad7507714ec1c4aafd1d1a672cb06ce8aac86305a9e41b40c WHIRLPOOL 6091d11bee3b54e37f0c4177ed8bf3cfade026668cf2ba1f46287bfad4c74f3da17f8366902399e80597545b54f8e2f9817e64fa3f42739001437d154e6368f1
 EBUILD netbeans-nb-9999_p20141031.ebuild 5013 SHA256 440666fb5171bf012e5c482162b0cf96fddc456f114ef2c185d5b5ba10f2520b SHA512 293e7bcc6f4735a4092ecb1009bb01b6a3fcf4107ff647f79ebe98fad5e92e171bb5af02a887dcf671ac964e6d56656d1d13d3c372e27ea833972a5b41cdb42c WHIRLPOOL 535b0998b11cec4f4288d516857b74c79e75937281f24858cf549c65784e84f228c33b4629e9eb4eb9f0a8d595eb0d064bd1695ba5f94a8f9486b55680d853dc
-MISC ChangeLog 126467 SHA256 0bb54f92d3c6fd9c3e99c3d4e1d3a40ed2b3eac27baa16df4f3217676040fa36 SHA512 b698e318d56676cb042d3920709701a4966ca06e43894c1421ef38627c1076aa397aa79842e720934052312cdf711745380df7e5d222155e780b639f461dbcfe WHIRLPOOL 6c0b8ef24b3888f7a9dc44ef01bfd55795508babd5d2b7df4b0d5ff4a531000b5eb96cf36f885a1bdc35ac0b377cb94a58eeffcb3894dcc5acfae6a6faca6869
+EBUILD netbeans-nb-9999_p20141103.ebuild 5013 SHA256 46d6f7872388f4360357b1eb69028c800026dc7a89548954c39b80236d0c06d5 SHA512 679816c7559852b5d292c40b511c8994af0b01774be02012e42672256e315c2625efce206c6ec649f2cea770404a08b8ef46bda02e46b8669c2752d61cc414c9 WHIRLPOOL 860da685d8d8f8623c87fd049bd9a24037d6dead71fd3322e5ffe8378cada510a7d5ca6469a8c5e5d609271b973255c9277d0a569505e2a018674bf2dc88470f
+MISC ChangeLog 126632 SHA256 667872dc300a153922ecf31d64cfa8c487f55a41d6800fefc55f3fd72da2c2d3 SHA512 52e58ac6dfb67c3af2b04d4e49efcb8905c0fe3f23f0d694cf3ca9d27c220b7c5ecf2cb0f4d06b4c7e088fa05c83121ed22dad652319ba6b5f73eec1cf96807b WHIRLPOOL 3ad8327c22d64457f8128e7abc554e0bc65db2c11c805d759744be1a61d50df9df721d2a320af1411c976d70265f4e0a80fa91f87b51b20ab91165d625d3142d
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

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

diff --git a/dev-java/netbeans-php/ChangeLog b/dev-java/netbeans-php/ChangeLog
index bc1c249..3dfb33c 100644
--- a/dev-java/netbeans-php/ChangeLog
+++ b/dev-java/netbeans-php/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-php-9999_p20141103 (03 Nov 2014)
+
+  03 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-php-9999_p20141103.ebuild:
+  bumped to the latest sources
+
 *netbeans-php-9999_p20141031 (31 Oct 2014)
 
   31 Oct 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index af52ea1..3cf9253 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -40,6 +40,7 @@ DIST netbeans-trunk-nightly-201410170001-src.zip 197610191 SHA256 ece01ea8e2f656
 DIST netbeans-trunk-nightly-201410190001-src.zip 198848484 SHA256 239ac089ce10c7f9bb528c7885a1096edf90c34a449e0954123015da764964e4 SHA512 b6d330d6d7a82662b73c410877ce049e6a9258a3310383e515a4cfeb8597ea5c72b2adcb650a131b7a2dcda5d1260b4d927120cc6f4dfd667e6ec14e71c27daa WHIRLPOOL 48c59a25b584360cafb366df0fdb1acaf46612dc0a204b91841d0d9493b3b34056485005ad23db8ae05ae44c2d68798b603f68ce87e7012b2e63211db3fe3e8d
 DIST netbeans-trunk-nightly-201410300002-src.zip 198898097 SHA256 a8617a69f201a25d4bf0f78226885e73a6fedcd5c8620f115573fda6d617b444 SHA512 8c7c70c04260cda6225b6246e756ea285dd60f88490ff29b2f13195103f5fd3589a8ea0b30436a126a33663c5b25b1d7a7e2713804bb7fb23b2033038c229c08 WHIRLPOOL 61c3ceea8c2ba7d8f55515495b6cb47473d55b7a35c84632fd34edb34fe8c94393dc0b08252196d9132290db974aa03e15b897c0d8a9397bfdc957fa64ca9219
 DIST netbeans-trunk-nightly-201410310002-src.zip 198916747 SHA256 4f200798d8c10985c1e5fa7c9e523564808e508a3f19737a3effa9aef7d8808e SHA512 e7aae2121699e1d8b19df3406c1eae8e1573a64b11ecfae2c110df895ceaf114585643e064b781896f6956747169265aecd317018eef324f3ba2d3571020c76d WHIRLPOOL 8ef1ebedc044af25a3219c24d38e677ffd89ffb91cfb0d017373d60c3c1c3d27ee0065c6ea68b003fb8ef28a3b7c6c7e64a110e1f670f989f1a038efbef406a0
+DIST netbeans-trunk-nightly-201411030002-src.zip 198928747 SHA256 4101f4b4ca15f57435d9973d7ca3e1d742744515af454add071132034944df53 SHA512 890d8331fbe66022c65ce2aa71af4c88f23a75d101a90f0c0f63b3bf63307abcf47362064d685ecb26ae27405fcbb5e051ca798151505717f5d43d7f4adb37f5 WHIRLPOOL fa908bb07de1375432cbb2cb4cc9ba669e8042bb2e4b29b4a2ba95e994fac7043a9883df7f046a3928b8f4774ae82272855e73e644b58c5782f8afd27006ef1f
 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
@@ -64,5 +65,6 @@ EBUILD netbeans-php-9999_p20141017.ebuild 4423 SHA256 2df6577d0b872a2ca764093f2b
 EBUILD netbeans-php-9999_p20141019.ebuild 4423 SHA256 a2bbe0dfcc8a6dd44e310f8453772e471a5fc41b9d9bc1424421bd486fe96245 SHA512 c373934b571d26892dd1c06f3f332dc8e1899754af1e8113b8e0ce801e7342eb1bef513e3ed53ca45589b0000d6704358af7fadb238c65eb071f098c5624d107 WHIRLPOOL 8efd58b00fe8471d39a27f8e318ceb810f7a1f5e0813b19e430ad29442e4a451a71682e4d5a8d0b335f50ceac4fffd59e000a99320e7482e8592678415d124fc
 EBUILD netbeans-php-9999_p20141030.ebuild 4423 SHA256 e6d040134304f697fcc0ce26862e67e9b1288c59842f5d5b4a7d6dd40d09a21c SHA512 4dfd880236d00a8195d0ad3685217ff57806a8f53af9624f7f9a2639e61cff7af3dbf326fb5d400fd8020fc4350bee261f8830035e05cd6e5c9ac31df62ade0f WHIRLPOOL 42cfa6d82e19686241699dab97a2f7d545b9be82b78a7282340f0399064f4e6365d71dd40eb8c481f2b974dfcd3c4c1d52e144f4abd0d3248be51ac2be4ef2cb
 EBUILD netbeans-php-9999_p20141031.ebuild 4423 SHA256 42c8739bac0b0f857e7d9d6c678f39954c02ab7db7f7bb93c6710ef6215e6193 SHA512 612fc892bea4f8da1e4115daefac5520aee06e1e86cd26177bbd07039ac239f09dcde202c5e83ba6e078838496f499a01e50d44196fd2008912e29ccce30208a WHIRLPOOL 3a1fc83658b067f1dd6ffe536b016cf6f5710b955b37a6bd00167dc024154870747e1c8d256ed21301a06a5d1362de507f6e8f3d434ed58f0e91f3960990e39b
-MISC ChangeLog 127108 SHA256 b9450da94e16641ee87d01d19ac1f3bcdd20f3dd10d6f2ef58be7ab0252ce838 SHA512 7985c4b64c65bd579d55eba1880a392aa5d25a9790ab2041de17e6a644e65159efac3d7d5eb673ee7db3a7fd883565c70552fc312d25bfc45b362768882f3281 WHIRLPOOL 974721ff41fff4362d916ed5098f72831adc28f1e082529db6d335197d53725b32f1867716efbf5eb78c0fdc19a6fcb147f57726dce5af1a383bad9d0aac63df
+EBUILD netbeans-php-9999_p20141103.ebuild 4423 SHA256 dd8677a327b2ea14e379be5e3ac0a589ccf49e3acd6cf41bdc8274f88b2bc65c SHA512 70a99805500ee6c8d0096457b4d6dd6d22a1808edc0c40a44b22ef84777da49b1aa4b74d6496b4c94bb55a75968e887b7b226bbb98d500dec6610523411078b9 WHIRLPOOL c188c57ae0f072b672378a051dfc106c51da71886073687c8f7d763d0e3961ba01dd29a3c924f987897748d7eda82f495d368774e32dd98abad30c8cb816dea9
+MISC ChangeLog 127275 SHA256 1b473bc620c10c3adeb564815667b161ea9b637c907cd094a7dbd990ae3bef05 SHA512 9bb956ca44889458371d04b9a40770dc3074406ce8a40e3e678e05b1e695313e334b3d824fef2e52abf92030f04ab6ed669a51547309f4e7190adb841db8539f WHIRLPOOL 85a554f50161d8dcbb9cb9ceb0e924ab8c46934a6ed0fd1a841ee4904c525a3faa74929452845e7fa41ae1c12e326c8f20d8594e6a1fef3c2a330c2b2fc67b78
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20141103.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20141103.ebuild
new file mode 100644
index 0000000..1e9509a
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20141103.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2014 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/2014-11-03_00-02-02/zip/netbeans-trunk-nightly-201411030002-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 b874e9e..ad5459a 100644
--- a/dev-java/netbeans-platform/ChangeLog
+++ b/dev-java/netbeans-platform/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-platform-9999_p20141103 (03 Nov 2014)
+
+  03 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-platform-9999_p20141103.ebuild:
+  bumped to the latest sources
+
 *netbeans-platform-9999_p20141031 (31 Oct 2014)
 
   31 Oct 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 3981581..1dbbc3d 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -55,6 +55,7 @@ DIST netbeans-trunk-nightly-201410170001-src.zip 197610191 SHA256 ece01ea8e2f656
 DIST netbeans-trunk-nightly-201410190001-src.zip 198848484 SHA256 239ac089ce10c7f9bb528c7885a1096edf90c34a449e0954123015da764964e4 SHA512 b6d330d6d7a82662b73c410877ce049e6a9258a3310383e515a4cfeb8597ea5c72b2adcb650a131b7a2dcda5d1260b4d927120cc6f4dfd667e6ec14e71c27daa WHIRLPOOL 48c59a25b584360cafb366df0fdb1acaf46612dc0a204b91841d0d9493b3b34056485005ad23db8ae05ae44c2d68798b603f68ce87e7012b2e63211db3fe3e8d
 DIST netbeans-trunk-nightly-201410300002-src.zip 198898097 SHA256 a8617a69f201a25d4bf0f78226885e73a6fedcd5c8620f115573fda6d617b444 SHA512 8c7c70c04260cda6225b6246e756ea285dd60f88490ff29b2f13195103f5fd3589a8ea0b30436a126a33663c5b25b1d7a7e2713804bb7fb23b2033038c229c08 WHIRLPOOL 61c3ceea8c2ba7d8f55515495b6cb47473d55b7a35c84632fd34edb34fe8c94393dc0b08252196d9132290db974aa03e15b897c0d8a9397bfdc957fa64ca9219
 DIST netbeans-trunk-nightly-201410310002-src.zip 198916747 SHA256 4f200798d8c10985c1e5fa7c9e523564808e508a3f19737a3effa9aef7d8808e SHA512 e7aae2121699e1d8b19df3406c1eae8e1573a64b11ecfae2c110df895ceaf114585643e064b781896f6956747169265aecd317018eef324f3ba2d3571020c76d WHIRLPOOL 8ef1ebedc044af25a3219c24d38e677ffd89ffb91cfb0d017373d60c3c1c3d27ee0065c6ea68b003fb8ef28a3b7c6c7e64a110e1f670f989f1a038efbef406a0
+DIST netbeans-trunk-nightly-201411030002-src.zip 198928747 SHA256 4101f4b4ca15f57435d9973d7ca3e1d742744515af454add071132034944df53 SHA512 890d8331fbe66022c65ce2aa71af4c88f23a75d101a90f0c0f63b3bf63307abcf47362064d685ecb26ae27405fcbb5e051ca798151505717f5d43d7f4adb37f5 WHIRLPOOL fa908bb07de1375432cbb2cb4cc9ba669e8042bb2e4b29b4a2ba95e994fac7043a9883df7f046a3928b8f4774ae82272855e73e644b58c5782f8afd27006ef1f
 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
@@ -79,5 +80,6 @@ EBUILD netbeans-platform-9999_p20141017.ebuild 8294 SHA256 77719cfa512d4d0e32e6d
 EBUILD netbeans-platform-9999_p20141019.ebuild 8508 SHA256 bbe3104e803e630af4133ed19805bb336948dd0274b416b3218bce7ece6763c7 SHA512 e18c9b96d0a57256049bfce7806ba2862413157b464c83e879905a7f2067c51f25c251f7b4871604a3110fa8ee9f3ca867049862b5147a3332d76b6e5863d76d WHIRLPOOL 0327709a07f7bcd52ddbbbdf2479ec81ea34e8a2a15f3bed69b0c98861c42bef936f846d9b2709f1c3d99b73faf88813b7502237eb7dfe5439f9df6451406c61
 EBUILD netbeans-platform-9999_p20141030.ebuild 8508 SHA256 928b3a45ac39ca6a98a76108df246e42612f9c6a11ea24cdd1cb867c70542212 SHA512 a180aacb83a7b28a52bcdc57f2549c77828cc4e4bc4007c71b3b65db91130978d5db29b0c92bd9d14b13f51c0d36bd2bb9edc0526789e83f4c1decd06394c184 WHIRLPOOL b983feb0f6c343a1a670f7e494e5763f20adf5b5073d74f1c0bbad17fc251f47038b85ce95d3ce304c2cf76769b9ef1cf200f3e7ff30edba29acc86d20fedc17
 EBUILD netbeans-platform-9999_p20141031.ebuild 8508 SHA256 3907beaf30f80b56c4aa4b29508ac16daac3d8d469818b639a82a0845389fff9 SHA512 4d62a4dce529cad8bfb9815d17dfdf8cf36aaf2485116d91edad649071aaa591d10d2d539b8e85642b723b92dc1d510cc80578acb74821dd24611ec219a1a948 WHIRLPOOL 67233a1a742ba5d428128d53ca1f248496e75d5ab6eac001da03d56e5a6ca366210568d3c9f200df527be63739ab7017060a534a98c37587e5097a842fcfeb14
-MISC ChangeLog 136818 SHA256 186da675f9245ef18eae1dda2cab114f131969a7c381b5a116f7bb73ab91c31d SHA512 3099cfd8f1db07805085dca20406141277d82b45e4f879d571f12702d3ea3267737acaf59d1b1b8fda04df47f14bef08c46724028b508e51a527ae55c476e121 WHIRLPOOL 117d47018b8ca852636c9d8d646d3d53c2c5ce3bbde65bc804ea0520e078dcd692feebc2cef8c01ce852b55b3002cf2f052d7d45803aaef58068084431f43a6d
+EBUILD netbeans-platform-9999_p20141103.ebuild 8508 SHA256 6697b779b59bb8473d00b6b344f28ddf0bb60eae3d056f8dddfe8832304d65f1 SHA512 bd7e5a25e7b3af1415257b8a22566510e339355f6135c8292c47ee8bcd68ca7be9c3629579ce3de5d8a6f04aaa534b4411615467cdaef58c9f688f083c51c549 WHIRLPOOL 8f59627c3e48147345bd2814a7042a193b4f86484f79bd92ec83d241f644ae04d76cdc26b3b963657f2a90b4fe485ecca7af17c79bfc98fa7d913178d8dbd90b
+MISC ChangeLog 136995 SHA256 0db79497cbc45c3b870f37f1b6bdd4bb60d398f3b128ba1f24cf92343e9e9e93 SHA512 1b700439ba9bbd18dc754271c15802d9f7f00ce615d988ed4693680d2ceee0a11e6b7f425ae365664ab73438afd0335381d2a5c15c01bd46d4da256bd424447b WHIRLPOOL fdc7ddec45f3233d678833063005c946a1adf0a014f51a01e15a4ee5b933a290b11ff82b8fcf516694372a85508e1c22c09dbebafff3f5535d200d9726a490dd
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-profiler/ChangeLog b/dev-java/netbeans-profiler/ChangeLog
index 063b629..2ec0a60 100644
--- a/dev-java/netbeans-profiler/ChangeLog
+++ b/dev-java/netbeans-profiler/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-profiler-9999_p20141103 (03 Nov 2014)
+
+  03 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-profiler-9999_p20141103.ebuild:
+  bumped to the latest sources
+
 *netbeans-profiler-9999_p20141031 (31 Oct 2014)
 
   31 Oct 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index eeca314..df8b5aa 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201410170001-src.zip 197610191 SHA256 ece01ea8e2f656
 DIST netbeans-trunk-nightly-201410190001-src.zip 198848484 SHA256 239ac089ce10c7f9bb528c7885a1096edf90c34a449e0954123015da764964e4 SHA512 b6d330d6d7a82662b73c410877ce049e6a9258a3310383e515a4cfeb8597ea5c72b2adcb650a131b7a2dcda5d1260b4d927120cc6f4dfd667e6ec14e71c27daa WHIRLPOOL 48c59a25b584360cafb366df0fdb1acaf46612dc0a204b91841d0d9493b3b34056485005ad23db8ae05ae44c2d68798b603f68ce87e7012b2e63211db3fe3e8d
 DIST netbeans-trunk-nightly-201410300002-src.zip 198898097 SHA256 a8617a69f201a25d4bf0f78226885e73a6fedcd5c8620f115573fda6d617b444 SHA512 8c7c70c04260cda6225b6246e756ea285dd60f88490ff29b2f13195103f5fd3589a8ea0b30436a126a33663c5b25b1d7a7e2713804bb7fb23b2033038c229c08 WHIRLPOOL 61c3ceea8c2ba7d8f55515495b6cb47473d55b7a35c84632fd34edb34fe8c94393dc0b08252196d9132290db974aa03e15b897c0d8a9397bfdc957fa64ca9219
 DIST netbeans-trunk-nightly-201410310002-src.zip 198916747 SHA256 4f200798d8c10985c1e5fa7c9e523564808e508a3f19737a3effa9aef7d8808e SHA512 e7aae2121699e1d8b19df3406c1eae8e1573a64b11ecfae2c110df895ceaf114585643e064b781896f6956747169265aecd317018eef324f3ba2d3571020c76d WHIRLPOOL 8ef1ebedc044af25a3219c24d38e677ffd89ffb91cfb0d017373d60c3c1c3d27ee0065c6ea68b003fb8ef28a3b7c6c7e64a110e1f670f989f1a038efbef406a0
+DIST netbeans-trunk-nightly-201411030002-src.zip 198928747 SHA256 4101f4b4ca15f57435d9973d7ca3e1d742744515af454add071132034944df53 SHA512 890d8331fbe66022c65ce2aa71af4c88f23a75d101a90f0c0f63b3bf63307abcf47362064d685ecb26ae27405fcbb5e051ca798151505717f5d43d7f4adb37f5 WHIRLPOOL fa908bb07de1375432cbb2cb4cc9ba669e8042bb2e4b29b4a2ba95e994fac7043a9883df7f046a3928b8f4774ae82272855e73e644b58c5782f8afd27006ef1f
 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
@@ -53,5 +54,6 @@ EBUILD netbeans-profiler-9999_p20141017.ebuild 3478 SHA256 bee9e8d4d6ffadf54df82
 EBUILD netbeans-profiler-9999_p20141019.ebuild 3478 SHA256 da72130dcdf83729e4d6a0939c265765c0510270f880b60b935871f9c7a95361 SHA512 799d50c833f6952415b42b87627eb2525ad902b44dbf7e09be53c2d6edeb114ae598c6a6e88bc063b9b1b97da37760cfb4621090b112d646a31494a6ece3e232 WHIRLPOOL 6175ec9a7eaf32a9968bbf677df4ed8f4caca6a5351279432c1d717170ffbe5cfed5630750d916596c95c36c9a724e5e7b621704efa1e124654093ffb7471191
 EBUILD netbeans-profiler-9999_p20141030.ebuild 3478 SHA256 83fdca194873dec16c3297a19b6d4db2eb1e4dfc5b9111467ee28ca2f00303d5 SHA512 c12e52d34ddbb1fa4fcec2ca88a30089fedbc426ef2f94a326bddc42360e6c6f2fa645977ba4fb7bbd323f33bc775ad571717097fa5ca06fecb2f3dcee1a925b WHIRLPOOL 4aabdf072291196cab24a0e68806680118e7f45a3654570c310c19be3091bdb326df21dc63f8c55fe7265779749698775d624fe6b5d6cf87d15a3ebade8a3f45
 EBUILD netbeans-profiler-9999_p20141031.ebuild 3478 SHA256 a5de25bcc7c855623ede04a119019c5c37254ede639c0394e232ce2ad7af53c0 SHA512 ec3df2754282e1ec42b36772465c34772e08272b9869c5a460804fff98a19cd520054c791e8b63fc501097b191d7cbd65435eb083fb4234cb5e900b73cfcad14 WHIRLPOOL aaa5d11007c1ca72ce254e711003a710fbdc26198125c79f196c55ed5ce7e3cdd2117aa44aa63c6d837d31fde29c2d33917aa0fd108778a079acfb293baae9db
-MISC ChangeLog 136279 SHA256 84486a767c55a307174abcc106288ca94567c9b0a466a7da92d775b27d848fff SHA512 905dfd63494898e247ca7c16852bc42733b19ab19c40bcfc1531103515ccfdb311dc63c165401fee88b642dd28f87875e73f1fd004a7c36881f0eb2e3b137b99 WHIRLPOOL dc082de5c785c670ac3ad29f2bb09f3071f890a055afb060889a3bd90c177a49ff600aa3512b031626f76525ac2f7d2136a35465c0819d25cc47f665c20f06ba
+EBUILD netbeans-profiler-9999_p20141103.ebuild 3478 SHA256 af074fe1a9f62b421aafe7ebb3489afa30dbb28b7487989d0321441adad509a5 SHA512 b27cd5d278ce32a9c73d7de506596d4af3d365f4e97f7719aa9e85fdda11e9bdf695437e7d98332448abce174d218c4a088bf93908dc6adc16b0350ab1c875b9 WHIRLPOOL c31dc15ae3e8922ea257152a6ff9d14220fb935ccbc5edb329c0514a2a6ac52fa06b1670bc24606f962cd99def534d747a3fe07a684b33c1bf4fbcd525ca6347
+MISC ChangeLog 136456 SHA256 7735c425c003c6e1f0e5c6aa275a5a66d7378b0a20a7d37ffda8ea6865973d6c SHA512 8cb5519a0eae7bdee8048e8712ec9d274eb1d1b42e2d22eb7d857e333ac8288c98cb2bcc403104f094d8bf89bd8d0ad16aa6ee977e7a8feb5cf391bc0d8e456a WHIRLPOOL dff1d298df929cc06098a7460eda3c85cb7cc9feb3b364f7c3e996edee3a09bfac618b2c2959e62abc01f9e9847a636c84e66dc2feba3eedeb3f8c0065a9a37f
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20141103.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20141103.ebuild
new file mode 100644
index 0000000..1b24ea9
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20141103.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2014 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/2014-11-03_00-02-02/zip/netbeans-trunk-nightly-201411030002-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 0d5751a..87711e9 100644
--- a/dev-java/netbeans-webcommon/ChangeLog
+++ b/dev-java/netbeans-webcommon/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-webcommon-9999_p20141103 (03 Nov 2014)
+
+  03 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-webcommon-9999_p20141103.ebuild:
+  bumped to the latest sources
+
 *netbeans-webcommon-9999_p20141031 (31 Oct 2014)
 
   31 Oct 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index 414536e..d6b3777 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201410170001-src.zip 197610191 SHA256 ece01ea8e2f656
 DIST netbeans-trunk-nightly-201410190001-src.zip 198848484 SHA256 239ac089ce10c7f9bb528c7885a1096edf90c34a449e0954123015da764964e4 SHA512 b6d330d6d7a82662b73c410877ce049e6a9258a3310383e515a4cfeb8597ea5c72b2adcb650a131b7a2dcda5d1260b4d927120cc6f4dfd667e6ec14e71c27daa WHIRLPOOL 48c59a25b584360cafb366df0fdb1acaf46612dc0a204b91841d0d9493b3b34056485005ad23db8ae05ae44c2d68798b603f68ce87e7012b2e63211db3fe3e8d
 DIST netbeans-trunk-nightly-201410300002-src.zip 198898097 SHA256 a8617a69f201a25d4bf0f78226885e73a6fedcd5c8620f115573fda6d617b444 SHA512 8c7c70c04260cda6225b6246e756ea285dd60f88490ff29b2f13195103f5fd3589a8ea0b30436a126a33663c5b25b1d7a7e2713804bb7fb23b2033038c229c08 WHIRLPOOL 61c3ceea8c2ba7d8f55515495b6cb47473d55b7a35c84632fd34edb34fe8c94393dc0b08252196d9132290db974aa03e15b897c0d8a9397bfdc957fa64ca9219
 DIST netbeans-trunk-nightly-201410310002-src.zip 198916747 SHA256 4f200798d8c10985c1e5fa7c9e523564808e508a3f19737a3effa9aef7d8808e SHA512 e7aae2121699e1d8b19df3406c1eae8e1573a64b11ecfae2c110df895ceaf114585643e064b781896f6956747169265aecd317018eef324f3ba2d3571020c76d WHIRLPOOL 8ef1ebedc044af25a3219c24d38e677ffd89ffb91cfb0d017373d60c3c1c3d27ee0065c6ea68b003fb8ef28a3b7c6c7e64a110e1f670f989f1a038efbef406a0
+DIST netbeans-trunk-nightly-201411030002-src.zip 198928747 SHA256 4101f4b4ca15f57435d9973d7ca3e1d742744515af454add071132034944df53 SHA512 890d8331fbe66022c65ce2aa71af4c88f23a75d101a90f0c0f63b3bf63307abcf47362064d685ecb26ae27405fcbb5e051ca798151505717f5d43d7f4adb37f5 WHIRLPOOL fa908bb07de1375432cbb2cb4cc9ba669e8042bb2e4b29b4a2ba95e994fac7043a9883df7f046a3928b8f4774ae82272855e73e644b58c5782f8afd27006ef1f
 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
@@ -57,5 +58,6 @@ EBUILD netbeans-webcommon-9999_p20141017.ebuild 5200 SHA256 3f49f39ec8c0c8bdc9f9
 EBUILD netbeans-webcommon-9999_p20141019.ebuild 5200 SHA256 35c64ee441d8fe2cd40e7fde44694427da1e0ab776cbb22af1201e8037cd8926 SHA512 9bac6f29720b72b540a751e62ef993e42037c68d56dcd459571741a16f9d3a506c372305b8ea03f448891d2fb3bc8d469b97963a07cbd0242e0525b81ff9eef9 WHIRLPOOL 8726948bfaeaabc42ecdcca0952ff5f174086f4cae33724d7c56f7cd5f80c130ea41e51408cf7bc1acbac8e9cbb94ab6c0c8be15cf51fb5568b9ab82da71021e
 EBUILD netbeans-webcommon-9999_p20141030.ebuild 4997 SHA256 e33bdf015e04698dab854bb21809cd6b2654de716f6a4cbe7e829e84296d5208 SHA512 c6149650c42b3ab509f98b1b145aed4a583e468c2341c88de59286a10cc599bc6d50016f4cbf8c9527257b7c95f17359d68b87a6f1b7a92cd385ae5e96757460 WHIRLPOOL 0be2328280db348820bb4a490f7f7bbaa0bb095bce74efec0d98c6d482c46e20bea410261fe82ea907d42adcf99e3b9e8b76cca9887df135f39268ea961e268c
 EBUILD netbeans-webcommon-9999_p20141031.ebuild 4997 SHA256 c07921927bad51c37125cfee3573c3aae13a9d05d2c9d3ad63eb80bdb33e9c83 SHA512 392624a8c94b1bcf64bd89674d6211cd0b33caa82e6f8678cd63e32650fcb40db6f2ba1795b062c79aa5e400fd82841e8f06384ba7654a45b43495f7d9b42614 WHIRLPOOL 93e9f3e475ff3ab7648db25aa32b15e91fded4075eb4ec95c6fa376d391b19ea401b4100683cfd3d9d4857b8eb1b402b04b015b7c74d6eed86d56ae715b24edf
-MISC ChangeLog 108942 SHA256 09d96e175cfbf88cdf883e275cbe04258c33b07bbb3aa5a3d370897b6f3d9641 SHA512 5e1a5a48cd3f50d99670d352abfa185240d332db4ce5d9ca73d10e68d4695a1dec49420a510010a9c3c9d72f06eb132d001954bb2c5f7b4cef5826ee7bba06b8 WHIRLPOOL 926300bdf6695a725bfc32598463ec385aad71e3dab93c8c4f360b66294e28c60530df4039ae6ddf0e4bc10c1aea55ac0d951777dc236e3bb4ae86ef0a0e38e8
+EBUILD netbeans-webcommon-9999_p20141103.ebuild 4997 SHA256 25c6e668908d467c52b8b9e8ad2ee222428668066a30f4a6a43b25505de9142d SHA512 adfb2f2d25cd573fb0a261e38b4e9b337abb64bc7f1e9fd78c0708f97c943b2cc3ce2e0731d8bac8e20a1b16dfc50373395f2013e3797c01e83536fdb40f8a46 WHIRLPOOL a9e017893448fc3163b88b4b2fa23865c2e6f6ca5beb72c36ccf53187be87b1e09b534bcfece14d338ec89b4196b0ec934751b8e933e17f3d04a5db1581fd8d5
+MISC ChangeLog 109121 SHA256 864ff880545b6e1d0c9e3b70297f15fc088845567256905ce370c28aac9c80e0 SHA512 c81e994073103a6af819251556e820e3ff9a2e2ed255fbcf3e8361aa31be039744cb76ff7408e256cb2a007515954080fb73826801528cce1746a40e385a7c95 WHIRLPOOL d9342852501d443a261b6d777136df7f160b9435ce05acebd114d38695986a5063fde3f06f79be001753ae141b74f7254eda62a931c23a40d4ba4567c5067f64
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20141103.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20141103.ebuild
new file mode 100644
index 0000000..2220784
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20141103.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2014 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/2014-11-03_00-02-02/zip/netbeans-trunk-nightly-201411030002-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 270c89d..5fdddf3 100644
--- a/dev-java/netbeans-websvccommon/ChangeLog
+++ b/dev-java/netbeans-websvccommon/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-websvccommon-9999_p20141103 (03 Nov 2014)
+
+  03 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-websvccommon-9999_p20141103.ebuild:
+  bumped to the latest sources
+
 *netbeans-websvccommon-9999_p20141031 (31 Oct 2014)
 
   31 Oct 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 7dea56e..f61f87c 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201410170001-src.zip 197610191 SHA256 ece01ea8e2f656
 DIST netbeans-trunk-nightly-201410190001-src.zip 198848484 SHA256 239ac089ce10c7f9bb528c7885a1096edf90c34a449e0954123015da764964e4 SHA512 b6d330d6d7a82662b73c410877ce049e6a9258a3310383e515a4cfeb8597ea5c72b2adcb650a131b7a2dcda5d1260b4d927120cc6f4dfd667e6ec14e71c27daa WHIRLPOOL 48c59a25b584360cafb366df0fdb1acaf46612dc0a204b91841d0d9493b3b34056485005ad23db8ae05ae44c2d68798b603f68ce87e7012b2e63211db3fe3e8d
 DIST netbeans-trunk-nightly-201410300002-src.zip 198898097 SHA256 a8617a69f201a25d4bf0f78226885e73a6fedcd5c8620f115573fda6d617b444 SHA512 8c7c70c04260cda6225b6246e756ea285dd60f88490ff29b2f13195103f5fd3589a8ea0b30436a126a33663c5b25b1d7a7e2713804bb7fb23b2033038c229c08 WHIRLPOOL 61c3ceea8c2ba7d8f55515495b6cb47473d55b7a35c84632fd34edb34fe8c94393dc0b08252196d9132290db974aa03e15b897c0d8a9397bfdc957fa64ca9219
 DIST netbeans-trunk-nightly-201410310002-src.zip 198916747 SHA256 4f200798d8c10985c1e5fa7c9e523564808e508a3f19737a3effa9aef7d8808e SHA512 e7aae2121699e1d8b19df3406c1eae8e1573a64b11ecfae2c110df895ceaf114585643e064b781896f6956747169265aecd317018eef324f3ba2d3571020c76d WHIRLPOOL 8ef1ebedc044af25a3219c24d38e677ffd89ffb91cfb0d017373d60c3c1c3d27ee0065c6ea68b003fb8ef28a3b7c6c7e64a110e1f670f989f1a038efbef406a0
+DIST netbeans-trunk-nightly-201411030002-src.zip 198928747 SHA256 4101f4b4ca15f57435d9973d7ca3e1d742744515af454add071132034944df53 SHA512 890d8331fbe66022c65ce2aa71af4c88f23a75d101a90f0c0f63b3bf63307abcf47362064d685ecb26ae27405fcbb5e051ca798151505717f5d43d7f4adb37f5 WHIRLPOOL fa908bb07de1375432cbb2cb4cc9ba669e8042bb2e4b29b4a2ba95e994fac7043a9883df7f046a3928b8f4774ae82272855e73e644b58c5782f8afd27006ef1f
 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
@@ -53,5 +54,6 @@ EBUILD netbeans-websvccommon-9999_p20141017.ebuild 2727 SHA256 5f840815e97e9d397
 EBUILD netbeans-websvccommon-9999_p20141019.ebuild 2727 SHA256 f23ad6bbcea617945a44600c63e109205aae29f5826713e3113954056008f444 SHA512 3e5a1e1d1ee782d858fc4157a20126e9db0c9dbf96bae9853a5df33233876232cdf715614464a3d4e6364f8ea526a31dbb275b8de2a5678ff065cb0caf65b268 WHIRLPOOL f47412a44e52ffea05129f59bfc77e2592823887a846a7b52154c711102d245b9b71b2f82b0c2818c84c5e5eebb8d2b56c954f33407725af406a5dac6f085714
 EBUILD netbeans-websvccommon-9999_p20141030.ebuild 2727 SHA256 ffa8a61daa19e380a126459bdff8ede268ed2b0eab8465dc5c1bc8280cf61287 SHA512 9b023e4112e280f65f3e30eb4a108ee83abf94457d4aefc0a601b854b7d54fe0b3eb02853d0e1b117a1c228af4e5f9fe8ec60ec6602dfe276ef91b62897b2d91 WHIRLPOOL d52d399830032030049087ef2a6dac116e0a4be03157f63d42d9a3500506197434a8b328f172e39af55970f7673c38e18990e53002cdbb27cadc01d980eec60c
 EBUILD netbeans-websvccommon-9999_p20141031.ebuild 2727 SHA256 76e7ec1d8b5a2b4847186583d3d2ed12b0d4a715f6f25a764d123035a9aefa1d SHA512 2a10369337a7c6e3a756dcbbdc72242f94f4c6977c22744085e761f833eff13a1ba792a64154b1961972f4180580ffca303b2ce865ac2506af2cc7abce549c3a WHIRLPOOL 3df8a65cc4971e7a6e3719c201080915e530373b1e7c02994c9729f6a282c5f40c70175a85799e75c68f7a863b7fb722ee212a5d062b147602b564ee1fac6524
-MISC ChangeLog 142672 SHA256 e011798cb36e1a89756ce1dcc68663148953e98d964ea3ea8289c189ae7752fb SHA512 dc9afcd24380527da9c9ceff5dbd0f97a156fb6435fa5196b695307a3ed9dcd2a86dd78d333ba8cc53f901593fb6941b727122e8f2b346f5ffc1dadabb24070e WHIRLPOOL fa61515bacf77cc537989dffccd7f201a10378c11530a1de13a2a58228d4408073e058ba96299a0cfcf5c80f2c0ed9fe1c5f0ebf0080f468bebddb4597a670b2
+EBUILD netbeans-websvccommon-9999_p20141103.ebuild 2727 SHA256 a99d0cd7451db91e0305b6480dc8ed5aeac37a61bcd65256051e6c8fb42a8bac SHA512 eb76b2bb13beb8b9c3e2770b47aaf8b7b086162ebb2c6bed287984793d30658391f499b1223145da211588c11cdbd3a3ba7cf3095b5b0bd9a82ee7931b9914e8 WHIRLPOOL 026d8064677d470d40478a1c16312503f0588ba56377a445bc7a1283da44b5832a869c0a7d65b648845c0d05f5ef7bfdf51e09fe6ba2e0cb64b7dc818f94e30b
+MISC ChangeLog 142857 SHA256 f1256cff73b02170cbad3143c46f88b564d817c5b1d8129a9a1e80b1c0433113 SHA512 ac931447ac59db1ca75fa22b733d3ea4167f5d189cd3ed64d87ba3955bf5a84db291a7fc9352a2b7f0dde93d4e01aa88c266888dd2c117eeff2f8ac1487a5783 WHIRLPOOL 38b4dd8aa953faed44103f3e5604eef8f04737ecdf734ddc4600bfccf70472ac8370a2f9e6689265ba1559b5154f39ab0d25a70a4028a8ce535cff707a863682
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20141103.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20141103.ebuild
new file mode 100644
index 0000000..4fd0f52
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20141103.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2014 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/2014-11-03_00-02-02/zip/netbeans-trunk-nightly-201411030002-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 9ac649a..5e70f0b 100644
--- a/dev-util/netbeans/ChangeLog
+++ b/dev-util/netbeans/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-9999_p20141103 (03 Nov 2014)
+
+  03 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-9999_p20141103.ebuild:
+  bumped to the latest sources
+
 *netbeans-9999_p20141031 (31 Oct 2014)
 
   31 Oct 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index d5c11d0..4315ab2 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201410170001-src.zip 197610191 SHA256 ece01ea8e2f656
 DIST netbeans-trunk-nightly-201410190001-src.zip 198848484 SHA256 239ac089ce10c7f9bb528c7885a1096edf90c34a449e0954123015da764964e4 SHA512 b6d330d6d7a82662b73c410877ce049e6a9258a3310383e515a4cfeb8597ea5c72b2adcb650a131b7a2dcda5d1260b4d927120cc6f4dfd667e6ec14e71c27daa WHIRLPOOL 48c59a25b584360cafb366df0fdb1acaf46612dc0a204b91841d0d9493b3b34056485005ad23db8ae05ae44c2d68798b603f68ce87e7012b2e63211db3fe3e8d
 DIST netbeans-trunk-nightly-201410300002-src.zip 198898097 SHA256 a8617a69f201a25d4bf0f78226885e73a6fedcd5c8620f115573fda6d617b444 SHA512 8c7c70c04260cda6225b6246e756ea285dd60f88490ff29b2f13195103f5fd3589a8ea0b30436a126a33663c5b25b1d7a7e2713804bb7fb23b2033038c229c08 WHIRLPOOL 61c3ceea8c2ba7d8f55515495b6cb47473d55b7a35c84632fd34edb34fe8c94393dc0b08252196d9132290db974aa03e15b897c0d8a9397bfdc957fa64ca9219
 DIST netbeans-trunk-nightly-201410310002-src.zip 198916747 SHA256 4f200798d8c10985c1e5fa7c9e523564808e508a3f19737a3effa9aef7d8808e SHA512 e7aae2121699e1d8b19df3406c1eae8e1573a64b11ecfae2c110df895ceaf114585643e064b781896f6956747169265aecd317018eef324f3ba2d3571020c76d WHIRLPOOL 8ef1ebedc044af25a3219c24d38e677ffd89ffb91cfb0d017373d60c3c1c3d27ee0065c6ea68b003fb8ef28a3b7c6c7e64a110e1f670f989f1a038efbef406a0
+DIST netbeans-trunk-nightly-201411030002-src.zip 198928747 SHA256 4101f4b4ca15f57435d9973d7ca3e1d742744515af454add071132034944df53 SHA512 890d8331fbe66022c65ce2aa71af4c88f23a75d101a90f0c0f63b3bf63307abcf47362064d685ecb26ae27405fcbb5e051ca798151505717f5d43d7f4adb37f5 WHIRLPOOL fa908bb07de1375432cbb2cb4cc9ba669e8042bb2e4b29b4a2ba95e994fac7043a9883df7f046a3928b8f4774ae82272855e73e644b58c5782f8afd27006ef1f
 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
@@ -60,5 +61,6 @@ EBUILD netbeans-9999_p20141017.ebuild 7216 SHA256 23b0cacc55d5aec3268196e53f3b06
 EBUILD netbeans-9999_p20141019.ebuild 7216 SHA256 16048acf46a09952d7d7a3b0e7e97542df36d0909baf723b659520e753b136d9 SHA512 ce12b87fa4f6b2e60a5311cbb414d87e55b5b08ae4dc2b960d847124a223817a868fb9e9a7bff40a06d924ae177fa9abbae8bcb302928b1b2c506410f94f0197 WHIRLPOOL 9fa9019571d3a6dee508cf3f56ca9c0785b81569b655af65a07a7a7c6d5d0c0ed8cb47f711104675ce9500101ff15895ac558b3157c63829ce1a0cb0c908d61b
 EBUILD netbeans-9999_p20141030.ebuild 7216 SHA256 29359641953d250b11c1d36ba7431255ede3d29dbae10107c89783ccbff9afa3 SHA512 7c3529128cb24e49f0a92d66514aa402bf96324cab7e12c2e80e6ce6653269c02f32e3d023162ac5ccefb30289b0d30f234f59a7525ae00a5fadbe09a40569a1 WHIRLPOOL 2c0feb672779347fcd0646a5786fafdc237b407871f873bcc6f9e225b4bd0d73d5038f512aae54c0cace6041324e7ca1479223ae3a0812e9526ea5b07886b5cf
 EBUILD netbeans-9999_p20141031.ebuild 7216 SHA256 9b09a6508e968a6f38ad6ac99656f794658866858767bedcf192a1cb8d1a2a83 SHA512 77c3706e5469badba142326ceadcbd17ecf69402f02785e483970d318137c868bc684c357282e7ed0bb327c2443eb9ca1a0c7d0caf834c703818fbdef45b7b9c WHIRLPOOL 0d05bc7f8e6df83d80ce26513adb1003a6afced4f7db70d0daee2d3f27fcfe0cb371c0e3108f39aed36795c495eb52760adc9c66d177f1b585a4c9f31044bff9
-MISC ChangeLog 121789 SHA256 e4e4e325b4ecda92bba2bf80a8d83e2e86a4118b5a0ab105a8910e0e53c7cef2 SHA512 5f43f9374a16735db6bd91c50b6e46e96c95f5e15fc0953df3a170fccede4a2d0d9f1b6d33af73b451001e0af5be95609d1c64a5a597cb5b1dd8f14f9bdce927 WHIRLPOOL 0bd427e9169b00e53bfd2a7c2109a87cfcaf8584a4ecf2cd915299576e8b8ecc48b557e40f7356559c926a5ad79f0dfe0612ac252fb3daed8b35eb12db76cfbc
+EBUILD netbeans-9999_p20141103.ebuild 7216 SHA256 2df0392d8b6f97e3d0acd8a560b8772adae453a6e4070141231e7308e6b93e4f SHA512 541276a53532e6355c3deeb420451feb72406ae60c0950dfe6aab7d88419c7ca3077e4c28c2970553c63ab6fb877619939267e8addc3e8d47467a48d44b5ae6e WHIRLPOOL 3341dd80a9af56d778ac10d9f1bdbe86eafc82c5adba757354f5c5b102bb239da73246710d41f31f59a9cbf16287d52f8aa42abb11732fbe553f45b0e200bafe
+MISC ChangeLog 121948 SHA256 40c79135120f3355bca5b3bc952e8ae15782fea190c9be570f6a2d7f19f11c97 SHA512 7a888e82490e9c50a0160d362e091e861a9b5f7298a4eb5632b4b50a6cc2e5dbca1c222b64cd86856211d7b7e9bfa8e3d2c87f3ef3df818cacfe3a6093b4114a WHIRLPOOL d2faf959535ee799725e0559bb84af24a12eb1dcc0d237c4fff3d11e8954e2a8c79a42d2682725b292767a5110468feb046ca09a06aec754ae3d1005bfba2313
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

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


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

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-javacard/, dev-java/netbeans-webcommon/, ...
@ 2015-04-29 10:38 Miroslav Šulc
  0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2015-04-29 10:38 UTC (permalink / raw
  To: gentoo-commits

commit:     d0543748ae965872067223218ace88830e41aa52
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 21 07:49:35 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Apr 21 07:49:35 2015 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=d0543748

netbeans: bumped to the latest sources

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

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 80ccf55..7d78863 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201504130001-src.zip 207117285 SHA256 0d878514b8738f
 DIST netbeans-trunk-nightly-201504140001-src.zip 207131027 SHA256 78124063613a80e58738442f8dfdf251a297c218bf3a9982d2c8aa62a2d77a9f SHA512 dd5b7d32c1ac1107f8ddca68168d47abdc93eda7b226de6373d1f2842707ca275c2c23d61fffac7d125d8aa403c946c2b6d52ea992a609b4b065d3215ed9d206 WHIRLPOOL 8cf5588de638ee1effa5ba65dc95bbea8b6c72dc8b36d997eeaf3dd60d0ca1848c8786e4fbd43f98b5036a707efef6625c4a6a1acf35a6fb40e9fd1566939e13
 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
 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
@@ -54,5 +55,6 @@ EBUILD netbeans-apisupport-9999_p20150413.ebuild 3390 SHA256 e0e1d2946d5ec38cbc9
 EBUILD netbeans-apisupport-9999_p20150414.ebuild 3390 SHA256 96cd4c467f2e398af4725e81c6a860d1ed5bb5a401806ac0320ede2f737e142a SHA512 85c350d27e9b983caef381b065cea10e37b86f4cf89bada14a4c72a1a221921db971556652fc613c6644710f449d9e553815375da01a04f093e84c791894c7ae WHIRLPOOL feae49ce22afe6891535cab1d78b2c5cd365c1b934ce84953af32c0dd1a8c16f62e23495a8060986461ca1c8095667325b3f1693ce960910ca2f2548e1f8aed0
 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
-MISC ChangeLog 168145 SHA256 18837d82ae370009c1116be1668d07b3e15faacaf0f6975798ff49e3be327bcd SHA512 1f865abda695b675767e52ca3808b9e1729601a9f5c35656162ea5a7bf78ab06af6c18e12dc5c6f382074b36618a34db2d3ad35b372c7434c96010c757bdf9b9 WHIRLPOOL 35debacfef6f164e20ace8beb6baede4185c22717e49f54014d76585ac8454f25eeaf20401db04dc3aca2518f3f5c1635f00d538b2855e3ca0da14ef9ff6ce37
+EBUILD netbeans-apisupport-9999_p20150421.ebuild 3390 SHA256 0304c8008fda731adc0cd938fc3925ed618d4766e27407e354ac823b2332bb77 SHA512 dc7c1fb007da9bda4426a6732545eeb4688acf56b9e2285549078083c900882d0f8604513fe12e6b587de3aaef6825acfb9fd02b30e5d4844b73606b3d040c90 WHIRLPOOL 6b4f330d87938032860dca5c7b5fdb41ee0ee8d789cf44ccfdea8bd51326a27b0069b9d34985b689d601e42cf322a0c9d1c6f36f8b2adddf43938b4a5f5992b7
+MISC ChangeLog 168326 SHA256 2bc398d92eb7a0ec2cc6d42db7eb30dbf371b1c1d3a76f0da8a85e2ceb03366e SHA512 e8eec93b893dc8b7da163ac4df25a2b7977f65dc68be61844faec4f7b301fe467319c0579f6d9f135a60ef6b7a2f2620ad81bd4f800b962690c1d64efdf27d94 WHIRLPOOL ae4b2e3bcfcaaa0bdf6132271922c4548426d180c352283128337b2de8e8c8c13cc54b25bc9d46e944a6a661d777f1525fb8b2293bfeb373efdc407b0f5bd9c8
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index f534f15..d293bb1 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -45,6 +45,7 @@ DIST netbeans-trunk-nightly-201504130001-src.zip 207117285 SHA256 0d878514b8738f
 DIST netbeans-trunk-nightly-201504140001-src.zip 207131027 SHA256 78124063613a80e58738442f8dfdf251a297c218bf3a9982d2c8aa62a2d77a9f SHA512 dd5b7d32c1ac1107f8ddca68168d47abdc93eda7b226de6373d1f2842707ca275c2c23d61fffac7d125d8aa403c946c2b6d52ea992a609b4b065d3215ed9d206 WHIRLPOOL 8cf5588de638ee1effa5ba65dc95bbea8b6c72dc8b36d997eeaf3dd60d0ca1848c8786e4fbd43f98b5036a707efef6625c4a6a1acf35a6fb40e9fd1566939e13
 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
 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
@@ -69,5 +70,6 @@ EBUILD netbeans-cnd-9999_p20150413.ebuild 4586 SHA256 4a276b0d6209f3640c945ae2ee
 EBUILD netbeans-cnd-9999_p20150414.ebuild 4586 SHA256 6a37a83fdbe6676a90447630a16254b12973236d6d4653d5c1792269ae94cd5a SHA512 6097d7976bb50a9164b84f2b03df9b57f4b0523f840c089e4c90628a12f3a7e0ffc3c466325138f914553cd45e662dad86ca237e1094bab428c80aa64d4cfce1 WHIRLPOOL b64b738eb4c3a3b270c2e514ebfde0966c2151712f40d2b3cc58ffce4ee01bbc39a47233d982ac90fa16f43c4f18b5a57a5271077c4efb7afaca7ec3f48898a9
 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
-MISC ChangeLog 153478 SHA256 9ac92e53058854af725b08268fb0af7afe9b321b9bcfc208fe5b2eef6eeaf940 SHA512 a54a67162deb5b86d08a4d2f242be0e9f3d78c115544e67be67a70e531eaa9401ad59015070428bb1cf12c07633dff3cf266243c806f3a76ca41e08ad5fc92bd WHIRLPOOL c3133e7c08cdea45cf70a4bcaf6a1eb12cc95e6b29d304caee69d739f5e31ec57a3a4d6fba115f888048a4da9320166c5d05f6aa87d4d4d2cfc54b5be2352242
+EBUILD netbeans-cnd-9999_p20150421.ebuild 4586 SHA256 9e5244ff0758a679429ad0c044f7d3749192455d490585a84034372d610a179f SHA512 fbb8026f59c406120d3c4140b35a7f18aad966545fec714bccaee15bdbaddf2726c36470c9632512b275f462c4944e7a4809f5bf3bd7736ca2fa2aea902f3bc0 WHIRLPOOL 1a0b339a07e4e51efe337597269e6b5cbee593e98044bfd84fe9eb3ef4f2ac2ba604fb885d687a4ae55e24ac8d08da0b88a7fa490560daf3c66fc8f0889b0f88
+MISC ChangeLog 153645 SHA256 dc9db1f8ead79c8d97735396fdbc2151b621fefe11976a52bf36cf0587977bb0 SHA512 5ab248b3bc4f15cdc59ed8d03b7b698079bceaa1ddd89f8a4defda54368f5c407cebbf82688c3c6de037392b38bb090f0cc0a3343855dbc06bf8f0d86a88444d WHIRLPOOL df383a91eb557b2c467f591fa59ae267318de1d9d5d03a14747dfb280bd418f0bfbd4a391d35d66a83d70253eb169c78f89dccde0f2bbb43ad8771405981ee10
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150421.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150421.ebuild
new file mode 100644
index 0000000..08309f0
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150421.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-21_00-01-56/zip/netbeans-trunk-nightly-201504210001-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 98329dc..9421486 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_p20150421 (21 Apr 2015)
+
+  21 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-dlight-9999_p20150421.ebuild:
+  bumped to the latest sources
+
 *netbeans-dlight-9999_p20150417 (17 Apr 2015)
 
   17 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 6b118a7..ad201be 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201504130001-src.zip 207117285 SHA256 0d878514b8738f
 DIST netbeans-trunk-nightly-201504140001-src.zip 207131027 SHA256 78124063613a80e58738442f8dfdf251a297c218bf3a9982d2c8aa62a2d77a9f SHA512 dd5b7d32c1ac1107f8ddca68168d47abdc93eda7b226de6373d1f2842707ca275c2c23d61fffac7d125d8aa403c946c2b6d52ea992a609b4b065d3215ed9d206 WHIRLPOOL 8cf5588de638ee1effa5ba65dc95bbea8b6c72dc8b36d997eeaf3dd60d0ca1848c8786e4fbd43f98b5036a707efef6625c4a6a1acf35a6fb40e9fd1566939e13
 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
 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
@@ -63,5 +64,6 @@ EBUILD netbeans-dlight-9999_p20150413.ebuild 2995 SHA256 d3ede7192c69b9bcd0819af
 EBUILD netbeans-dlight-9999_p20150414.ebuild 2995 SHA256 1330bb86e1fdb45175952af97c6f47172de2e9dbe1105804066aa01afe81ad42 SHA512 92aeea72a560c2cef9c07cbda65b6bab82f9f02f8ed653952583011b6d2a27a7ef65c2a3c0332606d1e5548cbee2ff8825343df078151020eb65f49339b31ba5 WHIRLPOOL 84e18bda4649a797f11520d30cdffa01e6c8db0283bc8852dd993639a2bdad4405dde9112946e5fde54304837242503b67a97d4f3403d00d0b86b84bdecd5b5c
 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
-MISC ChangeLog 160186 SHA256 74a46735e41db4ab6db89168221ad711c95f917cbdaeef12f17131955a428319 SHA512 7fc4e21e40f71c51ba081d7b951e0af3f07c5c4adc641d9002ec1aa61e57a9e6e2c1d91edc76211c5b185866fc3e1ebfb8c561239d10dd67edfe59ae0b4b87af WHIRLPOOL df734fa5d725fd6abeebcfff9a597297a763bd95ed62c2bf11b91c055fd996b54c88f1811ff80d64711a877e77643f81dfae945d454de3a65f66ba4fc9037fb9
+EBUILD netbeans-dlight-9999_p20150421.ebuild 2995 SHA256 ba1a8bba2548d7ed29b960961d15b253d8ea6f03449ae90fae539f49ec77d766 SHA512 df9b191108aad68624653b934b17c04628999381c4254fcef25f8239a0f9247802683706288f9be70d695c994f1108b0951cae55a8a8708ebe331c4bc2ca5f01 WHIRLPOOL 85a11aeea2fc4447978a9b9005323408200dd0fc9e90fd42ac1e9af9b7c9cd66480a020fa8b582036d82a803a142f53b8e5e85307fbc2caa7939afd43e010091
+MISC ChangeLog 160359 SHA256 e7d8d24d86a2ee110f67622524f765e071795fafd43e351a07fea446a1a2dede SHA512 44cc94e994f2dde8d02dd0d45e4c765cfe1ff9a2bb8e049de2f0573991b7af80a56c422ed1aed5ec28b82db0154b38984d41f5426bf4b357e635340b6b55986e WHIRLPOOL a12378c3ab56332fdbb6ec7002f19ab3d62633623752e3bea025cce9965022a77840f56b9b2828da5297a0d6e0a6c46ae2c04c2a43ec28394260e2ab971ef0ed
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150421.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150421.ebuild
new file mode 100644
index 0000000..ef737c3
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150421.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-21_00-01-56/zip/netbeans-trunk-nightly-201504210001-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 f0f22d8..02fc9ab 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_p20150421 (21 Apr 2015)
+
+  21 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-enterprise-9999_p20150421.ebuild:
+  bumped to the latest sources
+
 *netbeans-enterprise-9999_p20150417 (17 Apr 2015)
 
   17 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 5a8a100..588b80b 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -119,6 +119,7 @@ DIST netbeans-trunk-nightly-201504130001-src.zip 207117285 SHA256 0d878514b8738f
 DIST netbeans-trunk-nightly-201504140001-src.zip 207131027 SHA256 78124063613a80e58738442f8dfdf251a297c218bf3a9982d2c8aa62a2d77a9f SHA512 dd5b7d32c1ac1107f8ddca68168d47abdc93eda7b226de6373d1f2842707ca275c2c23d61fffac7d125d8aa403c946c2b6d52ea992a609b4b065d3215ed9d206 WHIRLPOOL 8cf5588de638ee1effa5ba65dc95bbea8b6c72dc8b36d997eeaf3dd60d0ca1848c8786e4fbd43f98b5036a707efef6625c4a6a1acf35a6fb40e9fd1566939e13
 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
 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
@@ -143,5 +144,6 @@ EBUILD netbeans-enterprise-9999_p20150413.ebuild 14851 SHA256 979e612cc4ca1e5ffb
 EBUILD netbeans-enterprise-9999_p20150414.ebuild 14851 SHA256 8478fd9a92b51d04e7e972402e94ae3ac01112a8ca5bb4222458b9f59ce0113d SHA512 dc6e8808837d4a7370f64db5beb1d2f86adf0396abbec196809f6cadcec713d893cf3dc2e4afa718efd0bf04fb6588d9700a65289f9d199e712db3a245c7af57 WHIRLPOOL cf47664728f04ad5fe3823470444c6759a4b77a203fc0de14fd813882643d6181f2e512e83527da5979c7089d61125541805b04a64eb8053284c20a1646108ab
 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
-MISC ChangeLog 168670 SHA256 7c4f92bde125630f83b72d3de0dbcc114b7de78f374bed58e47783892461e565 SHA512 53abd65fcd4f618d1041129856643648bb8f16673dbe17cca7e441f746537d9ce942992b0e9a8a19826a3c71ab20ce5a2a355949a88cad10a6c98850b39d9a57 WHIRLPOOL e53f4b8118f9c4be28535c58354f2330a4af19ab45307a386840c1c3b0cadd47f7d716ea5f58b115dbc17de0a97c04197635238c4d782e76e12669279bfd958c
+EBUILD netbeans-enterprise-9999_p20150421.ebuild 14851 SHA256 b5a66e12c6f06069d745da67b49826befaa05a82eea5b2c04f614bdcdf040106 SHA512 9f5df1090ba60ec1e28d84bcffbcc8c5c9db282c60d51803d4417392640df55ac8b8f0ae74ddc0011f970e2390f2070048ff6e2d7780546b4ffc8dc37628762b WHIRLPOOL 186e3dcfb48a32ccbaad5aeb4142b5a69d18b310d85f76c1995905c77fefcf75f3229fd8950277f19ca5b222b1af56d2cf1c03224bfc0e33ad7e940413eac431
+MISC ChangeLog 168851 SHA256 6e467ab48bd701ff532c9a8e2c38b40dadb9e81deb64c333ee66a748bcfcb685 SHA512 5ff5da78a99350e1347078bd4b331c0869b4f3b440ee92c1494f63c8cbad2f1aaa9e802f6c9a6c14617e0d8ba8b9c6cc761f82a177c696276326aa88d8f7b190 WHIRLPOOL 75fcaba08e539e1860809ff80de1305a8cb826567200a2924111a61d683998048fc2ca01b65fbc9fd08a8b67ff4b0674acc0b810cfd8a80b693451c7bdfdac7e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

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

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 69714dc..258a9a9 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201504130001-src.zip 207117285 SHA256 0d878514b8738f
 DIST netbeans-trunk-nightly-201504140001-src.zip 207131027 SHA256 78124063613a80e58738442f8dfdf251a297c218bf3a9982d2c8aa62a2d77a9f SHA512 dd5b7d32c1ac1107f8ddca68168d47abdc93eda7b226de6373d1f2842707ca275c2c23d61fffac7d125d8aa403c946c2b6d52ea992a609b4b065d3215ed9d206 WHIRLPOOL 8cf5588de638ee1effa5ba65dc95bbea8b6c72dc8b36d997eeaf3dd60d0ca1848c8786e4fbd43f98b5036a707efef6625c4a6a1acf35a6fb40e9fd1566939e13
 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
 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
@@ -54,5 +55,6 @@ EBUILD netbeans-ergonomics-9999_p20150413.ebuild 2919 SHA256 67b03704398da019521
 EBUILD netbeans-ergonomics-9999_p20150414.ebuild 2919 SHA256 c4b6380136ca3771223648acb664675acac7657cbe2f52c1511542e15272690e SHA512 cb0eeb7b9ef22570eca2d647bc7389f1e7e12b3c70015db855da3a372a40119c01b70cfd39146f5bdacdab5da1b1cf3045d07eb76b3223aa521fae71d0e348a3 WHIRLPOOL 0824262668a4e6b17d7792e7799822ed3c58edc66a10e800b78f77f8226236c2028aedb76e7b2776a2f2fe97943e3ef527520c22d5bef0f6ed9a8b0667049fcc
 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
-MISC ChangeLog 168145 SHA256 25f25da39409dcbeb6922aa18730547940d2bf54c77d92236ef235c7aff579c3 SHA512 92cc34cb25ef9cdda5d69fde52d8283392af7846b95a94a4c7678249d016d84560dcbed1e9927c86dae0e2fcb234e1d7e474cba1515c1d4c2da4349f541e6519 WHIRLPOOL e744ef6f5f205113cc35a73d390a3c43ef910ecb088ddd662f2460d8b571b0f84bd64a8826eb2c4d809f771afebb1f8c7ac9bc0c6b5bb0985036cd7f7cc7fff4
+EBUILD netbeans-ergonomics-9999_p20150421.ebuild 2919 SHA256 975d1649145cc6c160a3a724192d7b5d1cf6e5309e05fac4e05f4630461fbb1f SHA512 eebf700fa23b0a1bbefe785d35222ea78e07b1233050276db84e74c4d254056a328ea3bc00115f3aa7ccd2f47f55361d2bef6a49feecc2a232085fb719393c11 WHIRLPOOL 4be6b36a9b9e09c3dad813b7658dcef5f031d45fa42ca7af41a788dd3bc1657b9280e9c9381cdbb9eec2712a95501fd6c961ad443705de813592ef02c7ac09e6
+MISC ChangeLog 168326 SHA256 2b88f58ab65d6efd58964273e96d5c6efa2fa23948c9e8c27c6129056a6bb788 SHA512 009773fb7efb1d54ca0a6b50b4dba18af588e7f34e4d997a7e8474a2374d38f33b7bf8ac2c910bba349ca9e2573e2fd6cbf10c8d931072c1fc1f80a13da89c66 WHIRLPOOL a4e503ef56602f49b7d692db0e2d4dec185c9777ab0e026097730507d5b3162f7389ee17b4644f4423e23e26d8909579fcc133e18b0988f61c638dbe875d3523
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150421.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150421.ebuild
new file mode 100644
index 0000000..6bcfcb6
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150421.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-21_00-01-56/zip/netbeans-trunk-nightly-201504210001-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 56985ea..67bc682 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_p20150421 (21 Apr 2015)
+
+  21 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-extide-9999_p20150421.ebuild:
+  bumped to the latest sources
+
 *netbeans-extide-9999_p20150417 (17 Apr 2015)
 
   17 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index b6e575d..ce820fb 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201504130001-src.zip 207117285 SHA256 0d878514b8738f
 DIST netbeans-trunk-nightly-201504140001-src.zip 207131027 SHA256 78124063613a80e58738442f8dfdf251a297c218bf3a9982d2c8aa62a2d77a9f SHA512 dd5b7d32c1ac1107f8ddca68168d47abdc93eda7b226de6373d1f2842707ca275c2c23d61fffac7d125d8aa403c946c2b6d52ea992a609b4b065d3215ed9d206 WHIRLPOOL 8cf5588de638ee1effa5ba65dc95bbea8b6c72dc8b36d997eeaf3dd60d0ca1848c8786e4fbd43f98b5036a707efef6625c4a6a1acf35a6fb40e9fd1566939e13
 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
 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
@@ -48,5 +49,6 @@ EBUILD netbeans-extide-9999_p20150413.ebuild 3383 SHA256 a9c8cdfce0924ef61ddb3ab
 EBUILD netbeans-extide-9999_p20150414.ebuild 3383 SHA256 eb50642e35490b89a2adeb6a3f50b18bfd35566c5f86ea3eb90181dc9995ccf3 SHA512 f92d17cb6d0d9c2e69d4b056fea9f0d3b349bba0fb5812d7f3b0f61bbafff8fe3fa5ec7c79f1b6f0cce4aa6d61d197f9fb0c92c0cf51b2d677f63ffbbaaf3c5b WHIRLPOOL 585de6544c43c7d395b18cb3b91f95174b81ed64aceeb8ed90e91e82f256ddb5c3ea6169687736288a124494cd63076143b28438566f481bbb153fca835bec5e
 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
-MISC ChangeLog 92096 SHA256 108133861d6e8d49a8c9fe2fba792649941a340bcd6ea627f7ee9f1e1b7f5418 SHA512 48e9281acb4979c39497a13ce691210811d5132aeb11a97785c00e1caa41fd1712edfbf62a896a2e5f5895b2159ce7b8195e95a98a1b883842a2cb3cac830670 WHIRLPOOL 5bd3ad0155e8e2496838bc140fb1045ee296886b9c2ee925886aa59e65030fabae893c91db47063f40fd110e9b0b78fe6d5d9993b7aac5696729033314cee1f1
+EBUILD netbeans-extide-9999_p20150421.ebuild 3383 SHA256 7518f83d097ee412ba5c6131c6a007c73c9f650f202fdb42a66e98ca427bf981 SHA512 3ca03569170302875417e61d11bd3516f74a1d3feff3c46fec9e3718eed9ccb2c766357e691634b85a9b02981801cc9d79ac7aae6740127034531afa8b90297b WHIRLPOOL 71087faa2d76b8d1f5a15d59509b559734d951ba178ebe140d0c5d3f6e6c6e6ba33a0bb5714ac110823459bead755c96ae07e9e178266816c5a71952d67f627a
+MISC ChangeLog 92269 SHA256 aca0e62bcf652f025eb9cc96b6b9f76c28acf9ce8b568a43797dec3487ca14bb SHA512 ce1b9a849751b5e44704abf221dcab344bb24f51df85968787c9d4b73d02d760f99b4e93a0e3c4dc3b8409cff17a86aacdd34d6066035e779e8478cc61b746f0 WHIRLPOOL 41d28bcc05e04bdb23ef81148f7c6ccaa73c7c46bd44ae7f3eef86da8153e54204501461a7268cbd3f2c0245a481a4ecef1b9acd27f21b98fc1dfffe0e0d89b3
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 49baa0f..fd9b815 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201504130001-src.zip 207117285 SHA256 0d878514b8738f
 DIST netbeans-trunk-nightly-201504140001-src.zip 207131027 SHA256 78124063613a80e58738442f8dfdf251a297c218bf3a9982d2c8aa62a2d77a9f SHA512 dd5b7d32c1ac1107f8ddca68168d47abdc93eda7b226de6373d1f2842707ca275c2c23d61fffac7d125d8aa403c946c2b6d52ea992a609b4b065d3215ed9d206 WHIRLPOOL 8cf5588de638ee1effa5ba65dc95bbea8b6c72dc8b36d997eeaf3dd60d0ca1848c8786e4fbd43f98b5036a707efef6625c4a6a1acf35a6fb40e9fd1566939e13
 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
 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
@@ -58,5 +59,6 @@ EBUILD netbeans-groovy-9999_p20150413.ebuild 3422 SHA256 1b8f7b4d440536cc8a79351
 EBUILD netbeans-groovy-9999_p20150414.ebuild 3422 SHA256 5051b2b9788edd5094a3aefb7b722e377268674121cbccfbd6689943e4e5107b SHA512 53e8981128a4958e7d06025516a9d1dd70dad7e40c01f0763c5c5cc6abece56b471ca0424eaed3fb3302289de5eb60437369c9a31dd684fa80a2db0346652bc8 WHIRLPOOL 99b97f849e08bc45a07ff7fb30b7c09361bb09a89ffcf1d9ad1e018b23be2675d13b3c5fde4694c7f17d6e1f2b4a9a1167ac0c0b5eea1688ec0035fca80a84b1
 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
-MISC ChangeLog 160076 SHA256 dc51d62e07b00554b88f0cc9950c29570eb82508bb97386937320665f23e6d1c SHA512 330b9d8d45df42e9f432e5ff1072e22dda5733299fc3b2a456c2f119803d6dcbd091dfcd8737a126c9d5c92cc131899a6c8fe4bcf5790bccccc887bbbc476c7e WHIRLPOOL 336cc0835bb10378faa580a66865a9f7e7a863ad64e2dfa365fe9704459ee18dd9d250d5b94ff29bd91dd580c770c6050b4c40f8452bf0267be3bcbc61cd5bc1
+EBUILD netbeans-groovy-9999_p20150421.ebuild 3422 SHA256 8840d448cf98e8f98876276a8c7c698b76d7d181286d15a4a695f01d23c17f25 SHA512 709da54247b84827c176b92a5907dcdf9473da0f1773333b475232025aede4ccbc9276cfabd2ae6ddaea546e71b59e931f80774fc2a96adcd0d9c4139d621ceb WHIRLPOOL 9cc6a4ab042b47222908826a12acc214d59b1ff86e061a612498d905a7c7507334d576f34eaf54f0bf887346408f0309232ea9aa6cfa232826d4b388a40e71c2
+MISC ChangeLog 160249 SHA256 87de78cdeb51a3f4a7697b81a7690772cb74587dc7401e34d75ece5b7d649e86 SHA512 cbce392e518c0f29dcfc1a95085ba94c805a7caa13525564e23b57ba4015c2904d8c0679296eb7808253277fc036f80bc839adbf70d2d740bfbce76ab7170035 WHIRLPOOL cc4c35c2650c675b08d5338f66bfa9e595401fca58a1158ed48e777f4fe65d2c1a065bdc6c0deb3fc86cad686ce74fab6e5bfd45a783979c05c7f2f2522bd4d7
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 6ed341c..20fd335 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201504130001-src.zip 207117285 SHA256 0d878514b8738f
 DIST netbeans-trunk-nightly-201504140001-src.zip 207131027 SHA256 78124063613a80e58738442f8dfdf251a297c218bf3a9982d2c8aa62a2d77a9f SHA512 dd5b7d32c1ac1107f8ddca68168d47abdc93eda7b226de6373d1f2842707ca275c2c23d61fffac7d125d8aa403c946c2b6d52ea992a609b4b065d3215ed9d206 WHIRLPOOL 8cf5588de638ee1effa5ba65dc95bbea8b6c72dc8b36d997eeaf3dd60d0ca1848c8786e4fbd43f98b5036a707efef6625c4a6a1acf35a6fb40e9fd1566939e13
 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
 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
@@ -60,5 +61,6 @@ EBUILD netbeans-harness-9999_p20150413.ebuild 4131 SHA256 cc48603260ea296b66d618
 EBUILD netbeans-harness-9999_p20150414.ebuild 4131 SHA256 6ccc012a70799b66d9b4ef6b74bb8410c27ac99254f5e72d9cbf0b60d7f9d76c SHA512 482cfba35c8e8ee14f7dc6dc192d93ff2ef9e445365a3cc2d460711f6aca333b87e8090a4650a277e31a4b3ba02090262def0c69aaf4180825ffd95842911132 WHIRLPOOL 6bff467e5cb25b8d00f55783e6de81d7c8910665a48619149174f7e4a4b52c88d00d815946008240821cf25687e4c5e7b2ae004a8c93ee49f8dcae0d2b904fb2
 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
-MISC ChangeLog 162122 SHA256 f544cad05b26d0c6812e04fc869d7307ad93338d6d3b21cf2de5b811afaef18c SHA512 a45f1748b47308942712615637aa91a2c3d3713bff38e3da5713718369885fdd9972fb4877ade974d2e355f3f83bc74ad80bc56358a7adaf111cbcc5bbbd8da0 WHIRLPOOL 046e4b08d0c0cee24bfedc5b8e14cf7d1089aa89f019c80c28a38180f230f7ab6c6d69f04b57f11abf4427f3aeb2b3fb0351ab860614dc4f6b8a1dfd6fb64006
+EBUILD netbeans-harness-9999_p20150421.ebuild 4131 SHA256 26a35a0b824e7a7beb25befaba9b250d121cd53cd60a11fc988e1848ba129d4f SHA512 49d53a70313c1a8fa030a7d6bf461794702ad11978eec2f604abbd4bbf896c3506b76ae9c8244118e4f8fda9c21c698a38dfa5ff03e1a39ef1fa2db0b4a19a62 WHIRLPOOL f54503653b529cc7e96e6e18c4fedf356bf0c484b7bc37a824983a19365ac5d5a177f23e7c35e028118d5fc0993092981b7a26dab9ec9b1513482ceae9d11807
+MISC ChangeLog 162297 SHA256 b71994acc9d52127cd66eee29656b2edcd4e2ed80b6fd2e44c655a0fd2497f20 SHA512 cc46f36d762242d8d04e4d3ab747f204b8d7b7328b74c3075a5eb0eefb1097f904ab38c3ecf8fa8d8d5362628f32364275453df88ef85889307f388826e1de14 WHIRLPOOL cd4bf684c5a17e4e189eeca70ab8bfb9724b5ef7cfec352d75f81c86572d4416ef80ccf9743fef5d880c44a3117c8afbff51345a2d14162ff325be22717f49bd
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

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

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index e547c03..667304b 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -191,6 +191,7 @@ DIST E2CE2FB65B648E8762828D839CB7BE751FEBBCFE-processtreekiller-1.0.4.jar 34146
 DIST E31000A35F9FB210B18AB4F50F513F4D400BC48D-org.eclipse.mylyn.bugzilla.core_3.8.2.v20120916-1200.jar 249992 SHA256 6172040ec676ea3ead093ad1af70475a80dcf7a5d91ca00e9fea142e55d93871 SHA512 f2b44a6a1fe36ef7fb1059ab42bd6f767f5fc269863e087623eece12050a22c06d538f1c2c527611290bd280e17f6afe74df0e6c32de2c5b214be7f37fc9fa0f WHIRLPOOL 8584a80cfc2df75b42148dec0d92b5035a249e7e111a94111305821156c78769da5906ddb7b9127f9932058e1ec4c0bebf762159782d647c1ab2bc830384a985
 DIST E64EF6A3FC5DB01AD95632B843706CCE56614C90-org.eclipse.core.net_1.2.100.I20110511-0800.jar 69180 SHA256 d01eb1dfeb6806c34f957035252855e76da791d1e2f273db24a40a511e87c7d9 SHA512 3a2ee75681c54ad11048fcd9c06678c4088c32f29896a4851e037beb5ec70977898d1d3935cc731479b881765de80cb1cb77098dafccce948bb623e723534320 WHIRLPOOL d6daa7e39cfdb9c86d16a8f5c39e548b700f7ee03fbd656506a4788b19ee1ee6247b745ec40dfa526662859befd2412ffb682ba0df80bae8d0c111e7f91537ef
 DIST E66876EB5F33AA0E57F035F1AADD8C44FEAE7FCB-processtreekiller-1.0.1.jar 33750 SHA256 06a523b6db1cbc3ef5fa61d13a425e884b526887b8ab9a9be9d3ae53e1df9a91 SHA512 47c5808a42a2707475d6034f56c6ef51d0ea3c34feac634997bcc02a8bd5952bea05e57a0645ef384ad327b950ef1d3970c2cbe4310a3633e3f9490d28b21b71 WHIRLPOOL 545aac332c994afcc300604853e1800968ce6fe2359c8e6ffa197446d9b9a74cc34cabbc073b2880ffd4887e41ba8d65ced2abde29a0f57de1d66eb785cf299e
+DIST E90EF50215FFD23928B3308DC76A17B7DADE5F33-processtreekiller-1.0.5.jar 34300 SHA256 3a26446f2721cd5a91f15e8a6ab0100a8b7abd5784d971bc43f7835c9d0594bf SHA512 f9433d2169d3eb7c4cbb3492f99b328516ed1529d0bacf34614281cc60b5bab0357de9a7b1da635464c22dbb6fa4ad90da4c358a1d231b85619bf3dfee456f3b WHIRLPOOL ec925c7645ead7ec746291be9f000a2af93a84956a98302c75db679eca03e52c24181f27337cc7bc18a9d69c3db7682daad62df5f29ad859c14101c8d05f4b9d
 DIST E99C3C29A90F8AB29078A38CF8EBC3860249640C-org.eclipse.core.runtime-3.7.0_nosignature.jar 64754 SHA256 baad38de06ef30af744bdedece7ac1c4d2150fd88ad6b2a4e6ccf290aed4344b SHA512 279acfaec08b440491be18ad9b5f80a6b02e9a3b828c14fa7dc82cb87df6eafdf239a02970c7fcb2883eceea0cf73cf1f093517ce40823ed17e193f260c2dca6 WHIRLPOOL f4fd3995ddf58744d2748af693010288f590421eeaf394387bec7f18c588fba8bc5565ae32704147f3014253d981edd9495e59e73cbf0146c440e87967f9f913
 DIST ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar 125146 SHA256 fc499deb9153610f735f75817f1c177978d27a95a18e03d7d3849cfcb35abfc4 SHA512 5b77ad69e116393560ff0e4514b514e0c0be5796a237458b09981a92b270a36892feb96293954e983221b2800a49ca693e30592ee69f391b67174cfc3ff107c2 WHIRLPOOL 9295543c60a6899b982cb3d5c4390c5c841f6a02980c84429f3648478eb5d7ed360d412b35e5106828d5a925491fca1e3ad250a7f2d1886b3a86804303e4e527
 DIST EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar 761996 SHA256 df7463424e3560f5e8c8003e1816c0a6ea6e84673921ca5af05b90b0892b3c97 SHA512 4923bbfcd0531d6807debc9ac0d8a1e10576eb2ed8a224ccb3bbba7e4f172d97b1d41f708398943b1298db15335fdd8919f1c8d9ba0ceb2170f7bf935cb7e470 WHIRLPOOL 755ff43f93d09733c6c4e41938e777d86273b5be8a475e4b32e1766bb0ee01c523ccd24197af9e133401cd15a4be08b72b34eae54c2645f434ca8065f51bbc05
@@ -239,6 +240,7 @@ DIST netbeans-trunk-nightly-201504130001-src.zip 207117285 SHA256 0d878514b8738f
 DIST netbeans-trunk-nightly-201504140001-src.zip 207131027 SHA256 78124063613a80e58738442f8dfdf251a297c218bf3a9982d2c8aa62a2d77a9f SHA512 dd5b7d32c1ac1107f8ddca68168d47abdc93eda7b226de6373d1f2842707ca275c2c23d61fffac7d125d8aa403c946c2b6d52ea992a609b4b065d3215ed9d206 WHIRLPOOL 8cf5588de638ee1effa5ba65dc95bbea8b6c72dc8b36d997eeaf3dd60d0ca1848c8786e4fbd43f98b5036a707efef6625c4a6a1acf35a6fb40e9fd1566939e13
 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
 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
@@ -265,5 +267,6 @@ EBUILD netbeans-ide-9999_p20150413.ebuild 30068 SHA256 9f46542faee57332b545247ab
 EBUILD netbeans-ide-9999_p20150414.ebuild 30068 SHA256 b98120fa998e889402b23663cb4e04f3b03975bd44aa9a9d0ebb25ee0c32c2ad SHA512 c1690d14cb7c8b2a6807d0410b87d7feaf863dd4cd10d5b65915697e85b3ed5937174dfba836a10b64c865056c43d1206224b0fd82cc49633dab0dc2b70d4378 WHIRLPOOL c918bca5b167558580786d4704cb8028e3f29d9f5c03a1198d4aab511b9938a0a18065b6fc3e7fe0d1660ff94d6466c0311d1037d0df48b8072b4e488eb8f678
 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
-MISC ChangeLog 154392 SHA256 b695021ebb26eb0cabbc3fd2837864a8e03616ff7d9897b22078aee744085a69 SHA512 627bd26011fc50539c741c089b57e17300b01ca91cb892f1b723f921c8af63de62d1484b6770ea46a337c26261e50518ee35b82efac44c1621b4d06e171f38de WHIRLPOOL eef2aff39743b3bed46236ca207f496bfd7bfa88431d89cecd266764c72da46a91478b2b4bca37917fddbd0761410055ef88aeedfa5f3a0cbd424fc9e1a1b208
+EBUILD netbeans-ide-9999_p20150421.ebuild 30068 SHA256 4d795d834ffe7cd7c27d0dc17da0d5eb91bd0620ac7fbdd13d2162b3f06e8c22 SHA512 315b4675a5e83d625f4452f74316833bd2a72beb996de8abd6b89f3fada49a71785cd1665b0f1d06f26224269f11da2228705b1464000965b2638982f130732e WHIRLPOOL 99d06711689269fd1efcbdcf8c09d5ecb74c15d4b4c5f7fbe745e9e304e90141e1126aa2b8fc0bd9e209b2650d59e5c98338a037c3e065ecd302e413349de655
+MISC ChangeLog 154559 SHA256 eaa6e8cfd22b11092d5917ef94724d810142e459cd7c32bd0a481b1f67a49f6a SHA512 e01d5ff212604627192a42e4a757bf038af5c9f65d6ff009f2139ab7384b7f48f11c53f389ae421b9f19a86112d85aceef76fa32138f213325859a3772d5b474 WHIRLPOOL 5097eaee7f7cb9cb8adbca26696bb0399008b4198681ab28b1bd58e3a7dcd5bbfa0995803a197d1c67f4655c4ee140a2d57d6780696383269e9d6e57427d2dbe
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20150421.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20150421.ebuild
new file mode 100644
index 0000000..0e977e2
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20150421.ebuild
@@ -0,0 +1,371 @@
+# 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-21_00-01-56/zip/netbeans-trunk-nightly-201504210001-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/json-simple-1.1:0
+	dev-java/jsr173:0
+	dev-java/jvyamlb:0
+	dev-java/log4j:0
+	dev-java/lucene:3.5
+	dev-java/rhino:1.6
+	dev-java/saxon:9
+	dev-java/smack:2.2
+	dev-java/sun-jaf:0
+	dev-java/tomcat-servlet-api:2.2
+	dev-java/ws-commons-util:0
+	dev-java/xerces:2"
+#	dev-vcs/subversion>=1.8.4:0[java] missing from the tree
+#	app-text/jing:0 our version is probably too old
+#	dev-java/commons-io:1 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/freemarker:2.3
+#	dev-java/ini4j:0 our version is too old
+#	dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours
+#	dev-java/trilead-ssh2:0 in overlay
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	dev-java/commons-codec:0
+	>=dev-java/jsch-0.1.46:0
+	dev-java/jzlib:0
+	${CDEPEND}
+	dev-java/javacc:0
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ide -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
+	ln -s "${DISTDIR}"/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar libs.nashorn/external/asm-all-4.0.jar || die
+	ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
+	ln -s "${DISTDIR}"/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar o.apache.commons.io/external/commons-io-1.4.jar || die
+	ln -s "${DISTDIR}"/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar libs.commons_net/external/commons-net-3.3.jar || die
+	ln -s "${DISTDIR}"/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip css.editor/external/css21-spec.zip || die
+	ln -s "${DISTDIR}"/53AFD6CAA1B476204557B0626E7D673FBD5D245C-css3-spec.zip css.editor/external/css3-spec.zip || die
+	ln -s "${DISTDIR}"/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip derby/external/derbysampledb.zip || die
+	ln -s "${DISTDIR}"/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 --build-only --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.51.jar
+	java-pkg_jar-from --build-only --into c.jcraft.jzlib/external jzlib jzlib.jar jzlib-1.0.7.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
+	java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar
+	java-pkg_jar-from --into html.parser/external icu4j-4.4 icu4j.jar icu4j-4_4_2.jar
+	java-pkg_jar-from --into html.validation/external iso-relax isorelax.jar isorelax.jar
+	java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
+	java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
+	# java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.19.jar
+	java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.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/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 15fe7b7..b6324c2 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_p20150421 (21 Apr 2015)
+
+  21 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-java-9999_p20150421.ebuild:
+  bumped to the latest sources
+
 *netbeans-java-8.0.2-r2 (17 Apr 2015)
 
   17 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 2b88594..458b049 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -111,6 +111,7 @@ DIST netbeans-trunk-nightly-201504130001-src.zip 207117285 SHA256 0d878514b8738f
 DIST netbeans-trunk-nightly-201504140001-src.zip 207131027 SHA256 78124063613a80e58738442f8dfdf251a297c218bf3a9982d2c8aa62a2d77a9f SHA512 dd5b7d32c1ac1107f8ddca68168d47abdc93eda7b226de6373d1f2842707ca275c2c23d61fffac7d125d8aa403c946c2b6d52ea992a609b4b065d3215ed9d206 WHIRLPOOL 8cf5588de638ee1effa5ba65dc95bbea8b6c72dc8b36d997eeaf3dd60d0ca1848c8786e4fbd43f98b5036a707efef6625c4a6a1acf35a6fb40e9fd1566939e13
 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
 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
@@ -137,5 +138,6 @@ EBUILD netbeans-java-9999_p20150413.ebuild 13432 SHA256 426d577023f3b0038f70423d
 EBUILD netbeans-java-9999_p20150414.ebuild 13432 SHA256 4cc1ea0b3e212da96fae22ba8258d6ec49d79434711f1e7d1f5468eb7432a319 SHA512 9775ce0b0ddc727485fc7f91bc7ed6bb95552f088a7ed8addb61fbba6ab82b48e55ca7d521c1dfe1241698e147da6e9bd1f4ea4fc9fed0328dfcece4a22d0aef WHIRLPOOL 39896ca770d2a12480e1ad26fd982ae2bcb263edb6ae27743c838f65943eeb7e87c102d3590bc14e23111026e36ef853b2ece613dc1cb7de02432752008f47e1
 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
-MISC ChangeLog 157540 SHA256 6bab8b8bf86c2fa7da74058f5db649026d4447308ee4b744fb6c62b3afa7f60b SHA512 872fabbd761d19236e613ed0f3fafc40e2a5115f7cd4be57b3feff709c7345e3e90846c605b755dbc982c18a1d18dd0927b704b0dd44893188079dde1072e4e0 WHIRLPOOL 62874c7ed11bf9d63182d9216906283ef82a97f2d337ccd49639d416e8f1fd92cd2f555c0db334d1a302260c1a151e8af15b709607f58af7f7c14c7d7f1c8ad8
+EBUILD netbeans-java-9999_p20150421.ebuild 13404 SHA256 0cef5013ed56bd13bf0b12099a50e6f0f49701a025cced57ef4253a4fba27ed8 SHA512 e39130e1c3a7f8036728cd5db58ae4f0e28af596ff1f854bf792cb864c0da273f281e0c37cba2c3c8bea312cc99709518eeed8390b3375317b0a6680d7574559 WHIRLPOOL dbc44fe02f09454cc414a4dedc45af755b0f52c502bab13195b3bba4f6c4c41174f00207bd9c5f972c4d3f6730685273b2af0a22b2f5cba2ae5798b6990fe462
+MISC ChangeLog 157709 SHA256 006ad4cd97a97d42a4d00bfea8bb77908265129d4bd585bfbb4fba5b05129164 SHA512 55fd76e1b18d657f92249d328c1cab2b7f25dad7010b38f3e328d6adfca6fce55c397a370c504ffbc094e794163fa80ed08771bf70cce139c4cf597193834575 WHIRLPOOL e7a3de57d9778ca4b247b6e91aa2d9958627c4a7190ed656c6dfd631c04a4ed1b0c1088494d5359b0c1b7b44ed79a48c41f93745b8f8e11c5729887c5baf4fb8
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20150421.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20150421.ebuild
new file mode 100644
index 0000000..e5a6a21
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20150421.ebuild
@@ -0,0 +1,252 @@
+# 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-21_00-01-56/zip/netbeans-trunk-nightly-201504210001-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/5E42E78CB7A02699FC213B8D90808C0B99F0F1CA-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-collections:0
+	dev-java/dom4j:1
+	dev-java/fastinfoset:0
+	dev-java/glassfish-transaction-api:0
+	dev-java/javassist:3
+	dev-java/jboss-logging:0
+	dev-java/jsr67:0
+	dev-java/jsr181:0
+	dev-java/jtidy:0
+	dev-java/log4j:0
+	dev-java/mimepull:0
+	dev-java/saaj:0
+	dev-java/stax-ex:0
+	dev-java/xmlstreambuffer:0"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.java -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+pkg_pretend() {
+	local die_now=""
+
+	if [ -d /usr/share/netbeans-java-${SLOT}/ant ]; then
+		if [ -n "$(find /usr/share/netbeans-java-${SLOT}/ant -type l)" ]; then
+			eerror "Please remove following symlinks and run emerge again:"
+			find /usr/share/netbeans-java-${SLOT}/ant -type l
+			die_now="1"
+		fi
+	fi
+
+	if [ -L /usr/share/netbeans-java-${SLOT}/maven ]; then
+		if [ -z "${die_now}" ]; then
+			eerror "Please remove following symlinks and run emerge again:"
+		fi
+
+		echo "/usr/share/netbeans-java-${SLOT}/maven"
+		die_now="1"
+	fi
+
+	if [ -n "${die_now}" ]; then
+		die "Symlinks exist"
+	fi
+}
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip maven.embedder/external/apache-maven-3.0.5-bin.zip || die
+	ln -s "${DISTDIR}"/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip o.jdesktop.beansbinding/external/beansbinding-1.2.1-doc.zip || die
+	ln -s "${DISTDIR}"/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar j2ee.eclipselink/external/eclipselink.jar || die
+	ln -s "${DISTDIR}"/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip hibernate4lib/external/hibernate-release-4.3.1-lib.zip || die
+	ln -s "${DISTDIR}"/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar maven.indexer/external/indexer-artifact-5.1.1.jar || die
+	ln -s "${DISTDIR}"/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar maven.indexer/external/indexer-core-5.1.1-patched.jar || die
+	ln -s "${DISTDIR}"/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar maven/external/jarjar-1.4.jar || die
+	ln -s "${DISTDIR}"/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar j2ee.eclipselink/external/javax.persistence_2.1.0.v201304241213.jar || die
+	ln -s "${DISTDIR}"/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip websvc.jaxws21/external/jaxws-2.2.6.zip || die
+	ln -s "${DISTDIR}"/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip websvc.jaxws21api/external/jaxws-2.2.6-api.zip || die
+	ln -s "${DISTDIR}"/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip websvc.jaxws21/external/jaxws-api-doc.zip || die
+	ln -s "${DISTDIR}"/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip j2ee.eclipselink/external/JPAjavadocs04032013.zip || die
+	ln -s "${DISTDIR}"/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar maven.indexer/external/lucene-core-3.6.2.jar || die
+	ln -s "${DISTDIR}"/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar maven.indexer/external/lucene-highlighter-3.6.2.jar || die
+	ln -s "${DISTDIR}"/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar maven.embedder/external/maven-dependency-tree-2.0.jar || die
+	ln -s "${DISTDIR}"/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
+	ln -s "${DISTDIR}"/5E42E78CB7A02699FC213B8D90808C0B99F0F1CA-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.10.jar
+	java-pkg_jar-from --into maven.embedder/external jdom-1.0 jdom.jar jdom-1.0.jar
+	java-pkg_jar-from --into o.jdesktop.beansbinding/external beansbinding beansbinding.jar beansbinding-1.2.1.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/java >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+	grep -E "/java$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	chmod 755 "${D}"/${INSTALL_DIR}/maven/bin/mvn* || die
+	rm -fr "${D}"/${INSTALL_DIR}/maven/bin/*.bat || die
+
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm AbsoluteLayout.jar  && dosym /usr/share/absolutelayout/lib/absolutelayout.jar ${instdir}/AbsoluteLayout.jar || die
+	rm beansbinding-1.2.1.jar && dosym /usr/share/beansbinding/lib/beansbinding.jar ${instdir}/beansbinding-1.2.1.jar || die
+	rm cglib-2.2.jar && dosym /usr/share/cglib-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
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext/jaxws22
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm FastInfoset.jar && dosym /usr/share/fastinfoset/lib/fastinfoset.jar ${instdir}/FastInfoset.jar || die
+	rm mimepull.jar && dosym /usr/share/mimepull/lib/mimepull.jar ${instdir}/mimepull.jar || die
+	rm saaj-impl.jar && dosym /usr/share/saaj/lib/saaj.jar ${instdir}/saaj-impl.jar || die
+	rm stax-ex.jar && dosym /usr/share/stax-ex/lib/stax-ex.jar ${instdir}/stax-ex.jar || die
+	rm streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/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 9d29358..bd288bf 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_p20150421 (21 Apr 2015)
+
+  21 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javacard-9999_p20150421.ebuild:
+  bumped to the latest sources
+
 *netbeans-javacard-9999_p20150417 (17 Apr 2015)
 
   17 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index d4fda2e..e134745 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201504130001-src.zip 207117285 SHA256 0d878514b8738f
 DIST netbeans-trunk-nightly-201504140001-src.zip 207131027 SHA256 78124063613a80e58738442f8dfdf251a297c218bf3a9982d2c8aa62a2d77a9f SHA512 dd5b7d32c1ac1107f8ddca68168d47abdc93eda7b226de6373d1f2842707ca275c2c23d61fffac7d125d8aa403c946c2b6d52ea992a609b4b065d3215ed9d206 WHIRLPOOL 8cf5588de638ee1effa5ba65dc95bbea8b6c72dc8b36d997eeaf3dd60d0ca1848c8786e4fbd43f98b5036a707efef6625c4a6a1acf35a6fb40e9fd1566939e13
 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
 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
@@ -57,5 +58,6 @@ EBUILD netbeans-javacard-9999_p20150413.ebuild 4982 SHA256 af1eabf5f7942536a3c9d
 EBUILD netbeans-javacard-9999_p20150414.ebuild 4982 SHA256 0e1ef0e0493a7e7c703171a6afc205ae875d22098a49d793c1940ff7499250ce SHA512 24e6b9e2852638661d45e221dd938a9ee9800cc3ae17355860fd03b6db9f530322e40fd58bb0bde8f23df678c0f16828b7d7c361010733359778f97a9dc668f2 WHIRLPOOL 2f6611ab3d40832a953a2a9144ac0e197f0ebb5ac8994044a04e7fde6d7b1a00d495e3e434e4db0e8c7363fbdce35a9dffe81373d6c97c499ddc30b516f3c4da
 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
-MISC ChangeLog 164168 SHA256 f76dcb9247e463646198f9510abeddccdc8d517da89bcd5fd8afd9c6ebb10892 SHA512 daabae9e6636e7bc87eb2a771bbd5fabb5663cc067265e802d1845e9ae42ae4da96978592ebcba14cfe496b2259ccfea22564e5e5536b3efce135f2357d5a620 WHIRLPOOL eec77990cdfde78ea0d91ea3a74c0e5aa95d280da32ff879c677e8d09a3acb8de571c751c182cc7fdf56012dabee5a24f3aec78429f9f37aa3d583163d7a493a
+EBUILD netbeans-javacard-9999_p20150421.ebuild 4982 SHA256 aa18f52776de46de10979c45bd08f1e22b59ce6ee87c1e52c344a43e2de62909 SHA512 fc67dde704afddd6398e254535e1ca9b15fed1d01398a63c487f4528a68803779373609d3dbcac3aa02fee7c8f9342032c37b6b3ae357da5da26dfe2c8a043b5 WHIRLPOOL 5cd01326fce53b2ec01f73c18fdbd25c1948c2c6c1331c93b876dd4e8e276caead4014defc2749f5a21c554c407728a07dfe0921a10e4e758f4e3eec88a04c39
+MISC ChangeLog 164345 SHA256 7be6e76984edb3be5b244f42c6394b2812b1e8fa4255de55bdc71821c4eb4f2f SHA512 bfa06f9e99fbbf41ce274a98a5cae47d4ef99db9abcda94ff036c0a0d42d5f0b3960aa94a13350983af5b69d3cb68e01d1d1635445d7ea46f195a2a127178de2 WHIRLPOOL 7aeb9fb80463b5ed8ad0200c0cc46a5e4fad93fc2b50253e9a61e961f268f72b7a42d2a43e650f09fcc645db06c683408f8348dabef76673472ac4905ec247c8
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index ba86be8..aac2fa8 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201504130001-src.zip 207117285 SHA256 0d878514b8738f
 DIST netbeans-trunk-nightly-201504140001-src.zip 207131027 SHA256 78124063613a80e58738442f8dfdf251a297c218bf3a9982d2c8aa62a2d77a9f SHA512 dd5b7d32c1ac1107f8ddca68168d47abdc93eda7b226de6373d1f2842707ca275c2c23d61fffac7d125d8aa403c946c2b6d52ea992a609b4b065d3215ed9d206 WHIRLPOOL 8cf5588de638ee1effa5ba65dc95bbea8b6c72dc8b36d997eeaf3dd60d0ca1848c8786e4fbd43f98b5036a707efef6625c4a6a1acf35a6fb40e9fd1566939e13
 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
 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
@@ -60,5 +61,6 @@ EBUILD netbeans-javadoc-9999_p20150413.ebuild 6234 SHA256 cbc722bb8e4a4c786b89da
 EBUILD netbeans-javadoc-9999_p20150414.ebuild 6234 SHA256 b99c80bc2581fde7fedf71e930933d57e435242f70e86c9c55f0ee2851b1c7d6 SHA512 7d49aa31d5687a85b734112451266b756122340a027b128bb0662e2e086c5feafae0fd6daeaf7a274e7b66f2c83c997c071be967727616281d650c9fc9b09214 WHIRLPOOL 1cdbacdfcea049f047fda74a653c6ba2b2ebe156428101d25fd1c0b72d4a30a2d27b93c85ce43a2a60560b5585268c0a05211ff02705421c8e0931b722694668
 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
-MISC ChangeLog 161948 SHA256 d3e2988f37a44b8af2e509a152260857c5917f28c8ca7e036f9b90577307b8f3 SHA512 1d0e7f508c7d7adb7dc9feded162e89634c3f5ddd01557e6fe807796c40b254da155b1073f37ea0dd86c3404ddc6398fae3076050708abf8beca03a24eda42e2 WHIRLPOOL 0d4ae98eb2ee8b38af0b628e3f25431c4bb90e02f56e037d251bbdaff77cf0962eeff2e504c621e60b745521923ca708b17dcb01397d97beeb7067820aa7dc99
+EBUILD netbeans-javadoc-9999_p20150421.ebuild 6234 SHA256 079767078c911cc2098a67ec1844e73598d1e54c063f03ac67f7335dcdc80e0d SHA512 8d9e3a6105753a5a6a4cb53ed59abbca3ab68cb561004c828cf5857deb16a10c7b4a62836f6dc40ca9999c78291bdd95721aaa49721a910fed75611ad9a92f67 WHIRLPOOL 7ceb9363c7c6d8d60c493254c39ba07f2154c0c9f8daca3f748d5ceab584630950060f965685573a79aa14ef6d7fe80da15009f35eb32e3c2d321cbca7768172
+MISC ChangeLog 162123 SHA256 ab1d8803f4da972cb4d072baf7744729efef567541c6f2db72582900d1cbf32a SHA512 df16b3bf3c97b01c027d49163773b0250705cc1d40384202030a721f66f9291d96d04054065dfab663b186d40d01566629944cca6ad313eb191b7f28c15c4adc WHIRLPOOL 44cece6752586b03e531e06fa8c62fdbc71142ff0ee252526204ddcc1d3869da5d2c8aec96d6c51e6764964910e209f03fd2feca8e32115a93ad817461c0db7a
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

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

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 426a3b8..c228200 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201504130001-src.zip 207117285 SHA256 0d878514b8738f
 DIST netbeans-trunk-nightly-201504140001-src.zip 207131027 SHA256 78124063613a80e58738442f8dfdf251a297c218bf3a9982d2c8aa62a2d77a9f SHA512 dd5b7d32c1ac1107f8ddca68168d47abdc93eda7b226de6373d1f2842707ca275c2c23d61fffac7d125d8aa403c946c2b6d52ea992a609b4b065d3215ed9d206 WHIRLPOOL 8cf5588de638ee1effa5ba65dc95bbea8b6c72dc8b36d997eeaf3dd60d0ca1848c8786e4fbd43f98b5036a707efef6625c4a6a1acf35a6fb40e9fd1566939e13
 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
 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
@@ -59,5 +60,6 @@ EBUILD netbeans-javafx-9999_p20150413.ebuild 4723 SHA256 9d25c3be83817d40992b6b5
 EBUILD netbeans-javafx-9999_p20150414.ebuild 4723 SHA256 bc05fab90f0f7f63307e7a768b27e0112d96fb31b8f92c51208ad3939468d7cc SHA512 200f34169b531d115c67782f8b2886d095c3557ffd390de2354c62b651b8e089a9a8cfa3b7cdcea95eaf267afe93ec4ee58b496f4abbb57530d2a63a3cb5b311 WHIRLPOOL 6abcfbc366201bc6542282c3d08bc8f22f8e0bad113b879ed039a61ff06643b399d0355cdec88fd7259431bd4c977eac88408b3c4065b11b0d322ef218dcf9b9
 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
-MISC ChangeLog 146595 SHA256 c4f4c3eac34660380d3e879197152eb2001bfb28b6cf19eeccc29a73f5b96e78 SHA512 3f5bc0e91488502ea60584fc798a27e89236276905c95e3a11fa5f267a04e1d86bf9c9ad4980cc3c8befdccef538dbf55c020055c2dee1b27cfd1b389f4ff0c0 WHIRLPOOL 38297637af7c081bd78732b73aa3256825a0ffddbb3013a7529da8f95412ef1e05d79da8f4b1262d629af29fe4819915ae29e62ae8aac7a23e4707779ad87024
+EBUILD netbeans-javafx-9999_p20150421.ebuild 4723 SHA256 0d37ad047a7e40f954001bfe274c10ea812fc7376265a270d5770f2b12d153aa SHA512 abffa36d38e534ab214e1e3b6fd5dfcc58584dc8c1a28c98cbb0501bbfa6234405cf2c9b815fb1746e66d1ebde78be3a3f29efdc4e75b1fcce1aac7762230ca6 WHIRLPOOL 8320bf8436d4bc47a5802a9f6456d605c858170dc8492a86a08edd806ee48eab3d740d945d73891f3689874aa74d5115a7593251384a11f12fc054241938bdda
+MISC ChangeLog 146768 SHA256 720e1679e15b67c667f1988155926c4590cef9f39a6a67052e901017fb485f21 SHA512 42f3043829d4c17efebb37ad49b6e8e684efb64416a227207bfd71a19e3287b22872ac342dc31fa7dcb8a17658d02e56672935c4793cac70b9798b3ed9db46ad WHIRLPOOL 055783bb43395886f76b79c551b4684fcf8aedcbe020e6220acf6f5dcb22cb1a4f6ac214aed76104a1822dc8d658a6a758a7f02a0ec3d127ee062567aaffac75
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

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

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 4cb2fe0..466e407 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201504130001-src.zip 207117285 SHA256 0d878514b8738f
 DIST netbeans-trunk-nightly-201504140001-src.zip 207131027 SHA256 78124063613a80e58738442f8dfdf251a297c218bf3a9982d2c8aa62a2d77a9f SHA512 dd5b7d32c1ac1107f8ddca68168d47abdc93eda7b226de6373d1f2842707ca275c2c23d61fffac7d125d8aa403c946c2b6d52ea992a609b4b065d3215ed9d206 WHIRLPOOL 8cf5588de638ee1effa5ba65dc95bbea8b6c72dc8b36d997eeaf3dd60d0ca1848c8786e4fbd43f98b5036a707efef6625c4a6a1acf35a6fb40e9fd1566939e13
 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
 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
@@ -63,5 +64,6 @@ EBUILD netbeans-mobility-9999_p20150413.ebuild 4418 SHA256 e556ea08fd47ef7966060
 EBUILD netbeans-mobility-9999_p20150414.ebuild 4418 SHA256 6c3fd35761a9a7617dac4f2bbe49638427df011ac019b83821a39bb3d6d1631d SHA512 5277acb615352d9240421fe71f666b797f783d01d3514db3c63297731ca752684bb7e0b18c14a6851afae80e6abb4b32f2a30cc4d9ed36afa2739f67dce055c9 WHIRLPOOL b52534fe3c909b5b3cd1292fb8f453aacf708e77076ee596a113027e93fd00a5097862427f3836c63d9f8edd95e1c4975196827352e46b890bccf24e3b1e52cd
 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
-MISC ChangeLog 164309 SHA256 631a902f5d940d30f5be9bea521f49967f1ff35973ebd905d0b2f2e65f5c1430 SHA512 cc4bdd5616f03c175846a59f79d67fcfab23bc361dda7e902ab7d0e26371036ada4e61f2947ce4c7f0fc89acaf56bd9b4475809a8667d878448395a18b9ac687 WHIRLPOOL ef3b8bc73069b8b2696680e246670e05a4f20400b2e9300b052794392c620674b1726305f12d0dc5baf8f307e8929f3888f821003ff5155a453730c664fe186e
+EBUILD netbeans-mobility-9999_p20150421.ebuild 4418 SHA256 13aa9acf107dbd5eea12f6a656f80b383f79ab0b4de73e237739aa5d746b008a SHA512 04bc05fd045d3c4bb2d00968cd78979fb2bec4fcb42e310412b8fe75b08c62b8116809fd476cf2e90e0d88cf77831dcee6552b3253bf0ef8b02050e1fefefd84 WHIRLPOOL 2291d2d97a880c65fb6903a9d6ca9cee8a8362f6146b2bed7098974660d331fb0eb9a0c79c58e8cd25aad2b4708e0d3f6aafb6e75ad36865ccf7a69b46bcfc67
+MISC ChangeLog 164486 SHA256 ced09cba40968ef7e753d6e1bab6817b608b5aa850bf3fe832dd6bffd37f4cc2 SHA512 09b4acae50a23afccb8fd887f4bda7662824dffca9ceef2b996c7b3c85e9cbc874200b1ac5bcdb1554e50d30ee8421f813ecc9c970cff3d6952cd6656dd4622a WHIRLPOOL c61ce1c0de97785209ad8bce452f0a77e8b771512418b6e76f31382f47bda552c59a18bce196753df0df238fed06ebf9aa25d0531b0efcd43814c0bdc1b363d5
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index ae580e6..fb7844c 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201504130001-src.zip 207117285 SHA256 0d878514b8738f
 DIST netbeans-trunk-nightly-201504140001-src.zip 207131027 SHA256 78124063613a80e58738442f8dfdf251a297c218bf3a9982d2c8aa62a2d77a9f SHA512 dd5b7d32c1ac1107f8ddca68168d47abdc93eda7b226de6373d1f2842707ca275c2c23d61fffac7d125d8aa403c946c2b6d52ea992a609b4b065d3215ed9d206 WHIRLPOOL 8cf5588de638ee1effa5ba65dc95bbea8b6c72dc8b36d997eeaf3dd60d0ca1848c8786e4fbd43f98b5036a707efef6625c4a6a1acf35a6fb40e9fd1566939e13
 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
 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
@@ -62,5 +63,6 @@ EBUILD netbeans-nb-9999_p20150413.ebuild 5003 SHA256 006cabebac90c279e5532fe9e33
 EBUILD netbeans-nb-9999_p20150414.ebuild 5003 SHA256 20c402d6c38af77fbd6b6b22282e5786d4eaecdcbfaeb1bf544bb6222db2cf13 SHA512 0799c2709b67f8a8c33a4b14b9bbd0a44274cad0de3b54fc3424db2f1ea10a64b4ad71a00f06c0b7f72d607a9d764c8efeadf23b3dcfb1b2eb259c43826e2ebc WHIRLPOOL 590040ee2e43bf7a50cc1ecc3e084ec4523090ca02e7ad32a32818f45890c0430129c2cf53eaa2ab89affac845b9cb735e2e780701b041c65c2e9cd9526217cb
 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
-MISC ChangeLog 153543 SHA256 cb912a5ddb2959f9e3784bbf92554d6b60ed9e42fa3f6c041d5d841f326a7759 SHA512 2ae3f7b8d91e986c6c44e5365eef435f71d225370dd3e2d2282b7a70398bb1ebeef889464b4cdd06bf6d4524cabee82e6878427586fc9c1b539178212d52df74 WHIRLPOOL 64249297014324f8543ea86a0b112e00e09b9b81b874475a05ff2aa5c675abd8e5cf8661da91e1133f538fe39dd0214308481a4f59d6b827548201a1f538d650
+EBUILD netbeans-nb-9999_p20150421.ebuild 5003 SHA256 bf40f1a0d120b6e613800bd9d4a201275ca7a7b14a106933abf6718123e4e70d SHA512 44ec2ed13eeb90bb4cadd3bbd5f8dc550800c03b34ac976ba7295a3da92dd0f4a965a90aae77f108b0d4b9f86b3b3e88cf2899b11ca52e05341a57c456a64c03 WHIRLPOOL 89d97210ccac3633d25a1110b30a3678c40f0d5a1fbbf6c9242ac18290db96c1765e92f9d474322ae901e8b5712f2af329463e3828762d79d2837e2b639f1fec
+MISC ChangeLog 153708 SHA256 819d0b19ac3769e83cd7fe0de381918728cf4ad639953dfc9c24efb25ccdc82a SHA512 d9b61a91b1ca0bf178df837b1af607a73fd85a07cad269b639d20c7717d8b9cdedfb281a3d69ae1f51bdb8998a2d11dc49a7c1077bcc507613d951121d619c5b WHIRLPOOL 843c5c1a90a4295bf6bfe92da2fa204d7972efbe562b99a6e5fad5b62e9b52b6d840f1b028ead3f4c9b52830e0017364e2b1943fd77935c7ab728ab62e51381a
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20150421.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20150421.ebuild
new file mode 100644
index 0000000..76b4349
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20150421.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-21_00-01-56/zip/netbeans-trunk-nightly-201504210001-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 dc9d4b5..8c65e72 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_p20150421 (21 Apr 2015)
+
+  21 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-php-9999_p20150421.ebuild:
+  bumped to the latest sources
+
 *netbeans-php-9999_p20150417 (17 Apr 2015)
 
   17 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index e643343..5abd3d5 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -41,6 +41,7 @@ DIST netbeans-trunk-nightly-201504130001-src.zip 207117285 SHA256 0d878514b8738f
 DIST netbeans-trunk-nightly-201504140001-src.zip 207131027 SHA256 78124063613a80e58738442f8dfdf251a297c218bf3a9982d2c8aa62a2d77a9f SHA512 dd5b7d32c1ac1107f8ddca68168d47abdc93eda7b226de6373d1f2842707ca275c2c23d61fffac7d125d8aa403c946c2b6d52ea992a609b4b065d3215ed9d206 WHIRLPOOL 8cf5588de638ee1effa5ba65dc95bbea8b6c72dc8b36d997eeaf3dd60d0ca1848c8786e4fbd43f98b5036a707efef6625c4a6a1acf35a6fb40e9fd1566939e13
 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
 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
@@ -65,5 +66,6 @@ EBUILD netbeans-php-9999_p20150413.ebuild 4423 SHA256 4568e7e17faa2900d43988603e
 EBUILD netbeans-php-9999_p20150414.ebuild 4423 SHA256 dba90c7da072a072d4fcedee4c204191bbc93d84f8365908fd300b205c2120dc SHA512 3f010982dd13c5feb2ed4628d748420847bd89fde0009396e40f79cbd2432edd062a580619546e060847c63e447ecdcca5f4511903ca8153b51787aa4eccc0d2 WHIRLPOOL 632839b16f8c9e4bb935ca71e0374466f8c780b0d417c6228f115b6f8cb78a7e9a6f1995686e9782490eaa7ef6308abf3abc06a41b7bc2797135e0df17d5172f
 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
-MISC ChangeLog 153221 SHA256 78f87485c8a32be80ae2de09af7463713519a4c01c9a02809af58701d0526439 SHA512 5587c54835d0c4c6597f11cca6b60773ba72a835122d119a76d968cdccf540c145a5d12344ee2eeba7dd25e29bbdb0cef87a407f22d8571ec583bb69ee23c80e WHIRLPOOL 31f154a43f5708a1ed3cc4a96387072482662e4dac6f00e11bb548211d12dedcfd8d39e25cbfba4f672b5d3a1eda5fb256b369469f93406b9fa185a5c767c2b2
+EBUILD netbeans-php-9999_p20150421.ebuild 4423 SHA256 bfa7b69c5d065c2efdd80d319a3a35aa7c2c154c4feb33667dbc8e4fbb4b498a SHA512 f701317c5380a3994ab5a5ba91b70d21cf5975dc6d33e52e7178e97fd455730ba4ea11037ef9418c1db09a14615b59431052f41b13ddb0ade38c994c0ac0f665 WHIRLPOOL 195de15aa35c4e014dd683508ae3803e542626ef78f8940aaaaa6afd005ebe2711d16f4cc415fbaa463fcb685b99a8eb27a1e09c5ecb189d8fd88c741fc39db2
+MISC ChangeLog 153388 SHA256 de9ec625b53cf554067485c132e4baee94ab98b471f1753e833c5a43e5b80867 SHA512 1e04076795af471ae5345866b2a684cac9f6878d079d0ade93da4d9428bc7b35d9946447f561821e0afa8da3fb617c7c0fd416df283cca689e7a3549a4c750d5 WHIRLPOOL d701885fa7b6a437623df1534feb5ccdbb9253a11c09d0393e75ec6ea725410f1b32eb3b723f67aee3ac5bcc1d82150d4d6ffece8a51f4618316a53d4eb5ecce
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 372e340..955682f 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -55,6 +55,7 @@ DIST netbeans-trunk-nightly-201504130001-src.zip 207117285 SHA256 0d878514b8738f
 DIST netbeans-trunk-nightly-201504140001-src.zip 207131027 SHA256 78124063613a80e58738442f8dfdf251a297c218bf3a9982d2c8aa62a2d77a9f SHA512 dd5b7d32c1ac1107f8ddca68168d47abdc93eda7b226de6373d1f2842707ca275c2c23d61fffac7d125d8aa403c946c2b6d52ea992a609b4b065d3215ed9d206 WHIRLPOOL 8cf5588de638ee1effa5ba65dc95bbea8b6c72dc8b36d997eeaf3dd60d0ca1848c8786e4fbd43f98b5036a707efef6625c4a6a1acf35a6fb40e9fd1566939e13
 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
 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
@@ -79,5 +80,6 @@ EBUILD netbeans-platform-9999_p20150413.ebuild 8293 SHA256 a771ff21f8e8606cf65fa
 EBUILD netbeans-platform-9999_p20150414.ebuild 8293 SHA256 8f983066a5fe8c1eac7c9fcc8439c2a56f0f5a505cf7a4a8393a200a0945cbe7 SHA512 7ae9188a688488b70a04639b10700f822a4ba1361a372ee87402aa4a925c44b375aff85b3c7211216fc3b34066b2ebb69b96b38f7b32ddcd33cecf4446b22fda WHIRLPOOL aadc6549d299bb5b814d825a78ba89cea45f10bc99601e5be6723fd593b9e30cddcb641c00d52606e8a477b1819540a674e80e9d3a118352718fb423d7618dab
 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
-MISC ChangeLog 164905 SHA256 8e64efac1a0f005388068d1564cbbe421008659c1401b50d7f53dab8a643a41d SHA512 101ae9b370240f0ffa6306c051317eba7442a9891784251cec499615ba9308142f5fd3f7851e2edfdc4323976942fffeb24e659a4d08cd22ca731f094397d39a WHIRLPOOL c1e0bdda9728853e54ebe2620ea8eececd48db51551d1fbbdc4225c5a468bae0a5a87ce86c4d8253cb40ee0ec1b7c2936bbeab8d01664825b4a5dadc2179d468
+EBUILD netbeans-platform-9999_p20150421.ebuild 8293 SHA256 c105494e3e301bdd8c1c8308c85b10ce70877196cddc072bd64f77da07e132f7 SHA512 324ba652b8c61270ff98ba5d36202b4988107097afb9c072cf5d881587229927b19facc24b5a1a9ae2c59d7b5e3eee67c32525d8b7074b3b22bf0da81b4db099 WHIRLPOOL d829e13dad887dc8ddfba5dfe09c612f3593514d4f0c04b1153abba453dbd19710d46292fa992ea6370d6423c057f93d4b1a3f4f5ad8649a0e0173d5eed83f72
+MISC ChangeLog 165082 SHA256 c86a8d750ae3dd7f607f81fbea404525143e2f5d892abbf416afdd06574563ef SHA512 66e2119eda54cf0df12dd8732bf9df3274a36d826755de5284df6cf9ec5ff891dc949ea140687fcff349a7e3d04306d954462fd44ae6d55b0d499d7d07fb37b9 WHIRLPOOL 6225dd13e08e2ad479a5e7557d367e62b5fe150dd319c87056d067506bdb530a6cb08239b454f57e3c303bf61907ddeeb1bff8cf8186e041c6a3f4f7257d8ada
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

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

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 7ea09e4..5c7b5f0 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201504130001-src.zip 207117285 SHA256 0d878514b8738f
 DIST netbeans-trunk-nightly-201504140001-src.zip 207131027 SHA256 78124063613a80e58738442f8dfdf251a297c218bf3a9982d2c8aa62a2d77a9f SHA512 dd5b7d32c1ac1107f8ddca68168d47abdc93eda7b226de6373d1f2842707ca275c2c23d61fffac7d125d8aa403c946c2b6d52ea992a609b4b065d3215ed9d206 WHIRLPOOL 8cf5588de638ee1effa5ba65dc95bbea8b6c72dc8b36d997eeaf3dd60d0ca1848c8786e4fbd43f98b5036a707efef6625c4a6a1acf35a6fb40e9fd1566939e13
 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
 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
@@ -54,5 +55,6 @@ EBUILD netbeans-profiler-9999_p20150413.ebuild 3478 SHA256 985b98461654c62f33e58
 EBUILD netbeans-profiler-9999_p20150414.ebuild 3478 SHA256 9101d2b9f97e110898828406dc9843cc15a013d7b650e1df376bb51ac91c2ab3 SHA512 d07c7de8ca779246250dd1a1fa2d75fc17ce4b4310349c313938ac2abff664a4f4181e29bf73a15ca03f3adc9cb6da1f45d44886505a07d6e01192afa69b05f6 WHIRLPOOL bcfd785a5ceef4a13282a072a26c23689ad81914f386fa38e17292f6d8a69f5bb529703c9b74bff73f6dc110fec53b9703ed12aa1a82fc0ba5f94c610b88184f
 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
-MISC ChangeLog 164366 SHA256 1a7193f9a5b0f614a3c1d7989f8e556463877e90f98bcb5699174e6c127309d7 SHA512 2c4a7925443a897afe178eeda6738ba8d4372399653afe4d26ff8f5e2d93d05605f705dc1b3894d5704b26c0d6542051cdd640d576ae8cedd7d81bd6e43455f0 WHIRLPOOL 68a55e6b1c4e294559433607e210f32f27f3930ae38196f1e9fbe9db303df1a2ed61eccd91e90d79730fb5b2314cecdbc02ba1a38029488fe03f6fb7dd07f098
+EBUILD netbeans-profiler-9999_p20150421.ebuild 3478 SHA256 42fe361da62f2c704dcafc54fe338c80af6c670115ea9b8e9110c161bc1a2794 SHA512 445cbcbee658afa7d5e362a535f89ed2b86ee3ed8778ff74bae9eb945cca638f5985ae75a3d6564a7d46e7c8c3fc5197af804f6c29c2f7b0dfadad58a29cd7e4 WHIRLPOOL 9848b6d16506c9173153e43f411de318812e4695db1da1e60b014c917d5a567b066360a46bc54f0253ad692e7ba40630f0e236cf677e2c4999e6ec7be0d32a09
+MISC ChangeLog 164543 SHA256 c46db88852979fa1bfc79f9f3afdf8b11f7fc2056a6f91b120cb1fc773b7a791 SHA512 1b75da1dfe93180b0d8e333a4e530060f3ceb13aeaf62b8c392e4b4b75941b8e1a465e1f2899be09ef5756541014a66910f601814f4f1540ecd7ac5a135a49a0 WHIRLPOOL f37c90e42dedb5870b61f5f5fa6f399787128870067b478e8cece7ca6337679d6deb9e307983c01b3e3f4e6082d912af4279ae9eb043a56e155ad57aa2cc905a
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index 1275aeb..c226313 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201504130001-src.zip 207117285 SHA256 0d878514b8738f
 DIST netbeans-trunk-nightly-201504140001-src.zip 207131027 SHA256 78124063613a80e58738442f8dfdf251a297c218bf3a9982d2c8aa62a2d77a9f SHA512 dd5b7d32c1ac1107f8ddca68168d47abdc93eda7b226de6373d1f2842707ca275c2c23d61fffac7d125d8aa403c946c2b6d52ea992a609b4b065d3215ed9d206 WHIRLPOOL 8cf5588de638ee1effa5ba65dc95bbea8b6c72dc8b36d997eeaf3dd60d0ca1848c8786e4fbd43f98b5036a707efef6625c4a6a1acf35a6fb40e9fd1566939e13
 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
 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
@@ -58,5 +59,6 @@ EBUILD netbeans-webcommon-9999_p20150413.ebuild 4997 SHA256 91e8293c626d6060d8b9
 EBUILD netbeans-webcommon-9999_p20150414.ebuild 4997 SHA256 75076bd16e0fff89846981e44d8db4899b2b305d1a20b165e6e3f0382b1c8df5 SHA512 5d15feccc98ee3e41782c898291492b9d92569c8de7a6b41e3e7a06392f5f295c4760a7e888105f82fb5d28799b3750b9ad7d06506ed5cffaf9ce91f79b77dad WHIRLPOOL c92c9d4e9acbdeed73619edd5f6459821f2de050e1b33e7751dd6ca76e38fecba291c667900c81db65b5aa093d0881a51390a17447ebad8718ec5d23ab4658e2
 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
-MISC ChangeLog 137399 SHA256 9d738aeadeb5270f3294b5d61f3723e7131791f2fdfb0510162fffe25c02ae69 SHA512 1c719b96fbd7e2c3d29c01d566954100d23556e6e0af3dbf9a3b001c18e184fe70dcff1e8cac8752084009cde5893e855c1d6b11794c6df8ec1ed50e9791b372 WHIRLPOOL 62226cc6e0132e6746b0a5c10642066509f22f598458e85d0cdeee8c544aefb984b8a866ae293f122326bdbd2f95986d73165687687b29bc4add7a304d5cc905
+EBUILD netbeans-webcommon-9999_p20150421.ebuild 4997 SHA256 3b435a5a6c5c06a297180a526f702932fa37cf9e24fe08e20cf489136f07c920 SHA512 2daeba1bb1e64ad00186c3be0c28077d94db6cb70b54fc38b2a66758672a253817380a876678fee89db42743b251b6aabfd41414bc1806cece0ac84fdc43b10b WHIRLPOOL c1a6ee48403e031b0e7a61f73b256b8976cdc9b648516397e2307a4b84223198ec2cbbd007dc89907e0332a35b97a746f41b4dfd582143b3a0550f3dcea8e908
+MISC ChangeLog 137578 SHA256 9220a886c0a8e1720ee127089b9745f7da228608bd63798a0c1c9e1cb64e288a SHA512 8133c0abd5496e3f2dca839824a60ffcf618706b5962baad83216999b2a38df8ffd5c4ebcabb5ed86bd63723157f6df474d51aa15bdcdafbd52c07957e7a14be WHIRLPOOL 273ed3154f79530a8468c4811b79590feaa0f414f3982ea488ee918ef50e864c3ebd44b518a3da0aa92540e733ce338a6f50b0ea981a9692eeccf237de877bb9
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 5891369..24c7b02 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201504130001-src.zip 207117285 SHA256 0d878514b8738f
 DIST netbeans-trunk-nightly-201504140001-src.zip 207131027 SHA256 78124063613a80e58738442f8dfdf251a297c218bf3a9982d2c8aa62a2d77a9f SHA512 dd5b7d32c1ac1107f8ddca68168d47abdc93eda7b226de6373d1f2842707ca275c2c23d61fffac7d125d8aa403c946c2b6d52ea992a609b4b065d3215ed9d206 WHIRLPOOL 8cf5588de638ee1effa5ba65dc95bbea8b6c72dc8b36d997eeaf3dd60d0ca1848c8786e4fbd43f98b5036a707efef6625c4a6a1acf35a6fb40e9fd1566939e13
 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
 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
@@ -54,5 +55,6 @@ EBUILD netbeans-websvccommon-9999_p20150413.ebuild 2727 SHA256 7d435a9cf2b7d4cf7
 EBUILD netbeans-websvccommon-9999_p20150414.ebuild 2727 SHA256 aeba52c5446b7336be5b720d4baa0df43daa36d4b82ce9bb6a53388813cdcf17 SHA512 ce0280068b0c531f337045c5ce368da5ef4adf87ff7c050bc6e79b30635d20733349302dfad4d938955d68964ed3423ffa781a066b6e4ff7388d42f28015ad81 WHIRLPOOL 499c30240734eb49b062b8b38353aaea225c5b83165f85c8ed122b78ef14baafad821e75c0afbd774cc20c301044e27cae4f6c885fa0521baafb7d3b5eb7bf36
 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
-MISC ChangeLog 172239 SHA256 5bc8804b3ed937b69cc3e83e99b50b550a624cce559ea2ef01781aa9c0549bab SHA512 a811cf5708b452063919a81f221fb5432eafc481b06f5cfa5cb773fcaa962d3045ad48e89f3383fce2248a787101265495e3b54da7dcfe3687c0efeda6be55b5 WHIRLPOOL aa08938a86d2e1fbb6f4a46506530158f6b9d01ab13db9068146f444155312b817ca5ce5c4b31d2160088338b81f354467e00db5f0709fd4024e9c02a3009e49
+EBUILD netbeans-websvccommon-9999_p20150421.ebuild 2727 SHA256 31e0f629e921a3f9441d4d92658d45e0ad2521f4bbc07b6f66cea69b28dc84a3 SHA512 924b7777a51fe421c7ef9100c029347ccedd21c7c002abc2a4591c0ff66646d87c707a35a6c46aca3a48bac825b90f777e7bb3c5eebada6934a6a5363dafd21a WHIRLPOOL 76bb7c7d83a4fe16e9f703ce51aa7089634baad04c9780fa2b6238b577ed406d808ebfe051571d63e8edf166c0e594a948e684ae3a49686167478325d87cdbc8
+MISC ChangeLog 172424 SHA256 718647f932899e1f76519454e90a5287d3759ad02b08b286009c8385cb9aea67 SHA512 987460f3cec20c1ebb7564041ed715ac30293107930b89d04e880d2800f69a9d77b1a75a92a0353b5c6a1cc04336f926bb7446cb3ee6610eeb4378d728c4655a WHIRLPOOL 54e0a6a2719a8e86498317ebd1ed2ad27a6d0db96c2bd7f7eeaf6eb60d9e8499e9101a0411c6b6a89afee8d6f1adf9f04f10c6791996344b249167453661b943
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 6dc64d2..b228f90 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201504130001-src.zip 207117285 SHA256 0d878514b8738f
 DIST netbeans-trunk-nightly-201504140001-src.zip 207131027 SHA256 78124063613a80e58738442f8dfdf251a297c218bf3a9982d2c8aa62a2d77a9f SHA512 dd5b7d32c1ac1107f8ddca68168d47abdc93eda7b226de6373d1f2842707ca275c2c23d61fffac7d125d8aa403c946c2b6d52ea992a609b4b065d3215ed9d206 WHIRLPOOL 8cf5588de638ee1effa5ba65dc95bbea8b6c72dc8b36d997eeaf3dd60d0ca1848c8786e4fbd43f98b5036a707efef6625c4a6a1acf35a6fb40e9fd1566939e13
 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
 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
@@ -62,5 +63,6 @@ EBUILD netbeans-9999_p20150413.ebuild 7216 SHA256 4f9e9814aab0b20815b9b88a0ed235
 EBUILD netbeans-9999_p20150414.ebuild 7216 SHA256 12dd75fe3792937732b5a60c887eb1cb8f9e0e02ac7a42b689e5df34d99c5f67 SHA512 fdd8273374ce6c637112341d925c17e330ef3b134839bb44040c1e9e6dcedea6499d8d4763eb1224771f5242e09f60b98edc4d0c5def6bddcde6f151ee7d9402 WHIRLPOOL 05db751a76c3987ecd0bb67beb5aaa2e2e5c4ec88cf6e7a91f7f1c6e80c1709b04f4b4b4cb33e94528e092a3da1c20734dfd86d5d36e80e8be639819add9b84e
 EBUILD netbeans-9999_p20150416.ebuild 7216 SHA256 b7fa88bf3f631250541228241a213432d6e338df9c467342fc4ae25103877779 SHA512 fca01c7c3b7b00248bcdb2d51e8590e4a3aa8667f28c9b2fa38f3c2d9c701de94356ff82ba662c48c8378cd5bad5eaaef623c51b868ee3af220bb3d53cd171c8 WHIRLPOOL 98808eea35b4c951af3f3a44dd36270d52c6d23b7e9d233ba37f8f1422ee0b4fe12695c2df733ceff27424265fac0c41bf13bdeb258a293c369580b912f879b9
 EBUILD netbeans-9999_p20150417.ebuild 7216 SHA256 e4e7c9041975dea0715480a7de2cbbc781d82487f88e21d76b242a8fbe97e66d SHA512 808275b4f393117adde2f4959c80af31b5a09e9ae85d6c9d88054eb77324e074519e1735bccf3172bc348d6d8ff631c9648eefb5939bdd56d6874d1495f41453 WHIRLPOOL 02e0f06e3617a41d0d6410cda02996abb6919e8c742f40547187f3d44666f2667220d8f035df9e8f1564c04dfc1cc8d2f3e225059651df74fd20e2675b135566
-MISC ChangeLog 146422 SHA256 2fcad92a3aa8f18dd72f07e4f6c773fcee3830bbd82e11a4da6bf113eab249f8 SHA512 b3f8e76113f5585e2cd4c042aa7d74486263f05248af1381c6d0e9c453f2be164bce4666826009ae00b66a20d74daaf8e214b80192bd0e09cbedb0aef72f8827 WHIRLPOOL 74a9d6c111ee5c5619c99be76ca76894534405d44f5f06094232d3b7f9bc874c6e6de0f48d356d0788bad3fdc48493642a791d8a03c850173d89016011a9340c
+EBUILD netbeans-9999_p20150421.ebuild 7216 SHA256 424c295f177f3ec8b9aaeaf5ffb8b35a4b6fcfdb0caa4509295889b47a6481fe SHA512 ead9deac4500e89d7ead39a82dd44247cc9f1971591c505734593123ce87a16ba9fed52bfafecbcef07f634eb17ae87ed3da12c6f0d7d14e106b9a0d13d8a02e WHIRLPOOL b98a1e590fe6bb021abeaa7a7abdc40c4819b217984263d19a61598bfcf298ceed585fbcb5daac63730bb2128d794b61e9482d8f915623fd00008ebd7d37472f
+MISC ChangeLog 146581 SHA256 8a00dcc276dab0cae2a26d8e3cb9e558727f01baff08490000cc2e8477b41fbe SHA512 06e870b394b8c65a507a0fe5d1e2b028c465e4c8b6dc273cab18123ff0886fbfccc4d856fc0c55451e08d94525d6e9e6e7fde5111e8418d4d71d15b1ed1ce640 WHIRLPOOL 54dd3a9d28a97dc4a5b19918e487e14cacfc96e084db12829d319f14f087279cb00f0168af9b79da9d814914266228191133842081de048123493b42065e187a
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

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


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

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-javacard/, dev-java/netbeans-webcommon/, ...
@ 2015-10-26  9:37 Miroslav Šulc
  0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2015-10-26  9:37 UTC (permalink / raw
  To: gentoo-commits

commit:     bde8e326426e09584ace853794e5171521ed318a
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 23 10:12:06 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Oct 23 10:12:06 2015 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=bde8e326

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.2.23

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index f833e0f..6917a7b 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201510190002-src.zip 208635309 SHA256 ec26fab3d6ab19
 DIST netbeans-trunk-nightly-201510200002-src.zip 208646929 SHA256 58578f52d853065ed01442ec329d3a91610faaaea3f83253aeb4db125be71442 SHA512 8c0715828885c513dc12d391a202f1f3ccfdba9107dae60752754568369d68670ff088aaa5b550d7ef9f45a97048de5ffcc80cbcb4b59fbf9e8aba0a710a6bf9 WHIRLPOOL f36c658d37b39d0d9149ffaf3c4266a3fda14644b950216733054fa16a219ae16dc41355c44142cb14158aac60f205d29ce795e790a1ae01964847fb8e926678
 DIST netbeans-trunk-nightly-201510210002-src.zip 208641929 SHA256 b523c444d1fe7afb064c64225138aa795ad8ac9c0c25fef7d02bb534d2c54d4f SHA512 eed12ef2835ce6dcfb725bbacbebfde24c1893f7a67ebbb27a52e1ac907634cc562263de47e0115f620f45ca47874c833853965f3732569e65cc0213221a6fde WHIRLPOOL 0b8259848754750bc130a187e6e930effd66f765f6903fe7adab68e37be8b1048043bbe2cfcdf443ef58bd4d325d270b6900621678e3b1a730f3e41ae7294746
 DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e6871bf9e3601ea50113d123546decc916b02a832c876a07c6395 SHA512 413872ad9ca4ce3806db91c5c5dc137d031e1fa942f8382b02d86f97cf7e51892dfbfafe1751ff49bb76af3b4da10788ef5f46155eb1bd48f0d9110b5e72286e WHIRLPOOL 5b4ad028004e312be5602b1ef201ec9945320bc1345b4674c730f9af8cbbbf6da6f78dcffc1b4c71ffa7c0f8e13414f57c16a976418784aa0fa3d5825f56c572
+DIST netbeans-trunk-nightly-201510230002-src.zip 208659975 SHA256 2b00f5a10b9b57617f41c78adb256ae56e87a104fd88afeffdfe05ae46dec7bb SHA512 ab25742088a602ef44a1e3adec10fab612b100b7182efce801932156094103a2687da00df92a0fe7b6b0b5ca7ee825ee85b9cc84273449a6cffe686b0571c582 WHIRLPOOL e056f4cf9c2634a7ce09f466b722201d05096536683f9e0c744019e1e76cc53fb4b909e65b7d9fc16bf3ffaa6418b8c35521e2a6a6fcd043f615e8021a365107
 EBUILD netbeans-apisupport-8.0.2.ebuild 3314 SHA256 b68fe791f275fe4fcc8b00888688949b8927cb39db2cf9ad7860017c6d20adee SHA512 35c4bbcd34ec0eaef8a2de86c13333d2bf092db61af48558c3e173bb17dbf8fcd15001307bd7c498f4ccdbaa4277e1ee42ff0909af6170039165b547f646c383 WHIRLPOOL 206fe8d5f64e76827d3eb958a629ba087e8a16c2797752f5d9e62dff4166653677587a81be19e0a2c6adcf49292255d532e1f542c02550b1cf6ffd51467bde3c
 EBUILD netbeans-apisupport-8.1_rc2.ebuild 3339 SHA256 a5952c7ca966bb14f072fd1ad4b92464f12e1d9ef04ee18616b1ba4de33f016e SHA512 bf26818a2701f01dd4340d73f479fe38e4b8f7b94da83ff0d90a779ece651474fd353730c518b5dba5c7164f2b62f8c2f49df5e3e7b9dc9ae292b6648875fec9 WHIRLPOOL ee1e8769b8656dc81059a91673be35f43aeda9cb1ed43c1b3379508b4d62ea10bdce7423499046567f0d61c6410f3c26faaafc288cc41aef3ded36086e2d715f
 EBUILD netbeans-apisupport-9999_p20150914.ebuild 3384 SHA256 f310c45396c4b7495748d6399c113b3baaf9e7f72ab557ef838928e0809ffafa SHA512 ff390780810d61728b83d5143131c26b3cc4d0461bab9714ac91dda5b7974f5a16410bbca4b20313f5249aa158b631fcda68420824d2e218394d83b01d64ba33 WHIRLPOOL d5b0651cd5390a81b73053ae02efbec5b9261ffb4cfab8e73e8853518dd79b8e10f82665399f9092480a3a4359c0b08fd669e2e44e85cd24e60ff01aa607daa9
@@ -59,4 +60,5 @@ EBUILD netbeans-apisupport-9999_p20151019.ebuild 3384 SHA256 c134a692a5367948324
 EBUILD netbeans-apisupport-9999_p20151020.ebuild 3384 SHA256 a802a8f7ce9dacc6fff9450f9a1d23cf585e9fab6216a9cdd4d82155175e2c80 SHA512 dad537659fb7a12ee11ba7f902d516f74ecdaec8b12c22a3a5519ffe83581aea0f29c6c6cfd79c6385614f4f553f797a72d385a8f21d37354c40d3f21bb9f1a9 WHIRLPOOL 2ef2db6c7eddd9ffbc37285ecfb44ede5c9dab9f45f802c254ddae1d557aa65a38054f1284a23537a8a6617a1d7b1d31c5542025dc28d4c9a239c3ca2e957a35
 EBUILD netbeans-apisupport-9999_p20151021.ebuild 3384 SHA256 8180b30fce116176d454d8753d0dfcc95f5fc3d02a7170642a96f951fb2ece76 SHA512 bd4aaf03514786cafad52b694f263f555d2171d2812e363ee77c5ab9602095663cb0d87390c0c58bfe0860f0460f4f40878ccefd2684b5d08add0ee6d5069966 WHIRLPOOL e2cdc423ef3e773dd57494c11654e53a7f39fd32f46ac60c5399296eae21a59f4da7cb9b99b4071cd8f64697052a29880d689c9d1406740508ff9dabf9f1afc0
 EBUILD netbeans-apisupport-9999_p20151022.ebuild 3384 SHA256 38235791b80ca0e5c7eb9560cac729e16c5e1f28d0d9a586c79f22e28a9426a6 SHA512 98a26431e8a0da598fb9fcf37d82f9b9e37bd20d925fa36f967d0c231f8c6ae512db42a41261918d2765a776c36e68bd534c6af3d8b582a6e15ad1f234cac945 WHIRLPOOL 3620ee7fed60886be28516d147b1dde754271119025eeff52e7f8abbe811c1d4d7d44151fd3161b8979ee2424bae917fbe403db8ee3e742c7c9653482b630c12
+EBUILD netbeans-apisupport-9999_p20151023.ebuild 3384 SHA256 784c1cacba82d648910725954d890be0ff4f41cc8bd32e00c972fdb36534d76b SHA512 4df75f8d7cc063441851628b7ad8ca6665386f5d0f26ef71c4b08244293d064d97dac73027a48c7a648a8c4e8a6f72b2c292a780eb04a3e05f20ebb92094a898 WHIRLPOOL d38c532ecb0ad004673b039c5b23efd487f8622c11f25f6c47b636379c79f5aa3481f7f606ec9abd66a2cc7829a032be375cd2ce1480f99e527dfb3bb3054d2b
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index b90f9e5..4842117 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -15,6 +15,7 @@ DIST 6E655079DAB13EED7E53AD961F24664274646299-clank_0.3.6.zip 7723898 SHA256 c0f
 DIST 765AEE3D86807079B0FE630F0802E6A7EC86B2DF-clank_0.3.6.zip 8496056 SHA256 a369d68819db42141efd419744944822650f4dd792d35dcbb22b8c523f1f5635 SHA512 f4d68eabd8b3711f86ff54858a3e715ff5af715a93f0c1349d38db16158ea866c94b64a663b32ae6983d3afa674963bfe25774573113b414fd198ae2027b7391 WHIRLPOOL 21176e8901713158774cfffa3631a0b3edb5b8f46215f6e3edf8d661aeb1f4ee6e4fc9b47ae8d320c65d9ddcc624f888637c3fd38b39e15fded780d17363ef6c
 DIST 83D26AEF1BD40E89B6C61273F28AC4EB6AC11EDD-clank_0.3.6.zip 8525958 SHA256 fd2e84cd60aee6e07d022aef6953c92487b48c3b9e8405f35a4b2dae1bcc28f4 SHA512 ac626166c5b9c1c7bb18e7a91045dbb362072c0086b15fb94de161e98c84cb74e7d34340422d13b1edb46853809c3d2640042b9488faae56b2cd03556085bf2b WHIRLPOOL 1e8efe4a8c6f56f287fcf2a52b34bd16154bebb9305041f4da9d778aa4affe61bb610250cfeb0bdd3fe752b4be1deb7603d4b4b260408e5d049bcc577a222b53
 DIST 91F81ED36683E7DA584C97FACA3DA8E21F6EBAE4-clank_0.3.6.zip 7290324 SHA256 b6e274a8da5889c0206f342d7e9549ea3b1563d70fff2029e3ad1add0b35b43e SHA512 e826bc72cb839f6f7725d2fff70b45c594645410f2ebab0131c5942648cfaaed67d407ea2dcbe9a1fe060b35fd981ffc9e8fc1bff3e486acb782d073d55d37fd WHIRLPOOL e3a910243d6519b66c45f197f918ef0146250f58967fb37cec8e6a9fb2271cfe9c3b548d58f953d81f2c333cc5b3440b5dd6a156c20903bd119ab6ab7df707e8
+DIST 99529DC0E1426A102A98EF5494B6F6AA6E497F62-clank_0.3.6.zip 7930942 SHA256 ad9a64303fc4db833d2789a7d5b0be537ea7db55090189411e5778efff54a8a6 SHA512 46d91f0cbe86af186b87e6b972ecc9391f5b2a670eaf7238b60bb5399c0da40382c729338d1e2cf8ab94eb4ac64bfe9253da1cfad2ec900a87d56df4d299d707 WHIRLPOOL 52ab6b35eaa04d0e375bc4aaad43c4390021309da1956e81db6ba4fc8730da147f35eeceb8a02fa7e42e315296e8be3eb03d88d7d8987fdce30ec433ac5c407b
 DIST A8C1DD1ECB47D9424506C3BB0B40D7148278006E-clank_0.3.6.zip 8275014 SHA256 5ff9d23973dc3ad09d777d2baf9aec58f07c119d14ab168a98006bde20ddfda8 SHA512 b2c58cb116312e8ff06f8c842c0924b8a5db5fba3010e333924318ca5b5963025bcc3a2d048a2333a5f666eca8571c8a59dfb3d8ded6ba3cf99c07a46420f0b8 WHIRLPOOL 5bd5ce58a35403f516591f43b9a18d68be0a4dbe0e0910d3702df390fb7ceee98271cf0c08d92dd1f8627dbb1f1a09459c631c293169aff6639a62c7b3ec00fc
 DIST B4005BE1B5E701F2DF428F8431FA24C4FB2CBD9A-clank_0.3.6.zip 8261438 SHA256 24c17617807ddd0652ce6fbaa5ae0113974dfcce7f6ff74cc7229a0f37200525 SHA512 a5a2bf2ca2d53da5b7b7d69deb09118913e329d65a893baa5ba49bb180a423b0a975ad3ec43aa0941a90684fbfdf5d75686efcebbdfc1657cef8aa51a4fad90d WHIRLPOOL b2725acc7e3420056d9dace1ad52e9830260b69282b4691f8b39933736085ea60a4dff7c978d68c89c9f2fa082a14ca2476e86ab4c18b402dd44a639a7a933a4
 DIST BB83D4F8047D608858154CB041054F5CAE35B903-cnd-rfs-1.0.zip 177647 SHA256 c92c3d3311b8f75883f4f9280fe8d6932b154c67c9dd1bd65a49beb45e578cd1 SHA512 c42e4f0c1b7efb24a45dc375180bfc8b0e02e74e01233665d3e74bf83a182c2b0bbe8b572a8eeb993d77312f6d118777d0576adfca4ea8f4c2cfe08892155345 WHIRLPOOL 41b573c7ca4b926333f28a9329a2423955055ff716e7be03b7a6f4714e7261e57574b16a0e89b96ae744dc0a36f9a4a72f8d948b11a6b8052159d42cbd40876a
@@ -53,6 +54,7 @@ DIST netbeans-trunk-nightly-201510190002-src.zip 208635309 SHA256 ec26fab3d6ab19
 DIST netbeans-trunk-nightly-201510200002-src.zip 208646929 SHA256 58578f52d853065ed01442ec329d3a91610faaaea3f83253aeb4db125be71442 SHA512 8c0715828885c513dc12d391a202f1f3ccfdba9107dae60752754568369d68670ff088aaa5b550d7ef9f45a97048de5ffcc80cbcb4b59fbf9e8aba0a710a6bf9 WHIRLPOOL f36c658d37b39d0d9149ffaf3c4266a3fda14644b950216733054fa16a219ae16dc41355c44142cb14158aac60f205d29ce795e790a1ae01964847fb8e926678
 DIST netbeans-trunk-nightly-201510210002-src.zip 208641929 SHA256 b523c444d1fe7afb064c64225138aa795ad8ac9c0c25fef7d02bb534d2c54d4f SHA512 eed12ef2835ce6dcfb725bbacbebfde24c1893f7a67ebbb27a52e1ac907634cc562263de47e0115f620f45ca47874c833853965f3732569e65cc0213221a6fde WHIRLPOOL 0b8259848754750bc130a187e6e930effd66f765f6903fe7adab68e37be8b1048043bbe2cfcdf443ef58bd4d325d270b6900621678e3b1a730f3e41ae7294746
 DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e6871bf9e3601ea50113d123546decc916b02a832c876a07c6395 SHA512 413872ad9ca4ce3806db91c5c5dc137d031e1fa942f8382b02d86f97cf7e51892dfbfafe1751ff49bb76af3b4da10788ef5f46155eb1bd48f0d9110b5e72286e WHIRLPOOL 5b4ad028004e312be5602b1ef201ec9945320bc1345b4674c730f9af8cbbbf6da6f78dcffc1b4c71ffa7c0f8e13414f57c16a976418784aa0fa3d5825f56c572
+DIST netbeans-trunk-nightly-201510230002-src.zip 208659975 SHA256 2b00f5a10b9b57617f41c78adb256ae56e87a104fd88afeffdfe05ae46dec7bb SHA512 ab25742088a602ef44a1e3adec10fab612b100b7182efce801932156094103a2687da00df92a0fe7b6b0b5ca7ee825ee85b9cc84273449a6cffe686b0571c582 WHIRLPOOL e056f4cf9c2634a7ce09f466b722201d05096536683f9e0c744019e1e76cc53fb4b909e65b7d9fc16bf3ffaa6418b8c35521e2a6a6fcd043f615e8021a365107
 EBUILD netbeans-cnd-8.0.2.ebuild 4510 SHA256 0a9a4e58e28f395b5bcb017016b6ddb1b77afe393d0e5bd81cc05e3a32076c71 SHA512 2b1fedfe292fa140920fd11829e77127f9535e08b8307886accfa37e6d11195a1204e6b71b2640937da0711c3ce0bbf80c0eaa3c248a64fd61b6a3d99d5de14e WHIRLPOOL 10b1518360ade5d6f1f27c79a10f630b94a2ec5062e18df11f9828d4b374e6cbdea0b9f770e01c117ca90fa194dff9bd3be6a468075c2d35167fb78a7bb32794
 EBUILD netbeans-cnd-8.1_rc2.ebuild 4745 SHA256 b1c5a9a27ec1c22ea6eda555bce70adc6735c02d0eb47ebe676bffba4a2c3db7 SHA512 d50cb168b724476bbcb280e0e78a5ca3659721639f8e678be20523f0a491e2edbd78759cdbbeb86cc5ab039af7e46a92eebcabba5aeb366a5592fd3ed53d57a7 WHIRLPOOL a395a72b1acf8156dcb0185c5236986d40e01e1fec475f629c7a54f1e0cec2754a3d2de1883bf17e08264059d3d3009c54de019c4b5f156c1c884252b7240081
 EBUILD netbeans-cnd-9999_p20150914.ebuild 4790 SHA256 50932d2b0cb6a9edb4cd69bde82d3b68a05f423f3b2da10de6cd7a6228793c51 SHA512 0b3a4d72ae37ecc08c48201ff9129c67b1c70c9175a077630b0480d1bcf60c629a6ac53f81e1f7efbb79ca4aacaaa1be56bbab42ebd0970658ac183fdfa4e58c WHIRLPOOL 909af5ae85c91bf317a984c2601da50aeb3acd8f56d12384b929ffe99cb131bf7e814db8aa4836195953b3cd8ed031813193abc0654b3802e5a7ad63d165b422
@@ -82,4 +84,5 @@ EBUILD netbeans-cnd-9999_p20151019.ebuild 4790 SHA256 e7fd3e2dd0e907f6b5a3d45897
 EBUILD netbeans-cnd-9999_p20151020.ebuild 4790 SHA256 66315a81faa064377f614b4891799849b7c08b6e6da3dbd947313942d191bed0 SHA512 2008d230f3fb0b8d3665949e6015c768fd35aecc11b2847abcc7acf76a62d2e6b642d56d595acec6de81a2bead1e4feb948e4f2bbae183ad4d85935a48432c37 WHIRLPOOL 61f64490b827d42ac383ab6151db645d8bcf0589c90c8c31d8c55ddf71d7f723f219884d916c48b42fb63aa8faa534f3b0664cdcb498a36346f283302498ed09
 EBUILD netbeans-cnd-9999_p20151021.ebuild 4790 SHA256 3f91826649fd4a3c3788c9bccbf1254657bc8d9fe2e057a1f7bcba850bf80ab4 SHA512 bbb630dd578e5076f883182b93927f5eade7f6a7170b59b8600a1bcf734d51b6519d3f6d4e725b2e46390f69fe7a77054dea828a6e51b04a6b1d863e12b645e1 WHIRLPOOL 8af542176b14a589093d24f955c505295babffa003850da789d7617935f3edcc5a70b81ce5c7817179ba9d1a47e8659dcc2d26f62b8d40f8e62dba0a6b834ac4
 EBUILD netbeans-cnd-9999_p20151022.ebuild 4790 SHA256 b61fe394eb1ce8a9ad7ab895558721e3d9c1dd1e053c7dc4f8fcd433f3465b63 SHA512 8bfa722afe360ebfa5eb1b1acd3a2552f6d0862cc802d0256868983284c60f76657e287cd51c2ffa05abf35ffc2554c24222bf375d21921731382e8d6c66631c WHIRLPOOL 059f95a570528c96799220d7bcae2f1685cda0c62c40fc8ff240a51082995d01770e66d48320f6d7e0f5498bb214fa830479dc472db4a89ec06bee80af2730ce
+EBUILD netbeans-cnd-9999_p20151023.ebuild 4790 SHA256 76adbbd8e88ccf39cc3f8893c23d5bdc95f257bc19c3c0598b28ef12694b12b7 SHA512 44f6448b4bc501a4f7c528212ab67fab1093a8b924a365abc31ab30cbd1891925595625082c71bf75cc57fa5302c6305a1cc56d65847b15e2259e6ef90bc3986 WHIRLPOOL 5c2d7d3814603ddc993c3cae39cbb3eea4c89b308b23ed46fea7eb6c6f5e2a7e2631f2b07eb82849656991f17e2c586f54c15bd1fdba84e5c25fd1d033dc0655
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20151023.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20151023.ebuild
new file mode 100644
index 0000000..616df3d
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20151023.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans CND Cluster"
+HOMEPAGE="http://netbeans.org/projects/cnd"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-10-23_00-02-28/zip/netbeans-trunk-nightly-201510230002-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/99529DC0E1426A102A98EF5494B6F6AA6E497F62-clank_0.3.6.zip
+	http://hg.netbeans.org/binaries/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip
+	http://hg.netbeans.org/binaries/BB83D4F8047D608858154CB041054F5CAE35B903-cnd-rfs-1.0.zip
+	http://hg.netbeans.org/binaries/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+# These files are for remote development and debugging
+QA_PREBUILT="usr/share/netbeans-cnd-${SLOT}/bin/*"
+
+CDEPEND="~dev-java/netbeans-dlight-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	>=dev-java/jna-3.4.0
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.cnd -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar libs.antlr3.devel/external/antlr-3.4.jar || die
+	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
+	ln -s "${DISTDIR}"/99529DC0E1426A102A98EF5494B6F6AA6E497F62-clank_0.3.6.zip libs.clank/external/clank_0.3.6.zip || die
+	ln -s "${DISTDIR}"/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip cnd.discovery/external/cnd-build-trace-1.0.zip || die
+	ln -s "${DISTDIR}"/BB83D4F8047D608858154CB041054F5CAE35B903-cnd-rfs-1.0.zip cnd.remote/external/cnd-rfs-1.0.zip || die
+	ln -s "${DISTDIR}"/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip cnd.modelimpl/external/open-fortran-parser-0.7.1.2.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.jna/external jna jna.jar jna-4.1.0.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-dlight-${SLOT} dlight || die
+	cat /usr/share/netbeans-dlight-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.dlight.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/cnd >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/cnd$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	fperms 755 bin/dorun.sh
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/cnd
+}

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 5d8ddd8..aa5f701 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201510190002-src.zip 208635309 SHA256 ec26fab3d6ab19
 DIST netbeans-trunk-nightly-201510200002-src.zip 208646929 SHA256 58578f52d853065ed01442ec329d3a91610faaaea3f83253aeb4db125be71442 SHA512 8c0715828885c513dc12d391a202f1f3ccfdba9107dae60752754568369d68670ff088aaa5b550d7ef9f45a97048de5ffcc80cbcb4b59fbf9e8aba0a710a6bf9 WHIRLPOOL f36c658d37b39d0d9149ffaf3c4266a3fda14644b950216733054fa16a219ae16dc41355c44142cb14158aac60f205d29ce795e790a1ae01964847fb8e926678
 DIST netbeans-trunk-nightly-201510210002-src.zip 208641929 SHA256 b523c444d1fe7afb064c64225138aa795ad8ac9c0c25fef7d02bb534d2c54d4f SHA512 eed12ef2835ce6dcfb725bbacbebfde24c1893f7a67ebbb27a52e1ac907634cc562263de47e0115f620f45ca47874c833853965f3732569e65cc0213221a6fde WHIRLPOOL 0b8259848754750bc130a187e6e930effd66f765f6903fe7adab68e37be8b1048043bbe2cfcdf443ef58bd4d325d270b6900621678e3b1a730f3e41ae7294746
 DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e6871bf9e3601ea50113d123546decc916b02a832c876a07c6395 SHA512 413872ad9ca4ce3806db91c5c5dc137d031e1fa942f8382b02d86f97cf7e51892dfbfafe1751ff49bb76af3b4da10788ef5f46155eb1bd48f0d9110b5e72286e WHIRLPOOL 5b4ad028004e312be5602b1ef201ec9945320bc1345b4674c730f9af8cbbbf6da6f78dcffc1b4c71ffa7c0f8e13414f57c16a976418784aa0fa3d5825f56c572
+DIST netbeans-trunk-nightly-201510230002-src.zip 208659975 SHA256 2b00f5a10b9b57617f41c78adb256ae56e87a104fd88afeffdfe05ae46dec7bb SHA512 ab25742088a602ef44a1e3adec10fab612b100b7182efce801932156094103a2687da00df92a0fe7b6b0b5ca7ee825ee85b9cc84273449a6cffe686b0571c582 WHIRLPOOL e056f4cf9c2634a7ce09f466b722201d05096536683f9e0c744019e1e76cc53fb4b909e65b7d9fc16bf3ffaa6418b8c35521e2a6a6fcd043f615e8021a365107
 EBUILD netbeans-dlight-8.0.2.ebuild 2898 SHA256 08402481b573b90396431be03bda45904b2dd29f0086e09a111fe362e310c3f7 SHA512 3f6d6c9ea0043382562fbe47ad16e3273032407a74cb44ec7ff26736f96483835af4be8674361e910912a550b9fe592cc5a28c2b93b6b993076553195c35eac5 WHIRLPOOL 9d8706ccbc0d97b0f5d64ebf22c36316b08d8fbccd57408119ca5f5faef08c7f82677bf67488ff611eabeaa730e4c9a730c50966d94d738cfe79330ac147863d
 EBUILD netbeans-dlight-8.1_rc2.ebuild 2923 SHA256 70d3c3729f4e669f1f2a2c7d71f4abd2f171402c95290546e0f34413ccdf9bcc SHA512 641b633b048dca1b1d94d212de023f5977c08d9aa8bb25bf2047255698135e0ad0ea7173360d9deac09a25b9f0844dea192a378adc164aa62dfa4d52a8ce2b80 WHIRLPOOL 0c2abb5028cbc0717e54601a125a016d7c208694adf8cadcae274096b8c7e200de13a0ede6c0815dc38c16c63633a3974fca6051b64156aa839155e31604f380
 EBUILD netbeans-dlight-9999_p20150914.ebuild 2968 SHA256 80b05f9d601f411f2211eab2c61e1329d5c27a4f8fe4dec4993723b7f467b571 SHA512 b979693d6a0a0780194296a5a602f912c8c0002206d41077312689b629c0f40cd26af2eebe92c872d96c0d6af8a941576bcd697055df5f4d2065e518a1944a73 WHIRLPOOL 35eb43a94541843b0ce8067b31b710c25c8c9fdd8597c7409c9b2608d24f6972148c46a4c6d013dfd2f47b044ff6afce349bd2df903639436c4e68bd22dfdac8
@@ -62,4 +63,5 @@ EBUILD netbeans-dlight-9999_p20151019.ebuild 2968 SHA256 38278b338a5ffb6fcdc37a4
 EBUILD netbeans-dlight-9999_p20151020.ebuild 2968 SHA256 a65fcfda2248cf3e4d1f8f812a8205ebed17738be5f49c0446bd6a4047b3707c SHA512 f8cd1aeed5e0bb0bb83784c6179b799420f997830f11f452026cc4c17b7329eb7ba8a6c9a04cb230bbfe90468ece35ce3125c68caea71a094e469a549639a929 WHIRLPOOL 6f3109f29a5a3d9b9fc8cb355f3feb4c8bf1d0d895fd03dd17dd44502aa36f0f571fc35102854e56acf0a8c46ad0e05356ed08aa81540bf978a2ab0cc0cbf638
 EBUILD netbeans-dlight-9999_p20151021.ebuild 2968 SHA256 1ba7298de9cc2ecab062cc036ae5fd219a92adab1ea84d20b02c4ffbbf668509 SHA512 310cd0c5951d2fe796c17e0919e2200e954b520acebd7dea49f8480d42d4e7929db709cdf4f74fa30b494c4d15a12d6183ffb009c0082ccd9040018a2d47542e WHIRLPOOL 1a686d59235cd943aebcbe2890f5f5732c8fc1cd7a7f317624922b69bd4e78c6971a753c1fdeb1d1c142cbed244e211e5e7a3157f6ea36c80ca31e5218e8efc7
 EBUILD netbeans-dlight-9999_p20151022.ebuild 2968 SHA256 d1c935681cb5808863a2f034b84bc3c134bb0cdccddd71a4c452e15a52335284 SHA512 3bdd4e4b64e09ec2afd6cb0a2fd73ccd3a5665e19b380916790da07e7eccaecea226cd80fd1e47c38c0dfc2e694387b41213ec551e2bd39bbc6c0e3d8b8b2d8e WHIRLPOOL 919485d806915fe246ee52393e892e4166b0997b353eda23eff62c9b8d3c8fd04b92ab5f9c465263c866227c8ce4a5b5ca720e0c7b257101417242520400af14
+EBUILD netbeans-dlight-9999_p20151023.ebuild 2968 SHA256 03fe3bd70ea54b08aab2b543c36ecea70be97be6ea844f6fdbd42e15cd7ee261 SHA512 d81313faebfdc28ea75a51b04c7fa360c27f08b6b068e76ff4813128a572f34424ed3402fcb99fe73d3b9755110aded46d2f16b9fd207d8d982e83d5fb8f1e17 WHIRLPOOL ee437bfa4584adaa8aab5cebfae293ff1c0895384692a7f585ba09c1eea386fd9d43d9a2befe2a590062b01d752e148af2361730dfd5ab0fae43ee79ed7adea0
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20151023.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20151023.ebuild
new file mode 100644
index 0000000..01e9a30
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20151023.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans D-Light Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-10-23_00-02-28/zip/netbeans-trunk-nightly-201510230002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/51AC4960C19CF4C2CCA636765BFBC09A5029BFC5-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}"/51AC4960C19CF4C2CCA636765BFBC09A5029BFC5-fs_server-1.0.zip dlight.remote.impl/external/fs_server-1.0.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/dlight >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/dlight$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/dlight
+}

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 4c797f1..140a58b 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -62,6 +62,7 @@ DIST netbeans-trunk-nightly-201510190002-src.zip 208635309 SHA256 ec26fab3d6ab19
 DIST netbeans-trunk-nightly-201510200002-src.zip 208646929 SHA256 58578f52d853065ed01442ec329d3a91610faaaea3f83253aeb4db125be71442 SHA512 8c0715828885c513dc12d391a202f1f3ccfdba9107dae60752754568369d68670ff088aaa5b550d7ef9f45a97048de5ffcc80cbcb4b59fbf9e8aba0a710a6bf9 WHIRLPOOL f36c658d37b39d0d9149ffaf3c4266a3fda14644b950216733054fa16a219ae16dc41355c44142cb14158aac60f205d29ce795e790a1ae01964847fb8e926678
 DIST netbeans-trunk-nightly-201510210002-src.zip 208641929 SHA256 b523c444d1fe7afb064c64225138aa795ad8ac9c0c25fef7d02bb534d2c54d4f SHA512 eed12ef2835ce6dcfb725bbacbebfde24c1893f7a67ebbb27a52e1ac907634cc562263de47e0115f620f45ca47874c833853965f3732569e65cc0213221a6fde WHIRLPOOL 0b8259848754750bc130a187e6e930effd66f765f6903fe7adab68e37be8b1048043bbe2cfcdf443ef58bd4d325d270b6900621678e3b1a730f3e41ae7294746
 DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e6871bf9e3601ea50113d123546decc916b02a832c876a07c6395 SHA512 413872ad9ca4ce3806db91c5c5dc137d031e1fa942f8382b02d86f97cf7e51892dfbfafe1751ff49bb76af3b4da10788ef5f46155eb1bd48f0d9110b5e72286e WHIRLPOOL 5b4ad028004e312be5602b1ef201ec9945320bc1345b4674c730f9af8cbbbf6da6f78dcffc1b4c71ffa7c0f8e13414f57c16a976418784aa0fa3d5825f56c572
+DIST netbeans-trunk-nightly-201510230002-src.zip 208659975 SHA256 2b00f5a10b9b57617f41c78adb256ae56e87a104fd88afeffdfe05ae46dec7bb SHA512 ab25742088a602ef44a1e3adec10fab612b100b7182efce801932156094103a2687da00df92a0fe7b6b0b5ca7ee825ee85b9cc84273449a6cffe686b0571c582 WHIRLPOOL e056f4cf9c2634a7ce09f466b722201d05096536683f9e0c744019e1e76cc53fb4b909e65b7d9fc16bf3ffaa6418b8c35521e2a6a6fcd043f615e8021a365107
 EBUILD netbeans-enterprise-8.0.2.ebuild 15071 SHA256 84621e3bb946cfa254bb70ca3c3f61202882a7e6d631769ad2f0f4639b0de875 SHA512 6ad38e840764661e6bc5b89b5925e9665871009ba0b640c0a78c555ec104214dbee1200a93cb48e655bc620e07bb6e4d8932b23a00fe458f8a5e9e5c3200d79d WHIRLPOOL b2c2bbf2ff72f8cd9b4cdbe039fdbf7cd074b0fdc20f634aa0b6f79f5c639be358c61fab30854a6e3ab9714a285d9461ac4e39e94e10c14c5068422d6c873c56
 EBUILD netbeans-enterprise-8.1_rc2.ebuild 15886 SHA256 ffb03c95fbd05cc80ffd8d1590037ec6fd4e607a22160b986a0614edc7de0ba7 SHA512 f58ce52ccb40d5079502a1a43c3ac49b1b0607875d88c50f03295f78e0b6e586f5f52c809cfa8e9d803d07b351a2b75eefc91a0d5d4cd310b549b7a5e4b0f508 WHIRLPOOL 0b5550062f4a527614a107094a81e1e26492395a60190d50c0a76f0ce166f10153f37683344aab0c6b11741299e28fdc6d35eb91618f679dc4ce0df0e5ff6555
 EBUILD netbeans-enterprise-9999_p20150914.ebuild 15931 SHA256 9101e110b3d92415c5c316c94265682f2aa856e04cf2ea35a58895e51a17dd31 SHA512 98cc5ffd25d12b0d6b9829b2ba7c5c465ba34b283ae07424ac56ec87312b644cdf497e1be11bd997a0ac6a2666796953903b1e4bb2f6eb9e2dd5204e87c68ec4 WHIRLPOOL 0262e3566d8cdec8250eba494a669c60f90c01493eb5aa4828692d541b1e15c0b11b332e96fb1d937be24d6fa6c00b1e8ab216f8a937d97c698444b19a5f0ae3
@@ -91,4 +92,5 @@ EBUILD netbeans-enterprise-9999_p20151019.ebuild 15931 SHA256 db6f4874f27c87b19d
 EBUILD netbeans-enterprise-9999_p20151020.ebuild 15931 SHA256 e1b6fcfb1ed4f4645675540de7806a6ba0c25c493ac37d0b55cb713a25408e63 SHA512 2052dca8b87bcf9571d3aab7dc97cb1c954368e47a9eaca1a35f88222c584f74856ec7eb1a54d91c4fbc0b191cc6070c9c44dcc713cfbbff97fa7b2188e73289 WHIRLPOOL 32c6cc8a6d364ce2828fcce4226c6b567d8928445158efd9c5804424005e4c820115024bd3c5a1eb7399702c9a4e196bb6429f53be337722ec5003fd5829a70f
 EBUILD netbeans-enterprise-9999_p20151021.ebuild 15931 SHA256 4bcaa3e57a1b1ad788f058080a0d4f0750ba382c684f6a9503f446aabb5abebd SHA512 358be6956440ec87d99a7b8f972c166047f6df8ee196bc8997507a2083fdbb346d594667fa4503424ff6b28ca55388b36e26dff5670550dea24eec66660e6853 WHIRLPOOL 062c03c6e053226453c3435d605a97663c7aa4804ec0b38288462551f9ed089222d941f383d177c60e65d8b218cb4810c319b93ba57a939df0206fb4f013a698
 EBUILD netbeans-enterprise-9999_p20151022.ebuild 15931 SHA256 097ef498bbba60ad201765e4fbcd22e64854f64e0275d4ad00ff652569400a9d SHA512 20bab2b7214074635889173772557499b6ee18395a33209d9f18d5276f6bc9021314da812bb18b2c4c007f57efe78346b5b4350ab0851e1567a6b07833bc8996 WHIRLPOOL e098d110c3d7be8631d51ccdb37bc3c7edcd959f6d84b9aba88874d297da499c4aa4b1b52d7ca3d96a81dbdc791d027a3000e9f5cbadf122f29a6f05d826865c
+EBUILD netbeans-enterprise-9999_p20151023.ebuild 15931 SHA256 c8f902cd1c044376c9ac804f55d58367afd7088126b6254694aa2d3923c9e992 SHA512 b1083a6b178bb791617909a18ac1573383b3de7d30d01d2cf3561df094f479c96d8534f5ce28c423e92c1e5ffcc6c607cc06bfa90d55e624326efeafb9de12e1 WHIRLPOOL bca13080f2d490197688742a94402673748b7267c4e2fa50ed83e9a7c68ab9c6a37513d285d593bd5951f732a3f72311960c49f272f0d8202e48304cdf4d6e97
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 791b332..7d9c300 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201510190002-src.zip 208635309 SHA256 ec26fab3d6ab19
 DIST netbeans-trunk-nightly-201510200002-src.zip 208646929 SHA256 58578f52d853065ed01442ec329d3a91610faaaea3f83253aeb4db125be71442 SHA512 8c0715828885c513dc12d391a202f1f3ccfdba9107dae60752754568369d68670ff088aaa5b550d7ef9f45a97048de5ffcc80cbcb4b59fbf9e8aba0a710a6bf9 WHIRLPOOL f36c658d37b39d0d9149ffaf3c4266a3fda14644b950216733054fa16a219ae16dc41355c44142cb14158aac60f205d29ce795e790a1ae01964847fb8e926678
 DIST netbeans-trunk-nightly-201510210002-src.zip 208641929 SHA256 b523c444d1fe7afb064c64225138aa795ad8ac9c0c25fef7d02bb534d2c54d4f SHA512 eed12ef2835ce6dcfb725bbacbebfde24c1893f7a67ebbb27a52e1ac907634cc562263de47e0115f620f45ca47874c833853965f3732569e65cc0213221a6fde WHIRLPOOL 0b8259848754750bc130a187e6e930effd66f765f6903fe7adab68e37be8b1048043bbe2cfcdf443ef58bd4d325d270b6900621678e3b1a730f3e41ae7294746
 DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e6871bf9e3601ea50113d123546decc916b02a832c876a07c6395 SHA512 413872ad9ca4ce3806db91c5c5dc137d031e1fa942f8382b02d86f97cf7e51892dfbfafe1751ff49bb76af3b4da10788ef5f46155eb1bd48f0d9110b5e72286e WHIRLPOOL 5b4ad028004e312be5602b1ef201ec9945320bc1345b4674c730f9af8cbbbf6da6f78dcffc1b4c71ffa7c0f8e13414f57c16a976418784aa0fa3d5825f56c572
+DIST netbeans-trunk-nightly-201510230002-src.zip 208659975 SHA256 2b00f5a10b9b57617f41c78adb256ae56e87a104fd88afeffdfe05ae46dec7bb SHA512 ab25742088a602ef44a1e3adec10fab612b100b7182efce801932156094103a2687da00df92a0fe7b6b0b5ca7ee825ee85b9cc84273449a6cffe686b0571c582 WHIRLPOOL e056f4cf9c2634a7ce09f466b722201d05096536683f9e0c744019e1e76cc53fb4b909e65b7d9fc16bf3ffaa6418b8c35521e2a6a6fcd043f615e8021a365107
 EBUILD netbeans-ergonomics-8.0.2.ebuild 2843 SHA256 f9262f6ee7f2aed1fab9bf4cf756f565272e9894afa50b349735e39961e7acc3 SHA512 f158c27640541f7aef31da050e0811c07a251ae4797cc663b95a074a47eaf9d6bb7a9aa11ba38ea55e75c185f7dba74629ba6716a819e8ad68eb3db9ada71451 WHIRLPOOL 4fe9634fb673fb05dbba25996efc3a212ef3bb23ab6e7c732cb75de076feb930735e3901806fd9c801abc7ee8aa8eb800718065325d415371255a886474061d4
 EBUILD netbeans-ergonomics-8.1_rc2.ebuild 2868 SHA256 7d268bf5a12b5937222eea504fe2cb34afbceaa9b04c4a34a098bc4d6868c1ac SHA512 739350bd2dea25d5e40096e33818bdb9a21f80ef90699cbaf0c5010d0b3986b5b642da343c3fd9a85fb66367fe086898554e928bf0496293e93900591df3dc04 WHIRLPOOL 068204fe9949561b5a4b4e5271c465ff6adbbeef19041cbbcadc345ab5fbd639fb32e99267a59b17b5541016cf464b1a0cc301f6d2858591a2cb7a4340e30a38
 EBUILD netbeans-ergonomics-9999_p20150914.ebuild 2913 SHA256 48e1d1f1f682f53c1524d8aa790a653a644fb959a002b14173814e7d4d61bc76 SHA512 91551f3350562d318a9dfa662ba63a04682187df219e9d1cc04f3fa26782233858fabe0ee98f080e228a676084b39c377922f9ee99487eb608aa2aa659eac8f5 WHIRLPOOL 77d4ad318a910ea6e6971b2cb4798edc331d1d4966a05197cba33346109bf05807ec7119f714d6b35f58b06f467efab07406db9bb1f2059578ae250aade6017d
@@ -59,4 +60,5 @@ EBUILD netbeans-ergonomics-9999_p20151019.ebuild 2913 SHA256 4e1ab0db95ede7200ca
 EBUILD netbeans-ergonomics-9999_p20151020.ebuild 2913 SHA256 c427771eaed07707482008965ee7ab7a073165a1b5291ba7b7defde74b2b042e SHA512 cd21b3e42b03617836e91a78ea80fd864e5f6bba688dfb88d241528038bd598f6d0395a5ecc986eb285e18f4fff9103df5be6acd97a7e9475f8aa8abd05c5bd8 WHIRLPOOL 252962555c37479949e70d5fb0fc201fe540e5aa7f51ff1821db82bd96fa8ac047c788263bda06e0640e7590f007c0c213e834e4b2d39fbe44f0b906167ac7ba
 EBUILD netbeans-ergonomics-9999_p20151021.ebuild 2913 SHA256 31d4d32482d5610e2a7bed6bd644a5f19c3f6029d3f5a7234d5ff1f2b06f30eb SHA512 144b4e7a7d58bf843e65ca8ef31f0ca46e33cd7362103f4d2abfca685f2c61715597c4cf1db7cb5cbf59a9dae515f4e2115e11b77a0f1ea1adddeddc5a942cde WHIRLPOOL 938ad34a7e3f4e748917f506a1b4a2e6809d79966a0f23eb0251148a3994f87ff05d84753094987dfd7510b71d4083b457982f98d89588d6c1afacc401e41b59
 EBUILD netbeans-ergonomics-9999_p20151022.ebuild 2913 SHA256 493ed0397216d919708b33f9de2b043a5ef4165f2f5be40b7a48a94d71bcb525 SHA512 fdf00751a676a5e4c1bcb80a99378088398ee5a1b02cdd3aa729a94108d400bf2ea1cfc6c961404cb3ca29b051fb756bab3b16e366556d73a09964752bd0f512 WHIRLPOOL 38913fb4bfe612f0023b3ebe2b1e855218ab1ba8a0a28591d0ad448002db4cebb4f82d1cf18d983ce0f43a1576bd5c48f07fd30af5c3368bcbec20fe7bb6ff71
+EBUILD netbeans-ergonomics-9999_p20151023.ebuild 2913 SHA256 f76b104eec9d3f05d0c4de6b3dffc9a80e2f90f6d89d75211171e1cd07f5f983 SHA512 e1f603bbed437bef7eed36d69c80105265f60797223f1c15c27101a37e031302ecde8e49704d0c8e14e6762d1614508562a2a5f94acb1468405fb86ae8808872 WHIRLPOOL cfe3629f02b25c8a11c8f64d88dd84d099abea87e4bf6ca163e63f0136788df658d615daef4098969cb02cf935d4e1a8bcd15e779b36b7198d338204dbe85659
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index f558ee5..d3e49fc 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201510190002-src.zip 208635309 SHA256 ec26fab3d6ab19
 DIST netbeans-trunk-nightly-201510200002-src.zip 208646929 SHA256 58578f52d853065ed01442ec329d3a91610faaaea3f83253aeb4db125be71442 SHA512 8c0715828885c513dc12d391a202f1f3ccfdba9107dae60752754568369d68670ff088aaa5b550d7ef9f45a97048de5ffcc80cbcb4b59fbf9e8aba0a710a6bf9 WHIRLPOOL f36c658d37b39d0d9149ffaf3c4266a3fda14644b950216733054fa16a219ae16dc41355c44142cb14158aac60f205d29ce795e790a1ae01964847fb8e926678
 DIST netbeans-trunk-nightly-201510210002-src.zip 208641929 SHA256 b523c444d1fe7afb064c64225138aa795ad8ac9c0c25fef7d02bb534d2c54d4f SHA512 eed12ef2835ce6dcfb725bbacbebfde24c1893f7a67ebbb27a52e1ac907634cc562263de47e0115f620f45ca47874c833853965f3732569e65cc0213221a6fde WHIRLPOOL 0b8259848754750bc130a187e6e930effd66f765f6903fe7adab68e37be8b1048043bbe2cfcdf443ef58bd4d325d270b6900621678e3b1a730f3e41ae7294746
 DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e6871bf9e3601ea50113d123546decc916b02a832c876a07c6395 SHA512 413872ad9ca4ce3806db91c5c5dc137d031e1fa942f8382b02d86f97cf7e51892dfbfafe1751ff49bb76af3b4da10788ef5f46155eb1bd48f0d9110b5e72286e WHIRLPOOL 5b4ad028004e312be5602b1ef201ec9945320bc1345b4674c730f9af8cbbbf6da6f78dcffc1b4c71ffa7c0f8e13414f57c16a976418784aa0fa3d5825f56c572
+DIST netbeans-trunk-nightly-201510230002-src.zip 208659975 SHA256 2b00f5a10b9b57617f41c78adb256ae56e87a104fd88afeffdfe05ae46dec7bb SHA512 ab25742088a602ef44a1e3adec10fab612b100b7182efce801932156094103a2687da00df92a0fe7b6b0b5ca7ee825ee85b9cc84273449a6cffe686b0571c582 WHIRLPOOL e056f4cf9c2634a7ce09f466b722201d05096536683f9e0c744019e1e76cc53fb4b909e65b7d9fc16bf3ffaa6418b8c35521e2a6a6fcd043f615e8021a365107
 EBUILD netbeans-extide-8.0.2.ebuild 3307 SHA256 084e952eae1708b0fab785fd34313985e864dbc74a8531a0d5cdcf906e88f85a SHA512 ade8dc37aa932d7ec20966199e521311716061c23df08d02635f78efd2776f1d7bf040b0f9c9488b947bbbdfb3e33fa764723e3dfffa2214892bc6d685428f6f WHIRLPOOL ad2c26b005675ebca7d902ff1e6caa28552f3fda6795e327cc3584cf109f0ad6efad6516e15af5e70d689be236298b0948003e09a3da4991b3e29a1c85607b2f
 EBUILD netbeans-extide-8.1_rc2.ebuild 3332 SHA256 43580bab7453f294442683c85e5b1ba58d212977551240bb22c24627a4b442db SHA512 83e55ac4d2a424aad4685a2f77ce3e4944fab7330ca09fd6b6635bfec30895eaa09af60dd03a67bc4d66d0b387f4481787f9a6297e1c9382550bae894805cce3 WHIRLPOOL 10d30dfe7d188a67ab1d5afcb408064272fa68180c126d6bab5500c2726afd253f32db043b91e531c89841d8b857053a7fe250c5b8aed1e85506c42b7e2df7d8
 EBUILD netbeans-extide-9999_p20150914.ebuild 3377 SHA256 77f2909564d529ada9bfd65450c492a4a8e40ed17b043aa937749a1654194f99 SHA512 6274e8158a874de68a7ad374c629c98e4637f3a9304e6da9d017a2586f606ba8a5d1aca316fa854db86d2b03b694dbb292f670850debfad388d64399ec789a65 WHIRLPOOL da730ad9cf8c9961c7fde8e6cfecdeb7bbde12073957fcba3900ce4dc058bfe6894a4779f9a5a6c03c511b43ede152b692a5ac5db2840c4a871322d73a0db5f3
@@ -61,4 +62,5 @@ EBUILD netbeans-extide-9999_p20151019.ebuild 3377 SHA256 d862d79d9816d538e66ea68
 EBUILD netbeans-extide-9999_p20151020.ebuild 3377 SHA256 ae85904a27ed01ac4da2317415479c02bcfc53365cc80752b075caee00b98ff3 SHA512 6b206c3d29d731efb7a3b13c78fe199404b459296b43c2f4a6bcbbe4a01dba20e4e366ab4027e2390c92fc513a577f1c7dbb8bea1371952bdd989d6d37bd4942 WHIRLPOOL b57e3a64badedbe927a3313e5e90461d4433ef120a802bacaac0abc2cce7fa45c931e609e93c4340966960807073133d4ff1b3fb348f33a8491dade4729840da
 EBUILD netbeans-extide-9999_p20151021.ebuild 3377 SHA256 0739b41f0e002f5cc2aaecc54236508e91e1fc9076b0c0000116c2a41f6ae812 SHA512 1ee5b366e45b6ca95807593815ab92f3cfe1681cb54bbd5f7274bc04bcf3a1294abbf66ac8ccd52b9f36b2e3d3867302f556fb34fa5a665bbbb680226f6257c6 WHIRLPOOL 7dad8df184640c7476afaecbea2c9f2af3c95e88f0aed054fa976cfb56b4d8814650f434fbe9987497dd886d57db4cc7d14b2bd1d0f2166b8c0094fe8591c0c9
 EBUILD netbeans-extide-9999_p20151022.ebuild 3377 SHA256 5f4c64b9e644bcc85eef630ddb3c448c0faee378580604223d11c39b3b8b9814 SHA512 1afd5de7c73a58d2d1c01f9a81e97b9e0b7b2004ad180e9c58a197049abe60e3a716605fd3a2373b81b827a6dc250b6ebee6079b88ed24f8e541e37664d4f40a WHIRLPOOL 816e5e5fe6841cb472cf8a07404be93f87d5ebf009a66f44d0b68c6d9d3941090274a6c0d7296c9f902f4079b2ea82842cb185ab287c9b63fd2d759680d89ea4
+EBUILD netbeans-extide-9999_p20151023.ebuild 3377 SHA256 8bb2ff72a879185ff1cede8a504ed67ebe35e72e1340185da29287aa927beab5 SHA512 ffc1d49991e7a8b91ece6d1d6e7a668828e9e3402e64761f8b6d37fdd0283a94416ec29c107648a26c31e964d184dc3e950fd7eb98f5fbe4622787625be788bf WHIRLPOOL 8163294dc3dad0d0c5a9970cd493a04d5fa794a4e305b2060aa9dbb6882cdc8272e3144bfc00effec5c1daffb8912f7416055ea44f88e1d37bf421f0e8041171
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 2b64919..4a2ebf8 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201510190002-src.zip 208635309 SHA256 ec26fab3d6ab19
 DIST netbeans-trunk-nightly-201510200002-src.zip 208646929 SHA256 58578f52d853065ed01442ec329d3a91610faaaea3f83253aeb4db125be71442 SHA512 8c0715828885c513dc12d391a202f1f3ccfdba9107dae60752754568369d68670ff088aaa5b550d7ef9f45a97048de5ffcc80cbcb4b59fbf9e8aba0a710a6bf9 WHIRLPOOL f36c658d37b39d0d9149ffaf3c4266a3fda14644b950216733054fa16a219ae16dc41355c44142cb14158aac60f205d29ce795e790a1ae01964847fb8e926678
 DIST netbeans-trunk-nightly-201510210002-src.zip 208641929 SHA256 b523c444d1fe7afb064c64225138aa795ad8ac9c0c25fef7d02bb534d2c54d4f SHA512 eed12ef2835ce6dcfb725bbacbebfde24c1893f7a67ebbb27a52e1ac907634cc562263de47e0115f620f45ca47874c833853965f3732569e65cc0213221a6fde WHIRLPOOL 0b8259848754750bc130a187e6e930effd66f765f6903fe7adab68e37be8b1048043bbe2cfcdf443ef58bd4d325d270b6900621678e3b1a730f3e41ae7294746
 DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e6871bf9e3601ea50113d123546decc916b02a832c876a07c6395 SHA512 413872ad9ca4ce3806db91c5c5dc137d031e1fa942f8382b02d86f97cf7e51892dfbfafe1751ff49bb76af3b4da10788ef5f46155eb1bd48f0d9110b5e72286e WHIRLPOOL 5b4ad028004e312be5602b1ef201ec9945320bc1345b4674c730f9af8cbbbf6da6f78dcffc1b4c71ffa7c0f8e13414f57c16a976418784aa0fa3d5825f56c572
+DIST netbeans-trunk-nightly-201510230002-src.zip 208659975 SHA256 2b00f5a10b9b57617f41c78adb256ae56e87a104fd88afeffdfe05ae46dec7bb SHA512 ab25742088a602ef44a1e3adec10fab612b100b7182efce801932156094103a2687da00df92a0fe7b6b0b5ca7ee825ee85b9cc84273449a6cffe686b0571c582 WHIRLPOOL e056f4cf9c2634a7ce09f466b722201d05096536683f9e0c744019e1e76cc53fb4b909e65b7d9fc16bf3ffaa6418b8c35521e2a6a6fcd043f615e8021a365107
 EBUILD netbeans-groovy-8.0.2.ebuild 3346 SHA256 907e6cd11c222f15c826494b44929483803f0e4249de0d54db51e6855b574148 SHA512 8bb37121e7e32621959318d109b1d982e2c705a9deb7171f5fef1dcaed55fc5718b0bc9e6bbb2592cdaa5e96d874bb6e6bfa96d06fe09f14d5250c1485eb1da5 WHIRLPOOL d5e09fa1e975835f05c6132c091fee4ae9fc9dd671af9f5f88a9195d5cd4a93804f96687ed3f2bd741117fa65773f2c464b3cfd6697425039cc51a940efa2a31
 EBUILD netbeans-groovy-8.1_rc2.ebuild 3371 SHA256 6ace63d0b75118b4e82bc5fcd42fcff4af16aa94909f6b7ce53901f9df92117c SHA512 12f629d795a38c2d5220ed1c1b1d15db2446c464a3713fef2fa8c95d3c41365f346dabd6d408b899997c618d39e759e319d1cdc63c02c3a07994877ca75d9ecc WHIRLPOOL 5fa0e845cb4597c5a7a24dd19e464e491ec99b7be5b9040fd98ad4f12a399dc08f4707b046bb02bd4e04e0bef4f39a23f040816d5559edb7f782f397dd3007a8
 EBUILD netbeans-groovy-9999_p20150914.ebuild 3416 SHA256 cfeac72b47716cfbdd3088db781ee75e7b8b7af226af3eb3db85309db251ea6a SHA512 eeb0c02e56a5f349c6b23a8fe7bb5456eed83af8d413034eb8e20e4851a3b6d12a952d9816bd7011926154212f86689800f12e38d21248b555fd65f1434ed7df WHIRLPOOL 2172c53e64f60003dfec846bad6179a37302109bf4c065b87779db2139bc83946a4e85dd8567a752d26595eb88219be26b88838cf9950b50140a9f4659d0e321
@@ -60,4 +61,5 @@ EBUILD netbeans-groovy-9999_p20151019.ebuild 3416 SHA256 13a2961a362adca75a87584
 EBUILD netbeans-groovy-9999_p20151020.ebuild 3416 SHA256 e6656b24da8b8d6a7a5af50e93115a6076290e8df249db67906e0f815c3c9640 SHA512 82b2dfb7b9ba64c1da6f1801b2763bf53dad6b8ee5e73d1d833752be3c6f09df4ebf4c553e6b36ba6154e22bba2f8fd5e93f55c5d284d17e0854bda979f87dbd WHIRLPOOL b86d8797a030c2e95323a27ec0ce3e350895911ce42678c1c9ec836abf2cb44a60de951ef80f9d372ff6426ef758d5f6ba80bce14977805959587310ee8f41d6
 EBUILD netbeans-groovy-9999_p20151021.ebuild 3416 SHA256 b2c1a601df3a7ab4a34b37cd9aa16a0211d009a03431073313268fe09987992b SHA512 b21a5eb26165f56611f86944e2d7a3c74ad1b6eeeac6b738cd3c691a109b9ef8ef3a3dcf3debd78038933b681deb0ed35dc4d54e17610e9302c6b4f683b105c5 WHIRLPOOL 2f22eb772cc5fffd0c85605b99a87ee5552842c61ddf8205cd780a37ecbc70ee47f6af5884cadfb49a27af33fc3bb2831fc8f2080028221df1de07ed036aa593
 EBUILD netbeans-groovy-9999_p20151022.ebuild 3416 SHA256 188648c47c280020dd1c8d9d43e6cbf2715c9e686bd98f89eb547ccc794bfd1b SHA512 c5e58ccc41cb51547b35e5fae4f2f9d1881f79f4490f962c53895a0064a0e2e26057be284b7bfd4626cd172901a04246b36202ceaef4822d476dfa4010777547 WHIRLPOOL 7b094d7a0f59d3152b9b4b04acfee94817a1513fa3b8ac46c474b4e0bc6c1781d71c8c1cbd76a3314e4927cf9ecb9312553626bdc526eb88e72fbafb1999fa40
+EBUILD netbeans-groovy-9999_p20151023.ebuild 3416 SHA256 7799a16ec4faa6be9c104d69c4afca7ac28f05f299f1c8dc603a19fa91aed10b SHA512 4c6686a1f317127031588c6e1c61fe2f8893639e910b679f614a716d56d434bb9dd0b38ac363f65ec81fdc0457d046b578c76f705b9d01e2bfe2b0865553bc29 WHIRLPOOL 11ac197f1c91cbc5fcb79df84468932f9c0dd7c3501ef25d52468cb04a46f51cca11e5ac864b5a4bd0f88d4f864d3bd08f93433d3d16fc7e3ca718b5dbd91c39
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index f4e3420..a40f9a2 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201510190002-src.zip 208635309 SHA256 ec26fab3d6ab19
 DIST netbeans-trunk-nightly-201510200002-src.zip 208646929 SHA256 58578f52d853065ed01442ec329d3a91610faaaea3f83253aeb4db125be71442 SHA512 8c0715828885c513dc12d391a202f1f3ccfdba9107dae60752754568369d68670ff088aaa5b550d7ef9f45a97048de5ffcc80cbcb4b59fbf9e8aba0a710a6bf9 WHIRLPOOL f36c658d37b39d0d9149ffaf3c4266a3fda14644b950216733054fa16a219ae16dc41355c44142cb14158aac60f205d29ce795e790a1ae01964847fb8e926678
 DIST netbeans-trunk-nightly-201510210002-src.zip 208641929 SHA256 b523c444d1fe7afb064c64225138aa795ad8ac9c0c25fef7d02bb534d2c54d4f SHA512 eed12ef2835ce6dcfb725bbacbebfde24c1893f7a67ebbb27a52e1ac907634cc562263de47e0115f620f45ca47874c833853965f3732569e65cc0213221a6fde WHIRLPOOL 0b8259848754750bc130a187e6e930effd66f765f6903fe7adab68e37be8b1048043bbe2cfcdf443ef58bd4d325d270b6900621678e3b1a730f3e41ae7294746
 DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e6871bf9e3601ea50113d123546decc916b02a832c876a07c6395 SHA512 413872ad9ca4ce3806db91c5c5dc137d031e1fa942f8382b02d86f97cf7e51892dfbfafe1751ff49bb76af3b4da10788ef5f46155eb1bd48f0d9110b5e72286e WHIRLPOOL 5b4ad028004e312be5602b1ef201ec9945320bc1345b4674c730f9af8cbbbf6da6f78dcffc1b4c71ffa7c0f8e13414f57c16a976418784aa0fa3d5825f56c572
+DIST netbeans-trunk-nightly-201510230002-src.zip 208659975 SHA256 2b00f5a10b9b57617f41c78adb256ae56e87a104fd88afeffdfe05ae46dec7bb SHA512 ab25742088a602ef44a1e3adec10fab612b100b7182efce801932156094103a2687da00df92a0fe7b6b0b5ca7ee825ee85b9cc84273449a6cffe686b0571c582 WHIRLPOOL e056f4cf9c2634a7ce09f466b722201d05096536683f9e0c744019e1e76cc53fb4b909e65b7d9fc16bf3ffaa6418b8c35521e2a6a6fcd043f615e8021a365107
 EBUILD netbeans-harness-8.0.2.ebuild 4055 SHA256 2674d562adc57648c82cac9f714f74f9d29dd7b7ff7fa7f0ef37c43ef0975489 SHA512 7d72bed5b955b2365a4c11fcd97a2d6f2372ab939fb9a03b3ff7915053f24d695373c1aa154f6e6916d37ef3ace7b38864d575419460382760500576dae52e49 WHIRLPOOL 72f54a6cb83f282a75f0abb073109414a7b8bcd4e9263466281e68ff34148a7343ed3bd78ebdc8afd109b6b9f5b9f15bfd0e250f418fcaa4986a7c886b57b9f6
 EBUILD netbeans-harness-8.1_rc2.ebuild 4080 SHA256 93049f23b2ad31b40c784de1a3abb7b8332f59e5203e6058f6ada092e45fd01a SHA512 9cf8e85f62a03d1fd5c43a8ff746229d0d8e91f10a67a08b5634cef2c6d7e3c31a2f309b53c158fb5580ea1334fe3e0e5f84d555f07a5c3174e78c58e6a14cba WHIRLPOOL 40cf8d1fb75674c49e1af12292f7bace10d74724d1b034b6cd1ecc9c4a816b4a711ed9c49e6b0719dfec638349ab9669685e605d0e481c8b62958a9c82231ef9
 EBUILD netbeans-harness-9999_p20150914.ebuild 4125 SHA256 44bcecb8562b2e40d845b081f8a464447599a4d45e512f9b390dea97fea4e8c9 SHA512 1598fb8ed5b8317638ef150ab940e51d30b2225ab78b263290a409c801feb816adf8459659c25db29d27de0cefef490a4024bf646d22857547578322166fc9ad WHIRLPOOL a863567647c7e790e2b332a53c95822465e1040aec58171c3207c80397cdb4b9257e3a7e6f3bc438f936644e4de3ccdedb2d8735b3beaf43725a77c194b317bd
@@ -64,4 +65,5 @@ EBUILD netbeans-harness-9999_p20151019.ebuild 4125 SHA256 70f552997945558daf1078
 EBUILD netbeans-harness-9999_p20151020.ebuild 4125 SHA256 a2353178bb8fbb9ab606abc0255a5865df100d47ec8daa4dc39e0634f5304a7b SHA512 86ca298b06278505df877f2fdbf7f210808d6d2d5dfe1a523b0414026b8dde1a2e3c9d008c8052b628f9373036ff3300d8c12e100b45ece94fe1e7763fe3036c WHIRLPOOL d7f2648646ed5a1fefe9858fc1a2da28a5781d340578fe9004f9b3415ce4d6d6bca83bcf707f9715d1d1c7aa1f786af86c8f4d9a8ca95dbac24ccd8ddd15f82a
 EBUILD netbeans-harness-9999_p20151021.ebuild 4125 SHA256 349bd3dca2a82b4f1a3afe1aa586550863c18cd774a560419b6ec3fa7820a6d1 SHA512 e6b208566274f47633962cae96e791aeb31c19962ea96926d65d9a6860833dbd58df662a55cc4cb9824b1a7ed575becb9ec64c3ed1940707d9d3ae44403a53dd WHIRLPOOL a013264743a8ddf52c0a96ae166d4af620825fbd1bc7763e68af370856dd2cdef30c99d048e664f04c86fa65e4157bbdb086fa0b3cd7cae46b196988a2303b73
 EBUILD netbeans-harness-9999_p20151022.ebuild 4125 SHA256 6736ff80eaf28da59c4f11903cf06a581073541d9441dcfa8955379f43c8b66d SHA512 7a609e462c8b7848cc06bbecc06a4c880c38495d23bb06fad2dc29db7424752bc5cc94cd74537db1d727594a0a24683c17261ef157f0deb1482942c05f233ec8 WHIRLPOOL 6ba1a448293e7fb7ba1586860985916ee405da5e982014035fdf89bf0dd6e2dd7dd889a33fc072a0d5acee83e9b78e3dcde4876dce52749969461610b4f1480d
+EBUILD netbeans-harness-9999_p20151023.ebuild 4125 SHA256 80add6979042d6b7ee0377752c50bf18d4449649f0643ff4e492434f4312190b SHA512 0ac657e466d38ad4018741909a887dbddc6166602683a85068be82c77934eee0721977c79102838bca619f6d971398bfcda5c19f3872945880521311b2c6eb08 WHIRLPOOL 0233c814011eb5c542a0f1e20b10a77c735d8a3e43be7950cc3c24e8df1476f32607642eca5c3263ee950b3031497b9acef808ebbdccf3263aa43dfab83bc6e7
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index d62509a..00dfc4a 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -136,6 +136,7 @@ DIST netbeans-trunk-nightly-201510190002-src.zip 208635309 SHA256 ec26fab3d6ab19
 DIST netbeans-trunk-nightly-201510200002-src.zip 208646929 SHA256 58578f52d853065ed01442ec329d3a91610faaaea3f83253aeb4db125be71442 SHA512 8c0715828885c513dc12d391a202f1f3ccfdba9107dae60752754568369d68670ff088aaa5b550d7ef9f45a97048de5ffcc80cbcb4b59fbf9e8aba0a710a6bf9 WHIRLPOOL f36c658d37b39d0d9149ffaf3c4266a3fda14644b950216733054fa16a219ae16dc41355c44142cb14158aac60f205d29ce795e790a1ae01964847fb8e926678
 DIST netbeans-trunk-nightly-201510210002-src.zip 208641929 SHA256 b523c444d1fe7afb064c64225138aa795ad8ac9c0c25fef7d02bb534d2c54d4f SHA512 eed12ef2835ce6dcfb725bbacbebfde24c1893f7a67ebbb27a52e1ac907634cc562263de47e0115f620f45ca47874c833853965f3732569e65cc0213221a6fde WHIRLPOOL 0b8259848754750bc130a187e6e930effd66f765f6903fe7adab68e37be8b1048043bbe2cfcdf443ef58bd4d325d270b6900621678e3b1a730f3e41ae7294746
 DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e6871bf9e3601ea50113d123546decc916b02a832c876a07c6395 SHA512 413872ad9ca4ce3806db91c5c5dc137d031e1fa942f8382b02d86f97cf7e51892dfbfafe1751ff49bb76af3b4da10788ef5f46155eb1bd48f0d9110b5e72286e WHIRLPOOL 5b4ad028004e312be5602b1ef201ec9945320bc1345b4674c730f9af8cbbbf6da6f78dcffc1b4c71ffa7c0f8e13414f57c16a976418784aa0fa3d5825f56c572
+DIST netbeans-trunk-nightly-201510230002-src.zip 208659975 SHA256 2b00f5a10b9b57617f41c78adb256ae56e87a104fd88afeffdfe05ae46dec7bb SHA512 ab25742088a602ef44a1e3adec10fab612b100b7182efce801932156094103a2687da00df92a0fe7b6b0b5ca7ee825ee85b9cc84273449a6cffe686b0571c582 WHIRLPOOL e056f4cf9c2634a7ce09f466b722201d05096536683f9e0c744019e1e76cc53fb4b909e65b7d9fc16bf3ffaa6418b8c35521e2a6a6fcd043f615e8021a365107
 EBUILD netbeans-ide-8.0.2.ebuild 29317 SHA256 42218788ab0fc7c7cd1bb42a8b0c72a66543a3260b752aa55365833c355bcc63 SHA512 c712b66b6bee654390a45e5c616479df2be624bb770f3838d4fcce875f71a8d165703dffd55c4fd7d30e19c392784203e5fe01e2404907d88c935d439efaf578 WHIRLPOOL 67763e4a36215ac002fd321556ce2269affc15ba48ad5069d7ccc746d918179994f174e09305a9d9ddadddbea690778c2769e0ea1993eafc09e01580485e2292
 EBUILD netbeans-ide-8.1_rc2.ebuild 30289 SHA256 601a026a6ded95edde37912caab8d873aba2fd1466d3d5ac66fb33df95df3e9f SHA512 d1cdd2be0baf271f53978da38a9d7198074b2c91d84671aa1919cc03374715697c13fa182515010377e4773517fe560960d28a50db62e0d19f038baa06e91bec WHIRLPOOL f73fae56638de9ab520f428b82954212ddd22e55e4958b5c43252768985e5cc0358854237e0318a384fdf828ba2395754bed1fe3aedfcb1efa999b75e5c64bd4
 EBUILD netbeans-ide-9999_p20150914.ebuild 30334 SHA256 4c3267a9fe8092d970cd132a24f268402faa9fce9b0f80b9981d163d3faf8bb3 SHA512 2bc8699ddc6b588cd6e83a8bacad1f7ef9cab9c1a7b482862f0a537a12502078b01fffe5841d6161ebde0ccdfc2ffc9b355aca4d07573a8aa436baa21b187134 WHIRLPOOL 744458c4d2103007c06b97675567d135c385863a6d6b186ce23fa32a91f317c0f1e85fda8ad22688770f53fec33a6001fd5c60a3c58f4aeb27a2eef3a612ffa8
@@ -165,4 +166,5 @@ EBUILD netbeans-ide-9999_p20151019.ebuild 30334 SHA256 3c3bd64b2b2985868e9693267
 EBUILD netbeans-ide-9999_p20151020.ebuild 30334 SHA256 72d4045e01c0b9adb6b431f84f4c300b303e9ea6474df0149296202990811eb4 SHA512 9dbfe097d94f29368a251d851982df5990ed2dfb0dd6537d344e992d1a022e169a860413c7b459fbda6261f38bb1026b43ddba78a5a062bf55150647c5ac134d WHIRLPOOL 82a3f22970d024e8af5d0fba4fbb2dccc00759f98705264f5765f0a1c0cfda03a018bfaf406221a1cb251ce2e73a45acfb376ebe3f8152dfd69a0c706014a445
 EBUILD netbeans-ide-9999_p20151021.ebuild 30334 SHA256 084bad7ede24a5d26a4e91e71195cdd38fbaee886ad70421b838f070047c3fba SHA512 0bb75b12d2300d89f56e04915ed0bb6874a83ef69a6cc3eef028d1aef745ac90c4474ad61051f3d96873eb98a0eddc2bdb018b5b5c2b0bfc1b76807f5b3c8b24 WHIRLPOOL a76dc283dfd48058cbd9a98828678b23838d5639508f447479f1d7e71a581c7c9eb103d96f38cdbe4663a2de29e5770a54d1665272149f3db78de0417a76aa8d
 EBUILD netbeans-ide-9999_p20151022.ebuild 30334 SHA256 271c83431ca06beebf6261f927ab83899f80f405059a24116e0199c491f93e2d SHA512 8a1899efa9b1b8622bc7dfb7b8b719f8367bfcd3ea046d8bea7e07f6fea70b86946d9acea582c15d5bc022ad1a766d25426346e2821a34b9627ea3fb17edc04b WHIRLPOOL 741c585cc42725bed6103fed98cab81fcea2f30d11f9cb78e3281a1afb04b9e8591f0b21ad099ec9a7aeb0c944ff73dc387dc6327e26be1fa92d4669127ce7f1
+EBUILD netbeans-ide-9999_p20151023.ebuild 30334 SHA256 c7e1664e71ae5c5c42ab7a33239d244ba6c9739d2d6beed3374ae83555b7b401 SHA512 1d2c547923859dabf53a79f8f6dacacb298db649e6a358db5b53f47031738b2dbb39ae73f127d448f176cd582102ee57d1dbe0a59593243347a5934da745d520 WHIRLPOOL 0216d42be0262e7a6148a98b4b1f6a24f185ac69a163078f866d0cef22b23b72023e8ee7b8bc68fa98119fb516cfaf3493a935ea2b34efbe3f94a976f42f68a5
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 1485c3e..4e1fbe1 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -58,6 +58,7 @@ DIST netbeans-trunk-nightly-201510190002-src.zip 208635309 SHA256 ec26fab3d6ab19
 DIST netbeans-trunk-nightly-201510200002-src.zip 208646929 SHA256 58578f52d853065ed01442ec329d3a91610faaaea3f83253aeb4db125be71442 SHA512 8c0715828885c513dc12d391a202f1f3ccfdba9107dae60752754568369d68670ff088aaa5b550d7ef9f45a97048de5ffcc80cbcb4b59fbf9e8aba0a710a6bf9 WHIRLPOOL f36c658d37b39d0d9149ffaf3c4266a3fda14644b950216733054fa16a219ae16dc41355c44142cb14158aac60f205d29ce795e790a1ae01964847fb8e926678
 DIST netbeans-trunk-nightly-201510210002-src.zip 208641929 SHA256 b523c444d1fe7afb064c64225138aa795ad8ac9c0c25fef7d02bb534d2c54d4f SHA512 eed12ef2835ce6dcfb725bbacbebfde24c1893f7a67ebbb27a52e1ac907634cc562263de47e0115f620f45ca47874c833853965f3732569e65cc0213221a6fde WHIRLPOOL 0b8259848754750bc130a187e6e930effd66f765f6903fe7adab68e37be8b1048043bbe2cfcdf443ef58bd4d325d270b6900621678e3b1a730f3e41ae7294746
 DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e6871bf9e3601ea50113d123546decc916b02a832c876a07c6395 SHA512 413872ad9ca4ce3806db91c5c5dc137d031e1fa942f8382b02d86f97cf7e51892dfbfafe1751ff49bb76af3b4da10788ef5f46155eb1bd48f0d9110b5e72286e WHIRLPOOL 5b4ad028004e312be5602b1ef201ec9945320bc1345b4674c730f9af8cbbbf6da6f78dcffc1b4c71ffa7c0f8e13414f57c16a976418784aa0fa3d5825f56c572
+DIST netbeans-trunk-nightly-201510230002-src.zip 208659975 SHA256 2b00f5a10b9b57617f41c78adb256ae56e87a104fd88afeffdfe05ae46dec7bb SHA512 ab25742088a602ef44a1e3adec10fab612b100b7182efce801932156094103a2687da00df92a0fe7b6b0b5ca7ee825ee85b9cc84273449a6cffe686b0571c582 WHIRLPOOL e056f4cf9c2634a7ce09f466b722201d05096536683f9e0c744019e1e76cc53fb4b909e65b7d9fc16bf3ffaa6418b8c35521e2a6a6fcd043f615e8021a365107
 EBUILD netbeans-java-8.0.2-r3.ebuild 13294 SHA256 4abac657cff75400e92b1f2b19bca696113cdc37611c8c0f49dfa8c82fec4296 SHA512 32e41d7acc3aca026993e5edc791f1314f2bfda47413538af655b0335973c4fe50d998c67f129307b164075c3e0503280b4c1729d700431644ca6610d7f0f635 WHIRLPOOL d7f99c13421d08529b54085138fcffd2959a3c3f97d94a1dbe6e726a6dbc2cded69ec0bf97e1458b56847ac121954e8f173c1adde0703fd2969defa53ac37c51
 EBUILD netbeans-java-8.1_rc2.ebuild 14773 SHA256 4028adb2993d8a7cd8a4434afb5bc4d2a29bc2812c7ffda3131f2bfe3d4a6b8f SHA512 373ea3bb9175ef0cb4b74c67af69ea0409bbf364220f4b690cc628769cc748594e518efa9a35f890c1da952830b4dc7a1d316e7c020f2f1d704ce6973dd13859 WHIRLPOOL a8adc3fd9e2e9459ebe06d32939d92f5eb2cad81521d2f7f08445d8d000d34fd6f6bb7b69a274e60499637c866ec4654f789fa431382393db5538e5f57090f69
 EBUILD netbeans-java-9999_p20150914.ebuild 14818 SHA256 0b3ea17a460bed5d409d466392b7b8868b5f11d2227cad477a9887c6166fc7b9 SHA512 069cf42315117a89beb7255f42ca56643cbc4bfde90e55a8aba611284a2cabdda89ed736c243930b19856cbe1df472dba605ffed2b5baa8de6f90c13aee0e448 WHIRLPOOL 4dcab901e6f83addcd969657bfa0c5f6c5a33c36160c4fb96dabb023cd65dc1b5388e6c8c3060a72187c74167b98ca26f8f32fb9a0fa6736437004909670c4af
@@ -87,4 +88,5 @@ EBUILD netbeans-java-9999_p20151019.ebuild 14818 SHA256 f6e17f998a0631030e025654
 EBUILD netbeans-java-9999_p20151020.ebuild 14818 SHA256 8429447d697e0d2c5f6c169937b73ba3e061943bd1ccef44d4ec4676a4e175c6 SHA512 cf9d81fb87a1b5ae5d687023b244ed5d213a8860a0a46a3b8ea98f898b7abd4e07b2a69560f5d042160146c7047370dd132aad45914beb7cd30ab31de0abedad WHIRLPOOL 6a8be8b421801914af952de8bb88e416f451893a72fd123e731b58286bcf475015941c667d794f7372364a627324caf4e79dbd7451ef144d14df6a47d850aa65
 EBUILD netbeans-java-9999_p20151021.ebuild 14818 SHA256 777e781e5a006b2fa4d7a384a014e07121bf5ed56b13d26addb9aec240d61eed SHA512 a6b93c90bdcd51ec115ff179b3b59f589595f785c47acfa8bcf3cf169e726e092bd6f767747305a7ae92d3036456cf13f8cbf4e89a1fbe128b61478d10c95849 WHIRLPOOL aad57979d2eec8ea3ffbb631b303f4bee159ca27507d204f3908ad72c3664867ad70071ab6549315c32e6f432d9bb0b2d3abf9a2787486d7a26ed1c31c99004a
 EBUILD netbeans-java-9999_p20151022.ebuild 14818 SHA256 d94b61e944caff9edb0ff9867a35578586eef230df4a181b316f0b4c6487ff62 SHA512 367f611e540801617aa05b5c09dc9a2cc04864f7b4e016a1786cf9156111ca2b71569e0eabd00c7d8224d46dfac810abec664a3afbe644ecb8795eb67551097f WHIRLPOOL 893a722aefa75c8d257eb0ed7466394c5e5967807c4d54e07e78a18f29bac7cc980f7ebbcbb1b6c8d5822f0af35a1b8077b24049661a1355aec7a98410d10580
+EBUILD netbeans-java-9999_p20151023.ebuild 14818 SHA256 305956fb46c836c93162ad4c0af94569e928ef664343f76bce6751f1bf93e89c SHA512 9f38c12b3e26c5659a4cc555e13388e1dc0c9a4f60f8e8c525ad1162224a87a79301c097c00256745056acebba1c3ce07b0fe0110574defb5b9427154f63840e WHIRLPOOL 8fdee0002bca08afee17871dd46b5a9d3aa038866bfc546f3750c046ab62d3ed9cc2aa0e41e8ce4d858d99d1ebbc649b86123dc02fc85d694bc4fff50e882741
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 5b97b87..9d86890 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201510190002-src.zip 208635309 SHA256 ec26fab3d6ab19
 DIST netbeans-trunk-nightly-201510200002-src.zip 208646929 SHA256 58578f52d853065ed01442ec329d3a91610faaaea3f83253aeb4db125be71442 SHA512 8c0715828885c513dc12d391a202f1f3ccfdba9107dae60752754568369d68670ff088aaa5b550d7ef9f45a97048de5ffcc80cbcb4b59fbf9e8aba0a710a6bf9 WHIRLPOOL f36c658d37b39d0d9149ffaf3c4266a3fda14644b950216733054fa16a219ae16dc41355c44142cb14158aac60f205d29ce795e790a1ae01964847fb8e926678
 DIST netbeans-trunk-nightly-201510210002-src.zip 208641929 SHA256 b523c444d1fe7afb064c64225138aa795ad8ac9c0c25fef7d02bb534d2c54d4f SHA512 eed12ef2835ce6dcfb725bbacbebfde24c1893f7a67ebbb27a52e1ac907634cc562263de47e0115f620f45ca47874c833853965f3732569e65cc0213221a6fde WHIRLPOOL 0b8259848754750bc130a187e6e930effd66f765f6903fe7adab68e37be8b1048043bbe2cfcdf443ef58bd4d325d270b6900621678e3b1a730f3e41ae7294746
 DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e6871bf9e3601ea50113d123546decc916b02a832c876a07c6395 SHA512 413872ad9ca4ce3806db91c5c5dc137d031e1fa942f8382b02d86f97cf7e51892dfbfafe1751ff49bb76af3b4da10788ef5f46155eb1bd48f0d9110b5e72286e WHIRLPOOL 5b4ad028004e312be5602b1ef201ec9945320bc1345b4674c730f9af8cbbbf6da6f78dcffc1b4c71ffa7c0f8e13414f57c16a976418784aa0fa3d5825f56c572
+DIST netbeans-trunk-nightly-201510230002-src.zip 208659975 SHA256 2b00f5a10b9b57617f41c78adb256ae56e87a104fd88afeffdfe05ae46dec7bb SHA512 ab25742088a602ef44a1e3adec10fab612b100b7182efce801932156094103a2687da00df92a0fe7b6b0b5ca7ee825ee85b9cc84273449a6cffe686b0571c582 WHIRLPOOL e056f4cf9c2634a7ce09f466b722201d05096536683f9e0c744019e1e76cc53fb4b909e65b7d9fc16bf3ffaa6418b8c35521e2a6a6fcd043f615e8021a365107
 EBUILD netbeans-javacard-8.0.2.ebuild 4906 SHA256 944fee40d693c2c287e748f70ba565f3cd84bb7c19110f8be716134ec20694a7 SHA512 1f66cd2756effbfde7d43f9da7d8d93cb6252c58a02ee3d821f6faeaf63bf3c63e28f80c6eb44689e3aa954452a2f3893c65e75de84158dff1da0d94cafea14a WHIRLPOOL 88197e03008b8acb1ce62f72783bb096d9a3fc2a289b83367841a8adbee2bf822031f9bd6051831515ee44b1d5d2a109c5646f98ca723506f27c874301fb4189
 EBUILD netbeans-javacard-8.1_rc2.ebuild 4931 SHA256 e97ff379323330f47a1f1e13d0492b4308e4c377008b4e203d24988a7e412bab SHA512 48dd7e817df729322de3ee165e4cadebc2bb23e8a6831d9084d298ca01f456c2035c96808080a7b62021154146924dbe98af5ed862271701f25fa07e4fe40e9c WHIRLPOOL cb81b1c27069e86f45acc87bfd1191e876b44ff676333ccc73320311f6f8de5923d7f052029f42bfc614b93f1aabe6489ddf76f4c788224140878c6081938f4d
 EBUILD netbeans-javacard-9999_p20150914.ebuild 4976 SHA256 a88bcaa47f91d1526fdbed8a323a939fb94a7a7ea78483644852c9cfb376243c SHA512 a47471278379d1e264f1cce3a33d7b27a084cec57a3d98558a230107fd1fe9dc457ac9848e80d759e90bc8a7728d28d71ca7ddf0bc95f5bb8dcf05a981ba172e WHIRLPOOL efeeffd5f2a4ee1c81b0874afb09a1005f1d32b748b9031cf9d86a628ecfa776a5259a614eeef788287af254ec9717ba394349b76ec56578333d78f5fa61bc94
@@ -62,4 +63,5 @@ EBUILD netbeans-javacard-9999_p20151019.ebuild 4976 SHA256 b4a8e4a331c61ded18fc3
 EBUILD netbeans-javacard-9999_p20151020.ebuild 4976 SHA256 3fa86c840916b7cdbdad3ca01c01fc90d92d83e48570872e597fb1e195baa738 SHA512 198643bd7c1e2d724d51c03399456cb52aa976351acb9ae40da5fd6b87ebeb5b4790e939227e5e885f0422a5d53162258480d471fd8c00d698ce52838ca3f859 WHIRLPOOL d733b45a36ef3cedb5c8327b5a8b89bf76270f4347d51a702ac869687f24a65dfb85a4388e00aa81aebd04397ec8e555a2e9abed08c32f276fd8c5ae3e2cc8f9
 EBUILD netbeans-javacard-9999_p20151021.ebuild 4976 SHA256 6f89e15cba20992bcc753c2b30528ec01f252a375caef66957137d126fc61aef SHA512 1da01480b9c39dd0015598ced53b967b41af109b2fe415c3e630bcf8cb0fb07f504798cf1959e8778524587117275007a3d57c541ae36eb78632cba21d8c1155 WHIRLPOOL d072aebdce8fdbef17f4db01361bde811eaafd938c3c7a91068e657bdc17109a6e95b922dc63782ca66833ef63029dc239c98d72e28291385d6f9c5c09de2f2d
 EBUILD netbeans-javacard-9999_p20151022.ebuild 4976 SHA256 24603bc67e1689171486392d388ee593a230a938c672e0bf4e7a2f68c90f801a SHA512 50610482380a179244616d97104f60149bbfb63b36565bf73abf06df8a35edbfee1549a6fdb180b8d8ce64153943c4bce6f6ab0ebbd6ecad537578fe647f22cb WHIRLPOOL 63a866f42d85ac7064dbdf7be7862d0212e4bf45f9125a3ec5c340bfe3c7fd6b29d929c639ae99db690a320612b9e7a83b584cc8603445508f841869073e0fb2
+EBUILD netbeans-javacard-9999_p20151023.ebuild 4976 SHA256 6048b9aea0640200d9d24e12a71d209e11341316d9e689e6ac2545d81423523d SHA512 45d4f927c9df155e25492507ceb41c97b221a77d14621a0798a05dcf430209c43bc3f3503af521bf6dd666e744e955ed80cbf14da67804d9696a112de07955c7 WHIRLPOOL b7895a8fb10dbef15c798e49f4868db519fc2c2e3a721ce8f97eee8c784af6a753a5921813c70796d009039d10184613c64b2e8ca9ebd15d007f8b897ffcd995
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index 4cced51..826c381 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201510190002-src.zip 208635309 SHA256 ec26fab3d6ab19
 DIST netbeans-trunk-nightly-201510200002-src.zip 208646929 SHA256 58578f52d853065ed01442ec329d3a91610faaaea3f83253aeb4db125be71442 SHA512 8c0715828885c513dc12d391a202f1f3ccfdba9107dae60752754568369d68670ff088aaa5b550d7ef9f45a97048de5ffcc80cbcb4b59fbf9e8aba0a710a6bf9 WHIRLPOOL f36c658d37b39d0d9149ffaf3c4266a3fda14644b950216733054fa16a219ae16dc41355c44142cb14158aac60f205d29ce795e790a1ae01964847fb8e926678
 DIST netbeans-trunk-nightly-201510210002-src.zip 208641929 SHA256 b523c444d1fe7afb064c64225138aa795ad8ac9c0c25fef7d02bb534d2c54d4f SHA512 eed12ef2835ce6dcfb725bbacbebfde24c1893f7a67ebbb27a52e1ac907634cc562263de47e0115f620f45ca47874c833853965f3732569e65cc0213221a6fde WHIRLPOOL 0b8259848754750bc130a187e6e930effd66f765f6903fe7adab68e37be8b1048043bbe2cfcdf443ef58bd4d325d270b6900621678e3b1a730f3e41ae7294746
 DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e6871bf9e3601ea50113d123546decc916b02a832c876a07c6395 SHA512 413872ad9ca4ce3806db91c5c5dc137d031e1fa942f8382b02d86f97cf7e51892dfbfafe1751ff49bb76af3b4da10788ef5f46155eb1bd48f0d9110b5e72286e WHIRLPOOL 5b4ad028004e312be5602b1ef201ec9945320bc1345b4674c730f9af8cbbbf6da6f78dcffc1b4c71ffa7c0f8e13414f57c16a976418784aa0fa3d5825f56c572
+DIST netbeans-trunk-nightly-201510230002-src.zip 208659975 SHA256 2b00f5a10b9b57617f41c78adb256ae56e87a104fd88afeffdfe05ae46dec7bb SHA512 ab25742088a602ef44a1e3adec10fab612b100b7182efce801932156094103a2687da00df92a0fe7b6b0b5ca7ee825ee85b9cc84273449a6cffe686b0571c582 WHIRLPOOL e056f4cf9c2634a7ce09f466b722201d05096536683f9e0c744019e1e76cc53fb4b909e65b7d9fc16bf3ffaa6418b8c35521e2a6a6fcd043f615e8021a365107
 EBUILD netbeans-javadoc-8.0.2.ebuild 5993 SHA256 baf9da38d87b86eb8ed10ef46017361f36ca8583dd90885c9d1667a51851bc52 SHA512 892bc25b30dc26e3ee7c8be9aaf8542c00a7fa1d1d8f883d82bebb816edfa93e1ee9abeac1b0c47ecc8b4169bcaded56c5c71f18151fdc22fe241fcee0fd4521 WHIRLPOOL 2012f28f3ba5074b4d262b20e9a1c8ddf590ce444339ec1a404c890867c1271e38f9f9e09717d0648fae061553f5c8da3d97a70c35c8e853fe4894fb6fd4ec96
 EBUILD netbeans-javadoc-8.1_rc2.ebuild 6183 SHA256 160de5384af53a4ff95958ba30c1d3d0b3dbcf4e8f8209c67ff2447d504108c8 SHA512 cd7d0ecc527dc8c6a7ac59f27a39c332500ff60dd59b5c26d2579258adf75cff762083727b18172607d494a597143261423c97faa7f705015c372bff1a54908d WHIRLPOOL 39a55f84ccb43df6537b1276406d46d70cdc9e5b5c428aec33eeed091f5e580c752557319cbab5f6d6325de1509c87d8913f6c1b8712e72e148fb1883c684d76
 EBUILD netbeans-javadoc-9999_p20150914.ebuild 6228 SHA256 55dd9bf613c5bf6c5998afcdc3fd8194e58492ed3acd3897223bc8eaea80cfb8 SHA512 aeb46693635b14b92659b2f7f913aa2bc198098803e5653c8226822b84bde4e0a37212e32c3cfbbfc6307d49e778b7d1a7048e09e8c7f590b1a88b2fd4861e98 WHIRLPOOL 1c56c5b63744fd251f5f7c5264ee30011f0d067a70891211892bb195b32aa078f1cee5fcb4fc9522fd74a79acd1933d0360c07086b9e5c197161904b7d136351
@@ -60,4 +61,5 @@ EBUILD netbeans-javadoc-9999_p20151019.ebuild 6228 SHA256 1b46a4f83150969b16a457
 EBUILD netbeans-javadoc-9999_p20151020.ebuild 6228 SHA256 dc223ff5c029585a18f5e15773ad43b6ee99773eaf61133e915d638b4b80a432 SHA512 3a4fc7a669aefec1454c261ec6d151ecfb47ff4615029619ba9817c284a6acd9c0444da9113d9bc494b8722a85034b102307797936886c0c9817ef87565eb903 WHIRLPOOL 1741f79478c96b3aec92750444759bca60a84914c64bdf8cd6b28a0c4d0afa33391df02c31da9337d2e52ab81f5f563b44da330c18d265b8f5e7e0e167f338e3
 EBUILD netbeans-javadoc-9999_p20151021.ebuild 6228 SHA256 536b88593cc4708143c8136999c88a9a48d1015578314c34de9884f807b5a08f SHA512 f398d5684d3c08c8172137417d48ea912a3dcb1855dcc78d5bf7ec66f484a96153e6c5adf5fb53b34606a5b1d5aeca15abd60aad8cb744ecec04caa83245835d WHIRLPOOL 8b03543bb4a31cd7b2723cf740255f4df88c97aa1ed18d7edc4de44a595de768a4784e55827e025d54d0f9da982ef06d258b5786d65323f5fb33c30507d9c966
 EBUILD netbeans-javadoc-9999_p20151022.ebuild 6228 SHA256 8fdf6ffbbb93cf146c379a837c35bb77b68f96bb6f9e1c555b42f12345ee71ad SHA512 f4897e1aa3260f6186eb1ef39c5778e0701ccb8791b4e77cb6d9d1c107df8d2e042bf99d4e48d34c18f37784179ec17f2dd29896e0e02c43a20634f55f6cc17c WHIRLPOOL 7fe77b458beaba8173cab0ed1662573a1204e79ae85bf149356f22b5e739466670831b91da6976516d235e56cefae96cf528146df60407bf1b57a648a9fb8269
+EBUILD netbeans-javadoc-9999_p20151023.ebuild 6228 SHA256 eed53d61d014e87590508c98f2bd2448119ec322e343c03988a5bf12f3251bf0 SHA512 6e1d414c40750c2772cee21e45625e0e708dc1ead39b736c9e98bd6f07baea348cae174ecbd91ea21d50ab8350c345ba692b871012ddd8e182b9fc26fb1401c6 WHIRLPOOL fea652760a468998c69c10e690a3312f9a415b331c8bc1399f5db484eb5d81e3e5a5d7f573993e8661e470b92dd50091cec4684ea1143362ef481f2ad48c9e1b
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 0c1b647..7a3a808 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -37,6 +37,7 @@ DIST netbeans-trunk-nightly-201510190002-src.zip 208635309 SHA256 ec26fab3d6ab19
 DIST netbeans-trunk-nightly-201510200002-src.zip 208646929 SHA256 58578f52d853065ed01442ec329d3a91610faaaea3f83253aeb4db125be71442 SHA512 8c0715828885c513dc12d391a202f1f3ccfdba9107dae60752754568369d68670ff088aaa5b550d7ef9f45a97048de5ffcc80cbcb4b59fbf9e8aba0a710a6bf9 WHIRLPOOL f36c658d37b39d0d9149ffaf3c4266a3fda14644b950216733054fa16a219ae16dc41355c44142cb14158aac60f205d29ce795e790a1ae01964847fb8e926678
 DIST netbeans-trunk-nightly-201510210002-src.zip 208641929 SHA256 b523c444d1fe7afb064c64225138aa795ad8ac9c0c25fef7d02bb534d2c54d4f SHA512 eed12ef2835ce6dcfb725bbacbebfde24c1893f7a67ebbb27a52e1ac907634cc562263de47e0115f620f45ca47874c833853965f3732569e65cc0213221a6fde WHIRLPOOL 0b8259848754750bc130a187e6e930effd66f765f6903fe7adab68e37be8b1048043bbe2cfcdf443ef58bd4d325d270b6900621678e3b1a730f3e41ae7294746
 DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e6871bf9e3601ea50113d123546decc916b02a832c876a07c6395 SHA512 413872ad9ca4ce3806db91c5c5dc137d031e1fa942f8382b02d86f97cf7e51892dfbfafe1751ff49bb76af3b4da10788ef5f46155eb1bd48f0d9110b5e72286e WHIRLPOOL 5b4ad028004e312be5602b1ef201ec9945320bc1345b4674c730f9af8cbbbf6da6f78dcffc1b4c71ffa7c0f8e13414f57c16a976418784aa0fa3d5825f56c572
+DIST netbeans-trunk-nightly-201510230002-src.zip 208659975 SHA256 2b00f5a10b9b57617f41c78adb256ae56e87a104fd88afeffdfe05ae46dec7bb SHA512 ab25742088a602ef44a1e3adec10fab612b100b7182efce801932156094103a2687da00df92a0fe7b6b0b5ca7ee825ee85b9cc84273449a6cffe686b0571c582 WHIRLPOOL e056f4cf9c2634a7ce09f466b722201d05096536683f9e0c744019e1e76cc53fb4b909e65b7d9fc16bf3ffaa6418b8c35521e2a6a6fcd043f615e8021a365107
 EBUILD netbeans-javafx-8.0.2.ebuild 4647 SHA256 15e5e0b1c4729852dd55e5bfb2dcb520ba7c959bd9927d315c0abcb3f94e4ecc SHA512 520c60264fee67b0ccfd50ced0cc8586d5653d5186fa75c6b7cd8b400aae834de446b7e6145ad38df7e68207391fb360ef4834140e096d48add568fed387ac98 WHIRLPOOL 416a56ceb2ba85e3923ada0c8ef485cdd6fa16b3423b8fd0de523fa54dd082cbaedee5da4f1a92b50e440195f9256376f50e99a850d70ccdcb8c0ff370007f7c
 EBUILD netbeans-javafx-8.1_rc2.ebuild 4672 SHA256 95e0fd3db7cd71b95d3b1a0be1ec35e8b4f0ee2ef8e37e5defcdfb81c8a8ee4b SHA512 0dbdb39db83521ad87f5536c491a8f94d1d6261f1cebc5a80e943128f33364adf04a4a0a23898617eb0b12f770200f0a7df9c7bb8e5cac65aca4b50737a05b2b WHIRLPOOL 0ef3c1159df5dc25474beb8106b65133951ff48699c265d6be1a929e9537a30db8a125740f37a0295ed0e6267141cd1a7be9f5ec5d4412e0221f9734d6625b3b
 EBUILD netbeans-javafx-9999_p20150914.ebuild 4717 SHA256 c94fb1e23128e30fa73bbb32f64b5b253a06a3ec1d824d84ff6712d7ece8551d SHA512 416f91922ba69496cc1de0720559c933b053487bbe1587fe3cff56c640ec836eba6f9b4e7697c489b13c69a39b226ac41bb2108511b26a16c84f017ac8b37369 WHIRLPOOL 936e030931b83ead8beba2d397f24b049e189c0faabf27aa7ef36de371ec6d294f40070834d6b5e05d76fe790726b3d0253a3a8fcc91e202f2a2d2b405f939b0
@@ -66,4 +67,5 @@ EBUILD netbeans-javafx-9999_p20151019.ebuild 4717 SHA256 d87a5dce318596ab9c03ea2
 EBUILD netbeans-javafx-9999_p20151020.ebuild 4717 SHA256 9283235fe5544df58cb5962dced7108a333d8ba68124cabf6399a08435557670 SHA512 68f866b745bcbca8090a92896c0b5c29812eee41fe05a41c3f962f76a7026b98c6ca18ee441d394af0b11aab59a14bc9be50f5b4f87d257784ad3f2397e44dd5 WHIRLPOOL c35b1b34da5a61f3984a89dd10caa875c4bbe117964565de4c05a2417253c4fe311c5fee7c16f2c146004844007e0d90ecef359858cd89c3b9ec4357fba8d4cf
 EBUILD netbeans-javafx-9999_p20151021.ebuild 4717 SHA256 c47d7f400900c07d0d0e109eea6ac82602503243f545a7295d8a7641951804fa SHA512 8516c4f4eed684ba6927243a3f8088c7e3422f0b284fe31205c44fdf3b98d1bb4a67e36ec873e3fd955ce2951ac0d0052fc834b62a22a6f61dcb188aa7c29fbf WHIRLPOOL cda6d3bd92366f82b27550a4de1b628b65f14ef01dfe880ca638a3c55a6862e9fd89e97551dc49592723d9a1598fc8ac04a94f249db3214eefd9dd5d44c1a09a
 EBUILD netbeans-javafx-9999_p20151022.ebuild 4717 SHA256 1a6ce3036dbec321ce24697911fcb3ad3908cb64c51b3c4aaa7b64a46d1f9096 SHA512 2b3bb3d9f6e23ac6ae424481b4de62054751d0ae9c67d17c06358c3334033ad690153d359413b60f64e735967b7853c3a1d1ef212a4227b5c5cbb0f091e2f910 WHIRLPOOL 665235f06f9cb6008138cabb41d99088bf1f2b5e16c03d8e9076be3030d10ed73c09724357579528334b3b92c36f76bad501651f32e522f5866e64f26e6cd7d6
+EBUILD netbeans-javafx-9999_p20151023.ebuild 4717 SHA256 8e3c4c133bf67f5b3be455b1058b6935cf29175b7d7a340d519ae924557d08d8 SHA512 84cd67d516acf56f5e815915f4a15a4042e51a5fd86f5386d1aff7ecc8df06f1073e652141ded0cc5b30d6798f5751aea4c444c874f4c1f4091ae6edb8b1c288 WHIRLPOOL ea6876404f8f263aacd604a1d74c451cd039924bab4bb585e10c63473ad9ceab602890737c5fe7f28ba3c1073b83f1f8524778f6a8ce40bd922641054efc9715
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 2419c00..f4989d3 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201510190002-src.zip 208635309 SHA256 ec26fab3d6ab19
 DIST netbeans-trunk-nightly-201510200002-src.zip 208646929 SHA256 58578f52d853065ed01442ec329d3a91610faaaea3f83253aeb4db125be71442 SHA512 8c0715828885c513dc12d391a202f1f3ccfdba9107dae60752754568369d68670ff088aaa5b550d7ef9f45a97048de5ffcc80cbcb4b59fbf9e8aba0a710a6bf9 WHIRLPOOL f36c658d37b39d0d9149ffaf3c4266a3fda14644b950216733054fa16a219ae16dc41355c44142cb14158aac60f205d29ce795e790a1ae01964847fb8e926678
 DIST netbeans-trunk-nightly-201510210002-src.zip 208641929 SHA256 b523c444d1fe7afb064c64225138aa795ad8ac9c0c25fef7d02bb534d2c54d4f SHA512 eed12ef2835ce6dcfb725bbacbebfde24c1893f7a67ebbb27a52e1ac907634cc562263de47e0115f620f45ca47874c833853965f3732569e65cc0213221a6fde WHIRLPOOL 0b8259848754750bc130a187e6e930effd66f765f6903fe7adab68e37be8b1048043bbe2cfcdf443ef58bd4d325d270b6900621678e3b1a730f3e41ae7294746
 DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e6871bf9e3601ea50113d123546decc916b02a832c876a07c6395 SHA512 413872ad9ca4ce3806db91c5c5dc137d031e1fa942f8382b02d86f97cf7e51892dfbfafe1751ff49bb76af3b4da10788ef5f46155eb1bd48f0d9110b5e72286e WHIRLPOOL 5b4ad028004e312be5602b1ef201ec9945320bc1345b4674c730f9af8cbbbf6da6f78dcffc1b4c71ffa7c0f8e13414f57c16a976418784aa0fa3d5825f56c572
+DIST netbeans-trunk-nightly-201510230002-src.zip 208659975 SHA256 2b00f5a10b9b57617f41c78adb256ae56e87a104fd88afeffdfe05ae46dec7bb SHA512 ab25742088a602ef44a1e3adec10fab612b100b7182efce801932156094103a2687da00df92a0fe7b6b0b5ca7ee825ee85b9cc84273449a6cffe686b0571c582 WHIRLPOOL e056f4cf9c2634a7ce09f466b722201d05096536683f9e0c744019e1e76cc53fb4b909e65b7d9fc16bf3ffaa6418b8c35521e2a6a6fcd043f615e8021a365107
 EBUILD netbeans-mobility-8.0.2.ebuild 4342 SHA256 e9b4ff8fe38904346bc21a82219696e97322bf9df4e9d4cad2259b6f08bbe7f9 SHA512 338711fe61c469cee80e499ddf8c3ad70a3a38e6658311afcd1d24edd1a99b87566fafcbd392bb958b589796e0913d2574b07570870c8d3382a91a324227082f WHIRLPOOL 855b2817c36bea67c8fb368a0740be18b71dbebb2b98a154552f002a56eaff34f54eee2698379d7200a6042c1de699df23e7717b5b6c532776852d8757b74cb0
 EBUILD netbeans-mobility-8.1_rc2.ebuild 4367 SHA256 9b9490b5e2515bf38f69aee76ad664271a0296f68b88d4a005ab12d9048c61d8 SHA512 7eccdf31e705ae6f738995fdcb930c03cf779f02ed64d5e3ee97f1f9a9f6912a2ff56e1c839ddc2b71b9051fcd02ed410d85fff0c706b6ca84f3578c0aa2447d WHIRLPOOL 8d4657fc21b171bf050a272597e7b0567dac5ad480a8822fdcdf76b88b4537aaf8b45a3b1317dd34cef3beee417515a521b7e076e7776b845c0383066503ba3f
 EBUILD netbeans-mobility-9999_p20150914.ebuild 4412 SHA256 318aaed2311c749e72dc270361abfd97a8be75dd6fe5295688b69c82cea84ca4 SHA512 54768745327eb30abd6316d9b5b89e542542d0999fcf73155dfcb70b2a18e59e7a89a1fcf9e0fae3be2523ce68bb4ee5a2731d9c98263db66a4e6970b6c663c6 WHIRLPOOL 4d57661356f650fe83588f05d3cfcf5c374c90ee1232f053ee56d3253bdb9443c07589cdf25706b00c8b5564d660083ee160358b5741d4b6fd96ca5de7dc1cbd
@@ -59,4 +60,5 @@ EBUILD netbeans-mobility-9999_p20151019.ebuild 4412 SHA256 031e3b2d35529eb701dc3
 EBUILD netbeans-mobility-9999_p20151020.ebuild 4412 SHA256 1d8ef002e80070069c10a8f22e7f9ca36c3b42853cb5c703a8fce60f083d1323 SHA512 7034bc012801d98a05a011b2802d9afed49c382e120b6b09f4dfed83fa5f4a0c2532192ef3f436e6e579800f8302c4993f1c2892178f5959ad5fbda80f0c0aa7 WHIRLPOOL 503a6d3c20d7786ea062933e1dda16b596aa37f7744bbe40085981de931b6175b43589398e40e54ba9870073d3884a7315098766412e949cfe955497a575b549
 EBUILD netbeans-mobility-9999_p20151021.ebuild 4412 SHA256 df6d3be68d04956c7f3865ddc4ef8b0a26fd7b8dccfa3f7a0a64af16776cd264 SHA512 f72ab38f30043b6c9ee59141ea95547e5b46d7582c942bfa996d265766adbb6f09a8597b473426910fb87a91b7465cff5aa4b19a36895d166b165792b76487d0 WHIRLPOOL f80bf08281201c3cb5bfc7c33fadc7df8697bab60aae16bb8e0f90c48552f116c155f814dee18f62732a91d84cfc79491ff8569b10be3cb0b97e5e956d807776
 EBUILD netbeans-mobility-9999_p20151022.ebuild 4412 SHA256 39124bd89f53f7b3c28999fe76077da5cdde0489360ba3785f407ab2b52616fc SHA512 43bf5692f86d4cf5227d2a8270dc95801cf572cbb685ecfc72d95a131123147db059e91d6f3ad49dc212f28b58bde9236315820148c10fb3da9aba71285fdcc0 WHIRLPOOL 16b87a4dab31cd8fecee6beb315c6e2807dffac044cad1f3141d18dedfd6302d1db101f890f19b5618a9eb5069a5d57d2c47d69ddf2dcc9f7e58522d5ae0efcf
+EBUILD netbeans-mobility-9999_p20151023.ebuild 4412 SHA256 12e53904612550cd07cd9092f3dce8e89de5797cc7feb215d5364bab68d026ab SHA512 57ea5bfa455b893df4a76ff3cc8a52e26a20bc6623a4abca166ae47db86e0e89727e7b73c37fda2e1a4b93923f790ee62c7539f1013a1c8390acd5b54963a192 WHIRLPOOL 05eb17b775282f3e4f79768f86c751680b7d313c294255037179439f4545fe79eeecd9e3cc2e6897f1f3530e860bd8fbedc5fcaa2edaa00901de69c7d65ae3cd
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index fc521e7..11b2ce8 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201510190002-src.zip 208635309 SHA256 ec26fab3d6ab19
 DIST netbeans-trunk-nightly-201510200002-src.zip 208646929 SHA256 58578f52d853065ed01442ec329d3a91610faaaea3f83253aeb4db125be71442 SHA512 8c0715828885c513dc12d391a202f1f3ccfdba9107dae60752754568369d68670ff088aaa5b550d7ef9f45a97048de5ffcc80cbcb4b59fbf9e8aba0a710a6bf9 WHIRLPOOL f36c658d37b39d0d9149ffaf3c4266a3fda14644b950216733054fa16a219ae16dc41355c44142cb14158aac60f205d29ce795e790a1ae01964847fb8e926678
 DIST netbeans-trunk-nightly-201510210002-src.zip 208641929 SHA256 b523c444d1fe7afb064c64225138aa795ad8ac9c0c25fef7d02bb534d2c54d4f SHA512 eed12ef2835ce6dcfb725bbacbebfde24c1893f7a67ebbb27a52e1ac907634cc562263de47e0115f620f45ca47874c833853965f3732569e65cc0213221a6fde WHIRLPOOL 0b8259848754750bc130a187e6e930effd66f765f6903fe7adab68e37be8b1048043bbe2cfcdf443ef58bd4d325d270b6900621678e3b1a730f3e41ae7294746
 DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e6871bf9e3601ea50113d123546decc916b02a832c876a07c6395 SHA512 413872ad9ca4ce3806db91c5c5dc137d031e1fa942f8382b02d86f97cf7e51892dfbfafe1751ff49bb76af3b4da10788ef5f46155eb1bd48f0d9110b5e72286e WHIRLPOOL 5b4ad028004e312be5602b1ef201ec9945320bc1345b4674c730f9af8cbbbf6da6f78dcffc1b4c71ffa7c0f8e13414f57c16a976418784aa0fa3d5825f56c572
+DIST netbeans-trunk-nightly-201510230002-src.zip 208659975 SHA256 2b00f5a10b9b57617f41c78adb256ae56e87a104fd88afeffdfe05ae46dec7bb SHA512 ab25742088a602ef44a1e3adec10fab612b100b7182efce801932156094103a2687da00df92a0fe7b6b0b5ca7ee825ee85b9cc84273449a6cffe686b0571c582 WHIRLPOOL e056f4cf9c2634a7ce09f466b722201d05096536683f9e0c744019e1e76cc53fb4b909e65b7d9fc16bf3ffaa6418b8c35521e2a6a6fcd043f615e8021a365107
 EBUILD netbeans-nb-8.0.2.ebuild 4927 SHA256 7531e50c4d76608bf925efdba4f54f522de3a8ceeef4d48807fb4ee48bfabdf6 SHA512 925734f331cf228066c5c9e614f48b756af31cac8b559cfe756347b6a2cb0ce362c7c41489a25084f2ed3f2e415baefd148a54f39fc00269fb14179efe056cb9 WHIRLPOOL e3224c5f22bb8e4792a5f98bbe819e071ff18c99533ce05a3fc1c5898ddcca1e3ce34487ba78159bb4d60155acdf15ae4fe81189ff2d5b1bc77ffd9ee4e20aca
 EBUILD netbeans-nb-8.1_rc2.ebuild 4952 SHA256 7e7fd653bb309c4acbc812e3e4659e0f3f67f943ceaebfdea0e9ff75c2e71174 SHA512 59da938007782e139e0946ef8da1fcb49d2d6d993953222cd2540b0506981279c0f3ad6b9ccaba89af185f4fc9eb7ed23ec16e66c066c22541fe371384eab59b WHIRLPOOL 2be8f9f9cc42829865f393f4a641b73053d460da5c3bbe45bdf470ffd0c519e76af9e4712f0142d0c018801d003c347bcfb4fa99ff1e3a95bfebe8f1e0f02f2d
 EBUILD netbeans-nb-9999_p20150914.ebuild 4997 SHA256 b732bb9b9e9f525270f0f99f8975a6dcb82c07a6eb04ef2056c5afc387256bb7 SHA512 9275d710948861173aed8f0e37b5195684a7322a8ae4a21ff5b53647ce3e742b9d7c3eb3d1ae2562de2f72c6c948f3fb4f3da69f8ebac3acb3118422c03cd076 WHIRLPOOL 202450d4b7ab806dfe7e89958f9b2c998f189f48eb327532522f922040b38eee747351d055c97c29448cecfa674ab3332edbde40b15dd1ce741b8ab36697d5d3
@@ -62,4 +63,5 @@ EBUILD netbeans-nb-9999_p20151019.ebuild 4997 SHA256 aae5a9e0c85307179cf1a93f656
 EBUILD netbeans-nb-9999_p20151020.ebuild 4997 SHA256 9de1dc3e412e0221882d29d7c5fe185864b7cd18da96967de4c0548f8382c0b8 SHA512 e60354e81cd6278f54d71eecb07ad618cd8f9cc67e477bd4b4147ade941bb1316d39f05803dcd5e0ec559f075f2e1322909193bccc814722eeacdc5e074f3c33 WHIRLPOOL 04317326c50a78e843c281a4abd0e53cf1183fda10035a9ae3e120500a20b9a0a201ba990b184004635608a6fbccf6ef54a3ba0eb9fb3109b5c54a677405ed06
 EBUILD netbeans-nb-9999_p20151021.ebuild 4997 SHA256 18d9c7664c8a0426a3acdc46631c7830871e4582f4a869665c52522a12935a34 SHA512 0e04722f14fa109387d872adb91632819c5c16c91423e1d2fd656b24983e06ea3e144753f57c487559cbc536c2697aeefa3af56c73f5ea6b88e80148733edba8 WHIRLPOOL 9f4cfcbb2153b7a33866351e78151d74722db8af1a43ac52bff1470847a8e8d895036ab8c4ff0dda609d5ad0772f8686643b5df5af5f08f1af0f7edab94a75d4
 EBUILD netbeans-nb-9999_p20151022.ebuild 4997 SHA256 89df804a96cdef9701d3897bc135ec3d013e11d8153ca4a2a722511085709904 SHA512 debdddb74f9f74b303093ef594d78999a949b7793928a4830b1e3bd8a2b2ae17103b59a01376d10a4d094490bb99f9e158c39d3eb730c5bd14c17c790ea1b89e WHIRLPOOL 440fbc7759cac4c402b3132b9f72b04d6f956821f65ab659c55a20b56fd146574dc8aae3406a87fbdfe763eb0d73ed8ceda1bd2538e18478b17b9e44aa9c9119
+EBUILD netbeans-nb-9999_p20151023.ebuild 4997 SHA256 a019648553d26a99f7d6cacb24ea03d0cee5c89c2ca8aa64b84f8eed13a4f898 SHA512 c1a94d8fae78d61568726bd2ff5d6fe1f2a318163b0bdf64a5a57554bd0dea8d5403f7130c50cbb36802b537a39c40fb9d2a48518a4572e3b86c2163ced03a59 WHIRLPOOL cfdb1feab91a19ff728f5b7e1699c44d62bce02d8d7032f44256bf267f02871b25c5a2e203bd2ae8a8728b74c88d50bbf8b22671fe096f0b9a2e27b3e871b894
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

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

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index a73dda1..b614c86 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201510190002-src.zip 208635309 SHA256 ec26fab3d6ab19
 DIST netbeans-trunk-nightly-201510200002-src.zip 208646929 SHA256 58578f52d853065ed01442ec329d3a91610faaaea3f83253aeb4db125be71442 SHA512 8c0715828885c513dc12d391a202f1f3ccfdba9107dae60752754568369d68670ff088aaa5b550d7ef9f45a97048de5ffcc80cbcb4b59fbf9e8aba0a710a6bf9 WHIRLPOOL f36c658d37b39d0d9149ffaf3c4266a3fda14644b950216733054fa16a219ae16dc41355c44142cb14158aac60f205d29ce795e790a1ae01964847fb8e926678
 DIST netbeans-trunk-nightly-201510210002-src.zip 208641929 SHA256 b523c444d1fe7afb064c64225138aa795ad8ac9c0c25fef7d02bb534d2c54d4f SHA512 eed12ef2835ce6dcfb725bbacbebfde24c1893f7a67ebbb27a52e1ac907634cc562263de47e0115f620f45ca47874c833853965f3732569e65cc0213221a6fde WHIRLPOOL 0b8259848754750bc130a187e6e930effd66f765f6903fe7adab68e37be8b1048043bbe2cfcdf443ef58bd4d325d270b6900621678e3b1a730f3e41ae7294746
 DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e6871bf9e3601ea50113d123546decc916b02a832c876a07c6395 SHA512 413872ad9ca4ce3806db91c5c5dc137d031e1fa942f8382b02d86f97cf7e51892dfbfafe1751ff49bb76af3b4da10788ef5f46155eb1bd48f0d9110b5e72286e WHIRLPOOL 5b4ad028004e312be5602b1ef201ec9945320bc1345b4674c730f9af8cbbbf6da6f78dcffc1b4c71ffa7c0f8e13414f57c16a976418784aa0fa3d5825f56c572
+DIST netbeans-trunk-nightly-201510230002-src.zip 208659975 SHA256 2b00f5a10b9b57617f41c78adb256ae56e87a104fd88afeffdfe05ae46dec7bb SHA512 ab25742088a602ef44a1e3adec10fab612b100b7182efce801932156094103a2687da00df92a0fe7b6b0b5ca7ee825ee85b9cc84273449a6cffe686b0571c582 WHIRLPOOL e056f4cf9c2634a7ce09f466b722201d05096536683f9e0c744019e1e76cc53fb4b909e65b7d9fc16bf3ffaa6418b8c35521e2a6a6fcd043f615e8021a365107
 EBUILD netbeans-php-8.0.2.ebuild 4347 SHA256 585b2488d748f3d0f87c17c951870e167aac7bf10847428add786e4a8a446583 SHA512 1431305d4f340cb0a2c7c896c54d45f6f02ef82a4201f82053278b98511a5a4a68210317530e9cdf5cf1f495996d3a3f9c4b2c3c479aa407abd375072ab3182f WHIRLPOOL af8476f2ff2d119f2657e6be03cfea1160f86e41bd791f40609f1bc8a8aada46ba1081e4f2417b0fddde931fa4e43d20956c0fe1d4fdf3617b78d01afd23f9b4
 EBUILD netbeans-php-8.1_rc2.ebuild 4372 SHA256 76dac153b77fd368c61ae61aedbda5d9bffd3e713520cfb6e8c6923c6443fd2f SHA512 7a62423b8a60734d337ab08f5a84513ef8246bf2e807b0f88acce1bb64add72cde91739289aa968bd1eecff64a78f4c5947f6e722af7509fb3c9d93f57ee72ac WHIRLPOOL 1effeb1eba78584a32d4b763804cca16383715029247bfc3569ee3e06135dc03cc65425a8769b0ffa259672fd20909699bda99833a9024a924b408c93f4befb1
 EBUILD netbeans-php-9999_p20150914.ebuild 4417 SHA256 62e159a5b5c0c29209b706551be320ca84450dc78e29154daf8edb484976b8d1 SHA512 e52ce209b828467b94ca3436c94bfdb120bb214aa49c598f6f296cfbca0a7e21572e9982d450725d9d851a089dcbbf9d19b33bb358aacdcf7d0e5a21a2a55078 WHIRLPOOL b82b7d0d8c002a4a61e67f8061e49e1900462a73126513c47016ee20ead9aec304db025eeeb10c425a49ce0ae0d422f43af78c014ff17c113c33e5aa1b61167f
@@ -63,4 +64,5 @@ EBUILD netbeans-php-9999_p20151019.ebuild 4417 SHA256 134c67ccb6d4a4f117eca9e7f4
 EBUILD netbeans-php-9999_p20151020.ebuild 4417 SHA256 208c7fa12dd52de0ce78d242a9f427ba5b41adfca6cb259fad7fc4ace2df820d SHA512 3f73c670d6dfe34c28379c6e107588c293bd283b5de32089c83f8c7770baf9b1e53a284ad62c82b96df9590e08b8f45653a679603326a005063242bbf510b1ff WHIRLPOOL 7014632a49417d2062092a771c83b140d31b2eb6586673af3c766fff1d8afbca1b749b1866a407378f9757621ccce816c19a08eb12a50d52891ec1c6fc3776fb
 EBUILD netbeans-php-9999_p20151021.ebuild 4417 SHA256 b24ce936662554673be3aff8ea5336e6fdab67b224387562f745e83b0db07c0a SHA512 925de49261031fcf5746b890b978a6c14fe33a8b9a4505fa32dd8db8667f7000ecf7e68aa507619b7bc96020167295f4b878798b69675cd91702142ac09e3f8b WHIRLPOOL e3ba0851bbf8eab5d9a0007beed75e16943721d30db70c2ef2aa7c2bd8e99ed2d45844ef4bac9c53e6e069a205772563abaf0e242c3fce56e42b24d41b7a3def
 EBUILD netbeans-php-9999_p20151022.ebuild 4417 SHA256 eecba5b3b17ecc48e5d37ed05da4c746b8b89447ee52ed6de0539b2ca40e3162 SHA512 28c76bdac0036e20abdcb72d3584c8cf598a51a2e5edb0f6ec76140ab41ca1a71e8dfeea002a55a4e7a3e4d778cd035cee876e5d5424b8f3adafe6b5a22aedfc WHIRLPOOL 6e5fdc4553d72deb8a695a3457c8b4963e92f0c502db34532f6483ed183bc01c31398770a743500e59d3fa2a82ae0c3695018756788976d434aa25b2afaade0c
+EBUILD netbeans-php-9999_p20151023.ebuild 4417 SHA256 d4e689e087317a6ee7579699cc3d19857bf44fb847f58e7930a1d7cfcb1a9bd5 SHA512 69637c9af4433e393bac57e77288657e9822c636e9413200b985df160c9c6efa1a0c0afcc420960b192bc047437242fffa0c909647e7cf72f4b5496e92a6705e WHIRLPOOL baa741f2dc91bc2f8688344377cc6a75b6c2ce7c1459eb5ac80b158f6886b977a00f266052245deb5fc2f5f9982166fc4076583f29fe9fb1c920549a95551f93
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 8e662eb..02c63ac 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -54,6 +54,7 @@ DIST netbeans-trunk-nightly-201510190002-src.zip 208635309 SHA256 ec26fab3d6ab19
 DIST netbeans-trunk-nightly-201510200002-src.zip 208646929 SHA256 58578f52d853065ed01442ec329d3a91610faaaea3f83253aeb4db125be71442 SHA512 8c0715828885c513dc12d391a202f1f3ccfdba9107dae60752754568369d68670ff088aaa5b550d7ef9f45a97048de5ffcc80cbcb4b59fbf9e8aba0a710a6bf9 WHIRLPOOL f36c658d37b39d0d9149ffaf3c4266a3fda14644b950216733054fa16a219ae16dc41355c44142cb14158aac60f205d29ce795e790a1ae01964847fb8e926678
 DIST netbeans-trunk-nightly-201510210002-src.zip 208641929 SHA256 b523c444d1fe7afb064c64225138aa795ad8ac9c0c25fef7d02bb534d2c54d4f SHA512 eed12ef2835ce6dcfb725bbacbebfde24c1893f7a67ebbb27a52e1ac907634cc562263de47e0115f620f45ca47874c833853965f3732569e65cc0213221a6fde WHIRLPOOL 0b8259848754750bc130a187e6e930effd66f765f6903fe7adab68e37be8b1048043bbe2cfcdf443ef58bd4d325d270b6900621678e3b1a730f3e41ae7294746
 DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e6871bf9e3601ea50113d123546decc916b02a832c876a07c6395 SHA512 413872ad9ca4ce3806db91c5c5dc137d031e1fa942f8382b02d86f97cf7e51892dfbfafe1751ff49bb76af3b4da10788ef5f46155eb1bd48f0d9110b5e72286e WHIRLPOOL 5b4ad028004e312be5602b1ef201ec9945320bc1345b4674c730f9af8cbbbf6da6f78dcffc1b4c71ffa7c0f8e13414f57c16a976418784aa0fa3d5825f56c572
+DIST netbeans-trunk-nightly-201510230002-src.zip 208659975 SHA256 2b00f5a10b9b57617f41c78adb256ae56e87a104fd88afeffdfe05ae46dec7bb SHA512 ab25742088a602ef44a1e3adec10fab612b100b7182efce801932156094103a2687da00df92a0fe7b6b0b5ca7ee825ee85b9cc84273449a6cffe686b0571c582 WHIRLPOOL e056f4cf9c2634a7ce09f466b722201d05096536683f9e0c744019e1e76cc53fb4b909e65b7d9fc16bf3ffaa6418b8c35521e2a6a6fcd043f615e8021a365107
 EBUILD netbeans-platform-8.0.2.ebuild 5406 SHA256 98e9861da45ead0d2d975a0527315df5282870b2d7e71a089724d91c18852e81 SHA512 cadbe66132d3ad81f6d149e20731b558c11c529e2ec15b1fe47ff97d99a3f4b4612fa5c98c435c4ff979eaefab6702721db009a03162202c96b4b411cf9f872a WHIRLPOOL 9552948e8bbad308f4379eaae69d8c214da9fbfab87d75226949b69ddca3e68c2d36c4d05738196073e5b959ab0b764064c9186d421198937122aa4bdc4988dc
 EBUILD netbeans-platform-8.1_rc2.ebuild 9337 SHA256 3c257f2aa4574f4ec2cdcfee98008ed97c8ad08acaf27e4a19a11d6728154bec SHA512 d09eaa53c2a8f7162335ee24832b41c3a5d044f2415e694b895253baab7ced21300cb1eaf509720b261070401fbe71c2f629545705bb4bd41512f12cb432bc4f WHIRLPOOL d36468c532d27fea2d4718a3780175e81e1d2f5df2a6e1bf9a4bad6ee6b2c1f7a7e845a23128d3a5354031970fd6bc2eaa683fe3033b847ec966e9b8db0c4aeb
 EBUILD netbeans-platform-9999_p20150914.ebuild 9382 SHA256 d7484e54be1695327a998c284835af5647524c0faf30647e203482bfc2b42a9f SHA512 d2437197848e0cb0cb15ac5162d3d8118d84596e2029bd6856f22b0632a084c96744493c5f6e21ee6538b6673ee5a98fc776935c0db4c832ebae72053d46adbf WHIRLPOOL ddcaf68172239149f7587eb6f0958103bf1f81888b3e2564c8efe5ae78683b812add70312c84c0e8252daebd6f6d60daebf462db111e2932618f60ef06f5fed8
@@ -83,4 +84,5 @@ EBUILD netbeans-platform-9999_p20151019.ebuild 9382 SHA256 3709e97a9fc66b35cfc99
 EBUILD netbeans-platform-9999_p20151020.ebuild 9382 SHA256 db617dafb475e4324a21b071b145e661f9a79d786e95e7f396234d29308dc595 SHA512 5fcebabf4c0035b7ab436ca6da2ddf63a19a3d1f91e87193a0dc806b25d03c0f4e406b43232460bc4f54155a741d975b77dbeb2ec621a300276dae0b1b2f3033 WHIRLPOOL ec49b99816e734a41606e73d3d5bfbcdddfb9bbe73e667b5596919696f683ea37bbe8fcfc118ab63be48029de4708d4315944c38e98891a07e635634de7c8e0a
 EBUILD netbeans-platform-9999_p20151021.ebuild 9382 SHA256 d9742a3110a5b22b89e4329b9412db78682613b582e782a2a9813768948604e4 SHA512 fc2fe7c58772ce0ade11802e35e777bf91318e3a6b1d10dc66378e36fe310d36db8c51c575b6830eaf5876b2e6fee8a86b19e57ee6e9f1d2dd106f50ab4a8c78 WHIRLPOOL 21ec9e4973de328392a4b7ab8e850f3389ffdc642f120749ba35cb0ba80d5c7db08c8f7f378e97bdf6460c0e14d39a05b638af66b72e6422855cedf4131261b7
 EBUILD netbeans-platform-9999_p20151022.ebuild 9382 SHA256 1eb19a322dfc7d6dc8f1bb971253b41957503406af7c41eeb24c68b675fb7106 SHA512 4eca2fce825c4c4b6153c3808b68772c50c4f4e665d37ccab33b81b95cecad54b2d1979252c8b77ce8fc91599421bc974e995dd7a03af4e633d110254da13337 WHIRLPOOL a0f1a07c99ccee9cea1282657c855fee70aeef72487816d23f5f4874795ad27d188987f0babda4f74dbf5bdd5db8f1a3ff5056aa709d62f2a04bfe2758dfde9f
+EBUILD netbeans-platform-9999_p20151023.ebuild 9382 SHA256 bdd859e874772ec7177df97053f3515fffb3db92461cf7158df0382d2221d915 SHA512 7362660208aa4fae0ad17b282404629608b622b38e46d06a97d7f5d722778e7a5b4b7452f3cbfe323d46665a265b4b4dfb2232c2e28a78c764f4b0d2c5bfc2f6 WHIRLPOOL 048c0791018301910e9d792aa585e0820be159aae1fb491ca3db11b200de070b478bb6a7e6bdb3ad41d95385c8025a0a324a9bc7284427ab51bc23fb3ddfbebc
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 2079215..7f26d43 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201510190002-src.zip 208635309 SHA256 ec26fab3d6ab19
 DIST netbeans-trunk-nightly-201510200002-src.zip 208646929 SHA256 58578f52d853065ed01442ec329d3a91610faaaea3f83253aeb4db125be71442 SHA512 8c0715828885c513dc12d391a202f1f3ccfdba9107dae60752754568369d68670ff088aaa5b550d7ef9f45a97048de5ffcc80cbcb4b59fbf9e8aba0a710a6bf9 WHIRLPOOL f36c658d37b39d0d9149ffaf3c4266a3fda14644b950216733054fa16a219ae16dc41355c44142cb14158aac60f205d29ce795e790a1ae01964847fb8e926678
 DIST netbeans-trunk-nightly-201510210002-src.zip 208641929 SHA256 b523c444d1fe7afb064c64225138aa795ad8ac9c0c25fef7d02bb534d2c54d4f SHA512 eed12ef2835ce6dcfb725bbacbebfde24c1893f7a67ebbb27a52e1ac907634cc562263de47e0115f620f45ca47874c833853965f3732569e65cc0213221a6fde WHIRLPOOL 0b8259848754750bc130a187e6e930effd66f765f6903fe7adab68e37be8b1048043bbe2cfcdf443ef58bd4d325d270b6900621678e3b1a730f3e41ae7294746
 DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e6871bf9e3601ea50113d123546decc916b02a832c876a07c6395 SHA512 413872ad9ca4ce3806db91c5c5dc137d031e1fa942f8382b02d86f97cf7e51892dfbfafe1751ff49bb76af3b4da10788ef5f46155eb1bd48f0d9110b5e72286e WHIRLPOOL 5b4ad028004e312be5602b1ef201ec9945320bc1345b4674c730f9af8cbbbf6da6f78dcffc1b4c71ffa7c0f8e13414f57c16a976418784aa0fa3d5825f56c572
+DIST netbeans-trunk-nightly-201510230002-src.zip 208659975 SHA256 2b00f5a10b9b57617f41c78adb256ae56e87a104fd88afeffdfe05ae46dec7bb SHA512 ab25742088a602ef44a1e3adec10fab612b100b7182efce801932156094103a2687da00df92a0fe7b6b0b5ca7ee825ee85b9cc84273449a6cffe686b0571c582 WHIRLPOOL e056f4cf9c2634a7ce09f466b722201d05096536683f9e0c744019e1e76cc53fb4b909e65b7d9fc16bf3ffaa6418b8c35521e2a6a6fcd043f615e8021a365107
 EBUILD netbeans-profiler-8.0.2.ebuild 3402 SHA256 8021dea620d1bc26214ff0ec285f8061c24693dd28a62a97a48ac3223707e920 SHA512 2660390337a973256b1aac3a02b14e16782c230fa2714ae695213b0cabc0eb60621c6a1ae234f9e57259a19de22a87447f9a89ab846bd59bcedd2be313c35072 WHIRLPOOL 5d1053ded03143b2de05b64cfbe59b515cb786d60bfa65566be795567bfaf5feb88a2f8e7161a05da512fafd523f871778d5ddeb3c6b89fc95885096e379f65d
 EBUILD netbeans-profiler-8.1_rc2.ebuild 3427 SHA256 a142e156521746287b96e62a067e8a1fa3c6d1545a5528e2fd210e1b9c703906 SHA512 e2c864258c2dee2cf734ba2654c88c80c7a4f5a141a12370dae16c9a90609e0e84a0469ccab6925edb809e2bd192974372d5d4dcb69f3caeaf184a9c47fe0262 WHIRLPOOL 92fcf803213ad769fcf9df2bc8fc801423b222a727bf95bfabff28f38c8d1ef76c4a3193fae5f5a2b64d9a043e5bd5f42dd0cef165067ba94e8dc5fc9aec0312
 EBUILD netbeans-profiler-9999_p20150914.ebuild 3472 SHA256 70e6661ae19b9266a061eeae848bfc222db8ce83c0e63637938067ff772faaf6 SHA512 9a453a6ddb59beeff6c76e35cfd583c9d96aa0a6cb3ffa76bcc954289dd10b37e8217c06e5098b0b7caebf839ae6f3e6cc8debd0965f0ed465add1a4ff0b952c WHIRLPOOL d9716e833060942bb6ed623db92d0c8e4d9b7a0ba3a469202a2231cf3e284ebcaf3b003e267a51a515e302bb230a342341d34445690e2402a02584f71c7d2e05
@@ -59,4 +60,5 @@ EBUILD netbeans-profiler-9999_p20151019.ebuild 3472 SHA256 eace79d3de272258ef900
 EBUILD netbeans-profiler-9999_p20151020.ebuild 3472 SHA256 2b1993d329fe5afdea67c7e24a85fafff444cd7c28b57c9caf5c62b1ecde78f1 SHA512 db24778ecdb2490041c2ec371f94bbe417d1e2712ee1cd43b39b069f3dec7d87b23c494fbfe85408f7d202caa8c3e8761346070d07bb51233d75c24cc623b206 WHIRLPOOL 48caf83a0980a80af45609c9067e4c7f3df4f78f405fe2b545a14a63abf3fad1f316181767f1da3f5b945eaf0bf566ead544ad18516604c5fdc2099a493b7f04
 EBUILD netbeans-profiler-9999_p20151021.ebuild 3472 SHA256 03f58d3f6e992c1274fdcc0025c4fa32f718075f0e5225589a6873a0a2d64c7b SHA512 963d342afd85e0451a1bfcc72f94fd77b3f166bd38bb1b03f1bf414640aaa901167fbccc622d71a6c3708cd1eec278501acebe5271352ff65b0a6c3b8c5fa11e WHIRLPOOL e976cace69d324d27c8fa2ce56239d884d2a673c4c341aec1748a7743f8712c6395c9bdc7121750a62f6751d37c194207b08dc644540aa4e0fd0a59f90c47289
 EBUILD netbeans-profiler-9999_p20151022.ebuild 3472 SHA256 f33a9e9eb1f2a2dce32855a61ec417a3ff6c835b011492d83c66fa884c0f0179 SHA512 740a39b644677e35195cdc9e83afeacafe8ea0e76a4e8e8c4d3fcbbdcadaf675a4e99e8ff713892587cd3fb0e7d7e06e207b17a3abb39914b4e32cdb7a1d37c2 WHIRLPOOL b25ef4c55c9305654175af0bb700c3796858dc836f3868f3a6ade3b7455f643c46819534170e90a82efffcdf98ff37f33827f8e556a3641343bd46f162c8f228
+EBUILD netbeans-profiler-9999_p20151023.ebuild 3472 SHA256 db9fa42496eda2d8cc23427678c2598e2de86cd2680d730412d7c1ea07221bd3 SHA512 58fc9ae2ba039022662c6ab3b0c0a0d9ee8857c65be1195e1b2fd1f057f62ca048b138721ed2a226de18adcca40faede0ad88e492267ae8825a6e2042f5d1ebb WHIRLPOOL 980a53cd03c3c9ee83e842b796d18d240fb170fa301379cba179ef50ebcacde26ce820a714e2a19547ca37759df4425a2e5d1875632ec80b11e7b3f6a8553acc
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index c6a31d5..87700c0 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201510190002-src.zip 208635309 SHA256 ec26fab3d6ab19
 DIST netbeans-trunk-nightly-201510200002-src.zip 208646929 SHA256 58578f52d853065ed01442ec329d3a91610faaaea3f83253aeb4db125be71442 SHA512 8c0715828885c513dc12d391a202f1f3ccfdba9107dae60752754568369d68670ff088aaa5b550d7ef9f45a97048de5ffcc80cbcb4b59fbf9e8aba0a710a6bf9 WHIRLPOOL f36c658d37b39d0d9149ffaf3c4266a3fda14644b950216733054fa16a219ae16dc41355c44142cb14158aac60f205d29ce795e790a1ae01964847fb8e926678
 DIST netbeans-trunk-nightly-201510210002-src.zip 208641929 SHA256 b523c444d1fe7afb064c64225138aa795ad8ac9c0c25fef7d02bb534d2c54d4f SHA512 eed12ef2835ce6dcfb725bbacbebfde24c1893f7a67ebbb27a52e1ac907634cc562263de47e0115f620f45ca47874c833853965f3732569e65cc0213221a6fde WHIRLPOOL 0b8259848754750bc130a187e6e930effd66f765f6903fe7adab68e37be8b1048043bbe2cfcdf443ef58bd4d325d270b6900621678e3b1a730f3e41ae7294746
 DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e6871bf9e3601ea50113d123546decc916b02a832c876a07c6395 SHA512 413872ad9ca4ce3806db91c5c5dc137d031e1fa942f8382b02d86f97cf7e51892dfbfafe1751ff49bb76af3b4da10788ef5f46155eb1bd48f0d9110b5e72286e WHIRLPOOL 5b4ad028004e312be5602b1ef201ec9945320bc1345b4674c730f9af8cbbbf6da6f78dcffc1b4c71ffa7c0f8e13414f57c16a976418784aa0fa3d5825f56c572
+DIST netbeans-trunk-nightly-201510230002-src.zip 208659975 SHA256 2b00f5a10b9b57617f41c78adb256ae56e87a104fd88afeffdfe05ae46dec7bb SHA512 ab25742088a602ef44a1e3adec10fab612b100b7182efce801932156094103a2687da00df92a0fe7b6b0b5ca7ee825ee85b9cc84273449a6cffe686b0571c582 WHIRLPOOL e056f4cf9c2634a7ce09f466b722201d05096536683f9e0c744019e1e76cc53fb4b909e65b7d9fc16bf3ffaa6418b8c35521e2a6a6fcd043f615e8021a365107
 EBUILD netbeans-webcommon-8.0.2.ebuild 4723 SHA256 e2ba39cb6f22c990acf9a492eac5707f130382d56f9bc1e3636e82cbe4d61938 SHA512 61955d38f829b3ed54bc5cb9a71da07f05676a2bf7219fa8073aeee0f0e2d0e73f7aa6ec1636be39fb071d3d2b9de7ceb813a247a61961874f4cc78697d4e568 WHIRLPOOL 1a272650fc2394716a790b79cb85a9322929c7cc96ea4776cc639fb869c5b536140dbdc632b1a8aa9cb1fc8e740050125c2ebe9390de7a8f4207e88e24924206
 EBUILD netbeans-webcommon-8.1_rc2.ebuild 4946 SHA256 62c9421fd1f005d264d6c6f4eb6a0da4ba51fab3b6367b8128e543f24ef10242 SHA512 d38f9ca1f9a6671f7404a456544e2ea85f9261d6f011edcbee25c0ed829cfc751dd4a62a46db8081f23ad2bb82be1af2b0885d5863e6cd0f2be94073d2bc7547 WHIRLPOOL 6cc61860487ab3ed2b7db33ac73ce4df96dcbb739316f5b2cd0d0135be4ec9f5d4f3f8025dedf62a612b23dd7403d9fc9366848b8b8fe9311e8c2425099d1eab
 EBUILD netbeans-webcommon-9999_p20150914.ebuild 4991 SHA256 effe63f53cba64c97aa72a551076e34370fc9c828dd714532f49d53de98236d6 SHA512 b9387c353e55afff01908a5215806a4ea00d84523f61dd61d546c62a3eb2cf16b23d9b55558dd3bf5d2afdc789c79ad92329189bfd8f6a61c2578ba70444d5f5 WHIRLPOOL 7f86faa1190f131fa6496a2ddfb3fa8ace8b59f76a834f6b5aafe991530ebc6326c67610f605888d490894a47908a627ffaf5126fd7f23b896732add9a26f3ed
@@ -68,4 +69,5 @@ EBUILD netbeans-webcommon-9999_p20151019.ebuild 4991 SHA256 2adcbca8db36c998c90f
 EBUILD netbeans-webcommon-9999_p20151020.ebuild 4991 SHA256 d0ec398501285ef079063a9136b13a1cd191a422b54a035e2c3dfc4ba7603b31 SHA512 480a3b051ef36de88a023d53f764b522dee66ec02d1acb730d43cf4e8dc7f3f66690ce847fb3ce37a2f8b0234a0fc9fef3e6683ca40f858cd2dd0df1eda15687 WHIRLPOOL bc2873d5be22616d0327e9f40bc721549b75f4bb4d2288ab415ce3a5ec18c77ba0c1e8d9dde7524d0efac71142f95fc68fb951c0a786eb40dc22fec52991d4cc
 EBUILD netbeans-webcommon-9999_p20151021.ebuild 4991 SHA256 e1bcd977700d48aa2bb75b738ecff755fc24723d4152d0acc832a2b8c2d7311f SHA512 26df77097e720f8fa8cda7b666f64998f0851eb5cc4d7763974b4a09e863a59827efe68f76fef434685ffae7b5f21c7367d5713d3318547efc588606b4595b64 WHIRLPOOL 7d54f163d3939bba0ddcd256ec91addbe063101cc8d8b1dcfd7e08d586d52cd9b0a2e19d08db316d916ba97066b6989772e2231c0c73f67fbb57434b14f95a7f
 EBUILD netbeans-webcommon-9999_p20151022.ebuild 4991 SHA256 b1a14475ee0025e7b750d8779915750c7b30d1bbd79513f536a21fecd237eadf SHA512 dadc81d7405fd4bee1249583ce4102a1193c959825e261372a8ce561a6b6415712dac13b1a78ac3f808d45a771a362c1c8944769ad191fbaa333e1e0d235f7f9 WHIRLPOOL 24a20915e017bad651b8bcab44e107e2ff5ca74925fa5975400f8b94f9339d97cf9ead5e2af7b36bc67fb0e2a01d7a7a1d613a84a2e222bebfe4aec5fe25035c
+EBUILD netbeans-webcommon-9999_p20151023.ebuild 4991 SHA256 b48c23f57b3706974de2b3b0635988d439eada2c15918cae0d15bbda64e99c00 SHA512 b0acc8a0722cdf0bd3c03fab0cce434c5a8f14e015675d634c1b62aff7df1217a6f938f8c1be949adced7c567e85449cdede7cabf76b2ad94e7f8efd208f328e WHIRLPOOL 2e6ab968b57dfeac6c667dc8bf8a5c09e2b8754d901692bb038e2d09b737a54e640b4983a58ea6b7d74c0dfe2e7f35e6d9a88433a9c363090dc9d60d6d8ee7fb
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 1ac5744..6bfb7e6 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201510190002-src.zip 208635309 SHA256 ec26fab3d6ab19
 DIST netbeans-trunk-nightly-201510200002-src.zip 208646929 SHA256 58578f52d853065ed01442ec329d3a91610faaaea3f83253aeb4db125be71442 SHA512 8c0715828885c513dc12d391a202f1f3ccfdba9107dae60752754568369d68670ff088aaa5b550d7ef9f45a97048de5ffcc80cbcb4b59fbf9e8aba0a710a6bf9 WHIRLPOOL f36c658d37b39d0d9149ffaf3c4266a3fda14644b950216733054fa16a219ae16dc41355c44142cb14158aac60f205d29ce795e790a1ae01964847fb8e926678
 DIST netbeans-trunk-nightly-201510210002-src.zip 208641929 SHA256 b523c444d1fe7afb064c64225138aa795ad8ac9c0c25fef7d02bb534d2c54d4f SHA512 eed12ef2835ce6dcfb725bbacbebfde24c1893f7a67ebbb27a52e1ac907634cc562263de47e0115f620f45ca47874c833853965f3732569e65cc0213221a6fde WHIRLPOOL 0b8259848754750bc130a187e6e930effd66f765f6903fe7adab68e37be8b1048043bbe2cfcdf443ef58bd4d325d270b6900621678e3b1a730f3e41ae7294746
 DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e6871bf9e3601ea50113d123546decc916b02a832c876a07c6395 SHA512 413872ad9ca4ce3806db91c5c5dc137d031e1fa942f8382b02d86f97cf7e51892dfbfafe1751ff49bb76af3b4da10788ef5f46155eb1bd48f0d9110b5e72286e WHIRLPOOL 5b4ad028004e312be5602b1ef201ec9945320bc1345b4674c730f9af8cbbbf6da6f78dcffc1b4c71ffa7c0f8e13414f57c16a976418784aa0fa3d5825f56c572
+DIST netbeans-trunk-nightly-201510230002-src.zip 208659975 SHA256 2b00f5a10b9b57617f41c78adb256ae56e87a104fd88afeffdfe05ae46dec7bb SHA512 ab25742088a602ef44a1e3adec10fab612b100b7182efce801932156094103a2687da00df92a0fe7b6b0b5ca7ee825ee85b9cc84273449a6cffe686b0571c582 WHIRLPOOL e056f4cf9c2634a7ce09f466b722201d05096536683f9e0c744019e1e76cc53fb4b909e65b7d9fc16bf3ffaa6418b8c35521e2a6a6fcd043f615e8021a365107
 EBUILD netbeans-websvccommon-8.0.2.ebuild 2651 SHA256 a195b307847c466dbb5f46eb04240358ce3c92cadeecb8fda1562304de46820f SHA512 933626bd2073f58e3508180c042e237b9e61ba6f3c992cf37ea43978ac2fc972d2dcc3ef0b5c390b3867296e197ed2605c43452c98e36acf0982e7338b6d1eb7 WHIRLPOOL c3db8f0b50116d0129f50778e1961166e76601d8c165e20e73d75c91b02c8a095067e0f13e18178d849dd29adcedaeee7d3e0e62f99be592d7ce159fd6af632e
 EBUILD netbeans-websvccommon-8.1_rc2.ebuild 2676 SHA256 9c17f1d8da5dc2d0f744317b9e5e29069ae4a51c6cb08ae5ab3a76d4739f96dd SHA512 a02ca061aedf144a6f7a5dc86371125d7abed807c0e47393de18d4164309d4d5733d869c4ee9577924af1949b95418518e6e8dd1f4bec2938507d6f68ab202b8 WHIRLPOOL 7e07a5d125295dae0cc1d38e162b8225e46e7d668fd8255e74d05a0739bc8204ffd9f192c5a9e043ee1e856057441a2cb7424f2f9b512e659740e27c5ef532a7
 EBUILD netbeans-websvccommon-9999_p20150914.ebuild 2721 SHA256 41de18c1c6beef6483dd0059ae110ab4daef1a6072695a9e6076567a603d0ab1 SHA512 43f23cd5773be7a6e3d2859ce4218271510bb6318adce194edb90fa342e96d89221bb5edd381985dd7dc1ab5d7c3cee02cf0cb72c4c840191fb59c9ab77b2352 WHIRLPOOL e09384741bbe250f95b231eff35d645d77788a7c425909261db2fdf780267d2c92d45fe63583e37f4b086c767a32b1ada38e28c3884b5c4a7e84d8bb2d76c5b4
@@ -59,4 +60,5 @@ EBUILD netbeans-websvccommon-9999_p20151019.ebuild 2721 SHA256 443153a696ca5d85c
 EBUILD netbeans-websvccommon-9999_p20151020.ebuild 2721 SHA256 115ff09c7ff247c8b9ef65d7452406d05c17a740ee65c47948d9930276f6a565 SHA512 27ade14dda248dc3af18dd95798bf50b1bb777decc2c7c19757bac3a23fd6da256cce671acbd5c17c46c3c0ee2713f6ea1a901f5e48e2af74bc5a4c141686666 WHIRLPOOL d663e9681d67ce23e5147ffff7215a00c11a2ea3414ac04d27d7f4a94fb4853a1a51c48005a1cd78aaaf0cb788850315982b39d640cda5d6ad80a69bd6906bdb
 EBUILD netbeans-websvccommon-9999_p20151021.ebuild 2721 SHA256 ce046ae9846e58b532e79316ebb273b4d664408658b4f587f237af3b7028dd45 SHA512 f252fa6dd9b9bb9da91f8d53076fc4784be036b375cf0e6ab58accd5472b90096aec06a7a4e5072dee259b5a6bf7045589c2e54ba23a04480cf5d3e293ebcd09 WHIRLPOOL cee236130568ed4089c9d439794453fcba3a75370b7c82b0d7d4754d2d92a19ca2bc673e18e06723baa4938068d3b514a7811f16be278f4db2466099810a0603
 EBUILD netbeans-websvccommon-9999_p20151022.ebuild 2721 SHA256 81a6b38dc99d0293d3403c66340e6bbe1542382bd4be3a4849d77948dc7f72d7 SHA512 178c75337decbe611cae1d3456fcf5c92cfa16ec554ed841c97ad84e462af8db33ea488fe21cd8fe9db41483fdb3808a808de3f5a512dece8c5c3fd0d3b982c5 WHIRLPOOL b737fa34d4babc81e05fe98cbc2611758803f303a5b28f366d1bdd9ac0b1d769ac25c440652363e412b4637f671457f653ae2747542d80d94c3fc479a9b402d0
+EBUILD netbeans-websvccommon-9999_p20151023.ebuild 2721 SHA256 5f27ee5471e117854cb9da98e6ef3f06e6d4712307d22cd3d73b8298ea326ef7 SHA512 4df771491151058ee9f0791e4dc7d2eef21991cf021745b6c66d42ee05ffbe289db576c6237770331fcb9e9a565f119dc7027b1956f738cef3b61407d47d626c WHIRLPOOL 3e4e1ead6d4949ec3f8e7fbbd585a5d7c35331a10f6ba513d7707e27379fd9b576909df6e2f927c6f4c539e9ba979d4ac041406e1278106fa3e36f1a03fdbe2f
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index dadf78b..649eeb2 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201510190002-src.zip 208635309 SHA256 ec26fab3d6ab19
 DIST netbeans-trunk-nightly-201510200002-src.zip 208646929 SHA256 58578f52d853065ed01442ec329d3a91610faaaea3f83253aeb4db125be71442 SHA512 8c0715828885c513dc12d391a202f1f3ccfdba9107dae60752754568369d68670ff088aaa5b550d7ef9f45a97048de5ffcc80cbcb4b59fbf9e8aba0a710a6bf9 WHIRLPOOL f36c658d37b39d0d9149ffaf3c4266a3fda14644b950216733054fa16a219ae16dc41355c44142cb14158aac60f205d29ce795e790a1ae01964847fb8e926678
 DIST netbeans-trunk-nightly-201510210002-src.zip 208641929 SHA256 b523c444d1fe7afb064c64225138aa795ad8ac9c0c25fef7d02bb534d2c54d4f SHA512 eed12ef2835ce6dcfb725bbacbebfde24c1893f7a67ebbb27a52e1ac907634cc562263de47e0115f620f45ca47874c833853965f3732569e65cc0213221a6fde WHIRLPOOL 0b8259848754750bc130a187e6e930effd66f765f6903fe7adab68e37be8b1048043bbe2cfcdf443ef58bd4d325d270b6900621678e3b1a730f3e41ae7294746
 DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e6871bf9e3601ea50113d123546decc916b02a832c876a07c6395 SHA512 413872ad9ca4ce3806db91c5c5dc137d031e1fa942f8382b02d86f97cf7e51892dfbfafe1751ff49bb76af3b4da10788ef5f46155eb1bd48f0d9110b5e72286e WHIRLPOOL 5b4ad028004e312be5602b1ef201ec9945320bc1345b4674c730f9af8cbbbf6da6f78dcffc1b4c71ffa7c0f8e13414f57c16a976418784aa0fa3d5825f56c572
+DIST netbeans-trunk-nightly-201510230002-src.zip 208659975 SHA256 2b00f5a10b9b57617f41c78adb256ae56e87a104fd88afeffdfe05ae46dec7bb SHA512 ab25742088a602ef44a1e3adec10fab612b100b7182efce801932156094103a2687da00df92a0fe7b6b0b5ca7ee825ee85b9cc84273449a6cffe686b0571c582 WHIRLPOOL e056f4cf9c2634a7ce09f466b722201d05096536683f9e0c744019e1e76cc53fb4b909e65b7d9fc16bf3ffaa6418b8c35521e2a6a6fcd043f615e8021a365107
 EBUILD netbeans-8.0.2.ebuild 7167 SHA256 80e31382a0ceb680c2a055dc5c78c1dce8edf32c50bbae6a1c14a2c568492519 SHA512 0ab466ca247ec953896ef0ab3b01b43ffea3a9f37e9bcdacecfc0476226d45cef35e4ddf27f2b85628d9512ed304e6cc6cfe963a5e547217d08cad400eefc4b9 WHIRLPOOL d09668e669f4f8d7987ab02cf26104fc6e54ba29b8b497fe0013cc8816a2d7560c99e6e1b02db77ead872d5240b84c09e3fabbc3465587d1d1ca7d6fcae114c1
 EBUILD netbeans-8.1_rc2.ebuild 6892 SHA256 aea23cb4a7170da766bbc225c6b58e671a5ab08e095044ebdf36b195d86610fa SHA512 77a9c3d1c82648a0a5b9b335f577132013724ac37e29f99bb732653321e861f5628c9a8689d4f9196f3ebae1cc4cad569dc3b1a7f4c7a127f363ca82099439f7 WHIRLPOOL 023da0938e5f8b74062bbcabb1b0e659d093f5860f8e82322339546299a154d7b57c78f1bb4f28403a6a5ca45d0bf1f1dcf1fa2669423cba465a68ab6c08008c
 EBUILD netbeans-9999_p20150914.ebuild 7210 SHA256 97559b1aa14f762847a1866723d6fba2265203b61f390e3481c0cd68bb0a654a SHA512 12555ef853b5f47fb74f6c1974bb2f894f3d82897d980ca5fa5d1ea17273a52db382cccf3b1b0b80a97f870c5622d750f0dcc4da30b87153749630bba797eeab WHIRLPOOL 30cd5c2fcfca12b002115631d708dac0330ded807dfdfb5fb38d5dda9a275d204e5dab59745fbf95aec218acdcadf95b9408fda9e440405d4c10a90e1961137c
@@ -62,4 +63,5 @@ EBUILD netbeans-9999_p20151019.ebuild 7210 SHA256 5a6cbfec486deb344c00375590458e
 EBUILD netbeans-9999_p20151020.ebuild 7210 SHA256 a6b6f167d3b234a13eda7a8e03cf567afed94db4b32b53507640ed566e476909 SHA512 5f58a49a0d4ef7bb7dec98279eac950a88aa9f58f6c4f0a15b50c1b894211eceac8a4e1bca24d38ac6a1c1932678b73041a86d6818057afa24d0fbd503ce2546 WHIRLPOOL fd11fe87d841ecab50b36276d770a2e4b52566d6346cb92a69f22d606f9519c6a7cd244185e288dd9bc76ca08a2aef383576ff397df62d9085aeb2c09f0f573e
 EBUILD netbeans-9999_p20151021.ebuild 7210 SHA256 225a9d7b7600ee198486923f2b80170effa1c05ec5bd1a7aefb10e2deae73317 SHA512 9713857940ebee5a03afcb484763ed83fa2748961b7560eda427ef2b1814bbe8ee556a6dae348078c29f9573ad28166f6abdb16268ab6a30e65c9464d5a2c0c7 WHIRLPOOL 3eb5986ee7273d958e8610cfa8d81911c540e38e3a9c1f66c9e63a5fec62c67aee616071390fdc3e3643e8f8ccba23657e4dc4d9ccdad655c69b9028a6d3cc0a
 EBUILD netbeans-9999_p20151022.ebuild 7210 SHA256 cbf3546da7aa887c4d4a63d35c24bd6fddf63ebce42f3283b78c4c0fc92ae1c2 SHA512 20ac86f818714ac1c4b2e4f09d3b1ddb8b062d16505cc4b91ab826521509986193643f0b1db81254dc3b39d2d9687448d361bf565123153e9d9db3b45f966c41 WHIRLPOOL 4b73a12dc9742d515e5c1cf79c4d276f3dea57576f0143c542a4b04d3f4d386ffec2ed8383c17b2297d43a89d1b861f0a288e20f843be30c749b5f2a9c31be41
+EBUILD netbeans-9999_p20151023.ebuild 7210 SHA256 c23453db8a4b75b7b4cc5be8f686a53e473adb941c2956fd890904de9ddcc703 SHA512 6e39e33bccae36f191e9b00d04712bcf4dbb530da1535ce43eb62ad3094271248777396145ab002e30fa6516aba279943f4e4598a06e6699af98d42284154724 WHIRLPOOL 0ce5bbf592b6104252efd0ab405abcb86c27b7aacf3fad52f974a55f811ddce9285994bf53f6e10bbf49dc879546d739a6b0175415f004cadf3316f2a6f08713
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

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


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

end of thread, other threads:[~2015-10-26  9:37 UTC | newest]

Thread overview: 3+ 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-javacard/, dev-java/netbeans-webcommon/, Miroslav Šulc
  -- strict thread matches above, loose matches on Subject: below --
2015-10-26  9:37 Miroslav Šulc
2014-11-03 10:43 Miroslav Šulc

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