[gentoo-commits] dev/fordfrog:master commit in: dev-util/netbeans/, dev-java/netbeans-javafx/, dev-java/netbeans-dlight/, ...

[Miroslav Šulc]

commit:     e6d9ae163d6922809512d59be400e8ddfd76022e
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 28 12:07:55 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Oct 28 12:07:55 2015 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=e6d9ae16

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.2.23

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 2691bac..6c066d3 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e68
 DIST netbeans-trunk-nightly-201510230002-src.zip 208659975 SHA256 2b00f5a10b9b57617f41c78adb256ae56e87a104fd88afeffdfe05ae46dec7bb SHA512 ab25742088a602ef44a1e3adec10fab612b100b7182efce801932156094103a2687da00df92a0fe7b6b0b5ca7ee825ee85b9cc84273449a6cffe686b0571c582 WHIRLPOOL e056f4cf9c2634a7ce09f466b722201d05096536683f9e0c744019e1e76cc53fb4b909e65b7d9fc16bf3ffaa6418b8c35521e2a6a6fcd043f615e8021a365107
 DIST netbeans-trunk-nightly-201510260002-src.zip 208660814 SHA256 0962715fc1997619fb908583701ad896b33aab643a82a1e55d20e508632e7e59 SHA512 c280647e7db0464844b0f81f0603c4d2583c9bf29516a4503632960ae682d7c008f67e12d14521095c97f16d285d2fefdc5017658028f3f3eadd1c3a5a7c4bc3 WHIRLPOOL be2a219d0fcc2a81a297eb1e560b97e8fc9daee48954dd548fe5eaa8cd70307b679adf0a3743c3f808c6dd8e9d6191b14b98c385d95457dafcf120fa6a8e90d4
 DIST netbeans-trunk-nightly-201510270002-src.zip 208660814 SHA256 1c083e6b903f72b10882f5285d8edb286f8d16de21c3b046f6e4190a008ff0f3 SHA512 b202224350745f28283261cc7756020f227304af8294e1abda6004393d8a23986d444fe36af31573f1ed4cb822fb2f1197d20e91d804500c4cf22edbc0c81b51 WHIRLPOOL e4a03fb4ae2733dba2026e3f60d4ebf6bde257d9c3fdcff6b613e6b9af7d305c04d57b0d9724a04cbf29eb0cf5448c90e6489c00e35eb23593875339e5627c11
+DIST netbeans-trunk-nightly-201510280002-src.zip 208661828 SHA256 3139169e12a7c0fc41665a462154b3ab94fe553945524b605328c502c576e669 SHA512 4bb4158f8bff478aad34a69a0e985564f4e87a1e0df5174ab18af6018ddf34a52cd3bd0a1179ad2bf1842725effafe25117d6c004177dc196473211c2695f89f WHIRLPOOL ca8db212894d1f4fc3aacebcf3e0ef730ac5d80aa32ba1c3cd3f545027fd64b44e786dbec28485bd6905b19ccabb676c145274167054ed320eaa5ece98fceb88
 EBUILD netbeans-apisupport-8.0.2.ebuild 3314 SHA256 b68fe791f275fe4fcc8b00888688949b8927cb39db2cf9ad7860017c6d20adee SHA512 35c4bbcd34ec0eaef8a2de86c13333d2bf092db61af48558c3e173bb17dbf8fcd15001307bd7c498f4ccdbaa4277e1ee42ff0909af6170039165b547f646c383 WHIRLPOOL 206fe8d5f64e76827d3eb958a629ba087e8a16c2797752f5d9e62dff4166653677587a81be19e0a2c6adcf49292255d532e1f542c02550b1cf6ffd51467bde3c
 EBUILD netbeans-apisupport-8.1_rc2.ebuild 3339 SHA256 a5952c7ca966bb14f072fd1ad4b92464f12e1d9ef04ee18616b1ba4de33f016e SHA512 bf26818a2701f01dd4340d73f479fe38e4b8f7b94da83ff0d90a779ece651474fd353730c518b5dba5c7164f2b62f8c2f49df5e3e7b9dc9ae292b6648875fec9 WHIRLPOOL ee1e8769b8656dc81059a91673be35f43aeda9cb1ed43c1b3379508b4d62ea10bdce7423499046567f0d61c6410f3c26faaafc288cc41aef3ded36086e2d715f
 EBUILD netbeans-apisupport-9999_p20151001.ebuild 3384 SHA256 9b0a84fced88d25678a0fda5fd8bf40be0b9c7a8dccc17f70087ad49c187979f SHA512 696c46f929a272dfdebb76a2b969819106b60dd416df1cf0f040fcdd422b47d99eb55c6d7ad4d9c6a18b7ed5aeb87a4b5ff2cc7574be21c8fc20574b4ce3d514 WHIRLPOOL 1a5108cff46424afc2cbceddf570482bf8912e8565444b5e76e886f179e04bcec29b64844e0b5576812c6390a80f6e73c942acee0130075da483152b254d1c90
@@ -45,4 +46,5 @@ EBUILD netbeans-apisupport-9999_p20151022.ebuild 3384 SHA256 38235791b80ca0e5c7e
 EBUILD netbeans-apisupport-9999_p20151023.ebuild 3384 SHA256 784c1cacba82d648910725954d890be0ff4f41cc8bd32e00c972fdb36534d76b SHA512 4df75f8d7cc063441851628b7ad8ca6665386f5d0f26ef71c4b08244293d064d97dac73027a48c7a648a8c4e8a6f72b2c292a780eb04a3e05f20ebb92094a898 WHIRLPOOL d38c532ecb0ad004673b039c5b23efd487f8622c11f25f6c47b636379c79f5aa3481f7f606ec9abd66a2cc7829a032be375cd2ce1480f99e527dfb3bb3054d2b
 EBUILD netbeans-apisupport-9999_p20151026.ebuild 3384 SHA256 17e12dc8ff36fb03e50debaf23dc36bed43180a40033fcaf6eeef8ece7cfc853 SHA512 abeea4486f710096bb659d87b25f24e13aa4305705d28e3d7307722693651fa91b95798ec61327a697520ad0793319c243843437b15390acea0b899e8795dd80 WHIRLPOOL 0af6c16161640847f2c8e12ed61bff4a9731a5ee8f6d2384a0d7f8fb397154b6218ea0cde2ccccffcdd6274f1ccee64b428f7dd2c6cb585fce62bc4e0164b98c
 EBUILD netbeans-apisupport-9999_p20151027.ebuild 3384 SHA256 58b0b8bac782472630c63c07f2fb9a29c7fa004b5cdb2bb03a77ca51299b14dc SHA512 63fbe763a8dbeeebcf47eb859d533b74768f0e57c760e18638fec9b3d4e2c805042f65a4710335a1f7640be47c20bbb0ff12f39f81ce10e77b5e94ccd40d937c WHIRLPOOL f69f701d63044eaf714a0160413666ff6687ccaeb4d986493d97e907269c50130bedef4826dae17d7c2ba0f288641ee39455b8fd903d89af65255e5201bc13f2
+EBUILD netbeans-apisupport-9999_p20151028.ebuild 3384 SHA256 ccd1ac8b4e72072a1b18109f96b6f88aa8e806d16365639af5c02975b00e69c6 SHA512 6fd3afebc95051b431f872f82b027047d6abebe369a0473672a97f95fe4e5d13c7cfe21b9ea6bd57c98bc8852af753a2d5ee7535bc83d3cc1328643c72560431 WHIRLPOOL 350a31d9c86c9e2fdf48efb26a666bc384582dbb09274c8e6f1a591456670f1f2f7d50b54f9c8bb2e045b6a0dfc6ebeef856c04a7ee182420da25875eeb7aa09
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index 373ad50..ac4448c 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e68
 DIST netbeans-trunk-nightly-201510230002-src.zip 208659975 SHA256 2b00f5a10b9b57617f41c78adb256ae56e87a104fd88afeffdfe05ae46dec7bb SHA512 ab25742088a602ef44a1e3adec10fab612b100b7182efce801932156094103a2687da00df92a0fe7b6b0b5ca7ee825ee85b9cc84273449a6cffe686b0571c582 WHIRLPOOL e056f4cf9c2634a7ce09f466b722201d05096536683f9e0c744019e1e76cc53fb4b909e65b7d9fc16bf3ffaa6418b8c35521e2a6a6fcd043f615e8021a365107
 DIST netbeans-trunk-nightly-201510260002-src.zip 208660814 SHA256 0962715fc1997619fb908583701ad896b33aab643a82a1e55d20e508632e7e59 SHA512 c280647e7db0464844b0f81f0603c4d2583c9bf29516a4503632960ae682d7c008f67e12d14521095c97f16d285d2fefdc5017658028f3f3eadd1c3a5a7c4bc3 WHIRLPOOL be2a219d0fcc2a81a297eb1e560b97e8fc9daee48954dd548fe5eaa8cd70307b679adf0a3743c3f808c6dd8e9d6191b14b98c385d95457dafcf120fa6a8e90d4
 DIST netbeans-trunk-nightly-201510270002-src.zip 208660814 SHA256 1c083e6b903f72b10882f5285d8edb286f8d16de21c3b046f6e4190a008ff0f3 SHA512 b202224350745f28283261cc7756020f227304af8294e1abda6004393d8a23986d444fe36af31573f1ed4cb822fb2f1197d20e91d804500c4cf22edbc0c81b51 WHIRLPOOL e4a03fb4ae2733dba2026e3f60d4ebf6bde257d9c3fdcff6b613e6b9af7d305c04d57b0d9724a04cbf29eb0cf5448c90e6489c00e35eb23593875339e5627c11
+DIST netbeans-trunk-nightly-201510280002-src.zip 208661828 SHA256 3139169e12a7c0fc41665a462154b3ab94fe553945524b605328c502c576e669 SHA512 4bb4158f8bff478aad34a69a0e985564f4e87a1e0df5174ab18af6018ddf34a52cd3bd0a1179ad2bf1842725effafe25117d6c004177dc196473211c2695f89f WHIRLPOOL ca8db212894d1f4fc3aacebcf3e0ef730ac5d80aa32ba1c3cd3f545027fd64b44e786dbec28485bd6905b19ccabb676c145274167054ed320eaa5ece98fceb88
 EBUILD netbeans-cnd-8.0.2.ebuild 4510 SHA256 0a9a4e58e28f395b5bcb017016b6ddb1b77afe393d0e5bd81cc05e3a32076c71 SHA512 2b1fedfe292fa140920fd11829e77127f9535e08b8307886accfa37e6d11195a1204e6b71b2640937da0711c3ce0bbf80c0eaa3c248a64fd61b6a3d99d5de14e WHIRLPOOL 10b1518360ade5d6f1f27c79a10f630b94a2ec5062e18df11f9828d4b374e6cbdea0b9f770e01c117ca90fa194dff9bd3be6a468075c2d35167fb78a7bb32794
 EBUILD netbeans-cnd-8.1_rc2.ebuild 4745 SHA256 b1c5a9a27ec1c22ea6eda555bce70adc6735c02d0eb47ebe676bffba4a2c3db7 SHA512 d50cb168b724476bbcb280e0e78a5ca3659721639f8e678be20523f0a491e2edbd78759cdbbeb86cc5ab039af7e46a92eebcabba5aeb366a5592fd3ed53d57a7 WHIRLPOOL a395a72b1acf8156dcb0185c5236986d40e01e1fec475f629c7a54f1e0cec2754a3d2de1883bf17e08264059d3d3009c54de019c4b5f156c1c884252b7240081
 EBUILD netbeans-cnd-9999_p20151001.ebuild 4790 SHA256 b699f830d6365a79195b7b411d5b764aeb1c67c243c633fc8ec9076ccecd387a SHA512 0488b2027a00ece43bbda93220c366926d4a96a87c380db3157495c45e0ef1c6da70725882d7c449b555a1eb641f066b8868100ef112da0ad66ad80ec79fce0b WHIRLPOOL c13484878e87d25a9ca8ce0556b464778c47528b345971101b870291787b2b2835e5ba06cbe31e29fbcb2964eed15a5259041c344cc96f6546d78f4f51365f56
@@ -61,4 +62,5 @@ EBUILD netbeans-cnd-9999_p20151022.ebuild 4790 SHA256 b61fe394eb1ce8a9ad7ab89555
 EBUILD netbeans-cnd-9999_p20151023.ebuild 4790 SHA256 76adbbd8e88ccf39cc3f8893c23d5bdc95f257bc19c3c0598b28ef12694b12b7 SHA512 44f6448b4bc501a4f7c528212ab67fab1093a8b924a365abc31ab30cbd1891925595625082c71bf75cc57fa5302c6305a1cc56d65847b15e2259e6ef90bc3986 WHIRLPOOL 5c2d7d3814603ddc993c3cae39cbb3eea4c89b308b23ed46fea7eb6c6f5e2a7e2631f2b07eb82849656991f17e2c586f54c15bd1fdba84e5c25fd1d033dc0655
 EBUILD netbeans-cnd-9999_p20151026.ebuild 4790 SHA256 d7834a4fe5799a00ca73b3a44500d0b1da5aca7484514f75c5c24ce02fcfba16 SHA512 2eef278599332079fc5f391626f36df2443bd8399163c9577fc24806deaea8dd1f2a741d7bc8e98721143593dd9985411eebdf9ec4adad10d34c948fa928d9f2 WHIRLPOOL 4121efe1f625894361374fc1d798f249e31ddd7558f1ae107a5f2b5c2b7b59b880a7bbf9fe6bed0c76c9ca24398a5a6b87da6f7e16fb483cb3b74364af27c90e
 EBUILD netbeans-cnd-9999_p20151027.ebuild 4790 SHA256 ae10c21c89867185cb6750f06eacd7ec11b7a932a36e6e87a8212b600404e939 SHA512 31d12e0ce99e0b728e6c86c2cbfe2230b31179b83a3fe5a8246d185235db8de04320577db14867f7ad1c5a026512ff067d8075c3bfc2fa9519253ad4c8f1a5db WHIRLPOOL ed209eb3d93035932bb66cf4a2dd661a6d8ace256653d163e73efe9cd64cec3c2dd2db6b152ad5f1132de63112738589193aa3f5fdf8da92b25ea76fb618b9f0
+EBUILD netbeans-cnd-9999_p20151028.ebuild 4790 SHA256 5f1891830fd1643c3e74f9da0493509763f02e9fef409fbfede8a4fb87d676b0 SHA512 ec9747b5aa072644a8305e4dadbc849cbe37b584efd70cef285c9fef0588950c917b7aff43c02027f39ef9946c5cd8c756d2708595f36a9bc522c6050cddcd91 WHIRLPOOL a4adc6f50f7c7d7e8dd4e8831bb5a684ae39d2080bd3c7912904f0ee8094c885815baf140d5e7c99a6b4b48ce18b9c0c7f0f69a055d862afcf0168bf7c970c53
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index e83cf2d..22b71ae 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e68
 DIST netbeans-trunk-nightly-201510230002-src.zip 208659975 SHA256 2b00f5a10b9b57617f41c78adb256ae56e87a104fd88afeffdfe05ae46dec7bb SHA512 ab25742088a602ef44a1e3adec10fab612b100b7182efce801932156094103a2687da00df92a0fe7b6b0b5ca7ee825ee85b9cc84273449a6cffe686b0571c582 WHIRLPOOL e056f4cf9c2634a7ce09f466b722201d05096536683f9e0c744019e1e76cc53fb4b909e65b7d9fc16bf3ffaa6418b8c35521e2a6a6fcd043f615e8021a365107
 DIST netbeans-trunk-nightly-201510260002-src.zip 208660814 SHA256 0962715fc1997619fb908583701ad896b33aab643a82a1e55d20e508632e7e59 SHA512 c280647e7db0464844b0f81f0603c4d2583c9bf29516a4503632960ae682d7c008f67e12d14521095c97f16d285d2fefdc5017658028f3f3eadd1c3a5a7c4bc3 WHIRLPOOL be2a219d0fcc2a81a297eb1e560b97e8fc9daee48954dd548fe5eaa8cd70307b679adf0a3743c3f808c6dd8e9d6191b14b98c385d95457dafcf120fa6a8e90d4
 DIST netbeans-trunk-nightly-201510270002-src.zip 208660814 SHA256 1c083e6b903f72b10882f5285d8edb286f8d16de21c3b046f6e4190a008ff0f3 SHA512 b202224350745f28283261cc7756020f227304af8294e1abda6004393d8a23986d444fe36af31573f1ed4cb822fb2f1197d20e91d804500c4cf22edbc0c81b51 WHIRLPOOL e4a03fb4ae2733dba2026e3f60d4ebf6bde257d9c3fdcff6b613e6b9af7d305c04d57b0d9724a04cbf29eb0cf5448c90e6489c00e35eb23593875339e5627c11
+DIST netbeans-trunk-nightly-201510280002-src.zip 208661828 SHA256 3139169e12a7c0fc41665a462154b3ab94fe553945524b605328c502c576e669 SHA512 4bb4158f8bff478aad34a69a0e985564f4e87a1e0df5174ab18af6018ddf34a52cd3bd0a1179ad2bf1842725effafe25117d6c004177dc196473211c2695f89f WHIRLPOOL ca8db212894d1f4fc3aacebcf3e0ef730ac5d80aa32ba1c3cd3f545027fd64b44e786dbec28485bd6905b19ccabb676c145274167054ed320eaa5ece98fceb88
 EBUILD netbeans-dlight-8.0.2.ebuild 2898 SHA256 08402481b573b90396431be03bda45904b2dd29f0086e09a111fe362e310c3f7 SHA512 3f6d6c9ea0043382562fbe47ad16e3273032407a74cb44ec7ff26736f96483835af4be8674361e910912a550b9fe592cc5a28c2b93b6b993076553195c35eac5 WHIRLPOOL 9d8706ccbc0d97b0f5d64ebf22c36316b08d8fbccd57408119ca5f5faef08c7f82677bf67488ff611eabeaa730e4c9a730c50966d94d738cfe79330ac147863d
 EBUILD netbeans-dlight-8.1_rc2.ebuild 2923 SHA256 70d3c3729f4e669f1f2a2c7d71f4abd2f171402c95290546e0f34413ccdf9bcc SHA512 641b633b048dca1b1d94d212de023f5977c08d9aa8bb25bf2047255698135e0ad0ea7173360d9deac09a25b9f0844dea192a378adc164aa62dfa4d52a8ce2b80 WHIRLPOOL 0c2abb5028cbc0717e54601a125a016d7c208694adf8cadcae274096b8c7e200de13a0ede6c0815dc38c16c63633a3974fca6051b64156aa839155e31604f380
 EBUILD netbeans-dlight-9999_p20151001.ebuild 2968 SHA256 2662d9bd51c05b8c97c5be11ffaa9afd8e290d6be1f9c8e766267d1a945359d3 SHA512 f30c71dab1c3cc99c31885997c2e3a85912e1b34ce2dcd46fdcee3a7f76b8a50f50d3bac170d7055f268969bb13cfd5ad3564ff0df57cab88ab2c5f92b712edd WHIRLPOOL 44e5db72ef794b2fc8a26d1c1e3558d7420756a907fc2ff599922a36c65bf2c2de5423a328c7131ecf1637ef27965179aca5983359b7c678d8e50d8ce5a68981
