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

[Miroslav Šulc]

commit:     d861a980d18f18f9809fd26b763e924c68f52df5
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 30 13:41:25 2013 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Oct 30 13:41:25 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/fordfrog.git;a=commit;h=d861a980

netbeans: bumped to latest nightly sources

---
 dev-java/netbeans-apisupport/ChangeLog             |   8 +
 dev-java/netbeans-apisupport/Manifest              |   6 +-
 .../netbeans-apisupport-9999_p20131024.ebuild      | 111 +++++++
 .../netbeans-apisupport-9999_p20131030.ebuild      | 111 +++++++
 dev-java/netbeans-cnd/ChangeLog                    |   7 +
 dev-java/netbeans-cnd/Manifest                     |   6 +-
 .../netbeans-cnd-9999_p20131024.ebuild             | 125 +++++++
 .../netbeans-cnd-9999_p20131030.ebuild             | 125 +++++++
 dev-java/netbeans-dlight/ChangeLog                 |   8 +
 dev-java/netbeans-dlight/Manifest                  |   6 +-
 .../netbeans-dlight-9999_p20131024.ebuild          |  96 ++++++
 .../netbeans-dlight-9999_p20131030.ebuild          |  96 ++++++
 dev-java/netbeans-enterprise/ChangeLog             |   8 +
 dev-java/netbeans-enterprise/Manifest              |   6 +-
 .../netbeans-enterprise-9999_p20131024.ebuild      | 253 ++++++++++++++
 .../netbeans-enterprise-9999_p20131030.ebuild      | 253 ++++++++++++++
 dev-java/netbeans-ergonomics/ChangeLog             |   8 +
 dev-java/netbeans-ergonomics/Manifest              |   6 +-
 .../netbeans-ergonomics-9999_p20131024.ebuild      | 101 ++++++
 .../netbeans-ergonomics-9999_p20131030.ebuild      | 101 ++++++
 dev-java/netbeans-extide/ChangeLog                 |   8 +
 dev-java/netbeans-extide/Manifest                  |   6 +-
 .../netbeans-extide-9999_p20131024.ebuild          | 108 ++++++
 .../netbeans-extide-9999_p20131030.ebuild          | 108 ++++++
 dev-java/netbeans-groovy/ChangeLog                 |   8 +
 dev-java/netbeans-groovy/Manifest                  |   6 +-
 .../netbeans-groovy-9999_p20131024.ebuild          | 111 +++++++
 .../netbeans-groovy-9999_p20131030.ebuild          | 111 +++++++
 dev-java/netbeans-harness/ChangeLog                |   8 +
 dev-java/netbeans-harness/Manifest                 |   6 +-
 .../netbeans-harness-9999_p20131024.ebuild         | 114 +++++++
 .../netbeans-harness-9999_p20131030.ebuild         | 114 +++++++
 dev-java/netbeans-ide/ChangeLog                    |   7 +
 dev-java/netbeans-ide/Manifest                     |   7 +-
 .../netbeans-ide-9999_p20131024.ebuild             | 364 +++++++++++++++++++++
 .../netbeans-ide-9999_p20131030.ebuild             | 364 +++++++++++++++++++++
 dev-java/netbeans-java/ChangeLog                   |   7 +
 dev-java/netbeans-java/Manifest                    |   6 +-
 .../netbeans-java-9999_p20131024.ebuild            | 254 ++++++++++++++
 .../netbeans-java-9999_p20131030.ebuild            | 254 ++++++++++++++
 dev-java/netbeans-javacard/ChangeLog               |   8 +
 dev-java/netbeans-javacard/Manifest                |   6 +-
 .../netbeans-javacard-9999_p20131024.ebuild        | 134 ++++++++
 .../netbeans-javacard-9999_p20131030.ebuild        | 134 ++++++++
 dev-java/netbeans-javadoc/ChangeLog                |   8 +
 dev-java/netbeans-javadoc/Manifest                 |   6 +-
 .../netbeans-javadoc-9999_p20131024.ebuild         | 164 ++++++++++
 .../netbeans-javadoc-9999_p20131030.ebuild         | 164 ++++++++++
 dev-java/netbeans-javafx/ChangeLog                 |   8 +
 dev-java/netbeans-javafx/Manifest                  |   6 +-
 .../netbeans-javafx-9999_p20131024.ebuild          | 124 +++++++
 .../netbeans-javafx-9999_p20131030.ebuild          | 124 +++++++
 dev-java/netbeans-mobility/ChangeLog               |   8 +
 dev-java/netbeans-mobility/Manifest                |   6 +-
 .../netbeans-mobility-9999_p20131024.ebuild        | 154 +++++++++
 .../netbeans-mobility-9999_p20131030.ebuild        | 154 +++++++++
 dev-java/netbeans-nb/ChangeLog                     |   7 +
 dev-java/netbeans-nb/Manifest                      |   6 +-
 .../netbeans-nb/netbeans-nb-9999_p20131024.ebuild  | 148 +++++++++
 .../netbeans-nb/netbeans-nb-9999_p20131030.ebuild  | 148 +++++++++
 dev-java/netbeans-php/ChangeLog                    |   7 +
 dev-java/netbeans-php/Manifest                     |   6 +-
 .../netbeans-php-9999_p20131024.ebuild             | 127 +++++++
 .../netbeans-php-9999_p20131030.ebuild             | 127 +++++++
 dev-java/netbeans-platform/ChangeLog               |   8 +
 dev-java/netbeans-platform/Manifest                |   6 +-
 .../netbeans-platform-9999_p20131024.ebuild        | 126 +++++++
 .../netbeans-platform-9999_p20131030.ebuild        | 126 +++++++
 dev-java/netbeans-profiler/ChangeLog               |   8 +
 dev-java/netbeans-profiler/Manifest                |   6 +-
 .../netbeans-profiler-9999_p20131024.ebuild        | 121 +++++++
 .../netbeans-profiler-9999_p20131030.ebuild        | 121 +++++++
 dev-java/netbeans-webcommon/ChangeLog              |   8 +
 dev-java/netbeans-webcommon/Manifest               |   6 +-
 .../netbeans-webcommon-9999_p20131024.ebuild       | 118 +++++++
 .../netbeans-webcommon-9999_p20131030.ebuild       | 118 +++++++
 dev-java/netbeans-websvccommon/ChangeLog           |   8 +
 dev-java/netbeans-websvccommon/Manifest            |   6 +-
 .../netbeans-websvccommon-9999_p20131024.ebuild    |  94 ++++++
 .../netbeans-websvccommon-9999_p20131030.ebuild    |  94 ++++++
 dev-util/netbeans/ChangeLog                        |   7 +
 dev-util/netbeans/Manifest                         |   6 +-
 dev-util/netbeans/netbeans-9999_p20131024.ebuild   | 264 +++++++++++++++
 dev-util/netbeans/netbeans-9999_p20131030.ebuild   | 264 +++++++++++++++
 84 files changed, 6690 insertions(+), 21 deletions(-)

diff --git a/dev-java/netbeans-apisupport/ChangeLog b/dev-java/netbeans-apisupport/ChangeLog
index 8e4f81a..9a69cee 100644
--- a/dev-java/netbeans-apisupport/ChangeLog
+++ b/dev-java/netbeans-apisupport/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-apisupport-9999_p20131030 (30 Oct 2013)
+*netbeans-apisupport-9999_p20131024 (30 Oct 2013)
+
+  30 Oct 2013; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-apisupport-9999_p20131024.ebuild,
+  +netbeans-apisupport-9999_p20131030.ebuild:
+  bumped to latest nightly sources
+
   24 Oct 2013; Miroslav Šulc <fordfrog@g.o>
   -netbeans-apisupport-9999_p20130926.ebuild,
   -netbeans-apisupport-9999_p20130929.ebuild,

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 385f2c2..db272a7 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -13,6 +13,8 @@ DIST netbeans-trunk-nightly-201310110001-src.zip 186966977 SHA256 a987a5c4860c63
 DIST netbeans-trunk-nightly-201310160001-src.zip 193552704 SHA256 0d002764a1b5c5ef31ebe11101dc0125d0fd48d8e3daead824e3cec050e6bae8 SHA512 58227a201cddb7c89c171a3baa048f09ad437966522af4f39378e9cf2b6806407c895273f0ada5d5d2dd7e8679df2d82b3a2420fbe4c3ccf9b974b0778d20933 WHIRLPOOL 61c0682814a40948b234b30e320b5148ca05db33464e1f33f6d5d324c722b22ef8fdbe5aaeb4270a159d20319ae13f53a1fbe0e9df15702abfd955ec5c5642af
 DIST netbeans-trunk-nightly-201310170001-src.zip 193650002 SHA256 565ec13ba1f769b17e2172c257ca8c8058dda5851101fdd0a1a096f9f41c5b7d SHA512 1a3c385c2b95fa4328f02e4fe55e8850df9e149de1b62930cffc235a4063c9ff3e412769b4fab33a1e39d14b7aa6953212728f22c2d68f10f3de826f826c3e57 WHIRLPOOL 01fb58d969b599c6a7dd5c6d6984d259df8f79e19981d8ba14fb5a06f1374c67f6c7a80d52b8c701531cb85755e4e710e14b3a5ea6db81318d824592b61398a7
 DIST netbeans-trunk-nightly-201310180001-src.zip 193656938 SHA256 8ea8478ce28112b492cf7d460416d4bd6c408b627baa57879e351cd04b54031b SHA512 bdb5557f5eb8ec59ca52476ed4649316bf890e1d8721933a084a7a4f714c3f9b0b7026a6a9e043bae1e28c0f2a30b413f625f3775575962b8ecdedb8b762d656 WHIRLPOOL 73ec143e9155f6b0cc21a2144419feb6981ddc582d4adcc58a6668b698aac72fef9c80a7ee18df08b92d17fe7ad138d9227281ea61861a36908c180de41790bb
+DIST netbeans-trunk-nightly-201310240001-src.zip 193855785 SHA256 211ba26a46d366423b859c63a59cdafcb26ad29c16678094fb3037cd93937875 SHA512 dcc0d91a909b40721b3f8b5011318d6ec36dd30fca035530c6456b0bb41e12606e046cabebb0d1bf22ebba16cfd54ed04d25a81e878e9c844d71080451839b15 WHIRLPOOL 6c677335f795ca02116189162ac10808dd260133c7be4a67b7333c0a94296907cbb2d0bf492d47d9b0b8fd063977139c2df98d5ff635b776ee1df449669a09d4
+DIST netbeans-trunk-nightly-201310300001-src.zip 193888205 SHA256 8bdac1e58e9e6b710fc0f76669989ae2be95350a2c8cad63c89db7a83bdc60ce SHA512 9d25a803152ef40bfca42842dc7337036a8371ddb59748bdb37256c6fc201629d9440187e1d8d2d1ce249cee0827d4621e3b4043948edf1955ecb2231474f4ba WHIRLPOOL 1990e9a9de8b4b63a841ba5304ba5574dffb25e61a39a10b6dab74cfecd699ca392e86443857cb6a9a138f0913926474addd7ffed2c2c020038357b6b5d73725
 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
@@ -22,5 +24,7 @@ EBUILD netbeans-apisupport-9999_p20131011.ebuild 3364 SHA256 560b7ed3fdc9395d8ba
 EBUILD netbeans-apisupport-9999_p20131016.ebuild 3364 SHA256 f06b61c2510992fe3d46f0054817b10a754c397dd597632ecda80df1114e6156 SHA512 6a604f15c7d9314378ab187425542e7177c81c85ceb000d532fed8f563aeb34268ea305cf3d1107688033170535ea18a427531d6697e6ab58f3430acb613470b WHIRLPOOL cbcb9584884f6ce8c02392d1e7b34b79f31f83eb3fb7ce9c83f9526741a9054b55fb3eae069759d1ee20f7ef2538a4f8792545d54f2f37523c6c3f2ed254afdc
 EBUILD netbeans-apisupport-9999_p20131017.ebuild 3364 SHA256 3da3eb7d7035d3ecbaf47bc57c2518dc1dfdd2ef756cf01ef6d80b251b2617f6 SHA512 0d424ed401b68fcc9fdb6bef75fe909fc8b282b8e6ced69aff48ff61886cc1ddef1520e7d750736de71c8ec6833ddb8f693a9935cdc1a39223a80c740a6c9abe WHIRLPOOL ae1e90d5dad0d82fbd1f4af24b473c8fcc331b54bfdc462fd01fe3446d283b896fd12e78b587eef0e703b1a61a4ad0e68af4f022a5dde1f8b75e34734ef35d68
 EBUILD netbeans-apisupport-9999_p20131018.ebuild 3364 SHA256 44ea96e76583a473ff158c01df06efe79e385253d86572ae0bc49780605a24a5 SHA512 ccb96ade7033825aa36b85a5bca8a9ba632886882361d1038c7e9eb208656ce02066d6b0bac958a4cb2d89975d6e5f4cdb40f6538c17d075adc0fc4fd1d034c0 WHIRLPOOL dca202d9915fcf6175c20c3b945f9dc74f6fd5040688ad1b0e719ed4eca120b7d951024d94c8a59b640fb1f722a0ac3207be8393da91e1b744802598fa0e7e86
-MISC ChangeLog 93267 SHA256 ecd45a658e32f0f2048a6a9e257497d5dab4598398e1622e3cdb8a0d5ec489b2 SHA512 ae81825f9156bdd6b39c2ef5041ec40f25c3a7fcc2abf3eab7b3879a20bb1f80c03d501e712e51a1b504d4a977eeb18b0a714f0de0533f4e87534d682c3a7777 WHIRLPOOL 55fc947d71a87c7e06529b24d1ee9f680c64f7a4bee6b704f04ec5d237f334c8edc905759467da174a94c7e95f8d11ec087a319b3a7e5524d97b587ecc93c472
+EBUILD netbeans-apisupport-9999_p20131024.ebuild 3364 SHA256 4771290a5b48f4b39c22767a2a03feae4d50150323f7c5dc2db00ed16c4afdb5 SHA512 61b1afaa19631b58e5908aaeb4b36ed7c8e334f1dd3ea889e01a2ba6cbef27f537db426ad99b91b5c5e5a6503380a196459ed6e0dd4ab5cbf9c80d31acf30269 WHIRLPOOL 17e83a6128146959b4c3bd8bbea10393ac92a4f40dbfcfcab06b3d9b07cf95d1cdae0af18bde4b75c3bcd2ed66286545416242af7812ee7f32b4d11d54ac5168
+EBUILD netbeans-apisupport-9999_p20131030.ebuild 3364 SHA256 d8d6c7fb0ddd32f925506224c4bf98320a1ffdc6505079ff2f0c2aee08d9b1d1 SHA512 812fd53ac2254668b4a722bbce991475e93726af7ce910d45f26e060605695160df2ff1ed05b5f3f3e2dc1482dd7d5b62080983fdd64e980e47edd5a9f6d965e WHIRLPOOL a561cfd2cda7f96600c94acabde2be5576180408442a8c97eab62656ffdbaa3cd6aef7db5e8f6ebfe5e8de2a1f2203ac0c19b9bcbca032d8dfd5ae1326d9475e
+MISC ChangeLog 93548 SHA256 b8ecea0e182e4847d74524b9e7298b72e1345c2fa5e3c2353e5c88510b88c80d SHA512 55acdb8a8d93ee6f318cd0c5efa0cc7c69fdc1c85c934c18463e6f4bb47b5ef0ab339b01161eea0d5c54fa0bd172a5c8ca8dc0ea8d53318e216ba75186aa5036 WHIRLPOOL d3c9ccf961a6151712f01bc93fb20585e2804720d1d79eb62bad633431a1c48d4f7138a9b7c7429d0f70006b16160310d60b64260e58f5239103a3c45802101f
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20131024.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20131024.ebuild
new file mode 100644
index 0000000..c12c3bf
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20131024.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2013 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/2013-10-24_00-01-44/zip/netbeans-trunk-nightly-201310240001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r12-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"
+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-r12-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r12-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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-apisupport/netbeans-apisupport-9999_p20131030.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20131030.ebuild
new file mode 100644
index 0000000..7dd7d67
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20131030.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2013 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/2013-10-30_00-01-44/zip/netbeans-trunk-nightly-201310300001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r12-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"
+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-r12-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r12-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 8a0d2d3..c992461 100644
--- a/dev-java/netbeans-cnd/ChangeLog
+++ b/dev-java/netbeans-cnd/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-cnd-9999_p20131030 (30 Oct 2013)
+*netbeans-cnd-9999_p20131024 (30 Oct 2013)
+
+  30 Oct 2013; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-cnd-9999_p20131024.ebuild, +netbeans-cnd-9999_p20131030.ebuild:
+  bumped to latest nightly sources
+
   24 Oct 2013; Miroslav Šulc <fordfrog@g.o>
   -netbeans-cnd-9999_p20130926.ebuild, -netbeans-cnd-9999_p20130929.ebuild,
   -netbeans-cnd-9999_p20131003.ebuild, -netbeans-cnd-9999_p20131004.ebuild,

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index a9d5dc3..6fd15e0 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -26,6 +26,8 @@ DIST netbeans-trunk-nightly-201310110001-src.zip 186966977 SHA256 a987a5c4860c63
 DIST netbeans-trunk-nightly-201310160001-src.zip 193552704 SHA256 0d002764a1b5c5ef31ebe11101dc0125d0fd48d8e3daead824e3cec050e6bae8 SHA512 58227a201cddb7c89c171a3baa048f09ad437966522af4f39378e9cf2b6806407c895273f0ada5d5d2dd7e8679df2d82b3a2420fbe4c3ccf9b974b0778d20933 WHIRLPOOL 61c0682814a40948b234b30e320b5148ca05db33464e1f33f6d5d324c722b22ef8fdbe5aaeb4270a159d20319ae13f53a1fbe0e9df15702abfd955ec5c5642af
 DIST netbeans-trunk-nightly-201310170001-src.zip 193650002 SHA256 565ec13ba1f769b17e2172c257ca8c8058dda5851101fdd0a1a096f9f41c5b7d SHA512 1a3c385c2b95fa4328f02e4fe55e8850df9e149de1b62930cffc235a4063c9ff3e412769b4fab33a1e39d14b7aa6953212728f22c2d68f10f3de826f826c3e57 WHIRLPOOL 01fb58d969b599c6a7dd5c6d6984d259df8f79e19981d8ba14fb5a06f1374c67f6c7a80d52b8c701531cb85755e4e710e14b3a5ea6db81318d824592b61398a7
 DIST netbeans-trunk-nightly-201310180001-src.zip 193656938 SHA256 8ea8478ce28112b492cf7d460416d4bd6c408b627baa57879e351cd04b54031b SHA512 bdb5557f5eb8ec59ca52476ed4649316bf890e1d8721933a084a7a4f714c3f9b0b7026a6a9e043bae1e28c0f2a30b413f625f3775575962b8ecdedb8b762d656 WHIRLPOOL 73ec143e9155f6b0cc21a2144419feb6981ddc582d4adcc58a6668b698aac72fef9c80a7ee18df08b92d17fe7ad138d9227281ea61861a36908c180de41790bb
+DIST netbeans-trunk-nightly-201310240001-src.zip 193855785 SHA256 211ba26a46d366423b859c63a59cdafcb26ad29c16678094fb3037cd93937875 SHA512 dcc0d91a909b40721b3f8b5011318d6ec36dd30fca035530c6456b0bb41e12606e046cabebb0d1bf22ebba16cfd54ed04d25a81e878e9c844d71080451839b15 WHIRLPOOL 6c677335f795ca02116189162ac10808dd260133c7be4a67b7333c0a94296907cbb2d0bf492d47d9b0b8fd063977139c2df98d5ff635b776ee1df449669a09d4
+DIST netbeans-trunk-nightly-201310300001-src.zip 193888205 SHA256 8bdac1e58e9e6b710fc0f76669989ae2be95350a2c8cad63c89db7a83bdc60ce SHA512 9d25a803152ef40bfca42842dc7337036a8371ddb59748bdb37256c6fc201629d9440187e1d8d2d1ce249cee0827d4621e3b4043948edf1955ecb2231474f4ba WHIRLPOOL 1990e9a9de8b4b63a841ba5304ba5574dffb25e61a39a10b6dab74cfecd699ca392e86443857cb6a9a138f0913926474addd7ffed2c2c020038357b6b5d73725
 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
@@ -35,5 +37,7 @@ EBUILD netbeans-cnd-9999_p20131011.ebuild 4560 SHA256 579cb34718164387dfe135fad0
 EBUILD netbeans-cnd-9999_p20131016.ebuild 4560 SHA256 ffef1b3e054bc472277f6c2764c3993e3e953eadd14c5651dcf06c88257b7c00 SHA512 ef4476c10f0794a6e163de9efe9bb5e0a4c10cc127e37585997bbc05b9ffea9241e662c011cdf0dce79e18dc6b8984dc1f163f8efc6b6ab8b24cae92d1224957 WHIRLPOOL ad8588c90bfe9e0e4f2594930d4953285fb5a1e784b34cb21ddd1ac30c7c981d23834a3c258edc3901eae69d1120e2b29e9ae1e7989b8384965ed285e2783714
 EBUILD netbeans-cnd-9999_p20131017.ebuild 4560 SHA256 6a55a8e9250c37018e7a6eee94d96547334eeac9d7d0b87fe1cda9108b2f3066 SHA512 dd16156e512d54c7a920b9fc3d061b272e94ac1532f7d62a5c55e93bfd9c2f6e5a72f7fad9771d9e2075e25c36a54a568cde6c1db9d8926a40a3244f934ad0af WHIRLPOOL d22a5f4c9d8e71efb88736b800b8c65d619f1dc80c60053d683ae1af2da04a51fa57062f3a63fa2658c0435030d471080d4d078ab1f20508189cf019fde37d67
 EBUILD netbeans-cnd-9999_p20131018.ebuild 4560 SHA256 8e1c15bd5dbf16ec36c0e825ba76aa8368906b2906dd28d0697cfcc31ac4be50 SHA512 7dbc4b3919f1060a09c7839bb79d73dd120e237f859d6c1bcffb07deba7c387294118ad939f05e85327999069bfe4bc202bd384832928c04cb844f14438b4804 WHIRLPOOL 27e571858048dc957e9d50380e243c23cac8158755c72422bf20db5c39a300118a3b8d571e74c41273e672dbeaa9258df44c5147e358f2ffcf338a713936d717
-MISC ChangeLog 85547 SHA256 fb9c5ec0f4bf34205828126a2ff929d16b210db2538538deabf8e7f4d1e4acb8 SHA512 03c2d596efdb717aa28c6f5378f56eec1b260bec5b6b79bc8855cc5dd54ffdb290fef682f14ab12962b28faed0337e28cbb426524384c64e075d5e993fc19ca2 WHIRLPOOL 0b35612112861b502d776eabb1aba1a42bf7a8c2d4537202052133ae39ad533bfb58eeef8cca1b10f47a1b8ce61e2cbd2361f89238c08cb77e1d1103b55205ee
+EBUILD netbeans-cnd-9999_p20131024.ebuild 4560 SHA256 b2c6719807ae4c13e08009e8008da25ac26d4e3f39982717220e1dd464c46445 SHA512 036129b2240c0e20b53a4216194a115c3700644ceaabb3e5b4d53fa8b2c006b3ef79a2d7867cfb9f79987486e20faed12e0e430f346004b95d2bc2b14926b7b9 WHIRLPOOL 34fb52a630e59849a37eb55755d74af93926baa027797948b26c40e3abb40ef9a20b4277a4549eeefe832cf3e633198924256b04b3fb5325885cef8c090eb6d5
+EBUILD netbeans-cnd-9999_p20131030.ebuild 4560 SHA256 be8a411a33d4d467b8851c535b4e00a577c9fc3bcb998967ad3b25f872ec11f4 SHA512 e78c38b03b713954a0a5d96fcecd01510398603590e922dc7b19cd3067050c28740f46f36ba694e81fa0d04adb12f978b33c516c2f8e5050e4493e4c87d784e4 WHIRLPOOL d9b859c16b4879fcf2bf4f18c9fd053e21aa176506d1ae517e6d1b90db7732724172d16ed27b62ccd940d9a3839f0f0b65385ef3a978fcfdde5ba2470d112152
+MISC ChangeLog 85798 SHA256 7718c3e3943ad5ad4c9c19ad5f42cdf03ca7b0813803027e859079aa6d993c57 SHA512 02ba5fe85db4e65668e2d602fc5e9e6e5b845895b2c42a5293eab9e3e7a1d3f5902e66dbda836b04586a3ff9c9213f582231063d157bba5b9a206c50d5fb5140 WHIRLPOOL 352df13011b6e643ff694e44465e07a9063ae39cb1f90f45fd5058a9ac1bacdec9110c1af9368467c2492b3ad14ea174179cd2d9b4df059a286398841749e2a6
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20131024.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20131024.ebuild
new file mode 100644
index 0000000..4cabf74
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20131024.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2013 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/2013-10-24_00-01-44/zip/netbeans-trunk-nightly-201310240001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r12-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"
+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-r12-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-r12-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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.0.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-cnd/netbeans-cnd-9999_p20131030.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20131030.ebuild
new file mode 100644
index 0000000..1878e89
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20131030.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2013 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/2013-10-30_00-01-44/zip/netbeans-trunk-nightly-201310300001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r12-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"
+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-r12-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-r12-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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.0.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 a7ead5a..3569761 100644
--- a/dev-java/netbeans-dlight/ChangeLog
+++ b/dev-java/netbeans-dlight/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-dlight-9999_p20131030 (30 Oct 2013)
+*netbeans-dlight-9999_p20131024 (30 Oct 2013)
+
+  30 Oct 2013; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-dlight-9999_p20131024.ebuild,
+  +netbeans-dlight-9999_p20131030.ebuild:
+  bumped to latest nightly sources
+
   24 Oct 2013; Miroslav Šulc <fordfrog@g.o>
   -netbeans-dlight-9999_p20130926.ebuild,
   -netbeans-dlight-9999_p20130929.ebuild,

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 339c88d..47da009 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -16,6 +16,8 @@ DIST netbeans-trunk-nightly-201310110001-src.zip 186966977 SHA256 a987a5c4860c63
 DIST netbeans-trunk-nightly-201310160001-src.zip 193552704 SHA256 0d002764a1b5c5ef31ebe11101dc0125d0fd48d8e3daead824e3cec050e6bae8 SHA512 58227a201cddb7c89c171a3baa048f09ad437966522af4f39378e9cf2b6806407c895273f0ada5d5d2dd7e8679df2d82b3a2420fbe4c3ccf9b974b0778d20933 WHIRLPOOL 61c0682814a40948b234b30e320b5148ca05db33464e1f33f6d5d324c722b22ef8fdbe5aaeb4270a159d20319ae13f53a1fbe0e9df15702abfd955ec5c5642af
 DIST netbeans-trunk-nightly-201310170001-src.zip 193650002 SHA256 565ec13ba1f769b17e2172c257ca8c8058dda5851101fdd0a1a096f9f41c5b7d SHA512 1a3c385c2b95fa4328f02e4fe55e8850df9e149de1b62930cffc235a4063c9ff3e412769b4fab33a1e39d14b7aa6953212728f22c2d68f10f3de826f826c3e57 WHIRLPOOL 01fb58d969b599c6a7dd5c6d6984d259df8f79e19981d8ba14fb5a06f1374c67f6c7a80d52b8c701531cb85755e4e710e14b3a5ea6db81318d824592b61398a7
 DIST netbeans-trunk-nightly-201310180001-src.zip 193656938 SHA256 8ea8478ce28112b492cf7d460416d4bd6c408b627baa57879e351cd04b54031b SHA512 bdb5557f5eb8ec59ca52476ed4649316bf890e1d8721933a084a7a4f714c3f9b0b7026a6a9e043bae1e28c0f2a30b413f625f3775575962b8ecdedb8b762d656 WHIRLPOOL 73ec143e9155f6b0cc21a2144419feb6981ddc582d4adcc58a6668b698aac72fef9c80a7ee18df08b92d17fe7ad138d9227281ea61861a36908c180de41790bb
+DIST netbeans-trunk-nightly-201310240001-src.zip 193855785 SHA256 211ba26a46d366423b859c63a59cdafcb26ad29c16678094fb3037cd93937875 SHA512 dcc0d91a909b40721b3f8b5011318d6ec36dd30fca035530c6456b0bb41e12606e046cabebb0d1bf22ebba16cfd54ed04d25a81e878e9c844d71080451839b15 WHIRLPOOL 6c677335f795ca02116189162ac10808dd260133c7be4a67b7333c0a94296907cbb2d0bf492d47d9b0b8fd063977139c2df98d5ff635b776ee1df449669a09d4
+DIST netbeans-trunk-nightly-201310300001-src.zip 193888205 SHA256 8bdac1e58e9e6b710fc0f76669989ae2be95350a2c8cad63c89db7a83bdc60ce SHA512 9d25a803152ef40bfca42842dc7337036a8371ddb59748bdb37256c6fc201629d9440187e1d8d2d1ce249cee0827d4621e3b4043948edf1955ecb2231474f4ba WHIRLPOOL 1990e9a9de8b4b63a841ba5304ba5574dffb25e61a39a10b6dab74cfecd699ca392e86443857cb6a9a138f0913926474addd7ffed2c2c020038357b6b5d73725
 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
@@ -25,5 +27,7 @@ EBUILD netbeans-dlight-9999_p20131011.ebuild 2667 SHA256 e1ae917eb42e5f4d03c6319
 EBUILD netbeans-dlight-9999_p20131016.ebuild 2667 SHA256 a1e0832c7951b08f77f3e9b89cafd812c296de4defc9aa67e8c3b2a9eda3e253 SHA512 7fe8dd8df717bf5cbfa61c4cdb39b8f3a8f4ff2b9fbef4470b459fffa8ceb34046834d3af64bc3d5ef2e0f11557fbdef660af25621580aed02edf9546db473bc WHIRLPOOL ef05f09cd19bf11982a81ca80c1f644279d77c684dd8cfb1c1608b8036207014df9f973e98f2bb0bcca6d3e3e5c664e019251450e3f245a511b164bdacf1a555
 EBUILD netbeans-dlight-9999_p20131017.ebuild 2667 SHA256 89e2af037cf052deeec27e199d56940a93914fab6aba26f1a9e05b25a514e994 SHA512 ab34475ac7926a95b7ed71666da73ceed6d7f46d1464e59a231b7a4a10247db6358810d8a1e4fd700f80d7dcbeca9bf7b73caa1c5bc3b6425b9b04f842286472 WHIRLPOOL b774aa78ba835711925e0ae785b68fb7c9528a4a5cb88d866051191b1734650ac56e5f47a68c63545c6b1df088ca65f8b807663b3063d7b88f01b6249b8aa1c6
 EBUILD netbeans-dlight-9999_p20131018.ebuild 2667 SHA256 cee329f8c7e9f7035342355fccf1797d32dd7f84b9acf30e8a1ae5ab5da7a050 SHA512 b472c8d9672714f5ac015c52d61990427cd92af2fb46ca0e33ccabfeeb22db611727c58779e74ffec2bdad26be8a455ebacc861756df1506d8a210d163e6ca6f WHIRLPOOL e088589c8fa0ca0f866b841fd1029bab61dabfbb1f0af3e81e017d8db4906df21f860452b531a673e0c80947d4f3376b7bf616a4643708dc4f7b091ea9ef026f
