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

[Miroslav Šulc]

commit:     5bd2d0939a11f2590c25931b05420bcc416194ac
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  3 20:50:43 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Oct  3 20:50:43 2015 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=5bd2d093

netbeans: version bump

Package-Manager: portage-2.2.22

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index f458069..9aaa8e3 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -19,6 +19,7 @@ DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c2
 DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
 DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
+DIST netbeans-trunk-nightly-201510030002-src.zip 208672397 SHA256 56d684334f97609098798fc2e9d2bb56073a61dcd7c91be398476163b39b7dda SHA512 18c9b136a3f2bdca433dcd2cf7d0cdba5a6428027e3bd884791278b55af4955058674eeba8c920739896d80b88fc5eb94b67695ac7b81e55878328eec49ae516 WHIRLPOOL 75af86ffcdb1318b46995d168b01d979e8f40f3351ec875dfa8732c7ace713bd20ee38559ea2f5d2558088573831d545956e4efd228eaf697d17a2b14f74c3f0
 EBUILD netbeans-apisupport-8.0.2.ebuild 3314 SHA256 b68fe791f275fe4fcc8b00888688949b8927cb39db2cf9ad7860017c6d20adee SHA512 35c4bbcd34ec0eaef8a2de86c13333d2bf092db61af48558c3e173bb17dbf8fcd15001307bd7c498f4ccdbaa4277e1ee42ff0909af6170039165b547f646c383 WHIRLPOOL 206fe8d5f64e76827d3eb958a629ba087e8a16c2797752f5d9e62dff4166653677587a81be19e0a2c6adcf49292255d532e1f542c02550b1cf6ffd51467bde3c
 EBUILD netbeans-apisupport-9999_p20150901.ebuild 3384 SHA256 187e107dda837afe5fdc0b321a4bba2e5fc6f18dff1eb359c64c122ad04b9e86 SHA512 ea07d62ef5f4ee8d68f17f69fb3b10924e37ff38a6c15147f432232f354d3475f4fc768a535503cd12da6a3d6b2ad303abec714e362506bd723ff23cbef4b36c WHIRLPOOL 9fc6fb1c7f4bbbf79d15eef81c9c440c3a98a2ed8ff4f04e73ba4a0e36b9c54cad45e50ea89e04e5a8b175a3d9d56c9f3e3af47fbe9dd21b9d8c367bb3623ea2
 EBUILD netbeans-apisupport-9999_p20150903.ebuild 3384 SHA256 13a7a16b6a12ed08e9ad7234bec1ad5e5fe209e4f13e4587bfcf4d28a8869b22 SHA512 cbd2dbb4d8c01b1f6c70ca8a7835a58c2ecf94a0ec084ef2b2c73b675734ec61497925791bc2045fe7b36d372676309057a520a669828d604d93dd279306e9db WHIRLPOOL 08fc78eac704d29500bec5772b64ed2b159130e3414c9f7beeddb786ad3233afa0b74086d7de80d66ca335af56b22eafe254513a847839cc1ecf7584cbad832d
@@ -38,4 +39,5 @@ EBUILD netbeans-apisupport-9999_p20150925.ebuild 3384 SHA256 aa5fa670a547df95372
 EBUILD netbeans-apisupport-9999_p20150929.ebuild 3384 SHA256 cff9f5c21fc857af535175ae3d3bfd7f5d444a11d8ca84cafcd5808433f4426c SHA512 4aa8b0f28b022e9a03afd15a6eed0f28c8ad3e716e76de0dfabb8cfde3bd7f215fd026406dbf0821145abda79615327ff4c959bf01c6e85018b1968f0a8c1daf WHIRLPOOL 4614d7bd4d8ddcc358794b6761e7882c677136e5d4f4910c8ab8dc32f0bb4ec240e0ab16bc556c48ad85d9187bac92c37980ca1983d3f7b43046c59b019c3905
 EBUILD netbeans-apisupport-9999_p20151001.ebuild 3384 SHA256 9b0a84fced88d25678a0fda5fd8bf40be0b9c7a8dccc17f70087ad49c187979f SHA512 696c46f929a272dfdebb76a2b969819106b60dd416df1cf0f040fcdd422b47d99eb55c6d7ad4d9c6a18b7ed5aeb87a4b5ff2cc7574be21c8fc20574b4ce3d514 WHIRLPOOL 1a5108cff46424afc2cbceddf570482bf8912e8565444b5e76e886f179e04bcec29b64844e0b5576812c6390a80f6e73c942acee0130075da483152b254d1c90
 EBUILD netbeans-apisupport-9999_p20151002.ebuild 3384 SHA256 6f24772ec5ccf5cecd52bf4588d161adea100ddf121627b8a111ec3d203bc92b SHA512 fdbd10eb251e5faea44dce3a785de04af6a755f5b6a43e355330f7bfe8880b0ff079f1a30eccb490ada2b5c5aee93caa6204caed5dd0d998deaa1e5659423ecc WHIRLPOOL a9b99f47e816623e00c60a2e3f7514032703df6072a5df5fb127ea0c146866524e216f4e83b925c3ef93a732f62b6a96105ec78c337061f8f78a7c49b49edaaf
+EBUILD netbeans-apisupport-9999_p20151003.ebuild 3384 SHA256 ea74ccdcc63b59faf4badf83bbf5e5273b37eb3fb639f1fba7fa8b8df72e5293 SHA512 5d46bcbeed549a2099a951f78067953c9947810048702e5baf40a13d1cbb156068a263d92be798aa0e80f2c97a51144677c218f8777be1994dd3d46d11ce5d3e WHIRLPOOL 09e66faccd3b6d7bd066aeabc6c38eb843ad107128dbf451579a4c6f1d0ff94c846645af3ce6c14cab9448fdcb96a6dcf3ce386e8331ce2b650361b3e5f99d19
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20151003.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20151003.ebuild
new file mode 100644
index 0000000..2f2bcf0
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20151003.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-03_00-02-28/zip/netbeans-trunk-nightly-201510030002-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 5dfe9b9..2013cf3 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -42,6 +42,7 @@ DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c2
 DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
 DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
+DIST netbeans-trunk-nightly-201510030002-src.zip 208672397 SHA256 56d684334f97609098798fc2e9d2bb56073a61dcd7c91be398476163b39b7dda SHA512 18c9b136a3f2bdca433dcd2cf7d0cdba5a6428027e3bd884791278b55af4955058674eeba8c920739896d80b88fc5eb94b67695ac7b81e55878328eec49ae516 WHIRLPOOL 75af86ffcdb1318b46995d168b01d979e8f40f3351ec875dfa8732c7ace713bd20ee38559ea2f5d2558088573831d545956e4efd228eaf697d17a2b14f74c3f0
 EBUILD netbeans-cnd-8.0.2.ebuild 4510 SHA256 0a9a4e58e28f395b5bcb017016b6ddb1b77afe393d0e5bd81cc05e3a32076c71 SHA512 2b1fedfe292fa140920fd11829e77127f9535e08b8307886accfa37e6d11195a1204e6b71b2640937da0711c3ce0bbf80c0eaa3c248a64fd61b6a3d99d5de14e WHIRLPOOL 10b1518360ade5d6f1f27c79a10f630b94a2ec5062e18df11f9828d4b374e6cbdea0b9f770e01c117ca90fa194dff9bd3be6a468075c2d35167fb78a7bb32794
 EBUILD netbeans-cnd-9999_p20150901.ebuild 4790 SHA256 0be3c11a9af46d2d8aba83d0e15c09b935bd598464f43d5030887464d3f96f9b SHA512 f3b2e7de31f3434d6390bec0382fd6d77d2075470543cb9052572c91483ccfd026822a5db6f10932cb86b5974a0d2c5f390551873dac6cbd1f463b62560ab196 WHIRLPOOL f158e99c020c4e0f67c3ceec7a59d5f2cc455c52db4a9301bce821a123b7c8f3e570467aabe9281ac440d067dac36525b864dabd0c06b88ad86a2464d4e5140a
 EBUILD netbeans-cnd-9999_p20150903.ebuild 4790 SHA256 57a5694dab810fdf15990d575c3270fb7338837550ba4598e21703e4d904e85c SHA512 b5073782475520ba9126954d5341c0977a73f4b838ea4484835558b821baab49cbb52e3e07705f611e879b3eefedccb1e9a0817bbf9b98d80d17018e5888ad1d WHIRLPOOL 408c5a25c4877204b5e3a9ae8c4b7b23464a68527a8bd37e37df89a5fddf71fd23cc4e80610981dd72325d9289cfe2c5b3172986e3aff240be9911354b7d8946
@@ -61,4 +62,5 @@ EBUILD netbeans-cnd-9999_p20150925.ebuild 4790 SHA256 0442eb9d63835aa3ace4ec5fac
 EBUILD netbeans-cnd-9999_p20150929.ebuild 4790 SHA256 87d109d9568049b9a036f1b6c90f6bfb18cd7d2753719f1eabe78f841f66b26e SHA512 1974287975c2949e59fac98769fba4e605516e29dab8dfe12a9b34501100a0703901adf158ce1898e266d084228158e614e1c9550f089f5ae1e64e75f4e4f526 WHIRLPOOL 25b27509f3246e85c43a3f92e500d04e4b8cdb393759c379ba2cf78c9752d4f3acb60fde27f02eeb1b0a0196c38ef0946310b3744d0ae59ffcd3f7260fa117c5
 EBUILD netbeans-cnd-9999_p20151001.ebuild 4790 SHA256 b699f830d6365a79195b7b411d5b764aeb1c67c243c633fc8ec9076ccecd387a SHA512 0488b2027a00ece43bbda93220c366926d4a96a87c380db3157495c45e0ef1c6da70725882d7c449b555a1eb641f066b8868100ef112da0ad66ad80ec79fce0b WHIRLPOOL c13484878e87d25a9ca8ce0556b464778c47528b345971101b870291787b2b2835e5ba06cbe31e29fbcb2964eed15a5259041c344cc96f6546d78f4f51365f56
 EBUILD netbeans-cnd-9999_p20151002.ebuild 4790 SHA256 b594fe449b56ca1f3ea527c8825fca3180ede5c6e25d039af2cfeeb1243f6116 SHA512 f1b447f992183aad7180ef5630ca225d2b93b5c874c9e282d6565ca89129c43372f4535557cfcb81a47c27815997c6e051df224a8e9527d67c1ccb588e8e7129 WHIRLPOOL cc7c3c4d969c9a970ce0d1b3ff758fb934655e50326d32f11ed825fca008d089cede1201172872508bbda377e6266f5572e9e1e0199abb886093d566fbc04e5b
+EBUILD netbeans-cnd-9999_p20151003.ebuild 4790 SHA256 94fffae05a79f51102df6f08dd5cc640e811d6cf613c7dc7fb88ebe35600faa9 SHA512 d103617e2a0d9583e304cfda6a2ac9ab1d667f8c7b120f7b0b8d117899ba1e9b9fe02940088997a7d908d5650a2e20098a33ca45a0a8caf8125450d3d11dcd09 WHIRLPOOL b1bea6f6f91613239e41b256c5c1fad1d4162c64580d8729e395a42c03f400bec63f1150551b853798ca17dd2b961b85b6cc4dfbf6e126f8b8d8b77896b00347
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20151003.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20151003.ebuild
new file mode 100644
index 0000000..3b19313
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20151003.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-03_00-02-28/zip/netbeans-trunk-nightly-201510030002-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/36E4640519B7F44D81F3DAE57DE7B4407C09A382-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}"/36E4640519B7F44D81F3DAE57DE7B4407C09A382-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 345608b..4dfcc92 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -21,6 +21,7 @@ DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c2
 DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
 DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
+DIST netbeans-trunk-nightly-201510030002-src.zip 208672397 SHA256 56d684334f97609098798fc2e9d2bb56073a61dcd7c91be398476163b39b7dda SHA512 18c9b136a3f2bdca433dcd2cf7d0cdba5a6428027e3bd884791278b55af4955058674eeba8c920739896d80b88fc5eb94b67695ac7b81e55878328eec49ae516 WHIRLPOOL 75af86ffcdb1318b46995d168b01d979e8f40f3351ec875dfa8732c7ace713bd20ee38559ea2f5d2558088573831d545956e4efd228eaf697d17a2b14f74c3f0
 EBUILD netbeans-dlight-8.0.2.ebuild 2898 SHA256 08402481b573b90396431be03bda45904b2dd29f0086e09a111fe362e310c3f7 SHA512 3f6d6c9ea0043382562fbe47ad16e3273032407a74cb44ec7ff26736f96483835af4be8674361e910912a550b9fe592cc5a28c2b93b6b993076553195c35eac5 WHIRLPOOL 9d8706ccbc0d97b0f5d64ebf22c36316b08d8fbccd57408119ca5f5faef08c7f82677bf67488ff611eabeaa730e4c9a730c50966d94d738cfe79330ac147863d
 EBUILD netbeans-dlight-9999_p20150901.ebuild 2968 SHA256 f24ed1a628b18c080f9e06c1b488b101ebc2cf6cf0aa44c5b86f168fe52f912a SHA512 0fa494a731edd4f27e36d537e0a57ab868b8a04db394777b191d8352c452f75d06900ec23b0e25e4d08b18cfe9a8d9245890b01e24e510e52b2b218ebb91d2e8 WHIRLPOOL 439d07e76a1cb3967a1ef46540bfde542e11ffd7e4fbeb6fde5f198fa5f203703b6df26c4ba764d11d6299849fc8d4c5b7eb9f2133de02ccc586deee4cc34c34
 EBUILD netbeans-dlight-9999_p20150903.ebuild 2968 SHA256 e798582769fa118385293ad20cfcdeb51a4e10be437941396b37a71faf72bf3a SHA512 3080e3c87c9668b8c1646a61f2106ae937e1b8c9049e9d08aa933458b8e4dc4721c1caf84e12c37c397c4982cecfd53e39f2516c05617a59905182aa4e4190c1 WHIRLPOOL 5ea9f447ee4cd7a398db727ce0e3dd2944c58979d8af5f5a9c686732fd6dabf2403c2357c2e5d4d088ee36655b403dc6d574e2676d032e639b9cab3faf00bf70