@@ -48,4 +49,5 @@ EBUILD netbeans-dlight-9999_p20151022.ebuild 2968 SHA256 d1c935681cb5808863a2f03
 EBUILD netbeans-dlight-9999_p20151023.ebuild 2968 SHA256 03fe3bd70ea54b08aab2b543c36ecea70be97be6ea844f6fdbd42e15cd7ee261 SHA512 d81313faebfdc28ea75a51b04c7fa360c27f08b6b068e76ff4813128a572f34424ed3402fcb99fe73d3b9755110aded46d2f16b9fd207d8d982e83d5fb8f1e17 WHIRLPOOL ee437bfa4584adaa8aab5cebfae293ff1c0895384692a7f585ba09c1eea386fd9d43d9a2befe2a590062b01d752e148af2361730dfd5ab0fae43ee79ed7adea0
 EBUILD netbeans-dlight-9999_p20151026.ebuild 2968 SHA256 3cc4d044053c1ab5b99b3d59d9bad10d7d234204b9ba53832785f3e0c05d7de1 SHA512 2058307c9569616356a1248cbd81e60bf824a3d861a1bf9c7eab71dfeaa4bedbee917535560f3d6a2241b55114d19f869398f745c6c7de99105f06803de94b22 WHIRLPOOL 117177dbf7ef45438d5f500e43a43368d6083f006d900089d17166722ff8b27aa9b2ada94e14124111286348409eeb572a6c77f9029471cb604d80bbc872851e
 EBUILD netbeans-dlight-9999_p20151027.ebuild 2968 SHA256 82de487ea906741b6dd56ec9f639d794ffeffce2712958756a74d49b8fe6edb4 SHA512 4cd3fe9e5a2e6c1a8a69e54e9ac92d940a398439e3c66f5951eef9cf911a580af7770f21548228bfe0ffae4f9671b3c970367c1b23e75bc235aa137df28003f3 WHIRLPOOL fa3afa4be751a282e0c566aa23de489bf406aae88d65141bd096502563ce839e9f39c4d1acb9c24c700b8b324e03027898489429cab39fe910cf1cdd78158826
+EBUILD netbeans-dlight-9999_p20151028.ebuild 2968 SHA256 009cdcd8daafba0c623b58ec0131e8f6cff9b47dbcb8101d160bb2190c9c4313 SHA512 513c9f5e6c5a4c799ed2220fe71b309a117ffc69ed6b0f17f38bfa3a6e1ded3004f477372d1e230af11233e3a1023806e2364f6451113e7a1a9d7bedda33f941 WHIRLPOOL 092665a730f582b945fc9953173d5140aa114ef87ba037e3e146531206ce3c47ef2d6378216a1646739eb758897d92c9467db228df7afc56c29bd7c762f4541e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 25a5d86..bab21f0 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -55,6 +55,7 @@ DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e68
 DIST netbeans-trunk-nightly-201510230002-src.zip 208659975 SHA256 2b00f5a10b9b57617f41c78adb256ae56e87a104fd88afeffdfe05ae46dec7bb SHA512 ab25742088a602ef44a1e3adec10fab612b100b7182efce801932156094103a2687da00df92a0fe7b6b0b5ca7ee825ee85b9cc84273449a6cffe686b0571c582 WHIRLPOOL e056f4cf9c2634a7ce09f466b722201d05096536683f9e0c744019e1e76cc53fb4b909e65b7d9fc16bf3ffaa6418b8c35521e2a6a6fcd043f615e8021a365107
 DIST netbeans-trunk-nightly-201510260002-src.zip 208660814 SHA256 0962715fc1997619fb908583701ad896b33aab643a82a1e55d20e508632e7e59 SHA512 c280647e7db0464844b0f81f0603c4d2583c9bf29516a4503632960ae682d7c008f67e12d14521095c97f16d285d2fefdc5017658028f3f3eadd1c3a5a7c4bc3 WHIRLPOOL be2a219d0fcc2a81a297eb1e560b97e8fc9daee48954dd548fe5eaa8cd70307b679adf0a3743c3f808c6dd8e9d6191b14b98c385d95457dafcf120fa6a8e90d4
 DIST netbeans-trunk-nightly-201510270002-src.zip 208660814 SHA256 1c083e6b903f72b10882f5285d8edb286f8d16de21c3b046f6e4190a008ff0f3 SHA512 b202224350745f28283261cc7756020f227304af8294e1abda6004393d8a23986d444fe36af31573f1ed4cb822fb2f1197d20e91d804500c4cf22edbc0c81b51 WHIRLPOOL e4a03fb4ae2733dba2026e3f60d4ebf6bde257d9c3fdcff6b613e6b9af7d305c04d57b0d9724a04cbf29eb0cf5448c90e6489c00e35eb23593875339e5627c11
+DIST netbeans-trunk-nightly-201510280002-src.zip 208661828 SHA256 3139169e12a7c0fc41665a462154b3ab94fe553945524b605328c502c576e669 SHA512 4bb4158f8bff478aad34a69a0e985564f4e87a1e0df5174ab18af6018ddf34a52cd3bd0a1179ad2bf1842725effafe25117d6c004177dc196473211c2695f89f WHIRLPOOL ca8db212894d1f4fc3aacebcf3e0ef730ac5d80aa32ba1c3cd3f545027fd64b44e786dbec28485bd6905b19ccabb676c145274167054ed320eaa5ece98fceb88
 EBUILD netbeans-enterprise-8.0.2.ebuild 15071 SHA256 84621e3bb946cfa254bb70ca3c3f61202882a7e6d631769ad2f0f4639b0de875 SHA512 6ad38e840764661e6bc5b89b5925e9665871009ba0b640c0a78c555ec104214dbee1200a93cb48e655bc620e07bb6e4d8932b23a00fe458f8a5e9e5c3200d79d WHIRLPOOL b2c2bbf2ff72f8cd9b4cdbe039fdbf7cd074b0fdc20f634aa0b6f79f5c639be358c61fab30854a6e3ab9714a285d9461ac4e39e94e10c14c5068422d6c873c56
 EBUILD netbeans-enterprise-8.1_rc2.ebuild 15886 SHA256 ffb03c95fbd05cc80ffd8d1590037ec6fd4e607a22160b986a0614edc7de0ba7 SHA512 f58ce52ccb40d5079502a1a43c3ac49b1b0607875d88c50f03295f78e0b6e586f5f52c809cfa8e9d803d07b351a2b75eefc91a0d5d4cd310b549b7a5e4b0f508 WHIRLPOOL 0b5550062f4a527614a107094a81e1e26492395a60190d50c0a76f0ce166f10153f37683344aab0c6b11741299e28fdc6d35eb91618f679dc4ce0df0e5ff6555
 EBUILD netbeans-enterprise-9999_p20151001.ebuild 15931 SHA256 0149922936b3fbf9c74723ede45a126dd4715025589ea8cb8b90ecb12499b16a SHA512 85c65a25883f3161a04524139128f726d2ba672ea17eca95541be54c1a5ce779003de558cbb22df4935b498500a675661a96b2cd24caa0b85906aa1857b23023 WHIRLPOOL 24b427e9eb51d20f7c06dbdfb31476bf9a01b0a9934ad177c7175510cb61d7d5e847a96211b268cd4cca26221b9a5c64e64902258388b39512e3391003753013
@@ -77,4 +78,5 @@ EBUILD netbeans-enterprise-9999_p20151022.ebuild 15931 SHA256 097ef498bbba60ad20
 EBUILD netbeans-enterprise-9999_p20151023.ebuild 15931 SHA256 c8f902cd1c044376c9ac804f55d58367afd7088126b6254694aa2d3923c9e992 SHA512 b1083a6b178bb791617909a18ac1573383b3de7d30d01d2cf3561df094f479c96d8534f5ce28c423e92c1e5ffcc6c607cc06bfa90d55e624326efeafb9de12e1 WHIRLPOOL bca13080f2d490197688742a94402673748b7267c4e2fa50ed83e9a7c68ab9c6a37513d285d593bd5951f732a3f72311960c49f272f0d8202e48304cdf4d6e97
 EBUILD netbeans-enterprise-9999_p20151026.ebuild 15931 SHA256 70ec502b3204241030e0aba79b961420de080a38c6f25041fd81dd8daba7f33b SHA512 fb689e7868314dc2a151b3e40d131c8b4b3f8e01c453b34b32d31135652a196eea31d0b53c3786f7ff747d14e89a6b2c40dff2664102d448865f7e663cbabd15 WHIRLPOOL 39c9310ce19b95136270550c379f382f59ccaa53f9198e79ab7fe8a4fbfb39a77d7e61c822077e61217956af9a0e60e96c4a2c0831d9e0cf5df08629e3457886
 EBUILD netbeans-enterprise-9999_p20151027.ebuild 15931 SHA256 6c8c432bac883451b0613eb12c67d86b188b4b827e259cb2b601a21f6f6be4f9 SHA512 132ac3fe86175e8f18426e99abb5ca3f4d94507167c71906f406f06587bca572f58be90f03587fe5702467f424b7583a7f248648a00401c31cf6ebf3bb0998f5 WHIRLPOOL 478355e52f83ebd35900b68dc598e0d7c75b9da3ba35b3569fc27e3170dfaff22b00007e23fe1a10b5a2a188e4adfcb08af0bbc5f90df39c0a495d24e2307758
+EBUILD netbeans-enterprise-9999_p20151028.ebuild 15931 SHA256 908ac2dfaa3a5b65ead972eac24098709d10470aac8b774b95f7b7f288858932 SHA512 8bed3f734d860e2c60effbaef8f284ebfb7a36dbb3923d4d308c31e63091c4f2e5824b2c6c09a6c3c8131c9de5e5c301a85dfcc18620a024b48aa9cb3f1be9c0 WHIRLPOOL 741aee989fcb893a576f8461a44778226796e59f41047a66f85829fd91ab661286f19dbb3f7ceb525554316329df0cfa65028e83dcef64072797d330a591ebf9
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 6061717..28078b4 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e68
 DIST netbeans-trunk-nightly-201510230002-src.zip 208659975 SHA256 2b00f5a10b9b57617f41c78adb256ae56e87a104fd88afeffdfe05ae46dec7bb SHA512 ab25742088a602ef44a1e3adec10fab612b100b7182efce801932156094103a2687da00df92a0fe7b6b0b5ca7ee825ee85b9cc84273449a6cffe686b0571c582 WHIRLPOOL e056f4cf9c2634a7ce09f466b722201d05096536683f9e0c744019e1e76cc53fb4b909e65b7d9fc16bf3ffaa6418b8c35521e2a6a6fcd043f615e8021a365107
 DIST netbeans-trunk-nightly-201510260002-src.zip 208660814 SHA256 0962715fc1997619fb908583701ad896b33aab643a82a1e55d20e508632e7e59 SHA512 c280647e7db0464844b0f81f0603c4d2583c9bf29516a4503632960ae682d7c008f67e12d14521095c97f16d285d2fefdc5017658028f3f3eadd1c3a5a7c4bc3 WHIRLPOOL be2a219d0fcc2a81a297eb1e560b97e8fc9daee48954dd548fe5eaa8cd70307b679adf0a3743c3f808c6dd8e9d6191b14b98c385d95457dafcf120fa6a8e90d4
 DIST netbeans-trunk-nightly-201510270002-src.zip 208660814 SHA256 1c083e6b903f72b10882f5285d8edb286f8d16de21c3b046f6e4190a008ff0f3 SHA512 b202224350745f28283261cc7756020f227304af8294e1abda6004393d8a23986d444fe36af31573f1ed4cb822fb2f1197d20e91d804500c4cf22edbc0c81b51 WHIRLPOOL e4a03fb4ae2733dba2026e3f60d4ebf6bde257d9c3fdcff6b613e6b9af7d305c04d57b0d9724a04cbf29eb0cf5448c90e6489c00e35eb23593875339e5627c11
+DIST netbeans-trunk-nightly-201510280002-src.zip 208661828 SHA256 3139169e12a7c0fc41665a462154b3ab94fe553945524b605328c502c576e669 SHA512 4bb4158f8bff478aad34a69a0e985564f4e87a1e0df5174ab18af6018ddf34a52cd3bd0a1179ad2bf1842725effafe25117d6c004177dc196473211c2695f89f WHIRLPOOL ca8db212894d1f4fc3aacebcf3e0ef730ac5d80aa32ba1c3cd3f545027fd64b44e786dbec28485bd6905b19ccabb676c145274167054ed320eaa5ece98fceb88
 EBUILD netbeans-ergonomics-8.0.2.ebuild 2843 SHA256 f9262f6ee7f2aed1fab9bf4cf756f565272e9894afa50b349735e39961e7acc3 SHA512 f158c27640541f7aef31da050e0811c07a251ae4797cc663b95a074a47eaf9d6bb7a9aa11ba38ea55e75c185f7dba74629ba6716a819e8ad68eb3db9ada71451 WHIRLPOOL 4fe9634fb673fb05dbba25996efc3a212ef3bb23ab6e7c732cb75de076feb930735e3901806fd9c801abc7ee8aa8eb800718065325d415371255a886474061d4
 EBUILD netbeans-ergonomics-8.1_rc2.ebuild 2868 SHA256 7d268bf5a12b5937222eea504fe2cb34afbceaa9b04c4a34a098bc4d6868c1ac SHA512 739350bd2dea25d5e40096e33818bdb9a21f80ef90699cbaf0c5010d0b3986b5b642da343c3fd9a85fb66367fe086898554e928bf0496293e93900591df3dc04 WHIRLPOOL 068204fe9949561b5a4b4e5271c465ff6adbbeef19041cbbcadc345ab5fbd639fb32e99267a59b17b5541016cf464b1a0cc301f6d2858591a2cb7a4340e30a38
 EBUILD netbeans-ergonomics-9999_p20151001.ebuild 2913 SHA256 298a7adb7de6b3d67d0e0766d3d15ff94d15e5a8cc3158452a397d0861975685 SHA512 eb5d42a9417b03e97e556b78a345fae80121d191f528a10fc0589d1b9e90a8cf673fa75b0bce1cf7c8c8cdcc9d08f40a130f4eff48a898bd758cc836ee6011a1 WHIRLPOOL 62f9172cf7a7670932270e567606adf3a5624f542f0c174887fd8be6ff61b8376899ae5b3711aa0eb766c4a718675e116afe71246dbeae2b619a460b9d8ce8a6
@@ -45,4 +46,5 @@ EBUILD netbeans-ergonomics-9999_p20151022.ebuild 2913 SHA256 493ed0397216d919708
 EBUILD netbeans-ergonomics-9999_p20151023.ebuild 2913 SHA256 f76b104eec9d3f05d0c4de6b3dffc9a80e2f90f6d89d75211171e1cd07f5f983 SHA512 e1f603bbed437bef7eed36d69c80105265f60797223f1c15c27101a37e031302ecde8e49704d0c8e14e6762d1614508562a2a5f94acb1468405fb86ae8808872 WHIRLPOOL cfe3629f02b25c8a11c8f64d88dd84d099abea87e4bf6ca163e63f0136788df658d615daef4098969cb02cf935d4e1a8bcd15e779b36b7198d338204dbe85659
 EBUILD netbeans-ergonomics-9999_p20151026.ebuild 2913 SHA256 1a2a35fe67d0d8bb9484b7d21bad179d3277bee6a824d27b44caab4d6684f3e2 SHA512 1dbb65c4f4320681e2590da07fa9548409690e77d8e725096e5ce4fb2605c7c7fcac524f8335839f36eb946ae47c12c0e17ce3cb2ef1d3a46ae11de7ad764177 WHIRLPOOL dda2e9905dd89b1e2d50e023d6f7d781a6c1408e6c2d5166118d2a0ef930137aad06ab22673750f215da140679a7ccc37509c22ce8b792d0cb71badfeb7d4e57
 EBUILD netbeans-ergonomics-9999_p20151027.ebuild 2913 SHA256 25b5c1a79cfc40f7727e1192796c961aa99ab8a11e8765037ace6e8bef91e64b SHA512 d567f1630b274c44e273ed92ada2809759afa16fa421cb6f3732ba340fd3790fc3dd81655ace8a8b3ae5ac79b74fdfefe2639c3bd80925dff76f25ea4858bcd6 WHIRLPOOL 2df635e3cdb1cc7deae4182a590db78896d17a07d293fb39b52d2cba9af8af1a078269139b2f1842c6d052f99aa43d3a8736a1afcfb07e92e9b03ad7b1681cfe
+EBUILD netbeans-ergonomics-9999_p20151028.ebuild 2913 SHA256 cdde3244b9d76f56926eb09bdde4e91c2c07a1b0bc5e02c41b65b5117e14eafb SHA512 bd2074c3d3f70200572a698eae6584bd893dbb598d1295331c666b70e51c81fa7c44b6ce2c0225700d824b959b5edddc3be7e294111413a5ed3b5f74496f9ab8 WHIRLPOOL ca78070a33dd420e3b509af2160bfaf2fb6ddff6ab64d2de14abbc157c59999a5541b14a5edf9dbad95ece51f7f696f78dc3c274e0807169fa7d6e300d056702
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index 436c06d..ef3447a 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e68
 DIST netbeans-trunk-nightly-201510230002-src.zip 208659975 SHA256 2b00f5a10b9b57617f41c78adb256ae56e87a104fd88afeffdfe05ae46dec7bb SHA512 ab25742088a602ef44a1e3adec10fab612b100b7182efce801932156094103a2687da00df92a0fe7b6b0b5ca7ee825ee85b9cc84273449a6cffe686b0571c582 WHIRLPOOL e056f4cf9c2634a7ce09f466b722201d05096536683f9e0c744019e1e76cc53fb4b909e65b7d9fc16bf3ffaa6418b8c35521e2a6a6fcd043f615e8021a365107
 DIST netbeans-trunk-nightly-201510260002-src.zip 208660814 SHA256 0962715fc1997619fb908583701ad896b33aab643a82a1e55d20e508632e7e59 SHA512 c280647e7db0464844b0f81f0603c4d2583c9bf29516a4503632960ae682d7c008f67e12d14521095c97f16d285d2fefdc5017658028f3f3eadd1c3a5a7c4bc3 WHIRLPOOL be2a219d0fcc2a81a297eb1e560b97e8fc9daee48954dd548fe5eaa8cd70307b679adf0a3743c3f808c6dd8e9d6191b14b98c385d95457dafcf120fa6a8e90d4
 DIST netbeans-trunk-nightly-201510270002-src.zip 208660814 SHA256 1c083e6b903f72b10882f5285d8edb286f8d16de21c3b046f6e4190a008ff0f3 SHA512 b202224350745f28283261cc7756020f227304af8294e1abda6004393d8a23986d444fe36af31573f1ed4cb822fb2f1197d20e91d804500c4cf22edbc0c81b51 WHIRLPOOL e4a03fb4ae2733dba2026e3f60d4ebf6bde257d9c3fdcff6b613e6b9af7d305c04d57b0d9724a04cbf29eb0cf5448c90e6489c00e35eb23593875339e5627c11
+DIST netbeans-trunk-nightly-201510280002-src.zip 208661828 SHA256 3139169e12a7c0fc41665a462154b3ab94fe553945524b605328c502c576e669 SHA512 4bb4158f8bff478aad34a69a0e985564f4e87a1e0df5174ab18af6018ddf34a52cd3bd0a1179ad2bf1842725effafe25117d6c004177dc196473211c2695f89f WHIRLPOOL ca8db212894d1f4fc3aacebcf3e0ef730ac5d80aa32ba1c3cd3f545027fd64b44e786dbec28485bd6905b19ccabb676c145274167054ed320eaa5ece98fceb88
 EBUILD netbeans-extide-8.0.2.ebuild 3307 SHA256 084e952eae1708b0fab785fd34313985e864dbc74a8531a0d5cdcf906e88f85a SHA512 ade8dc37aa932d7ec20966199e521311716061c23df08d02635f78efd2776f1d7bf040b0f9c9488b947bbbdfb3e33fa764723e3dfffa2214892bc6d685428f6f WHIRLPOOL ad2c26b005675ebca7d902ff1e6caa28552f3fda6795e327cc3584cf109f0ad6efad6516e15af5e70d689be236298b0948003e09a3da4991b3e29a1c85607b2f
 EBUILD netbeans-extide-8.1_rc2.ebuild 3332 SHA256 43580bab7453f294442683c85e5b1ba58d212977551240bb22c24627a4b442db SHA512 83e55ac4d2a424aad4685a2f77ce3e4944fab7330ca09fd6b6635bfec30895eaa09af60dd03a67bc4d66d0b387f4481787f9a6297e1c9382550bae894805cce3 WHIRLPOOL 10d30dfe7d188a67ab1d5afcb408064272fa68180c126d6bab5500c2726afd253f32db043b91e531c89841d8b857053a7fe250c5b8aed1e85506c42b7e2df7d8
 EBUILD netbeans-extide-9999_p20151001.ebuild 3377 SHA256 c6e0674a87d64595344e0dd9011ec485b3aaf1c900d67ba14e6ea766c0e8efc0 SHA512 7c36b2a7932e8002a80a776dd14d2bfb82677e90cda7531295bac39063a354bd0d1fd2e587774c2d484ea75d2a88f4d4f37684dafab23ba700aebd23de8cd03c WHIRLPOOL 498bfe06ea235fb7c4588426e69fa3aa31595283231488c7d4612810af791cdc580f270b23f382108e549c3150765d191f57cf159e39f9203725cc269a770c1f