-MISC ChangeLog 89002 SHA256 19e69ad7d2f633073c4be765b8fb8e1b1ca1b14fc82011fb019160be5c8c8f3d SHA512 5cc89e6293ff593009bd5ec42157ce3ab2bc1936838a184920552f9e70f1648251fe0c127752eefa5cef9322ce4afd2f8179557bc0d9e2c5583e72bee769f2e3 WHIRLPOOL d594d20677cc418a975c9bc79a7f0b774e4e0d94224fc18f742d8e1dfec02c06911691bea52fc0496474d5c370108a00182c7affa5c6d067d5c242033e5a3e07
+EBUILD netbeans-dlight-9999_p20131024.ebuild 2667 SHA256 5c08147b38efd199549a213de93ed0e7e35cb01282486e5a2f64d3521e521e91 SHA512 23754eed901a9109441924fe8f47724570326a0a95fbd540645a4f7cb37c9f4e30267497b70f9e75ced797bff8df674ff4af4706f136039f15f84535ca41a81a WHIRLPOOL af396874ef966e05b3898b6a0868d168aca2bdd9aa1c555b1f9b86dbbae86ee97527b9309fcad8f5634cb758ffe89490326273823fda1d6cf1d77690c13a2e44
+EBUILD netbeans-dlight-9999_p20131030.ebuild 2667 SHA256 04e8e5136594244ea0b033e48bb1e79a3d634a9df50021118fb137dabf9ad567 SHA512 4d05064eacf45dfc26c30a5832bd687c6220a01d76bf02f84f411b577f0f90377db6f5edbdb89bf300730074a538db012de48ec0ea0492e893b4691a1b47f651 WHIRLPOOL 7e89ff40fdc5704efc681bf38aa4d2bdd917ad58db5757ff1bfaf8acdcdc033ea7e13e9f7045d8d749fa327bbac40eb937587a414f3dbb042f8be98f0e778d4a
+MISC ChangeLog 89267 SHA256 32e3ad025c0da88a6550a4269d3ee5282dc0dbad75d1694bcc39203b0d9c1f9e SHA512 b5c0644e44b77385622a73036796523189eefa049f7bd462680b9450e6d290e973238c55eeaa6f5538c77033a7dd7282c9de3f33891464c2dd73f6d29684f2fe WHIRLPOOL fc4fd8d8f706b9bac603433fbdeb10f6b3273f2991b3e10710eb8cffb42599f4c0c9e1cfce28b635464ccd571703a93a82988742c92c1559fa6dbcb542facc44
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20131024.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20131024.ebuild
new file mode 100644
index 0000000..23e7b45
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20131024.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2013 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/2013-10-24_00-01-44/zip/netbeans-trunk-nightly-201310240001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r12-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-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"
+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-r12-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r12-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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-dlight/netbeans-dlight-9999_p20131030.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20131030.ebuild
new file mode 100644
index 0000000..5fabc82
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20131030.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2013 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/2013-10-30_00-01-44/zip/netbeans-trunk-nightly-201310300001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r12-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-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"
+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-r12-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r12-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 d634443..7cf696f 100644
--- a/dev-java/netbeans-enterprise/ChangeLog
+++ b/dev-java/netbeans-enterprise/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-enterprise-9999_p20131030 (30 Oct 2013)
+*netbeans-enterprise-9999_p20131024 (30 Oct 2013)
+
+  30 Oct 2013; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-enterprise-9999_p20131024.ebuild,
+  +netbeans-enterprise-9999_p20131030.ebuild:
+  bumped to latest nightly sources
+
   24 Oct 2013; Miroslav Šulc <fordfrog@g.o>
   -netbeans-enterprise-9999_p20130926.ebuild,
   -netbeans-enterprise-9999_p20130929.ebuild,

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index f731a04..0b70fab 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -98,6 +98,8 @@ DIST netbeans-trunk-nightly-201310110001-src.zip 186966977 SHA256 a987a5c4860c63
 DIST netbeans-trunk-nightly-201310160001-src.zip 193552704 SHA256 0d002764a1b5c5ef31ebe11101dc0125d0fd48d8e3daead824e3cec050e6bae8 SHA512 58227a201cddb7c89c171a3baa048f09ad437966522af4f39378e9cf2b6806407c895273f0ada5d5d2dd7e8679df2d82b3a2420fbe4c3ccf9b974b0778d20933 WHIRLPOOL 61c0682814a40948b234b30e320b5148ca05db33464e1f33f6d5d324c722b22ef8fdbe5aaeb4270a159d20319ae13f53a1fbe0e9df15702abfd955ec5c5642af
 DIST netbeans-trunk-nightly-201310170001-src.zip 193650002 SHA256 565ec13ba1f769b17e2172c257ca8c8058dda5851101fdd0a1a096f9f41c5b7d SHA512 1a3c385c2b95fa4328f02e4fe55e8850df9e149de1b62930cffc235a4063c9ff3e412769b4fab33a1e39d14b7aa6953212728f22c2d68f10f3de826f826c3e57 WHIRLPOOL 01fb58d969b599c6a7dd5c6d6984d259df8f79e19981d8ba14fb5a06f1374c67f6c7a80d52b8c701531cb85755e4e710e14b3a5ea6db81318d824592b61398a7
 DIST netbeans-trunk-nightly-201310180001-src.zip 193656938 SHA256 8ea8478ce28112b492cf7d460416d4bd6c408b627baa57879e351cd04b54031b SHA512 bdb5557f5eb8ec59ca52476ed4649316bf890e1d8721933a084a7a4f714c3f9b0b7026a6a9e043bae1e28c0f2a30b413f625f3775575962b8ecdedb8b762d656 WHIRLPOOL 73ec143e9155f6b0cc21a2144419feb6981ddc582d4adcc58a6668b698aac72fef9c80a7ee18df08b92d17fe7ad138d9227281ea61861a36908c180de41790bb
+DIST netbeans-trunk-nightly-201310240001-src.zip 193855785 SHA256 211ba26a46d366423b859c63a59cdafcb26ad29c16678094fb3037cd93937875 SHA512 dcc0d91a909b40721b3f8b5011318d6ec36dd30fca035530c6456b0bb41e12606e046cabebb0d1bf22ebba16cfd54ed04d25a81e878e9c844d71080451839b15 WHIRLPOOL 6c677335f795ca02116189162ac10808dd260133c7be4a67b7333c0a94296907cbb2d0bf492d47d9b0b8fd063977139c2df98d5ff635b776ee1df449669a09d4
+DIST netbeans-trunk-nightly-201310300001-src.zip 193888205 SHA256 8bdac1e58e9e6b710fc0f76669989ae2be95350a2c8cad63c89db7a83bdc60ce SHA512 9d25a803152ef40bfca42842dc7337036a8371ddb59748bdb37256c6fc201629d9440187e1d8d2d1ce249cee0827d4621e3b4043948edf1955ecb2231474f4ba WHIRLPOOL 1990e9a9de8b4b63a841ba5304ba5574dffb25e61a39a10b6dab74cfecd699ca392e86443857cb6a9a138f0913926474addd7ffed2c2c020038357b6b5d73725
 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
@@ -107,5 +109,7 @@ EBUILD netbeans-enterprise-9999_p20131011.ebuild 15584 SHA256 97eb56b1b3b7e94148
 EBUILD netbeans-enterprise-9999_p20131016.ebuild 15584 SHA256 1ff800b4604bb043eaf927ccac4dce0e469713aadf3451e6ddac028da5fd1b59 SHA512 c75e44d5e57198b20db26f9f8a59d9e7371528dda7e9235d29c32747acb4eaf54d6cd645d82d9ec37906e5c8858b8e7e10a12a374aa9fa856d706869290d8953 WHIRLPOOL edbcaec30736b4c4ba6b5b1fab2b1daf6d6b54ee19ad26e54493e896baae1d14df1f873389c2a8781c6f75a0477fe5b9c91c454ec2e2b5cc4f847037ebd17756
 EBUILD netbeans-enterprise-9999_p20131017.ebuild 15584 SHA256 619ff5036b2df036f7049a74c546a858acf2b0409773f3352b62022bac40e1ef SHA512 1fe69f14817b3e78ea10a609d8938870e584f1ee0ff035a4f6c4a518dae0eb5b906f1b06731c39d910cb81a6c7b526f0428c71e5ef2dee7699f1afea5ed12812 WHIRLPOOL 829a06cfc7dc45fb448e098ffb22e6b8d390c3d4765c64edf36017b87ab127913a9d7f0249ff648086d73b3a3a86bbd3f0476b83163b3181b619ca956fa0fb6b
 EBUILD netbeans-enterprise-9999_p20131018.ebuild 15584 SHA256 218ece4525b820a17f3e10bfb4dce3ec1e3060fc491dd9ca854861e123877ddc SHA512 13c6772c362af7618da94bed1d504a856b964d57922fc5046651d8ea85e2038c550a8b559cac47c867aac85c3af0e06b154d0336295534edc15cbc5e35fe3c76 WHIRLPOOL 62440e36075961e5df1ac5b92315702155d5fe6ae8231949e870b12e4dfa4ba2c76e1e34fe7e14686019f544906a7d259a0f8309b4d400f09ca127d0c51ed54b
-MISC ChangeLog 93792 SHA256 3d57b482003df2620b500df6f6212d5671dd3f52cb80655c6b4529e1c0ced97c SHA512 fe876e8a8331fb16de8c91c6ad74582b9b774a29229c7df485055f7b757ff3a3563042b34717af1bfdb35bfb0f1d0ecb14b6e7cc863bb6a30722771f98106568 WHIRLPOOL b6c3a3ba70af48eb51ad8411166d1268b7efe37efc42a8e373857594a57e3de7ee5bbbd5642b40ded4693187e8e10d94b509379d13f5f5111d96f46ea63059ef
+EBUILD netbeans-enterprise-9999_p20131024.ebuild 15584 SHA256 50a079791a8e158be779f239eea052fe4c3bd145b6e7ee019ceb7f56b05263eb SHA512 17b2698e097dccaa3ff50adccc11df9c8053d9b3c6f48b3eb9723fa95bd899e304d681f28712a52a4a4876ce76832cdd9c4c9978d00c5d11fdf21aa75150b540 WHIRLPOOL 190b5c83f0940f7fa2c42ce65ae239bc633de3cc4a798bf62f164bac47229bd1131c106dd73fa15d49ad16d2df93fce716180211a6bbfa6355cfc827c58ae6ad
+EBUILD netbeans-enterprise-9999_p20131030.ebuild 15584 SHA256 8040f37a6224fee60bd791af36182b1004b578eeb840c8b21634322bc2b36e23 SHA512 c99ca522810ebb0fdb366b154acfdc5893f738fae3f70ea1480180f4f29db79b5218c1643c34efecd9c07d0030b2bc901e1d06aa5d7ba4393feee0953b5e1459 WHIRLPOOL 263e790b6b0998b228e6adae3b25892a2afcdb09136b804fc733848ceb2f7a421a0a508a67e6b9a6622598f4605f7a3f3449aba7da1a7dcb4e351b27d69681f8
+MISC ChangeLog 94073 SHA256 6268ae76cc919718333d4a8b7ebb107fafc736feee68a4bec97b1707a777500b SHA512 b37948aba0e458c81ad3abef29eccd580c99a33acc1b1bf38ba4422c63b474f9c4a6ef95dca0a6b411c4b43cb9ef671aa4c0ee699c4ca2963f2144fcf484bed8 WHIRLPOOL fa4a0b55387f5ee2082992df6744ee6b86277bcc9711bdeb5bc3683b6c0f2038b486fd2e1a25e53d59c1cc223a033cfbf1bfbd7ca131597f50fd656ad6616396
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20131024.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20131024.ebuild
new file mode 100644
index 0000000..bd671d5
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20131024.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2013 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/2013-10-24_00-01-44/zip/netbeans-trunk-nightly-201310240001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r12-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/2110507EBF38D759B9A22F98CB53515112240EC3-glassfish-tooling-sdk-0.3-b053.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/51EBE06BB1278AEDE08686B0D3618EBD1A999C25-jaxrs-ri-2.0.zip
+	http://hg.netbeans.org/binaries/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar
+	http://hg.netbeans.org/binaries/F999E0F3DE77B80DB439E47F0396CED8D7E3344C-jersey2-extensions.zip
+	http://hg.netbeans.org/binaries/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip
+	http://hg.netbeans.org/binaries/7447085649150DBF4CB8859F89BF118BFFB6A9C9-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/9084CD23ACD33EA4EF4EADBCB8788A22AF361C07-primefaces-4.0.jar
+	http://hg.netbeans.org/binaries/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar
+	http://hg.netbeans.org/binaries/275C5AC6ADE12819F49E984C8E06B114A4E23458-spring-webmvc-2.5.6.SEC03.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"
+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-r12-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}"/2110507EBF38D759B9A22F98CB53515112240EC3-glassfish-tooling-sdk-0.3-b053.jar libs.glassfish.sdk/external/glassfish-tooling-sdk-0.3-b053.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}"/51EBE06BB1278AEDE08686B0D3618EBD1A999C25-jaxrs-ri-2.0.zip websvc.restlib/external/jaxrs-ri-2.0.zip || die
+	ln -s "${DISTDIR}"/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar javaee7.api/external/jaxws-api.jar || die
+	ln -s "${DISTDIR}"/F999E0F3DE77B80DB439E47F0396CED8D7E3344C-jersey2-extensions.zip websvc.restlib/external/jersey2-extensions.zip || die
+	ln -s "${DISTDIR}"/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip web.jsf12/external/jsf-1.2.zip || die
+	ln -s "${DISTDIR}"/7447085649150DBF4CB8859F89BF118BFFB6A9C9-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}"/9084CD23ACD33EA4EF4EADBCB8788A22AF361C07-primefaces-4.0.jar web.primefaces/external/primefaces-4.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}"/275C5AC6ADE12819F49E984C8E06B114A4E23458-spring-webmvc-2.5.6.SEC03.jar spring.webmvc/external/spring-webmvc-2.5.6.SEC03.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-r12-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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-enterprise/netbeans-enterprise-9999_p20131030.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20131030.ebuild
new file mode 100644
index 0000000..f03a8d0
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20131030.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2013 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/2013-10-30_00-01-44/zip/netbeans-trunk-nightly-201310300001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r12-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/2110507EBF38D759B9A22F98CB53515112240EC3-glassfish-tooling-sdk-0.3-b053.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/51EBE06BB1278AEDE08686B0D3618EBD1A999C25-jaxrs-ri-2.0.zip
+	http://hg.netbeans.org/binaries/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar
+	http://hg.netbeans.org/binaries/F999E0F3DE77B80DB439E47F0396CED8D7E3344C-jersey2-extensions.zip
+	http://hg.netbeans.org/binaries/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip
+	http://hg.netbeans.org/binaries/7447085649150DBF4CB8859F89BF118BFFB6A9C9-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/9084CD23ACD33EA4EF4EADBCB8788A22AF361C07-primefaces-4.0.jar
+	http://hg.netbeans.org/binaries/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar
+	http://hg.netbeans.org/binaries/275C5AC6ADE12819F49E984C8E06B114A4E23458-spring-webmvc-2.5.6.SEC03.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"
+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-r12-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}"/2110507EBF38D759B9A22F98CB53515112240EC3-glassfish-tooling-sdk-0.3-b053.jar libs.glassfish.sdk/external/glassfish-tooling-sdk-0.3-b053.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}"/51EBE06BB1278AEDE08686B0D3618EBD1A999C25-jaxrs-ri-2.0.zip websvc.restlib/external/jaxrs-ri-2.0.zip || die
+	ln -s "${DISTDIR}"/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar javaee7.api/external/jaxws-api.jar || die
+	ln -s "${DISTDIR}"/F999E0F3DE77B80DB439E47F0396CED8D7E3344C-jersey2-extensions.zip websvc.restlib/external/jersey2-extensions.zip || die
+	ln -s "${DISTDIR}"/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip web.jsf12/external/jsf-1.2.zip || die
+	ln -s "${DISTDIR}"/7447085649150DBF4CB8859F89BF118BFFB6A9C9-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}"/9084CD23ACD33EA4EF4EADBCB8788A22AF361C07-primefaces-4.0.jar web.primefaces/external/primefaces-4.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}"/275C5AC6ADE12819F49E984C8E06B114A4E23458-spring-webmvc-2.5.6.SEC03.jar spring.webmvc/external/spring-webmvc-2.5.6.SEC03.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-r12-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 a113789..eb9443e 100644
--- a/dev-java/netbeans-ergonomics/ChangeLog
+++ b/dev-java/netbeans-ergonomics/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-ergonomics-9999_p20131030 (30 Oct 2013)
+*netbeans-ergonomics-9999_p20131024 (30 Oct 2013)
+
+  30 Oct 2013; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-ergonomics-9999_p20131024.ebuild,
+  +netbeans-ergonomics-9999_p20131030.ebuild:
+  bumped to latest nightly sources
+
   24 Oct 2013; Miroslav Šulc <fordfrog@g.o>
   -netbeans-ergonomics-9999_p20130926.ebuild,
   -netbeans-ergonomics-9999_p20130929.ebuild,

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 29f7ce1..81fdca9 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -13,6 +13,8 @@ DIST netbeans-trunk-nightly-201310110001-src.zip 186966977 SHA256 a987a5c4860c63
 DIST netbeans-trunk-nightly-201310160001-src.zip 193552704 SHA256 0d002764a1b5c5ef31ebe11101dc0125d0fd48d8e3daead824e3cec050e6bae8 SHA512 58227a201cddb7c89c171a3baa048f09ad437966522af4f39378e9cf2b6806407c895273f0ada5d5d2dd7e8679df2d82b3a2420fbe4c3ccf9b974b0778d20933 WHIRLPOOL 61c0682814a40948b234b30e320b5148ca05db33464e1f33f6d5d324c722b22ef8fdbe5aaeb4270a159d20319ae13f53a1fbe0e9df15702abfd955ec5c5642af
 DIST netbeans-trunk-nightly-201310170001-src.zip 193650002 SHA256 565ec13ba1f769b17e2172c257ca8c8058dda5851101fdd0a1a096f9f41c5b7d SHA512 1a3c385c2b95fa4328f02e4fe55e8850df9e149de1b62930cffc235a4063c9ff3e412769b4fab33a1e39d14b7aa6953212728f22c2d68f10f3de826f826c3e57 WHIRLPOOL 01fb58d969b599c6a7dd5c6d6984d259df8f79e19981d8ba14fb5a06f1374c67f6c7a80d52b8c701531cb85755e4e710e14b3a5ea6db81318d824592b61398a7
 DIST netbeans-trunk-nightly-201310180001-src.zip 193656938 SHA256 8ea8478ce28112b492cf7d460416d4bd6c408b627baa57879e351cd04b54031b SHA512 bdb5557f5eb8ec59ca52476ed4649316bf890e1d8721933a084a7a4f714c3f9b0b7026a6a9e043bae1e28c0f2a30b413f625f3775575962b8ecdedb8b762d656 WHIRLPOOL 73ec143e9155f6b0cc21a2144419feb6981ddc582d4adcc58a6668b698aac72fef9c80a7ee18df08b92d17fe7ad138d9227281ea61861a36908c180de41790bb
+DIST netbeans-trunk-nightly-201310240001-src.zip 193855785 SHA256 211ba26a46d366423b859c63a59cdafcb26ad29c16678094fb3037cd93937875 SHA512 dcc0d91a909b40721b3f8b5011318d6ec36dd30fca035530c6456b0bb41e12606e046cabebb0d1bf22ebba16cfd54ed04d25a81e878e9c844d71080451839b15 WHIRLPOOL 6c677335f795ca02116189162ac10808dd260133c7be4a67b7333c0a94296907cbb2d0bf492d47d9b0b8fd063977139c2df98d5ff635b776ee1df449669a09d4
+DIST netbeans-trunk-nightly-201310300001-src.zip 193888205 SHA256 8bdac1e58e9e6b710fc0f76669989ae2be95350a2c8cad63c89db7a83bdc60ce SHA512 9d25a803152ef40bfca42842dc7337036a8371ddb59748bdb37256c6fc201629d9440187e1d8d2d1ce249cee0827d4621e3b4043948edf1955ecb2231474f4ba WHIRLPOOL 1990e9a9de8b4b63a841ba5304ba5574dffb25e61a39a10b6dab74cfecd699ca392e86443857cb6a9a138f0913926474addd7ffed2c2c020038357b6b5d73725
 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
@@ -22,5 +24,7 @@ EBUILD netbeans-ergonomics-9999_p20131011.ebuild 2893 SHA256 334c6f2f847a75c0717
 EBUILD netbeans-ergonomics-9999_p20131016.ebuild 2893 SHA256 b44898a4ccc6c5797bb215a2ccf85644934dbeb9d3a6a444720ed47827a0330a SHA512 177aae242c81f094bfb5236ba5ad1aa3eccb3f426c6528b43e43871925c9c8ec446900e54d757dbe1dda633a5ed41687d5baa39d98d2f284f46b9e0b4ed364bb WHIRLPOOL 8605829c85dc0e0816ad9cb3ca0d1db79224021ae84f1aa6393947a92e35cb1d0c8417478fefea6f697c0bd005a677fab24ad85a80993afd47d147745778e20f
 EBUILD netbeans-ergonomics-9999_p20131017.ebuild 2893 SHA256 0ee71ad7f14ace69809e74c383b0f48797f9319dd3ce3010fbff31ae7a3d61e9 SHA512 db3852b38f14102c94dbc9981d408b59165279d04d825ca10866e37f9139c9cb3268f727833654ada761d6f4ce14c8ecb3834e67a438697dd4ee09ba64bf0b08 WHIRLPOOL 54ab0a884a2a21e2f63a61c13642b01ca5a20c69d24fa1169717b3f4c74611c1234cdd1a34b30d1f2197d96ec399cb30ce9d5236cfee46be0525de476d481028
 EBUILD netbeans-ergonomics-9999_p20131018.ebuild 2893 SHA256 7cce96af4b8a17b13f86f58c439efec146c070f62ec16c75655c9b8ba61123ff SHA512 1986aa8ef33b77927a546c246a33a1e9a87928cee74d18388605851b46ef7dfccf49d6dc6af98bb8f3448e9236922e78b90080ef4d71b0183aef650f719201f5 WHIRLPOOL eea9579d7c5ccae4f27762cb9ddc310f52bcc11c672470f97387aeeb652a24e39c087c6997067ec1dce64a7514cd16720b602a1f6896ea47ddff993acfef3afd
-MISC ChangeLog 93267 SHA256 b7c67ff940f5bd82c7496731c0fd6bae5bfd53186649b48878c3f7217ad175c9 SHA512 ea75697b5f2a98a0e470a01d22d41255fc8a692bb30dcfe3d3f490d5d14b3c2310ecb5b29a597bf23fab49b81a74461537ad42434ac18c7256583e642ab5d3f3 WHIRLPOOL ce64a406e780584d44b5deb850c2dbf84fc0d58d4716b2afafd7621b49e325d4fe435f1099d0aa18e052aae26499b475cef331e021d47dd94a9b3332b2eb863f
+EBUILD netbeans-ergonomics-9999_p20131024.ebuild 2893 SHA256 e50f62935d723f3d32ee1d0dc87db2bd2262fc238ad1294ed07aa96ec1ac0088 SHA512 82e4073680b7697ec09f67b32b3dda5a3c8eeae350182f80cd13621ad88aba52ee5d303e0d9802d67029d5d8d44c90da775e482e87709d699f72bcefa2e578dc WHIRLPOOL 812e30f6d919dc87bc72a4b7a1e896cc67de568e000d0d25829aef89065222006ded0af591354218ba20706f04d6821074c891d721bfed8bc2c174d631b42a5f
+EBUILD netbeans-ergonomics-9999_p20131030.ebuild 2893 SHA256 81cfab37d6c9eed0b47c4e8ea254aa5c1043076d806f5eb451125c25cf42ce07 SHA512 62d355d89218d858c36ec1e9eda6de680cea5c9c1347f2de44e0e12f74513684a739145b906c94d719725e325d98d51e828be1876987a3b3cd1b0996e25b06fc WHIRLPOOL 7dc01bb8f0cba5f0b557eb2fa6cc58c0b580fea81de084a49fa089ecc791fc50669e22ccbe6d42b34f96254fbf1ee75d4bb821a46a40680b2f3e73a30d7ee0d4
+MISC ChangeLog 93548 SHA256 7e0442d095033777eba360a380d4bb01bb05c5628e03419e2ee6791d59da5270 SHA512 f0cdeb69b53d921981cedb9686794b5019f6adfc3070460ec9c3009172127225268b5b17172210a7e9d902a8be4d1b530e2169cf0ece24866931bad3b3c33276 WHIRLPOOL 71144036c6d16fba0732de14b60c8ced83d79fe94a0a3a253c595213db908a11af0367831f40456bf9f8788f31a6182bead02549a0becc7650ccb2d29b2a2aed
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20131024.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20131024.ebuild
new file mode 100644
index 0000000..1a6bd32
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20131024.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2013 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/2013-10-24_00-01-44/zip/netbeans-trunk-nightly-201310240001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r12-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"
+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-r12-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r12-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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-ergonomics/netbeans-ergonomics-9999_p20131030.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20131030.ebuild
new file mode 100644
index 0000000..7b8d582
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20131030.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2013 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/2013-10-30_00-01-44/zip/netbeans-trunk-nightly-201310300001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r12-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"
+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-r12-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r12-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 0c66174..a951d28 100644
--- a/dev-java/netbeans-extide/ChangeLog
+++ b/dev-java/netbeans-extide/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-extide-9999_p20131030 (30 Oct 2013)
+*netbeans-extide-9999_p20131024 (30 Oct 2013)
+
+  30 Oct 2013; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-extide-9999_p20131024.ebuild,
+  +netbeans-extide-9999_p20131030.ebuild:
+  bumped to latest nightly sources
+
   24 Oct 2013; Miroslav Šulc <fordfrog@g.o>
   -netbeans-extide-9999_p20130926.ebuild,
   -netbeans-extide-9999_p20130929.ebuild,

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index 9c6f6e8..3acf3c1 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -9,10 +9,14 @@ DIST netbeans-trunk-nightly-201310110001-src.zip 186966977 SHA256 a987a5c4860c63
 DIST netbeans-trunk-nightly-201310160001-src.zip 193552704 SHA256 0d002764a1b5c5ef31ebe11101dc0125d0fd48d8e3daead824e3cec050e6bae8 SHA512 58227a201cddb7c89c171a3baa048f09ad437966522af4f39378e9cf2b6806407c895273f0ada5d5d2dd7e8679df2d82b3a2420fbe4c3ccf9b974b0778d20933 WHIRLPOOL 61c0682814a40948b234b30e320b5148ca05db33464e1f33f6d5d324c722b22ef8fdbe5aaeb4270a159d20319ae13f53a1fbe0e9df15702abfd955ec5c5642af
 DIST netbeans-trunk-nightly-201310170001-src.zip 193650002 SHA256 565ec13ba1f769b17e2172c257ca8c8058dda5851101fdd0a1a096f9f41c5b7d SHA512 1a3c385c2b95fa4328f02e4fe55e8850df9e149de1b62930cffc235a4063c9ff3e412769b4fab33a1e39d14b7aa6953212728f22c2d68f10f3de826f826c3e57 WHIRLPOOL 01fb58d969b599c6a7dd5c6d6984d259df8f79e19981d8ba14fb5a06f1374c67f6c7a80d52b8c701531cb85755e4e710e14b3a5ea6db81318d824592b61398a7
 DIST netbeans-trunk-nightly-201310180001-src.zip 193656938 SHA256 8ea8478ce28112b492cf7d460416d4bd6c408b627baa57879e351cd04b54031b SHA512 bdb5557f5eb8ec59ca52476ed4649316bf890e1d8721933a084a7a4f714c3f9b0b7026a6a9e043bae1e28c0f2a30b413f625f3775575962b8ecdedb8b762d656 WHIRLPOOL 73ec143e9155f6b0cc21a2144419feb6981ddc582d4adcc58a6668b698aac72fef9c80a7ee18df08b92d17fe7ad138d9227281ea61861a36908c180de41790bb
+DIST netbeans-trunk-nightly-201310240001-src.zip 193855785 SHA256 211ba26a46d366423b859c63a59cdafcb26ad29c16678094fb3037cd93937875 SHA512 dcc0d91a909b40721b3f8b5011318d6ec36dd30fca035530c6456b0bb41e12606e046cabebb0d1bf22ebba16cfd54ed04d25a81e878e9c844d71080451839b15 WHIRLPOOL 6c677335f795ca02116189162ac10808dd260133c7be4a67b7333c0a94296907cbb2d0bf492d47d9b0b8fd063977139c2df98d5ff635b776ee1df449669a09d4
+DIST netbeans-trunk-nightly-201310300001-src.zip 193888205 SHA256 8bdac1e58e9e6b710fc0f76669989ae2be95350a2c8cad63c89db7a83bdc60ce SHA512 9d25a803152ef40bfca42842dc7337036a8371ddb59748bdb37256c6fc201629d9440187e1d8d2d1ce249cee0827d4621e3b4043948edf1955ecb2231474f4ba WHIRLPOOL 1990e9a9de8b4b63a841ba5304ba5574dffb25e61a39a10b6dab74cfecd699ca392e86443857cb6a9a138f0913926474addd7ffed2c2c020038357b6b5d73725
 EBUILD netbeans-extide-7.4.ebuild 3311 SHA256 8585e0b9eac3b9bb35d5b5e0152936f84708a824d76831930a3dfd3d196556b0 SHA512 19eceec7a634923b4712eb277a1ff9900a2eb4d9ac0a2c699175333c263f0c02baaf24eb30bd7919444f5c9df751186689b2d4359ca1c88dca02884d7c18c3cd WHIRLPOOL e64509f198c4d09851f98d5bd2ddd5b469b0a7c0f3122f391c17833e5d6d77b7a6c2fd9e942e34f2df42047504ad40593f97af9b2898450e769c7b012355c316
 EBUILD netbeans-extide-9999_p20131011.ebuild 3357 SHA256 f983da124be264d733f8706455b24d785be0264d77c154d143bc6a08920b4250 SHA512 73e3eb4585fca6a8c749a6e0750b0c177ce6795b7ad84570a5db455b76dce3436bfccdbd76f730eca55a300d46699b15c28c7dc2018c27c3caab454a133270bc WHIRLPOOL e4b5e792496c182d904ba673c99df237375aba24f798433ce44f6c45b767ddcb90a3132d8164e35cf0c27eef83218dd122819f050a609f3867a593c275bbba5d
 EBUILD netbeans-extide-9999_p20131016.ebuild 3357 SHA256 2379227d4ce6bf65c3219f20f7650e1dd806f928d7e85fdfeb88c02593933449 SHA512 75aa3abd611d846f59d23f18727a2022da639fe7742d187603720e553d601313b919d29541c354dcd92e6acbfeeecb05dbe63aa782d43210b0b3b543085573d7 WHIRLPOOL cdb7f95d975f734ae802f0ca2c5889f4b807f6d2af5db7b887545697bd616d99113f4e645fcb5a8554342f45abbfb1f512d809dafc3eeb4b6e3befbcfa90e026
 EBUILD netbeans-extide-9999_p20131017.ebuild 3357 SHA256 70ef1e116fd337e73b23d985ac52248bf366bed68ff8a0373b69d8961022359a SHA512 4503fe0ccb75ac6806ca2a31abac085c5a79aaf6c9fb07aa9b3de7609fad6892e2a8681d92d9ccc5e89cff6b31916a9f839e11b4d7aed90ee28331e201b8d0c9 WHIRLPOOL d8e1f084d0dc028fa828dcce580adb5f4626ae42b2756ea56ce6e0747456cdc84f3a73a1feb29ae0f738ed90c2852104340fdd0683f41691ea6213179ef559c6
 EBUILD netbeans-extide-9999_p20131018.ebuild 3357 SHA256 1ad45735f974ec3276505c9438af3b3d132fcce84a1a369e5b9eff588648efab SHA512 9d74d6c4201278a32127bc1cc193863e92d627f7a5f6784ec186803b61d0ccd5a5e73e7a553bd99c8808c699afacdaaa0de4ba7b2a9fcb796714523251c53a13 WHIRLPOOL d4cfa5ab5478ea0bae6862705c2683b33e582f0fd4e6e28c02ff11c9b54a72b4d45d0b2926d1890494459459be22648909d7df8445beeb5687132c5957e78836