@@ -40,4 +41,5 @@ EBUILD netbeans-dlight-9999_p20150925.ebuild 2968 SHA256 aad2e8a17a258ef0a163cb5
 EBUILD netbeans-dlight-9999_p20150929.ebuild 2968 SHA256 2faba25efcb7eaf80d0fda7d0b40dde2eba9cb606660a7349c07ac02a82f98bd SHA512 d795e0e6cc884530f4f7b4e93d945535e0dc6c5635793a48f0d9999b2a189fda056e9348876e41d39321b8e6d86d15a1eb0e138b5c8f6d00b8a6eed27468aaf0 WHIRLPOOL ba3292c9c38a767525608e6022d3372d1a087fc40b60b1e1724ea39c125ebac09b3489d06b3860c5d81707c2b015637975ed6064fb635881ace0f032e9046672
 EBUILD netbeans-dlight-9999_p20151001.ebuild 2968 SHA256 2662d9bd51c05b8c97c5be11ffaa9afd8e290d6be1f9c8e766267d1a945359d3 SHA512 f30c71dab1c3cc99c31885997c2e3a85912e1b34ce2dcd46fdcee3a7f76b8a50f50d3bac170d7055f268969bb13cfd5ad3564ff0df57cab88ab2c5f92b712edd WHIRLPOOL 44e5db72ef794b2fc8a26d1c1e3558d7420756a907fc2ff599922a36c65bf2c2de5423a328c7131ecf1637ef27965179aca5983359b7c678d8e50d8ce5a68981
 EBUILD netbeans-dlight-9999_p20151002.ebuild 2968 SHA256 bb30a82d5a88b90855c74166981189f2e78b9a8421f730bb4c4d67362ca9ad67 SHA512 33ed0667c9696c2c57ff4884afd50876e2990a790e843ef10ca6d999dace666adb02376c5f1b9e3089d0ffa5bcf9f0669cddee584a2540a92406ca24d6487fe4 WHIRLPOOL d2846314b3702b53e947899006d3e5b19f98d405ab622e4253b6f7e931957ac5529a00362c1ea15905f95bdacd3359a3bd993102cf5fbabaa93a292198cecda8
+EBUILD netbeans-dlight-9999_p20151003.ebuild 2968 SHA256 d361d4a4cafee000ffce4b45b1d6a3c620e03920fb8f3dc07dc5f4ac41893816 SHA512 5fa9eee3e893461d55018fd42e134d499bce6bc49883c858ceaad02601a5bca15aa9f8bd6572bd1dadc63a50297e01786e093b08276ba8881b1e263db8243175 WHIRLPOOL 7cdb3fe2fd8d96110b58745d595687bfb44867323e0622039c0144734ae0ff1a72092ff2711c87aedf1999784d4cc5d1f53ca284b6122dca0127ef9a2f982a5d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20151003.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20151003.ebuild
new file mode 100644
index 0000000..21f6471
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20151003.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-03_00-02-28/zip/netbeans-trunk-nightly-201510030002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/6396ED8427E5068B5331C0A3A03A2235135D6D75-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}"/6396ED8427E5068B5331C0A3A03A2235135D6D75-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 02dba35..95ab195 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -51,6 +51,7 @@ DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c2
 DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
 DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
+DIST netbeans-trunk-nightly-201510030002-src.zip 208672397 SHA256 56d684334f97609098798fc2e9d2bb56073a61dcd7c91be398476163b39b7dda SHA512 18c9b136a3f2bdca433dcd2cf7d0cdba5a6428027e3bd884791278b55af4955058674eeba8c920739896d80b88fc5eb94b67695ac7b81e55878328eec49ae516 WHIRLPOOL 75af86ffcdb1318b46995d168b01d979e8f40f3351ec875dfa8732c7ace713bd20ee38559ea2f5d2558088573831d545956e4efd228eaf697d17a2b14f74c3f0
 EBUILD netbeans-enterprise-8.0.2.ebuild 15071 SHA256 84621e3bb946cfa254bb70ca3c3f61202882a7e6d631769ad2f0f4639b0de875 SHA512 6ad38e840764661e6bc5b89b5925e9665871009ba0b640c0a78c555ec104214dbee1200a93cb48e655bc620e07bb6e4d8932b23a00fe458f8a5e9e5c3200d79d WHIRLPOOL b2c2bbf2ff72f8cd9b4cdbe039fdbf7cd074b0fdc20f634aa0b6f79f5c639be358c61fab30854a6e3ab9714a285d9461ac4e39e94e10c14c5068422d6c873c56
 EBUILD netbeans-enterprise-9999_p20150901.ebuild 15931 SHA256 44c06fa71678bc9434d41c8f580375f0e56c4756da1ad14de658574360a4ca8a SHA512 0e0800cd6259f4e4524d328a593ad4d1a40cb0b129ef53088403c0fe90b732f15eb897686485f629501cdaf4efbbaa69c60ce648e655a016abf4d24588a9191a WHIRLPOOL ee6d2a407a2d6e124f21912a7a0b1c6dfc8155cf228f9f451554c1c40ab63d497070d0264360aded0de23e7c03a52825593fde03dc4ed092b65789cbe083d47a
 EBUILD netbeans-enterprise-9999_p20150903.ebuild 15931 SHA256 2d15c63f7b1c6b590dfbda9cc26aa44ee36c043a695ad4ae06bac98b17f9f73a SHA512 6ca976ec3cb4b96d4d9794abaaadaa7e42dc0d4537e02a6cd0a65b0df7c2789a5eeeaabdb33b42df134271d4f8f0b5d54ddbeffb18a704e36c6e8a25f6d5245b WHIRLPOOL b0927d3c4aedd46698cba83fb07e35d5d0796ec9a50b65cc828534da1c45ab9b75701c58003583af3f999a2d4fa69a6b4a62abc3225d7591444dfca0353e3bf8
@@ -70,4 +71,5 @@ EBUILD netbeans-enterprise-9999_p20150925.ebuild 15931 SHA256 49b14b170a1eacc6ec
 EBUILD netbeans-enterprise-9999_p20150929.ebuild 15931 SHA256 c4832834e7177dd02b4c6ea73155b86c4183b0be3b6bf31f85b75fbcb85333a9 SHA512 3aa244ed6c0df566530ad591aa84776bb011231b94e7c52279e10e717ebee18245bb798b57971ca555054b4bcd7308ba34af06b59d756951bcb711b65472ac29 WHIRLPOOL 4708419729c5f94ef86a10300c1c5eae37959e890fb1f7e3443c67bb41663b07343ad07fde358314aad0e3ce0be06ae1586d09386481f5cd574918fb7f8323dc
 EBUILD netbeans-enterprise-9999_p20151001.ebuild 15931 SHA256 0149922936b3fbf9c74723ede45a126dd4715025589ea8cb8b90ecb12499b16a SHA512 85c65a25883f3161a04524139128f726d2ba672ea17eca95541be54c1a5ce779003de558cbb22df4935b498500a675661a96b2cd24caa0b85906aa1857b23023 WHIRLPOOL 24b427e9eb51d20f7c06dbdfb31476bf9a01b0a9934ad177c7175510cb61d7d5e847a96211b268cd4cca26221b9a5c64e64902258388b39512e3391003753013
 EBUILD netbeans-enterprise-9999_p20151002.ebuild 15931 SHA256 4d8b137e7f98d1360c3dc67bbdbafb9ecc5f56cacd291f2ee8ec93571e127700 SHA512 b5cc45431d637b59204c6fe4dc92bc37f7a349e79e53afcab1f11551a315666192be86eae9b92023e4f5ef65bc40b815f63306becf04f56a71b2a24d31f92f1d WHIRLPOOL 7a8d0002b9783cbd3ded70084d1e0ade55f5db6adb9815c7a2f9f56db2819a20d4f9f539e7742e029c04994fa11ab7d597e9cb3b3e60506e6b715adea584e579
+EBUILD netbeans-enterprise-9999_p20151003.ebuild 15931 SHA256 356f1942ef0aabc2d057c85c3820224f8920ab55d4db9097653a51e2ce8dfe4d SHA512 17c689ed512039239724e6bcebf6b0a859e97ce85e86dc0d18187269b6bec218ddb28151346a36c7837d9197a11d7b63c953eb7c44c81c3ed175ea5c625bd5c2 WHIRLPOOL a82015685d9b9b35ab90c3f4f3f3656c60b635c83a5fecb7275fcfa1f4eec5a87ee71d4da490186f889c5899f3194b8c739cec3c204cc4b8f61468b541bc601f
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151003.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151003.ebuild
new file mode 100644
index 0000000..07f2e39
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151003.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-03_00-02-28/zip/netbeans-trunk-nightly-201510030002-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 d31f8ba..4b4d5a0 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -19,6 +19,7 @@ DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c2
 DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
 DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
+DIST netbeans-trunk-nightly-201510030002-src.zip 208672397 SHA256 56d684334f97609098798fc2e9d2bb56073a61dcd7c91be398476163b39b7dda SHA512 18c9b136a3f2bdca433dcd2cf7d0cdba5a6428027e3bd884791278b55af4955058674eeba8c920739896d80b88fc5eb94b67695ac7b81e55878328eec49ae516 WHIRLPOOL 75af86ffcdb1318b46995d168b01d979e8f40f3351ec875dfa8732c7ace713bd20ee38559ea2f5d2558088573831d545956e4efd228eaf697d17a2b14f74c3f0
 EBUILD netbeans-ergonomics-8.0.2.ebuild 2843 SHA256 f9262f6ee7f2aed1fab9bf4cf756f565272e9894afa50b349735e39961e7acc3 SHA512 f158c27640541f7aef31da050e0811c07a251ae4797cc663b95a074a47eaf9d6bb7a9aa11ba38ea55e75c185f7dba74629ba6716a819e8ad68eb3db9ada71451 WHIRLPOOL 4fe9634fb673fb05dbba25996efc3a212ef3bb23ab6e7c732cb75de076feb930735e3901806fd9c801abc7ee8aa8eb800718065325d415371255a886474061d4
 EBUILD netbeans-ergonomics-9999_p20150901.ebuild 2913 SHA256 5c3c619373ecaa4361d21b0686e634abd8e4f94f1d73aedbdc57307d50c64ba3 SHA512 d83f039014436f6e26b1f6fab2391ad2ecc33c184847574ea9c646a1b028f22ce3b566e4976a28d5b6bb00fd671043ff81bc718be76304077caa016613ef1edc WHIRLPOOL d0dbd357622f050e0b18a5c1262057050b740ce60069bdf6450cbdab0cdc4a78c81fc28e3837bd1fa1ab571666d3c2885fb975f5e26d50550b7c30ddbe17f547
 EBUILD netbeans-ergonomics-9999_p20150903.ebuild 2913 SHA256 08d2510fcb31a4ff36c702493e7a028659225e1678b6ad519c625b11220286c9 SHA512 5c5917f2498717d6d404145d13f2e1e75e1e93b08baaa451fbfa4c8e9b518f6207ec1eb86d7f6d57cc96ebaf55c0926f14b8601d7c2ea036c6566e95b2c5deb0 WHIRLPOOL 0e82e1fc32f080535e2b621f69111f0b5f453e08613b916c6fa1eb741cd9dfdb72651b31ac8f5c7bcf31b0b968aed41c3c6d9de6fa272b6d06851853beb1d57b
@@ -38,4 +39,5 @@ EBUILD netbeans-ergonomics-9999_p20150925.ebuild 2913 SHA256 d8a77a9dae947a38f83
 EBUILD netbeans-ergonomics-9999_p20150929.ebuild 2913 SHA256 0260fc62f5450f7cbb7b91be981c41fb8d2e5054270ec9d89f649cb35f42c915 SHA512 02ab4b0b92bdf9cd6f15e67f88ceb3a70940e61f9c550893836b6a4ec51b7ac3aa96b5d40aec6566ecda2960a1f76df7b74b332ae480bd409f6c711b612c9db2 WHIRLPOOL e25e35a5b1627d4a217bfafd89b9339604ce781685eaab301aa1bc39e7d078d072ea5b01c78923aef6f9b2c00252c36be6612f8db8564b9cdd6e1123689bc357
 EBUILD netbeans-ergonomics-9999_p20151001.ebuild 2913 SHA256 298a7adb7de6b3d67d0e0766d3d15ff94d15e5a8cc3158452a397d0861975685 SHA512 eb5d42a9417b03e97e556b78a345fae80121d191f528a10fc0589d1b9e90a8cf673fa75b0bce1cf7c8c8cdcc9d08f40a130f4eff48a898bd758cc836ee6011a1 WHIRLPOOL 62f9172cf7a7670932270e567606adf3a5624f542f0c174887fd8be6ff61b8376899ae5b3711aa0eb766c4a718675e116afe71246dbeae2b619a460b9d8ce8a6
 EBUILD netbeans-ergonomics-9999_p20151002.ebuild 2913 SHA256 a339af6e44667c67ae5f00b6dfb130b1f3ea3e6d5bbad20a7c3ab2ae37681059 SHA512 74851d3beee09bf4bae478271756ceca819a57dee328791bde5a2a27afe32b4540c4ec5c9fbbf3bfe4d769f69b2c52cf365dbab4b4dfc8e24b46d8c1efbdd211 WHIRLPOOL 6ce40af3d909d24ad3b17d664515cc052e8cc8799616a5cea1f675e6f55de9a76f5ab286fab9bc1909e478c551bc4c0fe69cda85171781316641180f6ec94805
+EBUILD netbeans-ergonomics-9999_p20151003.ebuild 2913 SHA256 70013b10fd740d2ea8ba3c4f96317c18aeb9c8eba90113d480122f10cfb7c619 SHA512 d748b04dd9faf8165de4645f5882e9955ca3843e0692d34205c42d4da3994b23d478ee8ec9d7d71dffef0363c42f4f660df25608b927d84a75653b8dc6b154da WHIRLPOOL 238459b724e035b73b4afe8873d8c1f5eb19d551964b80d4e0ef0ea153c266a637eb1f4b630ca549d1ea0fe85839d49a5f045a03c759be803dc8192fd5e97bd5
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20151003.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20151003.ebuild
new file mode 100644
index 0000000..113f00b
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20151003.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-03_00-02-28/zip/netbeans-trunk-nightly-201510030002-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 dce19e9..e5cbf2a 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -21,6 +21,7 @@ DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c2
 DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
 DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