@@ -47,4 +48,5 @@ EBUILD netbeans-extide-9999_p20151022.ebuild 3377 SHA256 5f4c64b9e644bcc85eef630
 EBUILD netbeans-extide-9999_p20151023.ebuild 3377 SHA256 8bb2ff72a879185ff1cede8a504ed67ebe35e72e1340185da29287aa927beab5 SHA512 ffc1d49991e7a8b91ece6d1d6e7a668828e9e3402e64761f8b6d37fdd0283a94416ec29c107648a26c31e964d184dc3e950fd7eb98f5fbe4622787625be788bf WHIRLPOOL 8163294dc3dad0d0c5a9970cd493a04d5fa794a4e305b2060aa9dbb6882cdc8272e3144bfc00effec5c1daffb8912f7416055ea44f88e1d37bf421f0e8041171
 EBUILD netbeans-extide-9999_p20151026.ebuild 3377 SHA256 16d2490a55cf6ad0a8a3bcbca4c106c1efc04676dc6de4b4c9a0aff2655b12af SHA512 249d4a348131c847f0ec36544f748d310b26e51f8ff1314c3918e041c42ff7ede25c84255c3cf6c3a6a193ba336132d4ee324ca432c6087cf25d53fb43bad257 WHIRLPOOL d0cff61b13478ddf8fd54376f4638b604c1e490733bdcd4189e2b6515dfd303d13931e85f3184386c8ade2b57c6baf3074618f92cf132e5834416d10d93062fb
 EBUILD netbeans-extide-9999_p20151027.ebuild 3377 SHA256 bf59f9ff92624c3dceb637010e9fb64a8f52d9ce04e1f19877b5e9202d575544 SHA512 bd971cbadf137132875831836c4396cba045c6bac0cbbe831756d97826b93a7ce64154122f0e91bab33d97aec1e88ee62a2f3872083cbe3daea91029bd84d1a3 WHIRLPOOL 442535076281217ebea26987471d193df42f1763fc6f8c10f8e2366059a161414abc9d04515d92fb3b15ed0c71f8eb52f4d5854add74c35ca4689ec2a05c1ba9
+EBUILD netbeans-extide-9999_p20151028.ebuild 3377 SHA256 991047cd9244c272f21a96ea6c87cb10e5e44cf7a76da87c6a4696b50924353c SHA512 f541e67bef0590eaa5d2181be8b3efcc486ee508790a84fcf76c8f58a77a3812c84967121e0bbaf3c1a2327946c90085f93486f2596545ed97b868b92d11eea9 WHIRLPOOL 47906687c072679611ed191e5ae917773f7a82848130279e742d5f781fbbb991a1b0ef4b16956a38ce15c0bce8873b13c51acd0f4de7a46c9fe71c7bf5d4cbb1
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 7ebed3a..f8bf4e5 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e68
 DIST netbeans-trunk-nightly-201510230002-src.zip 208659975 SHA256 2b00f5a10b9b57617f41c78adb256ae56e87a104fd88afeffdfe05ae46dec7bb SHA512 ab25742088a602ef44a1e3adec10fab612b100b7182efce801932156094103a2687da00df92a0fe7b6b0b5ca7ee825ee85b9cc84273449a6cffe686b0571c582 WHIRLPOOL e056f4cf9c2634a7ce09f466b722201d05096536683f9e0c744019e1e76cc53fb4b909e65b7d9fc16bf3ffaa6418b8c35521e2a6a6fcd043f615e8021a365107
 DIST netbeans-trunk-nightly-201510260002-src.zip 208660814 SHA256 0962715fc1997619fb908583701ad896b33aab643a82a1e55d20e508632e7e59 SHA512 c280647e7db0464844b0f81f0603c4d2583c9bf29516a4503632960ae682d7c008f67e12d14521095c97f16d285d2fefdc5017658028f3f3eadd1c3a5a7c4bc3 WHIRLPOOL be2a219d0fcc2a81a297eb1e560b97e8fc9daee48954dd548fe5eaa8cd70307b679adf0a3743c3f808c6dd8e9d6191b14b98c385d95457dafcf120fa6a8e90d4
 DIST netbeans-trunk-nightly-201510270002-src.zip 208660814 SHA256 1c083e6b903f72b10882f5285d8edb286f8d16de21c3b046f6e4190a008ff0f3 SHA512 b202224350745f28283261cc7756020f227304af8294e1abda6004393d8a23986d444fe36af31573f1ed4cb822fb2f1197d20e91d804500c4cf22edbc0c81b51 WHIRLPOOL e4a03fb4ae2733dba2026e3f60d4ebf6bde257d9c3fdcff6b613e6b9af7d305c04d57b0d9724a04cbf29eb0cf5448c90e6489c00e35eb23593875339e5627c11
+DIST netbeans-trunk-nightly-201510280002-src.zip 208661828 SHA256 3139169e12a7c0fc41665a462154b3ab94fe553945524b605328c502c576e669 SHA512 4bb4158f8bff478aad34a69a0e985564f4e87a1e0df5174ab18af6018ddf34a52cd3bd0a1179ad2bf1842725effafe25117d6c004177dc196473211c2695f89f WHIRLPOOL ca8db212894d1f4fc3aacebcf3e0ef730ac5d80aa32ba1c3cd3f545027fd64b44e786dbec28485bd6905b19ccabb676c145274167054ed320eaa5ece98fceb88
 EBUILD netbeans-groovy-8.0.2.ebuild 3346 SHA256 907e6cd11c222f15c826494b44929483803f0e4249de0d54db51e6855b574148 SHA512 8bb37121e7e32621959318d109b1d982e2c705a9deb7171f5fef1dcaed55fc5718b0bc9e6bbb2592cdaa5e96d874bb6e6bfa96d06fe09f14d5250c1485eb1da5 WHIRLPOOL d5e09fa1e975835f05c6132c091fee4ae9fc9dd671af9f5f88a9195d5cd4a93804f96687ed3f2bd741117fa65773f2c464b3cfd6697425039cc51a940efa2a31
 EBUILD netbeans-groovy-8.1_rc2.ebuild 3371 SHA256 6ace63d0b75118b4e82bc5fcd42fcff4af16aa94909f6b7ce53901f9df92117c SHA512 12f629d795a38c2d5220ed1c1b1d15db2446c464a3713fef2fa8c95d3c41365f346dabd6d408b899997c618d39e759e319d1cdc63c02c3a07994877ca75d9ecc WHIRLPOOL 5fa0e845cb4597c5a7a24dd19e464e491ec99b7be5b9040fd98ad4f12a399dc08f4707b046bb02bd4e04e0bef4f39a23f040816d5559edb7f782f397dd3007a8
 EBUILD netbeans-groovy-9999_p20151001.ebuild 3416 SHA256 3a45101e291ed46b58227eb22e6350d10249826f237793009cd9c68b4a13be49 SHA512 bef697cadc1a6ccb36be3b449cb1cf56bb644c2c5ed7189bb69daed9d16c18b18ba4b903362e1d80e9d8fe29702b5ccff58250c6efbf9bfefa968f94e2105abc WHIRLPOOL cdcc6244e9e24c0d7b7b0ae2d592f95813e3d8f1b5ce63d3f24315b5f4af559b3ca6668cc5ae5bdfd6817b2c7ed3b82fae1737123156ed597ada2e10d7e3c5df
@@ -46,4 +47,5 @@ EBUILD netbeans-groovy-9999_p20151022.ebuild 3416 SHA256 188648c47c280020dd1c8d9
 EBUILD netbeans-groovy-9999_p20151023.ebuild 3416 SHA256 7799a16ec4faa6be9c104d69c4afca7ac28f05f299f1c8dc603a19fa91aed10b SHA512 4c6686a1f317127031588c6e1c61fe2f8893639e910b679f614a716d56d434bb9dd0b38ac363f65ec81fdc0457d046b578c76f705b9d01e2bfe2b0865553bc29 WHIRLPOOL 11ac197f1c91cbc5fcb79df84468932f9c0dd7c3501ef25d52468cb04a46f51cca11e5ac864b5a4bd0f88d4f864d3bd08f93433d3d16fc7e3ca718b5dbd91c39
 EBUILD netbeans-groovy-9999_p20151026.ebuild 3416 SHA256 bb70561d28c2d626ad7a307f13838c8ef08a1c6e485b72ab2000f5602672b602 SHA512 d71bf176f315ab32635ab23ac2564eb914ceb0093503b215f15bf40f1540c15b2ac9043d6c33fd82c02d85b9718649401de2c9d37a02cdc44cc87a6756778b94 WHIRLPOOL 80aa001c0260b730154d1811c278464b2595fe58b3ac535aea49f06c2a88d9d5b818e78218f3812b3d5d8ecd1ed4dba8c967082a9ad30af897eff63ed49a8c9b
 EBUILD netbeans-groovy-9999_p20151027.ebuild 3416 SHA256 0f0135f52872ba4e7da6995cbd4e889d03250b45e297aa6f3c2702f96581e1b9 SHA512 0730a72595534c34147195a6a4cd2718c87affee101082795056943317d3c809039042421c0a1db12ccc79f9f849979ae76a2ed77c6a9229e63caeaf29ccc3c5 WHIRLPOOL b9b98f0cab3f2fa770c0bb2ade2850757dc0b53eec1473306da35590a5b1cb7db35ddd667117ba24014e1a58acde007d64cd645d49e2fea46d9efb53fc90021e
+EBUILD netbeans-groovy-9999_p20151028.ebuild 3416 SHA256 24e283ac6098045d8331e09a01aaca927360f5b7c4663c46fceb48f4bafb4ff1 SHA512 d82808aeec848826e057ebfe01575e3c5da2990fe7a1639c1bcfcb7a7a01def8e7bf1061c842a063e13f593ae0465a5c4b7d1b59ac3588b63195180aa8b9321a WHIRLPOOL 06db3845ea68b3823531af46aff98243c84798908dc543105b7217533c0b4fb2e981892122fd03931edb58512415d03b717d9bff5f7461fff74461e6f0a4d73e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 0ff97fc..206aa73 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e68
 DIST netbeans-trunk-nightly-201510230002-src.zip 208659975 SHA256 2b00f5a10b9b57617f41c78adb256ae56e87a104fd88afeffdfe05ae46dec7bb SHA512 ab25742088a602ef44a1e3adec10fab612b100b7182efce801932156094103a2687da00df92a0fe7b6b0b5ca7ee825ee85b9cc84273449a6cffe686b0571c582 WHIRLPOOL e056f4cf9c2634a7ce09f466b722201d05096536683f9e0c744019e1e76cc53fb4b909e65b7d9fc16bf3ffaa6418b8c35521e2a6a6fcd043f615e8021a365107
 DIST netbeans-trunk-nightly-201510260002-src.zip 208660814 SHA256 0962715fc1997619fb908583701ad896b33aab643a82a1e55d20e508632e7e59 SHA512 c280647e7db0464844b0f81f0603c4d2583c9bf29516a4503632960ae682d7c008f67e12d14521095c97f16d285d2fefdc5017658028f3f3eadd1c3a5a7c4bc3 WHIRLPOOL be2a219d0fcc2a81a297eb1e560b97e8fc9daee48954dd548fe5eaa8cd70307b679adf0a3743c3f808c6dd8e9d6191b14b98c385d95457dafcf120fa6a8e90d4
 DIST netbeans-trunk-nightly-201510270002-src.zip 208660814 SHA256 1c083e6b903f72b10882f5285d8edb286f8d16de21c3b046f6e4190a008ff0f3 SHA512 b202224350745f28283261cc7756020f227304af8294e1abda6004393d8a23986d444fe36af31573f1ed4cb822fb2f1197d20e91d804500c4cf22edbc0c81b51 WHIRLPOOL e4a03fb4ae2733dba2026e3f60d4ebf6bde257d9c3fdcff6b613e6b9af7d305c04d57b0d9724a04cbf29eb0cf5448c90e6489c00e35eb23593875339e5627c11
+DIST netbeans-trunk-nightly-201510280002-src.zip 208661828 SHA256 3139169e12a7c0fc41665a462154b3ab94fe553945524b605328c502c576e669 SHA512 4bb4158f8bff478aad34a69a0e985564f4e87a1e0df5174ab18af6018ddf34a52cd3bd0a1179ad2bf1842725effafe25117d6c004177dc196473211c2695f89f WHIRLPOOL ca8db212894d1f4fc3aacebcf3e0ef730ac5d80aa32ba1c3cd3f545027fd64b44e786dbec28485bd6905b19ccabb676c145274167054ed320eaa5ece98fceb88
 EBUILD netbeans-harness-8.0.2.ebuild 4055 SHA256 2674d562adc57648c82cac9f714f74f9d29dd7b7ff7fa7f0ef37c43ef0975489 SHA512 7d72bed5b955b2365a4c11fcd97a2d6f2372ab939fb9a03b3ff7915053f24d695373c1aa154f6e6916d37ef3ace7b38864d575419460382760500576dae52e49 WHIRLPOOL 72f54a6cb83f282a75f0abb073109414a7b8bcd4e9263466281e68ff34148a7343ed3bd78ebdc8afd109b6b9f5b9f15bfd0e250f418fcaa4986a7c886b57b9f6
 EBUILD netbeans-harness-8.1_rc2.ebuild 4080 SHA256 93049f23b2ad31b40c784de1a3abb7b8332f59e5203e6058f6ada092e45fd01a SHA512 9cf8e85f62a03d1fd5c43a8ff746229d0d8e91f10a67a08b5634cef2c6d7e3c31a2f309b53c158fb5580ea1334fe3e0e5f84d555f07a5c3174e78c58e6a14cba WHIRLPOOL 40cf8d1fb75674c49e1af12292f7bace10d74724d1b034b6cd1ecc9c4a816b4a711ed9c49e6b0719dfec638349ab9669685e605d0e481c8b62958a9c82231ef9
 EBUILD netbeans-harness-9999_p20151001.ebuild 4125 SHA256 13f8d1786b191f9fc161f267d8fee56c14846964eb8f6a9b9d7731c0d90a7a1c SHA512 d36a32bf08585f17658b0dc5b38b0a8a2ef6d1265ebb9feb93feeb1e0e3c900b85101b3572e8a63edaf07cb8623907ba9e775a643623ac3d8f0f52de7b2a5a64 WHIRLPOOL f891e812e45303986bbc9be420811fecf008450e16507747299aad4cafc6ecf7ec09e7a3803bd25374033cb4cbf5ff9f901c678612f6cc134e65b9640ff3bc1b
@@ -50,4 +51,5 @@ EBUILD netbeans-harness-9999_p20151022.ebuild 4125 SHA256 6736ff80eaf28da59c4f11
 EBUILD netbeans-harness-9999_p20151023.ebuild 4125 SHA256 80add6979042d6b7ee0377752c50bf18d4449649f0643ff4e492434f4312190b SHA512 0ac657e466d38ad4018741909a887dbddc6166602683a85068be82c77934eee0721977c79102838bca619f6d971398bfcda5c19f3872945880521311b2c6eb08 WHIRLPOOL 0233c814011eb5c542a0f1e20b10a77c735d8a3e43be7950cc3c24e8df1476f32607642eca5c3263ee950b3031497b9acef808ebbdccf3263aa43dfab83bc6e7
 EBUILD netbeans-harness-9999_p20151026.ebuild 4125 SHA256 42efb5108e3e9c3b7137c619db886d718c713f17ca1595d9a077b8e9959aab77 SHA512 45304cf6673b30ec101121039fb1b3be815af3f9d8cc345e22eea6ebef037308c95f60695ffa6d97049e9e804f9adb51ede00923aeb9bd25d247ce127e028081 WHIRLPOOL 32b3207460dc640798ddb6bac027dd17f8cca39579dc16d41a329452cd9e6767c7d0b908fbc6624d8ad06a54585cac387408c45451815831f4102421d97881fe
 EBUILD netbeans-harness-9999_p20151027.ebuild 4125 SHA256 516f9ce45a508b32ee6b9e6f1c419d48e4dc7c0f4cc47cd5ec4e2e900511f992 SHA512 fe555167e991032e108e631801a66e2559ee591131717f156d334c6be1c7add735f2fe1d5d4ea424e886d26552d0a5dfa5ccbb7b4fc014c30d3d515e37c29c8e WHIRLPOOL 92b5d0a515b140976fd394f0fd0732c72200301aabfc80f3a336e91d9d0952ea6792c77d1c20164dac269954cde88aeade6a46c43147b436fd5f8ae9d9290a6e
+EBUILD netbeans-harness-9999_p20151028.ebuild 4125 SHA256 f4ce0e0f1731c003781d80eaea193b8a113eefde0f1b390f99a810f837b94bd3 SHA512 92dc5b8501049f71c6300922f288d049fcb72466b139d9378edf0a5c773a027aaf546f8ce3afb5facd7b12233fd8ffa5a84c2cbdf4e3d46b4d8787939495f602 WHIRLPOOL c736ad0baf83c9ddfad206d524dc7a9a034f2eaa432bd0c4b53bbd77b715be44d88b5d53f007332883bf4c57b48bebee27a26f64c177c68e79ee55e61efa3849
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 632f8b7..3013fec 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -36,6 +36,7 @@ DIST 5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar 14867985 SHA256 34965ccc
 DIST 5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar 674877 SHA256 ebb76d0679f67261f2e8cc75f8efc0a653ba317115bb2519dfb6ac712378fc7a SHA512 61c24ff2c2286339b08cb5d749482d45bcc8e51b6821adccc715a9ebbd86a9810726d5889ff8e5ac2a7b0136fe23e7476483f593b54786c1799ecf623e904824 WHIRLPOOL 51d545abdb82060de205f3b00465e537128ac30e5095478ee29214ad2c550bbb4e85f3a37ae16b42ac1218c2ce4fe7c11de6f282054fc2a4776b01f56cc04697
 DIST 64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar 43312 SHA256 d3e98121d8a35cc94dc582287feb11f6864efda43492c83fbbad26a81ca08758 SHA512 89827a65cb27ec3cbd66892028eb4d1d3422cb5ba059bb26e288e75504c5445db21c6ac6725a18903a0beb3191824f96caf284515aee7381908d8074732b7bc0 WHIRLPOOL 12939e463a81dad2517061f44a7fe638a3db55b91db1882feabdf37ee2171a7db36b8df630c4f2ffeacec030f9835722e3f5da22aecc9d1d34f2669d03e8e121
 DIST 6658C235056134F7E86295E751129508802D71F2-org.eclipse.core.runtime-3.7.0.jar 70526 SHA256 2c207b8ac6c4bdeacfb4e3f86617ca801f1c22305f82cc98872c0df9c1e6b146 SHA512 2d71e727988fb2045288954979627e1464f5fd812bc996b79f0dd1f25eee8bee189cde4282a88ab36782f05a64da14b9126e93e3e6e0e1a22afb35915d0edf8f WHIRLPOOL 6d492211c37fde820a51243f63d7fdce64f52f4c5623995b3ad71b2a7bbd6f70912d5f6ba280e3b73a910432a234aa7b6920cfb2f785746f79456d02285c21b5