-MISC ChangeLog 21014 SHA256 58189fbaa482bee30b811a81d3c578ab3e4d8eb1fbf28b83fbfd917f89b18a5d SHA512 56bbc7ad3b69014ec904410059535924f188dc36e647607280b6f8232a2129aeb7f9f1d6440a60f4ed0b28057725289f44c7bf5ba1a66ef17850e957df3ecd46 WHIRLPOOL 6c0f160d09bf9c1275003a6813f33fc964c16d0afba1bf3eb8cec4a2dfc713d2bd8530a6420ed0fb523fb3df2b085e65bd6da0c230eb4dd3fafb780511fdc8e8
+EBUILD netbeans-extide-9999_p20131024.ebuild 3357 SHA256 7bfbb7f1645a643e6b303f729b9b5eefa139acf5f0b08f3e3976a2c5bffdcc4e SHA512 c94c2d91482b577a13eef00e5ee4c0f99b0c14241b12b12f164696a53c0b76a8c92b38cb502f013686c2cca325e48efac2b37d024325db35bfeca0089b372151 WHIRLPOOL cedbc2942117eb86ad086cdeeb53893156b332c0f977e759ce5800297d213a1e658b10963dc0e14ad82d76a52d802c906352e18c6245f3bf2964ac0674ebdcaa
+EBUILD netbeans-extide-9999_p20131030.ebuild 3357 SHA256 6520478398890411730bec64852bcea6c307ad1c0a657966a8045ee92bff056b SHA512 a92543cf4d3d85b2d39ce95406f1b4feb333f0084522595819eecd39420fe1000c1a1577baacd0938c4c77e445de46570ee252737d5d9639c20dc5cb7231943c WHIRLPOOL 92efda77d7cad82a82d71446380c22cf458be797e6a1bd601f68b2efd23125a699fa269847ac1c06735e438bce0ac5f5519c99a239edba7edbd22f71dc9196a0
+MISC ChangeLog 21279 SHA256 3277a65361d53f6fc24b0b4c61ada17d49b9d56665316cae715ea7cfac8b8c4a SHA512 3da67f071807b7eb640ae97285062112e17097ec8324f0e7641876804d9ee82236db6e637ea7a93a4e58bcba0ab19733fde93263e7166e718683fae9361e2f1a WHIRLPOOL 7a89f4c20139ce89df77c8421862de3cf25e470986c580c8911cad4a680c8b23d62aae9d2fba5d9a6e6d4d2e809482c425a275d327e3cb50dd5cee85b3d27b25
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20131024.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20131024.ebuild
new file mode 100644
index 0000000..d9a5041
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20131024.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2013 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/2013-10-24_00-01-44/zip/netbeans-trunk-nightly-201310240001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r12-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/51449E030F3A5F80327536CC51D75EE9D7E59BDA-ant-libs-1.9.2.zip
+	http://hg.netbeans.org/binaries/BEB2DE1B81AFF4A4B68D7839BB10341EE10A7A55-ant-misc-1.9.2.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"
+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-r12-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/51449E030F3A5F80327536CC51D75EE9D7E59BDA-ant-libs-1.9.2.zip o.apache.tools.ant.module/external/ant-libs-1.9.2.zip || die
+	ln -s "${DISTDIR}"/BEB2DE1B81AFF4A4B68D7839BB10341EE10A7A55-ant-misc-1.9.2.zip o.apache.tools.ant.module/external/ant-misc-1.9.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-r12-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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-extide/netbeans-extide-9999_p20131030.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20131030.ebuild
new file mode 100644
index 0000000..36a29db
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20131030.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2013 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/2013-10-30_00-01-44/zip/netbeans-trunk-nightly-201310300001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r12-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/51449E030F3A5F80327536CC51D75EE9D7E59BDA-ant-libs-1.9.2.zip
+	http://hg.netbeans.org/binaries/BEB2DE1B81AFF4A4B68D7839BB10341EE10A7A55-ant-misc-1.9.2.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"
+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-r12-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/51449E030F3A5F80327536CC51D75EE9D7E59BDA-ant-libs-1.9.2.zip o.apache.tools.ant.module/external/ant-libs-1.9.2.zip || die
+	ln -s "${DISTDIR}"/BEB2DE1B81AFF4A4B68D7839BB10341EE10A7A55-ant-misc-1.9.2.zip o.apache.tools.ant.module/external/ant-misc-1.9.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-r12-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 9877270..884cd6c 100644
--- a/dev-java/netbeans-groovy/ChangeLog
+++ b/dev-java/netbeans-groovy/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-groovy-9999_p20131030 (30 Oct 2013)
+*netbeans-groovy-9999_p20131024 (30 Oct 2013)
+
+  30 Oct 2013; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-groovy-9999_p20131024.ebuild,
+  +netbeans-groovy-9999_p20131030.ebuild:
+  bumped to latest nightly sources
+
   24 Oct 2013; Miroslav Šulc <fordfrog@g.o>
   -netbeans-groovy-9999_p20130926.ebuild,
   -netbeans-groovy-9999_p20130929.ebuild,

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 1acda8e..c3563f8 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -17,6 +17,8 @@ DIST netbeans-trunk-nightly-201310110001-src.zip 186966977 SHA256 a987a5c4860c63
 DIST netbeans-trunk-nightly-201310160001-src.zip 193552704 SHA256 0d002764a1b5c5ef31ebe11101dc0125d0fd48d8e3daead824e3cec050e6bae8 SHA512 58227a201cddb7c89c171a3baa048f09ad437966522af4f39378e9cf2b6806407c895273f0ada5d5d2dd7e8679df2d82b3a2420fbe4c3ccf9b974b0778d20933 WHIRLPOOL 61c0682814a40948b234b30e320b5148ca05db33464e1f33f6d5d324c722b22ef8fdbe5aaeb4270a159d20319ae13f53a1fbe0e9df15702abfd955ec5c5642af
 DIST netbeans-trunk-nightly-201310170001-src.zip 193650002 SHA256 565ec13ba1f769b17e2172c257ca8c8058dda5851101fdd0a1a096f9f41c5b7d SHA512 1a3c385c2b95fa4328f02e4fe55e8850df9e149de1b62930cffc235a4063c9ff3e412769b4fab33a1e39d14b7aa6953212728f22c2d68f10f3de826f826c3e57 WHIRLPOOL 01fb58d969b599c6a7dd5c6d6984d259df8f79e19981d8ba14fb5a06f1374c67f6c7a80d52b8c701531cb85755e4e710e14b3a5ea6db81318d824592b61398a7
 DIST netbeans-trunk-nightly-201310180001-src.zip 193656938 SHA256 8ea8478ce28112b492cf7d460416d4bd6c408b627baa57879e351cd04b54031b SHA512 bdb5557f5eb8ec59ca52476ed4649316bf890e1d8721933a084a7a4f714c3f9b0b7026a6a9e043bae1e28c0f2a30b413f625f3775575962b8ecdedb8b762d656 WHIRLPOOL 73ec143e9155f6b0cc21a2144419feb6981ddc582d4adcc58a6668b698aac72fef9c80a7ee18df08b92d17fe7ad138d9227281ea61861a36908c180de41790bb
+DIST netbeans-trunk-nightly-201310240001-src.zip 193855785 SHA256 211ba26a46d366423b859c63a59cdafcb26ad29c16678094fb3037cd93937875 SHA512 dcc0d91a909b40721b3f8b5011318d6ec36dd30fca035530c6456b0bb41e12606e046cabebb0d1bf22ebba16cfd54ed04d25a81e878e9c844d71080451839b15 WHIRLPOOL 6c677335f795ca02116189162ac10808dd260133c7be4a67b7333c0a94296907cbb2d0bf492d47d9b0b8fd063977139c2df98d5ff635b776ee1df449669a09d4
+DIST netbeans-trunk-nightly-201310300001-src.zip 193888205 SHA256 8bdac1e58e9e6b710fc0f76669989ae2be95350a2c8cad63c89db7a83bdc60ce SHA512 9d25a803152ef40bfca42842dc7337036a8371ddb59748bdb37256c6fc201629d9440187e1d8d2d1ce249cee0827d4621e3b4043948edf1955ecb2231474f4ba WHIRLPOOL 1990e9a9de8b4b63a841ba5304ba5574dffb25e61a39a10b6dab74cfecd699ca392e86443857cb6a9a138f0913926474addd7ffed2c2c020038357b6b5d73725
 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
@@ -26,5 +28,7 @@ EBUILD netbeans-groovy-9999_p20131011.ebuild 3396 SHA256 132ee6d45ec882eb4391b3a
 EBUILD netbeans-groovy-9999_p20131016.ebuild 3396 SHA256 dd807e28ba705f3623e842d860feca6c9c67468c1d69ddd36eccff3282f15a78 SHA512 7062ff96ca103d6e504617250286b06684f50754451be483dc5aa0c076ed69a875a4256ae710dbc805901e6736ab0432a862f7e8ad3e13e2a6fc8077616335b4 WHIRLPOOL 73d5665a52c544caad9123316e7f5a301bb5c8813b041e44f6953cde2f24198d858ddc8d68f3925435ae16f99ecdbf9e81a3cbab29863ebfd2019745fc6f07e0
 EBUILD netbeans-groovy-9999_p20131017.ebuild 3396 SHA256 5b5748900027166f472dedf61fceb7088d83ee03f2adeb3cbbd0e2acb16af057 SHA512 a4e33f6c4f71d7739b4c563785e6f819dc35066d3d3772f84b3b29af3f935d0b7112eeba8079bf488b00598fa15ac18c907d05a88b3ada84bb8bd95ec612a36c WHIRLPOOL b2f19b8e1ea635cce87eb6b16ea22ffef378dd59dc67a946f8ab64737ddb5bfa154af94f026ff864f88850d73bb0f0cc2eb880317b9e73b9476db01445cd3d2e
 EBUILD netbeans-groovy-9999_p20131018.ebuild 3396 SHA256 25f1e9952bafbd6d26fde6bff20d718a2de428013264c852e029fe561ed3ee31 SHA512 3bb6bf79b959662c545aaaeb267e405ad890b040faac5d7fa372cddae0ac5aa8e01c1e564d6be70e5bfb596eabc8947f339b70399b9341f2d9041f159cb85282 WHIRLPOOL 254a0c19bfc8d85268eaa61e59d03c7b42406cb26aec7ea83d2a23106528641251b6bc5a814b6dab2ab0175c214048127df2c99ce0157b78b9ec966b1261e8f9
-MISC ChangeLog 88994 SHA256 a0ab7c32aa8025c382e2b5fcbc2cfa1660b79b5c62b312d1cc6cba8b3d43bbe2 SHA512 5d4d08c7f3eac76776e04215b391bf52320378d0b238e884fd8bfafccd2bf213b9ea4c4cc3646eeafed67441bf670c2bc46e512c98a03615d607ba66f1395802 WHIRLPOOL c4b303d2b9e7b04a6100e7e64c81cd7a0bc6ff3c1644dbc21ad209dcabbbc946742ad316b8c72bd79ccacdef6874b43e7dedbed5ece2f6e59ef02dc609165843
+EBUILD netbeans-groovy-9999_p20131024.ebuild 3396 SHA256 5a9dbccc43dc4306aaaa6d207795db6606227e6609749424c547bb79b7bccf87 SHA512 569c10dc953f73d6ba9151e552768ed4aa0550051127db8a6afec1fd662d83e22cd41e0b0641983500c6184dcfe771003264640fb0765e974b3b3a7618b20490 WHIRLPOOL 61b6f9fc5c773ec629c144af5b4442bea1624a229567a97a99d15f4643d9bf1aa49c766e41f2ef8dd26aad29c893eb2a26e76bf9c4cbf79d9278ba1bb5c66013
+EBUILD netbeans-groovy-9999_p20131030.ebuild 3396 SHA256 6a664bbef5e98ffa34bacc621dbc7c6fe281b24a10300c3e2fd191ef96414aee SHA512 fbfc15b36f131bd38afaed83d3585007f8fd2643be653dedcd840caee84eaff05b0061aa2d5d145fe095d3a9f5fb6bc46f3adda3c919c99f93ed62a2c6b182a5 WHIRLPOOL 6d2574c77402bfa8406640bddbc5d37b7768e209147936c179b1d452029322d75f361cf2295f8fcc2fff8d0834d0fbba8245751ba126506c476f3a189c854c25
+MISC ChangeLog 89259 SHA256 7541c804150feb280d59bebeab5603f48c84fdaad5007d70ffe68d14172e48da SHA512 4932ea476adb4ecd4758acd05622c5a2640d05d2b28ebc52594785636b2c29d1f845987480896421952e45eb37faff3634b65302d5bf6df6a49bcd229765521b WHIRLPOOL d46b4c5ceeeb076057f68a4c8891fb93179133c04c363803672156bc03824efba5495ef0f3174e19a4de51c1456fcad2347ea30c56c01afe08bb31248932f22e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20131024.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20131024.ebuild
new file mode 100644
index 0000000..3c3915d
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20131024.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2013 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/2013-10-24_00-01-44/zip/netbeans-trunk-nightly-201310240001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r12-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"
+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-r12-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-r12-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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-groovy/netbeans-groovy-9999_p20131030.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20131030.ebuild
new file mode 100644
index 0000000..be003d0
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20131030.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2013 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/2013-10-30_00-01-44/zip/netbeans-trunk-nightly-201310300001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r12-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"
+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-r12-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-r12-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 673c07b..b5c8b6e 100644
--- a/dev-java/netbeans-harness/ChangeLog
+++ b/dev-java/netbeans-harness/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-harness-9999_p20131030 (30 Oct 2013)
+*netbeans-harness-9999_p20131024 (30 Oct 2013)
+
+  30 Oct 2013; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-harness-9999_p20131024.ebuild,
+  +netbeans-harness-9999_p20131030.ebuild:
+  bumped to latest nightly sources
+
   24 Oct 2013; Miroslav Šulc <fordfrog@g.o>
   -netbeans-harness-9999_p20130926.ebuild,
   -netbeans-harness-9999_p20130929.ebuild,

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index e659508..56f96f0 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -19,6 +19,8 @@ DIST netbeans-trunk-nightly-201310110001-src.zip 186966977 SHA256 a987a5c4860c63
 DIST netbeans-trunk-nightly-201310160001-src.zip 193552704 SHA256 0d002764a1b5c5ef31ebe11101dc0125d0fd48d8e3daead824e3cec050e6bae8 SHA512 58227a201cddb7c89c171a3baa048f09ad437966522af4f39378e9cf2b6806407c895273f0ada5d5d2dd7e8679df2d82b3a2420fbe4c3ccf9b974b0778d20933 WHIRLPOOL 61c0682814a40948b234b30e320b5148ca05db33464e1f33f6d5d324c722b22ef8fdbe5aaeb4270a159d20319ae13f53a1fbe0e9df15702abfd955ec5c5642af
 DIST netbeans-trunk-nightly-201310170001-src.zip 193650002 SHA256 565ec13ba1f769b17e2172c257ca8c8058dda5851101fdd0a1a096f9f41c5b7d SHA512 1a3c385c2b95fa4328f02e4fe55e8850df9e149de1b62930cffc235a4063c9ff3e412769b4fab33a1e39d14b7aa6953212728f22c2d68f10f3de826f826c3e57 WHIRLPOOL 01fb58d969b599c6a7dd5c6d6984d259df8f79e19981d8ba14fb5a06f1374c67f6c7a80d52b8c701531cb85755e4e710e14b3a5ea6db81318d824592b61398a7
 DIST netbeans-trunk-nightly-201310180001-src.zip 193656938 SHA256 8ea8478ce28112b492cf7d460416d4bd6c408b627baa57879e351cd04b54031b SHA512 bdb5557f5eb8ec59ca52476ed4649316bf890e1d8721933a084a7a4f714c3f9b0b7026a6a9e043bae1e28c0f2a30b413f625f3775575962b8ecdedb8b762d656 WHIRLPOOL 73ec143e9155f6b0cc21a2144419feb6981ddc582d4adcc58a6668b698aac72fef9c80a7ee18df08b92d17fe7ad138d9227281ea61861a36908c180de41790bb
+DIST netbeans-trunk-nightly-201310240001-src.zip 193855785 SHA256 211ba26a46d366423b859c63a59cdafcb26ad29c16678094fb3037cd93937875 SHA512 dcc0d91a909b40721b3f8b5011318d6ec36dd30fca035530c6456b0bb41e12606e046cabebb0d1bf22ebba16cfd54ed04d25a81e878e9c844d71080451839b15 WHIRLPOOL 6c677335f795ca02116189162ac10808dd260133c7be4a67b7333c0a94296907cbb2d0bf492d47d9b0b8fd063977139c2df98d5ff635b776ee1df449669a09d4
+DIST netbeans-trunk-nightly-201310300001-src.zip 193888205 SHA256 8bdac1e58e9e6b710fc0f76669989ae2be95350a2c8cad63c89db7a83bdc60ce SHA512 9d25a803152ef40bfca42842dc7337036a8371ddb59748bdb37256c6fc201629d9440187e1d8d2d1ce249cee0827d4621e3b4043948edf1955ecb2231474f4ba WHIRLPOOL 1990e9a9de8b4b63a841ba5304ba5574dffb25e61a39a10b6dab74cfecd699ca392e86443857cb6a9a138f0913926474addd7ffed2c2c020038357b6b5d73725
 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
@@ -28,5 +30,7 @@ EBUILD netbeans-harness-9999_p20131011.ebuild 4105 SHA256 039f40db9ad2fd92bf470e
 EBUILD netbeans-harness-9999_p20131016.ebuild 4105 SHA256 d35b3283484e0f0fa55d7f8229e55f5c4b9627a12c05fa73a9d39a7b41beef40 SHA512 981353042061617ce7266f5cbb360e0dcf80dd858dd70de102f38e5cd3ee89bba5760671d472a5c64c2e4f7d06fd7042a352fe6d0e20235258361b3f915d0e0b WHIRLPOOL c41050f63f2967b73fce55f842dfb4200705272e777c3b0f12644272b199aa64d951a1886a989a28d8730c0c369f7cb6e34104e5021cbe90ec2d9b785ad47f49
 EBUILD netbeans-harness-9999_p20131017.ebuild 4105 SHA256 dae617e75474ffd78517da57c5504ce67be6431ed76371d52dbe1ca84b3afa0e SHA512 5750600242bdef13ddc9e77b3edbff300f112b6bda5f2eea1238bff0819f3c9c43491b797c0baca201af07d37895b9209707c315f91bd7bf66f32c59de23dd9f WHIRLPOOL 1c7e42bcb832925bd7155a4a97bb9de03f1ff9e619df0552839d0a2fcf799baf7e22ff600bfbd5b6cc856e6e616d8892f723b8b968f142a660bf38bf3e85e49d
 EBUILD netbeans-harness-9999_p20131018.ebuild 4105 SHA256 63c5aba0b33042e20d08b43d76cf1a691ecc7a1d22a293061e28ce6807dc123b SHA512 d5374037ddb3bb8adb8675e7a370ec0e5fee9c09137827c072fae96f06ec064908fc916d369978d51a32e57829ae2ff937d90f11a268ee07d7cfd907c13bacb9 WHIRLPOOL 33601ec562525a1ea58cae7301c43a261f56ff86c6903467bd86b65e0eb3fee630949b8c75a0a6c0b952bd0806e0b528d7c280c3cec04260653c21a1b9df84a1
-MISC ChangeLog 90091 SHA256 9d88ddafeac9b7abea4c8005651db53d9158ae1ef6c99f47b4e87e0317cb203e SHA512 492fb937c726ad08b085d738c46046405f0b0dad55bb0737c9dd835e37b17f44373ef14bcec07afe30ba1d9be163344246b94bae0488bd8832f14675efb87d51 WHIRLPOOL c4d452fd1407be425f286dfe4a90f4349644190181760804fc5a2ade326dd89e99fa23924595fbdaaa7639ecc68f3ef992811bfb91f831a93a46553817dee546
+EBUILD netbeans-harness-9999_p20131024.ebuild 4105 SHA256 c54c853723565e981775250f424f570dad116126dfa3bee53cc636aceefdf10c SHA512 163b13d916746095a3318ca1855f03089059d7fa5f8f64d84eb9efb9d45850ccf7aef588db9e786cd2fa8d5a78b63ff1240140b59ccd363fb505c4b5aa7f1647 WHIRLPOOL 8904baabfef7818e409d39445d464834dc4e112906e818a45bd3645848e6844eb130be3e88d5b794c34dad056bf3fc6f421beab3ff9314ff6cad1406292c38ed
+EBUILD netbeans-harness-9999_p20131030.ebuild 4105 SHA256 fc41a8bb74b4af071935303366bca006eabc74e30258ef959a8673979af793f3 SHA512 c9ba57364beca964e85d6312f67fd356afac973ff5173399142a95d74eda6e1324878defa66ea58824620aa9831a707b0e881b29b151bb07217f820d6cd9e1e0 WHIRLPOOL 9f4ab52ac96f5e1b70e92baa323fb3bc9073070b317d8e0e4ec6dcfccc46139782499da4f29c1e4b31d3b60de62df9856fc778b0f2beaaeca1aaee87b52a0942
+MISC ChangeLog 90360 SHA256 a17f79a5215dba964ca841f6428544a9df58227e5a310cde6702c436f51c62a2 SHA512 d4fbaa546318a9e104896073664f09b68cf381b2ed704774e32b40b6728ba741c0a4739a94fb872991026daec96362b331b7e13fa8d85bfba79cb0fd0f0d9b1e WHIRLPOOL ced7c9f5a7dbdc67fc7ad4d8665eac6813cde6727a414eb091522ed2a8c27b5d2149d6a16d8b8f116fa9ed5e3a417401338b16a0a96bb1ea186eea1fad428d27
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20131024.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20131024.ebuild
new file mode 100644
index 0000000..c0c78f7
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20131024.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2013 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/2013-10-24_00-01-44/zip/netbeans-trunk-nightly-201310240001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r12-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"
+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-r12-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-r12-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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-harness/netbeans-harness-9999_p20131030.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20131030.ebuild
new file mode 100644
index 0000000..f2a40f0
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20131030.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2013 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/2013-10-30_00-01-44/zip/netbeans-trunk-nightly-201310300001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r12-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"
+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-r12-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-r12-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 74b9ef4..5485a54 100644
--- a/dev-java/netbeans-ide/ChangeLog
+++ b/dev-java/netbeans-ide/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-ide-9999_p20131030 (30 Oct 2013)
+*netbeans-ide-9999_p20131024 (30 Oct 2013)
+
+  30 Oct 2013; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-ide-9999_p20131024.ebuild, +netbeans-ide-9999_p20131030.ebuild:
+  bumped to latest nightly sources
+
   24 Oct 2013; Miroslav Šulc <fordfrog@g.o>
   -netbeans-ide-9999_p20130926.ebuild, -netbeans-ide-9999_p20130929.ebuild,
   -netbeans-ide-9999_p20131003.ebuild, -netbeans-ide-9999_p20131004.ebuild,

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index d9b7287..3cb6b42 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -130,6 +130,7 @@ DIST D19F70E8CC5D326509B1BF8C1A8FC87BD258E990-exechlp-1.0.zip 246169 SHA256 46c5
 DIST D1DADE169E1155780F5CCC263E5F9AEAE9ABFE2D-glassfish-tooling-sdk-0.3-b053.jar 443553 SHA256 8775aa7e19bb05e3091d704ac389b5808c26be5a62372ac8b855a66d09e36126 SHA512 3be774aaf28f57e50745e2677b1d9369833b1c047da4b09ecc46435b8b4242f2deff95e6ffa5c2ffdbec4bee9fb24166d5cfeb428e0e30fcbe399231b9fd8d98 WHIRLPOOL e78065b500d3b9fda8aa991c826c5ba313fa04cbd9eb4b868b62cffd515b0c78fec05c9bd7bcae5daaefab4dab0cf9553ac173cfd80e9f77c5d998f9b98c40c0
 DIST D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar 290305 SHA256 5a66f5d12058cdaddf6f945b419c3b2f7fcddbd5e6d3a933ccbebaad569452c7 SHA512 ea583899ebb31f7f55ba5f4e53008bdf8a2e79d472741f288d6b26b259aad788e0c67b197dba5445cc5c269ef9872c6c11b023212482ac7b0a160c777e7be597 WHIRLPOOL 54b52d3946db645db2e9ce608c965abf780e3cf282bb7c4b4ea715905a3ecb148399c62015fa50b8cd098692ab9392f18f8e17340553242829b4a98955235627
 DIST D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar 69186 SHA256 c320feb4e66a0dc0eec284221bb7f09b2f45663f898c690aeb3c716ef6cb5141 SHA512 99fbe678c6f20ad52a59aca159d2eb89c3a670f80453f909c6c9f713a4624b70d0f95b2797596e9a7618d6f1b28e5fd10afb6ce6c02d30b1ef8f98d5fb47d50f WHIRLPOOL 662521c298f3a90ae18c02a4eddd4056312a1aec2742a7d7cdffd8cc62637388ada5bc32d44e7212d600a264c84a588e46058f8a7401030c6694e32a7c5eacdf
+DIST DF1410E5D1DEAACFB70A2441B4766B61F2795BC3-org.eclipse.jgit-3.1.0.201310021548-r.jar 1833272 SHA256 f123f5f0674cc7c501cab5387f7d149eb1d48cb2dedf15b47d9cf6a38c1dc095 SHA512 9c0ddad4bccfcb08c771be9d50f093a93ce6588cc5ae275ab34c6c861bd8437f2128d61f55863699a92db5249d5bf8c37256ec316369f856d7250b78c360bba9 WHIRLPOOL 4612eb7d5a8aed50a32333ccfd602204659ca301aee890cceb20da3947d204eae759f712bfebca5dc1aca0439f82f4456ed00b19a76a8047a721be50c8cc1846
 DIST DF522A06BF4EFD99A12C545C294D940CF6A2E01D-org.eclipse.mylyn.tasks.core_3.3.1.jar 342835 SHA256 a207e1469504969340ded4c6ca02d24624c05148e08f1ddd9b0ebf8311532cd1 SHA512 3da2c22f34523b4a55fcccc1bde0f7d2633076dd83b25c054cf6e0a107c96158a4e52c8cb9aa07b44b437bbc1a738ef7d4933602dd95b9704265f013935a1824 WHIRLPOOL 03d9313c80de0372665187f81a85b81984c05b2f2a3e6939ddd5c56e5b2eadca482d9de635d61585c39d4697147d52fd223822e9d728485c331271250e7fc801
 DIST DF8DD2981C9C3EBEDB059CA98450B587E784AF58-org.eclipse.core.contenttype-3.4.100.jar 91927 SHA256 5a8f7681cf9b53f221ddbd8806bc97060886d4db128c384e83e9be0b335098f5 SHA512 24f84704d57f395bf418b312e1aeee3b97ad98eab272e975a19541cb908126f979034a2119d4a74cfb6b77e0953f481e8c1ad400f49d1dde18234db3293f2fcb WHIRLPOOL 7d8c8b1ad5bb6c119afe3494e3eeabc809762df8179b09ae3905454f3779d82f624a2e76d4be77f3e1926faf97c4d4672f79724a468a2767b675533bcb48ee5c
 DIST E0DC3B82DA5C95AC98AE43C4BADC741C2F56A43C-svnClientAdapter-svnkit-1.8.16.jar 92438 SHA256 b06e36c91d7628ff1e2fa7f5959113754a3cc41e694303975f01f21823bbc9b9 SHA512 7d9fec2b36794081966068cf77409626dd2364f5f6c3bfc1311538b9213506cdf9f81b20105acb270c9d14df436ff7b4eb8352ac4ae45395bfab6a2c02c2cc02 WHIRLPOOL d8098a1619564df2f2fba068f6239e561f2cdea5779976cbda64e3feec16787f2a64bb747d5a884f4eb8ab237daedf4f3b85aadc934a86153d6f721e3a178c8a
@@ -160,6 +161,8 @@ DIST netbeans-trunk-nightly-201310110001-src.zip 186966977 SHA256 a987a5c4860c63
 DIST netbeans-trunk-nightly-201310160001-src.zip 193552704 SHA256 0d002764a1b5c5ef31ebe11101dc0125d0fd48d8e3daead824e3cec050e6bae8 SHA512 58227a201cddb7c89c171a3baa048f09ad437966522af4f39378e9cf2b6806407c895273f0ada5d5d2dd7e8679df2d82b3a2420fbe4c3ccf9b974b0778d20933 WHIRLPOOL 61c0682814a40948b234b30e320b5148ca05db33464e1f33f6d5d324c722b22ef8fdbe5aaeb4270a159d20319ae13f53a1fbe0e9df15702abfd955ec5c5642af
 DIST netbeans-trunk-nightly-201310170001-src.zip 193650002 SHA256 565ec13ba1f769b17e2172c257ca8c8058dda5851101fdd0a1a096f9f41c5b7d SHA512 1a3c385c2b95fa4328f02e4fe55e8850df9e149de1b62930cffc235a4063c9ff3e412769b4fab33a1e39d14b7aa6953212728f22c2d68f10f3de826f826c3e57 WHIRLPOOL 01fb58d969b599c6a7dd5c6d6984d259df8f79e19981d8ba14fb5a06f1374c67f6c7a80d52b8c701531cb85755e4e710e14b3a5ea6db81318d824592b61398a7
 DIST netbeans-trunk-nightly-201310180001-src.zip 193656938 SHA256 8ea8478ce28112b492cf7d460416d4bd6c408b627baa57879e351cd04b54031b SHA512 bdb5557f5eb8ec59ca52476ed4649316bf890e1d8721933a084a7a4f714c3f9b0b7026a6a9e043bae1e28c0f2a30b413f625f3775575962b8ecdedb8b762d656 WHIRLPOOL 73ec143e9155f6b0cc21a2144419feb6981ddc582d4adcc58a6668b698aac72fef9c80a7ee18df08b92d17fe7ad138d9227281ea61861a36908c180de41790bb