+DIST netbeans-trunk-nightly-201510030002-src.zip 208672397 SHA256 56d684334f97609098798fc2e9d2bb56073a61dcd7c91be398476163b39b7dda SHA512 18c9b136a3f2bdca433dcd2cf7d0cdba5a6428027e3bd884791278b55af4955058674eeba8c920739896d80b88fc5eb94b67695ac7b81e55878328eec49ae516 WHIRLPOOL 75af86ffcdb1318b46995d168b01d979e8f40f3351ec875dfa8732c7ace713bd20ee38559ea2f5d2558088573831d545956e4efd228eaf697d17a2b14f74c3f0
 EBUILD netbeans-extide-8.0.2.ebuild 3307 SHA256 084e952eae1708b0fab785fd34313985e864dbc74a8531a0d5cdcf906e88f85a SHA512 ade8dc37aa932d7ec20966199e521311716061c23df08d02635f78efd2776f1d7bf040b0f9c9488b947bbbdfb3e33fa764723e3dfffa2214892bc6d685428f6f WHIRLPOOL ad2c26b005675ebca7d902ff1e6caa28552f3fda6795e327cc3584cf109f0ad6efad6516e15af5e70d689be236298b0948003e09a3da4991b3e29a1c85607b2f
 EBUILD netbeans-extide-9999_p20150901.ebuild 3377 SHA256 a459e45e713807b3565add526bbbca698d49b86ec31dfdb90dde5de79a98bf4f SHA512 7221a46804530530304a4cb1a36d58a82c19717e9d6a61c4e5c35a28ad3cb58d108fb11341a5ef9005557b1c7e891478e64f38aa12efffc652ddb684ba94c0d3 WHIRLPOOL 8b4d65a5d5c72f544ea83b43681136ba08678b20a71a15d336e9f8cf235331e01d6ba21bb7bf8147deb638d9e857006eb1ead0a0016e47c3c21262012c03e8ff
 EBUILD netbeans-extide-9999_p20150903.ebuild 3377 SHA256 e0a7a1f3704f2521ff54dbaa7eb9672a10bb8b866026d359c6fd4ae287937afa SHA512 c0f77e05c7a78608804126a10738d46e337f38b0124e30f50d14fedb24e984bca9a94bf31ee8ff6cc3931ca8b74527d521a27384dba09f555f7d59bafc366642 WHIRLPOOL 73fe4c7dc37d7b1ab2794cc55864dad1a5c1408a14c028df00c9f26c5049f08ccb5b8d2a88d3b0f2ad72d5fc927513692157e38b943db69fce602f6256638ab8
@@ -40,4 +41,5 @@ EBUILD netbeans-extide-9999_p20150925.ebuild 3377 SHA256 8df930f5181319c8ab5191b
 EBUILD netbeans-extide-9999_p20150929.ebuild 3377 SHA256 2d7dd2b719df3c5796435269dd65c1a4bac427cdd023efb15e873c92ec444c15 SHA512 399652fa635bb8b5a5a779ae766e9b8d2c0337e3c416db4e9e18b86b2156b60c0151e5ad228b145811554d8e0321f1234629de46bd4b48eb385220ef99a890b4 WHIRLPOOL 596a0202c30b0a8ab8a9aa8a85ce737f2d99b7899986b4cf000f64467a817c75ef263e59384d91117b9618e84e868694d10e4b43dca2ca71df1e311e39de554e
 EBUILD netbeans-extide-9999_p20151001.ebuild 3377 SHA256 c6e0674a87d64595344e0dd9011ec485b3aaf1c900d67ba14e6ea766c0e8efc0 SHA512 7c36b2a7932e8002a80a776dd14d2bfb82677e90cda7531295bac39063a354bd0d1fd2e587774c2d484ea75d2a88f4d4f37684dafab23ba700aebd23de8cd03c WHIRLPOOL 498bfe06ea235fb7c4588426e69fa3aa31595283231488c7d4612810af791cdc580f270b23f382108e549c3150765d191f57cf159e39f9203725cc269a770c1f
 EBUILD netbeans-extide-9999_p20151002.ebuild 3377 SHA256 5a475e917cb56e6afae58d3fd8c8c1c9d5a5652faaf6715ff3b6af9f336a2a2a SHA512 765e312a4739a14965f534f9e3951eee000dda22c167f47e27df7b88509f4ed36febb87ec791dcb2e09a7e0a5e7b6a14281ce2116aad4cada577bb70f79dec33 WHIRLPOOL b1e783f4b5f208ee3f95299c39044b184d38201f9d8eb16628cc9f9319ba9291d8ed493408bc5b4896d60fc3bd65aa05fde4edd94e96d2d1bb4ebc35665cfa69
+EBUILD netbeans-extide-9999_p20151003.ebuild 3377 SHA256 284338598a5a923b3a100ab3c471a5b16180b4a0aa3d190851dad87287e2215d SHA512 67a3e69a4d9ee03f3f0f19874c6e19d821201770de2262117767c338ff7e3ff50177c01973a9dbf90426f297fe4f4f3be9dce7034448ef7965ea15a06ebe39a9 WHIRLPOOL fb2dcafc94ecb98e79283c418b01f9b0190fd78e6c8147ad188b56988b41a0228fd7d7c5e4df7f5923b5dd4ea4ee5eee3d0da7cc504b1de157df9c1127bc4a3b
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20151003.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20151003.ebuild
new file mode 100644
index 0000000..58944d2
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20151003.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-03_00-02-28/zip/netbeans-trunk-nightly-201510030002-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 e417089..f04a01b 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -20,6 +20,7 @@ DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c2
 DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
 DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
+DIST netbeans-trunk-nightly-201510030002-src.zip 208672397 SHA256 56d684334f97609098798fc2e9d2bb56073a61dcd7c91be398476163b39b7dda SHA512 18c9b136a3f2bdca433dcd2cf7d0cdba5a6428027e3bd884791278b55af4955058674eeba8c920739896d80b88fc5eb94b67695ac7b81e55878328eec49ae516 WHIRLPOOL 75af86ffcdb1318b46995d168b01d979e8f40f3351ec875dfa8732c7ace713bd20ee38559ea2f5d2558088573831d545956e4efd228eaf697d17a2b14f74c3f0
 EBUILD netbeans-groovy-8.0.2.ebuild 3346 SHA256 907e6cd11c222f15c826494b44929483803f0e4249de0d54db51e6855b574148 SHA512 8bb37121e7e32621959318d109b1d982e2c705a9deb7171f5fef1dcaed55fc5718b0bc9e6bbb2592cdaa5e96d874bb6e6bfa96d06fe09f14d5250c1485eb1da5 WHIRLPOOL d5e09fa1e975835f05c6132c091fee4ae9fc9dd671af9f5f88a9195d5cd4a93804f96687ed3f2bd741117fa65773f2c464b3cfd6697425039cc51a940efa2a31
 EBUILD netbeans-groovy-9999_p20150901.ebuild 3416 SHA256 bd899df99a2dfaf3081354ae331ad0494b5f2cdda81dc9039cef398ff8fcb10d SHA512 5753e9033ecb74072aae302ac814e5e8f3c264b159f4d82f7d41467f552b8089ad4a02141a277f154d8f48145a925b4214898e188d69f38d50dbb28af5b45b60 WHIRLPOOL ff875fab2e82d6fe6dcbabcccf334ff8056939ea7502773191ba622ecf597acbb49ac0a685ddca883bee01a890c220d9d531b6daa01189dc9b4a58cf41144c80
 EBUILD netbeans-groovy-9999_p20150903.ebuild 3416 SHA256 52900724587824fe2970ef01a4f6e2478d2b43f8068473edce228ae26f295f11 SHA512 15387a879c00dc1262cfe45c5d4d4bed353a15606531a1942a4921eaa7e947d89624bf81ed25a75bc9d76c1f8d7d729478e31f5dff416f08ba5c81280d1b88ab WHIRLPOOL fe65f7e8120c3586e0e35c49008c85296237f69eeac8f6f383a0bf47c86407e66c6f17c3ff01dbdb921ecd9bb4c71e57e106a1f779b276239b9fa3ccefa8d2ab
@@ -39,4 +40,5 @@ EBUILD netbeans-groovy-9999_p20150925.ebuild 3416 SHA256 2bb58f38747a3a37402f558
 EBUILD netbeans-groovy-9999_p20150929.ebuild 3416 SHA256 2c20201dbbb456a22ca66f74703bbf35b31be0e748ef4501c356de13ce557223 SHA512 22cc755a4e43f9bda36a702f9bc65eb7e6c831ab938dc55a9378b3a4116dc87cfd0728f3017c806b9a6b7ca11227b1f1398e3de5d402160253783bca11b5244e WHIRLPOOL ea336706ddf6f13367d1fbc5e5d936857c67960e5238f84d6ab54b8d0f42d188c4910aec790fdb3caa81e76de0615ef208ba140c94b2090f901d76835bb0f7b7
 EBUILD netbeans-groovy-9999_p20151001.ebuild 3416 SHA256 3a45101e291ed46b58227eb22e6350d10249826f237793009cd9c68b4a13be49 SHA512 bef697cadc1a6ccb36be3b449cb1cf56bb644c2c5ed7189bb69daed9d16c18b18ba4b903362e1d80e9d8fe29702b5ccff58250c6efbf9bfefa968f94e2105abc WHIRLPOOL cdcc6244e9e24c0d7b7b0ae2d592f95813e3d8f1b5ce63d3f24315b5f4af559b3ca6668cc5ae5bdfd6817b2c7ed3b82fae1737123156ed597ada2e10d7e3c5df
 EBUILD netbeans-groovy-9999_p20151002.ebuild 3416 SHA256 a885a118d6bc446213eee0f4172d618b85908c7eba446e9267cc25a8d8a17d8d SHA512 be8c07d5a041141d597086eb1a8ee64f43edb30f12dc2aa040fa11fb61bc6a79ae235682d9c42d4dbfc356ecd85e1c06c651c3679a66293d1c887f6960f79a86 WHIRLPOOL 13b663a9186c990fb0570d8a767b699c027403b3e4037ad85f5e139cdb7b25edc5ead649be02fd7c88f7ea942a090d4b996e18875db1fa6b1c44039acf2ad7d3
+EBUILD netbeans-groovy-9999_p20151003.ebuild 3416 SHA256 67a93aa7218a65bda8a08a0a20ac030b3e0fa592c01d70562b9c676ce3f0d446 SHA512 8b659109c28d8a1a4dda141c10d41e3bfa0577bf539e87c86cb05afb40c08ec62ed3f88d9ced2df7c09afebda3f1f57833f0e1fc8e6dd065da9bb2c914485d62 WHIRLPOOL 8e1dba2c469e89ca985089eccf8e5de190990b624dc225fb924cccb9faf00d662d58e43266bf0653484554bbb3a2fc8dbe328886281a5aa0f3c65d4b6ebf7250
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20151003.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20151003.ebuild
new file mode 100644
index 0000000..2c3d9be
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20151003.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-03_00-02-28/zip/netbeans-trunk-nightly-201510030002-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 235ff13..2bf2281 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c2
 DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
 DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
+DIST netbeans-trunk-nightly-201510030002-src.zip 208672397 SHA256 56d684334f97609098798fc2e9d2bb56073a61dcd7c91be398476163b39b7dda SHA512 18c9b136a3f2bdca433dcd2cf7d0cdba5a6428027e3bd884791278b55af4955058674eeba8c920739896d80b88fc5eb94b67695ac7b81e55878328eec49ae516 WHIRLPOOL 75af86ffcdb1318b46995d168b01d979e8f40f3351ec875dfa8732c7ace713bd20ee38559ea2f5d2558088573831d545956e4efd228eaf697d17a2b14f74c3f0
 EBUILD netbeans-harness-8.0.2.ebuild 4055 SHA256 2674d562adc57648c82cac9f714f74f9d29dd7b7ff7fa7f0ef37c43ef0975489 SHA512 7d72bed5b955b2365a4c11fcd97a2d6f2372ab939fb9a03b3ff7915053f24d695373c1aa154f6e6916d37ef3ace7b38864d575419460382760500576dae52e49 WHIRLPOOL 72f54a6cb83f282a75f0abb073109414a7b8bcd4e9263466281e68ff34148a7343ed3bd78ebdc8afd109b6b9f5b9f15bfd0e250f418fcaa4986a7c886b57b9f6
 EBUILD netbeans-harness-9999_p20150901.ebuild 4125 SHA256 c9189bd6d9b770dcc22627aedb7041e6dd80a0464b4b3649a6cebf1352fd7dea SHA512 154f820f3b07192e4d8b35fd473cdedd3dcee70d81f8484e95a33846fd6c3e8474acbad1ee99ca2ee29574da125521ca695bed8a471e5fd10ab7724ef9d8f7d4 WHIRLPOOL 8b4a9ff80f36f06108df4508abd091b99e5ed96c6b297c1efe5b18b3f798890f6f23313c02d543d89fcde5169631bf3cdca15cc54a086747f8f52eda303d8f09
 EBUILD netbeans-harness-9999_p20150903.ebuild 4125 SHA256 68de6c9e0f914b0db958bcb0a48f9e74170cef31e65dcea5e8996f8796df32d1 SHA512 93a557e04df4f9fc4bc068b087e3b91d5fb409c30e8c16b625f2973b28e3f5f36474fa7d36ca9fc72c154bb2a2bd84b696a95241cd02ec14cf7ae4800291d545 WHIRLPOOL 4bbdb9c03f2b21ce25eba8f4ac8abe8144c4f315dc2a608d2ec4cb3a6adcd7020f4bae313924024eaba580e245d1e8e3e3cd19f3d1e6f90db4c6ca6f7c90ad3c
@@ -43,4 +44,5 @@ EBUILD netbeans-harness-9999_p20150925.ebuild 4125 SHA256 ec043c193907209f28dea4
 EBUILD netbeans-harness-9999_p20150929.ebuild 4125 SHA256 fef9bca6ffd87b35570d593e14c78b27a10f3a1499cd5c1e9afd2f7d61bdf6f9 SHA512 436f495476bcb81b80563e89f14e82960d92c84aeae05b088517638997cb4253aaf3edb57be73781734206ff4806285f6590c51e02cc95f7e4d2644f9ec9d3d5 WHIRLPOOL dd9cbd92b68529df70ac2963f0aeda23b1301d02f290828e8490a725050b330d5a10216a769f6bf71a2260dfded13ea988a8928e4e649ccc7a7e4a375fcae917
 EBUILD netbeans-harness-9999_p20151001.ebuild 4125 SHA256 13f8d1786b191f9fc161f267d8fee56c14846964eb8f6a9b9d7731c0d90a7a1c SHA512 d36a32bf08585f17658b0dc5b38b0a8a2ef6d1265ebb9feb93feeb1e0e3c900b85101b3572e8a63edaf07cb8623907ba9e775a643623ac3d8f0f52de7b2a5a64 WHIRLPOOL f891e812e45303986bbc9be420811fecf008450e16507747299aad4cafc6ecf7ec09e7a3803bd25374033cb4cbf5ff9f901c678612f6cc134e65b9640ff3bc1b
 EBUILD netbeans-harness-9999_p20151002.ebuild 4125 SHA256 c82d8f80bddf85498b7f74ce03091988896de0e56b35f0c45adc68f7c2c852ab SHA512 45959abac3fce686701af5d9e812b5d3d8764c59f4278c91db17d2deb4fb9bdd4a7f840b9ea3240bd69c1258ea36a1cd9b3a5aa5ed494e0afa536b3b4b4770f0 WHIRLPOOL d4cc543b085739b1615319793ba2ee6deacd53c85d96103fc9c075ffec54dec68b00ac54028a1d7128e97a29825be9ebbc549f6e82cf0e368d4c4c60d4a39957