+DIST 6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar 33833 SHA256 aad0143bc78f1e8d63cafd9fd267a232278f9183515435baedf8286fe5d77cb9 SHA512 fa1a9fefc90f4050d70ab79c6fc80cb7611835803fa5fc95d8bf1ec9de7b47f0cb620ab18387f239cf22ef97df08c4749eacaec336021b5f5250668b6d51211e WHIRLPOOL 3406378440e1ea1ec6fc9cae9acef7b2c58660c38b8fa189254bcb038bc7cc2251a9f5749e5e3bbad6cfbdd7cf4121d63a37bbc0f7c74fbc392fec3090c0392b
 DIST 6B0A6E9F9179E314944E4ADB831A9D6FCADED3DC-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar 30203 SHA256 f929629b5289cd7f67a3b04ca0d4a95b649bd949f553967a21915567ef9b5663 SHA512 46680aabc3530479e97ab8731dfa48b29dd75eaa6f15820df97f9efea0b57409d887557c7f182a01d1b55c04b5f198832d1b7b02ae6a68a659c84f84e8218e8a WHIRLPOOL e72b8cb9c22893cce4b2e26b3fc9ffc281b6506080f0c3056841f887ed2b6de40bbf573452ee6855897a58b5a68dc6a21e58c586dc159632f7b6eedfc86f1839
 DIST 6E914CA3075C8FDF7652F04A02868CF32F2EDCE3-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055.jar 85186 SHA256 d30d817a22b6dd75b15b6b2af10c71751f334eaf9cd8cf39b3fc6965a4856e58 SHA512 cbfd1f0f46017f59ffb1da2e6dd0cb601895a692b2adb5473ddcb83cbdc060fd15cef7c5fccf582b526f088a8f8f88cadb1557e1b58b60537b51505d6cda702e WHIRLPOOL 7ff2c0b18b0427f9f3f71db3ad204671d17c3e8761d904ecb37b1efbe849ad6b58346a56fdabe7dc8092b4111763d56808ea682e3d9d1f7c61d6c2576e382525
 DIST 6FC6098C230D7CBA5730106D379CBBB42F6EC48A-validator.jar 2049845 SHA256 f6f9415729b3e700289d895d9a3d658e23bb25cc72b7087ed83c4cfc4c027076 SHA512 3348b71375e83e630c8741c2e0c0e95386ec76675055b20ffecf6dba75263b1ed203193561307878073331a01684bee3f65248f2b106c52e39cdf4971d0b3e99 WHIRLPOOL 0564d4ab425fac7b1dd18159562a187ea3e1d6ac0709341e0ad9551446ea870ff97c24bfc7c742df83a46c73e3868c1d1c6c93191c3577818520b86c9af70898
@@ -129,6 +130,7 @@ DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e68
 DIST netbeans-trunk-nightly-201510230002-src.zip 208659975 SHA256 2b00f5a10b9b57617f41c78adb256ae56e87a104fd88afeffdfe05ae46dec7bb SHA512 ab25742088a602ef44a1e3adec10fab612b100b7182efce801932156094103a2687da00df92a0fe7b6b0b5ca7ee825ee85b9cc84273449a6cffe686b0571c582 WHIRLPOOL e056f4cf9c2634a7ce09f466b722201d05096536683f9e0c744019e1e76cc53fb4b909e65b7d9fc16bf3ffaa6418b8c35521e2a6a6fcd043f615e8021a365107
 DIST netbeans-trunk-nightly-201510260002-src.zip 208660814 SHA256 0962715fc1997619fb908583701ad896b33aab643a82a1e55d20e508632e7e59 SHA512 c280647e7db0464844b0f81f0603c4d2583c9bf29516a4503632960ae682d7c008f67e12d14521095c97f16d285d2fefdc5017658028f3f3eadd1c3a5a7c4bc3 WHIRLPOOL be2a219d0fcc2a81a297eb1e560b97e8fc9daee48954dd548fe5eaa8cd70307b679adf0a3743c3f808c6dd8e9d6191b14b98c385d95457dafcf120fa6a8e90d4
 DIST netbeans-trunk-nightly-201510270002-src.zip 208660814 SHA256 1c083e6b903f72b10882f5285d8edb286f8d16de21c3b046f6e4190a008ff0f3 SHA512 b202224350745f28283261cc7756020f227304af8294e1abda6004393d8a23986d444fe36af31573f1ed4cb822fb2f1197d20e91d804500c4cf22edbc0c81b51 WHIRLPOOL e4a03fb4ae2733dba2026e3f60d4ebf6bde257d9c3fdcff6b613e6b9af7d305c04d57b0d9724a04cbf29eb0cf5448c90e6489c00e35eb23593875339e5627c11
+DIST netbeans-trunk-nightly-201510280002-src.zip 208661828 SHA256 3139169e12a7c0fc41665a462154b3ab94fe553945524b605328c502c576e669 SHA512 4bb4158f8bff478aad34a69a0e985564f4e87a1e0df5174ab18af6018ddf34a52cd3bd0a1179ad2bf1842725effafe25117d6c004177dc196473211c2695f89f WHIRLPOOL ca8db212894d1f4fc3aacebcf3e0ef730ac5d80aa32ba1c3cd3f545027fd64b44e786dbec28485bd6905b19ccabb676c145274167054ed320eaa5ece98fceb88
 EBUILD netbeans-ide-8.0.2.ebuild 29317 SHA256 42218788ab0fc7c7cd1bb42a8b0c72a66543a3260b752aa55365833c355bcc63 SHA512 c712b66b6bee654390a45e5c616479df2be624bb770f3838d4fcce875f71a8d165703dffd55c4fd7d30e19c392784203e5fe01e2404907d88c935d439efaf578 WHIRLPOOL 67763e4a36215ac002fd321556ce2269affc15ba48ad5069d7ccc746d918179994f174e09305a9d9ddadddbea690778c2769e0ea1993eafc09e01580485e2292
 EBUILD netbeans-ide-8.1_rc2.ebuild 30289 SHA256 601a026a6ded95edde37912caab8d873aba2fd1466d3d5ac66fb33df95df3e9f SHA512 d1cdd2be0baf271f53978da38a9d7198074b2c91d84671aa1919cc03374715697c13fa182515010377e4773517fe560960d28a50db62e0d19f038baa06e91bec WHIRLPOOL f73fae56638de9ab520f428b82954212ddd22e55e4958b5c43252768985e5cc0358854237e0318a384fdf828ba2395754bed1fe3aedfcb1efa999b75e5c64bd4
 EBUILD netbeans-ide-9999_p20151001.ebuild 30334 SHA256 b78d36ee165147dbfba19a14e77783963c4f7377b4c418d6bfb1738507973bd4 SHA512 4c9ef09a23a310badc7c2f119d9ef7a9ce450a719a0d2b112af157b22aaccea8e5806e2ba015951b9be1c4ea38e6f27c071d025e22cb5c017f83cb009e4bf748 WHIRLPOOL 20a7706618dfccad4c186f512c05206516f92aeb8ee1243f924bc63fbc3b560e21fe8bf2f5cd976e8763dc08693be81ad961168197efbf054d2c5efc864754de
@@ -151,4 +153,5 @@ EBUILD netbeans-ide-9999_p20151022.ebuild 30334 SHA256 271c83431ca06beebf6261f92
 EBUILD netbeans-ide-9999_p20151023.ebuild 30334 SHA256 c7e1664e71ae5c5c42ab7a33239d244ba6c9739d2d6beed3374ae83555b7b401 SHA512 1d2c547923859dabf53a79f8f6dacacb298db649e6a358db5b53f47031738b2dbb39ae73f127d448f176cd582102ee57d1dbe0a59593243347a5934da745d520 WHIRLPOOL 0216d42be0262e7a6148a98b4b1f6a24f185ac69a163078f866d0cef22b23b72023e8ee7b8bc68fa98119fb516cfaf3493a935ea2b34efbe3f94a976f42f68a5
 EBUILD netbeans-ide-9999_p20151026.ebuild 30334 SHA256 4c995a1903cebb02615893a8e990c0609bb5047f907c22bce1c72d8857668849 SHA512 fc21d132ae68cdecf106beb02918bf8bd396e4316c1542ba12c8a73cf02ffb19bc5f85e1c08fedfa9691919a039fa247a0ecf5d08e2446e6f2002567cf81223c WHIRLPOOL 7ddcb2706c6091ee4a99be4b1ea2ecdd4957f81e4d39f3704cf44c72b457dacc26c81e3516196c552a2c848c6ea2319ea657373f60edfce1243092da5c1b7bd0
 EBUILD netbeans-ide-9999_p20151027.ebuild 30334 SHA256 5edd4b14780caed1ed78b654362b25fa458fec1d9d432a494584bfc25485c95a SHA512 1e2b457b2d952ae21f6530a7a7e519204d5357c957e61d8177d586324aeb20d1e8ff82401421ee579c1f8acfe76215ba0d1af864334f67620a0c4ca62c3f8753 WHIRLPOOL 3bdfab305ec083d9f8cc208275da432a60dfe5c45eb75bca586c945d4a2b7e258c1bb4be62b009099d61755dd4eb5562f588316c91033b14b759bd65ef7c38ca
+EBUILD netbeans-ide-9999_p20151028.ebuild 30334 SHA256 32be0303fa02c7c22db0a7b021b812c8ff46411f7bdc60f4ad8817ed0ee78d27 SHA512 7803d9d58d4fa8a802042b6ee86c15b761eed513a1f6eaad7a9c59ba799ffb8cfecd043bf389a5eb1a008fadc5da2f5620b840b571df5c7c8981ca64a2304291 WHIRLPOOL fc2290b10ac9a5bf2e8e4a66ed0ab2a7dcd6c948f4eb867472c7c23eb4a9a170b8751ed288cd393ef7d73b7a97425ab6042dfb0e01181f66a693b86279d3c34a
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 3dbc1b7..c614f4e 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -3,6 +3,7 @@ DIST 2B9EAB164D8748F9793F6A0D29B6463E97B284DA-indexer-core-5.1.1.jar 227233 SHA2
 DIST 3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar 45718 SHA256 18a77f915276751b01ed8e7feaf344e78f5ea62bf53b7bb6a821a22865165044 SHA512 1abad0ebdb35d8fd4eec1350ac497cc6a372239aea9eb6c45a94265f46e4e5c2458fe5e4d0e1e067effc9ba8629451abf169bb4820274484f9c2404271b21727 WHIRLPOOL 7aeb90a8661d8eaa2ee2a5953932e3b829187554bf605bb5e55abb42edb82ff13a6e4b4acb8f3615a74961f044ebaf19343e3d403a476a019890cadeead73dd5
 DIST 562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar 23838 SHA256 0c05ac203cfc63f1a6d59dea84d915220e18e8e37a57cfbb317e769f992f3e8f SHA512 a39da963b1e0c0111870bc3989e10c70dd136c0276099b48cadc70706f76b0b2ba1ece6df67c05bf8e26a4638b19b28b454df6c23ed5a9d4936d3cc5506ec4b1 WHIRLPOOL 88043adc7057b68647d9205782e46a2d7824533b9a46366e7949459e88fd2ac7be6dcd1bc1c7371e071c7efc5fcf6d3956c211f97932cee0e0a4f47c58db6983
 DIST 5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar 162126 SHA256 227c4888011550cad0aed4c07e187b9f8e873c01558a08f014d288987415a9a9 SHA512 de26d1e19a625adb040b6aa870762ecf8f1ffdfb2c82f58cc7a82f1a029249862dcfd39b6a995f63f04d9b36ef23a8ba8518c9cff1b5e2242e6ad5268790b5ba WHIRLPOOL 20dff7b96369cda98dace4dc38f7e013de9ccf7119047183f936bd58e1d8c6154fa913f906dd1996d8e989d16a4e92502aacf937f730a8b63728208b96455a7f
+DIST 61EFAA681DB4565984F8FB85AA95CCA5F7CE88D1-nb-javac-impl.jar 2766903 SHA256 b0000d2aa1948aa9039bec0be29b546ef25fefd59ac5c6fb2733fad4ff4b17d5 SHA512 bf2cf4ac9687a6d6be0a2672a7efcca48838860084f32d5b0fc519e60aa9738de9fcf431c5ad580256f5f3bb8da65fd8c6f5598b006433a40f199a5151c72405 WHIRLPOOL 87f3a6b70f4336d58176cb91ed44ed10989ad7a0954f0642e6f2f411c59884187b5f94c61c87d5f9ace47144e8016fff27b897a14d40de7a597e574993fc3114
 DIST 694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip 5870668 SHA256 91370093a4dcf8fc434f06039da0ca1a359530c665da110a97e0e2fe3ea84028 SHA512 49a0854318678ec52641babca57bbf57ce8d67825dc9b0565df77b8fc6bc90a2b02a3ace7dce737de49de2eb7d1f2885ca901350e8826a63c4dd5381f03fcaa6 WHIRLPOOL afbd6831d26e66b9a318e2ed060b2147a51493be68ec8c97ebaa6b38808bf55d52ad54ad20f520299d471cd461bcfcd70a48142035a51ed9732c37c075f3a970
 DIST 7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip 5678488 SHA256 368284af56e08cbd0c4a696663ce6f484eeddf4d710a14066da470ac9ee2709b SHA512 d49f22b3ce2bd49f3ddfc35f86c0c21accd45a07b710b0787560b9969e40700d408a25e8e02d10f0d937ce642cbcab222d4e8fa28bd442e34c768b63e5583b41 WHIRLPOOL ec07b768abdbe9aa8608c36aa6bb4641dc18bdfd21d93974f82ddb9074b1f03da17fd043a6bfbfb98a8715c8ba16b5fc2585e9b0d47119a6573fb0b446ae9487
 DIST 7B98BEC9E6D1A447C9C3DDC61EF6658BA000008C-nb-javac-impl.jar 2766790 SHA256 80f4546588c6d548f1448cc42fed5dcf94694782180a05e0dc5af90ad22aa218 SHA512 9fe395abd095a481b85f0bed66fb22f0761a727560af71a45ec2ae85f23a3a652219ac33e49c7b24a4c4a11f21d28ab69b0fcc69dda2843c059e4fb5f6e273ba WHIRLPOOL 3d7dffbdc985a53bff8563ef01eb91ac6b603278971d6c957a3f0cdad9bcfbbf71c78a59524083167f5e7395e7253dfaad9ed148074943b7d75f6f60196ac77f
@@ -50,6 +51,7 @@ DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e68
 DIST netbeans-trunk-nightly-201510230002-src.zip 208659975 SHA256 2b00f5a10b9b57617f41c78adb256ae56e87a104fd88afeffdfe05ae46dec7bb SHA512 ab25742088a602ef44a1e3adec10fab612b100b7182efce801932156094103a2687da00df92a0fe7b6b0b5ca7ee825ee85b9cc84273449a6cffe686b0571c582 WHIRLPOOL e056f4cf9c2634a7ce09f466b722201d05096536683f9e0c744019e1e76cc53fb4b909e65b7d9fc16bf3ffaa6418b8c35521e2a6a6fcd043f615e8021a365107
 DIST netbeans-trunk-nightly-201510260002-src.zip 208660814 SHA256 0962715fc1997619fb908583701ad896b33aab643a82a1e55d20e508632e7e59 SHA512 c280647e7db0464844b0f81f0603c4d2583c9bf29516a4503632960ae682d7c008f67e12d14521095c97f16d285d2fefdc5017658028f3f3eadd1c3a5a7c4bc3 WHIRLPOOL be2a219d0fcc2a81a297eb1e560b97e8fc9daee48954dd548fe5eaa8cd70307b679adf0a3743c3f808c6dd8e9d6191b14b98c385d95457dafcf120fa6a8e90d4
 DIST netbeans-trunk-nightly-201510270002-src.zip 208660814 SHA256 1c083e6b903f72b10882f5285d8edb286f8d16de21c3b046f6e4190a008ff0f3 SHA512 b202224350745f28283261cc7756020f227304af8294e1abda6004393d8a23986d444fe36af31573f1ed4cb822fb2f1197d20e91d804500c4cf22edbc0c81b51 WHIRLPOOL e4a03fb4ae2733dba2026e3f60d4ebf6bde257d9c3fdcff6b613e6b9af7d305c04d57b0d9724a04cbf29eb0cf5448c90e6489c00e35eb23593875339e5627c11
+DIST netbeans-trunk-nightly-201510280002-src.zip 208661828 SHA256 3139169e12a7c0fc41665a462154b3ab94fe553945524b605328c502c576e669 SHA512 4bb4158f8bff478aad34a69a0e985564f4e87a1e0df5174ab18af6018ddf34a52cd3bd0a1179ad2bf1842725effafe25117d6c004177dc196473211c2695f89f WHIRLPOOL ca8db212894d1f4fc3aacebcf3e0ef730ac5d80aa32ba1c3cd3f545027fd64b44e786dbec28485bd6905b19ccabb676c145274167054ed320eaa5ece98fceb88
 EBUILD netbeans-java-8.0.2-r3.ebuild 13294 SHA256 4abac657cff75400e92b1f2b19bca696113cdc37611c8c0f49dfa8c82fec4296 SHA512 32e41d7acc3aca026993e5edc791f1314f2bfda47413538af655b0335973c4fe50d998c67f129307b164075c3e0503280b4c1729d700431644ca6610d7f0f635 WHIRLPOOL d7f99c13421d08529b54085138fcffd2959a3c3f97d94a1dbe6e726a6dbc2cded69ec0bf97e1458b56847ac121954e8f173c1adde0703fd2969defa53ac37c51
 EBUILD netbeans-java-8.1_rc2.ebuild 14773 SHA256 4028adb2993d8a7cd8a4434afb5bc4d2a29bc2812c7ffda3131f2bfe3d4a6b8f SHA512 373ea3bb9175ef0cb4b74c67af69ea0409bbf364220f4b690cc628769cc748594e518efa9a35f890c1da952830b4dc7a1d316e7c020f2f1d704ce6973dd13859 WHIRLPOOL a8adc3fd9e2e9459ebe06d32939d92f5eb2cad81521d2f7f08445d8d000d34fd6f6bb7b69a274e60499637c866ec4654f789fa431382393db5538e5f57090f69
 EBUILD netbeans-java-9999_p20151001.ebuild 14818 SHA256 9ab4fd89bdaaad622116497f3e113e05b29acbbb83bc36fa6062b7eeff7c13f9 SHA512 060b6d6b4852fca9830f0067c218e775bd23854affbd4b254d6148e80f696e9704df24af93ff962c3419d3bf62157ccc54032647e6b84c8beb3d16596dd355b8 WHIRLPOOL a02fffb34b3439853100d5630559ee832d617140b3f52e81f789abfa2787835d7e13f74cde0d8ba8af9556bc23d4b032f188d1b16facc5abadddb7465b098c98
@@ -72,4 +74,5 @@ EBUILD netbeans-java-9999_p20151022.ebuild 14818 SHA256 d94b61e944caff9edb0ff986
 EBUILD netbeans-java-9999_p20151023.ebuild 14818 SHA256 305956fb46c836c93162ad4c0af94569e928ef664343f76bce6751f1bf93e89c SHA512 9f38c12b3e26c5659a4cc555e13388e1dc0c9a4f60f8e8c525ad1162224a87a79301c097c00256745056acebba1c3ce07b0fe0110574defb5b9427154f63840e WHIRLPOOL 8fdee0002bca08afee17871dd46b5a9d3aa038866bfc546f3750c046ab62d3ed9cc2aa0e41e8ce4d858d99d1ebbc649b86123dc02fc85d694bc4fff50e882741
 EBUILD netbeans-java-9999_p20151026.ebuild 14818 SHA256 276eedfa47fd76de18c97a43b4bf59538e6d2463890624f81eb72f015e283f39 SHA512 7ef4a11dfdd9347bc09b6a23ca716c9a28a3e72f778b97edadc55eacdc08895a911612daa58d7c7e105f943b8f6205c9cb602ad9bcfdee500348540f10087a14 WHIRLPOOL c8739d55187ad4f79d7c53d324699cb8a9456a595177ecffe9563f9523874a66b38838c3b46711d57033c4aa2911e38f557847f1d446d86b0bf4498b4e764c6d
 EBUILD netbeans-java-9999_p20151027.ebuild 14818 SHA256 c0be5951eaa80b69d96e3e06e58509a5e6a38243a835877f7b0173f20d99980a SHA512 7f2770d54c854bbf946056cca453dbf16b4af2782f1f55427887b2037c2b9a302c40b7afd0198218dc322e7d78dfc752a40571ba2f7d974e3db28cd418be7336 WHIRLPOOL 29d2496f858fe84b0ce41f7bd26aef9ad66e23c02069b7207af8c8e620b3ee0ab4aeee26d0662bee9de9f44c3d62f576f295d02827baf625cc7e09381043a65e