+DIST netbeans-trunk-nightly-201310240001-src.zip 193855785 SHA256 211ba26a46d366423b859c63a59cdafcb26ad29c16678094fb3037cd93937875 SHA512 dcc0d91a909b40721b3f8b5011318d6ec36dd30fca035530c6456b0bb41e12606e046cabebb0d1bf22ebba16cfd54ed04d25a81e878e9c844d71080451839b15 WHIRLPOOL 6c677335f795ca02116189162ac10808dd260133c7be4a67b7333c0a94296907cbb2d0bf492d47d9b0b8fd063977139c2df98d5ff635b776ee1df449669a09d4
+DIST netbeans-trunk-nightly-201310300001-src.zip 193888205 SHA256 8bdac1e58e9e6b710fc0f76669989ae2be95350a2c8cad63c89db7a83bdc60ce SHA512 9d25a803152ef40bfca42842dc7337036a8371ddb59748bdb37256c6fc201629d9440187e1d8d2d1ce249cee0827d4621e3b4043948edf1955ecb2231474f4ba WHIRLPOOL 1990e9a9de8b4b63a841ba5304ba5574dffb25e61a39a10b6dab74cfecd699ca392e86443857cb6a9a138f0913926474addd7ffed2c2c020038357b6b5d73725
 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
@@ -171,5 +174,7 @@ EBUILD netbeans-ide-9999_p20131011.ebuild 28602 SHA256 5b43c061c3bdc9580e8d78b33
 EBUILD netbeans-ide-9999_p20131016.ebuild 28602 SHA256 20636eaa530c44a1afb0bd05d899d1ee4576d73bbc66fdd6f58854a17c4f70ac SHA512 eccabe66d1aaa027349a00c64c2db466776ec12c078d0bc0939a0587df97027d70c36770b7b9765d94c02c7759aabcaa403588b06d8cf96bb0d63b24fe7714c0 WHIRLPOOL d484d8c776ccc767e3e9863b829fc5642141a531d9f14e536564913a961b21f1bca57c0c32ce62c917532619342f08de42b6f691d14f0f75b1f6ffeba6b59982
 EBUILD netbeans-ide-9999_p20131017.ebuild 28602 SHA256 b22257564d5b4c6379ece29e962f6e8177486eb40fe8e3a2e09bf9d7e9cee06d SHA512 aabceaeb5f4c110bf6038afa428a9766b62803d330629eb0b71be102fe0111d39996bb5485a4bb88b3a388132af4c97b58f3eb98686a0620b89d69caab4415b1 WHIRLPOOL 1b007a6cb902bb1a62197776c3e724ccee5ac8a24746a966d1c324e94d2d079a19ff8203f3c83be4f73f827047b8da205710f0a4f82e41ba72a30a0c0a1bbd3a
 EBUILD netbeans-ide-9999_p20131018.ebuild 28602 SHA256 cd64ef952b756d4d0dda1ee571af588f2bcfbfebe854fd0d3f5e2fb2787e426c SHA512 ac1bfd89abb019674860fb892ffb1c64d304174e4b60091a3fc42824e0fc666ba1f8dbf0fc88c20d76effd3257bf0fb95634ee72bc6f1f59c4b9bb5b794e9428 WHIRLPOOL 861291668af4cc1f80c562d584f00ae1680e86d8391afbfd614a079a4abea61a12280d73c9946993e525b2beef806ba524a91fb4e80a4d99f504c60517282bca
-MISC ChangeLog 86461 SHA256 680cb41526dbd199bc5cae6781c18a05a4730878506bc73596cf30d0101cf170 SHA512 e6d61014305d48932094dc22888996e9847b936776e4b70c61fefaf063061455c0a01eabf362b0a01549faeb8b4e5025d26f1b46f6988ad4565fe45b5f37c0cf WHIRLPOOL 61441d3b3a7f56a6a0fd0c69705364a9ae5d9bc42d6c222c322ed1f57a0a2ea301fb656db18e6a83df6c519d8a00183b83e80a6e31d5804939754915be53893c
+EBUILD netbeans-ide-9999_p20131024.ebuild 28602 SHA256 5814e9c1be57a8a7409f8a49470e2afe79bdeb364ac04e075c4333f2474fb988 SHA512 46b757260e230a5d63ec40068aae38e0865563226e24dbfac3a2c327b5406385b636e333ac12625f23bdd3a3cda6b30b25f7942f881a641f687acd80df64896d WHIRLPOOL a36c9752fe3dea50914b4fd06488cbd7332edc6f0c45f65f52e66bc225a3f7bca78e065ba201f8196aded3b4073cb2bbb53d36b59cfe1638fb959739af9331a8
+EBUILD netbeans-ide-9999_p20131030.ebuild 28602 SHA256 c0ac2922f569b7fc9e7a36c7055a7f6c41f193b3f90bc89a43f9dd2bc763c99f SHA512 b89e0110a81f88d582a3c268883b81f66aa2e0f48ec2939e2f38a34e1cfb7ef5bb224853a2462fb83ecc94fb447c37ad357a354c6a7e67dfe1f7059d050c5424 WHIRLPOOL 89587fcf9d2cffd023296a2a86e41847fa89fe78a8431f07c6c80fa9eb35932afb5c2a0a222fc734f2fc8d9dcc770f65b8c529476db26a0792fbffd0f50d6b92
+MISC ChangeLog 86712 SHA256 fca86f5a4b1fc90153e2e2198ffc145ef587b1268a91ea1a5a697e4f8753c226 SHA512 10f6c8ded4fbf7d9db0b9bfe31224e17be024bf8c44bd3a0305367adbe739dccc7f7b7e882f56fa501c39e2e5e1c018cafa31300571e9b51f204a67a453ec3a4 WHIRLPOOL efdbac76a974ae6179ac98ce3943d4e894f1783a13cb170a0b5df89fab14cd0d583d4f3794d44f1fa42b2e031f4ddd7b7833c5ef206394e663442f0a167e5083
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20131024.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20131024.ebuild
new file mode 100644
index 0000000..f5d678a
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20131024.ebuild
@@ -0,0 +1,364 @@
+# Copyright 1999-2013 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/2013-10-24_00-01-44/zip/netbeans-trunk-nightly-201310240001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r12-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/2110507EBF38D759B9A22F98CB53515112240EC3-glassfish-tooling-sdk-0.3-b053.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/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/F40AAAB7307471E0E8E0C859F60FFD9C5AE2657D-js-corestubs.zip
+	http://hg.netbeans.org/binaries/10E8A91299D9FFCF3395B27B32EC59340AD229EE-js-domstubs.zip
+	http://hg.netbeans.org/binaries/3BDCA362124B8C6A6C7E6B527E2B273E727B26F5-js-reststubs.zip
+	http://hg.netbeans.org/binaries/423D778F13BA995EE7775D6008F47C4E6CB0B6FE-jsch.agentproxy.core-0.0.6.jar
+	http://hg.netbeans.org/binaries/78651EE7D0625B7CF9C38033AF5DCA0CAC9B95B9-jsch.agentproxy.sshagent-0.0.6.jar
+	http://hg.netbeans.org/binaries/AC573C38F16CAE0B89541209AB1E44DEA6F665FF-jsch.agentproxy.pageant-0.0.6.jar
+	http://hg.netbeans.org/binaries/4A03B954787FECAC1043569334D5E8B7A842983A-jsch.agentproxy.usocket-nc-0.0.6.jar
+	http://hg.netbeans.org/binaries/0A55C1FD7A2017D7169919F58EAEEEAADE93F5CA-jsch.agentproxy.usocket-jna-0.0.6.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/DF1410E5D1DEAACFB70A2441B4766B61F2795BC3-org.eclipse.jgit-3.1.0.201310021548-r.jar
+	http://hg.netbeans.org/binaries/6B9C3920D9934A2AA8A43DC59CFECD8794389D42-org.eclipse.mylyn.bugzilla.core_3.9.0.v20130612-0100.jar
+	http://hg.netbeans.org/binaries/9B1D57A59FB2A2A127490455474FCC113B7D1D8F-org.eclipse.mylyn.commons.core_3.9.0.v20130612-0100.jar
+	http://hg.netbeans.org/binaries/62C207D4DAC376FE69FE9701AECDD82C7F70F248-org.eclipse.mylyn.commons.net_3.9.0.v20130612-0100.jar
+	http://hg.netbeans.org/binaries/6F23722EB8EA185FBC752BC31360AFEC726F7603-org.eclipse.mylyn.commons.repositories.core_1.1.0.v20130612-0100.jar
+	http://hg.netbeans.org/binaries/0CA9371811803782E988941E24B5B81D268B75C4-org.eclipse.mylyn.commons.xmlrpc_3.9.0.v20130612-0100.jar
+	http://hg.netbeans.org/binaries/7062F60B3094BE67EEF14899ABA2DD0B886785AB-org.eclipse.mylyn.tasks.core_3.9.0.v20130612-0100.jar
+	http://hg.netbeans.org/binaries/0204A7A3166889079D720352742D789FB62E615E-org.eclipse.mylyn.wikitext.confluence.core_1.8.0.v20130612-0100.jar
+	http://hg.netbeans.org/binaries/1B964C0E8B3F0476B6B211C2320797C60904D666-org.eclipse.mylyn.wikitext.core_1.8.0.v20130612-0100.jar
+	http://hg.netbeans.org/binaries/7CCC1445C7C13894806C007CE3DA32C9C8831C02-org.eclipse.mylyn.wikitext.textile.core_1.8.0.v20130612-0100.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/78CBB04534731D472CA853E024CD7EF136340142-svnClientAdapter-javahl-1.8.18.jar
+	http://hg.netbeans.org/binaries/CF988230BF3FB968C102F400ECA7E642BB371FB6-svnClientAdapter-main-1.8.18.jar
+	http://hg.netbeans.org/binaries/C40AEAD96AADF7E640FC9D0B8501CA839549941D-svnClientAdapter-svnkit-1.8.18.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/A618A836EEF5F88232A10675CE316EC0A9FA4E2B-sqljet-1.1.6.jar
+	http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar
+	http://hg.netbeans.org/binaries/24DD3B605C50A04D6C5FC129D4AD340659236EB5-com.trilead.ssh2_1.0.0.build215.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:0[java]"
+#	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"
+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-r12-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}"/2110507EBF38D759B9A22F98CB53515112240EC3-glassfish-tooling-sdk-0.3-b053.jar libs.glassfish.sdk/external/glassfish-tooling-sdk-0.3-b053.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}"/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 core.browser.webview/external/jfxrt.jar || die
+	ln -s "${DISTDIR}"/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar html.validation/external/jing.jar || die
+	ln -s "${DISTDIR}"/F40AAAB7307471E0E8E0C859F60FFD9C5AE2657D-js-corestubs.zip javascript2.editor/external/js-corestubs.zip || die
+	ln -s "${DISTDIR}"/10E8A91299D9FFCF3395B27B32EC59340AD229EE-js-domstubs.zip javascript2.editor/external/js-domstubs.zip || die
+	ln -s "${DISTDIR}"/3BDCA362124B8C6A6C7E6B527E2B273E727B26F5-js-reststubs.zip javascript2.editor/external/js-reststubs.zip || die
+	ln -s "${DISTDIR}"/423D778F13BA995EE7775D6008F47C4E6CB0B6FE-jsch.agentproxy.core-0.0.6.jar libs.jsch.agentproxy/external/jsch.agentproxy.core-0.0.6.jar || die
+	ln -s "${DISTDIR}"/78651EE7D0625B7CF9C38033AF5DCA0CAC9B95B9-jsch.agentproxy.sshagent-0.0.6.jar libs.jsch.agentproxy/external/jsch.agentproxy.sshagent-0.0.6.jar || die
+	ln -s "${DISTDIR}"/AC573C38F16CAE0B89541209AB1E44DEA6F665FF-jsch.agentproxy.pageant-0.0.6.jar libs.jsch.agentproxy/external/jsch.agentproxy.pageant-0.0.6.jar || die
+	ln -s "${DISTDIR}"/4A03B954787FECAC1043569334D5E8B7A842983A-jsch.agentproxy.usocket-nc-0.0.6.jar libs.jsch.agentproxy/external/jsch.agentproxy.usocket-nc-0.0.6.jar || die
+	ln -s "${DISTDIR}"/0A55C1FD7A2017D7169919F58EAEEEAADE93F5CA-jsch.agentproxy.usocket-jna-0.0.6.jar libs.jsch.agentproxy/external/jsch.agentproxy.usocket-jna-0.0.6.jar || die
+	ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.impl/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}"/DF1410E5D1DEAACFB70A2441B4766B61F2795BC3-org.eclipse.jgit-3.1.0.201310021548-r.jar o.eclipse.jgit/external/org.eclipse.jgit-3.1.0.201310021548-r.jar || die
+	ln -s "${DISTDIR}"/6B9C3920D9934A2AA8A43DC59CFECD8794389D42-org.eclipse.mylyn.bugzilla.core_3.9.0.v20130612-0100.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.9.0.v20130612-0100.jar || die
+	ln -s "${DISTDIR}"/9B1D57A59FB2A2A127490455474FCC113B7D1D8F-org.eclipse.mylyn.commons.core_3.9.0.v20130612-0100.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.9.0.v20130612-0100.jar || die
+	ln -s "${DISTDIR}"/62C207D4DAC376FE69FE9701AECDD82C7F70F248-org.eclipse.mylyn.commons.net_3.9.0.v20130612-0100.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.9.0.v20130612-0100.jar || die
+	ln -s "${DISTDIR}"/6F23722EB8EA185FBC752BC31360AFEC726F7603-org.eclipse.mylyn.commons.repositories.core_1.1.0.v20130612-0100.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.1.0.v20130612-0100.jar || die
+	ln -s "${DISTDIR}"/0CA9371811803782E988941E24B5B81D268B75C4-org.eclipse.mylyn.commons.xmlrpc_3.9.0.v20130612-0100.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.9.0.v20130612-0100.jar || die
+	ln -s "${DISTDIR}"/7062F60B3094BE67EEF14899ABA2DD0B886785AB-org.eclipse.mylyn.tasks.core_3.9.0.v20130612-0100.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.9.0.v20130612-0100.jar || die
+	ln -s "${DISTDIR}"/0204A7A3166889079D720352742D789FB62E615E-org.eclipse.mylyn.wikitext.confluence.core_1.8.0.v20130612-0100.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_1.8.0.v20130612-0100.jar || die
+	ln -s "${DISTDIR}"/1B964C0E8B3F0476B6B211C2320797C60904D666-org.eclipse.mylyn.wikitext.core_1.8.0.v20130612-0100.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_1.8.0.v20130612-0100.jar || die
+	ln -s "${DISTDIR}"/7CCC1445C7C13894806C007CE3DA32C9C8831C02-org.eclipse.mylyn.wikitext.textile.core_1.8.0.v20130612-0100.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_1.8.0.v20130612-0100.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}"/820FD32B3FB7F885996B15474F220BDCCACD6D27-processtreekiller-1.0.2.jar extexecution.impl/external/processtreekiller-1.0.2.jar || die
+	ln -s "${DISTDIR}"/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar o.apache.xml.resolver/external/resolver-1.2.jar || die
+	ln -s "${DISTDIR}"/A618A836EEF5F88232A10675CE316EC0A9FA4E2B-sqljet-1.1.6.jar libs.svnClientAdapter.svnkit/external/sqljet-1.1.6.jar || die
+	ln -s "${DISTDIR}"/78CBB04534731D472CA853E024CD7EF136340142-svnClientAdapter-javahl-1.8.18.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.8.18.jar || die
+	ln -s "${DISTDIR}"/CF988230BF3FB968C102F400ECA7E642BB371FB6-svnClientAdapter-main-1.8.18.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.8.18.jar || die
+	ln -s "${DISTDIR}"/C40AEAD96AADF7E640FC9D0B8501CA839549941D-svnClientAdapter-svnkit-1.8.18.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.8.18.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}"/24DD3B605C50A04D6C5FC129D4AD340659236EB5-com.trilead.ssh2_1.0.0.build215.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build215.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}"/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
+	ln -s "${DISTDIR}"/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar extexecution.impl/external/winp-1.14-patched.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r12-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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.7.8.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-ide/netbeans-ide-9999_p20131030.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20131030.ebuild
new file mode 100644
index 0000000..d4d2eb4
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20131030.ebuild
@@ -0,0 +1,364 @@
+# Copyright 1999-2013 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/2013-10-30_00-01-44/zip/netbeans-trunk-nightly-201310300001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r12-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/2110507EBF38D759B9A22F98CB53515112240EC3-glassfish-tooling-sdk-0.3-b053.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/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/F40AAAB7307471E0E8E0C859F60FFD9C5AE2657D-js-corestubs.zip
+	http://hg.netbeans.org/binaries/10E8A91299D9FFCF3395B27B32EC59340AD229EE-js-domstubs.zip
+	http://hg.netbeans.org/binaries/3BDCA362124B8C6A6C7E6B527E2B273E727B26F5-js-reststubs.zip
+	http://hg.netbeans.org/binaries/423D778F13BA995EE7775D6008F47C4E6CB0B6FE-jsch.agentproxy.core-0.0.6.jar
+	http://hg.netbeans.org/binaries/78651EE7D0625B7CF9C38033AF5DCA0CAC9B95B9-jsch.agentproxy.sshagent-0.0.6.jar
+	http://hg.netbeans.org/binaries/AC573C38F16CAE0B89541209AB1E44DEA6F665FF-jsch.agentproxy.pageant-0.0.6.jar
+	http://hg.netbeans.org/binaries/4A03B954787FECAC1043569334D5E8B7A842983A-jsch.agentproxy.usocket-nc-0.0.6.jar
+	http://hg.netbeans.org/binaries/0A55C1FD7A2017D7169919F58EAEEEAADE93F5CA-jsch.agentproxy.usocket-jna-0.0.6.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/DF1410E5D1DEAACFB70A2441B4766B61F2795BC3-org.eclipse.jgit-3.1.0.201310021548-r.jar
+	http://hg.netbeans.org/binaries/6B9C3920D9934A2AA8A43DC59CFECD8794389D42-org.eclipse.mylyn.bugzilla.core_3.9.0.v20130612-0100.jar
+	http://hg.netbeans.org/binaries/9B1D57A59FB2A2A127490455474FCC113B7D1D8F-org.eclipse.mylyn.commons.core_3.9.0.v20130612-0100.jar
+	http://hg.netbeans.org/binaries/62C207D4DAC376FE69FE9701AECDD82C7F70F248-org.eclipse.mylyn.commons.net_3.9.0.v20130612-0100.jar
+	http://hg.netbeans.org/binaries/6F23722EB8EA185FBC752BC31360AFEC726F7603-org.eclipse.mylyn.commons.repositories.core_1.1.0.v20130612-0100.jar
+	http://hg.netbeans.org/binaries/0CA9371811803782E988941E24B5B81D268B75C4-org.eclipse.mylyn.commons.xmlrpc_3.9.0.v20130612-0100.jar
+	http://hg.netbeans.org/binaries/7062F60B3094BE67EEF14899ABA2DD0B886785AB-org.eclipse.mylyn.tasks.core_3.9.0.v20130612-0100.jar
+	http://hg.netbeans.org/binaries/0204A7A3166889079D720352742D789FB62E615E-org.eclipse.mylyn.wikitext.confluence.core_1.8.0.v20130612-0100.jar
+	http://hg.netbeans.org/binaries/1B964C0E8B3F0476B6B211C2320797C60904D666-org.eclipse.mylyn.wikitext.core_1.8.0.v20130612-0100.jar
+	http://hg.netbeans.org/binaries/7CCC1445C7C13894806C007CE3DA32C9C8831C02-org.eclipse.mylyn.wikitext.textile.core_1.8.0.v20130612-0100.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/78CBB04534731D472CA853E024CD7EF136340142-svnClientAdapter-javahl-1.8.18.jar
+	http://hg.netbeans.org/binaries/CF988230BF3FB968C102F400ECA7E642BB371FB6-svnClientAdapter-main-1.8.18.jar
+	http://hg.netbeans.org/binaries/C40AEAD96AADF7E640FC9D0B8501CA839549941D-svnClientAdapter-svnkit-1.8.18.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/A618A836EEF5F88232A10675CE316EC0A9FA4E2B-sqljet-1.1.6.jar
+	http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar
+	http://hg.netbeans.org/binaries/24DD3B605C50A04D6C5FC129D4AD340659236EB5-com.trilead.ssh2_1.0.0.build215.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:0[java]"
+#	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"
+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-r12-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}"/2110507EBF38D759B9A22F98CB53515112240EC3-glassfish-tooling-sdk-0.3-b053.jar libs.glassfish.sdk/external/glassfish-tooling-sdk-0.3-b053.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}"/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 core.browser.webview/external/jfxrt.jar || die
+	ln -s "${DISTDIR}"/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar html.validation/external/jing.jar || die
+	ln -s "${DISTDIR}"/F40AAAB7307471E0E8E0C859F60FFD9C5AE2657D-js-corestubs.zip javascript2.editor/external/js-corestubs.zip || die
+	ln -s "${DISTDIR}"/10E8A91299D9FFCF3395B27B32EC59340AD229EE-js-domstubs.zip javascript2.editor/external/js-domstubs.zip || die
+	ln -s "${DISTDIR}"/3BDCA362124B8C6A6C7E6B527E2B273E727B26F5-js-reststubs.zip javascript2.editor/external/js-reststubs.zip || die
+	ln -s "${DISTDIR}"/423D778F13BA995EE7775D6008F47C4E6CB0B6FE-jsch.agentproxy.core-0.0.6.jar libs.jsch.agentproxy/external/jsch.agentproxy.core-0.0.6.jar || die
+	ln -s "${DISTDIR}"/78651EE7D0625B7CF9C38033AF5DCA0CAC9B95B9-jsch.agentproxy.sshagent-0.0.6.jar libs.jsch.agentproxy/external/jsch.agentproxy.sshagent-0.0.6.jar || die
+	ln -s "${DISTDIR}"/AC573C38F16CAE0B89541209AB1E44DEA6F665FF-jsch.agentproxy.pageant-0.0.6.jar libs.jsch.agentproxy/external/jsch.agentproxy.pageant-0.0.6.jar || die
+	ln -s "${DISTDIR}"/4A03B954787FECAC1043569334D5E8B7A842983A-jsch.agentproxy.usocket-nc-0.0.6.jar libs.jsch.agentproxy/external/jsch.agentproxy.usocket-nc-0.0.6.jar || die
+	ln -s "${DISTDIR}"/0A55C1FD7A2017D7169919F58EAEEEAADE93F5CA-jsch.agentproxy.usocket-jna-0.0.6.jar libs.jsch.agentproxy/external/jsch.agentproxy.usocket-jna-0.0.6.jar || die
+	ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.impl/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}"/DF1410E5D1DEAACFB70A2441B4766B61F2795BC3-org.eclipse.jgit-3.1.0.201310021548-r.jar o.eclipse.jgit/external/org.eclipse.jgit-3.1.0.201310021548-r.jar || die
+	ln -s "${DISTDIR}"/6B9C3920D9934A2AA8A43DC59CFECD8794389D42-org.eclipse.mylyn.bugzilla.core_3.9.0.v20130612-0100.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.9.0.v20130612-0100.jar || die
+	ln -s "${DISTDIR}"/9B1D57A59FB2A2A127490455474FCC113B7D1D8F-org.eclipse.mylyn.commons.core_3.9.0.v20130612-0100.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.9.0.v20130612-0100.jar || die
+	ln -s "${DISTDIR}"/62C207D4DAC376FE69FE9701AECDD82C7F70F248-org.eclipse.mylyn.commons.net_3.9.0.v20130612-0100.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.9.0.v20130612-0100.jar || die
+	ln -s "${DISTDIR}"/6F23722EB8EA185FBC752BC31360AFEC726F7603-org.eclipse.mylyn.commons.repositories.core_1.1.0.v20130612-0100.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.1.0.v20130612-0100.jar || die
+	ln -s "${DISTDIR}"/0CA9371811803782E988941E24B5B81D268B75C4-org.eclipse.mylyn.commons.xmlrpc_3.9.0.v20130612-0100.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.9.0.v20130612-0100.jar || die
+	ln -s "${DISTDIR}"/7062F60B3094BE67EEF14899ABA2DD0B886785AB-org.eclipse.mylyn.tasks.core_3.9.0.v20130612-0100.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.9.0.v20130612-0100.jar || die
+	ln -s "${DISTDIR}"/0204A7A3166889079D720352742D789FB62E615E-org.eclipse.mylyn.wikitext.confluence.core_1.8.0.v20130612-0100.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_1.8.0.v20130612-0100.jar || die
+	ln -s "${DISTDIR}"/1B964C0E8B3F0476B6B211C2320797C60904D666-org.eclipse.mylyn.wikitext.core_1.8.0.v20130612-0100.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_1.8.0.v20130612-0100.jar || die
+	ln -s "${DISTDIR}"/7CCC1445C7C13894806C007CE3DA32C9C8831C02-org.eclipse.mylyn.wikitext.textile.core_1.8.0.v20130612-0100.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_1.8.0.v20130612-0100.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}"/820FD32B3FB7F885996B15474F220BDCCACD6D27-processtreekiller-1.0.2.jar extexecution.impl/external/processtreekiller-1.0.2.jar || die
+	ln -s "${DISTDIR}"/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar o.apache.xml.resolver/external/resolver-1.2.jar || die
+	ln -s "${DISTDIR}"/A618A836EEF5F88232A10675CE316EC0A9FA4E2B-sqljet-1.1.6.jar libs.svnClientAdapter.svnkit/external/sqljet-1.1.6.jar || die
+	ln -s "${DISTDIR}"/78CBB04534731D472CA853E024CD7EF136340142-svnClientAdapter-javahl-1.8.18.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.8.18.jar || die
+	ln -s "${DISTDIR}"/CF988230BF3FB968C102F400ECA7E642BB371FB6-svnClientAdapter-main-1.8.18.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.8.18.jar || die
+	ln -s "${DISTDIR}"/C40AEAD96AADF7E640FC9D0B8501CA839549941D-svnClientAdapter-svnkit-1.8.18.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.8.18.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}"/24DD3B605C50A04D6C5FC129D4AD340659236EB5-com.trilead.ssh2_1.0.0.build215.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build215.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}"/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
+	ln -s "${DISTDIR}"/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar extexecution.impl/external/winp-1.14-patched.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r12-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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.7.8.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 0649a92..5e1b589 100644
--- a/dev-java/netbeans-java/ChangeLog
+++ b/dev-java/netbeans-java/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-java-9999_p20131030 (30 Oct 2013)
+*netbeans-java-9999_p20131024 (30 Oct 2013)
+
+  30 Oct 2013; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-java-9999_p20131024.ebuild, +netbeans-java-9999_p20131030.ebuild:
+  bumped to latest nightly sources
+
   24 Oct 2013; Miroslav Šulc <fordfrog@g.o>
   -netbeans-java-9999_p20130926.ebuild, -netbeans-java-9999_p20130929.ebuild,
   -netbeans-java-9999_p20131003.ebuild, -netbeans-java-9999_p20131004.ebuild,

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 3f19a9a..d521409 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -82,6 +82,8 @@ DIST netbeans-trunk-nightly-201310110001-src.zip 186966977 SHA256 a987a5c4860c63
 DIST netbeans-trunk-nightly-201310160001-src.zip 193552704 SHA256 0d002764a1b5c5ef31ebe11101dc0125d0fd48d8e3daead824e3cec050e6bae8 SHA512 58227a201cddb7c89c171a3baa048f09ad437966522af4f39378e9cf2b6806407c895273f0ada5d5d2dd7e8679df2d82b3a2420fbe4c3ccf9b974b0778d20933 WHIRLPOOL 61c0682814a40948b234b30e320b5148ca05db33464e1f33f6d5d324c722b22ef8fdbe5aaeb4270a159d20319ae13f53a1fbe0e9df15702abfd955ec5c5642af
 DIST netbeans-trunk-nightly-201310170001-src.zip 193650002 SHA256 565ec13ba1f769b17e2172c257ca8c8058dda5851101fdd0a1a096f9f41c5b7d SHA512 1a3c385c2b95fa4328f02e4fe55e8850df9e149de1b62930cffc235a4063c9ff3e412769b4fab33a1e39d14b7aa6953212728f22c2d68f10f3de826f826c3e57 WHIRLPOOL 01fb58d969b599c6a7dd5c6d6984d259df8f79e19981d8ba14fb5a06f1374c67f6c7a80d52b8c701531cb85755e4e710e14b3a5ea6db81318d824592b61398a7
 DIST netbeans-trunk-nightly-201310180001-src.zip 193656938 SHA256 8ea8478ce28112b492cf7d460416d4bd6c408b627baa57879e351cd04b54031b SHA512 bdb5557f5eb8ec59ca52476ed4649316bf890e1d8721933a084a7a4f714c3f9b0b7026a6a9e043bae1e28c0f2a30b413f625f3775575962b8ecdedb8b762d656 WHIRLPOOL 73ec143e9155f6b0cc21a2144419feb6981ddc582d4adcc58a6668b698aac72fef9c80a7ee18df08b92d17fe7ad138d9227281ea61861a36908c180de41790bb
+DIST netbeans-trunk-nightly-201310240001-src.zip 193855785 SHA256 211ba26a46d366423b859c63a59cdafcb26ad29c16678094fb3037cd93937875 SHA512 dcc0d91a909b40721b3f8b5011318d6ec36dd30fca035530c6456b0bb41e12606e046cabebb0d1bf22ebba16cfd54ed04d25a81e878e9c844d71080451839b15 WHIRLPOOL 6c677335f795ca02116189162ac10808dd260133c7be4a67b7333c0a94296907cbb2d0bf492d47d9b0b8fd063977139c2df98d5ff635b776ee1df449669a09d4
+DIST netbeans-trunk-nightly-201310300001-src.zip 193888205 SHA256 8bdac1e58e9e6b710fc0f76669989ae2be95350a2c8cad63c89db7a83bdc60ce SHA512 9d25a803152ef40bfca42842dc7337036a8371ddb59748bdb37256c6fc201629d9440187e1d8d2d1ce249cee0827d4621e3b4043948edf1955ecb2231474f4ba WHIRLPOOL 1990e9a9de8b4b63a841ba5304ba5574dffb25e61a39a10b6dab74cfecd699ca392e86443857cb6a9a138f0913926474addd7ffed2c2c020038357b6b5d73725
 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