+EBUILD netbeans-harness-9999_p20151003.ebuild 4125 SHA256 2b8b30b7e6ae46bec6532b918373fa23a82d5400bf6254065865c7d81c0f815f SHA512 f9089f270667a7e5974d629ce8c88605b6ed6d1707b6b2a49bcc4e4f83b3fbdfb8fd88678bd6232f81de449b16db4720b5cd99f6484b175113ac089e1ee0b3d1 WHIRLPOOL 795e568cc97a966f423050816cf1408923b5f747a9a35c9db4927229b432a18ad24dfde82247d4c2951c233cedd57ee5a34e12438cc863e4728e8bb10232bab4
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20151003.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20151003.ebuild
new file mode 100644
index 0000000..2ca93a2
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20151003.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-03_00-02-28/zip/netbeans-trunk-nightly-201510030002-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 b1c9f24..ce8f45b 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -125,6 +125,7 @@ DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c2
 DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
 DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
+DIST netbeans-trunk-nightly-201510030002-src.zip 208672397 SHA256 56d684334f97609098798fc2e9d2bb56073a61dcd7c91be398476163b39b7dda SHA512 18c9b136a3f2bdca433dcd2cf7d0cdba5a6428027e3bd884791278b55af4955058674eeba8c920739896d80b88fc5eb94b67695ac7b81e55878328eec49ae516 WHIRLPOOL 75af86ffcdb1318b46995d168b01d979e8f40f3351ec875dfa8732c7ace713bd20ee38559ea2f5d2558088573831d545956e4efd228eaf697d17a2b14f74c3f0
 EBUILD netbeans-ide-8.0.2.ebuild 29317 SHA256 42218788ab0fc7c7cd1bb42a8b0c72a66543a3260b752aa55365833c355bcc63 SHA512 c712b66b6bee654390a45e5c616479df2be624bb770f3838d4fcce875f71a8d165703dffd55c4fd7d30e19c392784203e5fe01e2404907d88c935d439efaf578 WHIRLPOOL 67763e4a36215ac002fd321556ce2269affc15ba48ad5069d7ccc746d918179994f174e09305a9d9ddadddbea690778c2769e0ea1993eafc09e01580485e2292
 EBUILD netbeans-ide-9999_p20150901.ebuild 30334 SHA256 a2430eba1da126a548c390a52701aa5a9ff7f3c5afcf591492704f6270f49ee2 SHA512 ee3b7c4d773f16ae78341f8393397d6090055d11b2b45a579afc23e020cda5bf0f86b1348d47b99fe94280885db4869b3f54a15e5f70aafb62c2ead0e63bc9f6 WHIRLPOOL dae179c3bed6fdbfa5527a31d3b15a9e8f1eb7a805ce872b9fa512be27b1ee4e3393a0713bec6e461fdaf7d09c04857c68cca5b497f772559491a4f32f2ef4cc
 EBUILD netbeans-ide-9999_p20150903.ebuild 30334 SHA256 ae41f1ecbbaf9cfc10fa655a7ac439d418a40d7cd2ae2cf8e40009035c839f22 SHA512 c8d03b4c44ed1855b06f861347078aadbbaed51e42eced7f35f02c438440a269b055042aa44666ebd2c0d1fb16c626f07a70c751025bce97735393e4faf9c387 WHIRLPOOL 45c00d9dcc84161a15412652088d25e5f220b7d499da453ef2f482960c7e51cef8d6ac3e6b343e9a9b5b78f6cc8f68ba7aaab15c557c2734c0335bf27e48a531
@@ -144,4 +145,5 @@ EBUILD netbeans-ide-9999_p20150925.ebuild 30334 SHA256 f00c2a190c4e0d8891a5201e4
 EBUILD netbeans-ide-9999_p20150929.ebuild 30334 SHA256 e48c57411bd1c03f0598aafa6820617ffaec85336229250ec6e45cf61dbc3e2d SHA512 de86c553caa4bb24eb7d87634793812f2af58b64f58bfaa35cda638f816cd543a332f51e15b4784de656d9b7210c1a0443b72e6bd30663fd3c328f4f08cec5bc WHIRLPOOL 16a5a122390eb893b5bddab3f18ef1b302a93d9239c07f955272741653748cfb2f258bc8eb13a880cb59426f7d658a0d082dd4e50bc9bc5c70c62e47f55f9db7
 EBUILD netbeans-ide-9999_p20151001.ebuild 30334 SHA256 b78d36ee165147dbfba19a14e77783963c4f7377b4c418d6bfb1738507973bd4 SHA512 4c9ef09a23a310badc7c2f119d9ef7a9ce450a719a0d2b112af157b22aaccea8e5806e2ba015951b9be1c4ea38e6f27c071d025e22cb5c017f83cb009e4bf748 WHIRLPOOL 20a7706618dfccad4c186f512c05206516f92aeb8ee1243f924bc63fbc3b560e21fe8bf2f5cd976e8763dc08693be81ad961168197efbf054d2c5efc864754de
 EBUILD netbeans-ide-9999_p20151002.ebuild 30334 SHA256 77ef9c2ee951343d8d1fa0b3e46ff55d5c2e7ee485a5f57db84925d148ba8590 SHA512 fe793e1ef37e789aa6e47fea9dd92e82c7b2678c2c5dd63a033349a62e229d5a586b4064bdf69fcc888531b3956465e955f070a25eb9c7f7734c7457c0186e39 WHIRLPOOL 2641f7d21223b53871b77d57b74d16bf73d984f936fe187ed3221a9267f18bf30642dd1011d360647766e806cc4ba785c66ad1074b99999be602b7bb1791469c
+EBUILD netbeans-ide-9999_p20151003.ebuild 30334 SHA256 f48fd5cd26ccae08abafc8364cccfc25c322bb453fde01f38c261801e6a7202b SHA512 48fc055d19cbe539cbb525a380a649626291a1f07234d5f499ed16d3036718ec85cd9b4bdfc7c21c94589eb890aa5b5b4d42e736c06e80c26de9b5f8a2f4f740 WHIRLPOOL d93f6f0ed2679bff540604e73b62bc32774b2e27bcdf2afcea15f2d37a6e867610568c48257cca23febbb5e35ecd22dc935f7df2abe008e45ed61798ba4ed874
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index c353ded..4ea660f 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -48,6 +48,7 @@ DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c2
 DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
 DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
+DIST netbeans-trunk-nightly-201510030002-src.zip 208672397 SHA256 56d684334f97609098798fc2e9d2bb56073a61dcd7c91be398476163b39b7dda SHA512 18c9b136a3f2bdca433dcd2cf7d0cdba5a6428027e3bd884791278b55af4955058674eeba8c920739896d80b88fc5eb94b67695ac7b81e55878328eec49ae516 WHIRLPOOL 75af86ffcdb1318b46995d168b01d979e8f40f3351ec875dfa8732c7ace713bd20ee38559ea2f5d2558088573831d545956e4efd228eaf697d17a2b14f74c3f0
 EBUILD netbeans-java-8.0.2-r3.ebuild 13294 SHA256 4abac657cff75400e92b1f2b19bca696113cdc37611c8c0f49dfa8c82fec4296 SHA512 32e41d7acc3aca026993e5edc791f1314f2bfda47413538af655b0335973c4fe50d998c67f129307b164075c3e0503280b4c1729d700431644ca6610d7f0f635 WHIRLPOOL d7f99c13421d08529b54085138fcffd2959a3c3f97d94a1dbe6e726a6dbc2cded69ec0bf97e1458b56847ac121954e8f173c1adde0703fd2969defa53ac37c51
 EBUILD netbeans-java-9999_p20150901.ebuild 14818 SHA256 2e650037a388a620e743e8212f0099878e8908fe4dc1680b36f6ae8e9a72fa54 SHA512 b7d8475055812c78ee45ceec123fc103641b4070972f0f7e3572a0b07efee2ca2cbcd16600fcfc7f30dff461fc235ccbbc1fde941f528e27f4a2f742f3ee5cdd WHIRLPOOL bb23d595159c481696ba4fefba3e398797db9cea44e4c2f00eef7929fbe1f442362c470163bc460d349da5cb18f627a3892c6d63b17439112becf538352785e2
 EBUILD netbeans-java-9999_p20150903.ebuild 14818 SHA256 f34ba8d98927651ec621ec445d4760fc596073f6857194bfceb5688b2910089b SHA512 ce7c86a52990ec26660a9eee1bc7588a2e069e80e42eb5b521699a9784e1da41411d5e9965c4f77bd4771b7046e9bd99e6563511336744404dd716e54c11faae WHIRLPOOL 5477f4bda878bfa48ba3851b740e5d9f06f594fa953f5ea0fab0a37917c7462b7356f96aaeca5847e85623c37e4bb46df81217451aace87cbcde7c50c38146a6
@@ -67,4 +68,5 @@ EBUILD netbeans-java-9999_p20150925.ebuild 14818 SHA256 8009633b2894840b5c440535
 EBUILD netbeans-java-9999_p20150929.ebuild 14818 SHA256 e746cd4a38e63f882c42e022c8635b0daa17205de2bc484df92ffad88fc91b6f SHA512 1250330f5b76235fa42455fe5dc022d42090a989251c03a2e85755321aba68a76153cc46975af20b409de3cdc441031bb6db7bd668324117389bc10b8ecd20e0 WHIRLPOOL a65e0257e2d06b7099ff605f1fc5d177aee6055a635176cb7003c28efc67cb9a1086763aa63e9175f0def4f7a350490059446e7176209849176a4ef36d786a02
 EBUILD netbeans-java-9999_p20151001.ebuild 14818 SHA256 9ab4fd89bdaaad622116497f3e113e05b29acbbb83bc36fa6062b7eeff7c13f9 SHA512 060b6d6b4852fca9830f0067c218e775bd23854affbd4b254d6148e80f696e9704df24af93ff962c3419d3bf62157ccc54032647e6b84c8beb3d16596dd355b8 WHIRLPOOL a02fffb34b3439853100d5630559ee832d617140b3f52e81f789abfa2787835d7e13f74cde0d8ba8af9556bc23d4b032f188d1b16facc5abadddb7465b098c98
 EBUILD netbeans-java-9999_p20151002.ebuild 14818 SHA256 75fabd2d1daa267b808eb69b3efc6ae9392d61bb39ba579a12d7f6c2d34d8438 SHA512 0903e337632ec3328a0847727d13f04f5813275a7da9c653f8ded21847ec7fd97c79e16559de23fbbea69c30156c53a3477aca4b91f02ab7a55d19a8681eb3dc WHIRLPOOL b11fe21dce01e1b22a2a0e4b2cb8c1ef86a315e67dfac782b1ffd1dd7eed1eb6de6c67ed589d42a392d59f2999df359d2ea29535dc18778a05823ddc872a71f9
+EBUILD netbeans-java-9999_p20151003.ebuild 14818 SHA256 aab7d1a7d6ff497d668d8de99f4b04d420824e2c69be2d005374d3f73f4f1694 SHA512 43a524b96d401bc2d3db19c07e88db66d089a470a4d307954e846ae8dc948157f9a8973a0bd22faa0a77bb1fdfe363be20b47a2aa5d46f3e45f9a47ef1e19b93 WHIRLPOOL 333889b94ae9b842d3e86b204e8b3ec9260c9bf0266046877d2c08a3ef2d5ad935b068c3dd939036f758c66afdd36089015b57be46885fc1957945ce02056058
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20151003.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20151003.ebuild
new file mode 100644
index 0000000..d7dbdff
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20151003.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-03_00-02-28/zip/netbeans-trunk-nightly-201510030002-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/7B98BEC9E6D1A447C9C3DDC61EF6658BA000008C-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}"/7B98BEC9E6D1A447C9C3DDC61EF6658BA000008C-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 75365f0..dc7c171 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -22,6 +22,7 @@ DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c2
 DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
 DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
+DIST netbeans-trunk-nightly-201510030002-src.zip 208672397 SHA256 56d684334f97609098798fc2e9d2bb56073a61dcd7c91be398476163b39b7dda SHA512 18c9b136a3f2bdca433dcd2cf7d0cdba5a6428027e3bd884791278b55af4955058674eeba8c920739896d80b88fc5eb94b67695ac7b81e55878328eec49ae516 WHIRLPOOL 75af86ffcdb1318b46995d168b01d979e8f40f3351ec875dfa8732c7ace713bd20ee38559ea2f5d2558088573831d545956e4efd228eaf697d17a2b14f74c3f0
 EBUILD netbeans-javacard-8.0.2.ebuild 4906 SHA256 944fee40d693c2c287e748f70ba565f3cd84bb7c19110f8be716134ec20694a7 SHA512 1f66cd2756effbfde7d43f9da7d8d93cb6252c58a02ee3d821f6faeaf63bf3c63e28f80c6eb44689e3aa954452a2f3893c65e75de84158dff1da0d94cafea14a WHIRLPOOL 88197e03008b8acb1ce62f72783bb096d9a3fc2a289b83367841a8adbee2bf822031f9bd6051831515ee44b1d5d2a109c5646f98ca723506f27c874301fb4189
 EBUILD netbeans-javacard-9999_p20150901.ebuild 4976 SHA256 f8bbd7f2419ccc07c17b05c295359dc07c55f3cfca78d7760105b82903fa2b79 SHA512 53bb2b9edbe87daecc4feb6b063579517ccea53b52168fc4a6ed03d8351d3f254a819125937aec58f551aa926b4b5a567b5bde3850fc390fad437f45194add80 WHIRLPOOL 9403f1dc9c3042fb5981d340b02d3615db9aefde73f1b2ade96b9010bdd6a37f610387aa303625ae0c979f20ccffd57ca87115321bd42ff9b6dcb39bcff03580
 EBUILD netbeans-javacard-9999_p20150903.ebuild 4976 SHA256 20835b1551b3382cd7a6b3f97fcf7725597e77317e8a5ede489954f99f0eb4e4 SHA512 93dc8f950ec2d8d8ad83eba39699436121729915ceca17ab3a4593ea2ec0a9cbeb81263f52cde443fb2ebe43658620c438664cd112b30774290a8cc03f2dfdb6 WHIRLPOOL 69670cab1e9e12e074a2874ade1cec66b08313763f7380b1839395becdab4bbd617172987d0ddb021dfa29241654119fa2d6d61cb34d507584c3c8e7670f6b83