+EBUILD netbeans-java-9999_p20151028.ebuild 14818 SHA256 20807e62ae8fa21f576985f5d9bacbecc5f251cab28aa9657f8e06a1e615d75d SHA512 4957d4e13a66a7cae9914b28786307b217e0d21e50af84987e2638269af5ddc4fc2b7718408cc3cda3ce5c9dbd96197b636124ed196190dfc8e08444c82d7c65 WHIRLPOOL ff4172f09bd634ec1ff245a4e243681dae24ffb07bef6b435936cb083cce5d5129f7f06bc3b43706115dd8b82d729d6fe805da9b79e4e1ed88c32bf7761fbf28
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 4c5ceed..b3159e6 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e68
 DIST netbeans-trunk-nightly-201510230002-src.zip 208659975 SHA256 2b00f5a10b9b57617f41c78adb256ae56e87a104fd88afeffdfe05ae46dec7bb SHA512 ab25742088a602ef44a1e3adec10fab612b100b7182efce801932156094103a2687da00df92a0fe7b6b0b5ca7ee825ee85b9cc84273449a6cffe686b0571c582 WHIRLPOOL e056f4cf9c2634a7ce09f466b722201d05096536683f9e0c744019e1e76cc53fb4b909e65b7d9fc16bf3ffaa6418b8c35521e2a6a6fcd043f615e8021a365107
 DIST netbeans-trunk-nightly-201510260002-src.zip 208660814 SHA256 0962715fc1997619fb908583701ad896b33aab643a82a1e55d20e508632e7e59 SHA512 c280647e7db0464844b0f81f0603c4d2583c9bf29516a4503632960ae682d7c008f67e12d14521095c97f16d285d2fefdc5017658028f3f3eadd1c3a5a7c4bc3 WHIRLPOOL be2a219d0fcc2a81a297eb1e560b97e8fc9daee48954dd548fe5eaa8cd70307b679adf0a3743c3f808c6dd8e9d6191b14b98c385d95457dafcf120fa6a8e90d4
 DIST netbeans-trunk-nightly-201510270002-src.zip 208660814 SHA256 1c083e6b903f72b10882f5285d8edb286f8d16de21c3b046f6e4190a008ff0f3 SHA512 b202224350745f28283261cc7756020f227304af8294e1abda6004393d8a23986d444fe36af31573f1ed4cb822fb2f1197d20e91d804500c4cf22edbc0c81b51 WHIRLPOOL e4a03fb4ae2733dba2026e3f60d4ebf6bde257d9c3fdcff6b613e6b9af7d305c04d57b0d9724a04cbf29eb0cf5448c90e6489c00e35eb23593875339e5627c11
+DIST netbeans-trunk-nightly-201510280002-src.zip 208661828 SHA256 3139169e12a7c0fc41665a462154b3ab94fe553945524b605328c502c576e669 SHA512 4bb4158f8bff478aad34a69a0e985564f4e87a1e0df5174ab18af6018ddf34a52cd3bd0a1179ad2bf1842725effafe25117d6c004177dc196473211c2695f89f WHIRLPOOL ca8db212894d1f4fc3aacebcf3e0ef730ac5d80aa32ba1c3cd3f545027fd64b44e786dbec28485bd6905b19ccabb676c145274167054ed320eaa5ece98fceb88
 EBUILD netbeans-javacard-8.0.2.ebuild 4906 SHA256 944fee40d693c2c287e748f70ba565f3cd84bb7c19110f8be716134ec20694a7 SHA512 1f66cd2756effbfde7d43f9da7d8d93cb6252c58a02ee3d821f6faeaf63bf3c63e28f80c6eb44689e3aa954452a2f3893c65e75de84158dff1da0d94cafea14a WHIRLPOOL 88197e03008b8acb1ce62f72783bb096d9a3fc2a289b83367841a8adbee2bf822031f9bd6051831515ee44b1d5d2a109c5646f98ca723506f27c874301fb4189
 EBUILD netbeans-javacard-8.1_rc2.ebuild 4931 SHA256 e97ff379323330f47a1f1e13d0492b4308e4c377008b4e203d24988a7e412bab SHA512 48dd7e817df729322de3ee165e4cadebc2bb23e8a6831d9084d298ca01f456c2035c96808080a7b62021154146924dbe98af5ed862271701f25fa07e4fe40e9c WHIRLPOOL cb81b1c27069e86f45acc87bfd1191e876b44ff676333ccc73320311f6f8de5923d7f052029f42bfc614b93f1aabe6489ddf76f4c788224140878c6081938f4d
 EBUILD netbeans-javacard-9999_p20151001.ebuild 4976 SHA256 714a98fde31d797fa8e50c0564ef66829e9e51f9fd740df1441b09bad904f433 SHA512 fd6dfd7720bb16541a2c0938ed5debc3c7ec313ceed2f8006d6aa801b89dd9d8ac12f6b865a6571fffe7fecf24720c34a10b4c50718cf6b505bcc7b659abbeca WHIRLPOOL f332fcb29ae308cec3c6ecf6b1b637742d5b8bcd420dcce3926b7ff3301f1949c2db7d1eb12ca06813aeb449d4526b4272e58d30f2c8a7c9003218e05479efbf
@@ -48,4 +49,5 @@ EBUILD netbeans-javacard-9999_p20151022.ebuild 4976 SHA256 24603bc67e16891714863
 EBUILD netbeans-javacard-9999_p20151023.ebuild 4976 SHA256 6048b9aea0640200d9d24e12a71d209e11341316d9e689e6ac2545d81423523d SHA512 45d4f927c9df155e25492507ceb41c97b221a77d14621a0798a05dcf430209c43bc3f3503af521bf6dd666e744e955ed80cbf14da67804d9696a112de07955c7 WHIRLPOOL b7895a8fb10dbef15c798e49f4868db519fc2c2e3a721ce8f97eee8c784af6a753a5921813c70796d009039d10184613c64b2e8ca9ebd15d007f8b897ffcd995
 EBUILD netbeans-javacard-9999_p20151026.ebuild 4976 SHA256 3ad34368cd0465a262c7ff7a4dc3a058c4bba679601594b07a287e7c48f695d8 SHA512 b5074ee01ebe17c21f77385b532b1f03e86c5469cdd1586fb3c8b01d8fca6186ad2da724fa6dd48fb4f5c28d05c85889c946568931b290cdd2f48aeaaab2ac46 WHIRLPOOL a39201515e79f13a5a1376e85812c8e6e686bfd4a84ab2b483449ce9e4a5d1c128a71eb4a76916a2fb567f5ce6272b31801f56a15a8d013747a63641394137cb
 EBUILD netbeans-javacard-9999_p20151027.ebuild 4976 SHA256 8e7ba13d32a16be7d0b9e3014cbe78e7728a880d64f4fcbf55368bce78d52ee4 SHA512 0621526ab9112c9563a01b48747ee0b238fe50f6a1452ca4ac9fd0a9a16ad9895abf5f8052ccbe52aaa85dcd683b80f14dc57cd33033154ff61c6978a0adbc4d WHIRLPOOL 38d36c6c62e8254c282abd70e140402f2b4e6f2b50ded9c7a53df9896ec2d1e15abb4d47aff002c29e4b6082443c85c751583b5ebf2a5b339c1036a932918f98
+EBUILD netbeans-javacard-9999_p20151028.ebuild 4976 SHA256 4c2c274dcc8bac59e93baceb5ad68e5df925ba1f1222673f3046b1afa3863fc5 SHA512 8fe1ff6a8083b84d8d6686c6cfb9269d982a66d4d498e82323f10bb4b174a5d479f81083dfdcaace2a4326a894fafef5a42899a13fb163fedb3dbd19137f42d7 WHIRLPOOL 1ec4d3b4dd803d5c558d827251ea6a7fe403908f835a1754efd73e6b36353b4d2b6afec2becff87f164b7fc2932ce9404199dc84523443ac56c830d2cd6835d1
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index 7168301..b06d4d7 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e68
 DIST netbeans-trunk-nightly-201510230002-src.zip 208659975 SHA256 2b00f5a10b9b57617f41c78adb256ae56e87a104fd88afeffdfe05ae46dec7bb SHA512 ab25742088a602ef44a1e3adec10fab612b100b7182efce801932156094103a2687da00df92a0fe7b6b0b5ca7ee825ee85b9cc84273449a6cffe686b0571c582 WHIRLPOOL e056f4cf9c2634a7ce09f466b722201d05096536683f9e0c744019e1e76cc53fb4b909e65b7d9fc16bf3ffaa6418b8c35521e2a6a6fcd043f615e8021a365107
 DIST netbeans-trunk-nightly-201510260002-src.zip 208660814 SHA256 0962715fc1997619fb908583701ad896b33aab643a82a1e55d20e508632e7e59 SHA512 c280647e7db0464844b0f81f0603c4d2583c9bf29516a4503632960ae682d7c008f67e12d14521095c97f16d285d2fefdc5017658028f3f3eadd1c3a5a7c4bc3 WHIRLPOOL be2a219d0fcc2a81a297eb1e560b97e8fc9daee48954dd548fe5eaa8cd70307b679adf0a3743c3f808c6dd8e9d6191b14b98c385d95457dafcf120fa6a8e90d4
 DIST netbeans-trunk-nightly-201510270002-src.zip 208660814 SHA256 1c083e6b903f72b10882f5285d8edb286f8d16de21c3b046f6e4190a008ff0f3 SHA512 b202224350745f28283261cc7756020f227304af8294e1abda6004393d8a23986d444fe36af31573f1ed4cb822fb2f1197d20e91d804500c4cf22edbc0c81b51 WHIRLPOOL e4a03fb4ae2733dba2026e3f60d4ebf6bde257d9c3fdcff6b613e6b9af7d305c04d57b0d9724a04cbf29eb0cf5448c90e6489c00e35eb23593875339e5627c11
+DIST netbeans-trunk-nightly-201510280002-src.zip 208661828 SHA256 3139169e12a7c0fc41665a462154b3ab94fe553945524b605328c502c576e669 SHA512 4bb4158f8bff478aad34a69a0e985564f4e87a1e0df5174ab18af6018ddf34a52cd3bd0a1179ad2bf1842725effafe25117d6c004177dc196473211c2695f89f WHIRLPOOL ca8db212894d1f4fc3aacebcf3e0ef730ac5d80aa32ba1c3cd3f545027fd64b44e786dbec28485bd6905b19ccabb676c145274167054ed320eaa5ece98fceb88
 EBUILD netbeans-javadoc-8.0.2.ebuild 5993 SHA256 baf9da38d87b86eb8ed10ef46017361f36ca8583dd90885c9d1667a51851bc52 SHA512 892bc25b30dc26e3ee7c8be9aaf8542c00a7fa1d1d8f883d82bebb816edfa93e1ee9abeac1b0c47ecc8b4169bcaded56c5c71f18151fdc22fe241fcee0fd4521 WHIRLPOOL 2012f28f3ba5074b4d262b20e9a1c8ddf590ce444339ec1a404c890867c1271e38f9f9e09717d0648fae061553f5c8da3d97a70c35c8e853fe4894fb6fd4ec96
 EBUILD netbeans-javadoc-8.1_rc2.ebuild 6183 SHA256 160de5384af53a4ff95958ba30c1d3d0b3dbcf4e8f8209c67ff2447d504108c8 SHA512 cd7d0ecc527dc8c6a7ac59f27a39c332500ff60dd59b5c26d2579258adf75cff762083727b18172607d494a597143261423c97faa7f705015c372bff1a54908d WHIRLPOOL 39a55f84ccb43df6537b1276406d46d70cdc9e5b5c428aec33eeed091f5e580c752557319cbab5f6d6325de1509c87d8913f6c1b8712e72e148fb1883c684d76
 EBUILD netbeans-javadoc-9999_p20151001.ebuild 6228 SHA256 e1a3b029266e3b470f00a50bdfd40ae55bd55704e05c349b61f95d634b61dd16 SHA512 46ca2c05feaffb2bc02ef2b13db9ed0f73c250dc9264a72045680c75c31a78eeff3afba43cf4a491bc6f06740b817cc4a69cad1ced802d7760be20450a2b56a3 WHIRLPOOL f81a54053408f205ca6b71b67977ffd3ccfc12173334713c7f604fe805da3db7e588ca002043e83a4f45cc62408d0a1b093538536481545f3e8f925a91b5f0f3
@@ -46,4 +47,5 @@ EBUILD netbeans-javadoc-9999_p20151022.ebuild 6228 SHA256 8fdf6ffbbb93cf146c379a
 EBUILD netbeans-javadoc-9999_p20151023.ebuild 6228 SHA256 eed53d61d014e87590508c98f2bd2448119ec322e343c03988a5bf12f3251bf0 SHA512 6e1d414c40750c2772cee21e45625e0e708dc1ead39b736c9e98bd6f07baea348cae174ecbd91ea21d50ab8350c345ba692b871012ddd8e182b9fc26fb1401c6 WHIRLPOOL fea652760a468998c69c10e690a3312f9a415b331c8bc1399f5db484eb5d81e3e5a5d7f573993e8661e470b92dd50091cec4684ea1143362ef481f2ad48c9e1b
 EBUILD netbeans-javadoc-9999_p20151026.ebuild 6228 SHA256 09c69d97b181457c9e53ce7456265e054becd4b3fc3748856a7e7f4bec4dbe8b SHA512 71bb23a5efc4a12a877ef0a9da57b0833faa342d4d5f2aeedee06b742ace7f3d0d9a48a1010760e80bd036e031379865571acd82bb58b9578a2c052ad58ccc65 WHIRLPOOL 82602f24976c5e231b6aee03c416abe34f002b33eebf37c1185788514fc0765de676cf3a611d74b54801364d236f9ffe1d6a868733c4b7804be42840524ce841
 EBUILD netbeans-javadoc-9999_p20151027.ebuild 6228 SHA256 7c237e27538e0b5987aac7931aba9f71c2bf2194eb15e1346155073e5dba7295 SHA512 90e85beab28801cf10149daa8a4c0191fdf0fbf6e9992a59bd15ced1e21dd16f61af00d62539f0d0d322071fd11c12a63e934783d71f5e51815bb5e56cc54c89 WHIRLPOOL 7a64dba1eb0d31809245f65ea4885fec3bfe361b7fe77644eb3e255ea8e2fd3e1c4c04a237d9f22e663d6b2abbc818368d19e74df54c1fe843053f15ca4e293f
+EBUILD netbeans-javadoc-9999_p20151028.ebuild 6228 SHA256 dd276e873754e88840c1df8801cc73af2162f664fc5790654ee78f10e1494712 SHA512 26c2163ba600596cfae489d997f8e386c1ffa673ddcf27198ec15a1df3b99c9d8dae31fd63856d3f4cca98a19db67566926c0c59910b67a4711e9de980153bea WHIRLPOOL 62451b58258ae09c8767dd9d99c762dd0847b350c705a89047de01f5bb58095b45889d7bedfd95ef28da259c26c753b8e15cd6a545c9a0c750bb380e2b8feb3a
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 973326b..580d8a6 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e68
 DIST netbeans-trunk-nightly-201510230002-src.zip 208659975 SHA256 2b00f5a10b9b57617f41c78adb256ae56e87a104fd88afeffdfe05ae46dec7bb SHA512 ab25742088a602ef44a1e3adec10fab612b100b7182efce801932156094103a2687da00df92a0fe7b6b0b5ca7ee825ee85b9cc84273449a6cffe686b0571c582 WHIRLPOOL e056f4cf9c2634a7ce09f466b722201d05096536683f9e0c744019e1e76cc53fb4b909e65b7d9fc16bf3ffaa6418b8c35521e2a6a6fcd043f615e8021a365107
 DIST netbeans-trunk-nightly-201510260002-src.zip 208660814 SHA256 0962715fc1997619fb908583701ad896b33aab643a82a1e55d20e508632e7e59 SHA512 c280647e7db0464844b0f81f0603c4d2583c9bf29516a4503632960ae682d7c008f67e12d14521095c97f16d285d2fefdc5017658028f3f3eadd1c3a5a7c4bc3 WHIRLPOOL be2a219d0fcc2a81a297eb1e560b97e8fc9daee48954dd548fe5eaa8cd70307b679adf0a3743c3f808c6dd8e9d6191b14b98c385d95457dafcf120fa6a8e90d4
 DIST netbeans-trunk-nightly-201510270002-src.zip 208660814 SHA256 1c083e6b903f72b10882f5285d8edb286f8d16de21c3b046f6e4190a008ff0f3 SHA512 b202224350745f28283261cc7756020f227304af8294e1abda6004393d8a23986d444fe36af31573f1ed4cb822fb2f1197d20e91d804500c4cf22edbc0c81b51 WHIRLPOOL e4a03fb4ae2733dba2026e3f60d4ebf6bde257d9c3fdcff6b613e6b9af7d305c04d57b0d9724a04cbf29eb0cf5448c90e6489c00e35eb23593875339e5627c11
+DIST netbeans-trunk-nightly-201510280002-src.zip 208661828 SHA256 3139169e12a7c0fc41665a462154b3ab94fe553945524b605328c502c576e669 SHA512 4bb4158f8bff478aad34a69a0e985564f4e87a1e0df5174ab18af6018ddf34a52cd3bd0a1179ad2bf1842725effafe25117d6c004177dc196473211c2695f89f WHIRLPOOL ca8db212894d1f4fc3aacebcf3e0ef730ac5d80aa32ba1c3cd3f545027fd64b44e786dbec28485bd6905b19ccabb676c145274167054ed320eaa5ece98fceb88
 EBUILD netbeans-javafx-8.0.2.ebuild 4647 SHA256 15e5e0b1c4729852dd55e5bfb2dcb520ba7c959bd9927d315c0abcb3f94e4ecc SHA512 520c60264fee67b0ccfd50ced0cc8586d5653d5186fa75c6b7cd8b400aae834de446b7e6145ad38df7e68207391fb360ef4834140e096d48add568fed387ac98 WHIRLPOOL 416a56ceb2ba85e3923ada0c8ef485cdd6fa16b3423b8fd0de523fa54dd082cbaedee5da4f1a92b50e440195f9256376f50e99a850d70ccdcb8c0ff370007f7c
 EBUILD netbeans-javafx-8.1_rc2.ebuild 4672 SHA256 95e0fd3db7cd71b95d3b1a0be1ec35e8b4f0ee2ef8e37e5defcdfb81c8a8ee4b SHA512 0dbdb39db83521ad87f5536c491a8f94d1d6261f1cebc5a80e943128f33364adf04a4a0a23898617eb0b12f770200f0a7df9c7bb8e5cac65aca4b50737a05b2b WHIRLPOOL 0ef3c1159df5dc25474beb8106b65133951ff48699c265d6be1a929e9537a30db8a125740f37a0295ed0e6267141cd1a7be9f5ec5d4412e0221f9734d6625b3b
 EBUILD netbeans-javafx-9999_p20151001.ebuild 4717 SHA256 f7d20a14f73084dd20657f4a6980f669648914eeb87b664570b6b48c2d130430 SHA512 20c414a6f5586949a115c142c0f2500162796eb64784e2bcd05ce611c5a709859994bceeba670ca45dfe1a9ca3e7b3506642347654e15b1336a3da1b466a5123 WHIRLPOOL 936b577abd4722aeb2e35a82422d5490fbf687875759052a635e90a1b6cc9839d67ce65e1de660381e61f9d865ea2583bc8a09f5779a7427274738523c6223cb