@@ -91,5 +93,7 @@ EBUILD netbeans-java-9999_p20131011.ebuild 13305 SHA256 e19ce9db88b62f7e8fe63484
 EBUILD netbeans-java-9999_p20131016.ebuild 13325 SHA256 2286a152ce528a49b3ab94cf7832ce1e1b8d817cdb5c443e30c8b6804882b190 SHA512 7e4b417d372a2c350bad456657fb79e3de6a62d97ed03fa756dc0bcf4cfaeb43a73adfb7c4225ab1161263b482885a8e6042b876fa7cd3b7c96bcc84a7da4f59 WHIRLPOOL ee8125d885a76e80b29404f32aa069f119767931fde2762a50545a87d18b2150d5f1cbfaa5878a7dbe3288717d6b7663595a5a30c58093ded63dfea538f184ee
 EBUILD netbeans-java-9999_p20131017.ebuild 13325 SHA256 ee9dce35b3999d1055556be7537ee72d974d8db4d2fd5156b3724209db7ca349 SHA512 6ca40a167227a2e145e80b311db4254cd21231b2e7b5192d95d860792ef3c8a072c7182281836eea61fd76cded40f1e8d74a1c30844a9eb687f14bd816c2f2f0 WHIRLPOOL 060d5a9e38253f1a281619ab66a6047dd13cb8578efb1ff281082bfae6075245226c3a74cb4e5f601eb1ffc85ba2c7a410256fbd5ff6a4db293d776770be3e85
 EBUILD netbeans-java-9999_p20131018.ebuild 13325 SHA256 77e667ba94d5d26901d79387096e8ccb126444fe9804c66eda01c5c372542c4e SHA512 83a9f08b749cdfe005e550f42c41399c9627442616a053e953dbdadb6e1b41fb33f803bf15532d741fa0ca0a56dd0e7713713dec491230c7d10f30d0519e04c7 WHIRLPOOL 998dd36481ea88561fb214c09f6d20725cdc54f5b8d7c4b446ff571ad1b4da3db78c7212aaac872a600618164b7b7f2949e92e9727d0de01feca901b5085925d
-MISC ChangeLog 88330 SHA256 1f72f25166e3dafbe54abe9b79eae8445c82ce1c1b0cd236f04dad7e990bce3e SHA512 fd7844479e56f95e8a1fcecf6d63b51ac10e47742ac421d2df66d71a6ed2be2c5f0e3100addf83a5644180c8fc9b1bf8f7300f8b53f1e14015a3d628ea9a5762 WHIRLPOOL 19f669ae3b6d2f4bc9df45b57c9c91c5c46e5cdb7c15fdca68adb6b77f5ca1a6eb58754014c760ecb81206ea74580b09e6fd31e7bb6decee06531223314de477
+EBUILD netbeans-java-9999_p20131024.ebuild 13325 SHA256 b183117fa72fb3593dab1ac123381287335005804686e06846e20b15fa78dbec SHA512 b212c60f25e656446dba682834d2adaeb36b3ee97eaecb9b7210f15160d659aae1d7316cb22d7a9b5bad677ea89d97af17fcfbe34797ceb7b6fc7826bba513b4 WHIRLPOOL a8d81214f6d10dd971ae724158e3c70b4664faa5e5dfd31ec0fb7754c8fd168dbcf3b3bce9f9c2029cd26c006ab82c6c71b9eafe9d991e604102cf2de05335af
+EBUILD netbeans-java-9999_p20131030.ebuild 13325 SHA256 2868476d5de44b82225a8b1b2d7581dc02c35df42968838a0f0bab105dc40ff9 SHA512 2a277633fb20431564b7f0123c2391188c3a4316db5776cc14044f2c6b3e92dcbc1b780685df8879922d483808bc2337fbcca1109329dfd5e0f296e92e8cb4f4 WHIRLPOOL 655889c2981a779de1edfff7b590351935fd2ea0fa50d695f56b6841e810b19925a62fa3bdb547342e1e93393eabadc5c6ba8984ea48b6f04764458249469b17
+MISC ChangeLog 88585 SHA256 f2fdbc70e0ffc13604ecfe78ee9f02f4c4d0c4ea42706aea0a4f54c09fe95185 SHA512 6c415ecfe70c9d53ec55a55a331af2fa3c951b2ca268db9577297c8ff3d0053ddbf8ad0779de881eaf2df6b995b59795dc3c552bc7cafa3da006b8aabdca7bdc WHIRLPOOL 1358f669a092eec2596ec1f6e51e8770e0d7dcab5ae6862abeafdff03ca2332491a9b960552d909f975df6b7781d61ae8d92f5d49e8a5b1b9bdb31137699bae6
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20131024.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20131024.ebuild
new file mode 100644
index 0000000..a8ba703
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20131024.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2013 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/2013-10-24_00-01-44/zip/netbeans-trunk-nightly-201310240001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r12-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/13BDBD486B15C1C7FD2D8392FE5D62D5A5AC10D6-eclipselink.jar
+	http://hg.netbeans.org/binaries/5282CF4CDBCD0210798283E0E35B3A1FDA994D37-hibernate-release-4.2.6-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/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/747B096FDC5F894840F8C134E2EB7CFCF5963662-nb-javac-api.jar
+	http://hg.netbeans.org/binaries/E588BEE27AFA9D6553B3DFA2E9EF29D04637A5AB-nb-javac-impl.jar
+	http://hg.netbeans.org/binaries/7F267F8656463BCB6D7441D3F6436C8F516AC18C-org.eclipse.persistence.jpa.jpql_2.5.1.v20130918-f2b9fc5.jar
+	http://hg.netbeans.org/binaries/C7526615424CD22908969630FD1D2B27818B6DCA-org.eclipse.persistence.jpa.modelgen_2.5.1.v20130918-f2b9fc5.jar
+	http://hg.netbeans.org/binaries/CB686A65B6C4516A32173CB60385D02027440620-spring-2.5.6.SEC03.jar
+	http://hg.netbeans.org/binaries/60169962AA9DE533DE6298110E54880A1C8B0C01-spring-framework-3.2.3.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/asm:2.2
+	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"
+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-r12-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}"/13BDBD486B15C1C7FD2D8392FE5D62D5A5AC10D6-eclipselink.jar j2ee.eclipselink/external/eclipselink.jar || die
+	ln -s "${DISTDIR}"/5282CF4CDBCD0210798283E0E35B3A1FDA994D37-hibernate-release-4.2.6-lib.zip hibernate4lib/external/hibernate-release-4.2.6-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}"/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}"/747B096FDC5F894840F8C134E2EB7CFCF5963662-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
+	ln -s "${DISTDIR}"/E588BEE27AFA9D6553B3DFA2E9EF29D04637A5AB-nb-javac-impl.jar libs.javacimpl/external/nb-javac-impl.jar || die
+	ln -s "${DISTDIR}"/7F267F8656463BCB6D7441D3F6436C8F516AC18C-org.eclipse.persistence.jpa.jpql_2.5.1.v20130918-f2b9fc5.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_2.5.1.v20130918-f2b9fc5.jar || die
+	ln -s "${DISTDIR}"/C7526615424CD22908969630FD1D2B27818B6DCA-org.eclipse.persistence.jpa.modelgen_2.5.1.v20130918-f2b9fc5.jar j2ee.eclipselinkmodelgen/external/org.eclipse.persistence.jpa.modelgen_2.5.1.v20130918-f2b9fc5.jar || die
+	ln -s "${DISTDIR}"/CB686A65B6C4516A32173CB60385D02027440620-spring-2.5.6.SEC03.jar libs.springframework/external/spring-2.5.6.SEC03.jar || die
+	ln -s "${DISTDIR}"/60169962AA9DE533DE6298110E54880A1C8B0C01-spring-framework-3.2.3.RELEASE.zip libs.springframework/external/spring-framework-3.2.3.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-r12-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 asm-commons-3.3.1.jar && dosym /usr/share/asm-2.2/lib/asm-commons.jar ${instdir}/asm-commons-3.3.1.jar || die
+	rm asm-3.3.1.jar && dosym /usr/share/asm-2.2/lib/asm.jar ${instdir}/asm-3.3.1.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.15.0-GA.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist-3.15.0-GA.jar || die
+	rm jboss-logging-3.1.0.GA.jar && dosym /usr/share/jboss-logging/lib/jboss-logging.jar ${instdir}/jboss-logging-3.1.0.GA.jar || die
+	rm jboss-transaction-api_1.1_spec-1.0.1.Final.jar && dosym /usr/share/glassfish-transaction-api/lib/jta.jar ${instdir}/jboss-transaction-api_1.1_spec-1.0.1.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.16.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.16.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-java/netbeans-java-9999_p20131030.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20131030.ebuild
new file mode 100644
index 0000000..829910e
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20131030.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2013 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/2013-10-30_00-01-44/zip/netbeans-trunk-nightly-201310300001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r12-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/13BDBD486B15C1C7FD2D8392FE5D62D5A5AC10D6-eclipselink.jar
+	http://hg.netbeans.org/binaries/5282CF4CDBCD0210798283E0E35B3A1FDA994D37-hibernate-release-4.2.6-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/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/747B096FDC5F894840F8C134E2EB7CFCF5963662-nb-javac-api.jar
+	http://hg.netbeans.org/binaries/E588BEE27AFA9D6553B3DFA2E9EF29D04637A5AB-nb-javac-impl.jar
+	http://hg.netbeans.org/binaries/7F267F8656463BCB6D7441D3F6436C8F516AC18C-org.eclipse.persistence.jpa.jpql_2.5.1.v20130918-f2b9fc5.jar
+	http://hg.netbeans.org/binaries/C7526615424CD22908969630FD1D2B27818B6DCA-org.eclipse.persistence.jpa.modelgen_2.5.1.v20130918-f2b9fc5.jar
+	http://hg.netbeans.org/binaries/CB686A65B6C4516A32173CB60385D02027440620-spring-2.5.6.SEC03.jar
+	http://hg.netbeans.org/binaries/60169962AA9DE533DE6298110E54880A1C8B0C01-spring-framework-3.2.3.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/asm:2.2
+	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"
+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-r12-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}"/13BDBD486B15C1C7FD2D8392FE5D62D5A5AC10D6-eclipselink.jar j2ee.eclipselink/external/eclipselink.jar || die
+	ln -s "${DISTDIR}"/5282CF4CDBCD0210798283E0E35B3A1FDA994D37-hibernate-release-4.2.6-lib.zip hibernate4lib/external/hibernate-release-4.2.6-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}"/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}"/747B096FDC5F894840F8C134E2EB7CFCF5963662-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
+	ln -s "${DISTDIR}"/E588BEE27AFA9D6553B3DFA2E9EF29D04637A5AB-nb-javac-impl.jar libs.javacimpl/external/nb-javac-impl.jar || die
+	ln -s "${DISTDIR}"/7F267F8656463BCB6D7441D3F6436C8F516AC18C-org.eclipse.persistence.jpa.jpql_2.5.1.v20130918-f2b9fc5.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_2.5.1.v20130918-f2b9fc5.jar || die
+	ln -s "${DISTDIR}"/C7526615424CD22908969630FD1D2B27818B6DCA-org.eclipse.persistence.jpa.modelgen_2.5.1.v20130918-f2b9fc5.jar j2ee.eclipselinkmodelgen/external/org.eclipse.persistence.jpa.modelgen_2.5.1.v20130918-f2b9fc5.jar || die
+	ln -s "${DISTDIR}"/CB686A65B6C4516A32173CB60385D02027440620-spring-2.5.6.SEC03.jar libs.springframework/external/spring-2.5.6.SEC03.jar || die
+	ln -s "${DISTDIR}"/60169962AA9DE533DE6298110E54880A1C8B0C01-spring-framework-3.2.3.RELEASE.zip libs.springframework/external/spring-framework-3.2.3.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-r12-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 asm-commons-3.3.1.jar && dosym /usr/share/asm-2.2/lib/asm-commons.jar ${instdir}/asm-commons-3.3.1.jar || die
+	rm asm-3.3.1.jar && dosym /usr/share/asm-2.2/lib/asm.jar ${instdir}/asm-3.3.1.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.15.0-GA.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist-3.15.0-GA.jar || die
+	rm jboss-logging-3.1.0.GA.jar && dosym /usr/share/jboss-logging/lib/jboss-logging.jar ${instdir}/jboss-logging-3.1.0.GA.jar || die
+	rm jboss-transaction-api_1.1_spec-1.0.1.Final.jar && dosym /usr/share/glassfish-transaction-api/lib/jta.jar ${instdir}/jboss-transaction-api_1.1_spec-1.0.1.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.16.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.16.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 4a9aca0..c17b8df 100644
--- a/dev-java/netbeans-javacard/ChangeLog
+++ b/dev-java/netbeans-javacard/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javacard-9999_p20131030 (30 Oct 2013)
+*netbeans-javacard-9999_p20131024 (30 Oct 2013)
+
+  30 Oct 2013; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-javacard-9999_p20131024.ebuild,
+  +netbeans-javacard-9999_p20131030.ebuild:
+  bumped to latest nightly sources
+
   24 Oct 2013; Miroslav Šulc <fordfrog@g.o>
   -netbeans-javacard-9999_p20130926.ebuild,
   -netbeans-javacard-9999_p20130929.ebuild,

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 5a0a09e..f50b4e3 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -16,6 +16,8 @@ DIST netbeans-trunk-nightly-201310110001-src.zip 186966977 SHA256 a987a5c4860c63
 DIST netbeans-trunk-nightly-201310160001-src.zip 193552704 SHA256 0d002764a1b5c5ef31ebe11101dc0125d0fd48d8e3daead824e3cec050e6bae8 SHA512 58227a201cddb7c89c171a3baa048f09ad437966522af4f39378e9cf2b6806407c895273f0ada5d5d2dd7e8679df2d82b3a2420fbe4c3ccf9b974b0778d20933 WHIRLPOOL 61c0682814a40948b234b30e320b5148ca05db33464e1f33f6d5d324c722b22ef8fdbe5aaeb4270a159d20319ae13f53a1fbe0e9df15702abfd955ec5c5642af
 DIST netbeans-trunk-nightly-201310170001-src.zip 193650002 SHA256 565ec13ba1f769b17e2172c257ca8c8058dda5851101fdd0a1a096f9f41c5b7d SHA512 1a3c385c2b95fa4328f02e4fe55e8850df9e149de1b62930cffc235a4063c9ff3e412769b4fab33a1e39d14b7aa6953212728f22c2d68f10f3de826f826c3e57 WHIRLPOOL 01fb58d969b599c6a7dd5c6d6984d259df8f79e19981d8ba14fb5a06f1374c67f6c7a80d52b8c701531cb85755e4e710e14b3a5ea6db81318d824592b61398a7
 DIST netbeans-trunk-nightly-201310180001-src.zip 193656938 SHA256 8ea8478ce28112b492cf7d460416d4bd6c408b627baa57879e351cd04b54031b SHA512 bdb5557f5eb8ec59ca52476ed4649316bf890e1d8721933a084a7a4f714c3f9b0b7026a6a9e043bae1e28c0f2a30b413f625f3775575962b8ecdedb8b762d656 WHIRLPOOL 73ec143e9155f6b0cc21a2144419feb6981ddc582d4adcc58a6668b698aac72fef9c80a7ee18df08b92d17fe7ad138d9227281ea61861a36908c180de41790bb
+DIST netbeans-trunk-nightly-201310240001-src.zip 193855785 SHA256 211ba26a46d366423b859c63a59cdafcb26ad29c16678094fb3037cd93937875 SHA512 dcc0d91a909b40721b3f8b5011318d6ec36dd30fca035530c6456b0bb41e12606e046cabebb0d1bf22ebba16cfd54ed04d25a81e878e9c844d71080451839b15 WHIRLPOOL 6c677335f795ca02116189162ac10808dd260133c7be4a67b7333c0a94296907cbb2d0bf492d47d9b0b8fd063977139c2df98d5ff635b776ee1df449669a09d4
+DIST netbeans-trunk-nightly-201310300001-src.zip 193888205 SHA256 8bdac1e58e9e6b710fc0f76669989ae2be95350a2c8cad63c89db7a83bdc60ce SHA512 9d25a803152ef40bfca42842dc7337036a8371ddb59748bdb37256c6fc201629d9440187e1d8d2d1ce249cee0827d4621e3b4043948edf1955ecb2231474f4ba WHIRLPOOL 1990e9a9de8b4b63a841ba5304ba5574dffb25e61a39a10b6dab74cfecd699ca392e86443857cb6a9a138f0913926474addd7ffed2c2c020038357b6b5d73725
 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
@@ -25,5 +27,7 @@ EBUILD netbeans-javacard-9999_p20131011.ebuild 4956 SHA256 14f44d8f41168f71e0405
 EBUILD netbeans-javacard-9999_p20131016.ebuild 4956 SHA256 a2dc83bd7c557a83ea6f6163faeca6778047e209d3fb05d3ba9b45dc008b4d01 SHA512 587c5293125b3b13c811847c6f256c409578f7a8e42788ab55fb858bc33fda7e3d93a924638452420e36de3ab3b691a8a9eba3c2990a3eaee40117893e4b08b0 WHIRLPOOL 722635ee9bb8cf473ad6a1acb5622f68a5704f1ad1175932e4e1a6464c2409469c82b22b8b5b2e878d5c3741323e8188724351b85924cfed2c705e19575f4d33
 EBUILD netbeans-javacard-9999_p20131017.ebuild 4956 SHA256 b7c1af6af9a0d3f563e3346a45b2dae51b1491cf9c0de8e0f79bb41218f82b6b SHA512 d915e896355d25b7b033305147893e10d1952e74442c04b6e26bb23ad4b6b0729ef3438b59c09d9b93fbf4335a6d63f9ff554bcbebca9b5b7a4a5b0229ab2d52 WHIRLPOOL 184f87cf9bdb15f17186c915ca96844610c545568125fabb27e4804daa6dfff80811a7a484376b048d645f5b14c995baf25208bb1b286890d52e24ce637b0662
 EBUILD netbeans-javacard-9999_p20131018.ebuild 4956 SHA256 7679fda402c2cb21bbd09885a0646866212a2c2df143e09c0561d7aae3e11445 SHA512 37f632c1ae4f56d56a5c69f99d3713c0f4f932fa14a7d604e96ea1518367d21ceac115f4e29a9a4282549f2ff8aa799d8f78a6f599dd344328c6ee014266ec04 WHIRLPOOL 6130b7e28d19692062c6a009a33a60b2d0bece748d705f538f9032dfb85676a461a8a83225ac8b36fe13050239fcf6128390d3616e1d3577ed50783da37621c6
-MISC ChangeLog 91188 SHA256 a1016703b7f211e56ecfba1c690ff6c0e9c1def9af12ffcdceceea1e5eccc3f9 SHA512 e79342046896e30ab5aeb543a196da6f214b6835b1e9d840fc0288a6de5514bab41b098707c344c0945512f076c39c9a3789329d3174710248330ea626d532f9 WHIRLPOOL 37cfdc8493a44a6f4343bf317c1ac363951cb35305d9ef8e59b6d45edc00ac3662aabc2e64f5f9fcbf8ea07d0e0d6f1b34f618dfa8c1c379a64cfadd960e29a2
+EBUILD netbeans-javacard-9999_p20131024.ebuild 4956 SHA256 067161f5cad508d09659ea9a2be448887740659a30ef21cfe32cc0bd78c73356 SHA512 8ba091f99786f752facfd140e898c51be467352aca3f17fa692c156feb4add64f5a410f3567942aa5a1dcbed00dca7328708cbd3b5c8988d452d9ec4cb046530 WHIRLPOOL 94d920ad20639ab178c8d95b1ce4229f42c70b257fdc16f516b3f7e9642682af308677e0f11c40a2c91fe9d986164bd78d2bc7d2f8af90aff36ee4264d968649
+EBUILD netbeans-javacard-9999_p20131030.ebuild 4956 SHA256 8e514cbb4be7f742317c9971849e2cb6aaefd4655319561735ed2a963231d1c7 SHA512 c5d40b2325b8743c3387a4a314b4601d9daff3be96f8b3e943f46bcac8d9c14bd0adc42a0c09ae434066328fd31ce5c33f9ba1aca3df7700f1db58d7c4f3238a WHIRLPOOL 01e99f0057800bd798006620e8c6a53702934039a647c688284602e955e45648af77258397dca9926ec0d4eddc320a46b4eaffc268bfc78437f338d399d58db4
+MISC ChangeLog 91461 SHA256 1fe4afc908603a1c52c14a1089ee7e6f96a150901edf248e1c1fdb4bb85e4117 SHA512 f64e19eaf2744679aeee3466979c42c89a30a68612714d947f135027081dede48b022fb6fc10ee4015f1b054c66d802240a7ae434afa38d583636333e4442186 WHIRLPOOL eaad4734e01a5f8fd156482b4767ee3572fe7527ce0a811c3b7e0040efe762f4629f73cc714ec84e801cb40f32bd3068e9bb040da532a6415b1d1be095e1bb3a
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20131024.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20131024.ebuild
new file mode 100644
index 0000000..cb8d7dd
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20131024.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2013 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/2013-10-24_00-01-44/zip/netbeans-trunk-nightly-201310240001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r12-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"
+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-r12-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-r12-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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-javacard/netbeans-javacard-9999_p20131030.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20131030.ebuild
new file mode 100644
index 0000000..94c5a4c
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20131030.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2013 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/2013-10-30_00-01-44/zip/netbeans-trunk-nightly-201310300001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r12-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"
+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-r12-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-r12-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 2c463d0..4d7c88e 100644
--- a/dev-java/netbeans-javadoc/ChangeLog
+++ b/dev-java/netbeans-javadoc/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javadoc-9999_p20131030 (30 Oct 2013)
+*netbeans-javadoc-9999_p20131024 (30 Oct 2013)
+
+  30 Oct 2013; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-javadoc-9999_p20131024.ebuild,
+  +netbeans-javadoc-9999_p20131030.ebuild:
+  bumped to latest nightly sources
+
   24 Oct 2013; Miroslav Šulc <fordfrog@g.o>
   -netbeans-javadoc-9999_p20130926.ebuild,
   -netbeans-javadoc-9999_p20130929.ebuild,

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index b3a4360..4a4a9ea 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -18,6 +18,8 @@ DIST netbeans-trunk-nightly-201310110001-src.zip 186966977 SHA256 a987a5c4860c63
 DIST netbeans-trunk-nightly-201310160001-src.zip 193552704 SHA256 0d002764a1b5c5ef31ebe11101dc0125d0fd48d8e3daead824e3cec050e6bae8 SHA512 58227a201cddb7c89c171a3baa048f09ad437966522af4f39378e9cf2b6806407c895273f0ada5d5d2dd7e8679df2d82b3a2420fbe4c3ccf9b974b0778d20933 WHIRLPOOL 61c0682814a40948b234b30e320b5148ca05db33464e1f33f6d5d324c722b22ef8fdbe5aaeb4270a159d20319ae13f53a1fbe0e9df15702abfd955ec5c5642af
 DIST netbeans-trunk-nightly-201310170001-src.zip 193650002 SHA256 565ec13ba1f769b17e2172c257ca8c8058dda5851101fdd0a1a096f9f41c5b7d SHA512 1a3c385c2b95fa4328f02e4fe55e8850df9e149de1b62930cffc235a4063c9ff3e412769b4fab33a1e39d14b7aa6953212728f22c2d68f10f3de826f826c3e57 WHIRLPOOL 01fb58d969b599c6a7dd5c6d6984d259df8f79e19981d8ba14fb5a06f1374c67f6c7a80d52b8c701531cb85755e4e710e14b3a5ea6db81318d824592b61398a7
 DIST netbeans-trunk-nightly-201310180001-src.zip 193656938 SHA256 8ea8478ce28112b492cf7d460416d4bd6c408b627baa57879e351cd04b54031b SHA512 bdb5557f5eb8ec59ca52476ed4649316bf890e1d8721933a084a7a4f714c3f9b0b7026a6a9e043bae1e28c0f2a30b413f625f3775575962b8ecdedb8b762d656 WHIRLPOOL 73ec143e9155f6b0cc21a2144419feb6981ddc582d4adcc58a6668b698aac72fef9c80a7ee18df08b92d17fe7ad138d9227281ea61861a36908c180de41790bb
+DIST netbeans-trunk-nightly-201310240001-src.zip 193855785 SHA256 211ba26a46d366423b859c63a59cdafcb26ad29c16678094fb3037cd93937875 SHA512 dcc0d91a909b40721b3f8b5011318d6ec36dd30fca035530c6456b0bb41e12606e046cabebb0d1bf22ebba16cfd54ed04d25a81e878e9c844d71080451839b15 WHIRLPOOL 6c677335f795ca02116189162ac10808dd260133c7be4a67b7333c0a94296907cbb2d0bf492d47d9b0b8fd063977139c2df98d5ff635b776ee1df449669a09d4
+DIST netbeans-trunk-nightly-201310300001-src.zip 193888205 SHA256 8bdac1e58e9e6b710fc0f76669989ae2be95350a2c8cad63c89db7a83bdc60ce SHA512 9d25a803152ef40bfca42842dc7337036a8371ddb59748bdb37256c6fc201629d9440187e1d8d2d1ce249cee0827d4621e3b4043948edf1955ecb2231474f4ba WHIRLPOOL 1990e9a9de8b4b63a841ba5304ba5574dffb25e61a39a10b6dab74cfecd699ca392e86443857cb6a9a138f0913926474addd7ffed2c2c020038357b6b5d73725
 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
@@ -27,5 +29,7 @@ EBUILD netbeans-javadoc-9999_p20131011.ebuild 6043 SHA256 5d5db046c0cbc8286f3794
 EBUILD netbeans-javadoc-9999_p20131016.ebuild 6043 SHA256 3d58c2b409e949ba2af7d8ad314c8a9f5502de5edbc66dd462df61752061e163 SHA512 cc9087a16af1aa91cb48cba803e0127264d1bf7be46d9a88cfaded1f9107a0a8ae3221192341ab20a950cb6deef9f51a2dda7727dba48d4b442d8de978f39bd9 WHIRLPOOL 124808c17021af35bf7b0f062814ebb369fa5dd7b9af949f3665d707d44e3bea1d5c5ce1f4aedead22c775c3488946bb5804d12f7d53afab801f89e283ee1424
 EBUILD netbeans-javadoc-9999_p20131017.ebuild 6043 SHA256 b8c25ba59db570440b07e3aa4291a7993c345ad348c90df395fe293b0c6d3990 SHA512 f2a38c31d1aeed2e15e4c83ac6c1c55f1ea08b64b54e550dd0e065f882d35de10bcbffa4cee1156cd7e95ad3a3dca6e61fb03597a38c3ad42b41e418f465b71e WHIRLPOOL 9b380b3308765e59cb4a7538c1d0fd80699075bc5cbe991fa98db8005253f71764ec1e0e94de747cfef1feae7eb8850770a63d209295765a15fee132e0110f74
 EBUILD netbeans-javadoc-9999_p20131018.ebuild 6043 SHA256 f4037f00a1afd37e7b09c4622c1c53ba726863e8d97f9137700a61d41305fe07 SHA512 189bd5266a2fa49e930f422869e3cddff34c26fa5c11a46aa39b4b297a4b57b1c71e8ed851f7b0ab1c4d0fdeedf78238fb2270169f886139f2c32ca04513bc69 WHIRLPOOL a1f6c373d9f00a59c7695f591e19565f225330389e3cf9d02b6f3a3cc4fdaa2a71568139a6716230f5c71697be2218a364a6d021fdd99f1ea6e395250633b381
-MISC ChangeLog 89917 SHA256 2c7d56c099e1e692c0251790441050955d15f024c455bd9e7d673694248f39dd SHA512 02ae92d21dd71d68d5c75ef94b2efac454d5244d574631f25d9948219a51292bbe44de38d049c198ff6856fb54676c3c7a5c7e110a8d884e315ae52fd0413103 WHIRLPOOL e97d3da803738ef64244ddf9de39b579eb2411d29bca817772eadb818deb15efd9457d56ab2546951158fcada070ee446dc00c32e9701ef5a5a2c0e50c93e62a
+EBUILD netbeans-javadoc-9999_p20131024.ebuild 6043 SHA256 1142d00aaebfa5b33dda422c3451278a54531f3f8804740b964cdc84851d37ae SHA512 dc3e4cdad4a55147df67216018062d86455660fce20b6f653dd56bde43d8f169f6621ea33f0d5a731996d8065b881f542eb0c9558407ce0fcfa489d5c6c5295f WHIRLPOOL 38cf9ad8efea19c3aae9f771b2c33644b4f3fadc9feeeb1ba893152b17b5f82672ded7b8607c2ae9ea2b72da7f1a5fb260f61c112125ea2f93d79284ef814aa1
+EBUILD netbeans-javadoc-9999_p20131030.ebuild 6043 SHA256 cc881333b42ea30a18bb9fa350adf6341aaaf752b7dcbecf11e1ae52f7e8fc7d SHA512 891a59950f677fd4e12b0267e16ad4a421563086d76ca620bcfd27fad8372926967de394dd3e0c4125d6fa39621116a3adf89de2d096d29841e9f21d8a72b2b2 WHIRLPOOL 4beff92c7c5a3776a852a499e26298eb3e862fa17ac7bc91e2589b886cf1de0802eba3aca51fabaea4f825e519ba401d8ac412bfb4b2a14c77337d1845d1e136
+MISC ChangeLog 90186 SHA256 c63fc645f94abc82bf53de1639aa95f39c4eec4ae25ab6e9b5e1e5c07e041dcf SHA512 74ae139f44f48c762d1101d4c9a82c9062a34fdbc92519037f400adb590dc69463185b895cfba4b549f15fb2ae271ffc39361d82cb93e1358d6a16e1c7df82ef WHIRLPOOL d54ba623e87cb897d37fed75a34d7d2fa88d0db9b3a79b6e5636a1e0dfd6f62133fd33d21115d1baced4c1f65150f799c6b4caa4b077cd73ca255b680c12a4c4
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20131024.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20131024.ebuild
new file mode 100644
index 0000000..0e0cc85
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20131024.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2013 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/2013-10-24_00-01-44/zip/netbeans-trunk-nightly-201310240001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r12-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/51449E030F3A5F80327536CC51D75EE9D7E59BDA-ant-libs-1.9.2.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+DEPEND=">=virtual/jdk-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"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r12-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/51449E030F3A5F80327536CC51D75EE9D7E59BDA-ant-libs-1.9.2.zip o.apache.tools.ant.module/external/ant-libs-1.9.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-r12-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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-javadoc/netbeans-javadoc-9999_p20131030.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20131030.ebuild
new file mode 100644
index 0000000..f80301d
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20131030.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2013 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/2013-10-30_00-01-44/zip/netbeans-trunk-nightly-201310300001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r12-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/51449E030F3A5F80327536CC51D75EE9D7E59BDA-ant-libs-1.9.2.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+DEPEND=">=virtual/jdk-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"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r12-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/51449E030F3A5F80327536CC51D75EE9D7E59BDA-ant-libs-1.9.2.zip o.apache.tools.ant.module/external/ant-libs-1.9.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-r12-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 1cc9f3a..eac8107 100644
--- a/dev-java/netbeans-javafx/ChangeLog
+++ b/dev-java/netbeans-javafx/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javafx-9999_p20131030 (30 Oct 2013)
+*netbeans-javafx-9999_p20131024 (30 Oct 2013)
+
+  30 Oct 2013; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-javafx-9999_p20131024.ebuild,
+  +netbeans-javafx-9999_p20131030.ebuild:
+  bumped to latest nightly sources
+
   24 Oct 2013; Miroslav Šulc <fordfrog@g.o>
   -netbeans-javafx-9999_p20130926.ebuild,
   -netbeans-javafx-9999_p20130929.ebuild,

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 8dc293a..bcd90f6 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -18,6 +18,8 @@ DIST netbeans-trunk-nightly-201310110001-src.zip 186966977 SHA256 a987a5c4860c63
 DIST netbeans-trunk-nightly-201310160001-src.zip 193552704 SHA256 0d002764a1b5c5ef31ebe11101dc0125d0fd48d8e3daead824e3cec050e6bae8 SHA512 58227a201cddb7c89c171a3baa048f09ad437966522af4f39378e9cf2b6806407c895273f0ada5d5d2dd7e8679df2d82b3a2420fbe4c3ccf9b974b0778d20933 WHIRLPOOL 61c0682814a40948b234b30e320b5148ca05db33464e1f33f6d5d324c722b22ef8fdbe5aaeb4270a159d20319ae13f53a1fbe0e9df15702abfd955ec5c5642af
 DIST netbeans-trunk-nightly-201310170001-src.zip 193650002 SHA256 565ec13ba1f769b17e2172c257ca8c8058dda5851101fdd0a1a096f9f41c5b7d SHA512 1a3c385c2b95fa4328f02e4fe55e8850df9e149de1b62930cffc235a4063c9ff3e412769b4fab33a1e39d14b7aa6953212728f22c2d68f10f3de826f826c3e57 WHIRLPOOL 01fb58d969b599c6a7dd5c6d6984d259df8f79e19981d8ba14fb5a06f1374c67f6c7a80d52b8c701531cb85755e4e710e14b3a5ea6db81318d824592b61398a7
 DIST netbeans-trunk-nightly-201310180001-src.zip 193656938 SHA256 8ea8478ce28112b492cf7d460416d4bd6c408b627baa57879e351cd04b54031b SHA512 bdb5557f5eb8ec59ca52476ed4649316bf890e1d8721933a084a7a4f714c3f9b0b7026a6a9e043bae1e28c0f2a30b413f625f3775575962b8ecdedb8b762d656 WHIRLPOOL 73ec143e9155f6b0cc21a2144419feb6981ddc582d4adcc58a6668b698aac72fef9c80a7ee18df08b92d17fe7ad138d9227281ea61861a36908c180de41790bb