@@ -41,4 +42,5 @@ EBUILD netbeans-javacard-9999_p20150925.ebuild 4976 SHA256 e8bdd18777ea9dbaf9127
 EBUILD netbeans-javacard-9999_p20150929.ebuild 4976 SHA256 01561b45f5a730b0d5cca539d2c2193ad8f42b62b3fdf8b14eaa4805217f1fa3 SHA512 899000c51813f9dbf4545b511f177f0900b0dadacdeba9d01051d82c569df4a65a2c92c4fdb710f35491c938bea0104d665426efcb1fcea01725cd06c1b1f950 WHIRLPOOL 427097b8ae5fb4487fdb375c3658b239c0466653b7619ff547f9e28579ef49e05a561b3bc79b0e7b387c0c66433b3b056cb1742555b6e4827ef8cd342de364da
 EBUILD netbeans-javacard-9999_p20151001.ebuild 4976 SHA256 714a98fde31d797fa8e50c0564ef66829e9e51f9fd740df1441b09bad904f433 SHA512 fd6dfd7720bb16541a2c0938ed5debc3c7ec313ceed2f8006d6aa801b89dd9d8ac12f6b865a6571fffe7fecf24720c34a10b4c50718cf6b505bcc7b659abbeca WHIRLPOOL f332fcb29ae308cec3c6ecf6b1b637742d5b8bcd420dcce3926b7ff3301f1949c2db7d1eb12ca06813aeb449d4526b4272e58d30f2c8a7c9003218e05479efbf
 EBUILD netbeans-javacard-9999_p20151002.ebuild 4976 SHA256 f82032cb69c8bdfabdd873e04b1ee11fe8cb04dbc3291f2eb4868731fa7457d9 SHA512 d45ffafe072f2f0cff7c4a369289196fbf789d3f694b3772c771a3579636d289d9f86a8e83c5a440707322c8361a9457c2ac91d08cfc1eabe533ed75af631ebd WHIRLPOOL c6f13eea72bd4a848f3d250b6f9c9c5fb1ad01444ae96c785740c45561a0333faf13fe6376ecd80eec0ff615b5eaee53a0ba6b5d253e6904fd2873139418ce79
+EBUILD netbeans-javacard-9999_p20151003.ebuild 4976 SHA256 0cbe49060b268c5b21c25ad8a83323e7f9be06f6d780eec9b8db6c66f8ba2a64 SHA512 c7d706d6e91535a401dea4723c22b430f35dd2b5baf0c521d7f9482a436f4361554855cdcf8efe488216628170bf6d41bd40de70f92f13c3fcca7d35bec67ac6 WHIRLPOOL f64b3a0e0b0120d855171ffb3f7ddfdc720e31915529c453c38f39b2149dd98da4dd3e9122b30b9a7ef430fbc387681c7d7e5cf4d38caae33aa2bba397327b29
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151003.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151003.ebuild
new file mode 100644
index 0000000..4341cd3
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151003.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-03_00-02-28/zip/netbeans-trunk-nightly-201510030002-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 8f56bc0..6b94bbd 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -20,6 +20,7 @@ DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c2
 DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
 DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
+DIST netbeans-trunk-nightly-201510030002-src.zip 208672397 SHA256 56d684334f97609098798fc2e9d2bb56073a61dcd7c91be398476163b39b7dda SHA512 18c9b136a3f2bdca433dcd2cf7d0cdba5a6428027e3bd884791278b55af4955058674eeba8c920739896d80b88fc5eb94b67695ac7b81e55878328eec49ae516 WHIRLPOOL 75af86ffcdb1318b46995d168b01d979e8f40f3351ec875dfa8732c7ace713bd20ee38559ea2f5d2558088573831d545956e4efd228eaf697d17a2b14f74c3f0
 EBUILD netbeans-javadoc-8.0.2.ebuild 5993 SHA256 baf9da38d87b86eb8ed10ef46017361f36ca8583dd90885c9d1667a51851bc52 SHA512 892bc25b30dc26e3ee7c8be9aaf8542c00a7fa1d1d8f883d82bebb816edfa93e1ee9abeac1b0c47ecc8b4169bcaded56c5c71f18151fdc22fe241fcee0fd4521 WHIRLPOOL 2012f28f3ba5074b4d262b20e9a1c8ddf590ce444339ec1a404c890867c1271e38f9f9e09717d0648fae061553f5c8da3d97a70c35c8e853fe4894fb6fd4ec96
 EBUILD netbeans-javadoc-9999_p20150901.ebuild 6228 SHA256 70adb18643384a52dbe2b88467c14663a755609b1a5098cf816c5c0b88994e9e SHA512 529fa63d125fe04aa06c4f444924b0e1390680092ff4a474810b6ede97925cdf907b14283016f9000f54bc9cc1a1d0e89835ca681940152a029eee0f370c2fba WHIRLPOOL e117f345fd2dde9298afd3f8b2f7ac1a699936336a68dee80c50cc33193aba40b069ed8867a1af84efe3a4621fea35daf8b0835bf89f7ca7f35278b60ddaa56a
 EBUILD netbeans-javadoc-9999_p20150903.ebuild 6228 SHA256 9f0dd0e792cbe63c9dad51f0b445a2245ac2931123c3de1fc8079631e3dd4b77 SHA512 76e8762c17b07fdbe1ab65cef9b6b6c0e26355deb5f1827b7d864cf582d1aeecac57c579d439a49f19cbadd6db7f92e626e0c97ef5ddf0b1b883cfdd6282ee6b WHIRLPOOL 0efef7d57f10a275fda7f97c209ae41fc61f8f9961de19325e34c117378d97e7d1b362ffab93e1ac71ce38b13881823937fb8ef10fb014c84e1cd61ae42b3d2c
@@ -39,4 +40,5 @@ EBUILD netbeans-javadoc-9999_p20150925.ebuild 6228 SHA256 9da2acae57f47e7029ef3a
 EBUILD netbeans-javadoc-9999_p20150929.ebuild 6228 SHA256 3035638cf50308bd9b82ceeae22615d518d618476b78be9ab9f9fec366b18f0c SHA512 cf994c65cbea24f104261f38bf96f858cceaedb7acd5f2800405ca59921375fdb3a467ddbeef73d50f76dad684df1554d6e9acd818b8b1f23af6469764fc5b79 WHIRLPOOL 847b01a3bfb1503eb98446c8a25ca81786b3944e34beb02109332a1fa1bd1dde8f11efd63b5612e7f8a562125326c79226b9f79e0685dbf7416ad70e185165ed
 EBUILD netbeans-javadoc-9999_p20151001.ebuild 6228 SHA256 e1a3b029266e3b470f00a50bdfd40ae55bd55704e05c349b61f95d634b61dd16 SHA512 46ca2c05feaffb2bc02ef2b13db9ed0f73c250dc9264a72045680c75c31a78eeff3afba43cf4a491bc6f06740b817cc4a69cad1ced802d7760be20450a2b56a3 WHIRLPOOL f81a54053408f205ca6b71b67977ffd3ccfc12173334713c7f604fe805da3db7e588ca002043e83a4f45cc62408d0a1b093538536481545f3e8f925a91b5f0f3
 EBUILD netbeans-javadoc-9999_p20151002.ebuild 6228 SHA256 a687fddec18e191fecbb9aed6a6a2390688e8f2ee2a73ee10691c5062eeb933c SHA512 75ed80ad34847f6b20974067f47bae25e2ab9e1c2e7e24ed29e1a10a95c3178764f6bd51bfff1ec9c8a52fc6691b834b7854eeed0762f041db644a99bba8dc6f WHIRLPOOL f8c57073ce593060d8829bbe8e6174082797dcd11665733d86b5548d29b9e7c4b76bf777fb18bc6b123bad55d92c37753b772ec490e9553f937a4d26a8412f12
+EBUILD netbeans-javadoc-9999_p20151003.ebuild 6228 SHA256 699e9a51f3f2f67cd645c26e3e71473e173e86bc65fec4f79f322359b0fda501 SHA512 4c3126c9007b76c676720357671bdc04bad90c56de7d0b568c9de3ae17f348fd96c0176deb36531f2eb832d649c544e056ffecf4e19e25127d9640bb542026ea WHIRLPOOL 42dd2ce70c6c823a3fbeb93dbcf623a49bd4d2d10beda37e862a932ca625813bfe0685e0a0c637a3ad40ac547823d94a5f19c7d26112b177f4287cce12869760
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20151003.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20151003.ebuild
new file mode 100644
index 0000000..6f5e257
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20151003.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-03_00-02-28/zip/netbeans-trunk-nightly-201510030002-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 e9c85e2..44bf76b 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c2
 DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
 DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
+DIST netbeans-trunk-nightly-201510030002-src.zip 208672397 SHA256 56d684334f97609098798fc2e9d2bb56073a61dcd7c91be398476163b39b7dda SHA512 18c9b136a3f2bdca433dcd2cf7d0cdba5a6428027e3bd884791278b55af4955058674eeba8c920739896d80b88fc5eb94b67695ac7b81e55878328eec49ae516 WHIRLPOOL 75af86ffcdb1318b46995d168b01d979e8f40f3351ec875dfa8732c7ace713bd20ee38559ea2f5d2558088573831d545956e4efd228eaf697d17a2b14f74c3f0
 EBUILD netbeans-javafx-8.0.2.ebuild 4647 SHA256 15e5e0b1c4729852dd55e5bfb2dcb520ba7c959bd9927d315c0abcb3f94e4ecc SHA512 520c60264fee67b0ccfd50ced0cc8586d5653d5186fa75c6b7cd8b400aae834de446b7e6145ad38df7e68207391fb360ef4834140e096d48add568fed387ac98 WHIRLPOOL 416a56ceb2ba85e3923ada0c8ef485cdd6fa16b3423b8fd0de523fa54dd082cbaedee5da4f1a92b50e440195f9256376f50e99a850d70ccdcb8c0ff370007f7c
 EBUILD netbeans-javafx-9999_p20150901.ebuild 4717 SHA256 e95804f3d997f20e45ff63e57182227513494d00f034115bfea0fb80f7b06f86 SHA512 20431b8026fbcca039f412ab076e9aeea22745f964858dee0cebb070c08113cdabe35edefdb998efd0d146b0a9d055de441b21620e1beadfeb9970009e479eab WHIRLPOOL 1352d5de66acd787070011681f7800e37f7bc9f9420b7e957a16c490b7b0419d88408c13ce930f2e2507ff8a84308a93ed50434ed80c9f26b21e28356b73a716
 EBUILD netbeans-javafx-9999_p20150903.ebuild 4717 SHA256 f8dcd19435adff0ba1a386857b8a0d2624ba16b64e36bfd40f58a2da8616be5f SHA512 776aa675ae3ee669bff503e9ac240e801dd080c34a18f46a53ee9308044152eb4dd067b0ce9b3d89708a56f533426c2010e06d63d2c7465bd3e461193a71c082 WHIRLPOOL 12f7d33492850172e803a4c2fac724d0b6e196bc7d64746fb51f1382cc1d82df5714511dadc1167e5921d6a492e47d5e879f8f5fdcd1bb2d2501e14e2425407c
@@ -45,4 +46,5 @@ EBUILD netbeans-javafx-9999_p20150925.ebuild 4717 SHA256 8c1627c4c59d97318b19668
 EBUILD netbeans-javafx-9999_p20150929.ebuild 4717 SHA256 682c527ca8852d8e2dc0bab8f04a915b63a479d5a29bee4d1129b24d91f9e6b4 SHA512 cb5593d381c0258350ff1e9bee77fa4062afe371882f88557e512463791a1236c34cc070c3f63c615beaad7ee0500790afb03ea8b778385fd3f139503165d05e WHIRLPOOL a80bacad9c52faf4b1ea851134b87677713f7f9bc668ef42484d867c46f420c7cda7c6f2c1883b5bebee60a8ff05f648637a14591e4d3480ff5f0ceed05f8814
 EBUILD netbeans-javafx-9999_p20151001.ebuild 4717 SHA256 f7d20a14f73084dd20657f4a6980f669648914eeb87b664570b6b48c2d130430 SHA512 20c414a6f5586949a115c142c0f2500162796eb64784e2bcd05ce611c5a709859994bceeba670ca45dfe1a9ca3e7b3506642347654e15b1336a3da1b466a5123 WHIRLPOOL 936b577abd4722aeb2e35a82422d5490fbf687875759052a635e90a1b6cc9839d67ce65e1de660381e61f9d865ea2583bc8a09f5779a7427274738523c6223cb
 EBUILD netbeans-javafx-9999_p20151002.ebuild 4717 SHA256 9a6e99d919c51b950269a7211ba0706b34e8089fb8597945b255382126897634 SHA512 727f3c917c81692c65527a7c0e5d85898614ca1d84ff3c3cb5eb57656b3f04529abb43c1db2c52074b1a52f99631d88d69c7680b1d01fedd3b827fd4ccf903d0 WHIRLPOOL 4bdef0a6873f39f737d892e8b32a0e2f5af57f52c268b97a0590dd512d27052756fa1f184a9eb27d0a02705a7eab5188e423933a6a13ef7f2ee526a710fe6ee5
+EBUILD netbeans-javafx-9999_p20151003.ebuild 4717 SHA256 03d1d9072581af463e15e1511386ca9fee31f1c0b0c6c61e8dce201ac8b8191b SHA512 49de10a7661e68b166520466b00486892a71d04e62910c85767933f1878c5663ded79da8ac826090b86225683d8a8f5a5bbf7c4355a37bf4606cddc08e093480 WHIRLPOOL 4fb2aa5b95f85a3f68ba998e7bdba9c97e9781c1422018a3c1143bcee7eb60f82efce783a4b3b2bb7fd5e81ca115565a97ebef34a4df7407c19b320ef8321c41
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20151003.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20151003.ebuild
new file mode 100644
index 0000000..cbbc0c0
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20151003.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-03_00-02-28/zip/netbeans-trunk-nightly-201510030002-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 6cd2dc5..8a0772b 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -19,6 +19,7 @@ DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c2
 DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
 DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