@@ -52,4 +53,5 @@ EBUILD netbeans-javafx-9999_p20151022.ebuild 4717 SHA256 1a6ce3036dbec321ce24697
 EBUILD netbeans-javafx-9999_p20151023.ebuild 4717 SHA256 8e3c4c133bf67f5b3be455b1058b6935cf29175b7d7a340d519ae924557d08d8 SHA512 84cd67d516acf56f5e815915f4a15a4042e51a5fd86f5386d1aff7ecc8df06f1073e652141ded0cc5b30d6798f5751aea4c444c874f4c1f4091ae6edb8b1c288 WHIRLPOOL ea6876404f8f263aacd604a1d74c451cd039924bab4bb585e10c63473ad9ceab602890737c5fe7f28ba3c1073b83f1f8524778f6a8ce40bd922641054efc9715
 EBUILD netbeans-javafx-9999_p20151026.ebuild 4717 SHA256 5ddee603c803ffd030c2b3f050f04930fc92a454cb00a84c0d2a4b25363eb972 SHA512 12695f2525758897305587be70aeef4985624e1184cdf709fdd0385cbe4ec30241bf3daa4522dec2c1cce77b298f476a7d93a683913dadbb2c1a6585a7803996 WHIRLPOOL 6c7d3e7828c1ce1c17acef8f427c77f7a95ff5cad443ee9492a9d0924359599dc4db314ec5d1e3ae8f5527aaf06b8cef9270a2082f8dfe01da5a9765d6585202
 EBUILD netbeans-javafx-9999_p20151027.ebuild 4717 SHA256 a3e7506e80d2fe2ffbe5313e47f6792859e21c8f6d44d2057b8f83b2adff1802 SHA512 57eff0caa6e146aff5d907d8a977f336780be3fc6d9fe125b74c03e1f3ec91b739b9c17ab2b385350d3c593091200f538afa59327d404db41dbdc9488ec2aa17 WHIRLPOOL 469948f50b564a57ca365916b5c4f9392882d30ef3fc61304f5fee0c04d20eb295e49b8d5c6230f72575679917c2963d3cf5874ea184f0e6e5185ce66d130ced
+EBUILD netbeans-javafx-9999_p20151028.ebuild 4717 SHA256 6b4ffb34216f5f0171d87e1f53016d76e295e075d878dc30eb93942a4b000b7b SHA512 d120dd124186585c2e3c5976debbefda3acddeedf8cba5d00572d8f24c9ceb81cfe364ad77d3105aecb2c5d65d4054a317d463a8fc81d106fdd4c6a3bc16406c WHIRLPOOL 53261f8a2c4611870041d965b40693b8b3f529f2edb9a869ecfdafb53a4fb0cd91b68f90b49788c744533398a8c1b839d42666c1f11f72149bd76fe4025ea76e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 57caeda..c4c6d38 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e68
 DIST netbeans-trunk-nightly-201510230002-src.zip 208659975 SHA256 2b00f5a10b9b57617f41c78adb256ae56e87a104fd88afeffdfe05ae46dec7bb SHA512 ab25742088a602ef44a1e3adec10fab612b100b7182efce801932156094103a2687da00df92a0fe7b6b0b5ca7ee825ee85b9cc84273449a6cffe686b0571c582 WHIRLPOOL e056f4cf9c2634a7ce09f466b722201d05096536683f9e0c744019e1e76cc53fb4b909e65b7d9fc16bf3ffaa6418b8c35521e2a6a6fcd043f615e8021a365107
 DIST netbeans-trunk-nightly-201510260002-src.zip 208660814 SHA256 0962715fc1997619fb908583701ad896b33aab643a82a1e55d20e508632e7e59 SHA512 c280647e7db0464844b0f81f0603c4d2583c9bf29516a4503632960ae682d7c008f67e12d14521095c97f16d285d2fefdc5017658028f3f3eadd1c3a5a7c4bc3 WHIRLPOOL be2a219d0fcc2a81a297eb1e560b97e8fc9daee48954dd548fe5eaa8cd70307b679adf0a3743c3f808c6dd8e9d6191b14b98c385d95457dafcf120fa6a8e90d4
 DIST netbeans-trunk-nightly-201510270002-src.zip 208660814 SHA256 1c083e6b903f72b10882f5285d8edb286f8d16de21c3b046f6e4190a008ff0f3 SHA512 b202224350745f28283261cc7756020f227304af8294e1abda6004393d8a23986d444fe36af31573f1ed4cb822fb2f1197d20e91d804500c4cf22edbc0c81b51 WHIRLPOOL e4a03fb4ae2733dba2026e3f60d4ebf6bde257d9c3fdcff6b613e6b9af7d305c04d57b0d9724a04cbf29eb0cf5448c90e6489c00e35eb23593875339e5627c11
+DIST netbeans-trunk-nightly-201510280002-src.zip 208661828 SHA256 3139169e12a7c0fc41665a462154b3ab94fe553945524b605328c502c576e669 SHA512 4bb4158f8bff478aad34a69a0e985564f4e87a1e0df5174ab18af6018ddf34a52cd3bd0a1179ad2bf1842725effafe25117d6c004177dc196473211c2695f89f WHIRLPOOL ca8db212894d1f4fc3aacebcf3e0ef730ac5d80aa32ba1c3cd3f545027fd64b44e786dbec28485bd6905b19ccabb676c145274167054ed320eaa5ece98fceb88
 EBUILD netbeans-mobility-8.0.2.ebuild 4342 SHA256 e9b4ff8fe38904346bc21a82219696e97322bf9df4e9d4cad2259b6f08bbe7f9 SHA512 338711fe61c469cee80e499ddf8c3ad70a3a38e6658311afcd1d24edd1a99b87566fafcbd392bb958b589796e0913d2574b07570870c8d3382a91a324227082f WHIRLPOOL 855b2817c36bea67c8fb368a0740be18b71dbebb2b98a154552f002a56eaff34f54eee2698379d7200a6042c1de699df23e7717b5b6c532776852d8757b74cb0
 EBUILD netbeans-mobility-8.1_rc2.ebuild 4367 SHA256 9b9490b5e2515bf38f69aee76ad664271a0296f68b88d4a005ab12d9048c61d8 SHA512 7eccdf31e705ae6f738995fdcb930c03cf779f02ed64d5e3ee97f1f9a9f6912a2ff56e1c839ddc2b71b9051fcd02ed410d85fff0c706b6ca84f3578c0aa2447d WHIRLPOOL 8d4657fc21b171bf050a272597e7b0567dac5ad480a8822fdcdf76b88b4537aaf8b45a3b1317dd34cef3beee417515a521b7e076e7776b845c0383066503ba3f
 EBUILD netbeans-mobility-9999_p20151001.ebuild 4412 SHA256 fa37c54076909decb1265c7a0f659d19ccb7f66021dc55262bb840d238bdf5ec SHA512 03783d0b84678f37f31e5739113ec02438161775854a05abd52decf8438cbcc29be6126d2926edfa8f65788a293884ea638b6a442f3552f1f0547cbb58560de4 WHIRLPOOL 534bb40d4aefca1435202edb8e4602a6aff3579043f404e7da65badc9dac4fcbb7821c5462d975cbea66bfa9a3e9ae84a8ca28428433385747455b61726e1eb4
@@ -45,4 +46,5 @@ EBUILD netbeans-mobility-9999_p20151022.ebuild 4412 SHA256 39124bd89f53f7b3c2899
 EBUILD netbeans-mobility-9999_p20151023.ebuild 4412 SHA256 12e53904612550cd07cd9092f3dce8e89de5797cc7feb215d5364bab68d026ab SHA512 57ea5bfa455b893df4a76ff3cc8a52e26a20bc6623a4abca166ae47db86e0e89727e7b73c37fda2e1a4b93923f790ee62c7539f1013a1c8390acd5b54963a192 WHIRLPOOL 05eb17b775282f3e4f79768f86c751680b7d313c294255037179439f4545fe79eeecd9e3cc2e6897f1f3530e860bd8fbedc5fcaa2edaa00901de69c7d65ae3cd
 EBUILD netbeans-mobility-9999_p20151026.ebuild 4412 SHA256 1f130e82eb851b7dd6485d380ff39efc250c38a0cf436ad3787e3e6063b2226b SHA512 c3dd11b851637806885a2f6b9b2e29bb120e2f408c5ba7b2889c3f290812799ed650b38ac98d4ca1b813808672107e43e485c9390e58cd9130405602ed2eb1d1 WHIRLPOOL bd475ee6a3c6703928b09c7366805a9d996bbffcd2a7b0e1e39edfdc2d59452a2fcc30c3a9686a811754fb6e2c248a99daf4336699d85a58a7272939424ca4b9
 EBUILD netbeans-mobility-9999_p20151027.ebuild 4412 SHA256 0802a42f470a00d7f1318bf2e452c8448baf2953f25efb3923b4f5eb289cd981 SHA512 0c875b75106c61390e78510aee89700782e9ee210e25b56b82166797177c75acd97b973184bb0006e95594dbd31b0adff716da9dd7cc4668303537a75a0069d1 WHIRLPOOL 06255d473d3ff625a67e1e83f54c6a02d340fa5dd3b2bc0435f7b1611472d8d0d3fa8707c41a5311e8272b00eb5188cc73a040d9f9b7c7258efa991eb401667a
+EBUILD netbeans-mobility-9999_p20151028.ebuild 4412 SHA256 6671a728a82ca100c1ba7cceac7aa02ad256ebf4ced169c0c9b65a2257fad3be SHA512 50693747c46a7f2718b4fb8962c63558bffcc904c33252483c7180fe8d38ca333ec425a6cc3bea6bc447757263101fa2dc5a5b6fe2f2e1500569f3612e2f8357 WHIRLPOOL 54bdc9d1bc9d979ef7e13504e15456aa11c555c40186721eea952a56c5e36d9c2d9aa3c9f01849900e7ac5a0d81ee9c543814fb95ae5afe0fc43055880e9e7ef
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index e784ada..0a77253 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e68
 DIST netbeans-trunk-nightly-201510230002-src.zip 208659975 SHA256 2b00f5a10b9b57617f41c78adb256ae56e87a104fd88afeffdfe05ae46dec7bb SHA512 ab25742088a602ef44a1e3adec10fab612b100b7182efce801932156094103a2687da00df92a0fe7b6b0b5ca7ee825ee85b9cc84273449a6cffe686b0571c582 WHIRLPOOL e056f4cf9c2634a7ce09f466b722201d05096536683f9e0c744019e1e76cc53fb4b909e65b7d9fc16bf3ffaa6418b8c35521e2a6a6fcd043f615e8021a365107
 DIST netbeans-trunk-nightly-201510260002-src.zip 208660814 SHA256 0962715fc1997619fb908583701ad896b33aab643a82a1e55d20e508632e7e59 SHA512 c280647e7db0464844b0f81f0603c4d2583c9bf29516a4503632960ae682d7c008f67e12d14521095c97f16d285d2fefdc5017658028f3f3eadd1c3a5a7c4bc3 WHIRLPOOL be2a219d0fcc2a81a297eb1e560b97e8fc9daee48954dd548fe5eaa8cd70307b679adf0a3743c3f808c6dd8e9d6191b14b98c385d95457dafcf120fa6a8e90d4
 DIST netbeans-trunk-nightly-201510270002-src.zip 208660814 SHA256 1c083e6b903f72b10882f5285d8edb286f8d16de21c3b046f6e4190a008ff0f3 SHA512 b202224350745f28283261cc7756020f227304af8294e1abda6004393d8a23986d444fe36af31573f1ed4cb822fb2f1197d20e91d804500c4cf22edbc0c81b51 WHIRLPOOL e4a03fb4ae2733dba2026e3f60d4ebf6bde257d9c3fdcff6b613e6b9af7d305c04d57b0d9724a04cbf29eb0cf5448c90e6489c00e35eb23593875339e5627c11
+DIST netbeans-trunk-nightly-201510280002-src.zip 208661828 SHA256 3139169e12a7c0fc41665a462154b3ab94fe553945524b605328c502c576e669 SHA512 4bb4158f8bff478aad34a69a0e985564f4e87a1e0df5174ab18af6018ddf34a52cd3bd0a1179ad2bf1842725effafe25117d6c004177dc196473211c2695f89f WHIRLPOOL ca8db212894d1f4fc3aacebcf3e0ef730ac5d80aa32ba1c3cd3f545027fd64b44e786dbec28485bd6905b19ccabb676c145274167054ed320eaa5ece98fceb88
 EBUILD netbeans-nb-8.0.2.ebuild 4927 SHA256 7531e50c4d76608bf925efdba4f54f522de3a8ceeef4d48807fb4ee48bfabdf6 SHA512 925734f331cf228066c5c9e614f48b756af31cac8b559cfe756347b6a2cb0ce362c7c41489a25084f2ed3f2e415baefd148a54f39fc00269fb14179efe056cb9 WHIRLPOOL e3224c5f22bb8e4792a5f98bbe819e071ff18c99533ce05a3fc1c5898ddcca1e3ce34487ba78159bb4d60155acdf15ae4fe81189ff2d5b1bc77ffd9ee4e20aca
 EBUILD netbeans-nb-8.1_rc2.ebuild 4952 SHA256 7e7fd653bb309c4acbc812e3e4659e0f3f67f943ceaebfdea0e9ff75c2e71174 SHA512 59da938007782e139e0946ef8da1fcb49d2d6d993953222cd2540b0506981279c0f3ad6b9ccaba89af185f4fc9eb7ed23ec16e66c066c22541fe371384eab59b WHIRLPOOL 2be8f9f9cc42829865f393f4a641b73053d460da5c3bbe45bdf470ffd0c519e76af9e4712f0142d0c018801d003c347bcfb4fa99ff1e3a95bfebe8f1e0f02f2d
 EBUILD netbeans-nb-9999_p20151001.ebuild 4997 SHA256 beee62184543011b39e38178684cb39843804f4c34e3296fdf163da2288891a6 SHA512 d21f566eff13f763bcb2c99d16f7a713254d3251eb6c9131acae6b28bc4658055e20d137eb6d526fd77bec7f76d42c1ab7fcba967891e68c42ccd0e44d0d46f3 WHIRLPOOL dbc5168e83e57f4e137b5d29606a10f800bfe50861b3ba80ff05bcf6f8fb74840dec8a10d9717875bfaf32aed11a978169e41962443724c090c5e35230a2003a
@@ -48,4 +49,5 @@ EBUILD netbeans-nb-9999_p20151022.ebuild 4997 SHA256 89df804a96cdef9701d3897bc13
 EBUILD netbeans-nb-9999_p20151023.ebuild 4997 SHA256 a019648553d26a99f7d6cacb24ea03d0cee5c89c2ca8aa64b84f8eed13a4f898 SHA512 c1a94d8fae78d61568726bd2ff5d6fe1f2a318163b0bdf64a5a57554bd0dea8d5403f7130c50cbb36802b537a39c40fb9d2a48518a4572e3b86c2163ced03a59 WHIRLPOOL cfdb1feab91a19ff728f5b7e1699c44d62bce02d8d7032f44256bf267f02871b25c5a2e203bd2ae8a8728b74c88d50bbf8b22671fe096f0b9a2e27b3e871b894
 EBUILD netbeans-nb-9999_p20151026.ebuild 4997 SHA256 0c64cfac56adedc3358bd153d2cfecc50fff8600b950f4360831124a43004b50 SHA512 7a67be976b85b2f1c7913666af6cb266047322518fa95f84e41faae856871ef747cb23c9aa89b446b3830193b552e819cce61d46005141c8dfaecb8887ec57ba WHIRLPOOL add096a0b1c1d493d82f150434985a837cd08e3a9511d3e49c8ac179e346aa71cc6a12ad8b44a366794f7363c70b46d25676f1e1403afda0084198ec8a070d0c
 EBUILD netbeans-nb-9999_p20151027.ebuild 4997 SHA256 11d39ce8dcb6e465c843c74367aed601ac47527c1c90239a25dce416504c4a83 SHA512 08fb919dfa06b8ec12bdfd25ba6a053aa060009d9cc95517b2feb18e306a0a5e8d2cbef9d38f2c6da28bb138183acf79666518f4bc4b4179885c70734d8fdda4 WHIRLPOOL ecb3c888ebf7537d66172ca1c1068cc76cad14b296b6588f4b518317d49b93fdb703f9a5df80ac57b53bd0f969c70fae8989ee05e47485e2eeda1f4a44f99845
+EBUILD netbeans-nb-9999_p20151028.ebuild 4997 SHA256 245af016e2976230fc5ede4b16fb09a9fa7ee451498129cb5b06ac97254bcb73 SHA512 1594eb2bb3f6a00938fcca94a7a858681e9d7c263fe95eca8452b6c01c19d1061a0e3e2b69997ae46418d32dccf8dd5278bbc181666910188276000bd618de68 WHIRLPOOL 6b9446734a7c36570a32eb14ac4241a0fdb22fa23ad932c4a5419f09c62538eb6ff15f218804b28466ff107f574a50c708ce23d19800b27f325b0ae319941842
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

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

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index 6ad8e2c..af70a4c 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e68
 DIST netbeans-trunk-nightly-201510230002-src.zip 208659975 SHA256 2b00f5a10b9b57617f41c78adb256ae56e87a104fd88afeffdfe05ae46dec7bb SHA512 ab25742088a602ef44a1e3adec10fab612b100b7182efce801932156094103a2687da00df92a0fe7b6b0b5ca7ee825ee85b9cc84273449a6cffe686b0571c582 WHIRLPOOL e056f4cf9c2634a7ce09f466b722201d05096536683f9e0c744019e1e76cc53fb4b909e65b7d9fc16bf3ffaa6418b8c35521e2a6a6fcd043f615e8021a365107
 DIST netbeans-trunk-nightly-201510260002-src.zip 208660814 SHA256 0962715fc1997619fb908583701ad896b33aab643a82a1e55d20e508632e7e59 SHA512 c280647e7db0464844b0f81f0603c4d2583c9bf29516a4503632960ae682d7c008f67e12d14521095c97f16d285d2fefdc5017658028f3f3eadd1c3a5a7c4bc3 WHIRLPOOL be2a219d0fcc2a81a297eb1e560b97e8fc9daee48954dd548fe5eaa8cd70307b679adf0a3743c3f808c6dd8e9d6191b14b98c385d95457dafcf120fa6a8e90d4
 DIST netbeans-trunk-nightly-201510270002-src.zip 208660814 SHA256 1c083e6b903f72b10882f5285d8edb286f8d16de21c3b046f6e4190a008ff0f3 SHA512 b202224350745f28283261cc7756020f227304af8294e1abda6004393d8a23986d444fe36af31573f1ed4cb822fb2f1197d20e91d804500c4cf22edbc0c81b51 WHIRLPOOL e4a03fb4ae2733dba2026e3f60d4ebf6bde257d9c3fdcff6b613e6b9af7d305c04d57b0d9724a04cbf29eb0cf5448c90e6489c00e35eb23593875339e5627c11