+DIST netbeans-trunk-nightly-201310240001-src.zip 193855785 SHA256 211ba26a46d366423b859c63a59cdafcb26ad29c16678094fb3037cd93937875 SHA512 dcc0d91a909b40721b3f8b5011318d6ec36dd30fca035530c6456b0bb41e12606e046cabebb0d1bf22ebba16cfd54ed04d25a81e878e9c844d71080451839b15 WHIRLPOOL 6c677335f795ca02116189162ac10808dd260133c7be4a67b7333c0a94296907cbb2d0bf492d47d9b0b8fd063977139c2df98d5ff635b776ee1df449669a09d4
+DIST netbeans-trunk-nightly-201310300001-src.zip 193888205 SHA256 8bdac1e58e9e6b710fc0f76669989ae2be95350a2c8cad63c89db7a83bdc60ce SHA512 9d25a803152ef40bfca42842dc7337036a8371ddb59748bdb37256c6fc201629d9440187e1d8d2d1ce249cee0827d4621e3b4043948edf1955ecb2231474f4ba WHIRLPOOL 1990e9a9de8b4b63a841ba5304ba5574dffb25e61a39a10b6dab74cfecd699ca392e86443857cb6a9a138f0913926474addd7ffed2c2c020038357b6b5d73725
 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
@@ -26,5 +28,7 @@ EBUILD netbeans-javafx-9999_p20131011.ebuild 4697 SHA256 dcb594bc839c58b44be9d9e
 EBUILD netbeans-javafx-9999_p20131016.ebuild 4697 SHA256 7bfc88169ac6b97425cc0e6f84f450ef253e40a2f7426a2948a49595ca06d76f SHA512 55abb49441eaaee23d649dea446463f1c8e857a83b6b6ee1809fa42c8c696ad3d67bdd822cedf86887efd9a101d29edd9d23b63a8d13a681b7a5c923dd671c16 WHIRLPOOL e243137810a124c056c551790de78aa8d0a1d0402d2faa750188fb093fa010bd58f7bcff1a03368aebed0a73a086a25a998db51368a16ca4cfe4fc69f9cb1bd9
 EBUILD netbeans-javafx-9999_p20131017.ebuild 4697 SHA256 c88ceb6b5f302cf4d11b4da1b2d2c581168d82d87156ff57c0312a9526b806be SHA512 479c1df5a132fe6f7350f2fcc3cf9584fc000201c47cbb04d0be22c93daa86dfbd1381650ada2a46496759920ff85d5a8322be481d93d58f5e1a02d5b98cc758 WHIRLPOOL 9736ee2b0133385a0b101338d1a639625687189cf5db835c8e26c1b2cb9303c93383ee0c24e4b82e756dc04fed38c6b48abe8799d1e42fa2db3e9a6288eec516
 EBUILD netbeans-javafx-9999_p20131018.ebuild 4697 SHA256 c3f5b249f8e104ea60848f341b1cacdffe8c682c480bfa83b03b8357bd3dcea0 SHA512 e3f852d8a54cc09d39cb7b6f0f4858e70efc20691e3b7c08276edeb23a6aafb89beb2104a0791364864df84f34a95a9250e779832696ed6e9b209b1efff00ae7 WHIRLPOOL 57ef6fc9558f104a00f2473c7c61f8d589ef4c4c90ea844bdf31b97d6717b134a702feca517823275514a01ef387eeb6fe735d897f2f2f27aed3e0de38f10487
-MISC ChangeLog 75513 SHA256 fd0468b8ca46204d670e96373b0e1e0ca53b9c62803cdae3f570733bf01dc585 SHA512 a5de0084a077d33192b6788d5df4e3c7a5a558ec9d46bdf78180fa4c4dafe367beb7e57c50f4fa2e945746187bf806381c1e817d3224b23de7aaf535e2aec38b WHIRLPOOL 60fabb88f6c7b9850cee3cd62e5340f9b1015383ce6555ce8f9ee1642e01f74ba295c59a4ec09ad047ab347aef7c75aa06b6dc7e20dd4e0d60a97450db8b8cac
+EBUILD netbeans-javafx-9999_p20131024.ebuild 4697 SHA256 b153eb43211e38be696efb7d3e5f526720c6f6a225d35cd109675b5d020f1837 SHA512 b43acd4f4d4cd083b39ea8c30aee153fdd0525b11037bd28f5edfafb96eba49228722b00ee6704c1aa848c65d1f490c7dc86a00eb15553bf8f8201bdf468ae12 WHIRLPOOL 221e572db8da76c985fcc7ff46c3558ea00b30a4699a71aadf0f001edadd8da9e348b372cc0f2123184e73ea51d18e661c6a97e544bfd3b585b0c92e4aa4e991
+EBUILD netbeans-javafx-9999_p20131030.ebuild 4697 SHA256 775b0f6bd1739b9f483dd7d52884823ce7ae4b5e7a5117ce3d98eb0f83222f84 SHA512 a1af5faac22ddcbe833c73ea2ab8159febba64faea17344dcb464e68ce8ecafa461e9b31a08e221778d0187e41b8ca199af213986982e42b159e539c6e9257ae WHIRLPOOL 3d0eb673741909d58942aa784eca5fae9439b6755f165b1e1f557a9b6ff2587ce91048ba3998ea82bbdd5f053843ab51a2a33f5a2d3cb21a2f2876398f536c54
+MISC ChangeLog 75778 SHA256 a218f831de976d13109f2ede38f0ebdcd4082961384b20460da0474e7d68bbee SHA512 d29cc13b034816a4e2d663852b5be79d178cb074e508dc6a7372b1f6c51a16dd88cea7042b9fda217b6626ee53ece0ab4f4509b594252b2ac59be24eec3d878c WHIRLPOOL 91090403bfc14d31bb74657ee80fd36f71d8d6ad45cbd2e2006ecb5039d342db34f1e625a439344ceae0695dac3b92e33a02c3e5ab62ff5e9e4f074f40896776
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20131024.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20131024.ebuild
new file mode 100644
index 0000000..8f30a53
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20131024.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2013 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/2013-10-24_00-01-44/zip/netbeans-trunk-nightly-201310240001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r12-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"
+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-r12-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-r12-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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-javafx/netbeans-javafx-9999_p20131030.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20131030.ebuild
new file mode 100644
index 0000000..f319af1
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20131030.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2013 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/2013-10-30_00-01-44/zip/netbeans-trunk-nightly-201310300001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r12-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"
+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-r12-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-r12-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 3c7112d..70c7a57 100644
--- a/dev-java/netbeans-mobility/ChangeLog
+++ b/dev-java/netbeans-mobility/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-mobility-9999_p20131030 (30 Oct 2013)
+*netbeans-mobility-9999_p20131024 (30 Oct 2013)
+
+  30 Oct 2013; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-mobility-9999_p20131024.ebuild,
+  +netbeans-mobility-9999_p20131030.ebuild:
+  bumped to latest nightly sources
+
   24 Oct 2013; Miroslav Šulc <fordfrog@g.o>
   -netbeans-mobility-9999_p20130926.ebuild,
   -netbeans-mobility-9999_p20130929.ebuild,

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index d9af8b9..574a464 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -22,6 +22,8 @@ DIST netbeans-trunk-nightly-201310110001-src.zip 186966977 SHA256 a987a5c4860c63
 DIST netbeans-trunk-nightly-201310160001-src.zip 193552704 SHA256 0d002764a1b5c5ef31ebe11101dc0125d0fd48d8e3daead824e3cec050e6bae8 SHA512 58227a201cddb7c89c171a3baa048f09ad437966522af4f39378e9cf2b6806407c895273f0ada5d5d2dd7e8679df2d82b3a2420fbe4c3ccf9b974b0778d20933 WHIRLPOOL 61c0682814a40948b234b30e320b5148ca05db33464e1f33f6d5d324c722b22ef8fdbe5aaeb4270a159d20319ae13f53a1fbe0e9df15702abfd955ec5c5642af
 DIST netbeans-trunk-nightly-201310170001-src.zip 193650002 SHA256 565ec13ba1f769b17e2172c257ca8c8058dda5851101fdd0a1a096f9f41c5b7d SHA512 1a3c385c2b95fa4328f02e4fe55e8850df9e149de1b62930cffc235a4063c9ff3e412769b4fab33a1e39d14b7aa6953212728f22c2d68f10f3de826f826c3e57 WHIRLPOOL 01fb58d969b599c6a7dd5c6d6984d259df8f79e19981d8ba14fb5a06f1374c67f6c7a80d52b8c701531cb85755e4e710e14b3a5ea6db81318d824592b61398a7
 DIST netbeans-trunk-nightly-201310180001-src.zip 193656938 SHA256 8ea8478ce28112b492cf7d460416d4bd6c408b627baa57879e351cd04b54031b SHA512 bdb5557f5eb8ec59ca52476ed4649316bf890e1d8721933a084a7a4f714c3f9b0b7026a6a9e043bae1e28c0f2a30b413f625f3775575962b8ecdedb8b762d656 WHIRLPOOL 73ec143e9155f6b0cc21a2144419feb6981ddc582d4adcc58a6668b698aac72fef9c80a7ee18df08b92d17fe7ad138d9227281ea61861a36908c180de41790bb
+DIST netbeans-trunk-nightly-201310240001-src.zip 193855785 SHA256 211ba26a46d366423b859c63a59cdafcb26ad29c16678094fb3037cd93937875 SHA512 dcc0d91a909b40721b3f8b5011318d6ec36dd30fca035530c6456b0bb41e12606e046cabebb0d1bf22ebba16cfd54ed04d25a81e878e9c844d71080451839b15 WHIRLPOOL 6c677335f795ca02116189162ac10808dd260133c7be4a67b7333c0a94296907cbb2d0bf492d47d9b0b8fd063977139c2df98d5ff635b776ee1df449669a09d4
+DIST netbeans-trunk-nightly-201310300001-src.zip 193888205 SHA256 8bdac1e58e9e6b710fc0f76669989ae2be95350a2c8cad63c89db7a83bdc60ce SHA512 9d25a803152ef40bfca42842dc7337036a8371ddb59748bdb37256c6fc201629d9440187e1d8d2d1ce249cee0827d4621e3b4043948edf1955ecb2231474f4ba WHIRLPOOL 1990e9a9de8b4b63a841ba5304ba5574dffb25e61a39a10b6dab74cfecd699ca392e86443857cb6a9a138f0913926474addd7ffed2c2c020038357b6b5d73725
 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
@@ -31,5 +33,7 @@ EBUILD netbeans-mobility-9999_p20131011.ebuild 6809 SHA256 64eac3c02a3a0522642ec
 EBUILD netbeans-mobility-9999_p20131016.ebuild 6809 SHA256 e316475c170ecbab1b250fe9237a9b53d948226365fca9a79431749e1975f9c6 SHA512 ec688d0395c511cf0b623879a28cc1df10c1685e759fba7a858eeb1c233929cc01b2d4a3e7031bca037edb982a29dc4aaeedfd24f059153c69d97008bec560f5 WHIRLPOOL 6c13947a1223931cd4f7b9ff4a0c706db78fece8ec3c57ea2ad3696c54cda0947156834d3903c7ff863089eab9d6bc189f7b84cfa61da2c8574d91959c58540f
 EBUILD netbeans-mobility-9999_p20131017.ebuild 6809 SHA256 f113693f16c4202e857451e2298d02b1d7ba0e53d55fa0025f542eb096ade4d9 SHA512 33a438faf29276c20275adb9731f9c273c30a2137c0cca11ae60cd659730f68726e97c8226f5607888776a047d98c930493be62501e74324d4bf823273aaf47b WHIRLPOOL 9de7520da66cfac1bb21797f36f4d0c2d4be7f1e8f2b5875f90ca397692d7fb2a37ccf2648cba8177deca830c74e3649004c54f3f5ffad1e23a924754be5636b
 EBUILD netbeans-mobility-9999_p20131018.ebuild 6809 SHA256 feb341f46d4ad14264fee9ee4f0d5a595e2d8d451582585cd68f671e31b107a5 SHA512 779876a4bbb80901bebbcc8eac78fc6dee4839ea0876630d4c079d9717ccd56a139e7ec210b726ad5fe67d6ba57b615dfee1500a566f84d5aaa940b53bf53cae WHIRLPOOL c64df465fe53a57df3e5b200178e242f0dc04b366ae7acc52bd4fc145ef2b35f4422d540abefefba0a24d3d626c76512487626aad951319fc663990c8fd88e82
-MISC ChangeLog 91329 SHA256 ff6d25ffea791a549a5ca899348dacdd66b8fe5829a04bbc82680cc142e20bd9 SHA512 4235fc800b289641b7687d00b7cf41a60d856a080981a338745762cb9e6888fa44902f0edab4953c5b901dfa5bf5d283005e3e545138d89b8567b8823c1cbf8d WHIRLPOOL fdfc84107f9bef65d0cba87cc3fd9856a26f0d5e0d3009da62be178ecd6604d52d6bf8639b0ba3262394080291d9724f95ad174b6fe9d9df31dd8f4744fa816a
+EBUILD netbeans-mobility-9999_p20131024.ebuild 6809 SHA256 795f54b36b6b1ff4be6a515b4d12ec8cf51eed41f5a3fe2d71a7ff44bae4e9cd SHA512 8875aec5d878b37d1ae85a265b544e33d4eeb02cadc5cd792351796d5744ace1d08dbffaa52dffdad9319b93fa1daf314766ea7cef75fe0bbd475206c84df100 WHIRLPOOL e747db9704a2dec826b418c4760de4cfc51b44f655df03e785f932b766c5c6495759769293f38e9b7f0a0f8bea81c646823c0d1aff201ae5cdea17fa0923c378
+EBUILD netbeans-mobility-9999_p20131030.ebuild 6809 SHA256 85337766eb22a762eb91172886a3a567938476d8569beebe7baa955766c3068e SHA512 de1fe42978b29bf8ff825d1cd7332323977c90ce5479b7d77e3fa9100b7a7910e55f850510143e09f09b80e0d8bef01e0efccd70305cbe16ac576d54b6c12e58 WHIRLPOOL f866e87ce0464f40ba11b5d77068f40b9e15b2da0e5c6b0d1464cea1300521f5e47063f35b5556838b24f0fe20543f3296912b93ae51e93e70bc8c3717e2bd84
+MISC ChangeLog 91602 SHA256 26ee72ed9734bf5e938e00930db6613e316bf6e2af9d2418f84590c154269df3 SHA512 b461faeefbdeee2ea7856a9450ce24bc7263a56d6e1e8cc1808afb5ed3c233f8552a0b41ab8ed64ef0032de65ec634441f97c8c280ee82eb5d075207eeeccd83 WHIRLPOOL ac81bc9bf8cfa119635c0d57a0409af588bdfa9624e0850f75c36af227289af65bb6691bba71947a912b790f47613ae4b9c2c4909b03ff25c6252da0ba09ce67
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20131024.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20131024.ebuild
new file mode 100644
index 0000000..1e42f27
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20131024.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2013 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/2013-10-24_00-01-44/zip/netbeans-trunk-nightly-201310240001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r12-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/CEF99941E945D543DF0711F2C6AEF765B50F8501-jakarta-slide-ant-webdav-2.1.jar
+	http://hg.netbeans.org/binaries/D1B5BA3BFE8DCFAF08A0468F8879EF1D0E998038-jakarta-slide-webdavlib-2.1.jar
+	http://hg.netbeans.org/binaries/2FB485DD8C5EFC7972037781BFFF0CE31316FCE6-jmunit-1.2.1-api.zip
+	http://hg.netbeans.org/binaries/BD84F1A4C0789070CC62A8D2DBA75121A57C069C-jmunit4cldc10-1.2.1.jar
+	http://hg.netbeans.org/binaries/D76B8334DCBDBE93297AA5C02B17D9A856E72246-jmunit4cldc11-1.2.1.jar
+	http://hg.netbeans.org/binaries/D63B2CB355170F1BC8E126E43021047F94243B70-perseus-nb-1.0.1.jar"
+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}
+	dev-java/ant-contrib:0
+	dev-java/commons-httpclient:3
+	dev-java/jdom:1.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.mobility -Dext.binaries.downloaded=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-r12-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/CEF99941E945D543DF0711F2C6AEF765B50F8501-jakarta-slide-ant-webdav-2.1.jar mobility.deployment.webdav/external/jakarta-slide-ant-webdav-2.1.jar || die
+	ln -s "${DISTDIR}"/D1B5BA3BFE8DCFAF08A0468F8879EF1D0E998038-jakarta-slide-webdavlib-2.1.jar mobility.deployment.webdav/external/jakarta-slide-webdavlib-2.1.jar || die
+	ln -s "${DISTDIR}"/2FB485DD8C5EFC7972037781BFFF0CE31316FCE6-jmunit-1.2.1-api.zip mobility.j2meunit/external/jmunit-1.2.1-api.zip || die
+	ln -s "${DISTDIR}"/BD84F1A4C0789070CC62A8D2DBA75121A57C069C-jmunit4cldc10-1.2.1.jar mobility.j2meunit/external/jmunit4cldc10-1.2.1.jar || die
+	ln -s "${DISTDIR}"/D76B8334DCBDBE93297AA5C02B17D9A856E72246-jmunit4cldc11-1.2.1.jar mobility.j2meunit/external/jmunit4cldc11-1.2.1.jar || die
+	ln -s "${DISTDIR}"/D63B2CB355170F1BC8E126E43021047F94243B70-perseus-nb-1.0.1.jar svg.perseus/external/perseus-nb-1.0.1.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r12-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 mobility.antext/external ant-contrib ant-contrib.jar ant-contrib-1.0b3.jar
+	java-pkg_jar-from --into mobility.deployment.webdav/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.0.1.jar
+	java-pkg_jar-from --into mobility.deployment.webdav/external jdom-1.0 jdom.jar jdom-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-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
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	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 commons-httpclient-3.0.1.jar && dosym /usr/share/commons-httpclient-3/lib/commons-httpclient.jar ${instdir}/commons-httpclient-3.0.1.jar || 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}/mobility
+}

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20131030.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20131030.ebuild
new file mode 100644
index 0000000..4500615
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20131030.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2013 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/2013-10-30_00-01-44/zip/netbeans-trunk-nightly-201310300001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r12-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/CEF99941E945D543DF0711F2C6AEF765B50F8501-jakarta-slide-ant-webdav-2.1.jar
+	http://hg.netbeans.org/binaries/D1B5BA3BFE8DCFAF08A0468F8879EF1D0E998038-jakarta-slide-webdavlib-2.1.jar
+	http://hg.netbeans.org/binaries/2FB485DD8C5EFC7972037781BFFF0CE31316FCE6-jmunit-1.2.1-api.zip
+	http://hg.netbeans.org/binaries/BD84F1A4C0789070CC62A8D2DBA75121A57C069C-jmunit4cldc10-1.2.1.jar
+	http://hg.netbeans.org/binaries/D76B8334DCBDBE93297AA5C02B17D9A856E72246-jmunit4cldc11-1.2.1.jar
+	http://hg.netbeans.org/binaries/D63B2CB355170F1BC8E126E43021047F94243B70-perseus-nb-1.0.1.jar"
+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}
+	dev-java/ant-contrib:0
+	dev-java/commons-httpclient:3
+	dev-java/jdom:1.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.mobility -Dext.binaries.downloaded=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-r12-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/CEF99941E945D543DF0711F2C6AEF765B50F8501-jakarta-slide-ant-webdav-2.1.jar mobility.deployment.webdav/external/jakarta-slide-ant-webdav-2.1.jar || die
+	ln -s "${DISTDIR}"/D1B5BA3BFE8DCFAF08A0468F8879EF1D0E998038-jakarta-slide-webdavlib-2.1.jar mobility.deployment.webdav/external/jakarta-slide-webdavlib-2.1.jar || die
+	ln -s "${DISTDIR}"/2FB485DD8C5EFC7972037781BFFF0CE31316FCE6-jmunit-1.2.1-api.zip mobility.j2meunit/external/jmunit-1.2.1-api.zip || die
+	ln -s "${DISTDIR}"/BD84F1A4C0789070CC62A8D2DBA75121A57C069C-jmunit4cldc10-1.2.1.jar mobility.j2meunit/external/jmunit4cldc10-1.2.1.jar || die
+	ln -s "${DISTDIR}"/D76B8334DCBDBE93297AA5C02B17D9A856E72246-jmunit4cldc11-1.2.1.jar mobility.j2meunit/external/jmunit4cldc11-1.2.1.jar || die
+	ln -s "${DISTDIR}"/D63B2CB355170F1BC8E126E43021047F94243B70-perseus-nb-1.0.1.jar svg.perseus/external/perseus-nb-1.0.1.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r12-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 mobility.antext/external ant-contrib ant-contrib.jar ant-contrib-1.0b3.jar
+	java-pkg_jar-from --into mobility.deployment.webdav/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.0.1.jar
+	java-pkg_jar-from --into mobility.deployment.webdav/external jdom-1.0 jdom.jar jdom-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-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
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	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 commons-httpclient-3.0.1.jar && dosym /usr/share/commons-httpclient-3/lib/commons-httpclient.jar ${instdir}/commons-httpclient-3.0.1.jar || 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}/mobility
+}

diff --git a/dev-java/netbeans-nb/ChangeLog b/dev-java/netbeans-nb/ChangeLog
index bfc353c..2517eef 100644
--- a/dev-java/netbeans-nb/ChangeLog
+++ b/dev-java/netbeans-nb/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-nb-9999_p20131030 (30 Oct 2013)
+*netbeans-nb-9999_p20131024 (30 Oct 2013)
+
+  30 Oct 2013; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-nb-9999_p20131024.ebuild, +netbeans-nb-9999_p20131030.ebuild:
+  bumped to latest nightly sources
+
   24 Oct 2013; Miroslav Šulc <fordfrog@g.o>
   -netbeans-nb-9999_p20130926.ebuild, -netbeans-nb-9999_p20130929.ebuild,
   -netbeans-nb-9999_p20131003.ebuild, -netbeans-nb-9999_p20131004.ebuild,

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 17f8d0e..897fbfd 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -20,6 +20,8 @@ DIST netbeans-trunk-nightly-201310110001-src.zip 186966977 SHA256 a987a5c4860c63
 DIST netbeans-trunk-nightly-201310160001-src.zip 193552704 SHA256 0d002764a1b5c5ef31ebe11101dc0125d0fd48d8e3daead824e3cec050e6bae8 SHA512 58227a201cddb7c89c171a3baa048f09ad437966522af4f39378e9cf2b6806407c895273f0ada5d5d2dd7e8679df2d82b3a2420fbe4c3ccf9b974b0778d20933 WHIRLPOOL 61c0682814a40948b234b30e320b5148ca05db33464e1f33f6d5d324c722b22ef8fdbe5aaeb4270a159d20319ae13f53a1fbe0e9df15702abfd955ec5c5642af
 DIST netbeans-trunk-nightly-201310170001-src.zip 193650002 SHA256 565ec13ba1f769b17e2172c257ca8c8058dda5851101fdd0a1a096f9f41c5b7d SHA512 1a3c385c2b95fa4328f02e4fe55e8850df9e149de1b62930cffc235a4063c9ff3e412769b4fab33a1e39d14b7aa6953212728f22c2d68f10f3de826f826c3e57 WHIRLPOOL 01fb58d969b599c6a7dd5c6d6984d259df8f79e19981d8ba14fb5a06f1374c67f6c7a80d52b8c701531cb85755e4e710e14b3a5ea6db81318d824592b61398a7
 DIST netbeans-trunk-nightly-201310180001-src.zip 193656938 SHA256 8ea8478ce28112b492cf7d460416d4bd6c408b627baa57879e351cd04b54031b SHA512 bdb5557f5eb8ec59ca52476ed4649316bf890e1d8721933a084a7a4f714c3f9b0b7026a6a9e043bae1e28c0f2a30b413f625f3775575962b8ecdedb8b762d656 WHIRLPOOL 73ec143e9155f6b0cc21a2144419feb6981ddc582d4adcc58a6668b698aac72fef9c80a7ee18df08b92d17fe7ad138d9227281ea61861a36908c180de41790bb
+DIST netbeans-trunk-nightly-201310240001-src.zip 193855785 SHA256 211ba26a46d366423b859c63a59cdafcb26ad29c16678094fb3037cd93937875 SHA512 dcc0d91a909b40721b3f8b5011318d6ec36dd30fca035530c6456b0bb41e12606e046cabebb0d1bf22ebba16cfd54ed04d25a81e878e9c844d71080451839b15 WHIRLPOOL 6c677335f795ca02116189162ac10808dd260133c7be4a67b7333c0a94296907cbb2d0bf492d47d9b0b8fd063977139c2df98d5ff635b776ee1df449669a09d4
+DIST netbeans-trunk-nightly-201310300001-src.zip 193888205 SHA256 8bdac1e58e9e6b710fc0f76669989ae2be95350a2c8cad63c89db7a83bdc60ce SHA512 9d25a803152ef40bfca42842dc7337036a8371ddb59748bdb37256c6fc201629d9440187e1d8d2d1ce249cee0827d4621e3b4043948edf1955ecb2231474f4ba WHIRLPOOL 1990e9a9de8b4b63a841ba5304ba5574dffb25e61a39a10b6dab74cfecd699ca392e86443857cb6a9a138f0913926474addd7ffed2c2c020038357b6b5d73725
 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
@@ -29,5 +31,7 @@ EBUILD netbeans-nb-9999_p20131011.ebuild 4987 SHA256 42acc9e4ec4d117e59afe811cf9
 EBUILD netbeans-nb-9999_p20131016.ebuild 4987 SHA256 527fa1409af709ec22916bf57284a3b47adf06b761037556ff19dbfa902f965a SHA512 384f83a431e705cf75b5317ca0942d148798bc985bfaa8710ac994c6464f13fa7da7937a7501403625c783c568c3240f4543508cef20fffa8126eb38a0fc528a WHIRLPOOL 6c9d5fc067ecb217c92b1926e23a8c6292486b6840c3ba793d798c392c0bf1872fc66c4611c9fa821c329acc54ec1ee11c55dc39616925178cf2c23950f91500
 EBUILD netbeans-nb-9999_p20131017.ebuild 4987 SHA256 a309e958586f663e6568b673faf63f4afcaba0466d72c70744ca4dacb52d624f SHA512 bdfe8034fab31b07809835eab6f3f3a9f7dbfbff8cfdfa6e7e335e94a6c254102ea0e631b8421750465d5249c69741ee8e48baa1920a6a15f6118b23df9fb62a WHIRLPOOL c764405c1751acdbd5c7ec7b196b7679e9f9244096c7c8d40c1601233d4bcf9af19dd16029f930afe0b17d26790339b7df083b56a464c26b65703c5f55a7d3b3
 EBUILD netbeans-nb-9999_p20131018.ebuild 4987 SHA256 dabe12a9b70abfaf2f7aa660e162c8bacaf660fb91e93cb72330bff7463281c0 SHA512 fd6e97bf0bc67f86354e4a89831e0bc471807076accdde9003e5ca2d382505daf7e23efc844a238f5f5d05d1ddcc462ac1a8b0f510759ad2e9694f960ae9b1aa WHIRLPOOL 0e106224afddb0882c1a014f9495a318db7ad8ef86db53c8f8e718f78ba4dc952829d63988934586d5504d25f351049cbb061f120d1bbe0b581a3f8bf15377e9