+DIST netbeans-trunk-nightly-201510030002-src.zip 208672397 SHA256 56d684334f97609098798fc2e9d2bb56073a61dcd7c91be398476163b39b7dda SHA512 18c9b136a3f2bdca433dcd2cf7d0cdba5a6428027e3bd884791278b55af4955058674eeba8c920739896d80b88fc5eb94b67695ac7b81e55878328eec49ae516 WHIRLPOOL 75af86ffcdb1318b46995d168b01d979e8f40f3351ec875dfa8732c7ace713bd20ee38559ea2f5d2558088573831d545956e4efd228eaf697d17a2b14f74c3f0
 EBUILD netbeans-mobility-8.0.2.ebuild 4342 SHA256 e9b4ff8fe38904346bc21a82219696e97322bf9df4e9d4cad2259b6f08bbe7f9 SHA512 338711fe61c469cee80e499ddf8c3ad70a3a38e6658311afcd1d24edd1a99b87566fafcbd392bb958b589796e0913d2574b07570870c8d3382a91a324227082f WHIRLPOOL 855b2817c36bea67c8fb368a0740be18b71dbebb2b98a154552f002a56eaff34f54eee2698379d7200a6042c1de699df23e7717b5b6c532776852d8757b74cb0
 EBUILD netbeans-mobility-9999_p20150901.ebuild 4412 SHA256 24385dc623efa0f82a8ac6b377c867cc43863d1ef24a67cf0a55840d22d24fc8 SHA512 cef8f1359a5a8607376cf3db54b737a637a2efb7e08a3ec34ef911403c3cbe7c3f6201674522554875d96e8870a6a53b9fa54f9bb4d920575b7fd870d00f4448 WHIRLPOOL 7ab52bd93e70de0c6b3c184bce62b22086e81d736224ce66a157c40a052a57d9963030916f96fa54c5be7abfbec33536fe6be968696eff0461d1900366c0acb1
 EBUILD netbeans-mobility-9999_p20150903.ebuild 4412 SHA256 7ba27bee1e24a5cae28b92bd03db76751ef9815e6b9ca1f48e93302e33753edd SHA512 90aa1332c367f89d6fd7cd562376baac469928b71d878f6974bd0435eac1238c49a8215a53286092331fe2b87dff24357928e4811b093bcef8307bbe90d6eb87 WHIRLPOOL cf8378b155e8661bc366ea56ae4078e2e5c0209f9eb1363202b3daa3a9ab531ad21ecee420ac96e62a6ecd006f4e80ef9da8095cce60e9a293c644923e432656
@@ -38,4 +39,5 @@ EBUILD netbeans-mobility-9999_p20150925.ebuild 4412 SHA256 e443173e1940e1f0fc4c4
 EBUILD netbeans-mobility-9999_p20150929.ebuild 4412 SHA256 ccf44b1222add6a7a1d0d73122438b43e8cd467849f208d32c23121bc3f79656 SHA512 b08c4d586f6200925bd6fd2e43c9068778a5f355617690b6e6c07c1a05aa903637b8624dff647d171f5f585f2cbb66e10567564ba39225851dbb572e113d1884 WHIRLPOOL 76fe5de816c67035600d006e222846814605a98e21af29c1110695684f1095d10698cbda466fb0276a5fd1ed58ec196f13e2712ca9427a201b94fcae60dc33c2
 EBUILD netbeans-mobility-9999_p20151001.ebuild 4412 SHA256 fa37c54076909decb1265c7a0f659d19ccb7f66021dc55262bb840d238bdf5ec SHA512 03783d0b84678f37f31e5739113ec02438161775854a05abd52decf8438cbcc29be6126d2926edfa8f65788a293884ea638b6a442f3552f1f0547cbb58560de4 WHIRLPOOL 534bb40d4aefca1435202edb8e4602a6aff3579043f404e7da65badc9dac4fcbb7821c5462d975cbea66bfa9a3e9ae84a8ca28428433385747455b61726e1eb4
 EBUILD netbeans-mobility-9999_p20151002.ebuild 4412 SHA256 df00ff89ea7e700ba86d2fa5200cfe2acebb3dd7e701e73ea0b46f7bf0bb0f01 SHA512 fdf208e110fbcdf52f7c3056348c1927d1442ca9186a432ea84b4d4650723d46f33bbeee7e3a291659675340f102c5f2b009115e68dfc604804c231be27d6c51 WHIRLPOOL db8eff616a20bbcfdd284974501986f19822e098fee0cb8825912b80c512ce6068e1c26cbf1e6f0917edc01a603f6f85ee2b1e5504a106b828c7a78531252692
+EBUILD netbeans-mobility-9999_p20151003.ebuild 4412 SHA256 4008de7070cbd2be6d3e73ebe1c214953cb79dd18f284a9ac8c5e7602bde1e37 SHA512 0cf6b7a3e152677b73e1b81c2cc37a23b66f70213ad567085b936bf1994d92f13270f9a210ec2d97ee4edb42ef79b2c74ea2f2c28ee740f20a2dec005a3a0bdd WHIRLPOOL 9f1f6eebaeb6cded573a16c0e87bff20cf8166767e676fcdc424a13a68a809d7d99d271545365e2eae801c5e0ababf0e455de67d997007b43cb2af2bf4981e98
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20151003.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20151003.ebuild
new file mode 100644
index 0000000..f9aea08
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20151003.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-03_00-02-28/zip/netbeans-trunk-nightly-201510030002-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 75bbbc9..97222c1 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -22,6 +22,7 @@ DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c2
 DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
 DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
+DIST netbeans-trunk-nightly-201510030002-src.zip 208672397 SHA256 56d684334f97609098798fc2e9d2bb56073a61dcd7c91be398476163b39b7dda SHA512 18c9b136a3f2bdca433dcd2cf7d0cdba5a6428027e3bd884791278b55af4955058674eeba8c920739896d80b88fc5eb94b67695ac7b81e55878328eec49ae516 WHIRLPOOL 75af86ffcdb1318b46995d168b01d979e8f40f3351ec875dfa8732c7ace713bd20ee38559ea2f5d2558088573831d545956e4efd228eaf697d17a2b14f74c3f0
 EBUILD netbeans-nb-8.0.2.ebuild 4927 SHA256 7531e50c4d76608bf925efdba4f54f522de3a8ceeef4d48807fb4ee48bfabdf6 SHA512 925734f331cf228066c5c9e614f48b756af31cac8b559cfe756347b6a2cb0ce362c7c41489a25084f2ed3f2e415baefd148a54f39fc00269fb14179efe056cb9 WHIRLPOOL e3224c5f22bb8e4792a5f98bbe819e071ff18c99533ce05a3fc1c5898ddcca1e3ce34487ba78159bb4d60155acdf15ae4fe81189ff2d5b1bc77ffd9ee4e20aca
 EBUILD netbeans-nb-9999_p20150901.ebuild 4997 SHA256 4bc20abbd79e622dae684777ea3942b19cdb96e94d76cae254b9bae919055997 SHA512 9eac2a9adbcb86bde4662b9edbb874ba820db2e622a0f4e436a570081cb49e664958e3e8fe6900dbfcfd44a0e1b33047fc25a536e93781b8e9b303ae9738bc83 WHIRLPOOL b83b659bbbd93f830039465b737c190e5031e88a634523f3e2647715e4a5b953d3469ac1c760db9613f3d6987157d89b14f0e740da228c0436950fd339d53ab9
 EBUILD netbeans-nb-9999_p20150903.ebuild 4997 SHA256 f2cbf0e344be20488551d7ad04e8c1f2452c03bc7f6f1e3db68527924c3a9b4f SHA512 f7eb44514e61a0e30d546d43caf3e2239da9faa0e59d6c224df6a102fd194589079833b980fcc719982faa9a35c2fb60dec1cf77f327926955e984e633fafba1 WHIRLPOOL 4995f7d9e24ca16d1d7d5a863692fa221b252f2185beac1c6ca908b3ea731a94f7f150affd8cfd03d16f2f7eb620be60833286d37a8d4b71a1e6b8eadbb32f50
@@ -41,4 +42,5 @@ EBUILD netbeans-nb-9999_p20150925.ebuild 4997 SHA256 dff8097023e878707cd6204eee0
 EBUILD netbeans-nb-9999_p20150929.ebuild 4997 SHA256 cab36248dc89114c1bb44ef8d7192ce16c893115c5a03a26dc24518e2ee795fa SHA512 5751c433804a46b8f3b7bf86f6299e50ea9d6c073101dbe73a1b28dc6ba822e5d9b77be21fe3b7c8d6d21f4aea09917a3e35438247782986665ae9f6b85e2e38 WHIRLPOOL 75afd81d5c8255c8415b125506624ab3ca80dc4fa387511460bbfb21559a59ed28bf5041dced0bba86f1d98c875a0982ec64d9b63654b620cceeb9ae72ef6456
 EBUILD netbeans-nb-9999_p20151001.ebuild 4997 SHA256 beee62184543011b39e38178684cb39843804f4c34e3296fdf163da2288891a6 SHA512 d21f566eff13f763bcb2c99d16f7a713254d3251eb6c9131acae6b28bc4658055e20d137eb6d526fd77bec7f76d42c1ab7fcba967891e68c42ccd0e44d0d46f3 WHIRLPOOL dbc5168e83e57f4e137b5d29606a10f800bfe50861b3ba80ff05bcf6f8fb74840dec8a10d9717875bfaf32aed11a978169e41962443724c090c5e35230a2003a
 EBUILD netbeans-nb-9999_p20151002.ebuild 4997 SHA256 9ab3d3fd8b6c8ed179f38eb1b4b91adb1097bafce9fdb19fcd070f6e012a846d SHA512 b4f77eedd60ad27e2b79c979da933504c796531078d7b31537a04a16e471baff40fd64866445afdad95c780e27c19d6e898b411c947f84fb6eaf81ba70720a51 WHIRLPOOL fa901af75d59511cff43f7dd67a01ec4dffdbaacb77f64efe08ae28b7d765b377350bb17c7353b285f150bfad33bc9bdff032c08655c9209c506722cf540db35
+EBUILD netbeans-nb-9999_p20151003.ebuild 4997 SHA256 4a3f76f876ef86def5c520bfe25862b967c4a1541afe3482249606b3f25bf834 SHA512 8b7394269188b4ca4fc3ae1c57b8433d1fcbecfec83a65ce24784f15677417c9023a290e13c2815bed8366d9059aaa958e3e8010a0a5c54e1ba6dcae2991babe WHIRLPOOL dfd1bc86f95779e9a8f0058838a3566153b42095f3c4fac7763eccbab6fee0612053c3becb53d01d4000c314a4299c17653e816007a1b51d262e6b39409b9e47
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20151003.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20151003.ebuild
new file mode 100644
index 0000000..91e766e
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20151003.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-03_00-02-28/zip/netbeans-trunk-nightly-201510030002-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 8d4dbd6..320babb 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c2
 DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
 DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
+DIST netbeans-trunk-nightly-201510030002-src.zip 208672397 SHA256 56d684334f97609098798fc2e9d2bb56073a61dcd7c91be398476163b39b7dda SHA512 18c9b136a3f2bdca433dcd2cf7d0cdba5a6428027e3bd884791278b55af4955058674eeba8c920739896d80b88fc5eb94b67695ac7b81e55878328eec49ae516 WHIRLPOOL 75af86ffcdb1318b46995d168b01d979e8f40f3351ec875dfa8732c7ace713bd20ee38559ea2f5d2558088573831d545956e4efd228eaf697d17a2b14f74c3f0
 EBUILD netbeans-php-8.0.2.ebuild 4347 SHA256 585b2488d748f3d0f87c17c951870e167aac7bf10847428add786e4a8a446583 SHA512 1431305d4f340cb0a2c7c896c54d45f6f02ef82a4201f82053278b98511a5a4a68210317530e9cdf5cf1f495996d3a3f9c4b2c3c479aa407abd375072ab3182f WHIRLPOOL af8476f2ff2d119f2657e6be03cfea1160f86e41bd791f40609f1bc8a8aada46ba1081e4f2417b0fddde931fa4e43d20956c0fe1d4fdf3617b78d01afd23f9b4
 EBUILD netbeans-php-9999_p20150901.ebuild 4417 SHA256 b6f52a63053c7f6d74829800396e15d463a7316c2de194bb0e243385eb8cc95b SHA512 b783d245589b2f43d616f3e3af5ab8bb0d9c5097974c640f8d22996b8185eb921edb851c174bd02a17ef0d29c50f0db03c595b5f23bc717dd3b2c4944c7fbf73 WHIRLPOOL 00d18b2b7f6bff0fcf8852a6137df8eebaa99885091a6363628b7ae18dd9c4ec18e3dfb75f214092be4cde7fe7c1150889ee8c173751089af52e8710f67446b7
 EBUILD netbeans-php-9999_p20150903.ebuild 4417 SHA256 e7c715d04d186e6e62d408485f33ee6c94ec5a76969d95de552d10e590b94940 SHA512 44abb97abf1ae49840e20575bd05374f301870892bde53213df37d5a0b21bd6d9691bfc9f36120225d357572ba6df840cd4ef5f5f5492c24e5ef25f57f64624a WHIRLPOOL 35a1dcede6c295345409ac71f20c53c41b772a523d91d91bcd9b20369bc203e5f7f79e1ce7e2a72bb3cbb50ad693dfd8ad77a4ba22eea72000d70dfa593dfc00
@@ -43,4 +44,5 @@ EBUILD netbeans-php-9999_p20150925.ebuild 4417 SHA256 ffb384a595a952da0310361c0c
 EBUILD netbeans-php-9999_p20150929.ebuild 4417 SHA256 5fd717c5b28d9317a83f6a634ad143f592c7749caf9f51d63a9d85b5ca0e145a SHA512 699074f43790af084f366351616b2c864b65e928a26838445d018d01f6bfb031601afd2296e0ff2d483b6b2b5dfcec79c5abb75f3ac050e578e1405c6465bd8e WHIRLPOOL 2f2315a187732006df6b26f2b633fea1cab8d6290e164f8ddfb567d20a577b3aee4d1fe4d02c1b828fe8e8def28ed2959977aa3c0354a90c8092fa425771a40c
 EBUILD netbeans-php-9999_p20151001.ebuild 4417 SHA256 df6044e54831ad66583fe0f1e8ae27d25a6dbb768829230ad2f21e3602807732 SHA512 fb840cf50a278f6afb1189e3263405b6dc2404317d677b046e923e01631b5ee1afb476bce60ad647f74cbf0b3560963689cd6c369215a29033620c971d8f94dd WHIRLPOOL 9ebefcf91e9c7e6dfb5d095df07267405caa3f15f5e103f612704cd3658ebaf6c83a2e06b448517c4adddbb34bc6fc0dac4d87f8f9d1c2f54a03bd7878d2fc2a
 EBUILD netbeans-php-9999_p20151002.ebuild 4417 SHA256 d8723db67e98daabf5df80b39d3ccbbf3b657f74b61e79d6676f2af21fdd2fd6 SHA512 fcbe482a156e5933203a13e6c1f54c565fe842cdec988c114c0d69a6c30df680eab745b1b8cf7be68840e8579c9ca8c4fb5938c91436549d509e37300f05a839 WHIRLPOOL 0f390b8e7ce548787ef87a36edbc417f3a436fa0503871fcc11d6d884e37ec0a7ddd2a9a1481c316a11d575b001eab10e34437277474bf0e990c9fa6241d20e1