+DIST netbeans-trunk-nightly-201510280002-src.zip 208661828 SHA256 3139169e12a7c0fc41665a462154b3ab94fe553945524b605328c502c576e669 SHA512 4bb4158f8bff478aad34a69a0e985564f4e87a1e0df5174ab18af6018ddf34a52cd3bd0a1179ad2bf1842725effafe25117d6c004177dc196473211c2695f89f WHIRLPOOL ca8db212894d1f4fc3aacebcf3e0ef730ac5d80aa32ba1c3cd3f545027fd64b44e786dbec28485bd6905b19ccabb676c145274167054ed320eaa5ece98fceb88
 EBUILD netbeans-php-8.0.2.ebuild 4347 SHA256 585b2488d748f3d0f87c17c951870e167aac7bf10847428add786e4a8a446583 SHA512 1431305d4f340cb0a2c7c896c54d45f6f02ef82a4201f82053278b98511a5a4a68210317530e9cdf5cf1f495996d3a3f9c4b2c3c479aa407abd375072ab3182f WHIRLPOOL af8476f2ff2d119f2657e6be03cfea1160f86e41bd791f40609f1bc8a8aada46ba1081e4f2417b0fddde931fa4e43d20956c0fe1d4fdf3617b78d01afd23f9b4
 EBUILD netbeans-php-8.1_rc2.ebuild 4372 SHA256 76dac153b77fd368c61ae61aedbda5d9bffd3e713520cfb6e8c6923c6443fd2f SHA512 7a62423b8a60734d337ab08f5a84513ef8246bf2e807b0f88acce1bb64add72cde91739289aa968bd1eecff64a78f4c5947f6e722af7509fb3c9d93f57ee72ac WHIRLPOOL 1effeb1eba78584a32d4b763804cca16383715029247bfc3569ee3e06135dc03cc65425a8769b0ffa259672fd20909699bda99833a9024a924b408c93f4befb1
 EBUILD netbeans-php-9999_p20151001.ebuild 4417 SHA256 df6044e54831ad66583fe0f1e8ae27d25a6dbb768829230ad2f21e3602807732 SHA512 fb840cf50a278f6afb1189e3263405b6dc2404317d677b046e923e01631b5ee1afb476bce60ad647f74cbf0b3560963689cd6c369215a29033620c971d8f94dd WHIRLPOOL 9ebefcf91e9c7e6dfb5d095df07267405caa3f15f5e103f612704cd3658ebaf6c83a2e06b448517c4adddbb34bc6fc0dac4d87f8f9d1c2f54a03bd7878d2fc2a
@@ -49,4 +50,5 @@ EBUILD netbeans-php-9999_p20151022.ebuild 4417 SHA256 eecba5b3b17ecc48e5d37ed05d
 EBUILD netbeans-php-9999_p20151023.ebuild 4417 SHA256 d4e689e087317a6ee7579699cc3d19857bf44fb847f58e7930a1d7cfcb1a9bd5 SHA512 69637c9af4433e393bac57e77288657e9822c636e9413200b985df160c9c6efa1a0c0afcc420960b192bc047437242fffa0c909647e7cf72f4b5496e92a6705e WHIRLPOOL baa741f2dc91bc2f8688344377cc6a75b6c2ce7c1459eb5ac80b158f6886b977a00f266052245deb5fc2f5f9982166fc4076583f29fe9fb1c920549a95551f93
 EBUILD netbeans-php-9999_p20151026.ebuild 4417 SHA256 3d97cdcaefe48b8790f826644c4771d2f36de33012ec40003970a2d79a4d2b55 SHA512 1f7af10caad0779fb9b2ae3e46d9b35437f743b1d92725ffcb21ab17fdca5014afb5d26ff09527630f810d99159b8b2345ac0e31073b942d69163bbf86a36755 WHIRLPOOL fbb2f7e1e0fa5bd9076df58c1aa4e48d6a41e96f36489d6f3c41847687d5dc6b8fef9080196363ef076c2f32d62f26b1018e5b503efe9ceff74b9007c4e2c10f
 EBUILD netbeans-php-9999_p20151027.ebuild 4417 SHA256 6cac68c3821a59b888a06e5b33d998744bd5fd18aa9c58286a74c1a2ae8a50f1 SHA512 3c8e5e731ff9d5f9b2da475cecf84a2675abd5740218cd2041687a954eb47f569373a84441000350ee4007f3ee83a9854867725f13271184b89f00dc4fc6df6d WHIRLPOOL f0b0a4478c8f4fed286a5fec968b4ef77b7ea6540a8d275ac910033db9b7bf3fbf1dd8d15a2ca13fff381cc8f61c9527f7cf29e1732ed24bf722814721d0babd
+EBUILD netbeans-php-9999_p20151028.ebuild 4417 SHA256 63b7bfb12d57dfa249bbc1ab7960b14314ed394a19f43caca0ef2402597a2b25 SHA512 f251fe9d449c1a1d2b40602b620fad89b733e8f46f76778bc454e1059e5714e91e693530308020e5e111ba23b80e6c37b4cbd563ab3e3a584e6e425ffba3ab16 WHIRLPOOL 0dcb1deeeb1aedad78e28f3581ff255f726824766e1f9c410aa5a932fddbed96262b55cb8c29d1a18d53a15e9b55163e88b84c023dceecbdbc70203e847d4536
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 4261c37..826ff10 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e68
 DIST netbeans-trunk-nightly-201510230002-src.zip 208659975 SHA256 2b00f5a10b9b57617f41c78adb256ae56e87a104fd88afeffdfe05ae46dec7bb SHA512 ab25742088a602ef44a1e3adec10fab612b100b7182efce801932156094103a2687da00df92a0fe7b6b0b5ca7ee825ee85b9cc84273449a6cffe686b0571c582 WHIRLPOOL e056f4cf9c2634a7ce09f466b722201d05096536683f9e0c744019e1e76cc53fb4b909e65b7d9fc16bf3ffaa6418b8c35521e2a6a6fcd043f615e8021a365107
 DIST netbeans-trunk-nightly-201510260002-src.zip 208660814 SHA256 0962715fc1997619fb908583701ad896b33aab643a82a1e55d20e508632e7e59 SHA512 c280647e7db0464844b0f81f0603c4d2583c9bf29516a4503632960ae682d7c008f67e12d14521095c97f16d285d2fefdc5017658028f3f3eadd1c3a5a7c4bc3 WHIRLPOOL be2a219d0fcc2a81a297eb1e560b97e8fc9daee48954dd548fe5eaa8cd70307b679adf0a3743c3f808c6dd8e9d6191b14b98c385d95457dafcf120fa6a8e90d4
 DIST netbeans-trunk-nightly-201510270002-src.zip 208660814 SHA256 1c083e6b903f72b10882f5285d8edb286f8d16de21c3b046f6e4190a008ff0f3 SHA512 b202224350745f28283261cc7756020f227304af8294e1abda6004393d8a23986d444fe36af31573f1ed4cb822fb2f1197d20e91d804500c4cf22edbc0c81b51 WHIRLPOOL e4a03fb4ae2733dba2026e3f60d4ebf6bde257d9c3fdcff6b613e6b9af7d305c04d57b0d9724a04cbf29eb0cf5448c90e6489c00e35eb23593875339e5627c11
+DIST netbeans-trunk-nightly-201510280002-src.zip 208661828 SHA256 3139169e12a7c0fc41665a462154b3ab94fe553945524b605328c502c576e669 SHA512 4bb4158f8bff478aad34a69a0e985564f4e87a1e0df5174ab18af6018ddf34a52cd3bd0a1179ad2bf1842725effafe25117d6c004177dc196473211c2695f89f WHIRLPOOL ca8db212894d1f4fc3aacebcf3e0ef730ac5d80aa32ba1c3cd3f545027fd64b44e786dbec28485bd6905b19ccabb676c145274167054ed320eaa5ece98fceb88
 EBUILD netbeans-platform-8.0.2.ebuild 5406 SHA256 98e9861da45ead0d2d975a0527315df5282870b2d7e71a089724d91c18852e81 SHA512 cadbe66132d3ad81f6d149e20731b558c11c529e2ec15b1fe47ff97d99a3f4b4612fa5c98c435c4ff979eaefab6702721db009a03162202c96b4b411cf9f872a WHIRLPOOL 9552948e8bbad308f4379eaae69d8c214da9fbfab87d75226949b69ddca3e68c2d36c4d05738196073e5b959ab0b764064c9186d421198937122aa4bdc4988dc
 EBUILD netbeans-platform-8.1_rc2.ebuild 9337 SHA256 3c257f2aa4574f4ec2cdcfee98008ed97c8ad08acaf27e4a19a11d6728154bec SHA512 d09eaa53c2a8f7162335ee24832b41c3a5d044f2415e694b895253baab7ced21300cb1eaf509720b261070401fbe71c2f629545705bb4bd41512f12cb432bc4f WHIRLPOOL d36468c532d27fea2d4718a3780175e81e1d2f5df2a6e1bf9a4bad6ee6b2c1f7a7e845a23128d3a5354031970fd6bc2eaa683fe3033b847ec966e9b8db0c4aeb
 EBUILD netbeans-platform-9999_p20151001.ebuild 9382 SHA256 b240d296480c76bbb7064369bd251082dce9e7022846023f345c298d6918e6bd SHA512 7352181ac30b2c867f1a194a36b9ed8bb7df74b2b6b34995327455bcb64603cb94d74c6c8c19f7e0cc8ffefd190731c377e2212661238eb5a0522af5fdd2cf06 WHIRLPOOL d69c8f39aba08877130d96a9a5230be8a201a1cc078648bfb88e718a2042896ffc12d3f2834f40c277cdeefc6f1c25db27dbb3043bceda2c9752d8c044804ef4
@@ -61,4 +62,5 @@ EBUILD netbeans-platform-9999_p20151022.ebuild 9382 SHA256 1eb19a322dfc7d6dc8f1b
 EBUILD netbeans-platform-9999_p20151023.ebuild 9382 SHA256 bdd859e874772ec7177df97053f3515fffb3db92461cf7158df0382d2221d915 SHA512 7362660208aa4fae0ad17b282404629608b622b38e46d06a97d7f5d722778e7a5b4b7452f3cbfe323d46665a265b4b4dfb2232c2e28a78c764f4b0d2c5bfc2f6 WHIRLPOOL 048c0791018301910e9d792aa585e0820be159aae1fb491ca3db11b200de070b478bb6a7e6bdb3ad41d95385c8025a0a324a9bc7284427ab51bc23fb3ddfbebc
 EBUILD netbeans-platform-9999_p20151026.ebuild 9382 SHA256 58399d2332decdaf845b441bd2f5edd4ebfafe23baf8d1e883d3dd6658898df7 SHA512 bf86f6a0427ddf4a8b9951025e68bc38c11356ecda589a22db9a07fe5c2e3f61af9dc4a581199e5da5ae644456c1beacc52fc0240ceaeac6fe5cf58d4f80c1ee WHIRLPOOL 668a2dea33b20355fc08bf77f71c14f6a6a2257592a979c78acd248725e9fe4ef1895b79e6f064e0bafd28cce3efac29b55f8b89537b4d0e301ce3958c12951d
 EBUILD netbeans-platform-9999_p20151027.ebuild 9382 SHA256 8c2443f5d25ad614091e2911a36ad3b221482d197792655db6354fc7b0bde9be SHA512 55a3fa3393c23b133196964c4d0a727c91f5750936a6e930d0e6faa701f4bdebe752bb51c338d4436184e34058b698f669a58690884aa599c27b080de8ad547e WHIRLPOOL addecc44cf1a822dd69257310c5d79faf736b00ab1ce9cf1259066eca86111a1edd7999cacb08c9f1aad735511e5d7735c797445d48a912b2ee3d7ee1315b69e
+EBUILD netbeans-platform-9999_p20151028.ebuild 9382 SHA256 f87f502658a5d528d94e4446d76856bdcb094d98f582e4b8bf085dbdb22ca32d SHA512 9aa39060f601625f4f2049abea8cc117170f435f328387c58bdfa7e354a8709bfc1b134f8641db66cf6672a4ff58f14b4989021e7aad7b5ae49d1f2c33efc876 WHIRLPOOL 5c571afd19cecc9ac1d30ef952f79c65919b5f2062975fca3796c6cceab818661c8a5c8b5467551b56b19244d971335bdf2716535b0345ec32a9be0d17fda262
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 8d5ca7f..9ee5f60 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e68
 DIST netbeans-trunk-nightly-201510230002-src.zip 208659975 SHA256 2b00f5a10b9b57617f41c78adb256ae56e87a104fd88afeffdfe05ae46dec7bb SHA512 ab25742088a602ef44a1e3adec10fab612b100b7182efce801932156094103a2687da00df92a0fe7b6b0b5ca7ee825ee85b9cc84273449a6cffe686b0571c582 WHIRLPOOL e056f4cf9c2634a7ce09f466b722201d05096536683f9e0c744019e1e76cc53fb4b909e65b7d9fc16bf3ffaa6418b8c35521e2a6a6fcd043f615e8021a365107
 DIST netbeans-trunk-nightly-201510260002-src.zip 208660814 SHA256 0962715fc1997619fb908583701ad896b33aab643a82a1e55d20e508632e7e59 SHA512 c280647e7db0464844b0f81f0603c4d2583c9bf29516a4503632960ae682d7c008f67e12d14521095c97f16d285d2fefdc5017658028f3f3eadd1c3a5a7c4bc3 WHIRLPOOL be2a219d0fcc2a81a297eb1e560b97e8fc9daee48954dd548fe5eaa8cd70307b679adf0a3743c3f808c6dd8e9d6191b14b98c385d95457dafcf120fa6a8e90d4
 DIST netbeans-trunk-nightly-201510270002-src.zip 208660814 SHA256 1c083e6b903f72b10882f5285d8edb286f8d16de21c3b046f6e4190a008ff0f3 SHA512 b202224350745f28283261cc7756020f227304af8294e1abda6004393d8a23986d444fe36af31573f1ed4cb822fb2f1197d20e91d804500c4cf22edbc0c81b51 WHIRLPOOL e4a03fb4ae2733dba2026e3f60d4ebf6bde257d9c3fdcff6b613e6b9af7d305c04d57b0d9724a04cbf29eb0cf5448c90e6489c00e35eb23593875339e5627c11
+DIST netbeans-trunk-nightly-201510280002-src.zip 208661828 SHA256 3139169e12a7c0fc41665a462154b3ab94fe553945524b605328c502c576e669 SHA512 4bb4158f8bff478aad34a69a0e985564f4e87a1e0df5174ab18af6018ddf34a52cd3bd0a1179ad2bf1842725effafe25117d6c004177dc196473211c2695f89f WHIRLPOOL ca8db212894d1f4fc3aacebcf3e0ef730ac5d80aa32ba1c3cd3f545027fd64b44e786dbec28485bd6905b19ccabb676c145274167054ed320eaa5ece98fceb88
 EBUILD netbeans-profiler-8.0.2.ebuild 3402 SHA256 8021dea620d1bc26214ff0ec285f8061c24693dd28a62a97a48ac3223707e920 SHA512 2660390337a973256b1aac3a02b14e16782c230fa2714ae695213b0cabc0eb60621c6a1ae234f9e57259a19de22a87447f9a89ab846bd59bcedd2be313c35072 WHIRLPOOL 5d1053ded03143b2de05b64cfbe59b515cb786d60bfa65566be795567bfaf5feb88a2f8e7161a05da512fafd523f871778d5ddeb3c6b89fc95885096e379f65d
 EBUILD netbeans-profiler-8.1_rc2.ebuild 3427 SHA256 a142e156521746287b96e62a067e8a1fa3c6d1545a5528e2fd210e1b9c703906 SHA512 e2c864258c2dee2cf734ba2654c88c80c7a4f5a141a12370dae16c9a90609e0e84a0469ccab6925edb809e2bd192974372d5d4dcb69f3caeaf184a9c47fe0262 WHIRLPOOL 92fcf803213ad769fcf9df2bc8fc801423b222a727bf95bfabff28f38c8d1ef76c4a3193fae5f5a2b64d9a043e5bd5f42dd0cef165067ba94e8dc5fc9aec0312
 EBUILD netbeans-profiler-9999_p20151001.ebuild 3472 SHA256 1b18ebd1d0c854f9c64c65a1a28feaf75ed2a361ea47e30504efd1c1b31380fa SHA512 81ae8b10fcded109712ffbafb154be971dac86ce1085f54b94bf3cdd67e2b9af749fd0d4aa2810cf0cada6dfed42a704b92230251a3ace47068030ca6aea5dff WHIRLPOOL 37b00b190b836c33666ce47d6f36d8cf9b4f32e0e812fc4f3642f5d2eb154780019cac3228f88ecd83ed796c79d5628ce72a5f69a350241e7d5d7496ec6f0f5c
@@ -45,4 +46,5 @@ EBUILD netbeans-profiler-9999_p20151022.ebuild 3472 SHA256 f33a9e9eb1f2a2dce3285
 EBUILD netbeans-profiler-9999_p20151023.ebuild 3472 SHA256 db9fa42496eda2d8cc23427678c2598e2de86cd2680d730412d7c1ea07221bd3 SHA512 58fc9ae2ba039022662c6ab3b0c0a0d9ee8857c65be1195e1b2fd1f057f62ca048b138721ed2a226de18adcca40faede0ad88e492267ae8825a6e2042f5d1ebb WHIRLPOOL 980a53cd03c3c9ee83e842b796d18d240fb170fa301379cba179ef50ebcacde26ce820a714e2a19547ca37759df4425a2e5d1875632ec80b11e7b3f6a8553acc
 EBUILD netbeans-profiler-9999_p20151026.ebuild 3472 SHA256 f19ccfa91d2e459a5cc16da60e0019448e43a8b4bdfbda360aa724f50bc1532f SHA512 6070b5df97a4729daf337be2a09e6e857bf2c66f03713e98a6b5da22fc98fd85223376d8d2f7003f1ac738bfbd68ee3b6b11ad64169815585627a06c5a939bf2 WHIRLPOOL c8e43b4fc01d216cce320b8c474588b6bbe60b8a8b8ed53e29e0e8e8dc51d459251b4f60e5bc47a6c69e96f13de161bc211a2fc8ac0b478000170dba7c2e068f
 EBUILD netbeans-profiler-9999_p20151027.ebuild 3472 SHA256 2770caf8ba006381f59e9ed758beb6af2ffba102b55caff11bb2ee8f9bf744ac SHA512 fee0a425a89fa1e8d325167fc528c6f957f13080026fe2671947bf00a2f7ba43f0ba41f0b482cff1d1438b9381adbb0a3d70dec0cc8305b44a1a037b269ae27f WHIRLPOOL 447eccc0d6bc8da214de210cde7cb41db8ad8435ea3419607d7fa53fe718e0790b25f91927196f627821b557e89ff4ba51937904adfbe68a7e130d0f6955c5ef
+EBUILD netbeans-profiler-9999_p20151028.ebuild 3472 SHA256 a50ff2fb88bae82fe4d3758a784a036faf0e541cf1f723b0ce1f1dfb8b11164c SHA512 2d718beaedffd6676f4e93584ed622aacf58d256ca549636c41ea0f71434a073ea989a5fef318c0f6b4c89193d77b776846ac6368ec1425f7f4fd72b7dc51491 WHIRLPOOL 3ca7d4a7b08a8489dc33c62c1be13f8af78045fbff5070178b05542a43ce370576ff0ec7396e5338057e52b5ac06bc91df9ca747626844b6a11d8743ccd6636b
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index f942ea4..783391b 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e68
 DIST netbeans-trunk-nightly-201510230002-src.zip 208659975 SHA256 2b00f5a10b9b57617f41c78adb256ae56e87a104fd88afeffdfe05ae46dec7bb SHA512 ab25742088a602ef44a1e3adec10fab612b100b7182efce801932156094103a2687da00df92a0fe7b6b0b5ca7ee825ee85b9cc84273449a6cffe686b0571c582 WHIRLPOOL e056f4cf9c2634a7ce09f466b722201d05096536683f9e0c744019e1e76cc53fb4b909e65b7d9fc16bf3ffaa6418b8c35521e2a6a6fcd043f615e8021a365107
 DIST netbeans-trunk-nightly-201510260002-src.zip 208660814 SHA256 0962715fc1997619fb908583701ad896b33aab643a82a1e55d20e508632e7e59 SHA512 c280647e7db0464844b0f81f0603c4d2583c9bf29516a4503632960ae682d7c008f67e12d14521095c97f16d285d2fefdc5017658028f3f3eadd1c3a5a7c4bc3 WHIRLPOOL be2a219d0fcc2a81a297eb1e560b97e8fc9daee48954dd548fe5eaa8cd70307b679adf0a3743c3f808c6dd8e9d6191b14b98c385d95457dafcf120fa6a8e90d4
 DIST netbeans-trunk-nightly-201510270002-src.zip 208660814 SHA256 1c083e6b903f72b10882f5285d8edb286f8d16de21c3b046f6e4190a008ff0f3 SHA512 b202224350745f28283261cc7756020f227304af8294e1abda6004393d8a23986d444fe36af31573f1ed4cb822fb2f1197d20e91d804500c4cf22edbc0c81b51 WHIRLPOOL e4a03fb4ae2733dba2026e3f60d4ebf6bde257d9c3fdcff6b613e6b9af7d305c04d57b0d9724a04cbf29eb0cf5448c90e6489c00e35eb23593875339e5627c11