-MISC ChangeLog 85101 SHA256 fe613bbe0da381313fd8e24adca59e092709c936d41879ec098713a320f63d73 SHA512 b45dd707f2d269cc9574da981c980d5c7d92f162189bc69a536edde7d50cfa421d5aa134a70df7e3c33154f7d7e2b80ac0a7d8691bab21fbe792d66226bb22a9 WHIRLPOOL d8d646e1069679c3cee57a207b06cbd78daeeb0868812fd943ecd806e77edff5f7b0047605620d30750b4a08523bafae266b15ec9b87cc55eb79fc2b914c4fe3
+EBUILD netbeans-nb-9999_p20131024.ebuild 4987 SHA256 f52f0db1a6eb059e5694fcb7b5bba846938bfec62d801239c14b9da40b533f0e SHA512 7fd27981bb40d8efc109d29c70f02cf1b0068140b07bba856150f10623dffc9f34d43d2da901cd6f70004a4b1609fad0ad80d546512338955252f04418cfbaab WHIRLPOOL 7832ca0fb3a0be995f358c2610f60c9277d964d79ec4634b826b2d784db567d61b61f19e33fd6fbff3e19bc7e9f6a19a52f2f8d67eabe6e800a14e5f7553a321
+EBUILD netbeans-nb-9999_p20131030.ebuild 4987 SHA256 8290e62ef5daeb776a886261ef24e090c577b3e385662bd3d6052f1fa7278118 SHA512 e7d0e012aa29da1e16d788117a620edce9b68bbf9c2a3f53a3243d0e76c0a93e9ff0f36efb4f265efc2745571c4cdefad3c9369078df426c5dfc0752d31dd686 WHIRLPOOL 4e64a2e470ae1e631d853ad4a5c5da00cd3e9f8b20fa8fe547e9d4b12d45828cfc9ee02f11ab7868c5312cf8b8bd35469e3d371182e4cf09fcf2db334ea44b28
+MISC ChangeLog 85348 SHA256 782c91b34cda4799082325e73b83d98a49e89b586ed018bf55b164351a9d2243 SHA512 0255abcf776f4cde15a6e7473a0c8269e525c15bb4ad781b981db55ca2f8749df6d788c115ed80323c9f859b8d8fdc113eff1028084574657021d285df557046 WHIRLPOOL 3df834be65cc5618cd906481c67407edb3301f17cbfe3f2674bd20b0467b0a5ad2a98a735fa0ce21d0081201c96b698d3703db8ff08c696b3e1106c22fc665d2
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20131024.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20131024.ebuild
new file mode 100644
index 0000000..02eaf58
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20131024.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2013 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/2013-10-24_00-01-44/zip/netbeans-trunk-nightly-201310240001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r12-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"
+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-r12-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r12-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-nb/netbeans-nb-9999_p20131030.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20131030.ebuild
new file mode 100644
index 0000000..823ed35
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20131030.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2013 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/2013-10-30_00-01-44/zip/netbeans-trunk-nightly-201310300001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r12-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"
+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-r12-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r12-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 6bc3c46..e02c8dd 100644
--- a/dev-java/netbeans-php/ChangeLog
+++ b/dev-java/netbeans-php/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-php-9999_p20131030 (30 Oct 2013)
+*netbeans-php-9999_p20131024 (30 Oct 2013)
+
+  30 Oct 2013; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-php-9999_p20131024.ebuild, +netbeans-php-9999_p20131030.ebuild:
+  bumped to latest nightly sources
+
   24 Oct 2013; Miroslav Šulc <fordfrog@g.o>
   -netbeans-php-9999_p20130926.ebuild, -netbeans-php-9999_p20130929.ebuild,
   -netbeans-php-9999_p20131003.ebuild, -netbeans-php-9999_p20131004.ebuild,

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index fd8614f..e5ef5bb 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -22,6 +22,8 @@ DIST netbeans-trunk-nightly-201310110001-src.zip 186966977 SHA256 a987a5c4860c63
 DIST netbeans-trunk-nightly-201310160001-src.zip 193552704 SHA256 0d002764a1b5c5ef31ebe11101dc0125d0fd48d8e3daead824e3cec050e6bae8 SHA512 58227a201cddb7c89c171a3baa048f09ad437966522af4f39378e9cf2b6806407c895273f0ada5d5d2dd7e8679df2d82b3a2420fbe4c3ccf9b974b0778d20933 WHIRLPOOL 61c0682814a40948b234b30e320b5148ca05db33464e1f33f6d5d324c722b22ef8fdbe5aaeb4270a159d20319ae13f53a1fbe0e9df15702abfd955ec5c5642af
 DIST netbeans-trunk-nightly-201310170001-src.zip 193650002 SHA256 565ec13ba1f769b17e2172c257ca8c8058dda5851101fdd0a1a096f9f41c5b7d SHA512 1a3c385c2b95fa4328f02e4fe55e8850df9e149de1b62930cffc235a4063c9ff3e412769b4fab33a1e39d14b7aa6953212728f22c2d68f10f3de826f826c3e57 WHIRLPOOL 01fb58d969b599c6a7dd5c6d6984d259df8f79e19981d8ba14fb5a06f1374c67f6c7a80d52b8c701531cb85755e4e710e14b3a5ea6db81318d824592b61398a7
 DIST netbeans-trunk-nightly-201310180001-src.zip 193656938 SHA256 8ea8478ce28112b492cf7d460416d4bd6c408b627baa57879e351cd04b54031b SHA512 bdb5557f5eb8ec59ca52476ed4649316bf890e1d8721933a084a7a4f714c3f9b0b7026a6a9e043bae1e28c0f2a30b413f625f3775575962b8ecdedb8b762d656 WHIRLPOOL 73ec143e9155f6b0cc21a2144419feb6981ddc582d4adcc58a6668b698aac72fef9c80a7ee18df08b92d17fe7ad138d9227281ea61861a36908c180de41790bb
+DIST netbeans-trunk-nightly-201310240001-src.zip 193855785 SHA256 211ba26a46d366423b859c63a59cdafcb26ad29c16678094fb3037cd93937875 SHA512 dcc0d91a909b40721b3f8b5011318d6ec36dd30fca035530c6456b0bb41e12606e046cabebb0d1bf22ebba16cfd54ed04d25a81e878e9c844d71080451839b15 WHIRLPOOL 6c677335f795ca02116189162ac10808dd260133c7be4a67b7333c0a94296907cbb2d0bf492d47d9b0b8fd063977139c2df98d5ff635b776ee1df449669a09d4
+DIST netbeans-trunk-nightly-201310300001-src.zip 193888205 SHA256 8bdac1e58e9e6b710fc0f76669989ae2be95350a2c8cad63c89db7a83bdc60ce SHA512 9d25a803152ef40bfca42842dc7337036a8371ddb59748bdb37256c6fc201629d9440187e1d8d2d1ce249cee0827d4621e3b4043948edf1955ecb2231474f4ba WHIRLPOOL 1990e9a9de8b4b63a841ba5304ba5574dffb25e61a39a10b6dab74cfecd699ca392e86443857cb6a9a138f0913926474addd7ffed2c2c020038357b6b5d73725
 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
@@ -31,5 +33,7 @@ EBUILD netbeans-php-9999_p20131011.ebuild 4397 SHA256 1cffaab13b7f74ae8f86af8229
 EBUILD netbeans-php-9999_p20131016.ebuild 4397 SHA256 b77d01061557d7f71d4f51ddbdc8707849ea79739e25f9f5ae1c57ef997a2c15 SHA512 c57ac01f62cf23e65eb1124cdb849a5d3c1329acebff383467fbf9f31a0ecff0cd19973dd5ab0302d7dfa64f782aefdb7f31a387b16a131444fa3c7965d5ec1f WHIRLPOOL 301b4901766bc01f9345d3885f5c3229f7a4216abb14322b97b07a8c81f3b666da17d8797411236fb2320add52d20cdb8ed096e206c7a441d6b4a64b070910a3
 EBUILD netbeans-php-9999_p20131017.ebuild 4397 SHA256 39cebb5362ad16dd73ef641eba20d45c9ee22f67fc6d7bb4cf2e6f5c6eac2f4d SHA512 4ee4799438b086d18e015e6a94654cf8f876776b30f026c2ce1b4a7e37445230fc39e93edad672542907892a0153f9ed37208f531e5c780cdb5cc4184579076c WHIRLPOOL bcfc19a293cab55921d71327c598f3ea493df6695d68a20480330925c95574c7e66eff35de666245583bdb983e43f20f33ade7e8d278bbbc3ef4365ffebe4625
 EBUILD netbeans-php-9999_p20131018.ebuild 4397 SHA256 974d2020eb1b485e2faa5864df679312358c99ab2db58adeb3b6132e7a58d196 SHA512 423b27b29aa19ee81b0208089aaefb6160ec194420eab5beb8066dadc6df2424d7f4020e0f6e645eeeb6f672c375b023c31af12d645acd53e28ebc0cbd4982fa WHIRLPOOL fd805afeca2431ae75e13f31dfdb599855f101dd8b7a9022826c2ed4aad5dee534ffa221e8b8f2abad914acfbfb48c463302ac7760f57cdd1ae329cd5306222e
-MISC ChangeLog 85290 SHA256 831d740da63c314e1b486de465bfa91260fa47209e6521a29848fe099721ff16 SHA512 d88f3dc9b8394e67a3d69ea03dfd968b757b5e739d2e1125d2f7fe2f73d9e80c52836f51ee2016b721216794fcac89c0103c4cdaae529cd2115796ff67dc223d WHIRLPOOL f8b5c7a3ca64893bd6820f9caba601d2d06fcdc961f8cd87e9fbf420cbd2a5015f1b211195420b3025d3450a4171e8434aa5f81702f61db946c9a4916d3170cf
+EBUILD netbeans-php-9999_p20131024.ebuild 4397 SHA256 b7b9ca6c0df6368984d24c05c1e54a0d5d5b717470d89a406cb5ef6e40e89ac9 SHA512 de9e7114f5ae319f82c14510109702eaef3169fd3e1006fce272a130e3a45782c6ba7793432081e8015fa7a3ee8f8b6cc11f70a7d164f067697895598154664d WHIRLPOOL db00e6d63c9e842ca74044e76cda8a82b6ad2d47a0dc6346164cfb424e275bb373da0b9099671028788eb26572abf4a61d5a7b298db83c888611411b312b186a
+EBUILD netbeans-php-9999_p20131030.ebuild 4397 SHA256 bafe0b741a5674c30524db877c73caa63486579a217b5cf36ead11e6c6b13a61 SHA512 d361747af3eb19850eea9e0220cf7453ec79fe38edc1f82e2c19de68d3532319fed9d1b66c13b2d48f44c8ec3fa58b5cd30de709216d3acd73e32b52c8510efa WHIRLPOOL 9f1993251bfd368c9c9a171dd041104e3ba6186c26dd09e47ab523adf9016ba5bab170d24e03ce414ac8568de9266485adfbe5890cc10435d28c58e5bdab22e1
+MISC ChangeLog 85541 SHA256 4599d940c13245f18fbc77a45193cea3bacd9a82541a51b028bd288f00c44dc9 SHA512 4d96ec73ac4bbb1e5eaa6771c20a5a42df19d909f0237eb9d34eaa5f39d541a8c7596817c6ab1bd5b6d670152240d72bd059452e481a83166402501651e1aa44 WHIRLPOOL e21b20b27d25c3cb370a00d0fb3817e481dbb67ea0bdbaa84fe00131e0c3a7202a7d1dca116c1f7b7a842bebb5a7f2e1fe05afda1c6c9556a618c038159ec43d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20131024.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20131024.ebuild
new file mode 100644
index 0000000..2e203d3
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20131024.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2013 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/2013-10-24_00-01-44/zip/netbeans-trunk-nightly-201310240001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r12-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip
+	http://hg.netbeans.org/binaries/1A43C7644AECAEABCEA48BC412ED12FDD3AFFD3D-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"
+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-r12-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}"/1A43C7644AECAEABCEA48BC412ED12FDD3AFFD3D-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-r12-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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-php/netbeans-php-9999_p20131030.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20131030.ebuild
new file mode 100644
index 0000000..0b4c532
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20131030.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2013 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/2013-10-30_00-01-44/zip/netbeans-trunk-nightly-201310300001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r12-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip
+	http://hg.netbeans.org/binaries/1A43C7644AECAEABCEA48BC412ED12FDD3AFFD3D-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"
+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-r12-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}"/1A43C7644AECAEABCEA48BC412ED12FDD3AFFD3D-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-r12-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 c049a6a..ede8265 100644
--- a/dev-java/netbeans-platform/ChangeLog
+++ b/dev-java/netbeans-platform/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-platform-9999_p20131030 (30 Oct 2013)
+*netbeans-platform-9999_p20131024 (30 Oct 2013)
+
+  30 Oct 2013; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-platform-9999_p20131024.ebuild,
+  +netbeans-platform-9999_p20131030.ebuild:
+  bumped to latest nightly sources
+
   24 Oct 2013; Miroslav Šulc <fordfrog@g.o>
   -netbeans-platform-9999_p20130926.ebuild,
   -netbeans-platform-9999_p20130929.ebuild,

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 30fa8b5..5b4f9b1 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -27,6 +27,8 @@ DIST netbeans-trunk-nightly-201310110001-src.zip 186966977 SHA256 a987a5c4860c63
 DIST netbeans-trunk-nightly-201310160001-src.zip 193552704 SHA256 0d002764a1b5c5ef31ebe11101dc0125d0fd48d8e3daead824e3cec050e6bae8 SHA512 58227a201cddb7c89c171a3baa048f09ad437966522af4f39378e9cf2b6806407c895273f0ada5d5d2dd7e8679df2d82b3a2420fbe4c3ccf9b974b0778d20933 WHIRLPOOL 61c0682814a40948b234b30e320b5148ca05db33464e1f33f6d5d324c722b22ef8fdbe5aaeb4270a159d20319ae13f53a1fbe0e9df15702abfd955ec5c5642af
 DIST netbeans-trunk-nightly-201310170001-src.zip 193650002 SHA256 565ec13ba1f769b17e2172c257ca8c8058dda5851101fdd0a1a096f9f41c5b7d SHA512 1a3c385c2b95fa4328f02e4fe55e8850df9e149de1b62930cffc235a4063c9ff3e412769b4fab33a1e39d14b7aa6953212728f22c2d68f10f3de826f826c3e57 WHIRLPOOL 01fb58d969b599c6a7dd5c6d6984d259df8f79e19981d8ba14fb5a06f1374c67f6c7a80d52b8c701531cb85755e4e710e14b3a5ea6db81318d824592b61398a7
 DIST netbeans-trunk-nightly-201310180001-src.zip 193656938 SHA256 8ea8478ce28112b492cf7d460416d4bd6c408b627baa57879e351cd04b54031b SHA512 bdb5557f5eb8ec59ca52476ed4649316bf890e1d8721933a084a7a4f714c3f9b0b7026a6a9e043bae1e28c0f2a30b413f625f3775575962b8ecdedb8b762d656 WHIRLPOOL 73ec143e9155f6b0cc21a2144419feb6981ddc582d4adcc58a6668b698aac72fef9c80a7ee18df08b92d17fe7ad138d9227281ea61861a36908c180de41790bb
+DIST netbeans-trunk-nightly-201310240001-src.zip 193855785 SHA256 211ba26a46d366423b859c63a59cdafcb26ad29c16678094fb3037cd93937875 SHA512 dcc0d91a909b40721b3f8b5011318d6ec36dd30fca035530c6456b0bb41e12606e046cabebb0d1bf22ebba16cfd54ed04d25a81e878e9c844d71080451839b15 WHIRLPOOL 6c677335f795ca02116189162ac10808dd260133c7be4a67b7333c0a94296907cbb2d0bf492d47d9b0b8fd063977139c2df98d5ff635b776ee1df449669a09d4
+DIST netbeans-trunk-nightly-201310300001-src.zip 193888205 SHA256 8bdac1e58e9e6b710fc0f76669989ae2be95350a2c8cad63c89db7a83bdc60ce SHA512 9d25a803152ef40bfca42842dc7337036a8371ddb59748bdb37256c6fc201629d9440187e1d8d2d1ce249cee0827d4621e3b4043948edf1955ecb2231474f4ba WHIRLPOOL 1990e9a9de8b4b63a841ba5304ba5574dffb25e61a39a10b6dab74cfecd699ca392e86443857cb6a9a138f0913926474addd7ffed2c2c020038357b6b5d73725
 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
@@ -36,5 +38,7 @@ EBUILD netbeans-platform-9999_p20131011.ebuild 5444 SHA256 b2aa891cc961d3edb7399
 EBUILD netbeans-platform-9999_p20131016.ebuild 5444 SHA256 b8703781293f02b0d1db1a3e3960fce01e737438da6c63e43e5790b7951d5987 SHA512 d420ae24753282f7a5ed1113edcd13b3eada239d2e2c66bde69ac86e004f4f7c150a2d1739f556977e8a251e654ca0ebe8d39ba3d6a0c4553b15a38ecc870609 WHIRLPOOL 94b49a1e133173453fa75027b22dde0530f65e53d9dbc2dcc9db4776e136f767af2f7cc96f6d505cd7bfc1d66d226ea34ee9e424fc3ccf74ce5857dcbef13b1a
 EBUILD netbeans-platform-9999_p20131017.ebuild 5444 SHA256 c40b7855e53e943f97f660b5ef13317e5db771c77d4d7772866d28fa71fe3de7 SHA512 25d295cf46ce5f6a40bf29272c1f17f55dd2b6e593d9c5e1078d7c089fc2fdd9c09b00eb658f78bb5179f43b18c2f539cde9d604976caabcb82ccc1041ab3108 WHIRLPOOL 6eb94dd96a1ba2653d71fdeae263ddc9bea87e85b72c796046fadbf681fc651480b353572ffc2926f70f35ed273920761315ca17dc6eb49b959fd202db492318
 EBUILD netbeans-platform-9999_p20131018.ebuild 5444 SHA256 53361a9a4e7de013c692f305c31376d5b9c7490d1db27264479db42629875335 SHA512 a1da6b3696b1a1bad180dcee789eb1291a0260fae4f312aeaf09e70a5e4c7d79728ce12828c3eb1538f7c3b7d99465a7c416270cc8a62793589ff56d2eb64dd8 WHIRLPOOL 6aae761fd70c53b3e9d7ffdcbdb76633b771725665fafed44797238c317cde77d0d4ba57e1b7cb0b20b36dcff36f323c5a2de4e69acc8da3e6e88f7066761227
-MISC ChangeLog 91925 SHA256 828c050405010fb20bab9354d7888f080552c3f65582823905457c33a1598f3f SHA512 3b64113468432c1060a6a75ea943ef1c0d9d44de564ca2c3dcf31d29e81352068caa61a3fa3e20d2bca4294f3142cc4869db059f18122cd05baab73901586683 WHIRLPOOL 44c08593934ee65bd323a2d96799c3e8800c60d9e053feac1acf6fa52150638ddedbc0f335310534559d98555e7b554e7760612e4cd7c455834a93f2e7325345
+EBUILD netbeans-platform-9999_p20131024.ebuild 5444 SHA256 6b185bf3514f71d4e58c7621662b024441455ec4569a283fccf22bc0066793a0 SHA512 41a626407b54bca046c6b771ecf435922ad5d8a6aebadbb099bc8d4052d20178cb11f793aab2c52da255ffaab7354649a9c08f891bd3a912a297031a91996ce3 WHIRLPOOL ac7dc7a67dff2b7f79f1d0f420f5668a209581db51fe92c5d8551e65cdd3ca065eae5c7eb6e898dc228c3383923df56a8972f71fcbb1345e2a16b689a47c6f47
+EBUILD netbeans-platform-9999_p20131030.ebuild 5444 SHA256 fd8a00aa050b6f91d1ea139a0caccd83945dd37a9734a53040f914ca85bff924 SHA512 c1fc4e502fa9f0c8c36fb2211526ab5593ec3b0aed5e79ba8a76bff0c7f3c99b53de28cd2defa9e3f74ce9bb110d2bc93e76f0aadeca7c5743b32cb6e0b83c0b WHIRLPOOL eaa4c4700bf51e17e5d009f489234eccefe044ed8cd9aff0a05742f4b0b0046124c4ff445a088b7094348ad7df5427fa11c1629f278560991602c32cb21575e1
+MISC ChangeLog 92198 SHA256 ca9dddf7a0272302bfd59772ac968574e81e7b827c4af83951fb90c4bd29581f SHA512 af35c6afe920538a1b5a52568374e3bed13235a5046084998a6a8bf969a8be748908e7da7cf18d87c952911b707eb30cd9976f4d940bf47177962c5b8a255f56 WHIRLPOOL 07821140f0fcc746ae191049509e32ba2aa2a7d2e31fac979419fc1bd3dd68c416094acdb278f4bd0c230d0011246e99ba340e2cfe2fe52ea615c3876a82e8e0
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20131024.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20131024.ebuild
new file mode 100644
index 0000000..5e5574d
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20131024.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2013 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/2013-10-24_00-01-44/zip/netbeans-trunk-nightly-201310240001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r12-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/14F630EDF137F54188636B5139432986D5FB19B7-felix-4.0.2.jar
+	http://hg.netbeans.org/binaries/B54E470D47DF378B9DCE9423F919CCF4C7A60138-org.eclipse.osgi_3.8.0.v20120529-1548.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]"
+DEPEND=">=virtual/jdk-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"
+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-r12-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/14F630EDF137F54188636B5139432986D5FB19B7-felix-4.0.2.jar libs.felix/external/felix-4.0.2.jar || die
+	ln -s "${DISTDIR}"/B54E470D47DF378B9DCE9423F919CCF4C7A60138-org.eclipse.osgi_3.8.0.v20120529-1548.jar netbinox/external/org.eclipse.osgi_3.8.0.v20120529-1548.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-r12-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 platform-3.4.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-3.4.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-3.4.0.jar && dosym /usr/share/jna/lib/jna.jar ${instdir}/jna-3.4.0.jar || die
+	rm platform-3.4.0.jar && dosym /usr/share/jna/lib/platform.jar ${instdir}/platform-3.4.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-platform/netbeans-platform-9999_p20131030.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20131030.ebuild
new file mode 100644
index 0000000..57b5a31
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20131030.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2013 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/2013-10-30_00-01-44/zip/netbeans-trunk-nightly-201310300001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r12-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/14F630EDF137F54188636B5139432986D5FB19B7-felix-4.0.2.jar
+	http://hg.netbeans.org/binaries/B54E470D47DF378B9DCE9423F919CCF4C7A60138-org.eclipse.osgi_3.8.0.v20120529-1548.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]"
+DEPEND=">=virtual/jdk-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"
+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-r12-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/14F630EDF137F54188636B5139432986D5FB19B7-felix-4.0.2.jar libs.felix/external/felix-4.0.2.jar || die
+	ln -s "${DISTDIR}"/B54E470D47DF378B9DCE9423F919CCF4C7A60138-org.eclipse.osgi_3.8.0.v20120529-1548.jar netbinox/external/org.eclipse.osgi_3.8.0.v20120529-1548.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-r12-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 platform-3.4.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-3.4.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-3.4.0.jar && dosym /usr/share/jna/lib/jna.jar ${instdir}/jna-3.4.0.jar || die
+	rm platform-3.4.0.jar && dosym /usr/share/jna/lib/platform.jar ${instdir}/platform-3.4.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 ee20032..67826a9 100644
--- a/dev-java/netbeans-profiler/ChangeLog
+++ b/dev-java/netbeans-profiler/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-profiler-9999_p20131030 (30 Oct 2013)
+*netbeans-profiler-9999_p20131024 (30 Oct 2013)
+
+  30 Oct 2013; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-profiler-9999_p20131024.ebuild,
+  +netbeans-profiler-9999_p20131030.ebuild:
+  bumped to latest nightly sources
+
   24 Oct 2013; Miroslav Šulc <fordfrog@g.o>
   -netbeans-profiler-9999_p20130926.ebuild,
   -netbeans-profiler-9999_p20130929.ebuild,

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index f1b0bd6..7d1c377 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -13,6 +13,8 @@ DIST netbeans-trunk-nightly-201310110001-src.zip 186966977 SHA256 a987a5c4860c63
 DIST netbeans-trunk-nightly-201310160001-src.zip 193552704 SHA256 0d002764a1b5c5ef31ebe11101dc0125d0fd48d8e3daead824e3cec050e6bae8 SHA512 58227a201cddb7c89c171a3baa048f09ad437966522af4f39378e9cf2b6806407c895273f0ada5d5d2dd7e8679df2d82b3a2420fbe4c3ccf9b974b0778d20933 WHIRLPOOL 61c0682814a40948b234b30e320b5148ca05db33464e1f33f6d5d324c722b22ef8fdbe5aaeb4270a159d20319ae13f53a1fbe0e9df15702abfd955ec5c5642af
 DIST netbeans-trunk-nightly-201310170001-src.zip 193650002 SHA256 565ec13ba1f769b17e2172c257ca8c8058dda5851101fdd0a1a096f9f41c5b7d SHA512 1a3c385c2b95fa4328f02e4fe55e8850df9e149de1b62930cffc235a4063c9ff3e412769b4fab33a1e39d14b7aa6953212728f22c2d68f10f3de826f826c3e57 WHIRLPOOL 01fb58d969b599c6a7dd5c6d6984d259df8f79e19981d8ba14fb5a06f1374c67f6c7a80d52b8c701531cb85755e4e710e14b3a5ea6db81318d824592b61398a7
 DIST netbeans-trunk-nightly-201310180001-src.zip 193656938 SHA256 8ea8478ce28112b492cf7d460416d4bd6c408b627baa57879e351cd04b54031b SHA512 bdb5557f5eb8ec59ca52476ed4649316bf890e1d8721933a084a7a4f714c3f9b0b7026a6a9e043bae1e28c0f2a30b413f625f3775575962b8ecdedb8b762d656 WHIRLPOOL 73ec143e9155f6b0cc21a2144419feb6981ddc582d4adcc58a6668b698aac72fef9c80a7ee18df08b92d17fe7ad138d9227281ea61861a36908c180de41790bb
+DIST netbeans-trunk-nightly-201310240001-src.zip 193855785 SHA256 211ba26a46d366423b859c63a59cdafcb26ad29c16678094fb3037cd93937875 SHA512 dcc0d91a909b40721b3f8b5011318d6ec36dd30fca035530c6456b0bb41e12606e046cabebb0d1bf22ebba16cfd54ed04d25a81e878e9c844d71080451839b15 WHIRLPOOL 6c677335f795ca02116189162ac10808dd260133c7be4a67b7333c0a94296907cbb2d0bf492d47d9b0b8fd063977139c2df98d5ff635b776ee1df449669a09d4
+DIST netbeans-trunk-nightly-201310300001-src.zip 193888205 SHA256 8bdac1e58e9e6b710fc0f76669989ae2be95350a2c8cad63c89db7a83bdc60ce SHA512 9d25a803152ef40bfca42842dc7337036a8371ddb59748bdb37256c6fc201629d9440187e1d8d2d1ce249cee0827d4621e3b4043948edf1955ecb2231474f4ba WHIRLPOOL 1990e9a9de8b4b63a841ba5304ba5574dffb25e61a39a10b6dab74cfecd699ca392e86443857cb6a9a138f0913926474addd7ffed2c2c020038357b6b5d73725
 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
@@ -22,5 +24,7 @@ EBUILD netbeans-profiler-9999_p20131011.ebuild 3452 SHA256 0cb77dc2d08e21eade304
 EBUILD netbeans-profiler-9999_p20131016.ebuild 3452 SHA256 e42d3c26d53ffeb4d8a99433f1600c199969dbeca0a08e0b47fb5796341486bd SHA512 811c011e60d6ce713baf4fec2275b4ce05d1cef87e87745ce363dda6652b2257820015ac774f9e54531addad6f9ce11312a1ad44d9c5982c1e3fcdb089f3b81b WHIRLPOOL fe6af7d8dd2826f72d4a473e7c7237ea642626889e39e75e57ec549f64e42eadf6228c06f24ad1f909dc2946e1c82e03e005ba550ca51438dc269a4d094055c7
 EBUILD netbeans-profiler-9999_p20131017.ebuild 3452 SHA256 878013ca8282abd23c8c25414719d759130b56abedacf6c10df4c9d9fee68abd SHA512 13e3fa597ec57d725ad574fe274fd433eae71ebef722640c37460beb47763ae42b0a6e658f640305e2ca9a04edaba30cdc50616f6c83348ac89354e537962a95 WHIRLPOOL 52360f350b683c0ab1f6dcde20221907e35bf1c264fb476697fbe1b6a813dbfddeafcc84deca6f1e9b8f6d78f535c9b43efe9dcecbfce71fe70504a13126d617
 EBUILD netbeans-profiler-9999_p20131018.ebuild 3452 SHA256 827c0dc981d45524ef77323c5587b79a2aeb743b1e287374f78c15b6fc686834 SHA512 0fed93a4f4735e3117288d8c3fa1fd81d8e55e14d1541fdda5ca67a08760737f69dfb4a1cbbbbeb26f65884dfd1abefb3f1656a3aef420fc6132717766a8ce52 WHIRLPOOL 210299be90fb08ac5556e4794a2318a3b497a0d63f54f0f115db6c39f09ab410455ffcfdddcdece0ecf0207f5db155f0b8ae9e1356573b0833989fa6f98b95de