+EBUILD netbeans-php-9999_p20151003.ebuild 4417 SHA256 1f9f8c33446cf1f316f2f0761f41c231217fe0da960ad4e6e34f3e576b9368c9 SHA512 cc5d7f7b566d0f406abe90af53ec07b8068a5c2838d156389835b029bf96e935e16bbe33cd6063c6eaa5274df4f04a7b00a7685e7ce3b6b63799041253e32482 WHIRLPOOL b85744dcd055cab0c5f9d609493879a01306d759c04a8e192699144a211e02376732f5842a48188f6b6335c36579c0178c7c0f4f7e44e03b6f84dec4fbac6021
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20151003.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20151003.ebuild
new file mode 100644
index 0000000..2d672ec
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20151003.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-03_00-02-28/zip/netbeans-trunk-nightly-201510030002-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 a8d0ad0..57698b4 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -59,6 +59,7 @@ DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c2
 DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
 DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
+DIST netbeans-trunk-nightly-201510030002-src.zip 208672397 SHA256 56d684334f97609098798fc2e9d2bb56073a61dcd7c91be398476163b39b7dda SHA512 18c9b136a3f2bdca433dcd2cf7d0cdba5a6428027e3bd884791278b55af4955058674eeba8c920739896d80b88fc5eb94b67695ac7b81e55878328eec49ae516 WHIRLPOOL 75af86ffcdb1318b46995d168b01d979e8f40f3351ec875dfa8732c7ace713bd20ee38559ea2f5d2558088573831d545956e4efd228eaf697d17a2b14f74c3f0
 EBUILD netbeans-platform-8.0.2.ebuild 5406 SHA256 98e9861da45ead0d2d975a0527315df5282870b2d7e71a089724d91c18852e81 SHA512 cadbe66132d3ad81f6d149e20731b558c11c529e2ec15b1fe47ff97d99a3f4b4612fa5c98c435c4ff979eaefab6702721db009a03162202c96b4b411cf9f872a WHIRLPOOL 9552948e8bbad308f4379eaae69d8c214da9fbfab87d75226949b69ddca3e68c2d36c4d05738196073e5b959ab0b764064c9186d421198937122aa4bdc4988dc
 EBUILD netbeans-platform-9999_p20150901.ebuild 9238 SHA256 85c58de49e8cf1c2202b5f892c9d9283587f255c58c4835f2169dce8b767967a SHA512 5d90e804870b94de49cf76db7e99bd2564f2fcd9984e9dc0b1f0ba02c5a66a2b97e0e59ad0b986d8ef055fb1184ab35998248379b76a456f576df5f87b90f81e WHIRLPOOL 4a74b24b3e8a975f1eff66d95406c629bf860b1956937a44f33eb2d92291d2dd95fb91dd8c34f730a35d6daafa9d16a67f2ed2a300c691d5dcacfd8f435b5185
 EBUILD netbeans-platform-9999_p20150903.ebuild 9334 SHA256 2e3f4bc8579db348c5b81fb1460caec924efd1c59ee4e980f0606673944d0efe SHA512 21e7cd36c60d7ac8d6ac919203d9d0fe800bf02c5d44d7f450f2005a6da86c1ec3ce50cc8a3577af144618964e0d2b9a9183f2957fdfbe087e2e5eefc4ff4186 WHIRLPOOL 1989aeedda0e97d37a5e99ec99899862d057fae52eafa789ef100c80f5ef30339a01f9155c9fb3be7fd3d91a693136eaad259b8706723a7fda51ee2949378eb2
@@ -78,4 +79,5 @@ EBUILD netbeans-platform-9999_p20150925.ebuild 9382 SHA256 fd582358cbf972f4b8f45
 EBUILD netbeans-platform-9999_p20150929.ebuild 9382 SHA256 b29cf8cb3b38d906e7d870b2e8a0f79de51b59a8ed082a55ec01129ed53a5ff2 SHA512 a0053fba65bc66c9b2f76686ec34f56b07b83e85421af3c2ff2a9b072e2194ecd0e4721f10dc3331ebfa41adeb3176216bd0b0f36a2af494d5277a2d24aba743 WHIRLPOOL b22bfb92f917d71a3b4d82710a8baefb0d1223152f0e3e49c854dc1bdd3210860d47294989719aca12027139d6b81f23628b9d979a8849db1238f6cf22787584
 EBUILD netbeans-platform-9999_p20151001.ebuild 9382 SHA256 b240d296480c76bbb7064369bd251082dce9e7022846023f345c298d6918e6bd SHA512 7352181ac30b2c867f1a194a36b9ed8bb7df74b2b6b34995327455bcb64603cb94d74c6c8c19f7e0cc8ffefd190731c377e2212661238eb5a0522af5fdd2cf06 WHIRLPOOL d69c8f39aba08877130d96a9a5230be8a201a1cc078648bfb88e718a2042896ffc12d3f2834f40c277cdeefc6f1c25db27dbb3043bceda2c9752d8c044804ef4
 EBUILD netbeans-platform-9999_p20151002.ebuild 9382 SHA256 c854dedc40e4b219058d81b09e6da2efd6ece66af76c1adaef5fbb99c410fb49 SHA512 e3bcb6d9cd44f8987ba9735b0f229123bd3936b070ac81938911c26112961f84c7fba8131ca8557f23a53524f0959074cd928391c1a9718b40ae3dd6d4455c63 WHIRLPOOL f0d6d44be2b67bb4ec1919c704bcd8da4f6160d133cf1e469ced3383dab50a04b9d5a3ca96c134e165913931f322234cd0aa649beb21e1a1d95b99c1906b1ece
+EBUILD netbeans-platform-9999_p20151003.ebuild 9382 SHA256 712a25e3f8b9e514688ef851c975e4577d291be80ea238f104774bec7bd8eb88 SHA512 0ddf1f958cbfdbf9e8500450625df7ab3ef1a452b5272c23e80d38f1c40de246276edd6da3fb3198d8b0a8c7d5e6a375776f99269336e71e87018577f0d24c7c WHIRLPOOL 4616082e1d8f0d97e104d23b49aac0dcf3b28d5d46997031b95533a9779b05f4020fdedbfac0f341e79ff04b78723ae99663aea2a9fd713959ac0f33c1141097
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20151003.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20151003.ebuild
new file mode 100644
index 0000000..6dcb461
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20151003.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-03_00-02-28/zip/netbeans-trunk-nightly-201510030002-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 f2001df..b176d00 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -19,6 +19,7 @@ DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c2
 DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
 DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
+DIST netbeans-trunk-nightly-201510030002-src.zip 208672397 SHA256 56d684334f97609098798fc2e9d2bb56073a61dcd7c91be398476163b39b7dda SHA512 18c9b136a3f2bdca433dcd2cf7d0cdba5a6428027e3bd884791278b55af4955058674eeba8c920739896d80b88fc5eb94b67695ac7b81e55878328eec49ae516 WHIRLPOOL 75af86ffcdb1318b46995d168b01d979e8f40f3351ec875dfa8732c7ace713bd20ee38559ea2f5d2558088573831d545956e4efd228eaf697d17a2b14f74c3f0
 EBUILD netbeans-profiler-8.0.2.ebuild 3402 SHA256 8021dea620d1bc26214ff0ec285f8061c24693dd28a62a97a48ac3223707e920 SHA512 2660390337a973256b1aac3a02b14e16782c230fa2714ae695213b0cabc0eb60621c6a1ae234f9e57259a19de22a87447f9a89ab846bd59bcedd2be313c35072 WHIRLPOOL 5d1053ded03143b2de05b64cfbe59b515cb786d60bfa65566be795567bfaf5feb88a2f8e7161a05da512fafd523f871778d5ddeb3c6b89fc95885096e379f65d
 EBUILD netbeans-profiler-9999_p20150901.ebuild 3472 SHA256 2463f091c9f090fd538ea9a18cb2fc00819c7e8d8b3780e0bbdff4a426fb361d SHA512 40e7d264ee795e18ea90278e8e1d792abbe6ad4c4339d76ffbf63dd1126b0c5bedcd259741dff47c624a415aa7e8c57c3d8ef192d74b69373b6bf3ec574d6691 WHIRLPOOL 1d33cc1f24c6b8e3dca00668fa152b5956490d4eabc60bcae55adcee1c45950c02c0ab19daadb7b3691fc0bc908be618f56af9119243770298307a398b181442
 EBUILD netbeans-profiler-9999_p20150903.ebuild 3472 SHA256 9c439061ab5f353d42cd066cc5793626222b9e9e9b40b4217427498e7036ac4b SHA512 0c0cf3b94565f9dbad4cca20fb9abc672655e8a032c4d53794d9db03cde7b400d41126d3eeca82304952f488d232f041675fea7ad417b4f2faa9c5e24bead22a WHIRLPOOL 97d96c8613ed98c787251b8a0d4a556ffb47cd477449044c9dd8b535c9b632650870b70ee6816604701884a83c19f869db0256cb7c1ff83c6af986a22d21a5fa
@@ -38,4 +39,5 @@ EBUILD netbeans-profiler-9999_p20150925.ebuild 3472 SHA256 fa9dccd6939559f3155e9
 EBUILD netbeans-profiler-9999_p20150929.ebuild 3472 SHA256 b82e95aa6e5265eac887b1552e68e10c3884174df66c447248444eeb2d90b48c SHA512 f4d5664b8161020fe6f360dddea06da25b089d690eacce71024d3e4e8a4ad7b3bac0b07ef15729755869e260937b2af80aabe71b06e386bfd85bac0acb548171 WHIRLPOOL d8e774ebefc407e6ce206c282abdf00b6517ba236445d334b1d9028d7d50eba0b011fb19d1c46894e3c94d4f5551fd374ddd5c5c7030abf3d62c890032431fbd
 EBUILD netbeans-profiler-9999_p20151001.ebuild 3472 SHA256 1b18ebd1d0c854f9c64c65a1a28feaf75ed2a361ea47e30504efd1c1b31380fa SHA512 81ae8b10fcded109712ffbafb154be971dac86ce1085f54b94bf3cdd67e2b9af749fd0d4aa2810cf0cada6dfed42a704b92230251a3ace47068030ca6aea5dff WHIRLPOOL 37b00b190b836c33666ce47d6f36d8cf9b4f32e0e812fc4f3642f5d2eb154780019cac3228f88ecd83ed796c79d5628ce72a5f69a350241e7d5d7496ec6f0f5c
 EBUILD netbeans-profiler-9999_p20151002.ebuild 3472 SHA256 9720248bf90bbc4decb48481ec3e8c4ffa1c84b6b7feb728781a171540bcce0e SHA512 4e3a9f84c42dca79952c2ed8d6fa19e536d46fda7c8f3a6626ef764b31c5d8903831f9e3a3d665840ec8ee3c730cf5c613bb27000040518c6d74f92081274b30 WHIRLPOOL 27c33660b378c52a89adc216a468c740fa45fee8bab23e861b7dbf3b18c5400acad65dc16c6c22b94e8822dc7a62ab1996d84475ab723eb5db832805963683fd
+EBUILD netbeans-profiler-9999_p20151003.ebuild 3472 SHA256 2b610710e7f7262ea0e901b77046f63c73828fe76ca32d40f03fe795fb4c090a SHA512 c332d809aa77f1a232b2a9a0289fd25b0534ef741629fb8fe5d77a76139ad042085cc4deb7f30a6a1355b3ec664514144cf2bdb5ca477e9dad11da3b9c3a7903 WHIRLPOOL 2a5460186493fd25e5af63b921d94e94652179149d616ddc7ce5360138048dfb01a21caa276bf0f7a7111425ae605569b757bca698244dfc7c184f886dd0fa66
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20151003.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20151003.ebuild
new file mode 100644
index 0000000..e251b52
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20151003.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-03_00-02-28/zip/netbeans-trunk-nightly-201510030002-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 31d54fd..247f40a 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c2
 DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
 DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
+DIST netbeans-trunk-nightly-201510030002-src.zip 208672397 SHA256 56d684334f97609098798fc2e9d2bb56073a61dcd7c91be398476163b39b7dda SHA512 18c9b136a3f2bdca433dcd2cf7d0cdba5a6428027e3bd884791278b55af4955058674eeba8c920739896d80b88fc5eb94b67695ac7b81e55878328eec49ae516 WHIRLPOOL 75af86ffcdb1318b46995d168b01d979e8f40f3351ec875dfa8732c7ace713bd20ee38559ea2f5d2558088573831d545956e4efd228eaf697d17a2b14f74c3f0
 EBUILD netbeans-webcommon-8.0.2.ebuild 4723 SHA256 e2ba39cb6f22c990acf9a492eac5707f130382d56f9bc1e3636e82cbe4d61938 SHA512 61955d38f829b3ed54bc5cb9a71da07f05676a2bf7219fa8073aeee0f0e2d0e73f7aa6ec1636be39fb071d3d2b9de7ceb813a247a61961874f4cc78697d4e568 WHIRLPOOL 1a272650fc2394716a790b79cb85a9322929c7cc96ea4776cc639fb869c5b536140dbdc632b1a8aa9cb1fc8e740050125c2ebe9390de7a8f4207e88e24924206
 EBUILD netbeans-webcommon-9999_p20150901.ebuild 4991 SHA256 6a58d046976202f9630b42e133fac192593354c8620dfca0bc5f6d5eefb41b63 SHA512 c7d0da7bf9bacf40c8afc1ee6543749b0f30969abd398bddc9109f18e29f93416496d0e31c837358412f1de192953972b3a4ed7f709789dd6abcff9f63b871c6 WHIRLPOOL eb9eefc3b2fa66241f1035309856f3b68c3373cd355d3d275b5dae7bef26d53a93628863b081e4cbde480371dd72a037ce275af31947069fce424c563866e267
 EBUILD netbeans-webcommon-9999_p20150903.ebuild 4991 SHA256 b12f68d20eb276d5787e83ba650885835308517e4de0553dc4bf16487ef5d974 SHA512 5f4fb009a589c9bc36a2908d16009b6d72f476e5fcbea52fd21385448a58335a033ad3e58a410173c0ac029e892db0d2ca2081ae8bd16bed98b62d121690d237 WHIRLPOOL 1deef8a500b05468cf6f3c2623cc38eec880bcaab1dae9ab51ff4424018465db71ed37c7146b289451558d54d858f4246ec3cfb80feecea0e1f42306c105b4a4