+DIST netbeans-trunk-nightly-201510280002-src.zip 208661828 SHA256 3139169e12a7c0fc41665a462154b3ab94fe553945524b605328c502c576e669 SHA512 4bb4158f8bff478aad34a69a0e985564f4e87a1e0df5174ab18af6018ddf34a52cd3bd0a1179ad2bf1842725effafe25117d6c004177dc196473211c2695f89f WHIRLPOOL ca8db212894d1f4fc3aacebcf3e0ef730ac5d80aa32ba1c3cd3f545027fd64b44e786dbec28485bd6905b19ccabb676c145274167054ed320eaa5ece98fceb88
 EBUILD netbeans-webcommon-8.0.2.ebuild 4723 SHA256 e2ba39cb6f22c990acf9a492eac5707f130382d56f9bc1e3636e82cbe4d61938 SHA512 61955d38f829b3ed54bc5cb9a71da07f05676a2bf7219fa8073aeee0f0e2d0e73f7aa6ec1636be39fb071d3d2b9de7ceb813a247a61961874f4cc78697d4e568 WHIRLPOOL 1a272650fc2394716a790b79cb85a9322929c7cc96ea4776cc639fb869c5b536140dbdc632b1a8aa9cb1fc8e740050125c2ebe9390de7a8f4207e88e24924206
 EBUILD netbeans-webcommon-8.1_rc2.ebuild 4946 SHA256 62c9421fd1f005d264d6c6f4eb6a0da4ba51fab3b6367b8128e543f24ef10242 SHA512 d38f9ca1f9a6671f7404a456544e2ea85f9261d6f011edcbee25c0ed829cfc751dd4a62a46db8081f23ad2bb82be1af2b0885d5863e6cd0f2be94073d2bc7547 WHIRLPOOL 6cc61860487ab3ed2b7db33ac73ce4df96dcbb739316f5b2cd0d0135be4ec9f5d4f3f8025dedf62a612b23dd7403d9fc9366848b8b8fe9311e8c2425099d1eab
 EBUILD netbeans-webcommon-9999_p20151001.ebuild 4991 SHA256 03578dcdaffc4652a45f2a97a08c8f283bb1e009f819b0f82d597077e74ba12e SHA512 03100ced6d732824efe800c39fc46c2d021bc1888f6c8b957130ce2adbf70b1abb45ab10f40c5329f3c097b85273177ed791a3740cd154b6d4681b4eacaed29a WHIRLPOOL 0696f5932e0b798bbd1c58c3e88994ed8c77cc32432228ddca59308c79bdc6908dfa3e2dc52a3b5e2a7a0aa028c8437848603f18459f2f66bcae2fcb312dc07a
@@ -54,4 +55,5 @@ EBUILD netbeans-webcommon-9999_p20151022.ebuild 4991 SHA256 b1a14475ee0025e7b750
 EBUILD netbeans-webcommon-9999_p20151023.ebuild 4991 SHA256 b48c23f57b3706974de2b3b0635988d439eada2c15918cae0d15bbda64e99c00 SHA512 b0acc8a0722cdf0bd3c03fab0cce434c5a8f14e015675d634c1b62aff7df1217a6f938f8c1be949adced7c567e85449cdede7cabf76b2ad94e7f8efd208f328e WHIRLPOOL 2e6ab968b57dfeac6c667dc8bf8a5c09e2b8754d901692bb038e2d09b737a54e640b4983a58ea6b7d74c0dfe2e7f35e6d9a88433a9c363090dc9d60d6d8ee7fb
 EBUILD netbeans-webcommon-9999_p20151026.ebuild 4991 SHA256 c55c1f544cc5c646e2c5bd35a70a764712992fe90e082835da68b61bbffdd2d6 SHA512 301c1ad51358ca0a0f099f3a22940f43ba5bdec45cd17a18286450548d9d6b3ff2dbf26730cfd53e6c0393fc8c681a0df62288468686522023efbae6086bfb50 WHIRLPOOL ffaf25740765ad7312520793c58709c63e0b9d942d24a32d4df5d907a79fcc7f6ac4b99854bf0b43a3bd6990d2ffb4f6163a359e5cf2f5202a7665f0cb96d831
 EBUILD netbeans-webcommon-9999_p20151027.ebuild 4991 SHA256 9abba6e6c31cc06d6ecf8485e1e26cd89476863ff5d936ae23ddbc4b4420fa3a SHA512 1142e84e45dbc1dbf17519d410a2f9e901bc0fa34596565098c4272c46b1dea421843c04443c6ec36f14c252574046e10b2b07671d3a2fdbdba17259956bfb9f WHIRLPOOL d0b89c9980a0471025e6efa6f8facf092cd68ecb0d0fcc710c8ef8d4080d7fc2c136892304f4e3c91a33e74c9676d53600ceaa76d8e325baa82c0347a80aa61e
+EBUILD netbeans-webcommon-9999_p20151028.ebuild 4991 SHA256 975c0efa69ab9f7d9744f57166cb69f81a16cd31c389b3e6273b40b29f4840be SHA512 cc0866c68c7aaf9d5a8d81b2c11611258bf2d5dc2e2db293898ef5954da15f81e6c2dfd642c9c828e7856255f95a20eb0ebb4208aa44158dd6d43a54f5d693b6 WHIRLPOOL 7907898ab713b8de1c620866d7e6c566753413718d5405ad192b55374e90b6fb07652d5bba8666dbf448668988f1f2dc4a7e12c3c7f15d5e452d4cb8c7cedcc7
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 444ad3e..280705f 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e68
 DIST netbeans-trunk-nightly-201510230002-src.zip 208659975 SHA256 2b00f5a10b9b57617f41c78adb256ae56e87a104fd88afeffdfe05ae46dec7bb SHA512 ab25742088a602ef44a1e3adec10fab612b100b7182efce801932156094103a2687da00df92a0fe7b6b0b5ca7ee825ee85b9cc84273449a6cffe686b0571c582 WHIRLPOOL e056f4cf9c2634a7ce09f466b722201d05096536683f9e0c744019e1e76cc53fb4b909e65b7d9fc16bf3ffaa6418b8c35521e2a6a6fcd043f615e8021a365107
 DIST netbeans-trunk-nightly-201510260002-src.zip 208660814 SHA256 0962715fc1997619fb908583701ad896b33aab643a82a1e55d20e508632e7e59 SHA512 c280647e7db0464844b0f81f0603c4d2583c9bf29516a4503632960ae682d7c008f67e12d14521095c97f16d285d2fefdc5017658028f3f3eadd1c3a5a7c4bc3 WHIRLPOOL be2a219d0fcc2a81a297eb1e560b97e8fc9daee48954dd548fe5eaa8cd70307b679adf0a3743c3f808c6dd8e9d6191b14b98c385d95457dafcf120fa6a8e90d4
 DIST netbeans-trunk-nightly-201510270002-src.zip 208660814 SHA256 1c083e6b903f72b10882f5285d8edb286f8d16de21c3b046f6e4190a008ff0f3 SHA512 b202224350745f28283261cc7756020f227304af8294e1abda6004393d8a23986d444fe36af31573f1ed4cb822fb2f1197d20e91d804500c4cf22edbc0c81b51 WHIRLPOOL e4a03fb4ae2733dba2026e3f60d4ebf6bde257d9c3fdcff6b613e6b9af7d305c04d57b0d9724a04cbf29eb0cf5448c90e6489c00e35eb23593875339e5627c11
+DIST netbeans-trunk-nightly-201510280002-src.zip 208661828 SHA256 3139169e12a7c0fc41665a462154b3ab94fe553945524b605328c502c576e669 SHA512 4bb4158f8bff478aad34a69a0e985564f4e87a1e0df5174ab18af6018ddf34a52cd3bd0a1179ad2bf1842725effafe25117d6c004177dc196473211c2695f89f WHIRLPOOL ca8db212894d1f4fc3aacebcf3e0ef730ac5d80aa32ba1c3cd3f545027fd64b44e786dbec28485bd6905b19ccabb676c145274167054ed320eaa5ece98fceb88
 EBUILD netbeans-websvccommon-8.0.2.ebuild 2651 SHA256 a195b307847c466dbb5f46eb04240358ce3c92cadeecb8fda1562304de46820f SHA512 933626bd2073f58e3508180c042e237b9e61ba6f3c992cf37ea43978ac2fc972d2dcc3ef0b5c390b3867296e197ed2605c43452c98e36acf0982e7338b6d1eb7 WHIRLPOOL c3db8f0b50116d0129f50778e1961166e76601d8c165e20e73d75c91b02c8a095067e0f13e18178d849dd29adcedaeee7d3e0e62f99be592d7ce159fd6af632e
 EBUILD netbeans-websvccommon-8.1_rc2.ebuild 2676 SHA256 9c17f1d8da5dc2d0f744317b9e5e29069ae4a51c6cb08ae5ab3a76d4739f96dd SHA512 a02ca061aedf144a6f7a5dc86371125d7abed807c0e47393de18d4164309d4d5733d869c4ee9577924af1949b95418518e6e8dd1f4bec2938507d6f68ab202b8 WHIRLPOOL 7e07a5d125295dae0cc1d38e162b8225e46e7d668fd8255e74d05a0739bc8204ffd9f192c5a9e043ee1e856057441a2cb7424f2f9b512e659740e27c5ef532a7
 EBUILD netbeans-websvccommon-9999_p20151001.ebuild 2721 SHA256 d9ac82f799c5e4846187b6eafc244d07065c2dc90ed1d291a75878f13b389dc8 SHA512 c6306a45f10908f3d1858ac840ae9a8b6f68928a0a048213915772516c7a321061a48bf6dbea85e51cc03f91082aa6c381a339356df0d8325fe1d1ece56e5294 WHIRLPOOL 5f0921b9e5e07014ca30bfb5acb988d6c44517436fb8e16977a446eccd203605e7caaa79fe9484caffcebe512a4ecac1c261b238324a0c2404829cc48e94bb97
@@ -45,4 +46,5 @@ EBUILD netbeans-websvccommon-9999_p20151022.ebuild 2721 SHA256 81a6b38dc99d0293d
 EBUILD netbeans-websvccommon-9999_p20151023.ebuild 2721 SHA256 5f27ee5471e117854cb9da98e6ef3f06e6d4712307d22cd3d73b8298ea326ef7 SHA512 4df771491151058ee9f0791e4dc7d2eef21991cf021745b6c66d42ee05ffbe289db576c6237770331fcb9e9a565f119dc7027b1956f738cef3b61407d47d626c WHIRLPOOL 3e4e1ead6d4949ec3f8e7fbbd585a5d7c35331a10f6ba513d7707e27379fd9b576909df6e2f927c6f4c539e9ba979d4ac041406e1278106fa3e36f1a03fdbe2f
 EBUILD netbeans-websvccommon-9999_p20151026.ebuild 2721 SHA256 34adc842d1763a2769d67bd269a2034908a3a0dd22d8c86c0a12b3527ea051a2 SHA512 75d9679743a4024ec8e92214427a3064973ceeaf5e886b1c97367f5ff9366d28e0551629373c35475783e5ce8951571427d49289e9fdcae5202c23bb93fbc32a WHIRLPOOL da46791b1086a4f90459a215a247fddbab717d627249f379291ebe9660922e52817f0bb8a966167fff14dc6fd3aba31b8acf5578a7b40a13ab6608ecb9cf30ff
 EBUILD netbeans-websvccommon-9999_p20151027.ebuild 2721 SHA256 3c073c229d2c8f888f304cb5b069d7ce4fc791938e4a106c7b4776e232ba8cbf SHA512 a078e3f9d56ee37eaa182922d1e856593275fd33e16b206ae564ddde87f0109e75d7e54474b943c2d8c8cd2614312a7e9f5d300835e7e587175680fa44041c0c WHIRLPOOL 866ee049e487aba8104a2e649304b6ddd05f37408148df3f099dcb23224e9927d122fbf406dd7a2fe104c2d04c8cccd449237efe20b8805cb1f56763d3742e23
+EBUILD netbeans-websvccommon-9999_p20151028.ebuild 2721 SHA256 3afa64b0dd57dda35e8dff5f755cf39b21616de021afdb455d312bb58d8ab2a7 SHA512 1319cb92f26487e4093f16fc94c840ae61c094a5d6a94490d73c6074ada20377b6542b1ba72e6ffa0e07c4eee23dc49e6c05a6d732e610ff7e8f914251971fc4 WHIRLPOOL 30fbd18d50111b05a3909a9ef5963d4d538a54c7c1143df34f726d1b88d31e5b062080be9dea97b563bcad2c1861d7855b65946678143bf4dc7afc67c3d68028
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index d27e0c1..c3077f0 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e68
 DIST netbeans-trunk-nightly-201510230002-src.zip 208659975 SHA256 2b00f5a10b9b57617f41c78adb256ae56e87a104fd88afeffdfe05ae46dec7bb SHA512 ab25742088a602ef44a1e3adec10fab612b100b7182efce801932156094103a2687da00df92a0fe7b6b0b5ca7ee825ee85b9cc84273449a6cffe686b0571c582 WHIRLPOOL e056f4cf9c2634a7ce09f466b722201d05096536683f9e0c744019e1e76cc53fb4b909e65b7d9fc16bf3ffaa6418b8c35521e2a6a6fcd043f615e8021a365107
 DIST netbeans-trunk-nightly-201510260002-src.zip 208660814 SHA256 0962715fc1997619fb908583701ad896b33aab643a82a1e55d20e508632e7e59 SHA512 c280647e7db0464844b0f81f0603c4d2583c9bf29516a4503632960ae682d7c008f67e12d14521095c97f16d285d2fefdc5017658028f3f3eadd1c3a5a7c4bc3 WHIRLPOOL be2a219d0fcc2a81a297eb1e560b97e8fc9daee48954dd548fe5eaa8cd70307b679adf0a3743c3f808c6dd8e9d6191b14b98c385d95457dafcf120fa6a8e90d4
 DIST netbeans-trunk-nightly-201510270002-src.zip 208660814 SHA256 1c083e6b903f72b10882f5285d8edb286f8d16de21c3b046f6e4190a008ff0f3 SHA512 b202224350745f28283261cc7756020f227304af8294e1abda6004393d8a23986d444fe36af31573f1ed4cb822fb2f1197d20e91d804500c4cf22edbc0c81b51 WHIRLPOOL e4a03fb4ae2733dba2026e3f60d4ebf6bde257d9c3fdcff6b613e6b9af7d305c04d57b0d9724a04cbf29eb0cf5448c90e6489c00e35eb23593875339e5627c11
+DIST netbeans-trunk-nightly-201510280002-src.zip 208661828 SHA256 3139169e12a7c0fc41665a462154b3ab94fe553945524b605328c502c576e669 SHA512 4bb4158f8bff478aad34a69a0e985564f4e87a1e0df5174ab18af6018ddf34a52cd3bd0a1179ad2bf1842725effafe25117d6c004177dc196473211c2695f89f WHIRLPOOL ca8db212894d1f4fc3aacebcf3e0ef730ac5d80aa32ba1c3cd3f545027fd64b44e786dbec28485bd6905b19ccabb676c145274167054ed320eaa5ece98fceb88
 EBUILD netbeans-8.0.2.ebuild 7167 SHA256 80e31382a0ceb680c2a055dc5c78c1dce8edf32c50bbae6a1c14a2c568492519 SHA512 0ab466ca247ec953896ef0ab3b01b43ffea3a9f37e9bcdacecfc0476226d45cef35e4ddf27f2b85628d9512ed304e6cc6cfe963a5e547217d08cad400eefc4b9 WHIRLPOOL d09668e669f4f8d7987ab02cf26104fc6e54ba29b8b497fe0013cc8816a2d7560c99e6e1b02db77ead872d5240b84c09e3fabbc3465587d1d1ca7d6fcae114c1
 EBUILD netbeans-8.1_rc2.ebuild 6892 SHA256 aea23cb4a7170da766bbc225c6b58e671a5ab08e095044ebdf36b195d86610fa SHA512 77a9c3d1c82648a0a5b9b335f577132013724ac37e29f99bb732653321e861f5628c9a8689d4f9196f3ebae1cc4cad569dc3b1a7f4c7a127f363ca82099439f7 WHIRLPOOL 023da0938e5f8b74062bbcabb1b0e659d093f5860f8e82322339546299a154d7b57c78f1bb4f28403a6a5ca45d0bf1f1dcf1fa2669423cba465a68ab6c08008c
 EBUILD netbeans-9999_p20151001.ebuild 7210 SHA256 def45859122eef44a348c1c45f165a664bf7490d2b86f0a3eedb856f59aae4d2 SHA512 5bf3d55dd64c75d567bbce039c729d924964f3ea8daf2b39bbd370f2c1f830bf8ce571281caa22654a43a39dc2f909736bece02b0c58ad020d3fee7d650fdd80 WHIRLPOOL 4c134a94ecb6dd5a35944ff0108135f4e0795bbb792bb6617b29db3a3348a41c001e28b2321bd0b69207e10e69942e18826213fce7f50cd0d526ae8cdf1ba8fa
@@ -48,4 +49,5 @@ EBUILD netbeans-9999_p20151022.ebuild 7210 SHA256 cbf3546da7aa887c4d4a63d35c24bd
 EBUILD netbeans-9999_p20151023.ebuild 7210 SHA256 c23453db8a4b75b7b4cc5be8f686a53e473adb941c2956fd890904de9ddcc703 SHA512 6e39e33bccae36f191e9b00d04712bcf4dbb530da1535ce43eb62ad3094271248777396145ab002e30fa6516aba279943f4e4598a06e6699af98d42284154724 WHIRLPOOL 0ce5bbf592b6104252efd0ab405abcb86c27b7aacf3fad52f974a55f811ddce9285994bf53f6e10bbf49dc879546d739a6b0175415f004cadf3316f2a6f08713
 EBUILD netbeans-9999_p20151026.ebuild 7210 SHA256 ea8a28c671234fe219d6ef28de95f48f22cf51c068b0c17abc639da0896b4928 SHA512 c8169d6bace1b1c2a3942608b8e9012b8c3715e432144e8e888830ad86735126ac789d3eb1f891777df3970765b0f0be89c76b9aeaf21a07ded008b4f0e82220 WHIRLPOOL a04d37f265de92ca6c4390f7133e5dff4bd3c72fda5d86b1ea39f8bdb78f31bfa932f37801421dae7dd5f7f7e5ca33dfe372b2ca2bf77501a73cf146e82e55bc
 EBUILD netbeans-9999_p20151027.ebuild 7210 SHA256 5509a3e6d58523380b68a8ab94d187acf1ff434123bdded6886439768173490b SHA512 14909b982c1aa7211481b4cda00145501f1836733eccd53696c14b118dc7067402e33b3fb2ccabc26cfd81fc0523f09feb20f0db1c57fd62f6527740bfa1da5b WHIRLPOOL 2417a2c0593b1a6c1b8b5cf1818b1b105ca47fb80bfbc88092b482635c5c9c8ff10cbb4f20294f2eb071f5d5bba0eb0661696362e8230d02b0e5bf0b5f318900
+EBUILD netbeans-9999_p20151028.ebuild 7210 SHA256 b1988a8137b62bd9e0c9247eb736f6bb46be7c57f65f7f4efff15347097c488f SHA512 7814c7dc87112de03eb6423ec290b9cb8a21aecadd7d3a69136131ff0d30a02884cf0241b1ca4068ea34146eca062a1e6dc7426d3f35115d661e4205126b50e9 WHIRLPOOL f0a2e7681257970d60ab38b57751109cd8ddab37f3e6c2e59c55b62878bb0fa7953c7e1a116aad94c9915c6909b08ff2c4eff5123ed3947dba028210b8b66a99
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

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