-MISC ChangeLog 91386 SHA256 8d757ea97ba35bba5ad9b23989b320d1ac2ee53d9d16119cacc43c6d29da2252 SHA512 1a550cc9b87bcaad1c82cd3baf2fdf55436e5a2e2a9d7abfbffe9e8dfac92be56d4b1bb3b3d6974f849f1e1b018782e07ef712017c7ace962bd2291c3adf0a1d WHIRLPOOL 469c36c9e33d6518438cc81b8d22fa1bc1ff4949777378af78b6ca2855e10863a1fa102468b571b446d9263257b8ebc3062138ae55a2a7af54924875d0f5134f
+EBUILD netbeans-profiler-9999_p20131024.ebuild 3452 SHA256 5a397dc4509171fff05ab05ad032e14b71928710cbc60d50c94b47061f5c748b SHA512 636453c52a98684c59451b56d00aeba62daa4991c9eee1b47d7785415a7a61d9d87430f49137bdc3b3e253c2e560a1432814107f0f6e24f578c672087521c1ed WHIRLPOOL de4dacb15bba8faeb7e7c0bc2a059fd2b406d39f20969b67456428f019b58dd6636acca739110fbbbb7ccb47da1fd0d7c35bc9c4db1c1aba79e64d7e940e429b
+EBUILD netbeans-profiler-9999_p20131030.ebuild 3452 SHA256 8c8ce53b67e023ce675edd02e376a5e3072df1404f41d4f423bbdd72ee48321c SHA512 7753acefd9609abd61388e63bc9d9271d649641327140713389cf7b5ce9fdfd5a3fb789449b30b2c4d8a477851114bdca5c010225ed4f41835e8999904346ca5 WHIRLPOOL be9113b893fd5322f1032634e0b1719fa202c164e5684995ee95acdd04d82e49b6cb1f86e84ba7712c9c6c72c6d9de465c4e486b38a9767f701ebc1033b80f3c
+MISC ChangeLog 91659 SHA256 b0a82326e853816577aac65b611f268af071229ba97beda0ce865d6b5da9dc1c SHA512 c31ca01993d737a1e303ca9047f19b1db6cac9ae8fe7ea6125f8895eaf124839977ace80d4733e501a388725b73496a3a959c3ca140c9bc22bff7507f5c57f04 WHIRLPOOL bb8e1438c7306594b0a2088052b880521b10f040f39d665f0ef1f306f7739e34a107d5ea0ca2d87310671b48c005a9c235c06ce251cc11200f01e6be5c8650ca
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20131024.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20131024.ebuild
new file mode 100644
index 0000000..3496bf1
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20131024.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2013 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/2013-10-24_00-01-44/zip/netbeans-trunk-nightly-201310240001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r12-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"
+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-r12-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r12-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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-profiler/netbeans-profiler-9999_p20131030.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20131030.ebuild
new file mode 100644
index 0000000..1bf9184
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20131030.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2013 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/2013-10-30_00-01-44/zip/netbeans-trunk-nightly-201310300001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r12-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"
+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-r12-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r12-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 6d9ef24..cc0a389 100644
--- a/dev-java/netbeans-webcommon/ChangeLog
+++ b/dev-java/netbeans-webcommon/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-webcommon-9999_p20131030 (30 Oct 2013)
+*netbeans-webcommon-9999_p20131024 (30 Oct 2013)
+
+  30 Oct 2013; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-webcommon-9999_p20131024.ebuild,
+  +netbeans-webcommon-9999_p20131030.ebuild:
+  bumped to latest nightly sources
+
   24 Oct 2013; Miroslav Šulc <fordfrog@g.o>
   -netbeans-webcommon-9999_p20130926.ebuild,
   -netbeans-webcommon-9999_p20130929.ebuild,

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index bddd9f8..463b853 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -17,6 +17,8 @@ DIST netbeans-trunk-nightly-201310110001-src.zip 186966977 SHA256 a987a5c4860c63
 DIST netbeans-trunk-nightly-201310160001-src.zip 193552704 SHA256 0d002764a1b5c5ef31ebe11101dc0125d0fd48d8e3daead824e3cec050e6bae8 SHA512 58227a201cddb7c89c171a3baa048f09ad437966522af4f39378e9cf2b6806407c895273f0ada5d5d2dd7e8679df2d82b3a2420fbe4c3ccf9b974b0778d20933 WHIRLPOOL 61c0682814a40948b234b30e320b5148ca05db33464e1f33f6d5d324c722b22ef8fdbe5aaeb4270a159d20319ae13f53a1fbe0e9df15702abfd955ec5c5642af
 DIST netbeans-trunk-nightly-201310170001-src.zip 193650002 SHA256 565ec13ba1f769b17e2172c257ca8c8058dda5851101fdd0a1a096f9f41c5b7d SHA512 1a3c385c2b95fa4328f02e4fe55e8850df9e149de1b62930cffc235a4063c9ff3e412769b4fab33a1e39d14b7aa6953212728f22c2d68f10f3de826f826c3e57 WHIRLPOOL 01fb58d969b599c6a7dd5c6d6984d259df8f79e19981d8ba14fb5a06f1374c67f6c7a80d52b8c701531cb85755e4e710e14b3a5ea6db81318d824592b61398a7
 DIST netbeans-trunk-nightly-201310180001-src.zip 193656938 SHA256 8ea8478ce28112b492cf7d460416d4bd6c408b627baa57879e351cd04b54031b SHA512 bdb5557f5eb8ec59ca52476ed4649316bf890e1d8721933a084a7a4f714c3f9b0b7026a6a9e043bae1e28c0f2a30b413f625f3775575962b8ecdedb8b762d656 WHIRLPOOL 73ec143e9155f6b0cc21a2144419feb6981ddc582d4adcc58a6668b698aac72fef9c80a7ee18df08b92d17fe7ad138d9227281ea61861a36908c180de41790bb
+DIST netbeans-trunk-nightly-201310240001-src.zip 193855785 SHA256 211ba26a46d366423b859c63a59cdafcb26ad29c16678094fb3037cd93937875 SHA512 dcc0d91a909b40721b3f8b5011318d6ec36dd30fca035530c6456b0bb41e12606e046cabebb0d1bf22ebba16cfd54ed04d25a81e878e9c844d71080451839b15 WHIRLPOOL 6c677335f795ca02116189162ac10808dd260133c7be4a67b7333c0a94296907cbb2d0bf492d47d9b0b8fd063977139c2df98d5ff635b776ee1df449669a09d4
+DIST netbeans-trunk-nightly-201310300001-src.zip 193888205 SHA256 8bdac1e58e9e6b710fc0f76669989ae2be95350a2c8cad63c89db7a83bdc60ce SHA512 9d25a803152ef40bfca42842dc7337036a8371ddb59748bdb37256c6fc201629d9440187e1d8d2d1ce249cee0827d4621e3b4043948edf1955ecb2231474f4ba WHIRLPOOL 1990e9a9de8b4b63a841ba5304ba5574dffb25e61a39a10b6dab74cfecd699ca392e86443857cb6a9a138f0913926474addd7ffed2c2c020038357b6b5d73725
 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
@@ -24,5 +26,7 @@ EBUILD netbeans-webcommon-9999_p20131011.ebuild 4773 SHA256 d8a3c751dbadb1a89caf
 EBUILD netbeans-webcommon-9999_p20131016.ebuild 4773 SHA256 42d1dea4d9ac52787be363b6d39bb7fe49476f7caf9b3a34a725ac248ae7061e SHA512 fd0a7ab57cc639cc397586a2660fdf4e0bf454cc1df26c303af52b16ec2b372a0a90705c891fd5b766a69ff0be20f8046ec882165ccf71f443ddfbd7562102e2 WHIRLPOOL 936ff234ff9638dc247a8ac589174af87ce6aa621264c51c932114b76400e19b875f7bddf94a39ee4d9720f02fde376ae16db02f5b8f3f60634171116f1713b3
 EBUILD netbeans-webcommon-9999_p20131017.ebuild 4773 SHA256 b5ae25ad2fffbe966c9e2e8332d9fd07d5c1301512304eb526891c13bd87dfd5 SHA512 43f575248699b1dfd4002df36295eae2c60d57175c38646204b6b1c5041fc37f5291abcd631cc7aa29f9962bd8128039511f695d51e3e85b5a8b757e18e4d821 WHIRLPOOL 0499ce23e246f4fbaf484f87b25083c9188d3ab6a842819b2b7cdd82d16451e04b4c006bb431d8174dce66a6780290fb88494059bf7101ad489947d60a675c86
 EBUILD netbeans-webcommon-9999_p20131018.ebuild 4773 SHA256 f8176c6c67b8cd7fcf353eb04442d33f4996b2e7fbd347958fb517a55bff756e SHA512 3c676dfbd22dd6ac74b541b62ae676015c5f9b8ec78227e55c8d7de094590ce9e594b88a0785e9c435bd708154686ed4d80f2482cacb4c68cea0cf84bf2f7975 WHIRLPOOL f95ec40da7a380392977cfd8aba1b00e5331ba63b911b23a3a631674edc144a12f726e948ae311d9187926e286abbf975a0dc4bfa084a26d4aac306ecab274ad
-MISC ChangeLog 63470 SHA256 283cc8d8a17dad632ac25e4ac02ed99e15bd786fca2f848cbdcb8d3c471cc6c4 SHA512 b310593031e84881271c5c9d9376ca7e5102cf2d0586a117df458052543424c1af0b72f207553db029abd995568631af20e2655989d6ac85aa41cf0411c5af9a WHIRLPOOL 6507788ee0b6a549df4d027d13ca3216005352f6f4cf97f86ae3db9d07ffea8db345bbe1a6fc9645bc6485ea5d4099783055b52eca92ab38c61c5f3ff271389a
+EBUILD netbeans-webcommon-9999_p20131024.ebuild 4773 SHA256 feb3c9ce34937106b87a8c09bd33fe613ceef324ab372ed329637104386ad13c SHA512 45b92a25ba46680f0d97d5447576157e85cf24edd62a315f4354a7fdf2a5887aabf5e842ceb544a523ad6a0ebfe2dadfb01428f8f96c6d49d2a0b33a60f609d1 WHIRLPOOL eef5980cc472eefc109c9897c412167d95fac6ab9f14c5f9383fa9bebdd0f304a74096f361015debc2d7155abb197ed264502aa613378ef67fe2f44230b51632
+EBUILD netbeans-webcommon-9999_p20131030.ebuild 4773 SHA256 daa1c27c97add46f7f7e712ba751247de5efb9cc9029a344f4db612fef45a966 SHA512 9f656e930b484ec868593461d39ad2a130eab862f809eafcd54be1d6438dedbc1e171c6cc128389cebfcd2436e802549bebe765293e9ffae93bf50a8c4b7942f WHIRLPOOL 2df49e583c0215a0b8b95c4ca4c37bc62af9ff6a0ecb699b51bdd241d100fc0a46661c2281fa4ba5abb59e5f0caf83d69a2d67393c7a375e81c216acfd09c46e
+MISC ChangeLog 63747 SHA256 5e25f4a17e557e6d9078c8050ebb337cac7c197d6a8679e1c2ae581be083954d SHA512 71f91a62fb2f836e57053c716da823556b6945c3a88e271158b38f618e61d4e5f569b519f3cb40ae6df72b41582680bfaca17e630e70c326f54ac43c92d389da WHIRLPOOL 33e58c74bb5bf83e6b4fd23b6a486f84d022127699c6c0ea2235bdc1f49dd3ad30a62b4238c8584c14dbcb916f75b7bde66f655993c1d9c7efefb6d8ee72e482
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20131024.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20131024.ebuild
new file mode 100644
index 0000000..8899d57
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20131024.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2013 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/2013-10-24_00-01-44/zip/netbeans-trunk-nightly-201310240001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r12-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/20317762D93542637CD2C6123B836C8DA267DE9D-cdnjs.zip
+	http://hg.netbeans.org/binaries/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar
+	http://hg.netbeans.org/binaries/E1B4ED2DCA9B1BDE7FE6D8F4B0A0CA265BCFFC16-ios-sim
+	http://hg.netbeans.org/binaries/9D29F2A9722C91A403F32971E97DD0E49E97B02E-libiDeviceNativeBinding.dylib
+	http://hg.netbeans.org/binaries/9F0D0D95F57E73C0110FA023813A4F9756D543B1-libimobiledevice.4.dylib
+	http://hg.netbeans.org/binaries/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib
+	http://hg.netbeans.org/binaries/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar
+	http://hg.netbeans.org/binaries/D05B7274396C8EED185207399B6D0400DE347DB7-libusbmuxd.2.dylib"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.webcommon -Dext.binaries.downloaded=true"
+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-r12-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/20317762D93542637CD2C6123B836C8DA267DE9D-cdnjs.zip web.clientproject.api/external/cdnjs.zip || die
+	ln -s "${DISTDIR}"/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar libs.plist/external/dd-plist.jar || die
+	ln -s "${DISTDIR}"/E1B4ED2DCA9B1BDE7FE6D8F4B0A0CA265BCFFC16-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-r12-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/webcommon >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+	grep -E "/webcommon$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/webcommon
+}

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20131030.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20131030.ebuild
new file mode 100644
index 0000000..9994b18
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20131030.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2013 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/2013-10-30_00-01-44/zip/netbeans-trunk-nightly-201310300001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r12-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/20317762D93542637CD2C6123B836C8DA267DE9D-cdnjs.zip
+	http://hg.netbeans.org/binaries/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar
+	http://hg.netbeans.org/binaries/E1B4ED2DCA9B1BDE7FE6D8F4B0A0CA265BCFFC16-ios-sim
+	http://hg.netbeans.org/binaries/9D29F2A9722C91A403F32971E97DD0E49E97B02E-libiDeviceNativeBinding.dylib
+	http://hg.netbeans.org/binaries/9F0D0D95F57E73C0110FA023813A4F9756D543B1-libimobiledevice.4.dylib
+	http://hg.netbeans.org/binaries/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib
+	http://hg.netbeans.org/binaries/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar
+	http://hg.netbeans.org/binaries/D05B7274396C8EED185207399B6D0400DE347DB7-libusbmuxd.2.dylib"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.webcommon -Dext.binaries.downloaded=true"
+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-r12-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/20317762D93542637CD2C6123B836C8DA267DE9D-cdnjs.zip web.clientproject.api/external/cdnjs.zip || die
+	ln -s "${DISTDIR}"/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar libs.plist/external/dd-plist.jar || die
+	ln -s "${DISTDIR}"/E1B4ED2DCA9B1BDE7FE6D8F4B0A0CA265BCFFC16-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-r12-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/webcommon >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+	grep -E "/webcommon$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/webcommon
+}

diff --git a/dev-java/netbeans-websvccommon/ChangeLog b/dev-java/netbeans-websvccommon/ChangeLog
index 246f932..44fb608 100644
--- a/dev-java/netbeans-websvccommon/ChangeLog
+++ b/dev-java/netbeans-websvccommon/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-websvccommon-9999_p20131030 (30 Oct 2013)
+*netbeans-websvccommon-9999_p20131024 (30 Oct 2013)
+
+  30 Oct 2013; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-websvccommon-9999_p20131024.ebuild,
+  +netbeans-websvccommon-9999_p20131030.ebuild:
+  bumped to latest nightly sources
+
   24 Oct 2013; Miroslav Šulc <fordfrog@g.o>
   -netbeans-websvccommon-9999_p20130926.ebuild,
   -netbeans-websvccommon-9999_p20130929.ebuild,

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index f146a4d..2f3ba35 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -13,6 +13,8 @@ DIST netbeans-trunk-nightly-201310110001-src.zip 186966977 SHA256 a987a5c4860c63
 DIST netbeans-trunk-nightly-201310160001-src.zip 193552704 SHA256 0d002764a1b5c5ef31ebe11101dc0125d0fd48d8e3daead824e3cec050e6bae8 SHA512 58227a201cddb7c89c171a3baa048f09ad437966522af4f39378e9cf2b6806407c895273f0ada5d5d2dd7e8679df2d82b3a2420fbe4c3ccf9b974b0778d20933 WHIRLPOOL 61c0682814a40948b234b30e320b5148ca05db33464e1f33f6d5d324c722b22ef8fdbe5aaeb4270a159d20319ae13f53a1fbe0e9df15702abfd955ec5c5642af
 DIST netbeans-trunk-nightly-201310170001-src.zip 193650002 SHA256 565ec13ba1f769b17e2172c257ca8c8058dda5851101fdd0a1a096f9f41c5b7d SHA512 1a3c385c2b95fa4328f02e4fe55e8850df9e149de1b62930cffc235a4063c9ff3e412769b4fab33a1e39d14b7aa6953212728f22c2d68f10f3de826f826c3e57 WHIRLPOOL 01fb58d969b599c6a7dd5c6d6984d259df8f79e19981d8ba14fb5a06f1374c67f6c7a80d52b8c701531cb85755e4e710e14b3a5ea6db81318d824592b61398a7
 DIST netbeans-trunk-nightly-201310180001-src.zip 193656938 SHA256 8ea8478ce28112b492cf7d460416d4bd6c408b627baa57879e351cd04b54031b SHA512 bdb5557f5eb8ec59ca52476ed4649316bf890e1d8721933a084a7a4f714c3f9b0b7026a6a9e043bae1e28c0f2a30b413f625f3775575962b8ecdedb8b762d656 WHIRLPOOL 73ec143e9155f6b0cc21a2144419feb6981ddc582d4adcc58a6668b698aac72fef9c80a7ee18df08b92d17fe7ad138d9227281ea61861a36908c180de41790bb
+DIST netbeans-trunk-nightly-201310240001-src.zip 193855785 SHA256 211ba26a46d366423b859c63a59cdafcb26ad29c16678094fb3037cd93937875 SHA512 dcc0d91a909b40721b3f8b5011318d6ec36dd30fca035530c6456b0bb41e12606e046cabebb0d1bf22ebba16cfd54ed04d25a81e878e9c844d71080451839b15 WHIRLPOOL 6c677335f795ca02116189162ac10808dd260133c7be4a67b7333c0a94296907cbb2d0bf492d47d9b0b8fd063977139c2df98d5ff635b776ee1df449669a09d4
+DIST netbeans-trunk-nightly-201310300001-src.zip 193888205 SHA256 8bdac1e58e9e6b710fc0f76669989ae2be95350a2c8cad63c89db7a83bdc60ce SHA512 9d25a803152ef40bfca42842dc7337036a8371ddb59748bdb37256c6fc201629d9440187e1d8d2d1ce249cee0827d4621e3b4043948edf1955ecb2231474f4ba WHIRLPOOL 1990e9a9de8b4b63a841ba5304ba5574dffb25e61a39a10b6dab74cfecd699ca392e86443857cb6a9a138f0913926474addd7ffed2c2c020038357b6b5d73725
 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
@@ -22,5 +24,7 @@ EBUILD netbeans-websvccommon-9999_p20131011.ebuild 2701 SHA256 55f7348c03c460301
 EBUILD netbeans-websvccommon-9999_p20131016.ebuild 2701 SHA256 3a4235c6138df85c686fcdf6720710a1c793e3c2ead9f3b269baf83dc59be642 SHA512 bdefb948bb41bf1a450bb5448378afc353ae0303975b30fc54a488d8c3fc765e45cd9f74774a7ef89073c1b9e63d84ff5c51ab69a9e861fae56881d0bf295383 WHIRLPOOL ef781cc74a4acb9e826305c4623857b3685734ddb02209783d2bf9822f5217be4bf47b0418aed5dfad44be294ad86c0d5a679af3d2e7d6cfac8ed73101b88457
 EBUILD netbeans-websvccommon-9999_p20131017.ebuild 2701 SHA256 d620d43d8e9d77fed83034803af81712ebe3164cb17554e04e72ba457b118f97 SHA512 f407709c89bfd8710e6fc22b1d06e682d1c89b61c728de42d5bc0d34847d3c22b449befbabf4fca0c4648b66b480e0308127e2c14ec17beceb3b66fb44701c63 WHIRLPOOL 4fa63989e498778a7e1db825043c0a5b01dcd14f7a9c6668fa07690dc939e003340943ed88626495894d696a8922f050126830613173fbb0e366a8a4206bbfbf
 EBUILD netbeans-websvccommon-9999_p20131018.ebuild 2701 SHA256 94a891bd79edeeba0d05a6118dc13ff4015a800cb76cafe9ff4bf45e1b2fdedf SHA512 3285477131a26457351fa0ee4e31e23af80836e49f59ea87dbeb4b69c2eb1dbb220d1c77e0c81ecb03cf52ea3e5f9abab3e0e02c8cf3a58dfb51e182385ca3cc WHIRLPOOL e0a31239f1f76f9d78e34f09ab0ee4fb7aeb8fdc61bb542949cde36354d3a6241894dc835195a77d3134c92beb2d279ba64b5676225160d8c71a8193ba8e6bf6
-MISC ChangeLog 95463 SHA256 4f2bef1320c0124c41c508739e66fa92d12f3408c1ea465e2f7ad09534b52af4 SHA512 26884041a65eb1ec8828be86452e7dca43320f8734925e47ed113e913b454410bda530eb0f686376fb0880c9633a60fcb4e2ca0344a6fb26adbe2a2688cb77c9 WHIRLPOOL 94168fab400d2ae9f2319902b826037737d0f09a52accf9c69d0f8b3b046bbe805099ba36375c7d10a4d9099059e55d3feb6d134ad3cd88ed2985021a7efafc5
+EBUILD netbeans-websvccommon-9999_p20131024.ebuild 2701 SHA256 fea79bf613d8c75c37dd630ae565b4f24b977b4038d7b3b1e407139869145271 SHA512 e6fd976c2a3f4459674f7d6536211a5bf7be56ffb9abf95179122b9dc25e0629de3937e611214e0151f03143746a1e2842cdf516d4e27fe77f1f1e306615fa75 WHIRLPOOL 37bfc0269edaca6cbc27d5dd9a0e2cf2e97cbca4d55b2591392222346b0f939ddaf2f8b86a38cfb674bc5c7990326a6a1371db123cd2a3caf27068b30f126a7b
+EBUILD netbeans-websvccommon-9999_p20131030.ebuild 2701 SHA256 5c714e08dfb04baf308f32b64a85b0476619b0d878d205f14c8f0a54702c47a2 SHA512 8dbbd822bcc714b00c615f924a67b4ac9f02a4bcab795314c6ce3639adcf2c8c69f4ab3ffc4653c91e1f35fada512121f32cc1edb7291074d0a2bec29312eb61 WHIRLPOOL 2f9adde72e597ae970e330d393058d69c7652cd2fb03dfd6a760aa8803b8253de5be956cb83f84fc49855dd36bcf6d499f4f617e1bfbfdce7e8d5b72b7167293
+MISC ChangeLog 95752 SHA256 7364c2fe47e81d137a48542e222a9896ad571bb4fa7ee8bd34227ef8656a5fc2 SHA512 bed967f2e4183182e8464b669cc4d997ac218fe38e846e20dfa1c6ad1cdb9670a08561d44e478de48d3d7e29b873406edce020487c42475d2e308ebb08e61847 WHIRLPOOL 8ef08c2f2aeea962fa8dc622cd77ea8ab0862a123b7c032b38d721dc0b8db7bd0eb8db0eec0c6dd3e69eb90c5742a9e808fff3b0a3e91d39b8b2ea059902fdd8
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20131024.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20131024.ebuild
new file mode 100644
index 0000000..b01eec4
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20131024.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2013 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/2013-10-24_00-01-44/zip/netbeans-trunk-nightly-201310240001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r12-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"
+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-r12-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r12-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20131030.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20131030.ebuild
new file mode 100644
index 0000000..cac5f2c
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20131030.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2013 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/2013-10-30_00-01-44/zip/netbeans-trunk-nightly-201310300001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r12-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"
+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-r12-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r12-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 d972831..ee296f1 100644
--- a/dev-util/netbeans/ChangeLog
+++ b/dev-util/netbeans/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-9999_p20131030 (30 Oct 2013)
+*netbeans-9999_p20131024 (30 Oct 2013)
+
+  30 Oct 2013; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-9999_p20131024.ebuild, +netbeans-9999_p20131030.ebuild:
+  bumped to latest nightly sources
+
   24 Oct 2013; Miroslav Šulc <fordfrog@g.o>
   -netbeans-9999_p20130926.ebuild, -netbeans-9999_p20130929.ebuild,
   -netbeans-9999_p20131003.ebuild, -netbeans-9999_p20131004.ebuild,

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index c30e9f4..93ec835 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -20,6 +20,8 @@ DIST netbeans-trunk-nightly-201310110001-src.zip 186966977 SHA256 a987a5c4860c63
 DIST netbeans-trunk-nightly-201310160001-src.zip 193552704 SHA256 0d002764a1b5c5ef31ebe11101dc0125d0fd48d8e3daead824e3cec050e6bae8 SHA512 58227a201cddb7c89c171a3baa048f09ad437966522af4f39378e9cf2b6806407c895273f0ada5d5d2dd7e8679df2d82b3a2420fbe4c3ccf9b974b0778d20933 WHIRLPOOL 61c0682814a40948b234b30e320b5148ca05db33464e1f33f6d5d324c722b22ef8fdbe5aaeb4270a159d20319ae13f53a1fbe0e9df15702abfd955ec5c5642af
 DIST netbeans-trunk-nightly-201310170001-src.zip 193650002 SHA256 565ec13ba1f769b17e2172c257ca8c8058dda5851101fdd0a1a096f9f41c5b7d SHA512 1a3c385c2b95fa4328f02e4fe55e8850df9e149de1b62930cffc235a4063c9ff3e412769b4fab33a1e39d14b7aa6953212728f22c2d68f10f3de826f826c3e57 WHIRLPOOL 01fb58d969b599c6a7dd5c6d6984d259df8f79e19981d8ba14fb5a06f1374c67f6c7a80d52b8c701531cb85755e4e710e14b3a5ea6db81318d824592b61398a7
 DIST netbeans-trunk-nightly-201310180001-src.zip 193656938 SHA256 8ea8478ce28112b492cf7d460416d4bd6c408b627baa57879e351cd04b54031b SHA512 bdb5557f5eb8ec59ca52476ed4649316bf890e1d8721933a084a7a4f714c3f9b0b7026a6a9e043bae1e28c0f2a30b413f625f3775575962b8ecdedb8b762d656 WHIRLPOOL 73ec143e9155f6b0cc21a2144419feb6981ddc582d4adcc58a6668b698aac72fef9c80a7ee18df08b92d17fe7ad138d9227281ea61861a36908c180de41790bb
+DIST netbeans-trunk-nightly-201310240001-src.zip 193855785 SHA256 211ba26a46d366423b859c63a59cdafcb26ad29c16678094fb3037cd93937875 SHA512 dcc0d91a909b40721b3f8b5011318d6ec36dd30fca035530c6456b0bb41e12606e046cabebb0d1bf22ebba16cfd54ed04d25a81e878e9c844d71080451839b15 WHIRLPOOL 6c677335f795ca02116189162ac10808dd260133c7be4a67b7333c0a94296907cbb2d0bf492d47d9b0b8fd063977139c2df98d5ff635b776ee1df449669a09d4
+DIST netbeans-trunk-nightly-201310300001-src.zip 193888205 SHA256 8bdac1e58e9e6b710fc0f76669989ae2be95350a2c8cad63c89db7a83bdc60ce SHA512 9d25a803152ef40bfca42842dc7337036a8371ddb59748bdb37256c6fc201629d9440187e1d8d2d1ce249cee0827d4621e3b4043948edf1955ecb2231474f4ba WHIRLPOOL 1990e9a9de8b4b63a841ba5304ba5574dffb25e61a39a10b6dab74cfecd699ca392e86443857cb6a9a138f0913926474addd7ffed2c2c020038357b6b5d73725
 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
@@ -29,5 +31,7 @@ EBUILD netbeans-9999_p20131011.ebuild 7216 SHA256 36e947eed0714c1f7ee7ca9f582c9d
 EBUILD netbeans-9999_p20131016.ebuild 7216 SHA256 f5f6c01b86e1788b5ce9622d6854f2aae5fee1206ec031d213666172cfa2de5a SHA512 79fa93fe88c3fa9633d16ed6d42bb91b489f61e293ec6e797bef71fd6dac227d71ec0f33ba15a9b5ec80defbbaeb03ec505058a9097de62302812c84bd17dbf9 WHIRLPOOL 2fa4818bf7b4e5ea892660fdc4982d297f7d416a4a89f96442fffe97f95f7ea248055f4ab54b2a2a85c24e7f953ae8887205a325f2ee6caa7588e4fd8b25293e
 EBUILD netbeans-9999_p20131017.ebuild 7216 SHA256 cfb7dc0e1dd2ae368d16e7509ca4891a062c0d39a3294bf6774e39bd86c326d9 SHA512 0efa1e63e9015ab0d4fbcfdad24b0a071134158c5c0e1ffae0a1e6fc180027a584c30abada488c1d1dfbdbedd7410b4db6b9b1fbec5dc4bae0c0e86619e3ddba WHIRLPOOL a74e0126cb4d86a49f06b923f16e8166c2e7b0b1b7c9dbed6867cd40da2e926c26db1873f820e9dc7988a11bb37ad4c221348e4edf3e5e646867e728351a8cb0
 EBUILD netbeans-9999_p20131018.ebuild 7216 SHA256 1d341e3055e4fc49bd225456c9efb72e4acb4f4991c5dbcf0982a169f7458961 SHA512 34a8400c5b05cc8eaee4f6f7ac21a18472b211a33cc6359027677a4ec82817bddd0766d7a717cb0290502de40724f8e475a8cc1cf4d9bf2f223a681127134182 WHIRLPOOL e37ea6d14f397d1cc30a5ef4718017f31b7b5ad4f12a6c041ef81530538fc015eb1593966fe55efc869ece79d30fae3c1236d0e69a9c156794d5278639cb5dc1
-MISC ChangeLog 82287 SHA256 a3c5ab2bfa192d3f93c9cae9ebc085b37af580545e5bff10cf25f8a448def77e SHA512 eb2d925727a537777ca2165bb0a7083512bf8a2e0963209a35781291192ccc7f082324be1464a12518c27a770059512cfe7d4b99eb570a8bf9178a498b9d3926 WHIRLPOOL 5cd4aebaf878f6275540903985ee613aeefe34cc4ba7d562af4747bd1ef4f4cc84e95f91870daa92c277b4eb43bc665c672dd6d5ab76b386098f2b40b8d94971
+EBUILD netbeans-9999_p20131024.ebuild 7216 SHA256 d3c621a77e20bcc532509d8b81fd3b8ea5a991a99d2b437cbf3d43eda9fe31ed SHA512 22d25c14d6a1eca351653b3b69aa64ecf7c90172f250ba1f8083fe98e9de9d0fb0d19b4c037ef5b2f7c244ac6c651f0edfa569cf3ff2ba7d04bb9ce756fbdbde WHIRLPOOL a6721f4b2dcc0e334e34240a63933be9f694b622667942faca38a1f7ce10afc7e364cc5ccde05ecc1071ec4126f8678ab1f84e131765b90e601ab8ae42327a5b
+EBUILD netbeans-9999_p20131030.ebuild 7216 SHA256 6e397eed2bd495c9e353bc620bfbed1e4223d6f1a3b9adbe1451f4d3fcad52cb SHA512 d84139069d67c101a782d4c43f05d399e0960db5531c92297f4aba26acc7d658e79cb5f8b5eab9a66ac825480c7cec0d05fc603e14696c509917904f8dd94709 WHIRLPOOL 99704ca4f90b687825365b08f6524400f61110c180590257993cc77ff16303a88e752eb71304f09fdfd1be633d89c7e7c465d09f60911e9351b847e54de49317
+MISC ChangeLog 82522 SHA256 3f7b0e1dfffaae6d30df3e806272caec61bd0273c88958a7b6c832275bd28b48 SHA512 a44119824bc7b996bc38facaa807c4def5e6be24c26c6249d649fd63f642450ad8710f95f29bfbeb5109447e9f4d44b6255cd5bb718f916fd1413808bc53c33a WHIRLPOOL 61aa17073f1b2320351d6cb99f038f4d4d23c17de9d14ad8d603e1a271f60924693920d89483e636adbb7dbb948867151376ac05ff3d6012f95a4083a11ac285
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

diff --git a/dev-util/netbeans/netbeans-9999_p20131024.ebuild b/dev-util/netbeans/netbeans-9999_p20131024.ebuild
new file mode 100644
index 0000000..c16a8a8
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20131024.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2013 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/2013-10-24_00-01-44/zip/netbeans-trunk-nightly-201310240001-src.zip"
+PATCHES_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r12-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-r12-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-r12-build.xml.patch
+
+		# Support for custom patches
+		if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+			local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+			if [ -n "${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
+}

diff --git a/dev-util/netbeans/netbeans-9999_p20131030.ebuild b/dev-util/netbeans/netbeans-9999_p20131030.ebuild
new file mode 100644
index 0000000..6d385cd
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20131030.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2013 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/2013-10-30_00-01-44/zip/netbeans-trunk-nightly-201310300001-src.zip"
+PATCHES_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r12-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-r12-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-r12-build.xml.patch
+
+		# Support for custom patches
+		if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+			local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+			if [ -n "${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
+}