@@ -47,4 +48,5 @@ EBUILD netbeans-webcommon-9999_p20150925.ebuild 4991 SHA256 898ffb39893f2b26f357
 EBUILD netbeans-webcommon-9999_p20150929.ebuild 4991 SHA256 b9fdbe32b8e5dc4b1e1a4f16a2d80bb2f425e507c6b1689106aab8b351da11d7 SHA512 f1e52cfe14c29bf4e1fb46ef7b3301ff8b652eaab11042eb028ea5cd8c7c88c5b04cde2b4be80ce875a43d20add697b92e816b6651114f22957800ac59f45b18 WHIRLPOOL 6fae77bb36b63aac4978569e0280c60f9cf518accfe13242b62429550b4f2706bed53ca25b9242099bf30826a193ebf313462747622681f1ae5f48e2cc9ddd20
 EBUILD netbeans-webcommon-9999_p20151001.ebuild 4991 SHA256 03578dcdaffc4652a45f2a97a08c8f283bb1e009f819b0f82d597077e74ba12e SHA512 03100ced6d732824efe800c39fc46c2d021bc1888f6c8b957130ce2adbf70b1abb45ab10f40c5329f3c097b85273177ed791a3740cd154b6d4681b4eacaed29a WHIRLPOOL 0696f5932e0b798bbd1c58c3e88994ed8c77cc32432228ddca59308c79bdc6908dfa3e2dc52a3b5e2a7a0aa028c8437848603f18459f2f66bcae2fcb312dc07a
 EBUILD netbeans-webcommon-9999_p20151002.ebuild 4991 SHA256 54fee490d088d97cfd8e125ed8357016a754a5b2683be61b85a54435156f41df SHA512 6231875af243909443999f7bda9c6fa199ed02258d8ae96406231c197b4facf3f4745c7c1dcec251b5c6117b5c209508becf8d6fb42d550a178e73c4b8562d71 WHIRLPOOL 0d1f347ad7ccb52246fc38d8a09b68067b98bf7c9c46ca73e7533dd499c5246914b0523b60f680bd518308617caeced87edd49157a4b255460d7ecefc35f9b68
+EBUILD netbeans-webcommon-9999_p20151003.ebuild 4991 SHA256 975a094c71ca5e9e41b44965ee854077072fe14299f151b8acdc3c0812662cc8 SHA512 2dd52d88f70c315ab5afbfc7520f7275d402889a897338c528d00df91860dd01f5c8f06da6ae960eb0d7fdca3b225f4639480dc82bc9b9ddc4ea0a45434c37a5 WHIRLPOOL 988399277abfb0e5f32a1ddd3ce3721e4f85d7b82dbbf17de7858d96abe1efd2dadf045577500b1384d17ae416af5b2bf54dd56a57e0f4555598e1625e82e89c
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20151003.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20151003.ebuild
new file mode 100644
index 0000000..f8afb9c
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20151003.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-03_00-02-28/zip/netbeans-trunk-nightly-201510030002-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 5a15330..c5bb3f3 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -19,6 +19,7 @@ DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c2
 DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
 DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
+DIST netbeans-trunk-nightly-201510030002-src.zip 208672397 SHA256 56d684334f97609098798fc2e9d2bb56073a61dcd7c91be398476163b39b7dda SHA512 18c9b136a3f2bdca433dcd2cf7d0cdba5a6428027e3bd884791278b55af4955058674eeba8c920739896d80b88fc5eb94b67695ac7b81e55878328eec49ae516 WHIRLPOOL 75af86ffcdb1318b46995d168b01d979e8f40f3351ec875dfa8732c7ace713bd20ee38559ea2f5d2558088573831d545956e4efd228eaf697d17a2b14f74c3f0
 EBUILD netbeans-websvccommon-8.0.2.ebuild 2651 SHA256 a195b307847c466dbb5f46eb04240358ce3c92cadeecb8fda1562304de46820f SHA512 933626bd2073f58e3508180c042e237b9e61ba6f3c992cf37ea43978ac2fc972d2dcc3ef0b5c390b3867296e197ed2605c43452c98e36acf0982e7338b6d1eb7 WHIRLPOOL c3db8f0b50116d0129f50778e1961166e76601d8c165e20e73d75c91b02c8a095067e0f13e18178d849dd29adcedaeee7d3e0e62f99be592d7ce159fd6af632e
 EBUILD netbeans-websvccommon-9999_p20150901.ebuild 2721 SHA256 1b1853b108ea504ea98052027c51e2ab8e55853bc016e1b288f7d5fdfa937ba9 SHA512 f914e9d3d8060c6740ab305233379a6c5cda835a09d1ad9c2d5e4a37fe7154f560899b4dc4e375b4a1d8b724102b522eb02529d65ce562afb914cdabbeebceff WHIRLPOOL 2eb7a4627b93b6bb8bbc033a6e941a64452a5c6377e28b86abcaca6b6be76ddec7df0950e7ef5234f5e3d6addb3dd191cfa00f6fc18b4442a2d7c1e6b27fa19b
 EBUILD netbeans-websvccommon-9999_p20150903.ebuild 2721 SHA256 5b548eaf95bd714f2b32bdbf189f8a5967ebb9ff9f4472b7dec07165540a4bf2 SHA512 d4e19899b1df32711eb649b10bb66ee7daeb463ce87bf330f3405e02788e7acea6a8573aacd2f17c5e09c93762e627dfc88b1f331c40280761cd0bd1d2b0339c WHIRLPOOL e6914d11ecf33f57de66f4bba5f8689f0ffc0ff40df29ec98cc6a0b731cf7c73096124e67433205a3fafaf744cc8b9c0a0361c905be1823b0dbde7e85bd52a66
@@ -38,4 +39,5 @@ EBUILD netbeans-websvccommon-9999_p20150925.ebuild 2721 SHA256 fe270a017f4b6b3dd
 EBUILD netbeans-websvccommon-9999_p20150929.ebuild 2721 SHA256 d15de36d53545f1c122f54f381b40daa574e5cfada795c9158b87634e9bc9928 SHA512 5a55315891a9f0364ba24c461b55e2d5eaa63c1fa4d01f4d722fc4eafecdb5888497f7b1a8f9fae87f523883c1bef7c6f40ca35d5f991efaa4c54f5f463459fa WHIRLPOOL e749767e1816d6dbae0cb14b0e8a64d7ebe664cf2d79b1cbc2741aff0e20cfb8304fc68b20feb8c7532345711d1de8ce58fbbbcfbb2be50760f1912ad1596e22
 EBUILD netbeans-websvccommon-9999_p20151001.ebuild 2721 SHA256 d9ac82f799c5e4846187b6eafc244d07065c2dc90ed1d291a75878f13b389dc8 SHA512 c6306a45f10908f3d1858ac840ae9a8b6f68928a0a048213915772516c7a321061a48bf6dbea85e51cc03f91082aa6c381a339356df0d8325fe1d1ece56e5294 WHIRLPOOL 5f0921b9e5e07014ca30bfb5acb988d6c44517436fb8e16977a446eccd203605e7caaa79fe9484caffcebe512a4ecac1c261b238324a0c2404829cc48e94bb97
 EBUILD netbeans-websvccommon-9999_p20151002.ebuild 2721 SHA256 5fd1f31664e98cc5083e865ec1b21c5901970dd393b1cad78e854f6edc6bc523 SHA512 36b92cbd7cfb19bdbdbcfd102e83608000c32c241e32e30bebbbce639c0edc145c3d22c0a91682a0401fcae5def48f89dd58fab049b057cb144f5e050c14999e WHIRLPOOL df9eb78699ef7b80661600e6afb4a705b7673b74289468ebaf18880453bcbb1492f322b974670ac726695aa785eb9b3b5582d519a771f0cafedff1a4f42632ba
+EBUILD netbeans-websvccommon-9999_p20151003.ebuild 2721 SHA256 0d7cbb5ae2387d2059e1e1837f688b13ce8bb75e60143675ea32642e51d05793 SHA512 0b5a17ea097691113830a527e2da9e3482700f975e518b4eb2fcfffbba792b34078f0ef013f50881ec07d3ac5fc65b0679482d20d6c245b8bc1939b30bdf86ef WHIRLPOOL f15afab3d3dd0fd6bc6d4f66a92d3b01f32f3b237ab8445e0ecfa08c250be476461fb72941b1ca86256670a0ac3f5fc44a70e1326d452a7c88ee40fcad829a88
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151003.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151003.ebuild
new file mode 100644
index 0000000..708f807
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151003.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-03_00-02-28/zip/netbeans-trunk-nightly-201510030002-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 ae82690..33ba457 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -21,6 +21,7 @@ DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c2
 DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
 DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
+DIST netbeans-trunk-nightly-201510030002-src.zip 208672397 SHA256 56d684334f97609098798fc2e9d2bb56073a61dcd7c91be398476163b39b7dda SHA512 18c9b136a3f2bdca433dcd2cf7d0cdba5a6428027e3bd884791278b55af4955058674eeba8c920739896d80b88fc5eb94b67695ac7b81e55878328eec49ae516 WHIRLPOOL 75af86ffcdb1318b46995d168b01d979e8f40f3351ec875dfa8732c7ace713bd20ee38559ea2f5d2558088573831d545956e4efd228eaf697d17a2b14f74c3f0
 EBUILD netbeans-8.0.2.ebuild 7167 SHA256 80e31382a0ceb680c2a055dc5c78c1dce8edf32c50bbae6a1c14a2c568492519 SHA512 0ab466ca247ec953896ef0ab3b01b43ffea3a9f37e9bcdacecfc0476226d45cef35e4ddf27f2b85628d9512ed304e6cc6cfe963a5e547217d08cad400eefc4b9 WHIRLPOOL d09668e669f4f8d7987ab02cf26104fc6e54ba29b8b497fe0013cc8816a2d7560c99e6e1b02db77ead872d5240b84c09e3fabbc3465587d1d1ca7d6fcae114c1
 EBUILD netbeans-9999_p20150901.ebuild 7210 SHA256 aa601ee01f6fb1485234688933becffe18ee2d30af5045951a2bffc2f24f849a SHA512 98f00da7d90c3425cd718c34d65aa46980a9c10f50dd34a01a1776d1a1488e92b9e657210f61e45724b6c9358a36a44a2fbf8ac5b7012012d163c6c91f7ec421 WHIRLPOOL 008820f5bbb9077bc739629262c1e24bbece9c55b50c270c76c3900424ea77e0dca4a33bdf32535b506d61dacd951f65d669485321837dd83234404ad9143594
 EBUILD netbeans-9999_p20150903.ebuild 7210 SHA256 73a22280e3cd8d717bb224ba8c243faa59493011739522863e3e93b83def156d SHA512 87214a421b60dbe51dd45b0124ba463585096fe7f7820fa48e0cbf7d55b3d3080645ecd9dbd4679d7968a9b90d1ed60b88bbc3e50109a00e3c2a7ea8192ef0b2 WHIRLPOOL b820124da7676168df3529566db7b2ca095972189a1ba848da238caae7a93947c0c664af310edc722146d2daaa9fdab9bbcc5b3477207664a5193c003f289c09
@@ -40,4 +41,5 @@ EBUILD netbeans-9999_p20150925.ebuild 7210 SHA256 024e11a350dda40eab393cc84e6a9b
 EBUILD netbeans-9999_p20150929.ebuild 7210 SHA256 102d914cac1aef4bb6da019493079610246f7b4414012277a68123bfe8147bde SHA512 b1603770130c0de5689f44e9539571142a8bc36546626996d59263f6ea5baad37a15ff2da3b5db1a11bad48ad3780bd92593b4e4fcf82b790762441ee70c39e2 WHIRLPOOL 3bf996c82f96a0b1ab99790de6e6fe57bd9967c6f497bbb214f82f271c73af60eea2cb5a664a263fd6e3ca7e6c27100e4948eadc484822dbce2c3f491983734b
 EBUILD netbeans-9999_p20151001.ebuild 7210 SHA256 def45859122eef44a348c1c45f165a664bf7490d2b86f0a3eedb856f59aae4d2 SHA512 5bf3d55dd64c75d567bbce039c729d924964f3ea8daf2b39bbd370f2c1f830bf8ce571281caa22654a43a39dc2f909736bece02b0c58ad020d3fee7d650fdd80 WHIRLPOOL 4c134a94ecb6dd5a35944ff0108135f4e0795bbb792bb6617b29db3a3348a41c001e28b2321bd0b69207e10e69942e18826213fce7f50cd0d526ae8cdf1ba8fa
 EBUILD netbeans-9999_p20151002.ebuild 7210 SHA256 c35dc91ef0201c2f45dbc2478914a7e4c89a7008fbee4a64d21595c26546266d SHA512 7f00d3e89966b3e713f9a888f5de7d5a1312e56079e18d5e5a9cf6eaf31ec52455f3d3fe0075e0df719f1419aeba0d9d39d906854dda5c22c0f4319206cce55a WHIRLPOOL 3c69bd92e9031c4e1fd32ce6e65538693a3493ca3c43571c6b3d8ca8519337409bdab4388054f30c15def817b7b02375b6b3fa095c9f943d81b54e2b9f7a6a52
+EBUILD netbeans-9999_p20151003.ebuild 7210 SHA256 73b26316fcaef5fc94acc2765f090985a2b67ae2518ad939cc3e420d5c3c775f SHA512 2d47a4742a550d1294374d9e4aa0eaa503f678af178269a56ed440f068fa396b0a6c87cf20a3d76d43565263ec93e15c950f62c0c3193643d0a3fc965e359fce WHIRLPOOL 14abe78c8bf20ff9dcb8a34a1a5daf901f3037ea37f67ebb93ed88aff9ff7a204e58563c0790cc550d61a02a0c31d646c2062500fdd21e943c70ada293437454
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

diff --git a/dev-util/netbeans/netbeans-9999_p20151003.ebuild b/dev-util/netbeans/netbeans-9999_p20151003.ebuild
new file mode 100644
index 0000000..69d9b9a
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20151003.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-03_00-02-28/zip/netbeans-trunk-nightly-201510030002-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
+}